林业修改网格化巡查轨迹

src/api/leader.js

@@ -31,18 +31,19 @@ export function getRemotelist() {
   })
 }
 
-// 巡林计划
-export function getPlanList(personId) {
+// 巡林任务
+export function getPlanList(userId) {
   return request({
-    url: '/center-fire/VisuForestLeaderController/getPlanList?personId='+personId,
-    method: 'get',
+    url: '/center-data/task/getPlanList',
+    method: 'post',
+    data: {userId:userId,type:'1'}
   })
 }
 
 // 巡林记录
-export function getRecordList(planId, personId) {
+export function getRecordList(taskId) {
   return request({
-    url: '/center-fire/VisuForestLeaderController/getRecordList?planId='+planId+'&personId='+personId,
+    url: '/center-data/record/list?taskId='+taskId,
     method: 'get',
   })
 }
@@ -50,7 +51,7 @@ export function getRecordList(planId, personId) {
 // 巡林轨迹
 export function getPointList(recordId) {
   return request({
-    url: '/center-fire/VisuForestLeaderController/getPointList?recordId='+recordId,
+    url: '/center-data/track/getTrack/'+recordId.toString(),
     method: 'get',
   })
 }

src/views/leader.vue

@@ -72,63 +72,40 @@
 							<dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;" />
 						</div>
 						<div class="i-list-con h-73">
-
 							<div class="h-73 overflow-y">
                 <el-collapse accordion>
                   <el-collapse-item v-for="(item,index) in xunLinListOne">
                     <template slot="title">
                       <div class="d-l-con sj-collapse"
-                           @click="getRecordList(item.id, item.personId)">
+                           @click="getRecordList(item.id)">
                         <div class="d-l-l-text">
                           <el-tooltip class="item" effect="dark" placement="left"
-                                      style="width:10rem ;" :disabled="(item.name.length <= 20)">
+                                      style="width:10rem ;" :disabled="(item.taskName.length <= 20)">
                             <div slot="content">
                               <h4 class="collapse-title" style="width: 200px;">
-                                {{ item.name}}</h4>
+                                {{ item.taskName}}</h4>
                             </div>
                             <h4 class="collapse-title" style="width: 100px;">
-                              {{ item.name | ellipsis20}}</h4>
+                              {{ item.taskName | ellipsis20}}</h4>
                           </el-tooltip>
                         </div>
                         <div class="d-l-l-count">({{ item.recordCount }}/{{ item.planCount }})
                         </div>
                       </div>
                     </template>
-                    <el-collapse accordion>
-                      <el-collapse-item v-for="(item,index) in xunLinListOne">
-                        <template slot="title">
-                          <div class="d-l-con sj-collapse"
-                               @click="getRecordList(item.id, item.personId)">
-                            <div class="d-l-l-text">
-                              <el-tooltip class="item" effect="dark" placement="left"
-                                          style="width:10rem ;" :disabled="(item.name.length <= 20)">
-                                <div slot="content">
-                                  <h4 class="collapse-title" style="width: 200px;">
-                                    {{ item.name}}</h4>
-                                </div>
-                                <h4 class="collapse-title" style="width: 100px;">
-                                  {{ item.name | ellipsis20}}</h4>
-                              </el-tooltip>
-                            </div>
-                            <div class="d-l-l-count">({{ item.recordCount }}/{{ item.planCount }})
-                            </div>
-                          </div>
-                        </template>
-                        <div class="d-l-con this-child sj-collapse" @click="getPointList(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 this-child sj-collapse" @click="getPointList(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}"
@@ -198,7 +175,7 @@
 				visuForestCloudRYBO: [], //人员类型列表
 				peopleList: [], //人员列表
 				connectList: [], //画线
-				xunLinListOne: [], //巡林计划
+				xunLinListOne: [], //巡林任务
 				recordList: [], //巡查记录
 				showNothing: false, //暂无信息
 				zrs: 0, //总人数
@@ -302,10 +279,6 @@
 					that.zxrs = res.data.visuForestCloudRyZxBO.zxrs
 					this.personnelChart()
 				})
-				//获取巡林计划
-				// getPlanList().then(res => {
-				//   this.xunLinListOne = res.data
-				// })
 			},
 			//获取左侧人员列表
 			getForestLeader(linJob, linType) {
@@ -319,20 +292,11 @@
 				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()
@@ -362,17 +326,16 @@
 				})
 			},
 			//点击右侧巡林计划获取 巡查记录
-			getRecordList(id, personId) {
+			getRecordList(id) {
 				this.showNothing = false;
 				this.recordList = [];
-				getRecordList(id, personId).then(res => {
-					console.log("记录", res.data);
+				getRecordList(id).then(res => {
 					this.recordList = res.data;
 				})
 				this.$refs.supermap.clearC()
 			},
 			//点击右侧巡查记录获取 巡查轨迹
-			getPointList(id, ) {
+			getPointList(id) {
 				getPointList(id).then(res => {
 					// console.log("落点",res.data);
 					this.setPointList(res);