From e1ac04b42be89ca26ff5f94c17c4e2eebe52a0a2 Mon Sep 17 00:00:00 2001 From: wl <173@qq.com> Date: 星期二, 03 一月 2023 09:52:39 +0800 Subject: [PATCH] Merge branch 'dev1.0' of ssh://42.193.1.25:29418/sccg_ui into dev1.0 --- src/views/operate/disposal/casepool/escalation/index.vue | 161 +++++++++++++++-------------------------------------- 1 files changed, 47 insertions(+), 114 deletions(-) diff --git a/src/views/operate/disposal/casepool/escalation/index.vue b/src/views/operate/disposal/casepool/escalation/index.vue index 0df69ef..5747bc6 100644 --- a/src/views/operate/disposal/casepool/escalation/index.vue +++ b/src/views/operate/disposal/casepool/escalation/index.vue @@ -8,12 +8,11 @@ <el-select v-model="mystatus" placeholder="杩濊" - @change="setMystatus" > <el-option - v-for="item in typeList" + v-for="item in resourceOptions" :key="item.label" - :label="item.name" + :label="item.label" :value="item.value" > </el-option> @@ -23,38 +22,15 @@ <el-button type="primary" @click="getUserList">鏌ヨ</el-button> </div> </div> - <!-- <div class="addUser"> - <el-button class="addBtn" type="primary" @click="dialogCreate = true">娣诲姞</el-button> - <el-dialog :before-close="handleClose" :visible.sync="dialogCreate" title="璇烽�夋嫨涓婃姤浜嬩欢绫诲瀷" width="45%" - v-if="dialogCreate"> - <createUser @getPageProp=setDialog /> - </el-dialog> - <el-dialog :before-close="handleClose" :visible.sync="dialogNewAdd" - :title="newAddType === 0 ? '杩濊浜嬩欢鐧昏' : '杩濆缓浜嬩欢鐧昏' " width="60%" v-if="dialogNewAdd"> - <MyIll v-if="newAddType === 1" :mytype=newAddType @changeDialog=changeDialog /> - <myVio v-else :mytype=newAddType @changeDialog=changeDialog /> - </el-dialog> - </div> --> + </div> </header> <main> <div class="mainContent"> - <!-- 瀵艰埅鐘舵�佹爣绛� --> - <!-- <div class="nav"> - <div @click="changeNavChecked(index)" :class="[item.checked ? 'is-active':'','nav-item']" - v-for="(item,index) in tagList" :key="item.name">{{item.name}}</div> - </div> - <div class="type-nav"> - <div @click="changeTypeChecked(index)" v-for="(item,index) in typeList" :key="item.name" - :class="[item.checked ? 'is-active':'','type-item']">{{item.name}}</div> - </div> --> <!-- 鏁版嵁灞曠ず --> <el-table ref="multipleTable" :header-cell-style="{ - background: '#06122c', - 'font-size': '12px', - color: '#4b9bb7', 'font-weight': '650', 'line-height': '45px', }" @@ -90,24 +66,11 @@ </el-table-column> <el-table-column prop="continueTime" label="鎸佺画鏃堕棿" min-width="10"> </el-table-column> - <!-- <el-table-column prop="operation" label="鎿嶄綔" min-width="20"> - <template slot-scope="scope"> - <div class="operation"> - <span @click="handleFind(scope.row)">涓婃姤</span> - <span class="line">|</span> - <span @click="handleDelete(scope.row)">璋冨害</span> - <span class="line">|</span> - <span @click="handleDelete(scope.row)">鍦ㄥ涔�</span> - <span class="line">|</span> - <span @click="handleDelete(scope.row)">鏆備笉澶勭悊</span> - </div> - </template> - </el-table-column>--> </el-table> <!-- 璇︽儏椤靛睍绀� --> <el-dialog :visible.sync="dialogView" - width="80%" + width="60%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView" :before-close="handleClose" @@ -127,7 +90,7 @@ >鍙嶉��</el-checkbox > </div> - <div class="funsItem"> + <!-- <div class="funsItem"> <el-select v-model="myIdx" placeholder="鎵归噺鎿嶄綔" @@ -142,7 +105,7 @@ > </el-option> </el-select> - </div> + </div> --> </div> <div class="pagination"> <el-pagination @@ -163,31 +126,17 @@ </div> </template> <script> -import { CATEGOTY, EVENT_SOURCE } from "@/utils/helper"; -// import updateUser from "./updateUser" +import { RESOURCE_OPTIONS, EVENT_SOURCE } from "@/utils/helper"; import MyDetail from "@/components/detail"; -// import createUser from "./createUser" -// import MyIll from './createUser/ill' -// import MyVio from './createUser/vio' +import basecase from "@/api/operate/basecase"; + export default { components: { MyDetail, }, data() { return { - tableData: [ - // { - // code:1, - // eventSource:1, - // category:1, - // type:1, - // actionCause:'妗堢敱1111', - // site:'浣犲ソ', - // streetId:1, - // alarmTime:'2022-21-20', - // continueTime:'8灏忔椂', - // } - ], + tableData: [], context: "", dialogCreate: false, dialogView: false, @@ -262,6 +211,8 @@ ], mystatus: "", statusArr: [], + resource: null, + resourceOptions: RESOURCE_OPTIONS }; }, created() { @@ -278,12 +229,6 @@ this.getUserList(); }, methods: { - setMystatus(value) { - console.log(value); - this.statusArr[1] = value; - this.changeTypeChecked(value - 1); - this.getUserList(); - }, setDialog({ flag, type }) { this.dialogCreate = flag; this.dialogNewAdd = true; @@ -291,7 +236,6 @@ }, // 鎵归噺鍒犻櫎 mulDelete(idArr) { - console.log(idArr instanceof Array); const { statusArr } = this; this.$confirm("鎮ㄧ‘瀹氳鎵归噺鍒犻櫎妗堜欢鍚�?") .then((_) => { @@ -318,12 +262,10 @@ }); }) .catch((err) => { - console.log(err); }); }, // 鎵ц涓嬫媺妗嗘搷浣� selectChange(list) { - console.log(this.tempList); if (this.tempList.length !== 0) { if (list === 3) { this.preMyIdx = list; @@ -343,11 +285,7 @@ list.forEach((item) => { this.tempList.push(item.code); }); - if (list.length === this.tableData.length) { - this.all = true; - } else { - this.all = false; - } + this.all = list.length === this.tableData.length; }, // 鍏ㄩ�� selectAll() { @@ -361,23 +299,27 @@ }, // 鑾峰彇鐢ㄦ埛鍒楄〃 getUserList() { - const { currentPage, pageSize, context, statusArr } = this; - this.$axios({ - method: "get", - url: `sccg/base_case/query?state=${statusArr[0]}¤t=${currentPage}&size=${pageSize}&resource=2&type=${statusArr[1]}`, - }).then((res) => { - this.totalNum = res.data.total; - this.tableData = res.data.records; - }); + const params = { + current: this.currentPage, + state: this.statusArr[0] ?? null, + size: this.pageSize, + resource: this.resource, + type: this.statusArr[1] ?? null + } + basecase.baseCasePoolList(params) + .then(({ records, total }) => { + this.tableData = records; + this.totalNum = total; + }) + .catch(err => this.$message.error(err)) }, // 璁剧疆琛ㄦ牸鏂戦┈绾� tableRowClassName({ row, rowIndex }) { - if ((rowIndex + 1) % 2 == 0) { + if ((rowIndex + 1) % 2 === 0) { return "warning-row"; } else { return "success-row"; } - return ""; }, // 鏌ョ湅鐢ㄦ埛淇℃伅(涓嶅彲淇敼) handleFind(rowData) { @@ -418,11 +360,7 @@ // 鏇存敼涓�绾ф爣绛剧殑閫変腑 changeNavChecked(idx) { this.tagList.forEach((item, index) => { - if (index === idx) { - item.checked = true; - } else { - item.checked = false; - } + item.checked = index === idx; }); this.typeList[0].checked = true; this.typeList[1].checked = false; @@ -433,11 +371,7 @@ // 鏇存敼杩濊/杩濆缓 changeTypeChecked(idx) { this.typeList.forEach((item, index) => { - if (index === idx) { - item.checked = true; - } else { - item.checked = false; - } + item.checked = index === idx; }); this.mystatus = idx + 1; this.statusArr[1] = this.typeList[idx].value; @@ -448,7 +382,6 @@ }, // 鑾峰彇妗堜欢淇℃伅 getEventInfo(code) { - console.log("鑾峰彇鍏蜂綋妗堜欢淇℃伅", code); this.$axios({ method: "get", url: `sccg/base_case/baseCaseDetail/${code}`, @@ -470,8 +403,7 @@ color: #4b9bb7; header { - background-color: #09152f; - border: 1pox solid #fff; + background-color: white; .headerContent { padding: 0 40px; @@ -532,15 +464,14 @@ } &::v-deep .el-input__inner { - background-color: #09152f; + // background-color: #09152f; border: 1px solid #17324c; } main { - background-color: #09152f; + // background-color: #09152f; margin-top: 20px; padding-bottom: 50px; - border: 1pox solid #fff; .mainTitle { line-height: 60px; @@ -562,8 +493,9 @@ } .is-active { - background-color: #070f22; - color: #fff; + // background-color: #070f22; + color: #333; + font-size: 500; } } @@ -583,9 +515,10 @@ } .is-active { - background-color: #070f22; + // background-color: #070f22; border-radius: 4px; - color: #fff; + color: #333; + font-size: 500; } } @@ -619,7 +552,7 @@ &::v-deep .el-input__inner { border: none; - background-color: #09152f; + // background-color: #09152f; } &:hover { @@ -642,7 +575,7 @@ &::v-deep li, &::v-deep .btn-prev, &::v-deep .btn-next { - background-color: #071f39; + // background-color: #071f39; color: #4b9bb7; } @@ -655,9 +588,9 @@ } .el-table { - color: #4b9bb7; - font-size: 10px; - margin-top: 10px; + // color: #4b9bb7; + // font-size: 10px; + // margin-top: 10px; &::v-deep .cell { text-overflow: ellipsis; @@ -666,7 +599,7 @@ } &::v-deep .el-table__empty-block { - background-color: #09152f; + // background-color: #09152f; } &::v-deep .el-table__empty-block { @@ -687,17 +620,17 @@ } .el-table::v-deep .warning-row { - background: #06122c; + // background: #06122c; } .el-table::v-deep .success-row { - background: #071f39; + // background: #071f39; } } &::v-deep .el-dialog__header, &::v-deep .el-dialog__body { - background-color: #06122c; + // background-color: #06122c; } &::v-deep .el-dialog__header { -- Gitblit v1.8.0