详情页聚合

src/views/eventdetailsdialog.vue

@@ -23,17 +23,17 @@
                           <a :href="visuForestCloudYuAnBo.fileUrl" ><span><div style=" width: 50px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;word-break: keep-all;">{{ visuForestCloudYuAnBo.reserveName }}</div></span></a>
                         </el-tooltip> -->
                         <el-tooltip
-                          placement="top"
-                          popper-class="js-tps"
-                          :visible-arrow="visuForestCloudYuAnBo.reserveName.length>6"
-                        >
-                          <div slot="content" class="leader-info-container">
-                            <div class="leader-info-list-con" v-show="visuForestCloudYuAnBo.reserveName.length>6">
-                              <h4>{{ visuForestCloudYuAnBo.reserveName }}</h4>
-                            </div>
-                          </div>
-                          <a :href="visuForestCloudYuAnBo.fileUrl">{{ visuForestCloudYuAnBo.reserveName | ellipsisFont6 }}</a>
-                        </el-tooltip>
+                        placement="top"
+                        popper-class="js-tps"
+                        :visible-arrow="visuForestCloudYuAnBo.reserveName.length>6"
+                  >
+                  <div slot="content" class="leader-info-container">
+                    <div class="leader-info-list-con" v-show="visuForestCloudYuAnBo.reserveName.length>6">
+                      <h4>{{ visuForestCloudYuAnBo.reserveName }}</h4>
+                    </div>
+                  </div>
+                  <a :href="visuForestCloudYuAnBo.fileUrl">{{ visuForestCloudYuAnBo.reserveName | ellipsisFont6 }}</a>
+                </el-tooltip>
                       </el-carousel-item>
                       <el-carousel-item v-else>
                         <a href="#">暂未关联预案</a>
@@ -87,7 +87,7 @@
                                 :isdynamicPlotting="true"
                                 @preview="preview"/>
                 <!-- <supermapDialog ref="supermapDialog" -->
-                <!-- @preview="preview"/> -->
+                                <!-- @preview="preview"/> -->
                 <!-- 地图end -->
               </div>
             </el-col>
@@ -96,7 +96,7 @@
             <el-col :span="6" class="dia-right">
               <div class="e-right">
                 <div class="forthis1">
-                  <dv-border-box-7 backgroundColor="#040b1f" :color="['#0c4b53', '#18caca']"
+                  <dv-border-box-7 backgroundColor="#040b1f"
                                    style="padding-bottom:1rem ;">
                     <div class="i-list-con">
                       <div class="this-con">
@@ -158,7 +158,7 @@
                   </dv-border-box-7>
                 </div>
                 <div class="forthis2">
-                  <dv-border-box-7 backgroundColor="#040b1f" :color="['#0c4b53', '#18caca']" >
+                  <dv-border-box-7 backgroundColor="#040b1f" >
                     <div class="i-list-con">
                       <div class="this-con h-25 no-padding">
                         <div class="z-info-list" style="margin-top: 0;">
@@ -229,14 +229,14 @@
                               <div class="z-info-btm-input-btn" v-else-if="eventStatusValue=='forest_event_status_2'">
                                 <div>
                                   <!--<el-button size="small"-->
-                                  <!--icon="el-icon-question"-->
-                                  <!--@click="updateCentereventTEventcatalogueStatus('wb',false)">-->
-                                  <!--误报-->
+                                             <!--icon="el-icon-question"-->
+                                             <!--@click="updateCentereventTEventcatalogueStatus('wb',false)">-->
+                                    <!--误报-->
                                   <!--</el-button>-->
                                   <!--<el-button size="small"-->
-                                  <!--icon="el-icon-warning"-->
-                                  <!--@click="updateCentereventTEventcatalogueStatus('cf',false)">-->
-                                  <!--重复-->
+                                             <!--icon="el-icon-warning"-->
+                                             <!--@click="updateCentereventTEventcatalogueStatus('cf',false)">-->
+                                    <!--重复-->
                                   <!--</el-button>-->
                                   <el-button size="small"
                                              icon="el-icon-phone" style="text-align:left"
@@ -367,13 +367,13 @@
           </el-select>
         </el-form-item>
         <!--<el-form-item label="联系人" v-if="eventStatusButton=='qs'">-->
-        <!--<el-select multiple collapse-tags v-model='sendUserFegin' placeholder='请选择联系人！' clearable filterable>-->
-        <!--<el-option-->
-        <!--v-for="item in userFeginList"-->
-        <!--:label="item.nickName"-->
-        <!--:value="item.phonenumber"-->
-        <!--/>-->
-        <!--</el-select>-->
+          <!--<el-select multiple collapse-tags v-model='sendUserFegin' placeholder='请选择联系人！' clearable filterable>-->
+            <!--<el-option-->
+              <!--v-for="item in userFeginList"-->
+              <!--:label="item.nickName"-->
+              <!--:value="item.phonenumber"-->
+            <!--/>-->
+          <!--</el-select>-->
         <!--</el-form-item>-->
         <el-button size="mini" type="primary" v-if="eventStatusButton=='qr'"
                    @click="updateCentereventTEventcatalogueStatus('qr',false)">确认
@@ -471,10 +471,10 @@
                     @click="handleDelete(scope.$index, scope.row)">删除
                   </el-button>
                   <!--<el-button-->
-                  <!--size="mini"-->
-                  <!--type="danger"-->
-                  <!--icon="el-icon-save"-->
-                  <!--@click="handleSave(scope.$index, scope.row)">保存-->
+                    <!--size="mini"-->
+                    <!--type="danger"-->
+                    <!--icon="el-icon-save"-->
+                    <!--@click="handleSave(scope.$index, scope.row)">保存-->
                   <!--</el-button>-->
                 </template>
               </el-table-column>
@@ -578,8 +578,8 @@
             <th rowspan="1" colspan="6" align="left"><input type="text" style="width:3rem;text-align: center;"
                                                             v-model="table1.reportTimeY"/>年<input
               type="text" style="width:4rem;text-align: center;" v-model="table1.reportTimeM"/>月<input type="text"
-                                                                                                        style="width:3rem;text-align: center;"
-                                                                                                        v-model="table1.reportTimeD"/>日
+                                                                                                       style="width:3rem;text-align: center;"
+                                                                                                       v-model="table1.reportTimeD"/>日
             </th>
             <th rowspan="1" colspan="8" style="text-align: right;">吉林省人民政府森林防火指挥部办公室制</th>
             </thead>
@@ -1508,7 +1508,7 @@ export default {
       this.showMeetingMsgDialog = false
     },
     addResponsibilityDialog() {//责任制保存
-      console.log(this.dutysystemTableData)
+console.log(this.dutysystemTableData)
       let reg_user = /^[\u4e00-\u9fa5]{2,4}$/;    //2-4个中文字符正则
       let reg_tel = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;    //11位手机号码正则
       for(let i in this.dutysystemTableData){
@@ -1619,8 +1619,8 @@ export default {
         this.$message.error(`修改预案信息在签收后方可修改！`)
         return
       }else if(this.eventStatusValue=='forest_event_status_3'){
-        this.$message.error(`误报事件无法修改预案信息！`)
-        return
+          this.$message.error(`误报事件无法修改预案信息！`)
+          return
       }else{
         let param = { eventCode: this.eventCode, reserve: this.sendGuanLianYuAn }
         if(this.sendGuanLianYuAn==''||this.sendGuanLianYuAn==null){
@@ -1664,13 +1664,7 @@ export default {
                   keepBindPopup: false,
                   isAggregation: true
                 }
-                if (res.data.pointList.length > 50) {
-                  markersMap.isAggregation = true
-                }
-                // centerdata_t_firecontrol_basic_linkage_force
-                // sj-icon-map-centerdata-t-firecontrol-basic-linkage-force
                 markersMap.icon = 'sj-icon-map-' + type.replaceAll("_", "-");
-                // alert(res.data.pointList[i].longitude)
                 markersMap.lng = res.data.pointList[i].longitude;
                 markersMap.lat = res.data.pointList[i].latitude;
                 markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -1739,9 +1733,6 @@ export default {
                 keepBindPopup: false,
                 isAggregation: true
               }
-              if (res.data.length > 50) {
-                markersMap.isAggregation = true
-              }
               if (type == 'qsk') {
                 markersMap.icon = 'sj-icon-centerdata-t-forest-waterintake'
               } else if (type == 'sh') {
@@ -2038,7 +2029,7 @@ export default {
         }
       } else {//事件提交后台
         if (eventStatus == 'ld') {
-          //事件处理流程--联动
+          //事件处理流程--联动1
           let array = that.$refs.LiandongDept.getCheckedNodes()
           if (array != null && array.length > 0) {
             for (let i = 0; i < array.length; i++) {
@@ -2139,15 +2130,11 @@ export default {
           updateCentereventTEventcatalogueStatus(param).then(res => {
             if (res.code == 200) {
               that.$message.success(`处理成功!`)
+              that.refreshEvent(that.eventCode)
               that.cancelEventConfirm_send()
               that.showEventConfirm_gd = false
               that.$emit('getEventList', that.calendarDay,10,1)
               that.$emit('getSupermap', that.calendarDay)
-                if (eventStatus == "cf" || eventStatus == "wb") {
-                  this.eventDialog = false;
-                  return;
-                }
-              that.refreshEvent(that.eventCode)
             }
           })
         } else if(eventStatus == 'cz'){
@@ -2192,11 +2179,15 @@ export default {
           updateCentereventTEventcatalogueStatus(param).then(res => {
             if (res.code == 200) {
               that.$message.success(`处理成功!`)
-              that.refreshEvent(that.eventCode)
               that.cancelEventConfirm_send()
               that.showEventConfirm = false
               that.$emit('getEventList', that.calendarDay,10,1)
               that.$emit('getSupermap', that.calendarDay)
+                if (eventStatus == "cf" || eventStatus == "wb") {
+                  this.eventDialog = false;
+                  return;
+                }
+              that.refreshEvent(that.eventCode)
             }
           })
         }
@@ -2281,8 +2272,8 @@ export default {
           markersMap.radius = res.data.eventdetail[0].fireRadius
         }
         setTimeout(() => {
-          that.$refs.supermapDialog.dynamicPlotting()//弹出动态绘制窗口，防止截图位置改变
-          that.$refs.supermapDialog.clearM(false)
+           that.$refs.supermapDialog.dynamicPlotting()//弹出动态绘制窗口，防止截图位置改变
+           that.$refs.supermapDialog.clearM(false)
           that.$refs.supermapDialog.clearM(true)
           that.$refs.supermapDialog.setMarkersRadius([markersMap])
           that.$refs.supermapDialog.dropLocation10(res.data.catalogue.latitude, res.data.catalogue.longitude)

src/views/findUserByDept.vue

@@ -96,10 +96,11 @@
         for (let i in selection){
           const res = {};
           res.id = selection[i].userId;
+          res.userId=''
           res.dept = '';
           res.depteventId = '';
           res.name = selection[i].nickName;
-          res.post = selection[i].postName;;
+          res.post = selection[i].postName;
           res.telphone = selection[i].phonenumber;
           this.resUser.push(res);
         }

src/views/firespread.vue

@@ -76,7 +76,7 @@
             <el-col :span="6" class="dia-right">
               <div class="e-right">
                 <div class="forthis1">
-                  <dv-border-box-7 backgroundColor="#040b1f" :color="['#0c4b53', '#18caca']"
+                  <dv-border-box-7 backgroundColor="#040b1f"
                                    style="padding-bottom:1rem ;">
                     <div class="i-list-con">
                       <div class="this-con">
@@ -138,7 +138,7 @@
                   </dv-border-box-7>
                 </div>
                 <div class="forthis2">
-                  <dv-border-box-7 backgroundColor="#040b1f" :color="['#0c4b53', '#18caca']" >
+                  <dv-border-box-7 backgroundColor="#040b1f"  >
                     <div class="i-list-con">
                       <div class="this-con h-25 no-padding">
                         <div class="z-info-list" style="margin-top: 0;">
@@ -193,14 +193,14 @@
                                     签收
                                   </el-button>
                                   <el-button size="small"
-                                             icon="el-icon-question"
-                                             @click="updateCentereventTEventcatalogueStatus('wb',false)">
-                                    误报
+                                  icon="el-icon-question"
+                                  @click="updateCentereventTEventcatalogueStatus('wb',false)">
+                                  误报
                                   </el-button>
                                   <el-button size="small"
-                                             icon="el-icon-warning"
-                                             @click="updateCentereventTEventcatalogueStatus('cf',false)">
-                                    重复
+                                  icon="el-icon-warning"
+                                  @click="updateCentereventTEventcatalogueStatus('cf',false)">
+                                  重复
                                   </el-button>
                                 </div>
                                 <el-button size="small" icon="el-icon-chat-dot-square" @click="sendEventLog()">发送
@@ -2158,13 +2158,7 @@ export default {
                   keepBindPopup: false,
                   isAggregation: true
                 }
-                if (res.data.pointList.length > 50) {
-                  markersMap.isAggregation = true
-                }
-                // centerdata_t_firecontrol_basic_linkage_force
-                // sj-icon-map-centerdata-t-firecontrol-basic-linkage-force
                 markersMap.icon = 'sj-icon-map-' + type.replaceAll("_", "-");
-                // alert(res.data.pointList[i].longitude)
                 markersMap.lng = res.data.pointList[i].longitude;
                 markersMap.lat = res.data.pointList[i].latitude;
                 markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -2398,10 +2392,7 @@ export default {
                 click: '',
                 parameter: '',
                 keepBindPopup: false,
-                isAggregation: false
-              }
-              if (res.data.length > 50) {
-                markersMap.isAggregation = true
+                isAggregation: true
               }
               if (type == 'qsk') {
                 markersMap.icon = 'sj-icon-waterintake'
@@ -2902,7 +2893,7 @@ export default {
           click: '',
           parameter: '',
           keepBindPopup: false,
-          isAggregation: false,
+          isAggregation: true,
           radius: 0
         }
         if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount == 0) {
@@ -2941,7 +2932,7 @@ export default {
             click: 'preview',
             parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory,name:res.data.centermonitorTCamera.name},
             keepBindPopup: false,
-            isAggregation: false,
+            isAggregation: true,
             radius: 0
           }
           markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -2998,7 +2989,7 @@ export default {
           click: '',
           parameter: '',
           keepBindPopup: false,
-          isAggregation: false,
+          isAggregation: true,
           radius: 0
         }
         if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount == 0) {
@@ -3039,7 +3030,7 @@ export default {
             click: 'preview',
             parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory,name:res.data.centermonitorTCamera.cameraName},
             keepBindPopup: false,
-            isAggregation: false,
+            isAggregation: true,
             radius: 0
           }
           markersMap.bindPopupHtml = '<div class="map-tip">' +