Merge remote-tracking branch 'origin/visu_forest_0_1' into visu_forest_0_1

src/api/leader.js

@@ -32,9 +32,9 @@ export function getRemotelist() {
 }
 
 // 巡林计划
-export function getPlanList(trackById) {
+export function getPlanList(personId) {
   return request({
-    url: '/center-fire/VisuForestLeaderController/getPlanList',
+    url: '/center-fire/VisuForestLeaderController/getPlanList?personId='+personId,
     method: 'get',
   })
 }

src/views/leader.vue

@@ -47,7 +47,7 @@
             <div class="i-list-con h-27">
               <div class="d-l-con-icon">
                 <div class="icon-con" :class="{on:listCurrentIndex1==item.userId}"
-                     v-for="(item,index) in peopleList" @click="getLeaderTrack(item.userId)">
+                     v-for="(item,index) in peopleList" @click="getPlanList(item.userId)">
                   <div class="icon icon-mid el-icon-user"></div>
                   <div class="icon-text personnel-name">
                     <h6>{{ item.nickName }}</h6>
@@ -74,14 +74,37 @@
             <div class="i-list-con h-73">
 
               <div class="h-19 overflow-y">
-                <div class="d-l-con" :class="{on:listCurrentIndex2==item.planName}"
+                <el-collapse accordion>
+                  <el-collapse-item v-for="(item,index) in xunLinListOne">
+                    <template slot="title">
+                      <div class="d-l-con sj-collapse" @click="getWaterRecord(item.id, item.reiverLengthId)">
+                        <div class="d-l-l-text">
+                          <h4 class="collapse-title">{{ item.name }}</h4>
+                        </div>
+                        <div class="d-l-l-count">({{ item.recordCount }}-{{ item.planCount }})</div>
+                      </div>
+                    </template>
+                    <div class="d-l-con this-child sj-collapse" @click="getWaterPoint(child.id)" v-for="(child,index) in recordList" >
+                      <div class="d-l-l-text" >
+                        <h4>{{child.beginTime}} - {{child.endTime}}</h4>
+                      </div>
+                      <!--<div class="d-l-l-count">{{index}}</div>-->
+                    </div>
+                    <div class="d-l-con this-child sj-collapse" v-if="showNothing && (recordList == null || recordList == '' || recordList == [])">
+                      <div class="d-l-l-text" >
+                        <h4 class="text-gray">暂无信息</h4>
+                      </div>
+                    </div>
+                  </el-collapse-item>
+                </el-collapse>
+                <!--<div class="d-l-con" :class="{on:listCurrentIndex2==item.planName}"
                      v-for="(item,index) in xunLinListOne"
                      @click="setConnectList(item.planLine,item.planName)">
                   <div class="d-l-l-text">
                     <i class="i-small"></i>
                     <h4>{{ item.planName }}</h4>
                   </div>
-                </div>
+                </div>-->
               </div>
             </div>
           </dv-border-box-13>
@@ -140,6 +163,8 @@ export default {
       peopleList: [], //人员列表
       connectList: [], //画线
       xunLinListOne: [], //巡林计划
+      recordList: [], //巡查记录
+      showNothing: false, //暂无信息
       zrs: 0, //总人数
       zxrs: 0 //在线人数
     }
@@ -230,9 +255,9 @@ export default {
         this.personnelChart()
       })
       //获取巡林计划
-      getPlanList().then(res => {
-        this.xunLinListOne = res.data
-      })
+      // getPlanList().then(res => {
+      //   this.xunLinListOne = res.data
+      // })
     },
     //获取左侧人员列表
     getForestLeader(linJob, linType) {
@@ -246,6 +271,24 @@ export default {
       this.connectList = []
       this.$refs.supermap.clearC()
     },
+    //获取巡林计划
+    // getPlanList(personId) {
+    //   alert(personId)
+    //   getPlanList(personId).then(res => {
+    //     console.log("计划", res.data)
+    //     this.xunLinListOne = res.data
+    //   })
+    // },
+    //点击左侧人员列表获取 巡林计划
+    getPlanList(personId) {
+      this.showNothing = false;
+      this.recordList = [];
+      getPlanList(personId).then(res => {
+        console.log("计划",res.data);
+        this.xunLinListOne = res.data;
+      })
+      this.$refs.supermap.clearC()
+    },
     //点击左侧人员列表获取轨迹
     getLeaderTrack(userId) {
       this.getRemotelist();
@@ -270,13 +313,43 @@ export default {
         }
       })
     },
+    //点击右巡林计划获取 巡查记录
+    getRecordList(userId) {
+      this.showNothing = false;
+      this.recordList = [];
+      getRecordList(reiverLengthId).then(res => {
+        console.log("记录",res.data);
+        this.xunLinListOne = res.data;
+      })
+      this.$refs.supermap.clearC()
+    },
     //点击左侧人员获取人员的巡林计划列表
     getRemotelist(){
       getRemotelist().then(res => {
         this.xunLinListOne = res.data;
       })
     },
-
+    //点击巡查轨迹时段 巡查轨迹落点
+    getPointList(res) {
+      let that = this;
+      this.connectList = [];
+      console.log("落点",res.data)
+      if (res.data != null && res.data.length > 0) {
+        for (let i = 0; i < res.data.length; i++) {
+          let latlng = {
+            lat: res.data[i].latitude,
+            lng: res.data[i].longitude
+          }
+          this.connectList.push(latlng)
+        }
+        setTimeout(() => {
+          that.$refs.supermap.clearC()
+          that.$refs.supermap.setConnectList(this.connectList, 'red')
+        }, 1000)
+      } else {
+        that.$refs.supermap.clearC()
+      }
+    },
     setConnectList(points, planName) {
       this.listCurrentIndex2 = planName
       this.connectList = []