From e1ac04b42be89ca26ff5f94c17c4e2eebe52a0a2 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 03 一月 2023 09:52:39 +0800
Subject: [PATCH] Merge branch 'dev1.0' of ssh://42.193.1.25:29418/sccg_ui into dev1.0
---
src/views/operate/baseSetting/violation/index.vue | 197 ++++++++++++-------------------------------------
1 files changed, 48 insertions(+), 149 deletions(-)
diff --git a/src/views/operate/baseSetting/violation/index.vue b/src/views/operate/baseSetting/violation/index.vue
index cc28303..f2fac8e 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>
@@ -25,20 +25,20 @@
<div class="mainContent">
<!-- 鏁版嵁灞曠ず -->
<el-table ref="multipleTable"
- :header-cell-style="{background:'#06122c','font-size':'12px',color:'#4b9bb7','font-weight':'650','line-height':'45px'}"
+ :header-cell-style="{'font-weight':'650','line-height':'45px'}"
:data="tableData" style="width: 100%" :row-class-name="tableRowClassName"
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</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,15 @@
},
methods: {
// 鎵归噺鍒犻櫎
- mulDelete(idArr){
- console.log(idArr);
+ mulDelete(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'
})
})
},
@@ -183,16 +182,13 @@
},
// 鍒犻櫎鍗曟潯鏁版嵁
handleDelete({ number }) {
- console.log(number);
this.$confirm('纭鍒犻櫎锛�')
.then(_ => {
- console.log(1);
this.$axios({
method: 'delete',
url: `sccg/violations/delete?id=${number}`,
})
.then(res => {
- console.log(res);
this.$message({
type: res.code === 200 ? 'success' : 'warning',
message: res.message
@@ -201,7 +197,7 @@
this.getUserList();
})
})
- .catch(_ => { console.log(2) });
+ .catch(_ => { });
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
getUserList() {
@@ -216,37 +212,7 @@
this.totalNum = res.data.total;
})
},
- // search() {
- // const that = this;
- // const { currentPage, pageSize, context } = this;
- // // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�
- // if (context == '') {
- // this.$axios.get('sccg/role/list?keyword=' + '&pageNum=' + currentPage + '&pageSize=' + pageSize).then(res => {
- // if (res.code === 200) {
- // console.log(res);
- // res.data.list.forEach(item => {
- // // item.createTime = helper(item.createTime);
- // item.status == 1 ? item.status = true : item.status = false;
- // })
- // that.tableData = res.data.list;
- // this.totalNum = res.data.list.length;
- // }
- // })
- // } else {
- // this.$axios({
- // method: 'get',
- // url: 'sccg/role/list?keyword=' + context + '&pageNum=' + currentPage + '&pageSize=' + pageSize,
- // }).then(res => {
- // if (res.code === 200) {
- // res.data.list.forEach(item => {
- // item.status == 1 ? item.status = true : item.status = false;
- // })
- // that.tableData = res.data.list
- // this.totalNum = res.data.list.length;
- // }
- // })
- // }
- // },
+
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
if ((rowIndex + 1) % 2 == 0) {
@@ -277,10 +243,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('纭鍏抽棴锛�')
@@ -298,15 +277,14 @@
.userList {
text-align: left;
margin: 10px 20px;
- color: #4b9bb7;
+ // color: #4b9bb7;
.headerTitle {
line-height: 40px;
}
header {
- background-color: #09152f;
- border: 1pox solid #fff;
+ // background-color: #09152f;
.headerContent {
padding: 0 40px;
@@ -326,11 +304,6 @@
.el-input {
flex: 2;
color: #1d3f57;
-
- &::v-deep .el-input__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
}
}
@@ -358,10 +331,9 @@
}
main {
- background-color: #09152f;
+ // background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
.mainTitle {
line-height: 60px;
@@ -396,7 +368,7 @@
&::v-deep .el-input__inner {
border: none;
- background-color: #09152f;
+ // background-color: #09152f;
}
&:hover {
@@ -418,39 +390,30 @@
.el-pagination {
- &::v-deep li,
- &::v-deep .btn-prev,
- &::v-deep .btn-next {
- background-color: #071f39;
- color: #4b9bb7;
- }
+ // &::v-deep li,
+ // &::v-deep .btn-prev,
+ // &::v-deep .btn-next {
+ // // background-color: #071f39;
+ // color: #4b9bb7;
+ // }
- &::v-deep .active {
- background-color: #409eff;
- color: #fff;
- }
+ // &::v-deep .active {
+ // background-color: #409eff;
+ // color: #fff;
+ // }
}
}
}
.el-table {
- color: #4b9bb7;
- font-size: 10px;
+ // color: #4b9bb7;
+ // font-size: 10px;
&::v-deep .cell {
text-overflow: ellipsis;
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 +426,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