From a6cf71dc4915bcde7b2e6406e868f09d0b257541 Mon Sep 17 00:00:00 2001
From: helloxujingliang <3225043@qq.com>
Date: Fri, 22 Sep 2023 09:00:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E7=BB=9F=E8=AE=A1=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=81=E9=99=84=E8=BF=91=E6=B0=B4=E6=BA=90=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/config/app.json                     |    4 +-
 src/views/home/widget/personnel.vue        | 1103 ++++++++++----------
 src/views/home/widget/rightechartsdata.vue |   39 +-
 src/views/home/widget/waterbox.vue         |    4 +-
 4 files changed, 606 insertions(+), 544 deletions(-)

diff --git a/public/config/app.json b/public/config/app.json
index 2dd7cca..9d54a90 100644
--- a/public/config/app.json
+++ b/public/config/app.json
@@ -35,7 +35,7 @@
             "center":[],
             "zoom":null
         },
-        "waterUrl":"http://223.99.16.253:9007/geoserver/ksp/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=ksp%3Ashp_1686208018&maxFeatures=50000&outputFormat=application%2Fjson",
+        "waterUrl":"http://60.217.22.180:9007/geoserver/ksp/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=ksp%3Aqushuidian&maxFeatures=50000&outputFormat=application%2Fjson",
         "goodsUrl":"",
         "tools":{
             "routebox":true,
@@ -58,7 +58,7 @@
             "center":[],
             "zoom":null
         },
-        "waterUrl":"http://223.99.16.253:9007/geoserver/ksp/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=ksp%3Ashp_1686208018&maxFeatures=50000&outputFormat=application%2Fjson",
+        "waterUrl":"http://60.217.22.180:9007/geoserver/ksp/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=ksp%3Aqushuidian&maxFeatures=50000&outputFormat=application%2Fjson",
         "goodsUrl":"",
         "tools":{
             "routebox":true,
diff --git a/src/views/home/widget/personnel.vue b/src/views/home/widget/personnel.vue
index 9386cde..0be9999 100644
--- a/src/views/home/widget/personnel.vue
+++ b/src/views/home/widget/personnel.vue
@@ -1,230 +1,237 @@
 <template>
-    <div class="box">
-      <div class="box-name">人员</div>
-      <div class="close-button" @click="close">
-          <i class='el-icon el-icon-close'></i>
-      </div>
-      <div class="box-title" >
-        <div class="flex" style="margin-top:15px;margin-bottom:5px;">
-          <span class="titlebox">人员类型：</span>
-          <div class="flex-1">
-            <el-checkbox-group v-model="checkList" @change="checkChange">
-              <el-checkbox label="护林员" value="1" style="margin-right:10px;"></el-checkbox>
-              <el-checkbox label="消防员" value="2"></el-checkbox>
-            </el-checkbox-group>
-          </div>
-        </div>
-        <div class="flex" style="margin-bottom:10px;">
-          <span class="titlebox">距离：</span>
-          <div>
-            <el-radio-group v-model="distanceradio" @input="radioChange">
-              <el-radio :label="1" class="mr-1">小于1km</el-radio>
-              <el-radio :label="2" class="mr-1">1~5km</el-radio>
-              <el-radio :label="3" class="mr-1">5~10km</el-radio>
-              <el-radio :label="4" class="mr-1">大于10km</el-radio>
-              <el-radio :label="5">全部</el-radio>
-            </el-radio-group>
-          </div>
-        </div>
-        <div class="flex">
-          <span class="titlebox"></span>
-          <div class="flex">
-            <span>自定义</span>
-            <el-input type="number" size="mini" style="width:100px;margin-right:10px;margin-left: 10px;" v-model="startdistance"></el-input>
-            <el-input type="number" size="mini" style="width:100px;margin-right: 10px;" v-model="enddistance"></el-input>
-            <el-button type="primary" size="mini" icon="el-icon-search" @click="selListData">查询</el-button>
-          </div>
-        </div>
-        
-
-      </div>
-      <div class="box-container">
-          <div class="table-body">
-              <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 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>
-                    <div class="line"></div>
-                    <div class="flex fz-10">
-                      <div class="li-desc">{{item.type}}</div>
-                      <div class="li-desc">距离：<span class="color2">{{item.distance}}公里</span></div>
-                      <div class="li-desc">预计到达时间：<span class="color2">{{item.duration}}分钟</span></div>
-                    </div>
-                  </div>
-                  <div class="flex ai-c jc-e" style="width:75px">
-                    <img class="img-box" src="/img/phone.png" @click="callPhone(item.phone)" />
-                  </div>
-                 </div>
-              </div>
-          </div>
-          <div class="flex ai-c jc-e callbox">
-            <el-input placeholder="请输入呼叫内容" v-model="callText"></el-input>
-            <el-button type="primary" size="large" @click="callPhoneAll">一键呼叫</el-button>
-          </div>
-      </div>
-
-      
+  <div class="box">
+    <div class="box-name">人员</div>
+    <div class="close-button" @click="close">
+      <i class='el-icon el-icon-close'></i>
     </div>
-  </template>
+    <div class="box-title">
+      <div class="flex" style="margin-top:15px;margin-bottom:5px;">
+        <span class="titlebox">人员类型：</span>
+        <div class="flex-1">
+          <el-checkbox-group v-model="checkList" @change="checkChange">
+            <el-checkbox label="护林员" value="1" style="margin-right:10px;"></el-checkbox>
+            <el-checkbox label="消防员" value="2" style="margin-right:10px;"></el-checkbox>
+            <el-checkbox label="网格员" value="3"></el-checkbox>
+          </el-checkbox-group>
+        </div>
+      </div>
+      <div class="flex" style="margin-bottom:10px;">
+        <span class="titlebox">距离：</span>
+        <div>
+          <el-radio-group v-model="distanceradio" @input="radioChange">
+            <el-radio :label="1" class="mr-1">1km内</el-radio>
+            <el-radio :label="2" class="mr-1">5Km内</el-radio>
+            <el-radio :label="3" class="mr-1">10km内</el-radio>
+            <el-radio :label="5">全部</el-radio>
+          </el-radio-group>
+        </div>
+      </div>
+      <div class="flex">
+        <span class="titlebox"></span>
+        <div class="flex">
+          <span>自定义</span>
+          <el-input type="number" size="mini" style="width:100px;margin-right:10px;margin-left: 10px;"
+            v-model="startdistance"></el-input>
+          <el-input type="number" size="mini" style="width:100px;margin-right: 10px;" v-model="enddistance"></el-input>
+          <el-button type="primary" size="mini" icon="el-icon-search" @click="selListData">查询</el-button>
+        </div>
+      </div>
+
+
+    </div>
+    <div class="box-container">
+      <div class="table-body">
+        <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 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>
+              <div class="line"></div>
+              <div class="flex fz-10">
+                <div class="li-desc">{{ item.type }}</div>
+                <div class="li-desc">距离：<span class="color2">{{ item.distance }}公里</span></div>
+                <div class="li-desc">预计到达时间：<span class="color2">{{ item.duration }}分钟</span></div>
+              </div>
+            </div>
+            <div class="flex ai-c jc-e" style="width:75px">
+              <img class="img-box" src="/img/phone.png" @click="callPhone(item.phone)" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="flex ai-c jc-e callbox">
+        <el-input placeholder="请输入呼叫内容" v-model="callText"></el-input>
+        <el-button type="primary" size="large" @click="callPhoneAll">一键呼叫</el-button>
+      </div>
+    </div>
+
+
+  </div>
+</template>
   
-  <script>
-  import { postMethodCommon } from '@/api/common.js';
-  import appConfig from '../../../../public/config/app.json'
-  import axios from "axios";
-    export default {
-      name: 'monitorbox',
-      props:['globalmap','fireData'],
-      data(){
-          return{
-              checkList:['护林员','消防员'],
-              listData:[],
-              allData:[],
-              fireLngLat:'',
-              distanceradio: 3,
-              personnelGraphicLayer: null,
-              graphicLayerArr: [],
-              areaName: localStorage.getItem("areaName"),
-              checkPhoneArr:[],
-              startdistance: null,
-              enddistance: null,
-              callText:null,
-          }
+<script>
+import { postMethodCommon } from '@/api/common.js';
+import appConfig from '../../../../public/config/app.json'
+import axios from "axios";
+export default {
+  name: 'monitorbox',
+  props: ['fireData'],
+  data() {
+    return {
+      checkList: ['护林员', '消防员','网格员'],
+      listData: [],
+      allData: [],
+      fireLngLat: '',
+      distanceradio: 5,
+      personnelGraphicLayer: null,
+      graphicLayerArr: [],
+      areaName: localStorage.getItem("areaName"),
+      checkPhoneArr: [],
+      startdistance: null,
+      enddistance: null,
+      callText: null,
+    }
+  },
+  watch: {
+    fireData: {
+      handler(newVal, oldVal) {
+        this.fireLngLat = [newVal.lng, newVal.lat]
+        this.getListData();
       },
-      watch:{
-        fireData:{
-          handler(newVal,oldVal) {
-            this.fireLngLat = [newVal.lng,newVal.lat]
-            this.getListData();
+      immediate: true,
+      // 开启深度监听 deep
+      deep: true
+    },
+    status: {
+      handler(newVal, oldVal) {
+        console.log('status', newVal)
+      }
+    },
+  },
+  created() {
+    // console.log('appConfig',appConfig.gaodeApi)
+    // this.getListData();
+    window.videoCall = this.videoCall
+  },
+  methods: {
+    videoCall(phone) {
+      this.$emit("videoCall", phone);
+    },
+    close() {
+      this.graphicLayerArr.forEach(item => {
+        this.personnelGraphicLayer.removeGraphic(item)
+      })
+      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();
+    },
+    flyToPosition(item) {
+      console.log('ii', item)
+      if (item.lat && item.lng) {
+        let lngLat = [item.lng, item.lat]
+        window.globalmap.flyToPoint(lngLat, { radius: 1000, "pitch": -90 });
+      } else {
+        console.log('人员无坐标')
+      }
+
+    },
+    radioChange(e) {
+      let arr = this.allData
+      let newArr = []
+      if (this.distanceradio == 1) {
+        arr.forEach(item => {
+          if (item.distance < 1) {
+            newArr.push(item)
+          }
+        })
+        this.listData = newArr
+      }
+      if (this.distanceradio == 2) {
+        arr.forEach(item => {
+          if (item.distance < 5) {
+            newArr.push(item)
+          }
+        })
+        this.listData = newArr
+      }
+      if (this.distanceradio == 3) {
+        arr.forEach(item => {
+          if (item.distance < 10) {
+            newArr.push(item)
+          }
+        })
+        this.listData = newArr
+      }
+      if (this.distanceradio == 4) {
+        arr.forEach(item => {
+          if (item.distance >= 10) {
+            newArr.push(item)
+          }
+        })
+        this.listData = newArr
+      }
+      if (this.distanceradio == 5) {
+        this.listData = arr
+      }
+
+      this.listData.sort((a, b) => {
+        return a.distance - b.distance
+      })
+      this.handleGraphic()
+
+    },
+    selListData() {
+      let arr = this.allData
+      let newArr = []
+      arr.forEach(item => {
+        if (Number(item.distance) >= this.startdistance && Number(item.distance) < this.enddistance) {
+          console.log('item', item)
+          newArr.push(item)
+        }
+      })
+      this.listData = newArr
+
+      this.listData.sort((a, b) => {
+        return a.distance - b.distance
+      })
+      this.handleGraphic()
+    },
+    handleGraphic() {
+      if (this.personnelGraphicLayer == null) {
+        this.personnelGraphicLayer = new mars3d.layer.GraphicLayer();
+        window.globalmap.addLayer(this.personnelGraphicLayer);
+      }
+      this.graphicLayerArr.forEach(item => {
+        this.personnelGraphicLayer.removeGraphic(item)
+      })
+      this.graphicLayerArr = []
+      this.listData.forEach((item, index) => {
+        let graphic = new mars3d.graphic.BillboardEntity({
+          position: [item.lng, item.lat],
+          style: {
+            image: "img/jiuyuanrenyuan.png",
+            horizontalOrigin: Cesium.HorizontalOrigin.LEFT,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 200000), // 按视距距离显示
+            scaleByDistance: new Cesium.NearFarScalar(1000, 0.4, 8000, 0.2),
+            clampToGround: true
           },
-          immediate: true,
-          // 开启深度监听 deep
-          deep: true
-        },
-        status:{
-          handler(newVal,oldVal) {
-            console.log('status',newVal)
-          }
-        },
-      },
-      created(){
-        // console.log('appConfig',appConfig.gaodeApi)
-          // this.getListData();
-          window.videoCall = this.videoCall
-      },
-      methods:{
-        videoCall(phone){
-            this.$emit("videoCall",phone);
-        },
-        close(){
-          this.graphicLayerArr.forEach(item =>{
-            this.personnelGraphicLayer.removeGraphic(item)
-          })
-          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();
-        },
-        flyToPosition(item){
-            console.log('ii',item)
-            let lngLat = [item.lng,item.lat]
-            this.globalmap.flyToPoint(lngLat,{radius:1000,"pitch":-90});
-        },
-        radioChange(e){
-          let arr = this.allData
-          let newArr = []
-          if(this.distanceradio == 1){
-            arr.forEach(item =>{
-              if(item.distance < 1){
-                newArr.push(item)
-              }
-            })
-            this.listData = newArr
-          }
-          if(this.distanceradio == 2){
-            arr.forEach(item =>{
-              if(item.distance >= 1 && item.distance < 5){
-                newArr.push(item)
-              }
-            })
-            this.listData = newArr
-          }
-          if(this.distanceradio == 3){
-            arr.forEach(item =>{
-              if(item.distance >= 5 && item.distance < 10){
-                newArr.push(item)
-              }
-            })
-            this.listData = newArr
-          }
-          if(this.distanceradio == 4){
-            arr.forEach(item =>{
-              if(item.distance >= 10){
-                newArr.push(item)
-              }
-            })
-            this.listData = newArr
-          }
-          if(this.distanceradio == 5){
-            this.listData = arr
-          }
-
-          this.listData.sort((a,b)=>{
-            return a.distance - b.distance
-          })
-          this.handleGraphic()
-          
-        },
-        selListData(){
-          let arr = this.allData
-          let newArr = []
-          arr.forEach(item =>{
-            if(Number(item.distance) >= this.startdistance && Number(item.distance) < this.enddistance){
-              console.log('item',item)
-              newArr.push(item)
-            }
-          })
-          this.listData = newArr
-
-          this.listData.sort((a,b)=>{
-            return a.distance - b.distance
-          })
-          this.handleGraphic()
-        },
-        handleGraphic(){
-          if(this.personnelGraphicLayer == null){
-              this.personnelGraphicLayer = new mars3d.layer.GraphicLayer();
-              this.globalmap.addLayer(this.personnelGraphicLayer);
-          }
-          this.graphicLayerArr.forEach(item =>{
-            this.personnelGraphicLayer.removeGraphic(item)
-          })
-          this.graphicLayerArr = [] 
-          this.listData.forEach((item,index)=>{
-              let graphic = new mars3d.graphic.BillboardEntity({
-                  position: [item.lng,item.lat],
-                  style: {
-                      image: "img/jiuyuanrenyuan.png",
-                      horizontalOrigin: Cesium.HorizontalOrigin.LEFT,
-                      verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-                      distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 200000), // 按视距距离显示
-                      scaleByDistance: new Cesium.NearFarScalar(1000, 0.4, 8000, 0.2),
-                      clampToGround: true
-                  },
-                  "popup": `<div class="marsTiltPanel marsTiltPanel-theme-green">
+          "popup": `<div class="marsTiltPanel marsTiltPanel-theme-green">
                   <div class="marsTiltPanel-wrap">
                       <div class="area">
                           <div class="arrow-lt"></div>
@@ -253,326 +260,352 @@
                   </div>
                   <div class="arrow" ></div>
               </div>`,
-                  "popupOptions":{
-                    "offsetY":-50,
-                    "offsetX":30,
-                    "template":"{content}",
-                    "horizontalOrigin":"Cesium.HorizontalOrigin.LEFT",
-                    "verticalOrigin":"Cesium.VerticalOrigin.CENTER"
-                  },
-                  pointerEvents: true
-              })
-              this.graphicLayerArr.push(graphic)
+          "popupOptions": {
+            "offsetY": -50,
+            "offsetX": 30,
+            "template": "{content}",
+            "horizontalOrigin": "Cesium.HorizontalOrigin.LEFT",
+            "verticalOrigin": "Cesium.VerticalOrigin.CENTER"
+          },
+          pointerEvents: true
+        })
+        this.graphicLayerArr.push(graphic)
 
-              this.personnelGraphicLayer.addGraphic(graphic);
-          })
-        },
-        callPhone(phone){
-          let time1 = this.fireData.reportTime.split(' ')[0]
-          let time2 = this.fireData.reportTime.split(' ')[1]
-          let date1 = time1.split('-')
-          let date2 = time2.split(':')
-          let dates = date1[0]+'年'+date1[1]+'月'+date1[2]+'日 '+date2[0]+'时'+date2[1]+'分'+date2[2]+'秒'
-          let param = {
-            phoneNumbers: phone,
-            time: dates,
-            address:this.fireData.address
-          }
-          let url = '/FireCodePC/EventAssign?phoneNumbers='+param.phoneNumbers+'&time='+param.time+'&address='+param.address
-          postMethodCommon('/FireCodePC/EventAssign',param).then(res =>{
-            console.log('sa',res)
-            if(res.code == 200){
-              this.$message({
-                message: res.message,
-                type: 'success'
-              });
-            }
-          })
-        },
-        callPhoneAll(){
-          console.log("fireData",this.fireData)
-          if(!this.fireData.reportTime){
-            return
-          }
-          let phoneArr = []
-          let time1 = this.fireData.reportTime.split(' ')[0]
-          let time2 = this.fireData.reportTime.split(' ')[1]
-          let date1 = time1.split('-')
-          let date2 = time2.split(':')
-          let dates = date1[0]+'年'+date1[1]+'月'+date1[2]+'日 '+date2[0]+'时'+date2[1]+'分'+date2[2]+'秒'
-          
-          
-          if(this.checkPhoneArr.length>0){
-            phoneArr = this.checkPhoneArr
-          }else{
-            this.listData.forEach(item =>{
-              phoneArr.push(item.phone)
-            })
-          }
-          let param = {
-            phoneNumbers: phoneArr.join(','),
-            time: dates,
-            address:this.fireData.address,
-            work:this.callText
-          }
+        this.personnelGraphicLayer.addGraphic(graphic);
+      })
+    },
+    callPhone(phone) {
+      let time1 = this.fireData.reportTime.split(' ')[0]
+      let time2 = this.fireData.reportTime.split(' ')[1]
+      let date1 = time1.split('-')
+      let date2 = time2.split(':')
+      let dates = date1[0] + '年' + date1[1] + '月' + date1[2] + '日 ' + date2[0] + '时' + date2[1] + '分' + date2[2] + '秒'
+      let param = {
+        phoneNumbers: phone,
+        time: dates,
+        address: this.fireData.address
+      }
+      let url = '/FireCodePC/EventAssign?phoneNumbers=' + param.phoneNumbers + '&time=' + param.time + '&address=' + param.address
+      postMethodCommon('/FireCodePC/EventAssign', param).then(res => {
+        console.log('sa', res)
+        if (res.code == 200) {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          });
+        }
+      })
+    },
+    callPhoneAll() {
+      console.log("fireData", this.fireData)
+      if (!this.fireData.reportTime) {
+        return
+      }
+      let phoneArr = []
+      let time1 = this.fireData.reportTime.split(' ')[0]
+      let time2 = this.fireData.reportTime.split(' ')[1]
+      let date1 = time1.split('-')
+      let date2 = time2.split(':')
+      let dates = date1[0] + '年' + date1[1] + '月' + date1[2] + '日 ' + date2[0] + '时' + date2[1] + '分' + date2[2] + '秒'
 
-          
-          postMethodCommon('/FireCodePC/EventAssign',param).then(res =>{
-            if(res.code == 200){
-              this.$message({
-                message: res.message,
-                type: 'success'
-              });
-            }
-          })
-        },
-        getListData(){
-          let arr = []
-          let _this = this
-          if(this.checkList.length>1){
-            arr  = [1,2]
-          }else if(this.checkList.length<1){
-            arr = []
-          }else{
-            if(this.checkList[0] == '护林员'){
-              arr = [1]
-            }else{
-              arr = [2]
-            }
-          }
 
-          this.personnelGraphicLayer = null
+      if (this.checkPhoneArr.length > 0) {
+        phoneArr = this.checkPhoneArr
+      } else {
+        this.listData.forEach(item => {
+          phoneArr.push(item.phone)
+        })
+      }
+      
+      let param = {
+        phoneNumbers: phoneArr.join(','),
+        time: dates,
+        address: this.fireData.address,
+        work: this.callText
+      }
 
-          let query = {
-            areaname:this.areaName,
-            lng:this.fireData.lng,
-            lat:this.fireData.lat
-          }
-          postMethodCommon("/FireCodePC/GetForestRangers?areaname="+this.areaName+"&lng="+this.fireData.lng+"&lat="+this.fireData.lat,[1,2]).then(res =>{
-            let rel = res.data
-            // let rel = []
-            // res.data.forEach((item,index) =>{
-            //     if(index == 1){
-            //         rel.push(item)
-            //     }
-            // })
-            
-            this.handleData(rel).then(dl =>{
-              dl.sort((a,b)=>{
-                return a.distance - b.distance
-              })
-              
-              _this.listData = dl
-              _this.allData = dl
-              setTimeout(()=>{
-                _this.radioChange()
-              },1000)
-              
-            })
-            
-          })
-        },
-        handleData(data){
-          data.forEach(item =>{
-            let url = "https://restapi.amap.com/v3/direction/driving?key="+appConfig.gaodeApi+"&origin=" + this.fireLngLat[0] + "," + this.fireLngLat[1] + 
-              "&destination=" + item.lng + "," + item.lat + "&extensions=base"
-            axios({
-                method: 'get',
-                url: url,
-            }).then(res => {
-              if(res.data.route.paths[0]){
-                let obj = res.data.route.paths[0]
-                item.distance = (obj.distance/1000).toFixed(2)
-                item.duration = Math.round(obj.duration/60)
-              }
-            }).catch(err =>{
-              console.log('ee',err)
-            })
-          })
-          return Promise.resolve(data)
+
+      postMethodCommon('/FireCodePC/EventAssign', param).then(res => {
+        if (res.code == 200) {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          });
+        }
+      })
+    },
+    getListData() {
+      let arr = []
+      let _this = this
+      if (this.checkList.length > 1) {
+        arr = [1, 2]
+      } else if (this.checkList.length < 1) {
+        arr = []
+      } else {
+        if (this.checkList[0] == '护林员') {
+          arr = [1]
+        } else {
+          arr = [2]
         }
       }
+
+      this.personnelGraphicLayer = null
+
+      let query = {
+        areaname: this.areaName,
+        lng: this.fireData.lng,
+        lat: this.fireData.lat
+      }
+      postMethodCommon("/FireCodePC/GetForestRangers?areaname=" + this.areaName + "&lng=" + this.fireData.lng + "&lat=" + this.fireData.lat, [1, 2]).then(res => {
+        let rel = res.data
+        // let rel = []
+        // res.data.forEach((item,index) =>{
+        //     if(index == 1){
+        //         rel.push(item)
+        //     }
+        // })
+
+        this.handleData(rel).then(dl => {
+          dl.sort((a, b) => {
+            return a.distance - b.distance
+          })
+
+          _this.listData = dl
+          _this.allData = dl
+          setTimeout(() => {
+            _this.radioChange()
+          }, 1000)
+        })
+
+      })
+    },
+    handleData(data) {
+      data.forEach(item => {
+        let url = "https://restapi.amap.com/v3/direction/driving?key=" + appConfig.gaodeApi + "&origin=" + this.fireLngLat[0] + "," + this.fireLngLat[1] +
+          "&destination=" + item.lng + "," + item.lat + "&extensions=base"
+        axios({
+          method: 'get',
+          url: url,
+        }).then(res => {
+          if (res.data.route.paths[0]) {
+            let obj = res.data.route.paths[0]
+            item.distance = (obj.distance / 1000).toFixed(2)
+            item.duration = Math.round(obj.duration / 60)
+          }
+        }).catch(err => {
+          console.log('ee', err)
+        })
+      })
+      return Promise.resolve(data)
     }
-  </script>
-  
-  <style scoped>
-    .box{
-          width: 100%;
-          height: 100%;
-          overflow: hidden;
-          text-align:left;
-          z-index: 99;
-    }
-    .box-name{
-      height: 47px;
-      line-height: 47px;
-      color: #fff;
-      font-size: 20px;
-      font-weight: bold;
-      padding: 0 40px;
-    }
-    .box-title{
-          width:100%;
-          height:110px;
-          color: #fff;
-          text-align: left;
-      }
-      .titlebox{
-        width: 100px;
-        text-align: right;
-      }
-      .box-container{
-          width: calc( 100% - 0px);
-          padding:0px 12px;
-          height: calc( 100% - 180px);
-      }
-      .table-header{
-          width: calc( 100% - 10px);
-          height:25px;
-          color:#fff;
-          text-align: center;
-      }
-      .table-header div{
-          float:left;
-          width:25%;
-          border-bottom:1px dashed #00FFF0;
-          padding-bottom:8px;
-      }
-      .table-body{
-          width:100%;
-          height: calc( 100% - 70px);
-          overflow-y: auto;
-      }
-  
-       .table-body .table-li{
-           width:100%;
-           height:99px;
-           background: #0E2320;
-           margin-bottom: 10px;
-           padding: 10px 15px;
-       }
-  
-       
+    /*
       
-     
-  
-       ::-webkit-scrollbar-track, ::-webkit-scrollbar-thumb {
-    border: 0
+    */ 
   }
-  
-  ::-webkit-scrollbar {
-    height: 10px;
-    width: 10px;
-    background: transparent;
-    border-radius: 5px
-  }
-  
-  ::-webkit-scrollbar-thumb {
-    padding-top: 100px;
-    -webkit-box-shadow: inset 1px 1px 0 rgba(0, 0, 0, .1), inset -1px -1px 0 rgba(0, 0, 0, .07);
-    background-color: #797979;
-    min-height: 28px;
-    border-radius: 4px;
-    background-clip: padding-box
-  }
-  
-  ::-webkit-scrollbar-track, ::-webkit-scrollbar-thumb {
-    border: 0
-  }
-  
-  ::-webkit-scrollbar-thumb:hover {
-    -webkit-box-shadow: inset 1px 1px 1px rgba(0, 0, 0, .25);
-    background-color: rgba(0, 0, 0, .4)
-  }
-  
-  ::-webkit-scrollbar-thumb:active {
-    -webkit-box-shadow: inset 1px 1px 3px rgba(0, 0, 0, .35);
-    background-color: rgba(0, 0, 0, .5)
-  }
-  .el-checkbox{
-    color: #fff;
-    margin-right: 0;
-  }
-  .el-checkbox__label{
-    padding-left: 0;
-  }
-  .el-checkbox__input{
-    display: inline;
-  }
-  .el-radio{
-    margin-right: 10px;
-    color: #fff;
-    margin-bottom: 0;
-  }
-  .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;
 }
-  .color1{
-    color: #156EF9;
-  }
-  .color2{
-    color: #E8A700;
-  }
-  .line{
-    width: 100%;
-    height: 1px;
-    border: 1px solid #2D80EE;
-  }
-  .li-desc{
-    padding: 3px 7px;
-    background: #14332F;
-    border-radius: 2px;
-    margin-right: 8px;
-  }
-  .li-desc:last-child{
-    margin-right: 0;
-  }
-  .img-box{
-    width: 44px;
-    height: 44px;
-    border-radius: 44px;
-    cursor: pointer;
-  }
-  .callbox{
-    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
+</script>
+  
+<style scoped>
+.box {
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  text-align: left;
+  z-index: 99;
+}
+
+.box-name {
+  height: 47px;
+  line-height: 47px;
+  color: #fff;
+  font-size: 20px;
+  font-weight: bold;
+  padding: 0 40px;
+}
+
+.box-title {
+  width: 100%;
+  height: 110px;
+  color: #fff;
+  text-align: left;
+}
+
+.titlebox {
+  width: 100px;
+  text-align: right;
+}
+
+.box-container {
+  width: calc(100% - 0px);
+  padding: 0px 12px;
+  height: calc(100% - 180px);
+}
+
+.table-header {
+  width: calc(100% - 10px);
+  height: 25px;
+  color: #fff;
+  text-align: center;
+}
+
+.table-header div {
+  float: left;
+  width: 25%;
+  border-bottom: 1px dashed #00FFF0;
+  padding-bottom: 8px;
+}
+
+.table-body {
+  width: 100%;
+  height: calc(100% - 70px);
+  overflow-y: auto;
+}
+
+.table-body .table-li {
+  width: 100%;
+  height: 99px;
+  background: #0E2320;
+  margin-bottom: 10px;
+  padding: 10px 15px;
+}
+
+
+
+
+
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-thumb {
+  border: 0
+}
+
+::-webkit-scrollbar {
+  height: 10px;
+  width: 10px;
+  background: transparent;
+  border-radius: 5px
+}
+
+::-webkit-scrollbar-thumb {
+  padding-top: 100px;
+  -webkit-box-shadow: inset 1px 1px 0 rgba(0, 0, 0, .1), inset -1px -1px 0 rgba(0, 0, 0, .07);
+  background-color: #797979;
+  min-height: 28px;
+  border-radius: 4px;
+  background-clip: padding-box
+}
+
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-thumb {
+  border: 0
+}
+
+::-webkit-scrollbar-thumb:hover {
+  -webkit-box-shadow: inset 1px 1px 1px rgba(0, 0, 0, .25);
+  background-color: rgba(0, 0, 0, .4)
+}
+
+::-webkit-scrollbar-thumb:active {
+  -webkit-box-shadow: inset 1px 1px 3px rgba(0, 0, 0, .35);
+  background-color: rgba(0, 0, 0, .5)
+}
+
+.el-checkbox {
+  color: #fff;
+  margin-right: 0;
+}
+
+.el-checkbox__label {
+  padding-left: 0;
+}
+
+.el-checkbox__input {
+  display: inline;
+}
+
+.el-radio {
+  margin-right: 10px;
+  color: #fff;
+  margin-bottom: 0;
+}
+
+.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;
+}
+
+.color1 {
+  color: #156EF9;
+}
+
+.color2 {
+  color: #E8A700;
+}
+
+.line {
+  width: 100%;
+  height: 1px;
+  border: 1px solid #2D80EE;
+}
+
+.li-desc {
+  padding: 3px 7px;
+  background: #14332F;
+  border-radius: 2px;
+  margin-right: 8px;
+}
+
+.li-desc:last-child {
+  margin-right: 0;
+}
+
+.img-box {
+  width: 44px;
+  height: 44px;
+  border-radius: 44px;
+  cursor: pointer;
+}
+
+.callbox {
+  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/rightechartsdata.vue b/src/views/home/widget/rightechartsdata.vue
index 942ce28..b0e7275 100644
--- a/src/views/home/widget/rightechartsdata.vue
+++ b/src/views/home/widget/rightechartsdata.vue
@@ -15,6 +15,27 @@
       data(){
           return {
               list:[],
+              query:[
+                {
+                    severName:"现有水源地-一级水源",
+                    tableRef:"yijishuiyuan"
+                },{
+                    severName:"现有水源地-二级水源",
+                    tableRef:"erjishuiyuan"
+                },{
+                    severName:"防火卡口",
+                    tableRef:"fanghuokakou"
+                },{
+                    severName:"森林消防专业队伍",
+                    tableRef:"xiaofangzhuanyeduiwu"
+                },{
+                    severName:"规划水源地",
+                    tableRef:"guihuashuiyuandi"
+                },{
+                    severName:"森林防火物资",
+                    tableRef:"senlinfanghuowuzi"
+                }
+              ],
               listParams:{
                   areaname:localStorage.getItem("areaName"),
               },
@@ -28,15 +49,20 @@
       },
       methods:{
           getList(){
+              let params= [];
+
+              this.query.forEach((item,index)=>{
+                  params.push(item.tableRef);
+              })
+
               axios({
-                  method:"get",
-                  url:BASE_URL+"/FirePrevention/GetTableListCount",
-                  params:this.listParams,
+                  method:"post",
+                  url:BASE_URL+"/FirePrevention/GetTableListCountByTableName",
+                  data:params,
                   headers:{
                       'X-Token':localStorage.getItem("X-Token")
                   }
               }).then(res=>{
-                //   console.log('1111',res)
                   let rel = res.data.data
                   this.handleEcharts(rel)
               })
@@ -45,7 +71,10 @@
             let xData = []
             let yData = []
             data.forEach(item =>{
-                xData.push(item.name)
+                let obj = this.query.find((it,idx)=>{
+                    return it.tableRef == item.name;
+                })
+                xData.push(obj.severName)
                 yData.push(item.value)
             })
             let option = {
diff --git a/src/views/home/widget/waterbox.vue b/src/views/home/widget/waterbox.vue
index 3174e5e..84ef4e4 100644
--- a/src/views/home/widget/waterbox.vue
+++ b/src/views/home/widget/waterbox.vue
@@ -12,8 +12,8 @@
             <el-radio :label="1" class="mr-1">1km内</el-radio>
             <el-radio :label="2" class="mr-1">5km内</el-radio>
             <el-radio :label="3" class="mr-1">10km内</el-radio>
-            <el-radio :label="4" class="mr-1">20km内</el-radio>
-            <el-radio :label="5">全部</el-radio>
+            <!-- <el-radio :label="4" class="mr-1">20km内</el-radio> -->
+            <!-- <el-radio :label="5">全部</el-radio> -->
           </el-radio-group>
         </div>
       </div>