From 2c131f137ee0b49e8a00beb030b750ecd8507341 Mon Sep 17 00:00:00 2001
From: zzq <15064940501@163.com>
Date: Tue, 15 Aug 2023 18:12:47 +0800
Subject: [PATCH] youhua

---
 src/views/home/index.vue             | 36 +++++++---------
 src/views/home/widget/personnel.vue  | 62 ++++++++++++++++++++++++----
 src/views/home/widget/reportlist.vue | 24 +++++++++++
 3 files changed, 94 insertions(+), 28 deletions(-)

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 1849052..9a6aaba 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -49,13 +49,9 @@
       </div>
 
       <div class="huoqing-box" v-if="reportlistShow">
-        <div class="close-button" @click="reportlistShow = false">
-          <i class='el-icon el-icon-close'></i>
-        </div>
-
         <reportlist :mergeSuccessRandom="mergeSuccessRandom" @wuzi="wuzi" @shuiyuan="shuiyuan" @jiankong="jiankong"
           @renyuan="renyuan" @merge="mergeboxShow=true;" @changeCurrentInfo="changeCurrentInfo" :globalmap="globalmap"
-          :checkList="checkList"></reportlist>
+          :checkList="checkList" @close="reportlistShow = false"></reportlist>
       </div>
 
       <div class="huoqing-box" v-if="mergeboxShow">
@@ -673,21 +669,21 @@
                   this.setVisibleShow = true
                 }
               },
-              {
-                text: "箭头",
-                callback: (e) => {
-                  const mpt = mars3d.LngLatPoint.fromCartesian(e.cartesian)
-                  this.setDatas = {
-                    title: '',
-                    lng: mpt._lng,
-                    lat: mpt._lat,
-                    iconUrl: '箭头',
-                    remark: ''
-                  }
-                  this.rightType = 3
-                  this.setVisibleShow = true
-                }
-              }
+              // {
+              //   text: "箭头",
+              //   callback: (e) => {
+              //     const mpt = mars3d.LngLatPoint.fromCartesian(e.cartesian)
+              //     this.setDatas = {
+              //       title: '',
+              //       lng: mpt._lng,
+              //       lat: mpt._lat,
+              //       iconUrl: '箭头',
+              //       remark: ''
+              //     }
+              //     this.rightType = 3
+              //     this.setVisibleShow = true
+              //   }
+              // }
             ]
 
           }
diff --git a/src/views/home/widget/personnel.vue b/src/views/home/widget/personnel.vue
index 1b2cbbc..242535a 100644
--- a/src/views/home/widget/personnel.vue
+++ b/src/views/home/widget/personnel.vue
@@ -34,7 +34,8 @@
               <div class="table-li" v-for="(item,index) in listData" :key="index">
                  <div class="flex jc-sb max-h">
                   <div class="flex-1 max-h flex column jc-sb fc-w max-w cursor" @click="flyToPosition(item)">
-                    <div class="flex fz-16">
+                    <div class="flex fz-16 ai-c">
+                      <div class="phonecheckbox" :class="checkPhoneArr.includes(item.phone)?'active':''" @click.stop="phoneCheckClick(item)"></div>
                       <div class="color1 mr-2">{{item.username}}</div>
                       <div>{{item.phone}}</div>
                     </div>
@@ -73,10 +74,11 @@
               listData:[],
               allData:[],
               fireLngLat:'',
-              distanceradio: 5,
+              distanceradio: 3,
               personnelGraphicLayer: null,
               graphicLayerArr: [],
-              areaName: localStorage.getItem("areaName") 
+              areaName: localStorage.getItem("areaName"),
+              checkPhoneArr:[]
           }
       },
       watch:{
@@ -106,6 +108,16 @@
           })
           this.$emit('close')
         },
+        phoneCheckClick(item){
+          if(!item.phone){
+            return
+          }
+          if(this.checkPhoneArr.includes(item.phone)){
+            this.checkPhoneArr = this.checkPhoneArr.filter(val => val != item.phone)
+          }else{
+            this.checkPhoneArr.push(item.phone)
+          }
+        },
         checkChange(){
           this.getListData();
         },
@@ -152,6 +164,7 @@
           if(this.distanceradio == 5){
             this.listData = arr
           }
+
           this.listData.sort((a,b)=>{
             return a.distance - b.distance
           })
@@ -217,10 +230,16 @@
           let date1 = time1.split('-')
           let date2 = time2.split(':')
           let dates = date1[0]+'年'+date1[1]+'月'+date1[2]+'日 '+date2[0]+'时'+date2[1]+'分'+date2[2]+'秒'
-          this.listData.forEach(item =>{
-            phoneArr.push(item.phone)
-          })
-          console.log('phoneArr',phoneArr.join(','))
+          
+          
+          if(this.checkPhoneArr.length>0){
+            phoneArr = this.checkPhoneArr
+          }else{
+            this.listData.forEach(item =>{
+              phoneArr.push(item.phone)
+            })
+          }
+        
           let param = {
             phoneNumbers: phoneArr.join(','),
             time: dates,
@@ -452,5 +471,32 @@
     width: 95%;
     height: 80px;
   }
-
+  .phonecheckbox{
+    width: 14px;
+    height: 14px;
+    border: 1px solid #DCDFE6;
+    border-radius: 3px;
+    background: #fff;
+    margin-right: 10px;
+  }
+  .phonecheckbox.active{
+    background: #409EFF;
+    border: 1px solid #409EFF;
+    position: relative;
+  }
+  .phonecheckbox.active::after{
+    box-sizing: content-box;
+    content: "";
+    border: 1px solid #FFF;
+    border-left: 0;
+    border-top: 0;
+    width: 3px;
+    height: 7px;
+    left: 4px;
+    top: 1px;
+    position: absolute;
+    transition: transform .15s ease-in .05s;
+    transform-origin: center;
+    transform: rotate(45deg) scaleY(1);
+  }
   </style>
\ No newline at end of file
diff --git a/src/views/home/widget/reportlist.vue b/src/views/home/widget/reportlist.vue
index 485cbef..05a39ae 100644
--- a/src/views/home/widget/reportlist.vue
+++ b/src/views/home/widget/reportlist.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="box">
     <div class="box-title">火情线索</div>
+    <div class="close-button" @click="close">
+        <i class='el-icon el-icon-close'></i>
+    </div>
     <div class="box-container">
         <div class="draw" v-show="active == 1">
             <div class="news" v-for="(item,index) in list" :key="index"  >
@@ -84,6 +87,11 @@ import { parse } from '../lib/handleGeojson';
                 this.$emit('merge')
             }
         },
+        close(){
+            this.graphicLayer.removeGraphic(this.graphicWinodw);
+            this.graphicLayer.removeGraphic(this.graphicPoint)
+            this.$emit("close")
+        },
         jiankong(e){
             this.$emit("jiankong",e);
         },
@@ -151,6 +159,9 @@ import { parse } from '../lib/handleGeojson';
                 })
                 _self.globalmap.addLayer(_self.graphicLayer)
             }
+            _self.graphicLayer.removeGraphic(_self.graphicWinodw);
+            _self.graphicLayer.removeGraphic(_self.graphicPoint)
+
             if(_self.graphicPoint && _self.graphicWinodw){
                 _self.graphicLayer.clear();
                 _self.graphicPoint = null;
@@ -357,5 +368,18 @@ border: 1px solid #F18B00;
   -webkit-box-shadow: inset 1px 1px 3px rgba(0, 0, 0, .35);
   background-color: rgba(0, 0, 0, .5)
 }
+.close-button {
+    position: absolute;
+    right: 20px;
+    top: 14px;
+    cursor: pointer;
+    color: #fff;
+    font-weight: bold;
+    width: 20px;
+    height: 20px;
+    background: #0ABFB5cc;
+    line-height: 20px;
+    text-align: center;
+  }
 
 </style>
\ No newline at end of file