Merge remote-tracking branch 'origin/visu_emergency_01_siping_2.5d' into visu_emergency_01_siping_2.5d

# Conflicts:
#	src/views/firespread.vue

src/views/eventdetailsdialog.vue

@@ -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;">
@@ -1664,13 +1664,7 @@ console.log(this.dutysystemTableData)
                   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 @@ console.log(this.dutysystemTableData)
                 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 @@ console.log(this.dutysystemTableData)
         }
       } 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++) {

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;">
@@ -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">' +
@@ -2400,9 +2394,6 @@ export default {
                 keepBindPopup: false,
                 isAggregation: true
               }
-              if (res.data.length > 50) {
-                markersMap.isAggregation = true
-              }
               if (type == 'qsk') {
                 markersMap.icon = 'sj-icon-waterintake'
               } else if (type == 'sh') {