From 0615f6c8dddf1cff5368e85ce4bfa92c4deebe02 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期二, 29 十一月 2022 18:36:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/operate/baseSetting/violation/index.vue | 124 +++++++++-------------------------------
1 files changed, 29 insertions(+), 95 deletions(-)
diff --git a/src/views/operate/baseSetting/violation/index.vue b/src/views/operate/baseSetting/violation/index.vue
index cc28303..23c156b 100644
--- a/src/views/operate/baseSetting/violation/index.vue
+++ b/src/views/operate/baseSetting/violation/index.vue
@@ -16,7 +16,7 @@
<el-button class="addBtn" type="primary" @click="dialogCreate = true">鏂板杩濊绫诲瀷</el-button>
<el-dialog :visible.sync="dialogCreate" title="鏂板杩濊绫诲瀷" width="45%" v-if="dialogCreate"
:before-close="handleClose">
- <createUser @changeDialog=changeDialog />
+ <createUser @changeDialog=changeDialog />
</el-dialog>
</div>
</div>
@@ -32,13 +32,13 @@
</el-table-column>
<el-table-column prop="number" label="杩濊浜嬮」缂栧彿" min-width="10">
</el-table-column>
- <el-table-column prop="type" label="鎵�灞炵被鍨�" min-width="10">
+ <el-table-column prop="typeThird" label="鎵�灞炵被鍨�" min-width="10">
</el-table-column>
- <el-table-column prop="typeFirst" label="鎵�灞炲ぇ绫�" min-width="10">
+ <el-table-column prop="typeSecond" label="鎵�灞炲ぇ绫�" min-width="10">
</el-table-column>
- <el-table-column prop="typeSecond" label="鎵�灞炲皬绫�" min-width="10">
+ <el-table-column prop="typeFirst" label="鎵�灞炲皬绫�" min-width="10">
</el-table-column>
- <el-table-column prop="typeThird" label="妗堢敱" min-width="45">
+ <el-table-column prop="type" label="妗堢敱" min-width="45">
</el-table-column>
<el-table-column prop="operation" label="鎿嶄綔" min-width="10">
<template slot-scope="scope">
@@ -52,14 +52,14 @@
</el-table>
<!-- 鏌ョ湅淇敼椤甸潰 -->
<el-dialog :visible.sync="dialogUpdate" width="45%" :title="updateFlag ? '鏉冮檺璁剧疆' :'鏌ョ湅瑙掕壊淇℃伅'"
- v-if="dialogUpdate" :before-close="handleClose">
+ v-if="dialogUpdate" :before-close="handleClose2">
<updateUser :updateFlag="updateFlag" :userInfo=userInfo
:getUserList=" context ? getUserList : getUserList" @changeDialog="changeDialog" />
</el-dialog>
<!-- tools -->
<div class="tools">
<div class="funs">
- <div class="funsItem">
+ <!-- <div class="funsItem">
<el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
</div>
<div class="funsItem">
@@ -71,7 +71,7 @@
:value="item.value" :disabled="item.disabled">
</el-option>
</el-select>
- </div>
+ </div> -->
</div>
<div class="pagination">
<el-pagination background :current-page="currentPage" layout="prev, pager, next"
@@ -89,7 +89,7 @@
import createUser from "./createUser"
export default {
components: {
- updateUser,createUser
+ updateUser, createUser
},
data() {
return {
@@ -132,16 +132,16 @@
},
methods: {
// 鎵归噺鍒犻櫎
- mulDelete(idArr){
+ mulDelete(idArr) {
console.log(idArr);
this.$axios({
- method:'delete',
- url:'sccg/violations/batch_delete?ids='+idArr,
- }).then(res=>{
+ method: 'delete',
+ url: 'sccg/violations/batch_delete?ids=' + idArr,
+ }).then(res => {
this.getUserList();
this.$message({
- message:res.message,
- type:res.code === 200 ? 'success' : 'warning'
+ message: res.message,
+ type: res.code === 200 ? 'success' : 'warning'
})
})
},
@@ -192,7 +192,6 @@
url: `sccg/violations/delete?id=${number}`,
})
.then(res => {
- console.log(res);
this.$message({
type: res.code === 200 ? 'success' : 'warning',
message: res.message
@@ -277,10 +276,23 @@
this.currentPage = page;
this.getUserList();
},
- changeDialog({flag}) {
+ changeDialog({ flag }) {
this.dialogCreate = flag;
this.dialogUpdate = flag;
this.getUserList();
+ },
+ handleClose2(done) {
+ if (this.updateFlag) {
+ this.$confirm('纭鍏抽棴锛�')
+ .then(_ => {
+ this.dialogCreate = false;
+ this.dialogUpdate = false;
+ done();
+ })
+ .catch(_ => { });
+ } else {
+ done();
+ }
},
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
@@ -326,11 +338,6 @@
.el-input {
flex: 2;
color: #1d3f57;
-
- &::v-deep .el-input__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
}
}
@@ -442,15 +449,6 @@
white-space: nowrap;
overflow: hidden;
}
-
- &::v-deep .el-table__empty-block {
- background-color: #09152f;
- }
-
- &::v-deep .el-table__empty-block {
- color: #4b9bb7;
- }
-
.operation {
display: flex;
@@ -463,70 +461,6 @@
}
}
}
-
- .el-table::v-deep .warning-row {
- background: #06122c;
- }
-
- .el-table::v-deep .success-row {
- background: #071f39;
- }
-
- &::v-deep .switchStyle .el-switch__label {
- position: absolute;
- display: none;
- color: #fff;
- }
-
- &::v-deep .el-switch__core {
- background-color: rgba(166, 166, 166, 1);
- }
-
- &::v-deep .switchStyle .el-switch__label--left {
- z-index: 9;
- left: 20px;
- }
-
- &::v-deep .switchStyle .el-switch__label--right {
- z-index: 9;
- left: 4px;
- }
-
- &::v-deep .switchStyle .el-switch__label.is-active {
- display: block;
- }
-
- &::v-deep .switchStyle.el-switch .el-switch__core,
- &::v-deep .el-switch .el-switch__label {
- width: 50px !important;
- }
- }
-
- &::v-deep .el-dialog__header,
- &::v-deep .el-dialog__body {
- background-color: #06122c;
- }
-
- &::v-deep .el-dialog__header {
- display: flex;
- align-items: center;
- background-color: #fff;
- padding: 20px;
- line-height: 60px;
- }
-
- &::v-deep .el-dialog__title {
- color: #4b9bb7;
- }
-
- &::v-deep .el-dialog__close {
- width: 20px;
- height: 20px;
- // color: #fff;
- }
-
- &::v-deep .el-dialog__body {
- padding: 0;
}
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0