From 0e68368c1df02acb4e96c14b7f4a307d369f1415 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期五, 25 十一月 2022 17:12:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/operate/baseSetting/illegalBuild/index.vue | 105 ++++++++--------------------------------------------
1 files changed, 16 insertions(+), 89 deletions(-)
diff --git a/src/views/operate/baseSetting/illegalBuild/index.vue b/src/views/operate/baseSetting/illegalBuild/index.vue
index 91fd871..8f88253 100644
--- a/src/views/operate/baseSetting/illegalBuild/index.vue
+++ b/src/views/operate/baseSetting/illegalBuild/index.vue
@@ -30,11 +30,11 @@
@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 prop="number" label="缂栧彿" min-width="5">
</el-table-column>
<el-table-column prop="typeFirst" label="鎵�灞炵被鍨�" min-width="10">
</el-table-column>
- <el-table-column prop="type" label="鎵�灞炵被鍒�" min-width="10">
+ <el-table-column prop="type" label="鎵�灞炵被鍒�" min-width="20">
</el-table-column>
<el-table-column prop="operation" label="鎿嶄綔" min-width="10">
<template slot-scope="scope">
@@ -48,13 +48,13 @@
</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 @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">
@@ -66,7 +66,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"
@@ -187,7 +187,6 @@
url: `sccg/illegal_building/delete?id=${number}`,
})
.then(res => {
- console.log(res);
this.$message({
type: res.code === 200 ? 'success' : 'warning',
message: res.message
@@ -254,6 +253,17 @@
done();
})
.catch(_ => { });
+ },
+ handleClose2(done){
+ if(this.updateFlag){
+ this.$confirm('纭鍏抽棴锛�')
+ .then(_ => {
+ done();
+ })
+ .catch(_ => { });
+ }else{
+ done();
+ }
}
}
}
@@ -290,11 +300,6 @@
.el-input {
flex: 2;
color: #1d3f57;
-
- &::v-deep .el-input__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
}
}
@@ -358,11 +363,6 @@
width: 120px;
}
- &::v-deep .el-input__inner {
- border: none;
- background-color: #09152f;
- }
-
&:hover {
border: 1px solid #4b9bb7;
}
@@ -406,15 +406,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;
@@ -427,70 +418,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