数字水利 巡查记录

src/api/leader.js

@@ -17,16 +17,23 @@ export function getForestLeader(linJob,linType) {
 }
 // 点击左侧人员列表获取轨迹
 export function getLeaderTrack(trackById) {
-  // alert(trackById)
+  alert(trackById)
   return request({
     url: '/center-water/VisuForestLeaderController/getLeaderTrack?trackById='+trackById,
     method: 'get',
   })
 }
-// 巡查监测点计划
-export function getPlanList(trackById) {
+// 点击左侧人员列表获取 巡查监测点计划
+export function getWaterPlan(reiverLengthId) {
   return request({
-    url: '/center-water/VisuForestLeaderController/getPlanList',
+    url: '/center-water/VisuForestLeaderController/getWaterPlan?reiverLengthId='+reiverLengthId,
+    method: 'get',
+  })
+}
+// 点击左侧人员列表获取 巡查监测点计划
+export function getWaterRecord(id, reiverLengthId) {
+  return request({
+    url: '/center-water/VisuForestLeaderController/getWaterRecord?id='+id+'&reiverLengthId='+reiverLengthId,
     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="getWaterPlan(item.reiverLengthId)">
                   <div class="icon icon-mid el-icon-user"></div>
                   <div class="icon-text personnel-name">
                     <h6>{{ item.nickName }}</h6>
@@ -77,10 +77,10 @@
               <div class="h-19 overflow-y">
                 <div class="d-l-con" :class="{on:listCurrentIndex2==item.planName}"
                      v-for="(item,index) in xunLinListOne"
-                     @click="setConnectList(item.planLine,item.planName)">
+                     @click="getWaterRecord(item.id, item.reiverLengthId)">
                   <div class="d-l-l-text">
                     <i class="i-small"></i>
-                    <h4>{{ item.planName }}</h4>
+                    <h4>{{ item.name }} ({{ item.recordCount }}-{{ item.planCount }})</h4>
                   </div>
                 </div>
               </div>
@@ -106,7 +106,8 @@
 import {
   getForestLeader,
   getLeaderTrack,
-  getPlanList,
+  getWaterPlan,
+  getWaterRecord,
   getRy
 } from '@/api/leader'
 
@@ -230,9 +231,9 @@ export default {
         this.personnelChart()
       })
       //获取巡查监测点计划
-      getPlanList().then(res => {
-        this.xunLinListOne = res.data
-      })
+      // getWaterPlan().then(res => {
+      //   this.xunLinListOne = res.data
+      // })
     },
     //获取左侧人员列表
     getForestLeader(linJob, linType) {
@@ -242,17 +243,32 @@ export default {
       this.peopleList = []
       getForestLeader(linJob, linType).then(res => {
         this.peopleList = res.data
+        console.log("人员", res.data)
       })
       this.connectList = []
       this.$refs.supermap.clearC()
     },
-    //点击左侧人员列表获取轨迹
-    getLeaderTrack(userId) {
+    //点击左侧人员列表获取 巡查监测点计划
+    getWaterPlan(reiverLengthId) {
+      getWaterPlan(reiverLengthId).then(res => {
+        console.log("计划",res.data);
+        this.xunLinListOne = res.data;
+      })
+    },
+    //点击左侧巡查监测点计划获取 巡查记录
+    getWaterRecord(id, reiverLengthId) {
+      getWaterRecord(id, reiverLengthId).then(res => {
+        console.log("记录",res.data);
+        this.xunLinListOne = res.data;
+      })
+    },
+    //点击左侧人员列表获取计划
+    getLeaderTrack(userId) {//String reiverLengthId;
       this.listCurrentIndex1 = userId
       let that = this
       this.connectList = []
       getLeaderTrack(userId).then(res => {
-        console.log("alert(trackById)",res.data)
+        console.log("计划",res.data);
         if (res.data != null && res.data.length > 0) {
           for (let i = 0; i < res.data.length; i++) {
             let latlng = {