From 7298e6cff9ed3e0137398283a96156dadbeabf5b Mon Sep 17 00:00:00 2001 From: “dzb” <2632970487@qq.com> Date: 星期三, 12 十月 2022 17:07:28 +0800 Subject: [PATCH] 修改bug --- src/views/operate/disposal/casepool/dispatch/index.vue | 108 ++++++++++++++++++++++++++++++++--------------------- 1 files changed, 65 insertions(+), 43 deletions(-) diff --git a/src/views/operate/disposal/casepool/dispatch/index.vue b/src/views/operate/disposal/casepool/dispatch/index.vue index ac946a7..f7ef9da 100644 --- a/src/views/operate/disposal/casepool/dispatch/index.vue +++ b/src/views/operate/disposal/casepool/dispatch/index.vue @@ -30,39 +30,52 @@ @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 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="10"> + <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="7"> <template slot-scope="scope"> <span>{{scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛涓婁紶'}}</span> </template> </el-table-column> - <el-table-column prop="category" label="澶х被鍚嶇О" min-width="10"> + <el-table-column :prop="mystatus === 1 ? 'category' :'category'" + :label="mystatus===1 ? '澶х被鍚嶇О' : '杩濆缓绫诲埆'" :min-width="mystatus===1?'10':'20'"> </el-table-column> - <el-table-column prop="type" label="灏忕被鍚嶇О" min-width="10"> + <el-table-column :prop="mystatus === 1 ? 'type' :'site'" :label="mystatus===1 ? '灏忕被鍚嶇О' : '杩濆缓鍦扮偣'" + min-width="10"> </el-table-column> - <el-table-column prop="actionCause" label="妗堢敱" min-width="10"> + <el-table-column :prop="mystatus === 1 ? 'actionCause' :'communityId'" + :label="mystatus===1 ? '妗堢敱' : '鎵�灞炵ぞ鍖�'" min-width="10"> </el-table-column> - <el-table-column prop="site" label="鎶ヨ鐐逛綅" min-width="10"> + <el-table-column :prop="mystatus === 1 ? 'site' :''" :label="mystatus===1 ? '鎶ヨ鐐逛綅' : '杩濇硶寤虹瓚闀裤�佸銆侀珮'" + :min-width="mystatus===1?'10' :'20' "> + <template slot-scope="scope"> + <div v-if="mystatus ===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="streetId" label="鎵�灞炲尯鍩�" min-width="10"> + <el-table-column :prop="mystatus === 1 ? 'street' :'buildingArea'" + :label="mystatus===1 ? '鎵�灞炲尯鍩�' : '杩濇硶寤虹瓚闈㈢Н'" min-width="10"> </el-table-column> - <el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="15"> + <el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="15" v-if="mystatus===1"> <template slot-scope="scope"> <span>{{filterTime(scope.row.alarmTime)}}</span> </template> </el-table-column> - <el-table-column prop="continueTime" label="鎸佺画鏃堕棿" min-width="10"> + <el-table-column :prop="mystatus === 1 ? 'continueTime' :'materials'" + :label="mystatus===1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="10"> </el-table-column> <el-table-column prop="operation" label="鎿嶄綔" min-width="20"> <template slot-scope="scope"> - <div class="btn"> - <span>璋冨害</span> - <span class="line">|</span> - <span @click="opernDialog(scope.row)">涓婁紶澶勭疆缁撴灉</span> + <div class="operation"> + <div class="btn"> + <span>璋冨害</span> + <span class="line">|</span> + <span @click="opernDialog(scope.row)">涓婁紶澶勭疆缁撴灉</span> + </div> </div> </template> </el-table-column> @@ -70,11 +83,12 @@ <!-- 璇︽儏椤靛睍绀� --> <el-dialog :visible.sync="dialogView" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView" :before-close="handleClose"> - <MyDetail :info=info></MyDetail> + <MyDetail :info=info v-if="mystatus==1 ? true:false"></MyDetail> + <MyIllDetail :info=info v-else></MyIllDetail> </el-dialog> <!-- 涓婁紶椤甸潰 --> - <el-dialog :visible.sync="dialogUpload" width="60%" title="涓婁紶澶勭疆缁撴灉" - v-if="dialogUpload" :before-close="handleClose"> + <el-dialog :visible.sync="dialogUpload" width="60%" title="涓婁紶澶勭疆缁撴灉" v-if="dialogUpload" + :before-close="handleClose"> <uploadVio v-if="mystatus === 1" :caseId="caseId" @closeDialog="closeDialog"></uploadVio> <uploadIll v-else :caseId="caseId" @closeDialog="closeDialog"></uploadIll> </el-dialog> @@ -110,19 +124,20 @@ import uploadVio from './updateUser/uploadResult/vio' import uploadIll from "./updateUser/uploadResult/ill" import MyDetail from '@/components/detail' +import MyIllDetail from '@/components/illdetail' import helper from '@/utils/mydate' export default { components: { // updateUser, - uploadVio,uploadIll,MyDetail + uploadVio, uploadIll, MyDetail,MyIllDetail }, data() { return { tableData: [], context: "", - dialogUpload:false, + dialogUpload: false, // dialogUpdate: false, - dialogView:false, + dialogView: false, info: {}, totalNum: null, pageSize: 10, @@ -130,7 +145,7 @@ all: false, unsame: false, myIdx: 0, - preMyIdx:0, + preMyIdx: 0, options: [ { value: 0, @@ -163,9 +178,9 @@ checked: false, }, ], - statusArr:[], - mystatus:1, - caseId:'', + statusArr: [], + mystatus: 1, + caseId: '', } }, created() { @@ -186,16 +201,16 @@ this.getUserList(); }, // 鎵归噺鍒犻櫎 - mulDelete(idArr){ + mulDelete(idArr) { console.log(idArr); this.$axios({ - method:'delete', - url:'sccg/violations/batch_delete?ids='+idArr, - }).then(res=>{ + method: 'delete', + url: 'sccg/violations/batch_delete?ids=' + idArr, + }).then(res => { this.getUserList(); this.$message({ - message:res.message, - type:res.code === 200 ? 'success' : 'warning' + message: res.message, + type: res.code === 200 ? 'success' : 'warning' }) }) }, @@ -319,32 +334,32 @@ }) .catch(_ => { }); }, - async JumpView(data){ + async JumpView(data) { await this.getEventInfo(data.code); }, // 鑾峰彇妗堜欢淇℃伅 - getEventInfo(code){ - this.$axios({ - method:'get', - url:`sccg/base_case/baseCaseDetail/${code}` + async getEventInfo(code) { + await this.$axios({ + method: 'get', + url: `sccg/base_case/baseCaseDetail/${code}` }) - .then(res=>{ - this.info = res.data; - this.dialogView = true; - }) + .then(res => { + this.info = res.data; + this.dialogView = true; + }) }, - opernDialog(data){ + opernDialog(data) { this.dialogUpload = true; this.caseId = data.id; // console.log(data); }, // 鍏抽棴涓婁紶鐣岄潰 - closeDialog({flag}){ + closeDialog({ flag }) { this.dialogUpload = flag; this.getUserList(); }, // 澶勭悊鏃堕棿 - filterTime(time){ + filterTime(time) { return helper(time); } } @@ -355,6 +370,7 @@ text-align: left; margin: 10px 20px; color: #4b9bb7; + header { background-color: #09152f; border: 1pox solid #fff; @@ -407,18 +423,22 @@ } } } + &::v-deep .el-input__inner { background-color: #09152f; border: 1px solid #17324c; } + main { background-color: #09152f; margin-top: 20px; padding-bottom: 50px; border: 1pox solid #fff; - .btn span:hover{ + + .btn span:hover { cursor: pointer; } + .type-nav { display: flex; line-height: 40px; @@ -576,9 +596,11 @@ width: 50px !important; } } - .line{ + + .line { padding: 0 5px; } + &::v-deep .el-dialog__header, &::v-deep .el-dialog__body { background-color: #06122c; -- Gitblit v1.8.0