From bf9a412b20afe9f22e99448eb002ff9e92fd30cb Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期四, 09 二月 2023 10:17:04 +0800 Subject: [PATCH] 统一table操作按钮样式 --- src/views/operate/writManager/writTemplate/index.vue | 2 src/views/operate/baseSetting/illegalBuild/index.vue | 2 src/views/operate/viewEvent/index.vue | 2 src/views/operate/baseSetting/violation/index.vue | 2 src/views/systemSetting/device/loudspeaker/index.vue | 2 src/views/operate/management/message/index.vue | 53 src/views/operate/log/index.vue | 14 src/views/operate/message/myIndex/index.vue | 2 src/views/systemSetting/platform/cockpitManage/index.vue | 2 src/views/intelligentPatrol/statistics/unlawful/type/index.vue | 2 src/views/systemSetting/device/handheldTerminal/index.vue | 2 src/views/operate/myWait/index.vue | 96 + src/views/operate/fivepack/threepack/components/content.vue | 288 +++- src/views/systemSetting/baseSetting/department/index.vue | 2 src/views/operate/images/index.vue | 114 + src/views/operate/sms/smsTemplate/index.vue | 2 src/views/systemSetting/baseSetting/user/components/createUser/index.vue | 437 ++++--- src/views/intelligentPatrol/statistics/unlawful/point/index.vue | 65 src/views/operate/video/index.vue | 2 src/views/intelligentPatrol/studyJudge/inspectionTable/index.vue | 2 src/views/systemSetting/baseSetting/user/components/main/index.vue | 92 src/views/intelligentPatrol/statistics/unlawful/time/index.vue | 2 src/views/operate/disposal/casepool/escalation/index.vue | 2 src/views/operate/message/mycontrol/index.vue | 917 ++++++++------- src/views/operate/writManager/writ/index.vue | 2 src/views/operate/disposal/casepool/dispatch/index.vue | 2 src/views/operate/sms/smsIndex/index.vue | 2 src/views/operate/car/myIndex/index.vue | 4 src/views/intelligentPatrol/statistics/unlawful/shop/index.vue | 64 src/views/operate/management/myIndex/index.vue | 1102 ++++++++++--------- src/views/systemSetting/device/grid/components/main/index.vue | 2 src/App.vue | 3 src/views/systemSetting/baseSetting/role/index.vue | 1 src/views/intelligentPatrol/statistics/unlawful/area/index.vue | 61 34 files changed, 1,868 insertions(+), 1,481 deletions(-) diff --git a/src/App.vue b/src/App.vue index bfbe1c3..ba2c5d2 100644 --- a/src/App.vue +++ b/src/App.vue @@ -49,6 +49,9 @@ }; </script> <style lang="scss"> +body { + --operation-color: #409eff; +} .el-select-dropdown__item { height: 100% !important; } diff --git a/src/views/intelligentPatrol/statistics/unlawful/area/index.vue b/src/views/intelligentPatrol/statistics/unlawful/area/index.vue index 43017a7..35ba7f2 100644 --- a/src/views/intelligentPatrol/statistics/unlawful/area/index.vue +++ b/src/views/intelligentPatrol/statistics/unlawful/area/index.vue @@ -40,11 +40,11 @@ <div class="main-content"> <!-- 鏁版嵁灞曠ず --> <el-table - border - stripe + border + stripe ref="multipleTable" :header-cell-style="{ - 'background':'#F5F5F5', + background: '#F5F5F5', 'font-weight': '650', 'line-height': '45px', }" @@ -142,30 +142,29 @@ handleExport(e) { this.$axios({ - method: 'post', + method: "post", url: `sccg/intelligentPatrol/statistics/export/unlawful`, - responseType: 'arraybuffer' - }) - .then(res => { - let time = new Date() - let deathdate =time.toLocaleDateString() - const blob = new Blob([res.data], { - type: "application/vnd.ms-excel;charset=utf-8", - }); - if (window.navigator.msSaveBlob) { - window.navigator.msSaveBlob(blob, deathdate+"鎸夊尯鍩熺粺璁�" + ".xlsx"); - } else { - const url = window.URL.createObjectURL(blob); - const link = document.createElement("a"); - link.style.display = "none"; - link.href = url; - link.download = deathdate+"鎸夊尯鍩熺粺璁�" + ".xlsx"; - document.body.appendChild(link); - link.click(); - document.body.removeChild(link); - } - this.$message.success('鎿嶄綔鎴愬姛'); - }) + responseType: "arraybuffer", + }).then((res) => { + let time = new Date(); + let deathdate = time.toLocaleDateString(); + const blob = new Blob([res.data], { + type: "application/vnd.ms-excel;charset=utf-8", + }); + if (window.navigator.msSaveBlob) { + window.navigator.msSaveBlob(blob, deathdate + "鎸夊尯鍩熺粺璁�" + ".xlsx"); + } else { + const url = window.URL.createObjectURL(blob); + const link = document.createElement("a"); + link.style.display = "none"; + link.href = url; + link.download = deathdate + "鎸夊尯鍩熺粺璁�" + ".xlsx"; + document.body.appendChild(link); + link.click(); + document.body.removeChild(link); + } + this.$message.success("鎿嶄綔鎴愬姛"); + }); }, setTableDataHandle(e) {}, resetTableData(e) {}, @@ -184,11 +183,11 @@ this.searchByArea({ currentPage, pageSize, - beginTime:'2022-05-01 00:00:00', - endTime:'2022-09-01 00:00:00' + beginTime: "2022-05-01 00:00:00", + endTime: "2022-09-01 00:00:00", }).then((res) => { - this.list = res.records; - this.totalNum = res.total; + this.list = res.records; + this.totalNum = res.total; }); }, // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠� @@ -357,7 +356,7 @@ // font-size: 10px; .operation { display: flex; - + color: var(--operation-color);; .line { padding: 0 5px; } diff --git a/src/views/intelligentPatrol/statistics/unlawful/point/index.vue b/src/views/intelligentPatrol/statistics/unlawful/point/index.vue index 04e9469..9b1cbc2 100644 --- a/src/views/intelligentPatrol/statistics/unlawful/point/index.vue +++ b/src/views/intelligentPatrol/statistics/unlawful/point/index.vue @@ -40,11 +40,11 @@ <div class="main-content"> <!-- 鏁版嵁灞曠ず --> <el-table - border - stripe + border + stripe ref="multipleTable" :header-cell-style="{ - 'background':'#F5F5F5', + background: '#F5F5F5', 'font-weight': '650', 'line-height': '45px', }" @@ -152,30 +152,29 @@ handleExport(e) { this.$axios({ - method: 'post', + method: "post", url: `sccg/intelligentPatrol/statistics/export/unlawful`, - responseType: 'arraybuffer' - }) - .then(res => { - let time = new Date() - let deathdate =time.toLocaleDateString() - const blob = new Blob([res.data], { - type: "application/vnd.ms-excel;charset=utf-8", - }); - if (window.navigator.msSaveBlob) { - window.navigator.msSaveBlob(blob, deathdate+"鎸夌偣浣嶇粺璁�" + ".xlsx"); - } else { - const url = window.URL.createObjectURL(blob); - const link = document.createElement("a"); - link.style.display = "none"; - link.href = url; - link.download = deathdate+"鎸夌偣浣嶇粺璁�" + ".xlsx"; - document.body.appendChild(link); - link.click(); - document.body.removeChild(link); - } - this.$message.success('鎿嶄綔鎴愬姛'); - }) + responseType: "arraybuffer", + }).then((res) => { + let time = new Date(); + let deathdate = time.toLocaleDateString(); + const blob = new Blob([res.data], { + type: "application/vnd.ms-excel;charset=utf-8", + }); + if (window.navigator.msSaveBlob) { + window.navigator.msSaveBlob(blob, deathdate + "鎸夌偣浣嶇粺璁�" + ".xlsx"); + } else { + const url = window.URL.createObjectURL(blob); + const link = document.createElement("a"); + link.style.display = "none"; + link.href = url; + link.download = deathdate + "鎸夌偣浣嶇粺璁�" + ".xlsx"; + document.body.appendChild(link); + link.click(); + document.body.removeChild(link); + } + this.$message.success("鎿嶄綔鎴愬姛"); + }); }, setTableDataHandle(e) {}, resetTableData(e) {}, @@ -194,11 +193,11 @@ this.searchByPoint({ currentPage, pageSize, - beginTime:'2022-05-01 00:00:00', - endTime:'2022-09-01 00:00:00' + beginTime: "2022-05-01 00:00:00", + endTime: "2022-09-01 00:00:00", }).then((res) => { - this.list = res.records; - this.totalNum = res.total; + this.list = res.records; + this.totalNum = res.total; }); }, // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠� @@ -348,11 +347,11 @@ } } // &::v-deep .warning-row { - // background-color: #06122c; + // background-color: #06122c; // } // &::v-deep .success-row { - // background-color: #071f39; + // background-color: #071f39; // } .operationBox { @@ -367,7 +366,7 @@ // font-size: 10px; .operation { display: flex; - + color: var(--operation-color); .line { padding: 0 5px; } diff --git a/src/views/intelligentPatrol/statistics/unlawful/shop/index.vue b/src/views/intelligentPatrol/statistics/unlawful/shop/index.vue index 33dcc15..3dccbb0 100644 --- a/src/views/intelligentPatrol/statistics/unlawful/shop/index.vue +++ b/src/views/intelligentPatrol/statistics/unlawful/shop/index.vue @@ -40,11 +40,11 @@ <div class="main-content"> <!-- 鏁版嵁灞曠ず --> <el-table - border - stripe + border + stripe ref="multipleTable" :header-cell-style="{ - 'background':'#F5F5F5', + background: '#F5F5F5', 'font-weight': '650', 'line-height': '45px', }" @@ -146,30 +146,32 @@ handleExport(e) { this.$axios({ - method: 'post', + method: "post", url: `sccg/intelligentPatrol/statistics/export/shop`, - responseType: 'arraybuffer' - }) - .then(res => { - let time = new Date() - let deathdate =time.toLocaleDateString() - const blob = new Blob([res.data], { - type: "application/vnd.ms-excel;charset=utf-8", - }); - if (window.navigator.msSaveBlob) { - window.navigator.msSaveBlob(blob, deathdate+"闂ㄥ墠涓夊寘缁熻" + ".xlsx"); - } else { - const url = window.URL.createObjectURL(blob); - const link = document.createElement("a"); - link.style.display = "none"; - link.href = url; - link.download = deathdate+"闂ㄥ墠涓夊寘缁熻" + ".xlsx"; - document.body.appendChild(link); - link.click(); - document.body.removeChild(link); - } - this.$message.success('鎿嶄綔鎴愬姛'); - }) + responseType: "arraybuffer", + }).then((res) => { + let time = new Date(); + let deathdate = time.toLocaleDateString(); + const blob = new Blob([res.data], { + type: "application/vnd.ms-excel;charset=utf-8", + }); + if (window.navigator.msSaveBlob) { + window.navigator.msSaveBlob( + blob, + deathdate + "闂ㄥ墠涓夊寘缁熻" + ".xlsx" + ); + } else { + const url = window.URL.createObjectURL(blob); + const link = document.createElement("a"); + link.style.display = "none"; + link.href = url; + link.download = deathdate + "闂ㄥ墠涓夊寘缁熻" + ".xlsx"; + document.body.appendChild(link); + link.click(); + document.body.removeChild(link); + } + this.$message.success("鎿嶄綔鎴愬姛"); + }); }, setTableDataHandle(e) {}, resetTableData(e) {}, @@ -188,11 +190,11 @@ this.searchByShop({ currentPage, pageSize, - beginTime:'2022-05-01 00:00:00', - endTime:'2022-09-01 00:00:00' + beginTime: "2022-05-01 00:00:00", + endTime: "2022-09-01 00:00:00", }).then((res) => { - this.list = res.records; - this.totalNum = res.total; + this.list = res.records; + this.totalNum = res.total; }); }, // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠� @@ -361,7 +363,7 @@ // font-size: 10px; .operation { display: flex; - + color: var(--operation-color); .line { padding: 0 5px; } diff --git a/src/views/intelligentPatrol/statistics/unlawful/time/index.vue b/src/views/intelligentPatrol/statistics/unlawful/time/index.vue index 426ca88..28960f5 100644 --- a/src/views/intelligentPatrol/statistics/unlawful/time/index.vue +++ b/src/views/intelligentPatrol/statistics/unlawful/time/index.vue @@ -357,7 +357,7 @@ // font-size: 10px; .operation { display: flex; - + color: var(--operation-color); .line { padding: 0 5px; } diff --git a/src/views/intelligentPatrol/statistics/unlawful/type/index.vue b/src/views/intelligentPatrol/statistics/unlawful/type/index.vue index 141601b..95276b4 100644 --- a/src/views/intelligentPatrol/statistics/unlawful/type/index.vue +++ b/src/views/intelligentPatrol/statistics/unlawful/type/index.vue @@ -366,7 +366,7 @@ // font-size: 10px; .operation { display: flex; - + color: var(--operation-color); .line { padding: 0 5px; } diff --git a/src/views/intelligentPatrol/studyJudge/inspectionTable/index.vue b/src/views/intelligentPatrol/studyJudge/inspectionTable/index.vue index 78e442c..6e3fe87 100644 --- a/src/views/intelligentPatrol/studyJudge/inspectionTable/index.vue +++ b/src/views/intelligentPatrol/studyJudge/inspectionTable/index.vue @@ -378,7 +378,7 @@ .operation { display: flex; - + color: var(--operation-color); .line { padding: 0 5px; } diff --git a/src/views/operate/baseSetting/illegalBuild/index.vue b/src/views/operate/baseSetting/illegalBuild/index.vue index bcf63fe..d954fb9 100644 --- a/src/views/operate/baseSetting/illegalBuild/index.vue +++ b/src/views/operate/baseSetting/illegalBuild/index.vue @@ -401,7 +401,7 @@ } .operation { display: flex; - + color: var(--operation-color); .line { padding: 0 5px; } diff --git a/src/views/operate/baseSetting/violation/index.vue b/src/views/operate/baseSetting/violation/index.vue index c42cac8..980c406 100644 --- a/src/views/operate/baseSetting/violation/index.vue +++ b/src/views/operate/baseSetting/violation/index.vue @@ -419,7 +419,7 @@ } .operation { display: flex; - + color: var(--operation-color); .line { padding: 0 5px; } diff --git a/src/views/operate/car/myIndex/index.vue b/src/views/operate/car/myIndex/index.vue index a16b704..fa2663e 100644 --- a/src/views/operate/car/myIndex/index.vue +++ b/src/views/operate/car/myIndex/index.vue @@ -52,7 +52,7 @@ </el-table-column> <el-table-column prop="operation" label="鎿嶄綔" min-width="20"> <template slot-scope="scope"> - <div class="btn"> + <div class="operation"> <!-- <span @click="handleView(scope.row)">鏌ョ湅</span> <span class="line">|</span> --> <span @click="handleEdit(scope.row)">缂栬緫</span> @@ -577,7 +577,7 @@ .operation { display: flex; - + color: var(--operation-color); .line { padding: 0 5px; } diff --git a/src/views/operate/disposal/casepool/dispatch/index.vue b/src/views/operate/disposal/casepool/dispatch/index.vue index 13ef881..3e9cc72 100644 --- a/src/views/operate/disposal/casepool/dispatch/index.vue +++ b/src/views/operate/disposal/casepool/dispatch/index.vue @@ -537,7 +537,7 @@ .operation { display: flex; - + color: var(--operation-color); .line { padding: 0 5px; } diff --git a/src/views/operate/disposal/casepool/escalation/index.vue b/src/views/operate/disposal/casepool/escalation/index.vue index ef4234b..455ff3c 100644 --- a/src/views/operate/disposal/casepool/escalation/index.vue +++ b/src/views/operate/disposal/casepool/escalation/index.vue @@ -614,7 +614,7 @@ .operation { display: flex; - + color: var(--operation-color); .line { padding: 0 5px; } diff --git a/src/views/operate/fivepack/threepack/components/content.vue b/src/views/operate/fivepack/threepack/components/content.vue index fe4bbae..d399d6b 100644 --- a/src/views/operate/fivepack/threepack/components/content.vue +++ b/src/views/operate/fivepack/threepack/components/content.vue @@ -5,35 +5,59 @@ <div class="find"> <div class="search-item"> <span>杈撳叆鏌ヨ:</span> - <el-input style="flex: 1" :placeholder=" - isStorePage() ? '搴楅摵锛堥棬搴楋級鍚嶇О' : '璇疯緭鍏ュ簵閾虹紪鍙�' - " v-model="storeCode" /> + <el-input + style="flex: 1" + :placeholder=" + isStorePage() ? '搴楅摵锛堥棬搴楋級鍚嶇О' : '璇疯緭鍏ュ簵閾虹紪鍙�' + " + v-model="storeCode" + /> </div> <div class="search-item"> <span>搴楅摵鐘舵��:</span> <el-select v-model="storeStatus" placeholder="閫夋嫨搴楅摵鐘舵��"> - <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" /> + <el-option + v-for="item in options" + :key="item.value" + :label="item.label" + :value="item.value" + /> </el-select> </div> <div class="findBtn"> - <el-button type="primary" @click="search" icon="el-icon-search">鏌ヨ</el-button> - <el-button icon="el-icon-delete-solid" @click="handleReset">閲嶇疆</el-button> + <el-button type="primary" @click="search" icon="el-icon-search" + >鏌ヨ</el-button + > + <el-button icon="el-icon-delete-solid" @click="handleReset" + >閲嶇疆</el-button + > </div> </div> - <el-button v-if="isStorePage()" type="primary" icon="el-icon-plus" class="button-addition" - @click="handleView(null, 'create')">娣诲姞</el-button> + <el-button + v-if="isStorePage()" + type="primary" + icon="el-icon-plus" + class="button-addition" + @click="handleView(null, 'create')" + >娣诲姞</el-button + > </div> </header> <main> <!-- 鏁版嵁灞曠ず --> <el-table - border - stripe - ref="multipleTable" :header-cell-style="{ - 'background':'#F5F5F5', - 'font-weight': '650', - 'line-height': '45px', - }" :data="tableData" style="width: 100%" :row-class-name="tableRowClassName"> + border + stripe + ref="multipleTable" + :header-cell-style="{ + background: '#F5F5F5', + 'font-weight': '650', + 'line-height': '45px', + }" + :data="tableData" + style="width: 100%" + :row-class-name="tableRowClassName" + > <el-table-column type="selection" min-width="5"> </el-table-column> <el-table-column prop="storeNumber" label="搴楅摵缂栧彿" min-width="10"> </el-table-column> @@ -43,7 +67,11 @@ </el-table-column> <el-table-column prop="contact" label="搴楅摵鑱旂郴鐢佃瘽" min-width="10"> </el-table-column> - <el-table-column prop="storeAddress" label="搴楅摵璇︾粏鍦板潃" min-width="10"> + <el-table-column + prop="storeAddress" + label="搴楅摵璇︾粏鍦板潃" + min-width="10" + > </el-table-column> <el-table-column prop="storeScore" label="搴楅摵绉垎" min-width="10"> </el-table-column> @@ -54,50 +82,121 @@ </el-table-column> <el-table-column prop="status" label="鐘舵��" min-width="10"> <template slot-scope="scope"> - <span>{{ scope.row.status == 1 ? '缁忚惀' : '鍊掗棴' }}</span> + <span>{{ scope.row.status == 1 ? "缁忚惀" : "鍊掗棴" }}</span> </template> </el-table-column> <el-table-column prop="operation" label="鎿嶄綔" min-width="20"> <template slot-scope="scope"> <div v-if="!isStorePage()" class="operation"> - <el-link icon="el-icon-edit" :underline="false" @click="handleView(scope.row, 'update')">缂栬緫</el-link> - <el-link class="leftPx" icon="el-icon-delete-solid" :underline="false" - @click="handleDelete(scope.row.id)">鍒犻櫎</el-link> - <el-link class="leftPx" icon="el-icon-edit" :underline="false" - @click="sendMessage(scope.row.contact)">鎺ㄩ�佷俊鎭�</el-link> - <el-link class="leftPx" icon="el-icon-edit" :underline="false" - @click="handleScoreView(scope.row, 'view')">鏌ョ湅</el-link> + <el-link + icon="el-icon-edit" + :underline="false" + @click="handleView(scope.row, 'update')" + >缂栬緫</el-link + > + <el-link + class="leftPx" + icon="el-icon-delete-solid" + :underline="false" + @click="handleDelete(scope.row.id)" + >鍒犻櫎</el-link + > + <el-link + class="leftPx" + icon="el-icon-edit" + :underline="false" + @click="sendMessage(scope.row.contact)" + >鎺ㄩ�佷俊鎭�</el-link + > + <el-link + class="leftPx" + icon="el-icon-edit" + :underline="false" + @click="handleScoreView(scope.row, 'view')" + >鏌ョ湅</el-link + > </div> <div v-else class="operation"> - <el-link icon="el-icon-edit" :underline="false" @click="handleView(scope.row, 'update')">缂栬緫</el-link> - <el-link class="leftPx" icon="el-icon-delete-solid" :underline="false" - @click="handleDelete(scope.row.id)">鍒犻櫎</el-link> + <el-link + icon="el-icon-edit" + :underline="false" + @click="handleView(scope.row, 'update')" + >缂栬緫</el-link + > + <el-link + class="leftPx" + icon="el-icon-delete-solid" + :underline="false" + @click="handleDelete(scope.row.id)" + >鍒犻櫎</el-link + > </div> </template> </el-table-column> </el-table> <!-- 鏌ョ湅淇敼椤甸潰 --> - <el-dialog :visible.sync="dialogUpdate" width="45%" :destroy-on-close="true" - :title="dialogType === 'view' ? '鏌ョ湅搴楅摵淇℃伅' : '淇敼搴楅摵淇℃伅'" :before-close="handleClose"> - <updateUser v-if="dialogUpdate" :dialogType="dialogType" :storeInfo="storeInfo" :isStorePage="isStorePage()" - @closeDialog="closeDialog" /> + <el-dialog + :visible.sync="dialogUpdate" + width="45%" + :destroy-on-close="true" + :title="dialogType === 'view' ? '鏌ョ湅搴楅摵淇℃伅' : '淇敼搴楅摵淇℃伅'" + :before-close="handleClose" + > + <updateUser + v-if="dialogUpdate" + :dialogType="dialogType" + :storeInfo="storeInfo" + :isStorePage="isStorePage()" + @closeDialog="closeDialog" + /> </el-dialog> <!-- 鏌ョ湅淇敼椤甸潰 --> - <el-dialog :visible.sync="dialogScore" width="60%" :destroy-on-close="true" title="鏌ョ湅绉垎" - :before-close="handleCloseScoreView"> + <el-dialog + :visible.sync="dialogScore" + width="60%" + :destroy-on-close="true" + title="鏌ョ湅绉垎" + :before-close="handleCloseScoreView" + > <scoreView v-if="dialogScore" :storeInfo="storeInfoScoreView" /> </el-dialog> <!-- 鏂板缓娑堟伅 --> - <el-dialog title="鏂板缓娑堟伅" :destroy-on-close="true" :key="dialogType" :visible.sync="isShowDialog" width="80%" - :before-close="handleConfirmClose"> + <el-dialog + title="鏂板缓娑堟伅" + :destroy-on-close="true" + :key="dialogType" + :visible.sync="isShowDialog" + width="80%" + :before-close="handleConfirmClose" + > <div class="mainContent"> - <el-form ref="user" label-width="140px" autoComplete="on" :model="role" :rules="rules" label-position="right"> + <el-form + ref="user" + label-width="140px" + autoComplete="on" + :model="role" + :rules="rules" + label-position="right" + > <!-- 娑堟伅鏍忕洰 --> - <el-form-item class="optionItem" label="鐭俊妯℃澘:" prop="messageType"> + <el-form-item + class="optionItem" + label="鐭俊妯℃澘:" + prop="messageType" + > <div class="message-item"> <div class="message-item__left"> - <el-select v-model="role.messageType" placeholder="璇烽�夋嫨鐭俊妯℃澘" @change="setTemplateValue"> - <el-option v-for="item in colList" :key="item.id" :label="item.title" :value="item.id"> + <el-select + v-model="role.messageType" + placeholder="璇烽�夋嫨鐭俊妯℃澘" + @change="setTemplateValue" + > + <el-option + v-for="item in colList" + :key="item.id" + :label="item.title" + :value="item.id" + > </el-option> </el-select> </div> @@ -106,11 +205,18 @@ <!-- 娑堟伅鏍囬 --> <el-form-item class="optionItems" label="鐭俊鏍囬:" prop="head"> <div class="message-item__left"> - <el-input v-model="role.head" placeholder="璇烽�夋嫨鐭俊鏍囬"></el-input> + <el-input + v-model="role.head" + placeholder="璇烽�夋嫨鐭俊鏍囬" + ></el-input> </div> </el-form-item> <!-- 鎺ユ敹瀵硅薄 --> - <el-form-item class="optionItem" label="鎺ユ敹鎵嬫満鍙�:" prop="targetTo"> + <el-form-item + class="optionItem" + label="鎺ユ敹鎵嬫満鍙�:" + prop="targetTo" + > <!-- <div class="message-item__left"> <el-select v-model="role.targetTo" placeholder="璇烽�夋嫨鎺ユ敹鎺ユ敹鎵嬫満鍙�" > <el-option :value="role.targetTo"> @@ -131,8 +237,17 @@ <el-form-item> <div class="optionBtn"> - <el-button type="primary" @click.native.prevent="handleSubmit(2)" class="btn submit">鍙戝竷</el-button> - <el-button class="btn cancel" @click.native.prevent="handleResetq">閲嶇疆</el-button> + <el-button + type="primary" + @click.native.prevent="handleSubmit(2)" + class="btn submit" + >鍙戝竷</el-button + > + <el-button + class="btn cancel" + @click.native.prevent="handleResetq" + >閲嶇疆</el-button + > </div> </el-form-item> </el-form> @@ -140,8 +255,14 @@ </el-dialog> <!-- 鍒嗛〉 --> <div class="pagination"> - <el-pagination background :current-page="currentPage" layout="prev, pager, next" :total="totalNum" - :page-size="pageSize" @current-change="changeCurrentPage"> + <el-pagination + background + :current-page="currentPage" + layout="prev, pager, next" + :total="totalNum" + :page-size="pageSize" + @current-change="changeCurrentPage" + > </el-pagination> </div> </main> @@ -155,7 +276,7 @@ deleteStoreInfo, } from "@/api/operate/storeManagement"; import { sendMessageByMobileNumber } from "@/api/operate/messageManagement"; -import MyEditor from '@/components/edit'; +import MyEditor from "@/components/edit"; import SMS from "@/api/operate/SMS"; export default { @@ -170,11 +291,11 @@ data() { const validateMessageContent = (rule, value, callback) => { if (!value) { - callback(new Error('璇疯緭鍏ョ煭淇″唴瀹�')); + callback(new Error("璇疯緭鍏ョ煭淇″唴瀹�")); } else { callback(); } - } + }; return { storeCode: null, storeStatus: null, @@ -195,24 +316,30 @@ storeInfo: null, storeInfoScoreView: {}, role: { - messageType: '', - head: '', - targetTo: '', + messageType: "", + head: "", + targetTo: "", targetFrom: null, - body: '', - channelCode: '02', + body: "", + channelCode: "02", phoneNumber: null, }, rules: { messageType: [ - { required: true, trigger: ['blur', 'change'], message: '璇烽�夋嫨鐭俊妯℃澘' }, + { + required: true, + trigger: ["blur", "change"], + message: "璇烽�夋嫨鐭俊妯℃澘", + }, ], - head: [ - { required: true, trigger: "blur", message: '璇疯緭鍏ョ煭淇℃爣棰�' }, - ], + head: [{ required: true, trigger: "blur", message: "璇疯緭鍏ョ煭淇℃爣棰�" }], body: [ - { required: true, trigger: ['blur', 'change'], validator: validateMessageContent } - ] + { + required: true, + trigger: ["blur", "change"], + validator: validateMessageContent, + }, + ], }, colList: [], departList: [], @@ -220,13 +347,13 @@ dialogCreate: false, dialogView: false, defaultProps: { - children: 'children', - label: 'departName' + children: "children", + label: "departName", }, checkedList: [], tempNameArr: [], info: {}, - sendUser: "" + sendUser: "", }; }, @@ -237,46 +364,46 @@ this.$refs.user.validate((valid) => { if (valid) { const params = Object.assign({}, this.role); - params.targetTo = this.checkedList.join(','); + params.targetTo = this.checkedList.join(","); params.status = mystatus; sendMessageByMobileNumber(params) .then(() => { - this.$message({ type: 'success', message: '鎿嶄綔鎴愬姛' }); + this.$message({ type: "success", message: "鎿嶄綔鎴愬姛" }); this.isShowDialog = false; - this.role.body = ''; - this.role.head = ''; + this.role.body = ""; + this.role.head = ""; this.$refs.edit.editor.txt.clear(); this.search(); this.$refs.user.resetFields(); }) - .catch(err => this.$message({ type: 'error', message: err })); + .catch((err) => this.$message({ type: "error", message: err })); } else { - this.$message.warning('璇锋鏌ュ繀濉」'); + this.$message.warning("璇锋鏌ュ繀濉」"); } - }) + }); }, setTemplateValue(obj) { - var _this = this + var _this = this; SMS.getSMSTemplateById(obj).then((result) => { - _this.role.head = result.title - _this.role.body = result.body - _this.$refs.edit.editor.txt.html(result.body) - }) + _this.role.head = result.title; + _this.role.body = result.body; + _this.$refs.edit.editor.txt.html(result.body); + }); }, getSMSTemplateList() { SMS.getSMSTemplateList({ current: 1, pageSize: 100 }) .then(({ records }) => { this.colList = records; }) - .catch(err => this.$message.error(err)) + .catch((err) => this.$message.error(err)); }, // 纭鍏抽棴寮圭獥 handleConfirmClose(done) { this.$confirm("纭鍏抽棴?").then(() => { done(); this.search(); - this.role.body = ''; - this.role.head = ''; + this.role.body = ""; + this.role.head = ""; this.$refs.edit.editor.txt.clear(); this.search(); this.$refs.user.resetFields(); @@ -287,8 +414,8 @@ this.$refs.edit.editor.txt.clear(); this.search(); this.$refs.user.resetFields(); - this.role.body = ''; - this.role.head = ''; + this.role.body = ""; + this.role.head = ""; }, sendMessage(val) { this.isShowDialog = true; @@ -512,7 +639,6 @@ justify-content: right; .el-pagination { - &::v-deep li, &::v-deep .btn-prev, &::v-deep .btn-next { @@ -533,7 +659,7 @@ .operation { display: flex; - + color: var(--operation-color); .el-button { border: none; } diff --git a/src/views/operate/images/index.vue b/src/views/operate/images/index.vue index 728865e..4f8ff53 100644 --- a/src/views/operate/images/index.vue +++ b/src/views/operate/images/index.vue @@ -22,10 +22,12 @@ </div> </div> <div class="addBtn"> - <el-button type="primary" @click="handleUpdateImageResource(null,'create')" - >鏂板</el-button - > - </div> + <el-button + type="primary" + @click="handleUpdateImageResource(null, 'create')" + >鏂板</el-button + > + </div> </div> </header> <main> @@ -42,11 +44,11 @@ </div> <!-- 鏁版嵁灞曠ず --> <el-table - border - stripe + border + stripe ref="multipleTable" :header-cell-style="{ - 'background':'#F5F5F5', + background: '#F5F5F5', 'font-weight': '650', 'line-height': '45px', }" @@ -55,7 +57,12 @@ :row-class-name="tableRowClassName" @selection-change="tableChange" > - <el-table-column type="selection" min-width="5" :selectable="selectable"> </el-table-column> + <el-table-column + type="selection" + min-width="5" + :selectable="selectable" + > + </el-table-column> <el-table-column prop="code" label="鎵�灞炰簨浠剁紪鍙�" min-width="18"> </el-table-column> <el-table-column prop="category" label="闂绫诲埆" min-width="8"> @@ -84,11 +91,15 @@ >鏌ョ湅</span > <span v-if="mystatus === 3" class="line">|</span> - <span v-if="mystatus === 3" @click="handleUdeletepdateImageResource(scope.row, 'update')" + <span + v-if="mystatus === 3" + @click="handleUdeletepdateImageResource(scope.row, 'update')" >淇敼</span > - <span v-if="mystatus === 3" class="line">|</span> - <span v-if="mystatus === 3" @click="handleDelete(scope.row)">鍒犻櫎</span> + <span v-if="mystatus === 3" class="line">|</span> + <span v-if="mystatus === 3" @click="handleDelete(scope.row)" + >鍒犻櫎</span + > </div> </template> </el-table-column> @@ -120,10 +131,7 @@ > </div> <div class="funsItem"> - <el-select - v-model="myIdx" - placeholder="鎵归噺鎿嶄綔" - > + <el-select v-model="myIdx" placeholder="鎵归噺鎿嶄綔"> <el-option v-for="item in options" :key="item.value" @@ -251,34 +259,34 @@ // 鎵归噺鍒犻櫎 mulDelete(idArr) { this.$confirm("鎮ㄧ‘瀹氳鎵归噺鍒犻櫎鍥剧墖鍚�?") - .then((_) => { - this.$axios({ - method: "delete", - url: "/sccg/image_resources/deletion_batch?ids=" + idArr, - }).then((res) => { - if (res.code === 200) { - this.$message({ - type: "success", - message: "鎵归噺鍒犻櫎鍥剧墖鎴愬姛", - }); - this.getImageResourceList(); - } else { - this.$message({ - type: "error", - message: res.message, - }); - } - }); - }) - .catch((err) => { - console.log(err); - }); + .then((_) => { + this.$axios({ + method: "delete", + url: "/sccg/image_resources/deletion_batch?ids=" + idArr, + }).then((res) => { + if (res.code === 200) { + this.$message({ + type: "success", + message: "鎵归噺鍒犻櫎鍥剧墖鎴愬姛", + }); + this.getImageResourceList(); + } else { + this.$message({ + type: "error", + message: res.message, + }); + } + }); + }) + .catch((err) => { + console.log(err); + }); }, // 鎵ц涓嬫媺妗嗘搷浣� selectChange(list) { if (this.tempList.length !== 0) { - this.preMyIdx = list; - this.mulDelete(this.tempList); + this.preMyIdx = list; + this.mulDelete(this.tempList); } else { this.myIdx = this.preMyIdx; this.$message({ @@ -339,10 +347,10 @@ }, // 鏇存敼杩濊/杩濆缓 changeTypeChecked(data) { - this.typeList.forEach(item => { + this.typeList.forEach((item) => { item.checked = data.name === item.name; - }) - const checkedType = this.typeList.find(item => item.checked); + }); + const checkedType = this.typeList.find((item) => item.checked); this.mystatus = +checkedType.value; this.size = checkedType.value; this.getImageResourceList(); @@ -378,12 +386,12 @@ getEventSource(value) { return EVENT_SOURCE.find((item) => item.value === value); }, - selectable(row,index){ - if(this.mystatus == '1'){ - return false;//绂佺敤鐘舵�� - }else{ - return true;//闈炵鐢ㄧ姸鎬� - } + selectable(row, index) { + if (this.mystatus == "1") { + return false; //绂佺敤鐘舵�� + } else { + return true; //闈炵鐢ㄧ姸鎬� + } }, }, }; @@ -479,7 +487,7 @@ .is-active { // background-color: #070f22; border-radius: 4px; - color: #333; + color: #333; font-size: 500; } } @@ -489,11 +497,11 @@ justify-content: space-between; align-items: center; padding: 0; - .funs-first{ - margin-left: 0!important; + .funs-first { + margin-left: 0 !important; } .funs-sp { - border: 1px solid #DCDFE6; + border: 1px solid #dcdfe6; } .funs { @@ -560,7 +568,7 @@ .operation { display: flex; - + color: var(--operation-color); .line { padding: 0 5px; } diff --git a/src/views/operate/log/index.vue b/src/views/operate/log/index.vue index 9d155ee..1d9109e 100644 --- a/src/views/operate/log/index.vue +++ b/src/views/operate/log/index.vue @@ -69,12 +69,12 @@ </div> <!-- 鏁版嵁灞曠ず --> <el-table - border - stripe + border + stripe ref="multipleTable" :header-cell-style="{ // background: '#06122c', - 'background':'#F5F5F5', + background: '#F5F5F5', 'font-size': '12px', color: '#606266', 'font-weight': '650', @@ -532,11 +532,11 @@ .funs { display: flex; - .funs-first{ - margin-left: 0!important; + .funs-first { + margin-left: 0 !important; } .funs-sp { - border: 1px solid #DCDFE6; + border: 1px solid #dcdfe6; } .funsItem { @@ -612,7 +612,7 @@ .line { padding: 0 5px; } - + color: var(--operation-color); span:hover { cursor: pointer; } diff --git a/src/views/operate/management/message/index.vue b/src/views/operate/management/message/index.vue index 7198a91..bf39969 100644 --- a/src/views/operate/management/message/index.vue +++ b/src/views/operate/management/message/index.vue @@ -15,7 +15,10 @@ </el-radio-group> </div> <div class="btns"> - <el-button type="primary" icon="el-icon-search" @click="getMessageAuditList" + <el-button + type="primary" + icon="el-icon-search" + @click="getMessageAuditList" >鏌ヨ</el-button > <el-button icon="el-icon-delete-solid" @click="handleReset" @@ -41,8 +44,8 @@ >瀹℃牳</el-link > </template> - <template #time="{timeobj}"> - <span>{{ changeUpdateTime(timeobj.row.updateTime)}}</span> + <template #time="{ timeobj }"> + <span>{{ changeUpdateTime(timeobj.row.updateTime) }}</span> </template> </MyTable> <div class="tools"> @@ -71,9 +74,9 @@ :before-close="handleClose" > <MyCheckSms - v-if="dialogCheckSms" - :messageData="messageData" - @closeDialog="closeDialog" + v-if="dialogCheckSms" + :messageData="messageData" + @closeDialog="closeDialog" ></MyCheckSms> </el-dialog> </div> @@ -156,18 +159,18 @@ }; }, created() { - this.getMessageAuditList() + this.getMessageAuditList(); }, methods: { // 閲嶇疆 handleReset() { - this.context = ''; + this.context = ""; this.status = 0; this.getMessageAuditList(); }, // 鑾峰彇娑堟伅鏁版嵁 getMessageAuditList() { - this.$axios({ + this.$axios({ method: "post", url: "sccg/message_audit/list", data: { @@ -177,12 +180,13 @@ current: this.currentPage, pageSize: this.pageSize, }, - }).then((res) => { - const { records, total } = res.data; - this.tableData = records; - this.totalNum = total; - }).catch(err => this.$message.error(err)) - + }) + .then((res) => { + const { records, total } = res.data; + this.tableData = records; + this.totalNum = total; + }) + .catch((err) => this.$message.error(err)); }, // 寮圭獥鍏抽棴 handleClose(done) { @@ -207,15 +211,14 @@ }, // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛淇℃伅 getLoginUserInfo() { - const name = sessionStorage.getItem('name'); - this.$axios({ - method: 'get', - url: 'sccg/admin/info?name=' + name, - }) - .then(res => { - this.auditId = res.data.userId - }) - }, + const name = sessionStorage.getItem("name"); + this.$axios({ + method: "get", + url: "sccg/admin/info?name=" + name, + }).then((res) => { + this.auditId = res.data.userId; + }); + }, // 鍏抽棴dialog closeDialog({ flag, index }) { this.dialogCheckSms = flag; @@ -358,7 +361,7 @@ .line { padding: 0 5px; } - + color: var(--operation-color); span:hover { cursor: pointer; } diff --git a/src/views/operate/management/myIndex/index.vue b/src/views/operate/management/myIndex/index.vue index 270dd4f..4141ff4 100644 --- a/src/views/operate/management/myIndex/index.vue +++ b/src/views/operate/management/myIndex/index.vue @@ -1,97 +1,186 @@ <template> - <div class="userList"> - <header> - <div class="problem"> - <div class="problem-title">闂绫诲瀷</div> - <el-radio-group v-model="myproblem" @change="changeMyProblem"> - <el-radio :label="1">杩濊</el-radio> - <el-radio :label="2">杩濆缓</el-radio> - </el-radio-group> - </div> - <div class="status"> - <div class="status-title">瀹℃牳鐘舵��</div> - <el-radio-group v-model="instatus" @change="changeInStatus"> - <el-radio :label="7">寰呭鏍�</el-radio> - <el-radio :label="8">宸插鏍�</el-radio> - <el-radio :label="9">宸茬粨妗�</el-radio> - </el-radio-group> - </div> - </header> - <main> - <div class="mainContent"> - <!-- 鏁版嵁灞曠ず --> - <el-table - border - stripe - ref="multipleTable" - :header-cell-style="{ 'background':'#F5F5F5','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="code" label="浜嬩欢缂栧彿" min-width="18"> - <template slot-scope="scope"> - <el-link @click="JumpView(scope.row)">{{scope.row.code}}</el-link> - </template> - </el-table-column> - <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="8"> - <template slot-scope="scope"> - <span>{{scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛宸℃煡'}}</span> - </template> - </el-table-column> - <el-table-column :prop="myproblem === 1 ? 'category' :'category'" :label="myproblem===1 ? '澶х被鍚嶇О' : '杩濆缓绫诲埆'" :min-width="myproblem===1?'10':'20'"> - </el-table-column> - <el-table-column :prop="myproblem === 1 ? 'type' :'site'" :label="myproblem===1 ? '灏忕被鍚嶇О' : '杩濆缓鍦扮偣'" min-width="10"> - </el-table-column> - <el-table-column :prop="myproblem === 1 ? 'actionCause' :'communityId'" :label="myproblem===1 ? '妗堢敱' : '鎵�灞炵ぞ鍖�'" min-width="10"> - </el-table-column> - <el-table-column :prop="myproblem === 1 ? 'site' :''" :label="myproblem===1 ? '鎶ヨ鐐逛綅' : '杩濇硶寤虹瓚闀裤�佸銆侀珮'" :min-width="myproblem===1?'10' :'20' "> - <template slot-scope="scope"> - <div v-if="myproblem ===2"><span>{{scope.row.buildingLength+'绫�'+'銆�'+ scope.row.buildingWidth+'绫�'+'銆�'+scope.row.buildingHigh+'绫�'}}</span></div> - <div v-else>{{scope.row.site}}</div> - </template> - </el-table-column> - <el-table-column :prop="myproblem === 1 ? 'street' :'buildingArea'" :label="myproblem===1 ? '鎵�灞炲尯鍩�' : '杩濇硶寤虹瓚闈㈢Н'" min-width="10"> - </el-table-column> - <el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="15" v-if="myproblem===1"> - <template slot-scope="scope"> - <span>{{filterTime(scope.row.alarmTime)}}</span> - </template> - </el-table-column> - <el-table-column :prop="myproblem === 1 ? 'continueTime' :'materials'" :label="myproblem===1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="15"> - </el-table-column> - <el-table-column prop="operation" label="鎿嶄綔" min-width="15"> - <template slot-scope="scope"> - <div class="btn"> - <!-- v-if="instatus===7 ? true : false" --> - <span @click="handleExamine(scope.row)" v-if="instatus===7">瀹℃牳</span> - <span @click="handleClosure(scope.row)" v-if="instatus===8">缁撴</span> - <span class="line" v-if="instatus !==9">|</span> - <span @click="JumpView(scope.row)">鏌ョ湅</span> - </div> - </template> - </el-table-column> - </el-table> - <!-- 瀹℃牳椤甸潰 --> - <el-dialog :visible.sync="dialogExamine" width="60%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogExamine" - :before-close="handleClose"> - <MyExamine :info="info" v-if="myproblem === 1" @closeDialog="closeDialog"></MyExamine> - <MyIllExamine :info="info" v-else @closeDialog="closeDialog"></MyIllExamine> - </el-dialog> - <!-- 缁撴椤甸潰 --> - <el-dialog :visible.sync="dialogClosure" width="60%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogClosure" - :before-close="handleClose"> - <MyClosure :info="info" v-if="myproblem === 1" @closeDialog="closeDialog"></MyClosure> - <MyIllClosure :info="info" v-else @closeDialog="closeDialog"></MyIllClosure> - </el-dialog> - <!-- 璇︽儏椤甸潰 --> - <el-dialog :visible.sync="dialogView" width="60%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView" - :before-close="handleNoClose"> - <MyDetail :info=info v-if="myproblem === 1" :mycode = 'code'></MyDetail> - <MyIllDetail :info=info v-else :mycode="code"></MyIllDetail> - </el-dialog> - <!-- tools --> - <!-- <div class="tools"> + <div class="userList"> + <header> + <div class="problem"> + <div class="problem-title">闂绫诲瀷</div> + <el-radio-group v-model="myproblem" @change="changeMyProblem"> + <el-radio :label="1">杩濊</el-radio> + <el-radio :label="2">杩濆缓</el-radio> + </el-radio-group> + </div> + <div class="status"> + <div class="status-title">瀹℃牳鐘舵��</div> + <el-radio-group v-model="instatus" @change="changeInStatus"> + <el-radio :label="7">寰呭鏍�</el-radio> + <el-radio :label="8">宸插鏍�</el-radio> + <el-radio :label="9">宸茬粨妗�</el-radio> + </el-radio-group> + </div> + </header> + <main> + <div class="mainContent"> + <!-- 鏁版嵁灞曠ず --> + <el-table + border + stripe + ref="multipleTable" + :header-cell-style="{ + background: '#F5F5F5', + '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="code" label="浜嬩欢缂栧彿" min-width="18"> + <template slot-scope="scope"> + <el-link @click="JumpView(scope.row)">{{ + scope.row.code + }}</el-link> + </template> + </el-table-column> + <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="8"> + <template slot-scope="scope"> + <span>{{ + scope.row.eventSource === 2 ? "浜哄伐涓婃姤" : "瑙嗛宸℃煡" + }}</span> + </template> + </el-table-column> + <el-table-column + :prop="myproblem === 1 ? 'category' : 'category'" + :label="myproblem === 1 ? '澶х被鍚嶇О' : '杩濆缓绫诲埆'" + :min-width="myproblem === 1 ? '10' : '20'" + > + </el-table-column> + <el-table-column + :prop="myproblem === 1 ? 'type' : 'site'" + :label="myproblem === 1 ? '灏忕被鍚嶇О' : '杩濆缓鍦扮偣'" + min-width="10" + > + </el-table-column> + <el-table-column + :prop="myproblem === 1 ? 'actionCause' : 'communityId'" + :label="myproblem === 1 ? '妗堢敱' : '鎵�灞炵ぞ鍖�'" + min-width="10" + > + </el-table-column> + <el-table-column + :prop="myproblem === 1 ? 'site' : ''" + :label="myproblem === 1 ? '鎶ヨ鐐逛綅' : '杩濇硶寤虹瓚闀裤�佸銆侀珮'" + :min-width="myproblem === 1 ? '10' : '20'" + > + <template slot-scope="scope"> + <div v-if="myproblem === 2"> + <span>{{ + scope.row.buildingLength + + "绫�" + + "銆�" + + scope.row.buildingWidth + + "绫�" + + "銆�" + + scope.row.buildingHigh + + "绫�" + }}</span> + </div> + <div v-else>{{ scope.row.site }}</div> + </template> + </el-table-column> + <el-table-column + :prop="myproblem === 1 ? 'street' : 'buildingArea'" + :label="myproblem === 1 ? '鎵�灞炲尯鍩�' : '杩濇硶寤虹瓚闈㈢Н'" + min-width="10" + > + </el-table-column> + <el-table-column + prop="alarmTime" + label="鎶ヨ鏃堕棿" + min-width="15" + v-if="myproblem === 1" + > + <template slot-scope="scope"> + <span>{{ filterTime(scope.row.alarmTime) }}</span> + </template> + </el-table-column> + <el-table-column + :prop="myproblem === 1 ? 'continueTime' : 'materials'" + :label="myproblem === 1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" + min-width="15" + > + </el-table-column> + <el-table-column prop="operation" label="鎿嶄綔" min-width="15"> + <template slot-scope="scope"> + <div class="btn"> + <!-- v-if="instatus===7 ? true : false" --> + <span @click="handleExamine(scope.row)" v-if="instatus === 7" + >瀹℃牳</span + > + <span @click="handleClosure(scope.row)" v-if="instatus === 8" + >缁撴</span + > + <span class="line" v-if="instatus !== 9">|</span> + <span @click="JumpView(scope.row)">鏌ョ湅</span> + </div> + </template> + </el-table-column> + </el-table> + <!-- 瀹℃牳椤甸潰 --> + <el-dialog + :visible.sync="dialogExamine" + width="60%" + title="鍩虹淇℃伅(浜哄伐)" + v-if="dialogExamine" + :before-close="handleClose" + > + <MyExamine + :info="info" + v-if="myproblem === 1" + @closeDialog="closeDialog" + ></MyExamine> + <MyIllExamine + :info="info" + v-else + @closeDialog="closeDialog" + ></MyIllExamine> + </el-dialog> + <!-- 缁撴椤甸潰 --> + <el-dialog + :visible.sync="dialogClosure" + width="60%" + title="鍩虹淇℃伅(浜哄伐)" + v-if="dialogClosure" + :before-close="handleClose" + > + <MyClosure + :info="info" + v-if="myproblem === 1" + @closeDialog="closeDialog" + ></MyClosure> + <MyIllClosure + :info="info" + v-else + @closeDialog="closeDialog" + ></MyIllClosure> + </el-dialog> + <!-- 璇︽儏椤甸潰 --> + <el-dialog + :visible.sync="dialogView" + width="60%" + title="鍩虹淇℃伅(浜哄伐)" + v-if="dialogView" + :before-close="handleNoClose" + > + <MyDetail + :info="info" + v-if="myproblem === 1" + :mycode="code" + ></MyDetail> + <MyIllDetail :info="info" v-else :mycode="code"></MyIllDetail> + </el-dialog> + <!-- tools --> + <!-- <div class="tools"> <div class="funs"> <div class="funsItem funs-sp"> <el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox> @@ -114,459 +203,458 @@ </el-pagination> </div> </div> --> - </div> - </main> - </div> + </div> + </main> + </div> </template> <script> -import MyExamine from './components/examine' -import MyClosure from './components/closure' -import MyIllExamine from './components/illExamine' -import MyIllClosure from './components/illclosure' -import MyDetail from '@/components/detail' -import MyIllDetail from '@/components/illdetail' -import helper from '@/utils/mydate' +import MyExamine from "./components/examine"; +import MyClosure from "./components/closure"; +import MyIllExamine from "./components/illExamine"; +import MyIllClosure from "./components/illclosure"; +import MyDetail from "@/components/detail"; +import MyIllDetail from "@/components/illdetail"; +import helper from "@/utils/mydate"; export default { - components: { - MyExamine,MyClosure,MyDetail,MyIllDetail,MyIllExamine,MyIllClosure - }, - data() { - return { - tableData: [], - dialogExamine:false, - dialogClosure:false, - dialogView:false, - info: {}, - totalNum: null, - pageSize: 10, - currentPage: 1, - all: false, - unsame: false, - myIdx: 0, - preMyIdx: 0, - options: [ - { - value: 0, - label: '鎵归噺鎿嶄綔', - disabled: true, - }, - { - value: 1, - label: '鎵归噺鍚敤', - }, - { - value: 2, - label: '鎵归噺绂佺敤', - }, - { - value: 3, - label: '鎵归噺鍒犻櫎', - } - ], - tempList: [], - typeList: [ - { - name: '杩濊', - value: 1, - checked: true - }, - { - name: '杩濆缓', - value: 2, - checked: false, - }, - ], - caseId: '', - myproblem: 1, - instatus: 7, - code:'' - } - }, - created() { + components: { + MyExamine, + MyClosure, + MyDetail, + MyIllDetail, + MyIllExamine, + MyIllClosure, + }, + data() { + return { + tableData: [], + dialogExamine: false, + dialogClosure: false, + dialogView: false, + info: {}, + totalNum: null, + pageSize: 10, + currentPage: 1, + all: false, + unsame: false, + myIdx: 0, + preMyIdx: 0, + options: [ + { + value: 0, + label: "鎵归噺鎿嶄綔", + disabled: true, + }, + { + value: 1, + label: "鎵归噺鍚敤", + }, + { + value: 2, + label: "鎵归噺绂佺敤", + }, + { + value: 3, + label: "鎵归噺鍒犻櫎", + }, + ], + tempList: [], + typeList: [ + { + name: "杩濊", + value: 1, + checked: true, + }, + { + name: "杩濆缓", + value: 2, + checked: false, + }, + ], + caseId: "", + myproblem: 1, + instatus: 7, + code: "", + }; + }, + created() { + this.getUserList(); + }, + methods: { + // 鎵归噺鍒犻櫎 + mulDelete(idArr) { + this.$axios({ + method: "delete", + url: "sccg/violations/batch_delete?ids=" + idArr, + }).then((res) => { this.getUserList(); + this.$message({ + message: res.message, + type: res.code === 200 ? "success" : "warning", + }); + }); }, - methods: { - // 鎵归噺鍒犻櫎 - mulDelete(idArr) { - this.$axios({ - method: 'delete', - url: 'sccg/violations/batch_delete?ids=' + idArr, - }).then(res => { - this.getUserList(); - this.$message({ - message: res.message, - type: res.code === 200 ? 'success' : 'warning' - }) - }) - }, - // 鎵ц涓嬫媺妗嗘搷浣� - selectChange(list) { - if (this.tempList.length !== 0) { - if (list === 3) { - this.preMyIdx = list; - this.mulDelete(this.tempList); - } - } else { - this.myIdx = this.preMyIdx; - this.$message({ - type: 'warning', - message: '鎮ㄨ繕娌¢�変腑浠讳綍鏁版嵁', - }) - } - }, - // 鐩戝惉琛ㄦ牸 - tableChange(list) { - this.tempList = []; - list.forEach(item => { - this.tempList.push(item.code); - }) - this.all = list.length === this.tableData.length; - }, - // 鍏ㄩ�� - selectAll() { - this.$refs.multipleTable.toggleAllSelection(); - }, - // 鍙嶉�� - disSame(list) { - list.forEach(row => { - this.$refs.multipleTable.toggleRowSelection(row) - }) - }, - // 鍒犻櫎鍗曟潯鏁版嵁 - handleDelete({ number }) { - this.$confirm('纭鍒犻櫎锛�') - .then(_ => { - this.$axios({ - method: 'delete', - url: `sccg/violations/delete?id=${number}`, - }) - .then(res => { - this.$message({ - type: res.code === 200 ? 'success' : 'warning', - message: res.message - }) - - this.getUserList(); - }) - }) - .catch(_ => { }); - }, - // 鑾峰彇鐢ㄦ埛鍒楄〃 - getUserList() { - const { currentPage, pageSize, instatus, myproblem } = this; - this.$axios({ - method: 'get', - url: `sccg/base_case/query?state=${instatus}¤t=${currentPage}&size=${pageSize}&type=${myproblem}` - }).then(res => { - this.totalNum = res.data.total; - this.tableData = res.data.records; - }) - }, - // 璁剧疆琛ㄦ牸鏂戦┈绾� - tableRowClassName({ row, rowIndex }) { - if ((rowIndex + 1) % 2 === 0) { - return 'warning-row'; - } else { - return 'success-row'; - } - }, - // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠� - changeCurrentPage(page) { - this.currentPage = page; - this.getUserList(); - }, - // 涓婁竴椤电偣鍑讳簨浠� - handlePrev(page) { - this.currentPage = page; - this.getUserList(); - }, - // 涓嬩竴椤电偣鍑讳簨浠� - handleNext(page) { - this.currentPage = page; - this.getUserList(); - }, - handleClose(done) { - this.$confirm('纭鍏抽棴锛�') - .then(_ => { - this.dialogExamine = false; - done(); - }) - .catch(_ => { }); - }, - handleNoClose(done) { - done(); - }, - async JumpView(data) { - this.code = data.code - await this.getEventInfo(data.code); - }, - // 鑾峰彇妗堜欢淇℃伅 - getEventInfo(code) { - this.$axios({ - method: 'get', - url: `sccg/base_case/baseCaseDetail/${code}` - }) - .then(res => { - this.info = res.data; - this.dialogView = true; - }) - }, - // 鑾峰彇妗堜欢淇℃伅 - getEventInfo3(code) { - this.$axios({ - method: 'get', - url: `sccg/base_case/baseCaseDetail/${code}` - }) - .then(res => { - this.info = res.data; - this.dialogExamine = true; - }) - }, - // 鑾峰彇妗堜欢淇℃伅 - getEventInfo2(code) { - this.$axios({ - method: 'get', - url: `sccg/base_case/baseCaseDetail/${code}` - }) - .then(res => { - this.info = res.data; - this.dialogClosure = true; - }) - }, - // 鍘诲鏍� - handleExamine({code}) { - this.getEventInfo3(code); - }, - // 鍘荤粨妗� - handleClosure({code}){ - this.getEventInfo2(code); - }, - // 鍏抽棴dialog - closeDialog({flag}){ - this.dialogExamine = flag; - this.dialogClosure = flag; - this.getUserList(); - }, - // 闂绫诲瀷 - changeMyProblem(val){ - this.getUserList(); - }, - // 瀹℃牳鐘舵�� - changeInStatus(val){ - this.getUserList(); - }, - filterTime(time){ - return helper(time); + // 鎵ц涓嬫媺妗嗘搷浣� + selectChange(list) { + if (this.tempList.length !== 0) { + if (list === 3) { + this.preMyIdx = list; + this.mulDelete(this.tempList); } - } -} + } else { + this.myIdx = this.preMyIdx; + this.$message({ + type: "warning", + message: "鎮ㄨ繕娌¢�変腑浠讳綍鏁版嵁", + }); + } + }, + // 鐩戝惉琛ㄦ牸 + tableChange(list) { + this.tempList = []; + list.forEach((item) => { + this.tempList.push(item.code); + }); + this.all = list.length === this.tableData.length; + }, + // 鍏ㄩ�� + selectAll() { + this.$refs.multipleTable.toggleAllSelection(); + }, + // 鍙嶉�� + disSame(list) { + list.forEach((row) => { + this.$refs.multipleTable.toggleRowSelection(row); + }); + }, + // 鍒犻櫎鍗曟潯鏁版嵁 + handleDelete({ number }) { + this.$confirm("纭鍒犻櫎锛�") + .then((_) => { + this.$axios({ + method: "delete", + url: `sccg/violations/delete?id=${number}`, + }).then((res) => { + this.$message({ + type: res.code === 200 ? "success" : "warning", + message: res.message, + }); + + this.getUserList(); + }); + }) + .catch((_) => {}); + }, + // 鑾峰彇鐢ㄦ埛鍒楄〃 + getUserList() { + const { currentPage, pageSize, instatus, myproblem } = this; + this.$axios({ + method: "get", + url: `sccg/base_case/query?state=${instatus}¤t=${currentPage}&size=${pageSize}&type=${myproblem}`, + }).then((res) => { + this.totalNum = res.data.total; + this.tableData = res.data.records; + }); + }, + // 璁剧疆琛ㄦ牸鏂戦┈绾� + tableRowClassName({ row, rowIndex }) { + if ((rowIndex + 1) % 2 === 0) { + return "warning-row"; + } else { + return "success-row"; + } + }, + // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠� + changeCurrentPage(page) { + this.currentPage = page; + this.getUserList(); + }, + // 涓婁竴椤电偣鍑讳簨浠� + handlePrev(page) { + this.currentPage = page; + this.getUserList(); + }, + // 涓嬩竴椤电偣鍑讳簨浠� + handleNext(page) { + this.currentPage = page; + this.getUserList(); + }, + handleClose(done) { + this.$confirm("纭鍏抽棴锛�") + .then((_) => { + this.dialogExamine = false; + done(); + }) + .catch((_) => {}); + }, + handleNoClose(done) { + done(); + }, + async JumpView(data) { + this.code = data.code; + await this.getEventInfo(data.code); + }, + // 鑾峰彇妗堜欢淇℃伅 + getEventInfo(code) { + this.$axios({ + method: "get", + url: `sccg/base_case/baseCaseDetail/${code}`, + }).then((res) => { + this.info = res.data; + this.dialogView = true; + }); + }, + // 鑾峰彇妗堜欢淇℃伅 + getEventInfo3(code) { + this.$axios({ + method: "get", + url: `sccg/base_case/baseCaseDetail/${code}`, + }).then((res) => { + this.info = res.data; + this.dialogExamine = true; + }); + }, + // 鑾峰彇妗堜欢淇℃伅 + getEventInfo2(code) { + this.$axios({ + method: "get", + url: `sccg/base_case/baseCaseDetail/${code}`, + }).then((res) => { + this.info = res.data; + this.dialogClosure = true; + }); + }, + // 鍘诲鏍� + handleExamine({ code }) { + this.getEventInfo3(code); + }, + // 鍘荤粨妗� + handleClosure({ code }) { + this.getEventInfo2(code); + }, + // 鍏抽棴dialog + closeDialog({ flag }) { + this.dialogExamine = flag; + this.dialogClosure = flag; + this.getUserList(); + }, + // 闂绫诲瀷 + changeMyProblem(val) { + this.getUserList(); + }, + // 瀹℃牳鐘舵�� + changeInStatus(val) { + this.getUserList(); + }, + filterTime(time) { + return helper(time); + }, + }, +}; </script> <style lang="scss" scoped> .userList { - text-align: left; - padding: 10px 20px; - color: #4b9bb7; + text-align: left; + padding: 10px 20px; + color: #4b9bb7; border: 1px solid #ccc; - header { - // background-color: #09152f; - //padding: 10px 20px; + header { + // background-color: #09152f; + //padding: 10px 20px; - .problem, - .status { - display: flex; - align-items: center; - line-height: 40px; - } - - .problem-title, - .status-title { - margin-right: 20px; - } + .problem, + .status { + display: flex; + align-items: center; + line-height: 40px; } - &::v-deep .el-input__inner { - // background-color: #09152f; - border: 1px solid #17324c; + .problem-title, + .status-title { + margin-right: 20px; } + } - main { - // background-color: #09152f; - margin-top: 20px; - padding-bottom: 50px; - .btn span:hover{ - cursor: pointer; + &::v-deep .el-input__inner { + // background-color: #09152f; + border: 1px solid #17324c; + } + + main { + // background-color: #09152f; + margin-top: 20px; + padding-bottom: 50px; + .btn span:hover { + cursor: pointer; + } + .tools { + display: flex; + justify-content: space-between; + align-items: center; + //padding: 0 20px; + + .funs { + display: flex; + .funs-first { + margin-left: 0 !important; } - .tools { - display: flex; - justify-content: space-between; - align-items: center; - //padding: 0 20px; - - .funs { - display: flex; - .funs-first{ - margin-left: 0!important; - } - .funs-sp{ - border: 1px solid #DCDFE6; - } - .funsItem { - line-height: 28px; - display: flex; - align-items: center; - border-radius: 4px; - font-size: 12px; - margin-left: 10px; - - .el-checkbox { - width: 80px; - padding: 0 10px; - } - - .el-select { - width: 120px; - } - - &::v-deep .el-input__inner { - border: none; - // background-color: #09152f; - } - - &:hover { - border: 1px solid #4b9bb7; - } - - &:hover .el-checkbox { - color: #4b9bb7; - } - } - - } - - .pagination { - margin-top: 50px; - display: flex; - line-height: 50px; - justify-content: center; - - .el-pagination { - - &::v-deep li, - &::v-deep .btn-prev, - &::v-deep .btn-next { - background-color: #071f39; - color: #4b9bb7; - } - - &::v-deep .active { - background-color: #409eff; - color: #fff; - } - } - } + .funs-sp { + border: 1px solid #dcdfe6; } + .funsItem { + line-height: 28px; + display: flex; + align-items: center; + border-radius: 4px; + font-size: 12px; + margin-left: 10px; - .el-table { - // color: #4b9bb7; - // font-size: 10px; + .el-checkbox { + width: 80px; + padding: 0 10px; + } - &::v-deep .cell { - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - .el-checkbox { - display: none; - } - } + .el-select { + width: 120px; + } - // &::v-deep .el-table__empty-block { - // background-color: #09152f; - // } + &::v-deep .el-input__inner { + border: none; + // background-color: #09152f; + } - &::v-deep .el-table__empty-block { - color: #4b9bb7; - } + &:hover { + border: 1px solid #4b9bb7; + } - .operation { - display: flex; - - .line { - padding: 0 5px; - } - - span:hover { - cursor: pointer; - } - } + &:hover .el-checkbox { + color: #4b9bb7; + } } + } - // .el-table::v-deep .warning-row { - // background: #06122c; - // } + .pagination { + margin-top: 50px; + display: flex; + line-height: 50px; + justify-content: center; - .el-table::v-deep .success-row { - background: #071f39; - } + .el-pagination { + &::v-deep li, + &::v-deep .btn-prev, + &::v-deep .btn-next { + background-color: #071f39; + color: #4b9bb7; + } - &::v-deep .switchStyle .el-switch__label { - position: absolute; - display: none; + &::v-deep .active { + background-color: #409eff; 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; - } + } } - .line { - padding: 0 5px; + .el-table { + // color: #4b9bb7; + // font-size: 10px; + + &::v-deep .cell { + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + .el-checkbox { + display: none; + } + } + + // &::v-deep .el-table__empty-block { + // background-color: #09152f; + // } + + &::v-deep .el-table__empty-block { + color: #4b9bb7; + } + + .operation { + display: flex; + + .line { + padding: 0 5px; + } + color: var(--operation-color); + span:hover { + cursor: pointer; + } + } } - &::v-deep .el-dialog__header, + // .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; + } + } + + .line { + padding: 0 5px; + } + + &::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; - } + display: flex; + align-items: center; + background-color: #fff; + padding: 20px; + line-height: 60px; + } - &::v-deep .el-dialog__title { - color: #4b9bb7; - } + &::v-deep .el-dialog__title { + color: #4b9bb7; + } - &::v-deep .el-dialog__close { - width: 20px; - height: 20px; - // color: #fff; - } + &::v-deep .el-dialog__close { + width: 20px; + height: 20px; + // color: #fff; + } - &::v-deep .el-dialog__body { - padding: 0; - } + &::v-deep .el-dialog__body { + padding: 0; + } } </style> diff --git a/src/views/operate/message/myIndex/index.vue b/src/views/operate/message/myIndex/index.vue index ae9d732..dc091b5 100644 --- a/src/views/operate/message/myIndex/index.vue +++ b/src/views/operate/message/myIndex/index.vue @@ -531,7 +531,7 @@ .line { padding: 0 5px; } - + color: var(--operation-color); span:hover { cursor: pointer; } diff --git a/src/views/operate/message/mycontrol/index.vue b/src/views/operate/message/mycontrol/index.vue index 85b8475..575262e 100644 --- a/src/views/operate/message/mycontrol/index.vue +++ b/src/views/operate/message/mycontrol/index.vue @@ -1,470 +1,507 @@ <template> - <div class="userList"> - <main> - <div class="mainContent"> - <div class="main-nav"> - <span>鏁版嵁鍒楄〃</span> - <el-button class="button-addition" type="primary" icon="el-icon-plus" @click="dialogCreate = true">娣诲姞</el-button> - </div> - <!-- 鏁版嵁灞曠ず --> - <el-table - border - stripe - ref="multipleTable" - :header-cell-style="{ 'background':'#F5F5F5','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="columnName" label="鏍忕洰鍚嶇О" min-width="10"> - </el-table-column> - <el-table-column prop="updateTime" label="淇敼鏃堕棿" min-width="10"> - <template slot-scope="scope"> - <span>{{changeTime(scope.row)}}</span> - </template> - </el-table-column> - <el-table-column prop="noticeAmount" label="鍏憡鏁伴噺" min-width="10"> - </el-table-column> - <el-table-column prop="isShow" label="鏄剧ず" min-width="5"> - <template slot-scope="scope"> - <el-switch class="switchStyle" v-model="scope.row.isShow" active-text="寮�" inactive-text="鍏�" - active-color="#3fef9a" inactive-color="#000212" @change="handleChangeStatus(scope.row)"> - </el-switch> - </template> - </el-table-column> - <el-table-column prop="operation" label="鎿嶄綔" min-width="15"> - <template slot-scope="scope"> - <div class="operation"> - <el-link icon="el-icon-edit" :underline="false" @click="handleEdit(scope.row)">缂栬緫</el-link> - <el-link class="leftPx" icon="el-icon-delete-solid" :underline="false" - @click="handleDelete([scope.row.id])">鍒犻櫎</el-link> - </div> - </template> - </el-table-column> - </el-table> - <!-- 鍒涘缓椤甸潰 --> - <el-dialog title="娣诲姞鏍忕洰" :visible.sync="dialogCreate" v-if="dialogCreate" width="45%" - :before-close="handleClose"> - <MyCreate @closeDialog="closeDialog"></MyCreate> - </el-dialog> - <!-- 缂栬緫椤甸潰 --> - <el-dialog title="淇敼鏍忕洰" :visible.sync="dialogEdit" v-if="dialogEdit" width="45%" - :before-close="handleClose"> - <MyEdit @closeDialog="closeDialog" :info="info"></MyEdit> - </el-dialog> - </div> - </main> - </div> + <div class="userList"> + <main> + <div class="mainContent"> + <div class="main-nav"> + <span>鏁版嵁鍒楄〃</span> + <el-button + class="button-addition" + type="primary" + icon="el-icon-plus" + @click="dialogCreate = true" + >娣诲姞</el-button + > + </div> + <!-- 鏁版嵁灞曠ず --> + <el-table + border + stripe + ref="multipleTable" + :header-cell-style="{ + background: '#F5F5F5', + '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="columnName" label="鏍忕洰鍚嶇О" min-width="10"> + </el-table-column> + <el-table-column prop="updateTime" label="淇敼鏃堕棿" min-width="10"> + <template slot-scope="scope"> + <span>{{ changeTime(scope.row) }}</span> + </template> + </el-table-column> + <el-table-column prop="noticeAmount" label="鍏憡鏁伴噺" min-width="10"> + </el-table-column> + <el-table-column prop="isShow" label="鏄剧ず" min-width="5"> + <template slot-scope="scope"> + <el-switch + class="switchStyle" + v-model="scope.row.isShow" + active-text="寮�" + inactive-text="鍏�" + active-color="#3fef9a" + inactive-color="#000212" + @change="handleChangeStatus(scope.row)" + > + </el-switch> + </template> + </el-table-column> + <el-table-column prop="operation" label="鎿嶄綔" min-width="15"> + <template slot-scope="scope"> + <div class="operation"> + <el-link + icon="el-icon-edit" + :underline="false" + @click="handleEdit(scope.row)" + >缂栬緫</el-link + > + <el-link + class="leftPx" + icon="el-icon-delete-solid" + :underline="false" + @click="handleDelete([scope.row.id])" + >鍒犻櫎</el-link + > + </div> + </template> + </el-table-column> + </el-table> + <!-- 鍒涘缓椤甸潰 --> + <el-dialog + title="娣诲姞鏍忕洰" + :visible.sync="dialogCreate" + v-if="dialogCreate" + width="45%" + :before-close="handleClose" + > + <MyCreate @closeDialog="closeDialog"></MyCreate> + </el-dialog> + <!-- 缂栬緫椤甸潰 --> + <el-dialog + title="淇敼鏍忕洰" + :visible.sync="dialogEdit" + v-if="dialogEdit" + width="45%" + :before-close="handleClose" + > + <MyEdit @closeDialog="closeDialog" :info="info"></MyEdit> + </el-dialog> + </div> + </main> + </div> </template> <script> // 寮曞叆鍒涘缓鏍忕洰缁勪欢 -import MyCreate from './createUser' +import MyCreate from "./createUser"; // 寮曞叆缂栬緫缁勪欢 -import MyEdit from './update' +import MyEdit from "./update"; // 寮曞叆鏃ユ湡js -import helper from '@/utils/mydate' +import helper from "@/utils/mydate"; export default { - components: { - MyCreate,MyEdit + components: { + MyCreate, + MyEdit, + }, + data() { + return { + tableData: [], + dialogCreate: false, + dialogEdit: false, + pageSize: 10, + currentPage: 1, + all: false, + unsame: false, + myIdx: 0, + preMyIdx: 0, + info: "", + options: [ + { + value: 0, + label: "鎵归噺鎿嶄綔", + disabled: true, + }, + { + value: 1, + label: "鎵归噺鍚敤", + }, + { + value: 2, + label: "鎵归噺绂佺敤", + }, + { + value: 3, + label: "鎵归噺鍒犻櫎", + }, + ], + tempList: [], + }; + }, + created() { + this.setTableData(); + }, + methods: { + // 缂栬緫 + handleEdit(data) { + this.info = data; + this.dialogEdit = true; }, - data() { - return { - tableData: [], - dialogCreate: false, - dialogEdit:false, - pageSize: 10, - currentPage: 1, - all: false, - unsame: false, - myIdx: 0, - preMyIdx: 0, - info:'', - options: [ - { - value: 0, - label: '鎵归噺鎿嶄綔', - disabled: true, - }, - { - value: 1, - label: '鎵归噺鍚敤', - }, - { - value: 2, - label: '鎵归噺绂佺敤', - }, - { - value: 3, - label: '鎵归噺鍒犻櫎', - } - ], - tempList: [] + // 鍒犻櫎鏁版嵁 + handleDelete(idArr) { + this.$confirm("鏄惁纭畾纭畾鍒犻櫎鏍忕洰?") + .then((_) => { + this.$axios({ + method: "post", + url: "sccg/message_column/delete" + "?ids=" + idArr, + }).then((res) => { + if (res.code === 200) { + this.$message({ + type: "success", + message: "鍒犻櫎鎴愬姛", + }); + this.setTableData(); + } + }); + }) + .catch((err) => {}); + }, + // 淇敼鏍忕洰鐘舵�� + handleChangeStatus({ id, isShow }) { + this.$axios({ + method: "post", + url: `sccg/message_column/update/${id}`, + data: { + isShow: Number(isShow), + }, + }).then((res) => { + if (res.code === 200) { + this.setTableData(); } + }); }, - created() { + // 鑾峰彇鍏ㄩ儴鏍忕洰 + async getColumnList() { + let arr = []; + await this.$axios({ + method: "get", + url: "sccg/message_column/getAllColumn", + }).then((res) => { + res.data.forEach((item) => { + item.isShow === 1 ? (item.isShow = true) : (item.isShow = false); + }); + arr = res.data; + }); + return arr; + }, + // 璁剧疆琛ㄦ牸鏁版嵁 + async setTableData() { + this.tableData = await this.getColumnList(); + }, + // 涓嬫媺妗嗙洃鍚� + async selectChange(list) { + if (this.tempList.length !== 0) { + this.preMyIdx = list; + if (list === 3) { + await this.handleDelete(this.tempList); + } else if (list === 2) { + await this.mulUpdateStatus(this.tempList, 0); + } else { + await this.mulUpdateStatus(this.tempList, 1); + } + this.myIdx = 0; + } else { + this.myIdx = this.preMyIdx; + this.$message({ + type: "warning", + message: "鎮ㄨ繕娌¢�変腑浠讳綍鏁版嵁", + }); + } + }, + // 鎵归噺鎿嶄綔 + mulUpdateStatus(idArr, flag) { + this.$confirm( + flag === 1 + ? "鎮ㄧ‘瀹氳杩涜鎵归噺鍚敤瑙掕壊鍚�?" + : "鎮ㄧ‘瀹氳杩涜鎵归噺绂佺敤瑙掕壊鍚�?" + ) + .then((_) => { + this.$axios({ + method: "post", + url: "sccg/role/updateStatusBatch?ids=" + idArr + "&status=" + flag, + }).then((res) => { + if (res.code === 200) { + this.$message({ + type: "success", + message: "鏇存敼鐢ㄦ埛鐘舵�佹垚鍔�", + }); + this.getUserList(); + } else { + this.$message({ + type: "error", + message: res.message, + }); + } + }); + }) + .catch((err) => {}); + }, + // 琛ㄦ牸鐘舵�佺洃鍚� + tableChange(list) { + this.tempList = []; + list.forEach((item) => { + this.tempList.push(item.id); + }); + if (list.length === this.tableData.length) { + this.all = true; + } else { + this.all = false; + } + }, + // 鏀瑰彉鏃ユ湡鏍煎紡 + changeTime({ updateTime }) { + return helper(updateTime); + }, + // 鍏ㄩ�� + selectAll() { + this.$refs.multipleTable.toggleAllSelection(); + }, + // 鍙嶉�� + disSame(list) { + list.forEach((row) => { + this.$refs.multipleTable.toggleRowSelection(row); + }); + }, + // 璁剧疆琛ㄦ牸鏂戦┈绾� + tableRowClassName({ row, rowIndex }) { + if ((rowIndex + 1) % 2 == 0) { + return "warning-row"; + } else { + return "success-row"; + } + return ""; + }, + // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠� + changeCurrentPage(page) { + this.currentPage = page; + this.search(); + }, + // 涓婁竴椤电偣鍑讳簨浠� + handlePrev(page) { + this.currentPage = page; + this.search(); + }, + // 涓嬩竴椤电偣鍑讳簨浠� + handleNext(page) { + this.currentPage = page; + this.search(); + }, + // 鍏抽棴寮圭獥 + handleClose(done) { + this.$confirm("纭畾鍏抽棴?") + .then((_) => { + done(); + }) + .catch((err) => {}); + }, + // 鑷畾涔夊叧闂脊绐� + closeDialog({ flag, index }) { + this.dialogCreate = flag; + this.dialogEdit = flag; + if (index === 1) { this.setTableData(); + } }, - methods: { - // 缂栬緫 - handleEdit(data){ - this.info = data; - this.dialogEdit = true; - }, - // 鍒犻櫎鏁版嵁 - handleDelete(idArr) { - this.$confirm('鏄惁纭畾纭畾鍒犻櫎鏍忕洰?') - .then(_ => { - this.$axios({ - method: 'post', - url: 'sccg/message_column/delete' + '?ids=' + idArr, - }) - .then(res => { - if (res.code === 200) { - this.$message({ - type: 'success', - message: '鍒犻櫎鎴愬姛', - }); - this.setTableData(); - } - }) - }) - .catch(err=>{ - }) - }, - // 淇敼鏍忕洰鐘舵�� - handleChangeStatus({ id, isShow }) { - this.$axios({ - method: 'post', - url: `sccg/message_column/update/${id}`, - data: { - isShow: Number(isShow), - } - }) - .then(res => { - if (res.code === 200) { - this.setTableData(); - } - }) - }, - // 鑾峰彇鍏ㄩ儴鏍忕洰 - async getColumnList() { - let arr = []; - await this.$axios({ - method: 'get', - url: 'sccg/message_column/getAllColumn', - }) - .then(res => { - res.data.forEach(item => { - item.isShow === 1 ? item.isShow = true : item.isShow = false; - }) - arr = res.data - }) - return arr; - }, - // 璁剧疆琛ㄦ牸鏁版嵁 - async setTableData() { - this.tableData = await this.getColumnList(); - }, - // 涓嬫媺妗嗙洃鍚� - async selectChange(list) { - if (this.tempList.length !== 0) { - this.preMyIdx = list; - if (list === 3) { - await this.handleDelete(this.tempList); - } else if (list === 2) { - await this.mulUpdateStatus(this.tempList, 0); - } else { - await this.mulUpdateStatus(this.tempList, 1); - } - this.myIdx = 0; - } else { - this.myIdx = this.preMyIdx; - this.$message({ - type: 'warning', - message: '鎮ㄨ繕娌¢�変腑浠讳綍鏁版嵁', - }) - } - }, - // 鎵归噺鎿嶄綔 - mulUpdateStatus(idArr, flag) { - this.$confirm(flag === 1 ? "鎮ㄧ‘瀹氳杩涜鎵归噺鍚敤瑙掕壊鍚�?" : '鎮ㄧ‘瀹氳杩涜鎵归噺绂佺敤瑙掕壊鍚�?') - .then(_ => { - this.$axios({ - method: 'post', - url: 'sccg/role/updateStatusBatch?ids=' + idArr + '&status=' + flag, - }) - .then(res => { - if (res.code === 200) { - this.$message({ - type: 'success', - message: '鏇存敼鐢ㄦ埛鐘舵�佹垚鍔�', - }) - this.getUserList(); - } else { - this.$message({ - type: 'error', - message: res.message - }) - } - }) - }) - .catch(err => { }) - }, - // 琛ㄦ牸鐘舵�佺洃鍚� - tableChange(list) { - this.tempList = []; - list.forEach(item => { - this.tempList.push(item.id); - }) - if (list.length === this.tableData.length) { - this.all = true; - } else { - this.all = false - } - }, - // 鏀瑰彉鏃ユ湡鏍煎紡 - changeTime({ updateTime }) { - return helper(updateTime); - }, - // 鍏ㄩ�� - selectAll() { - this.$refs.multipleTable.toggleAllSelection(); - }, - // 鍙嶉�� - disSame(list) { - list.forEach(row => { - this.$refs.multipleTable.toggleRowSelection(row) - }) - }, - // 璁剧疆琛ㄦ牸鏂戦┈绾� - tableRowClassName({ row, rowIndex }) { - if ((rowIndex + 1) % 2 == 0) { - return 'warning-row'; - } else { - return 'success-row'; - } - return ''; - }, - // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠� - changeCurrentPage(page) { - this.currentPage = page; - this.search(); - }, - // 涓婁竴椤电偣鍑讳簨浠� - handlePrev(page) { - this.currentPage = page; - this.search(); - }, - // 涓嬩竴椤电偣鍑讳簨浠� - handleNext(page) { - this.currentPage = page; - this.search(); - }, - // 鍏抽棴寮圭獥 - handleClose(done) { - this.$confirm('纭畾鍏抽棴?') - .then(_ => { - done(); - }) - .catch(err => { - }) - }, - // 鑷畾涔夊叧闂脊绐� - closeDialog({ flag, index }) { - this.dialogCreate = flag; - this.dialogEdit = flag; - if (index === 1) { - this.setTableData(); - } - } - } -} + }, +}; </script> <style lang="scss" scoped> .userList { - text-align: left; - padding: 10px 20px; - color: #606266; + text-align: left; + padding: 10px 20px; + color: #606266; border: 1px solid #ccc; - main { - background-color: white; - margin-top: 20px; - padding-bottom: 50px; - border: 1px solid #fff; + main { + background-color: white; + margin-top: 20px; + padding-bottom: 50px; + border: 1px solid #fff; - .mainTitle { - line-height: 60px; - } - - .main-nav { - line-height: 40px; - display: flex; - padding: 10px; - justify-content: space-between; - } - - .tools { - display: flex; - justify-content: space-between; - align-items: center; - padding: 0 20px; - - .funs { - display: flex; - - .funsItem { - line-height: 28px; - display: flex; - align-items: center; - border: 1px solid #17324c; - border-radius: 4px; - font-size: 12px; - margin-left: 10px; - - .el-checkbox { - width: 80px; - padding: 0 10px; - } - - .el-select { - width: 120px; - } - - &::v-deep .el-input__inner { - border: none; - //background-color: #09152f; - } - - &:hover { - border: 1px solid #4b9bb7; - } - - &:hover .el-checkbox { - color: #4b9bb7; - } - } - - } - - .pagination { - margin-top: 50px; - display: flex; - line-height: 50px; - justify-content: center; - - //.el-pagination { - // - // &::v-deep li, - // &::v-deep .btn-prev, - // &::v-deep .btn-next { - // background-color: #071f39; - // color: #4b9bb7; - // } - // - // &::v-deep .active { - // background-color: #409eff; - // color: #fff; - // } - //} - } - } - - .el-table { - // color: #606266; - // font-size: 10px; - - &::v-deep .el-table__empty-block { - //background-color: #09152f; - } - - &::v-deep .el-table__empty-block { - color: #4b9bb7; - } - - .operation { - display: flex; - - .el-link { - color: #4b9bb7; - } - - .leftPx { - margin-left: 10px; - } - - .line { - padding: 0 5px; - } - - span:hover { - cursor: pointer; - } - } - } - - //.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; - } + .mainTitle { + line-height: 60px; } - //&::v-deep .el-dialog__header, - //&::v-deep .el-dialog__body { - // background-color: #06122c; + .main-nav { + line-height: 40px; + display: flex; + padding: 10px; + justify-content: space-between; + } + + .tools { + display: flex; + justify-content: space-between; + align-items: center; + padding: 0 20px; + + .funs { + display: flex; + + .funsItem { + line-height: 28px; + display: flex; + align-items: center; + border: 1px solid #17324c; + border-radius: 4px; + font-size: 12px; + margin-left: 10px; + + .el-checkbox { + width: 80px; + padding: 0 10px; + } + + .el-select { + width: 120px; + } + + &::v-deep .el-input__inner { + border: none; + //background-color: #09152f; + } + + &:hover { + border: 1px solid #4b9bb7; + } + + &:hover .el-checkbox { + color: #4b9bb7; + } + } + } + + .pagination { + margin-top: 50px; + display: flex; + line-height: 50px; + justify-content: center; + + //.el-pagination { + // + // &::v-deep li, + // &::v-deep .btn-prev, + // &::v-deep .btn-next { + // background-color: #071f39; + // color: #4b9bb7; + // } + // + // &::v-deep .active { + // background-color: #409eff; + // color: #fff; + // } + //} + } + } + + .el-table { + // color: #606266; + // font-size: 10px; + + &::v-deep .el-table__empty-block { + //background-color: #09152f; + } + + &::v-deep .el-table__empty-block { + color: #4b9bb7; + } + + .operation { + display: flex; + + .el-link { + color: #4b9bb7; + } + color: var(--operation-color); + .leftPx { + margin-left: 10px; + } + + .line { + padding: 0 5px; + } + + span:hover { + cursor: pointer; + } + } + } + + //.el-table::v-deep .warning-row { + // background: #06122c; + //} + // + //.el-table::v-deep .success-row { + // background: #071f39; //} - &::v-deep .el-dialog__header { - display: flex; - align-items: center; - background-color: #fff; - padding: 20px; - line-height: 60px; + &::v-deep .switchStyle .el-switch__label { + position: absolute; + display: none; + color: #fff; } - &::v-deep .el-dialog__title { - color: #606266; + &::v-deep .el-switch__core { + background-color: rgba(166, 166, 166, 1); } - &::v-deep .el-dialog__close { - width: 20px; - height: 20px; - // color: #fff; + &::v-deep .switchStyle .el-switch__label--left { + z-index: 9; + left: 20px; } - &::v-deep .el-dialog__body { - padding: 0; + &::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: #606266; + } + + &::v-deep .el-dialog__close { + width: 20px; + height: 20px; + // color: #fff; + } + + &::v-deep .el-dialog__body { + padding: 0; + } } </style> diff --git a/src/views/operate/myWait/index.vue b/src/views/operate/myWait/index.vue index 18d9ce1..b6bdec3 100644 --- a/src/views/operate/myWait/index.vue +++ b/src/views/operate/myWait/index.vue @@ -16,13 +16,19 @@ <div class="mainContent"> <!-- 鏁版嵁灞曠ず --> <el-table - border - stripe - ref="multipleTable" :header-cell-style="{ - 'background':'#F5F5F5', - 'font-weight': '650', - 'line-height': '45px', - }" :data="tableData" style="width: 100%" :row-class-name="tableRowClassName" @selection-change="tableChange"> + border + stripe + ref="multipleTable" + :header-cell-style="{ + background: '#F5F5F5', + '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="code" label="浜嬩欢缂栧彿" min-width="10"> </el-table-column> @@ -52,11 +58,25 @@ <el-table-column min-width="10"> </el-table-column> </el-table> <!-- 鏌ョ湅淇敼椤甸潰 --> - <el-dialog :visible.sync="dialogUpdate" width="60%" :title="title" :destroy-on-close="true" :key="updateFlag" - :before-close="handleClose"> - <component v-if="dialogUpdate" @closeDialog="changeDialog" @changeDialog="changeDialog" - v-bind:is="currentTabComponent" :caseId="caseId" :id="caseId" :mycode="caseCode" :info="info" - :vioData="vioData"></component> + <el-dialog + :visible.sync="dialogUpdate" + width="60%" + :title="title" + :destroy-on-close="true" + :key="updateFlag" + :before-close="handleClose" + > + <component + v-if="dialogUpdate" + @closeDialog="changeDialog" + @changeDialog="changeDialog" + v-bind:is="currentTabComponent" + :caseId="caseId" + :id="caseId" + :mycode="caseCode" + :info="info" + :vioData="vioData" + ></component> <!-- <updateUser v-if="dialogUpdate" :updateFlag="updateFlag" @@ -69,22 +89,41 @@ <div class="tools"> <div class="funs"> <div class="funsItem"> - <el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox> + <el-checkbox v-model="all" @change="selectAll()" + >鍏ㄩ��</el-checkbox + > </div> <div class="funsItem"> - <el-checkbox v-model="unsame" @change="disSame(tableData)">鍙嶉��</el-checkbox> + <el-checkbox v-model="unsame" @change="disSame(tableData)" + >鍙嶉��</el-checkbox + > </div> <div class="funsItem"> - <el-select v-model="myIdx" placeholder="鎵归噺鎿嶄綔" @change="selectChange"> - <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" - :disabled="item.disabled"> + <el-select + v-model="myIdx" + placeholder="鎵归噺鎿嶄綔" + @change="selectChange" + > + <el-option + v-for="item in options" + :key="item.value" + :label="item.label" + :value="item.value" + :disabled="item.disabled" + > </el-option> </el-select> </div> </div> <div class="pagination"> - <el-pagination background :current-page="currentPage" layout="prev, pager, next" :total="totalNum" - :page-size="pageSize" @current-change="changeCurrentPage"> + <el-pagination + background + :current-page="currentPage" + layout="prev, pager, next" + :total="totalNum" + :page-size="pageSize" + @current-change="changeCurrentPage" + > </el-pagination> </div> </div> @@ -167,7 +206,11 @@ methods: { getTableData() { myWait - .getMybackLog({ num: this.context, current: this.currentPage, pageSize: this.pageSize }) + .getMybackLog({ + num: this.context, + current: this.currentPage, + pageSize: this.pageSize, + }) .then(({ records, total }) => { this.tableData = records; this.tableData = this.tableData.filter((item) => !!item); @@ -177,7 +220,7 @@ }, // 鎵归噺鍒犻櫎 - mulDelete(idArr) { }, + mulDelete(idArr) {}, // 鎵ц涓嬫媺妗嗘搷浣� selectChange(val) { let ids = []; @@ -211,7 +254,7 @@ }); }, // 鍒犻櫎鍗曟潯鏁版嵁 - handleDelete({ number }) { }, + handleDelete({ number }) {}, // 璁剧疆琛ㄦ牸鏂戦┈绾� tableRowClassName({ row, rowIndex }) { if ((rowIndex + 1) % 2 === 0) { @@ -237,7 +280,7 @@ this.dialogUpdate = false; done(); }) - .catch(() => { }); + .catch(() => {}); }, // 璁$畻鏃堕棿 getRestTime(time2) { @@ -389,7 +432,7 @@ line-height: 28px; display: flex; align-items: center; - border: 1px solid #DCDFE6; + border: 1px solid #dcdfe6; border-radius: 4px; font-size: 12px; margin-left: 10px; @@ -425,7 +468,6 @@ justify-content: center; .el-pagination { - &::v-deep li, &::v-deep .btn-prev, &::v-deep .btn-next { @@ -461,11 +503,11 @@ .operation { display: flex; - + color: var(--operation-color); .line { padding: 0 5px; } - + color: var(--operation-color); span:hover { cursor: pointer; } diff --git a/src/views/operate/sms/smsIndex/index.vue b/src/views/operate/sms/smsIndex/index.vue index 767989d..c7ea05c 100644 --- a/src/views/operate/sms/smsIndex/index.vue +++ b/src/views/operate/sms/smsIndex/index.vue @@ -595,7 +595,7 @@ .line { padding: 0 5px; } - + color: var(--operation-color); span:hover { cursor: pointer; } diff --git a/src/views/operate/sms/smsTemplate/index.vue b/src/views/operate/sms/smsTemplate/index.vue index 78645e7..b2976e8 100644 --- a/src/views/operate/sms/smsTemplate/index.vue +++ b/src/views/operate/sms/smsTemplate/index.vue @@ -494,7 +494,7 @@ .line { padding: 0 5px; } - + color: var(--operation-color); span:hover { cursor: pointer; } diff --git a/src/views/operate/video/index.vue b/src/views/operate/video/index.vue index 576af4e..0e47a53 100644 --- a/src/views/operate/video/index.vue +++ b/src/views/operate/video/index.vue @@ -542,7 +542,7 @@ .line { padding: 0 5px; } - + color: var(--operation-color); span:hover { cursor: pointer; } diff --git a/src/views/operate/viewEvent/index.vue b/src/views/operate/viewEvent/index.vue index 09b0742..7f3cc76 100644 --- a/src/views/operate/viewEvent/index.vue +++ b/src/views/operate/viewEvent/index.vue @@ -444,7 +444,7 @@ .line { padding: 0 5px; } - + color: var(--operation-color); span:hover { cursor: pointer; } diff --git a/src/views/operate/writManager/writ/index.vue b/src/views/operate/writManager/writ/index.vue index 68e223a..e177dc0 100644 --- a/src/views/operate/writManager/writ/index.vue +++ b/src/views/operate/writManager/writ/index.vue @@ -388,7 +388,7 @@ .line { padding: 0 5px; } - + color: var(--operation-color); span:hover { cursor: pointer; } diff --git a/src/views/operate/writManager/writTemplate/index.vue b/src/views/operate/writManager/writTemplate/index.vue index 7b2c608..1ddfc0c 100644 --- a/src/views/operate/writManager/writTemplate/index.vue +++ b/src/views/operate/writManager/writTemplate/index.vue @@ -291,7 +291,7 @@ .line { padding: 0 5px; } - + color: var(--operation-color); span:hover { cursor: pointer; } diff --git a/src/views/systemSetting/baseSetting/department/index.vue b/src/views/systemSetting/baseSetting/department/index.vue index 7dc2c49..e897ba3 100644 --- a/src/views/systemSetting/baseSetting/department/index.vue +++ b/src/views/systemSetting/baseSetting/department/index.vue @@ -593,7 +593,7 @@ .line { padding: 0 5px; } - + color: var(--operation-color); span:hover { cursor: pointer; } diff --git a/src/views/systemSetting/baseSetting/role/index.vue b/src/views/systemSetting/baseSetting/role/index.vue index 47a8ac2..93d1750 100644 --- a/src/views/systemSetting/baseSetting/role/index.vue +++ b/src/views/systemSetting/baseSetting/role/index.vue @@ -477,6 +477,7 @@ // font-size: 10px; .operation { display: flex; + color: var(--operation-color); .line { padding: 0 5px; } diff --git a/src/views/systemSetting/baseSetting/user/components/createUser/index.vue b/src/views/systemSetting/baseSetting/user/components/createUser/index.vue index 6f2f733..14a91a7 100644 --- a/src/views/systemSetting/baseSetting/user/components/createUser/index.vue +++ b/src/views/systemSetting/baseSetting/user/components/createUser/index.vue @@ -2,13 +2,27 @@ <div class="createUser"> <main> <div class="mainContent"> - <el-form ref="user" label-width="140px" autoComplete="on" :model="user" :rules="createUserRules" - label-position="right"> + <el-form + ref="user" + label-width="140px" + autoComplete="on" + :model="user" + :rules="createUserRules" + label-position="right" + > <!-- 鐢ㄦ埛鍚嶇О --> <div class="user-item"> <div class="item-left"> - <el-form-item class="optionItem" label="鐢ㄦ埛鍚嶇О:" prop="username"> - <el-input v-model="user.username" placeholder="濉啓鐢ㄦ埛鍚嶇О" autoComplete="new-username"> + <el-form-item + class="optionItem" + label="鐢ㄦ埛鍚嶇О:" + prop="username" + > + <el-input + v-model="user.username" + placeholder="濉啓鐢ㄦ埛鍚嶇О" + autoComplete="new-username" + > </el-input> </el-form-item> </div> @@ -17,9 +31,17 @@ <!-- 鐢ㄦ埛瀵嗙爜 --> <div class="user-item"> <div class="item-left"> - <el-form-item class="optionItems" label="鐢ㄦ埛瀵嗙爜:" prop="password" > - <el-input v-model="user.password" type="password" autoComplete="new-password" - placeholder="璇疯緭鍏ョ敤鎴峰瘑鐮�"></el-input> + <el-form-item + class="optionItems" + label="鐢ㄦ埛瀵嗙爜:" + prop="password" + > + <el-input + v-model="user.password" + type="password" + autoComplete="new-password" + placeholder="璇疯緭鍏ョ敤鎴峰瘑鐮�" + ></el-input> </el-form-item> </div> <div class="item-right"></div> @@ -28,8 +50,15 @@ <!-- 鎵�灞炵敤鎴峰鍚� --> <div class="user-item"> <div class="item-left"> - <el-form-item class="optionItem" label="鎵�灞炵敤鎴峰鍚�:" prop="nickName"> - <el-input v-model="user.nickName" placeholder="璇峰~鍐欑敤鎴峰鍚�"></el-input> + <el-form-item + class="optionItem" + label="鎵�灞炵敤鎴峰鍚�:" + prop="nickName" + > + <el-input + v-model="user.nickName" + placeholder="璇峰~鍐欑敤鎴峰鍚�" + ></el-input> </el-form-item> </div> <div class="item-right"></div> @@ -61,8 +90,16 @@ <!-- 鎵�灞炴墜鏈哄彿鐮� --> <div class="user-item"> <div class="item-left"> - <el-form-item class="optionItem" label="鎵�灞炴墜鏈哄彿鐮�:" prop="mobile"> - <el-input v-model="user.mobile" maxlength="11" placeholder="璇峰~鍐欐墜鏈哄彿鐮�"></el-input> + <el-form-item + class="optionItem" + label="鎵�灞炴墜鏈哄彿鐮�:" + prop="mobile" + > + <el-input + v-model="user.mobile" + maxlength="11" + placeholder="璇峰~鍐欐墜鏈哄彿鐮�" + ></el-input> </el-form-item> </div> <div class="item-right"></div> @@ -71,7 +108,10 @@ <div class="user-item"> <div class="item-left"> <el-form-item class="optionItem" label="閭鍦板潃:" prop="email"> - <el-input v-model="user.email" placeholder="璇峰~鍐欓偖绠卞湴鍧�"></el-input> + <el-input + v-model="user.email" + placeholder="璇峰~鍐欓偖绠卞湴鍧�" + ></el-input> </el-form-item> </div> <div class="item-right"></div> @@ -80,9 +120,18 @@ <div class="user-item"> <div class="item-left"> <el-form-item class="optionItem" label="閫夋嫨瑙掕壊:" prop="role"> - <el-select v-model="user.role" placeholder="璇烽�夋嫨鎵�灞炶鑹�" multiple collapse-tags> - <el-option v-for="item in roleList" :key="item.id" :label="item.name" - :value="item.id"> + <el-select + v-model="user.role" + placeholder="璇烽�夋嫨鎵�灞炶鑹�" + multiple + collapse-tags + > + <el-option + v-for="item in roleList" + :key="item.id" + :label="item.name" + :value="item.id" + > </el-option> </el-select> </el-form-item> @@ -92,10 +141,18 @@ <!-- 鐢ㄦ埛绫诲瀷 --> <div class="user-item"> <div class="item-left"> - <el-form-item class="optionItem" label="鐢ㄦ埛绫诲瀷:" prop="userType"> + <el-form-item + class="optionItem" + label="鐢ㄦ埛绫诲瀷:" + prop="userType" + > <el-select v-model="user.userType" placeholder="璇烽�夋嫨鐢ㄦ埛绫诲瀷"> - <el-option v-for="item in typeList" :key="item.id" :label="item.name" - :value="item.id"> + <el-option + v-for="item in typeList" + :key="item.id" + :label="item.name" + :value="item.id" + > </el-option> </el-select> </el-form-item> @@ -123,12 +180,28 @@ <!-- 鎵�灞為儴闂� --> <div class="user-item"> <div class="item-left"> - <el-form-item class="optionItem" label="鎵�灞為儴闂�:" prop="departmentId"> - <el-select v-model="user.departmentId" placeholder="璇烽�夋嫨鎵�灞為儴闂�" @change="getDepartName"> + <el-form-item + class="optionItem" + label="鎵�灞為儴闂�:" + prop="departmentId" + > + <el-select + v-model="user.departmentId" + placeholder="璇烽�夋嫨鎵�灞為儴闂�" + @change="getDepartName" + > <el-option :value="mylabel"> - <el-tree ref="tree" :check-strictly="true" :data="departList" - :props="defaultProps" show-checkbox @check-change="handleCheck" - default-expand-all node-key="id"> + <el-tree + ref="tree" + :check-strictly="true" + :data="departList" + :props="defaultProps" + show-checkbox + @check-change="handleCheck" + @node-click="nodeClick" + default-expand-all + node-key="id" + > </el-tree> </el-option> </el-select> @@ -139,8 +212,15 @@ <!-- 褰撳墠鑱屽姟 --> <div class="user-item"> <div class="item-left"> - <el-form-item class="optionItem" label="褰撳墠鑱屽姟:" prop="jobTitle"> - <el-input v-model="user.jobTitle" placeholder="璇疯緭鍏ュ綋鍓嶈亴鍔�"></el-input> + <el-form-item + class="optionItem" + label="褰撳墠鑱屽姟:" + prop="jobTitle" + > + <el-input + v-model="user.jobTitle" + placeholder="璇疯緭鍏ュ綋鍓嶈亴鍔�" + ></el-input> </el-form-item> </div> <div class="item-right"></div> @@ -148,8 +228,15 @@ <!-- 濉啓鎵�灞瀖ac鍦板潃 --> <div class="user-item"> <div class="item-left"> - <el-form-item class="optionItem" label="濉啓鎵�灞瀖ac鍦板潃:" prop="mac"> - <el-input v-model="user.mac" placeholder="璇峰~鍐欐墍灞瀖ac鍦板潃"></el-input> + <el-form-item + class="optionItem" + label="濉啓鎵�灞瀖ac鍦板潃:" + prop="mac" + > + <el-input + v-model="user.mac" + placeholder="璇峰~鍐欐墍灞瀖ac鍦板潃" + ></el-input> </el-form-item> </div> <div class="item-right"></div> @@ -157,27 +244,39 @@ <!-- 濉啓鎵�灞瀒p鍦板潃 --> <div class="user-item"> <div class="item-left"> - <el-form-item class="optionItem" label="濉啓鎵�灞瀒p鍦板潃:" prop="ip"> - <el-input v-model="user.ip" placeholder="璇峰~鍐欐墍灞瀒p鍦板潃"></el-input> + <el-form-item + class="optionItem" + label="濉啓鎵�灞瀒p鍦板潃:" + prop="ip" + > + <el-input + v-model="user.ip" + placeholder="璇峰~鍐欐墍灞瀒p鍦板潃" + ></el-input> </el-form-item> </div> <div class="item-right"></div> </div> <el-form-item> <div class="optionBtn"> - <el-button type="primary" class="btn submit" @click.native.prevent="handleUser">鎻愪氦 + <el-button + type="primary" + class="btn submit" + @click.native.prevent="handleUser" + >鎻愪氦 </el-button> - <el-button class="btn reset" @click.native.prevent="resetForm">閲嶇疆</el-button> + <el-button class="btn reset" @click.native.prevent="resetForm" + >閲嶇疆</el-button + > </div> </el-form-item> </el-form> - </div> </main> </div> </template> <script> -import { getTypeList } from '@/utils/helper' +import { getTypeList } from "@/utils/helper"; export default { data() { const validateNickname = (rule, value, callback) => { @@ -189,12 +288,16 @@ }; const validatePass = (rule, value, callback) => { //蹇呴』鍖呭惈瀛楁瘝銆佹暟瀛椼�侀暱搴﹀啀6-16浣嶄箣闂� - var rep =/^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$/; - if (!rep.test(value) ) { - callback(new Error("瀵嗙爜闀垮害8鍒�16浣嶄笖瀵嗙爜涓殑瀛楃蹇呴』鍖呭惈瀛楁瘝澶у啓鍜屽瓧姣嶅皬鍐欏拰蹇呴』鍖呭惈鏁板瓧锛屼笉鑳藉寘鍚┖鏍�")); - } else { - callback(); - } + var rep = /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$/; + if (!rep.test(value)) { + callback( + new Error( + "瀵嗙爜闀垮害8鍒�16浣嶄笖瀵嗙爜涓殑瀛楃蹇呴』鍖呭惈瀛楁瘝澶у啓鍜屽瓧姣嶅皬鍐欏拰蹇呴』鍖呭惈鏁板瓧锛屼笉鑳藉寘鍚┖鏍�" + ) + ); + } else { + callback(); + } // if (!value) { // callback(new Error("鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖")); @@ -222,7 +325,7 @@ if (!value) { callback(new Error("鎵嬫満鍙风爜涓嶈兘涓虹┖")); } else { - const rep = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/ + const rep = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/; if (!rep.test(value)) { callback("璇疯緭鍏ユ纭殑鎵嬫満鍙风爜"); } else { @@ -232,9 +335,10 @@ }; const validateMail = (rule, value, callback) => { if (value) { - const rep = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/; + const rep = + /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/; if (!rep.test(value)) { - callback(new Error("璇疯緭鍏ユ纭殑閭")) + callback(new Error("璇疯緭鍏ユ纭殑閭")); } else { callback(); } @@ -246,21 +350,21 @@ if (!value) { callback(new Error("鎵�灞炶鑹蹭笉鑳戒负绌�")); } else { - callback() + callback(); } }; const validateType = (rule, value, callback) => { if (!value) { callback(new Error("鐢ㄦ埛绫诲瀷涓嶈兘涓虹┖")); } else { - callback() + callback(); } }; const validateDepartment = (rule, value, callback) => { if (!value) { callback(new Error("璇烽�夋嫨鐢ㄦ埛閮ㄩ棬")); } else { - callback() + callback(); } }; const validateWork = (rule, value, callback) => { @@ -274,34 +378,34 @@ if (value) { callback(); } else { - callback() + callback(); } }; const validateIp = (rule, value, callback) => { if (value) { callback(); } else { - callback() + callback(); } }; return { user: { - nickName: '', - password: '', - username: '', + nickName: "", + password: "", + username: "", sex: 1, isDy: 0, - mobile: '', - email: '', + mobile: "", + email: "", role: null, userType: null, - zjarea: '', - zjnumber: '', - zjother: '', + zjarea: "", + zjnumber: "", + zjother: "", departmentId: null, jobTitle: null, - mac: '', - ip: '', + mac: "", + ip: "", }, createUserRules: { nickName: [ @@ -313,61 +417,41 @@ username: [ { required: true, trigger: "blur", validator: validateTruename }, ], - sex: [ - { required: true, trigger: "blur" }, - ], - isDy: [ - { required: true, trigger: "blur" }, - ], - mobile: [ - { required: true, trigger: "blur", validator: validatePhone }, - ], - email: [ - { required: true, trigger: "blur", validator: validateMail }, - ], - role: [ - { required: true, trigger: "change", validator: validateRole }, - ], + sex: [{ required: true, trigger: "blur" }], + isDy: [{ required: true, trigger: "blur" }], + mobile: [{ required: true, trigger: "blur", validator: validatePhone }], + email: [{ required: true, trigger: "blur", validator: validateMail }], + role: [{ required: true, trigger: "change", validator: validateRole }], userType: [ { required: true, trigger: "change", validator: validateType }, ], - zj: [ - { required: false, trigger: "blur" }, - ], + zj: [{ required: false, trigger: "blur" }], departmentId: [ { required: true, trigger: "change", validator: validateDepartment }, ], jobTitle: [ { required: true, trigger: "blur", validator: validateWork }, ], - mac: [ - { required: false, trigger: "blur", validator: validateMac }, - ], - ip: [ - { required: false, trigger: "blur", validator: validateIp }, - ], + mac: [{ required: false, trigger: "blur", validator: validateMac }], + ip: [{ required: false, trigger: "blur", validator: validateIp }], }, - roleList: [ - - ], - typeList: [ - - ], + roleList: [], + typeList: [], departList: [], - mylabel: '', + mylabel: "", defaultProps: { - children: 'children', - label: 'departName', + children: "children", + label: "departName", disabled: (data, node) => { if (node.level === 1 && node.childNodes.length !== 0) { - return !data.leaf + return !data.leaf; } - } + }, }, selectOrg: { - orgsid: [] + orgsid: [], }, - } + }; }, created() { // 鑾峰彇瑙掕壊鍒楄〃 @@ -380,120 +464,112 @@ methods: { // 鎻愪氦娉ㄥ唽 handleUser() { - this.$refs['user'].validate((valid) => { + this.$refs["user"].validate((valid) => { console.log(valid); if (valid) { const { user, selectOrg } = this; console.log(user); - this.$axios.post('sccg/admin/register', { - departmentId: selectOrg.orgsid[0], - email: user.email, - icon: '', - isDy: `${user.isDy}`, - jobTitle: user.jobTitle, - mobile: user.mobile, - note: '', - roleIds: user.role, - // nickName: user.nickName, - sex: `${user.sex}`, - password: user.password, - userType: user.userType, - username: user.username, - zj: user.zjarea + `${user.zjnumber}` + user.zjother, - nickName: user.nickName - // departName:user.departName, - }).then(res => { - if (res.code === 200) { - console.log(1); - this.$message({ - type: 'success', - message: res.message, - }) - this.$emit('sendDialog', { flag: false }); - } else if (res.code === 500 && res.message === "鎿嶄綔澶辫触") { - this.$message({ - type: 'warning', - message: '璇ョ敤鎴峰凡娉ㄥ唽' - }) - } else { - this.$message({ - type: 'warning', - message: res.message - }) - } - }) + this.$axios + .post("sccg/admin/register", { + departmentId: selectOrg.orgsid[0], + email: user.email, + icon: "", + isDy: `${user.isDy}`, + jobTitle: user.jobTitle, + mobile: user.mobile, + note: "", + roleIds: user.role, + // nickName: user.nickName, + sex: `${user.sex}`, + password: user.password, + userType: user.userType, + username: user.username, + zj: user.zjarea + `${user.zjnumber}` + user.zjother, + nickName: user.nickName, + // departName:user.departName, + }) + .then((res) => { + if (res.code === 200) { + console.log(1); + this.$message({ + type: "success", + message: res.message, + }); + this.$emit("sendDialog", { flag: false }); + } else if (res.code === 500 && res.message === "鎿嶄綔澶辫触") { + this.$message({ + type: "warning", + message: "璇ョ敤鎴峰凡娉ㄥ唽", + }); + } else { + this.$message({ + type: "warning", + message: res.message, + }); + } + }); } else { - return false + return false; } - }) + }); }, // 鑾峰彇瑙掕壊鍒楄〃 getRoleList() { this.$axios({ - method: 'get', - url: 'sccg/role/listAll', - }) - .then(res => { - this.roleList = res.data; - }) + method: "get", + url: "sccg/role/listAll", + }).then((res) => { + this.roleList = res.data; + }); }, // 閲嶇疆琛ㄥ崟 resetForm() { - this.$refs['user'].resetFields(); + this.$refs["user"].resetFields(); }, // 鑾峰緱閮ㄩ棬鍚嶇О getDepartName(data) { - this.departList.forEach(item => { + this.departList.forEach((item) => { if (item.id === data) { - this.user.departName = item.departName + this.user.departName = item.departName; } - }) + }); }, // 鑾峰彇鐢ㄦ埛绫诲瀷 async getUserTypeList() { - this.typeList = await getTypeList(1, '07'); + this.typeList = await getTypeList(1, "07"); }, // 鑾峰彇閮ㄩ棬鏍� getDepartList() { this.$axios({ - method: 'get', - url: 'sccg/depart/tree' - }) - .then(res => { - this.departList = res.data; - }) + method: "get", + url: "sccg/depart/tree", + }).then((res) => { + this.departList = res.data; + }); + }, + nodeClick(data, checked) { + this.checkedId = data.comcode; + this.$refs.tree.setCheckedNodes([data]); + this.user.departmentId = data.departName; + this.selectOrg.orgsid = []; + this.selectOrg.orgsid.push(data.id); }, handleCheck(data, checked) { - this.user.departmentId = data.departName; - // 鑾峰彇褰撳墠閫夋嫨鐨刬d鍦ㄦ暟缁勪腑鐨勭储寮� - const indexs = this.selectOrg.orgsid.indexOf(data.id) - // 濡傛灉涓嶅瓨鍦ㄦ暟缁勪腑锛屽苟涓旀暟缁勪腑宸茬粡鏈変竴涓猧d骞朵笖checked涓簍rue鐨勬椂鍊欙紝浠h〃涓嶈兘鍐嶆閫夋嫨銆� - if (indexs < 0 && this.selectOrg.orgsid.length === 1 && checked) { - this.$message({ - message: '鍙兘閫夋嫨涓�涓儴闂紒', - type: 'warning', - showClose: true - }) - // 璁剧疆宸查�夋嫨鐨勮妭鐐逛负false 寰堥噸瑕� - this.$refs.tree.setChecked(data, false) - } else if (this.selectOrg.orgsid.length === 0 && checked) { - // 鍙戠幇鏁扮粍涓虹┖ 骞朵笖鏄凡閫夋嫨 - // 闃叉鏁扮粍鏈夊�硷紝棣栧厛娓呯┖锛屽啀push - this.selectOrg.orgsid = [] - this.selectOrg.orgsid.push(data.id) - } else if ( - indexs >= 0 && - this.selectOrg.orgsid.length === 1 && - !checked - ) { + if (checked == true) { + this.checkedId = data.comcode; + this.$refs.tree.setCheckedNodes([data]); + this.user.departmentId = data.departName; + this.selectOrg.orgsid = []; + this.selectOrg.orgsid.push(data.id); + } else { // 鍐嶆鐩存帴杩涜璧嬪�间负绌烘搷浣� - this.selectOrg.orgsid = [] - this.user.departmentId = ''; + this.selectOrg.orgsid = []; + this.user.departmentId = ""; } }, }, - props: ['sendDialog'] -} + props: ["sendDialog"], +}; </script> <style lang="scss" scoped> .createUser { @@ -529,7 +605,7 @@ } .sp-item { - .item-left{ + .item-left { display: flex; } } @@ -560,8 +636,11 @@ padding: 12px 50px; } } - } } } + +::v-deep .el-form-item__error { + width: 608px; +} </style> diff --git a/src/views/systemSetting/baseSetting/user/components/main/index.vue b/src/views/systemSetting/baseSetting/user/components/main/index.vue index b7cfaa8..26e0685 100644 --- a/src/views/systemSetting/baseSetting/user/components/main/index.vue +++ b/src/views/systemSetting/baseSetting/user/components/main/index.vue @@ -3,11 +3,11 @@ <div class="mainContent"> <!-- 鏁版嵁灞曠ず --> <el-table - border - stripe + border + stripe ref="multipleTable" :header-cell-style="{ - 'background':'#F5F5F5', + background: '#F5F5F5', 'font-size': '14px', 'font-weight': '650', 'line-height': '45px', @@ -118,46 +118,46 @@ </el-dialog> <!-- tools --> <div class="tools"> - <div class="funs"> - <div class="funsItem funs-sp"> - <el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox> - </div> - <div class="funsItem funs-sp"> - <el-checkbox v-model="unsame" @change="disSame(tableData)" - >鍙嶉��</el-checkbox - > - </div> - <div class="funsItem"> - <el-select - v-model="myIdx" - placeholder="鎵归噺鎿嶄綔" - @change="selectChange" - > - <el-option - popper-class="funs-select" - v-for="item in options" - :key="item.value" - :label="item.label" - :value="item.value" - :disabled="item.disabled" - > - </el-option> - </el-select> - </div> - </div> - <div class="pagination"> - <el-pagination - background - :current-page="currentPage" - layout="prev, pager, next" - :total="totalNum" - :page-size="pageSize" - @current-change="changeCurrentPage" - @prev-click="handlePrev" - @next-click="handleNext" - > - </el-pagination> - </div> + <div class="funs"> + <div class="funsItem funs-sp"> + <el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox> + </div> + <div class="funsItem funs-sp"> + <el-checkbox v-model="unsame" @change="disSame(tableData)" + >鍙嶉��</el-checkbox + > + </div> + <div class="funsItem"> + <el-select + v-model="myIdx" + placeholder="鎵归噺鎿嶄綔" + @change="selectChange" + > + <el-option + popper-class="funs-select" + v-for="item in options" + :key="item.value" + :label="item.label" + :value="item.value" + :disabled="item.disabled" + > + </el-option> + </el-select> + </div> + </div> + <div class="pagination"> + <el-pagination + background + :current-page="currentPage" + layout="prev, pager, next" + :total="totalNum" + :page-size="pageSize" + @current-change="changeCurrentPage" + @prev-click="handlePrev" + @next-click="handleNext" + > + </el-pagination> + </div> </div> </div> </main> @@ -498,7 +498,7 @@ .funs { display: flex; .funs-sp { - border: 1px solid #DCDFE6; + border: 1px solid #dcdfe6; background-color: #fff; } .funsItem { @@ -515,7 +515,7 @@ .el-select { width: 120px; - .funs-select{ + .funs-select { background-color: transparent; } } @@ -544,8 +544,8 @@ // color: #4b9bb7; // font-size: 10px; .operation { + color: var(--operation-color); display: flex; - font-size: 10px; .line { padding: 0 1px; } diff --git a/src/views/systemSetting/device/grid/components/main/index.vue b/src/views/systemSetting/device/grid/components/main/index.vue index 0f0803c..114999f 100644 --- a/src/views/systemSetting/device/grid/components/main/index.vue +++ b/src/views/systemSetting/device/grid/components/main/index.vue @@ -323,7 +323,7 @@ .operation { display: flex; - + color: var(--operation-color); .line { padding: 0 5px; } diff --git a/src/views/systemSetting/device/handheldTerminal/index.vue b/src/views/systemSetting/device/handheldTerminal/index.vue index 004e3ae..d4eb0d2 100644 --- a/src/views/systemSetting/device/handheldTerminal/index.vue +++ b/src/views/systemSetting/device/handheldTerminal/index.vue @@ -365,7 +365,7 @@ // font-size: 10px; .operation { display: flex; - + color: var(--operation-color); .line { padding: 0 5px; } diff --git a/src/views/systemSetting/device/loudspeaker/index.vue b/src/views/systemSetting/device/loudspeaker/index.vue index 4cb5738..8f1d6f6 100644 --- a/src/views/systemSetting/device/loudspeaker/index.vue +++ b/src/views/systemSetting/device/loudspeaker/index.vue @@ -357,7 +357,7 @@ .operation { display: flex; - + color: var(--operation-color); .line { padding: 0 5px; } diff --git a/src/views/systemSetting/platform/cockpitManage/index.vue b/src/views/systemSetting/platform/cockpitManage/index.vue index 1be6436..5450eeb 100644 --- a/src/views/systemSetting/platform/cockpitManage/index.vue +++ b/src/views/systemSetting/platform/cockpitManage/index.vue @@ -581,7 +581,7 @@ .operation { display: flex; - + color: var(--operation-color); .line { padding: 0 5px; } -- Gitblit v1.8.0