From a3b4eb017a0f948348ef7732267c7ed0d4bca8c0 Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期二, 12 三月 2024 16:15:27 +0800 Subject: [PATCH] bug修改 --- src/views/operate/disposal/casepool/pool/index.vue | 176 +++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 131 insertions(+), 45 deletions(-) diff --git a/src/views/operate/disposal/casepool/pool/index.vue b/src/views/operate/disposal/casepool/pool/index.vue index 3fe1cfe..9c93699 100644 --- a/src/views/operate/disposal/casepool/pool/index.vue +++ b/src/views/operate/disposal/casepool/pool/index.vue @@ -1,7 +1,8 @@ <template> <div class="userList"> <header> - <MyHeader ref="myHeader" + <MyHeader + ref="myHeader" @dialogCreatepro="dialogCreatepro" @getUserList="getUserList" ></MyHeader> @@ -44,7 +45,7 @@ :row-class-name="tableRowClassName" @selection-change="tableChange" > - <el-table-column type="selection" min-width="5"> + <el-table-column label="搴忓彿" type="index" width="60px"> </el-table-column> <el-table-column prop="code" @@ -129,13 +130,25 @@ > </el-table-column> <el-table-column + prop="state" + label="鐘舵��" + min-width="8" + :formatter="formatPrivilegeType" + > + </el-table-column> + <el-table-column prop="operation" label="鎿嶄綔" min-width="20" > <template slot-scope="scope"> - <div class="operation" v-if="statusArr[0] === 0"> - <span @click="handleFind(scope.row)">涓婃姤</span> + <div + class="operation" + v-if="statusArr[0] === 'wait'" + > + <span @click="handleUpload(scope.row)" + >涓婃姤</span + > <span class="line">|</span> <span @click="handleDispatch(scope.row)" >璋冨害</span @@ -157,14 +170,22 @@ </el-table> <!-- 璇︽儏椤靛睍绀� --> <el-dialog + custom-class="customWidth" :visible.sync="dialogView" - width="60%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView" - :before-close="handleClose" + :before-close="handleClose2" > - <MyDetail :info="info" v-if="mystatus === 1"></MyDetail> - <MyIllDetail :info="info" v-else></MyIllDetail> + <MyDetail + style="min-width: 300px" + :info="info" + v-if="mystatus === 1" + ></MyDetail> + <MyIllDetail + style="min-width: 500px" + :info="info" + v-else + ></MyIllDetail> </el-dialog> <!-- 璋冨害 --> <el-dialog @@ -259,7 +280,7 @@ import helper from "@/utils/mydate"; import { RESOURCE_OPTIONS } from "@/utils/helper"; import basecase from "@/api/operate/basecase"; -import MyHeader from "@/components/seachHeader/index" +import MyHeader from "@/components/seachHeader/index"; export default { components: { createUser, @@ -268,7 +289,7 @@ MyDetail, MyDispatch, MyIllDetail, - MyHeader + MyHeader, }, data() { return { @@ -309,27 +330,17 @@ tagList: [ { name: "寰呭鐞�", - value: 0, + value: 'wait', checked: true, }, { - name: "宸蹭笂鎶�", - value: 3, + name: "澶勭悊涓�", + value: 'handle', checked: false, }, { - name: "宸茶皟搴�", - value: 6, - checked: false, - }, - { - name: "鍦ㄥ涔�", - value: 3, - checked: false, - }, - { - name: "鏆備笉澶勭悊", - value: 4, + name: "宸插畬鎴�", + value: 'finish', checked: false, }, ], @@ -365,12 +376,10 @@ }); this.getUserList(undefined); }, - mounted() { - }, + mounted() { }, methods: { dialogCreatepro() { - console.log('-------------------') - this.dialogCreate = true + this.dialogCreate = true; }, // 璋冨害 handleDispatch(data) { @@ -448,28 +457,47 @@ // 鑾峰彇鐢ㄦ埛鍒楄〃 getUserList(seachData) { // console.log(seachData.seachData.resource) - let params + let params; if (seachData) { params = { current: this.currentPage, state: this.statusArr[0] ?? null, size: this.pageSize, - resource: seachData.seachData.resource == undefined ? null : seachData.seachData.resource, - region: seachData.seachData.region == undefined ? null : seachData.seachData.region, + resource: + seachData.seachData.resource == undefined + ? null + : seachData.seachData.resource, + region: + seachData.seachData.region == undefined + ? null + : seachData.seachData.region, type: this.statusArr[1] ?? null, - code: seachData.seachData.code == undefined ? null : seachData.seachData.code, - categoryBig: seachData.seachData.categoryBig == undefined ? null : seachData.seachData.categoryBig, - categorySmall: seachData.seachData.categorySmall == undefined ? null : seachData.seachData.categorySmall, - site: seachData.seachData.site == undefined ? null : seachData.seachData.site, - street: seachData.seachData.street == undefined ? null : seachData.seachData.street, - + code: + seachData.seachData.code == undefined + ? null + : seachData.seachData.code, + categoryBig: + seachData.seachData.categoryBig == undefined + ? null + : seachData.seachData.categoryBig, + categorySmall: + seachData.seachData.categorySmall == undefined + ? null + : seachData.seachData.categorySmall, + site: + seachData.seachData.site == undefined + ? null + : seachData.seachData.site, + street: + seachData.seachData.street == undefined + ? null + : seachData.seachData.street, }; if (seachData.seachData.alarmTime) { - params.startTime = seachData.seachData.alarmTime[0] - params.endTime = seachData.seachData.alarmTime[1] + params.startTime = seachData.seachData.alarmTime[0]; + params.endTime = seachData.seachData.alarmTime[1]; } } else { - params = { current: this.currentPage, state: this.statusArr[0] ?? null, @@ -494,8 +522,14 @@ return "success-row"; } }, - // 鏌ョ湅鐢ㄦ埛淇℃伅(涓嶅彲淇敼) - handleFind(rowData) { }, + + handleUpload(rowData) { + basecase + .uploadEvent(rowData.id) + .then((res) => { + }) + .catch((err) => this.$message.error(err)); + }, // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠� changeCurrentPage(page) { this.currentPage = page; @@ -507,6 +541,12 @@ this.dialogCreate = flag; this.dialogView = flag; this.dialogDispatch = flag; + }, + handleClose2(done) { + this.dialogCreate = false; + this.dialogNewAdd = false; + this.dialogDispatch = false; + this.dialogView = false; }, handleClose(done) { this.$confirm("纭鍏抽棴锛�") @@ -521,6 +561,8 @@ }, // 鏇存敼涓�绾ф爣绛剧殑閫変腑 changeNavChecked(idx) { + + this.currentPage = 1 this.tagList.forEach((item, index) => { item.checked = index === idx; }); @@ -530,17 +572,18 @@ this.statusArr[0] = this.tagList[idx].value; this.statusArr[1] = 1; this.getUserList(); - this.$refs.myHeader.seachData = {} + this.$refs.myHeader.seachData = {}; }, // 鏇存敼杩濊/杩濆缓 changeTypeChecked(idx) { + this.currentPage = 1 this.typeList.forEach((item, index) => { item.checked = index === idx; }); this.mystatus = idx + 1; this.statusArr[1] = this.typeList[idx].value; this.getUserList(); - this.$refs.myHeader.seachData = {} + this.$refs.myHeader.seachData = {}; }, async JumpView(data) { await this.getEventInfo(data.code); @@ -603,6 +646,44 @@ filterTime(time) { return helper(time); }, + formatPrivilegeType: function (row, column) { + let value = ''; + switch (row.state) { + case 0: + value = '寰呭鐞�' + break; + case 1: + value = '鍐嶅涔� / 鍐嶈缁�' + break; + case 2: + value = '涓婃姤' + break; + case 3: + value = '鍐嶅涔� / 鍐嶈缁�' + break; + case 4: + value = '鏆備笉澶勭悊' + break; + case 5: + value = '绔嬫' + break; + case 6: + value = '璋冨害' + break; + case 7: + value = '澶勭疆' + break; + case 8: + value = '鏍告煡' + break; + case 9: + value = '缁撴' + break; + default: + break; + } + return value + } }, }; </script> @@ -816,3 +897,8 @@ } } </style> +<style> +.customWidth { + width: 1000px !important; +} +</style> -- Gitblit v1.8.0