王通 1 rok pred
rodič
commit
520e9057a9

+ 1 - 1
src/components/TVWall.vue

@@ -399,7 +399,7 @@ export default {
         }
       ]
       if(array1 != undefined && array1 != null ){
-        params.ctrlProperty.splitNum = (array1.length == 1 ? 1 : 4)
+        params[0].ctrlProperty.splitNum = (array1.length == 1 ? 1 : 4)
       }
       this.setPos()
       this.customizeTree(tvListJson);

+ 4 - 3
src/components/vBottomMenu.vue

@@ -194,11 +194,11 @@
               </div>
             </div>
             <div class="btm-r-pop-info-btm">
-              <el-link type="success" v-if="item.eventCode!=null" @click="showEventDialog_message(item.eventCode)">
+              <el-link type="success" v-if="item.eventCode!=null&&item.type ==1" @click="showEventDialog_message(item.eventCode)">
                 查看事件详情
               </el-link>
               <div class="btm-r-pop-info-btm-btn">
-                <el-button type="primary" @click="selectMessageById(item.id)">标记已读
+                <el-button type="primary" v-if="item.type ==2" @click="selectMessageById(item.id)">标记已读
                 </el-button>
               </div>
             </div>
@@ -1367,6 +1367,7 @@ export default {
             if (res.code == 200) {
               that.$message.success(`处理成功!`)
               that.refreshEvent(that.eventCode)
+              that.selectMessageList()
               that.cancelEventConfirm_send()
               that.showEventConfirm = false
             } else if (res.code == 304) {
@@ -1403,6 +1404,7 @@ export default {
             if (res.code == 200) {
               that.$message.success(`处理成功!`)
               that.refreshEvent(that.eventCode)
+              that.selectMessageList()
               that.cancelEventConfirm_send()
               that.showEventConfirm = false
             } else if (res.code == 304) {
@@ -1426,7 +1428,6 @@ export default {
         eventCode: eventCode
       }).then(res => {
         let markersMapList = [];
-        that.eventDialog = true
         that.eventLogList = res.data.eventlog
         that.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo //应急预案
         that.address = res.data.catalogue.address