From 1c0bb2817007566179ada20ae740018ba6a9615a Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 17 十一月 2022 17:40:16 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

---
 src/views/operate/disposal/casepool/dispatch/index.vue |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/views/operate/disposal/casepool/dispatch/index.vue b/src/views/operate/disposal/casepool/dispatch/index.vue
index effa791..3c0252b 100644
--- a/src/views/operate/disposal/casepool/dispatch/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/index.vue
@@ -35,7 +35,7 @@
                             <el-link @click="JumpView(scope.row)">{{scope.row.code}}</el-link>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="7">
+                    <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="8">
                         <template slot-scope="scope">
                             <span>{{scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛涓婁紶'}}</span>
                         </template>
@@ -58,7 +58,7 @@
                         </template>
                     </el-table-column>
                     <el-table-column :prop="mystatus === 1 ? 'street' :'buildingArea'"
-                        :label="mystatus===1 ? '鎵�灞炲尯鍩�' : '杩濇硶寤虹瓚闈㈢Н'" min-width="10">
+                        :label="mystatus===1 ? '鎵�灞炲尯鍩�' : '杩濇硶寤虹瓚闈㈢Н'" min-width="12">
                     </el-table-column>
                     <el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="15" v-if="mystatus===1">
                         <template slot-scope="scope">
@@ -66,14 +66,12 @@
                         </template>
                     </el-table-column>
                     <el-table-column :prop="mystatus === 1 ? 'continueTime' :'materials'"
-                        :label="mystatus===1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="10">
+                        :label="mystatus===1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="12">
                     </el-table-column>
-                    <el-table-column prop="operation" label="鎿嶄綔" min-width="20">
+                    <el-table-column prop="operation" label="鎿嶄綔" min-width="15">
                         <template slot-scope="scope">
                             <div class="operation">
                                 <div class="btn">
-                                    <span>璋冨害</span>
-                                    <span class="line">|</span>
                                     <span @click="opernDialog(scope.row)">涓婁紶澶勭疆缁撴灉</span>
                                 </div>
                             </div>
@@ -87,10 +85,10 @@
                     <MyIllDetail :info=info v-else></MyIllDetail>
                 </el-dialog>
                 <!-- 涓婁紶椤甸潰 -->
-                <el-dialog :visible.sync="dialogUpload" width="60%" title="涓婁紶澶勭疆缁撴灉" v-if="dialogUpload"
+                <el-dialog :visible.sync="dialogUpload" width="80%" 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>
+                    <uploadVio v-if="mystatus === 1" :caseId="caseId" :mycode="caseCode"  @closeDialog="closeDialog"></uploadVio>
+                    <uploadIll v-else :caseId="caseId" :mycode="caseCode" @closeDialog="closeDialog"></uploadIll>
                 </el-dialog>
                 <!-- tools -->
                 <div class="tools">
@@ -181,6 +179,7 @@
             statusArr: [],
             mystatus: 1,
             caseId: '',
+            caseCode:null,
         }
     },
     created() {
@@ -263,7 +262,6 @@
                         url: `sccg/violations/delete?id=${number}`,
                     })
                         .then(res => {
-                            console.log(res);
                             this.$message({
                                 type: res.code === 200 ? 'success' : 'warning',
                                 message: res.message
@@ -277,14 +275,12 @@
         // 鑾峰彇鐢ㄦ埛鍒楄〃
         getUserList() {
             const { currentPage, pageSize, context, statusArr } = this;
-            console.log(statusArr);
             this.$axios({
                 method: 'get',
                 url: `sccg/base_case/query?state=${statusArr[0]}&current=${currentPage}&size=${pageSize}&resource=2&type=${statusArr[1]}`
             }).then(res => {
                 this.totalNum = res.data.total;
                 this.tableData = res.data.records;
-                console.log(res);
             })
         },
         // 鏇存敼杩濊/杩濆缓
@@ -351,6 +347,7 @@
         opernDialog(data) {
             this.dialogUpload = true;
             this.caseId = data.id;
+            this.caseCode = data.code
             // console.log(data); 
         },
         // 鍏抽棴涓婁紶鐣岄潰

--
Gitblit v1.8.0