浏览代码

田长制

彭宇 2 年之前
父节点
当前提交
8525f69ef7
共有 3 个文件被更改,包括 29 次插入215 次删除
  1. 9 0
      src/api/tianzhangzhi.js
  2. 6 6
      src/router/index.js
  3. 14 209
      src/views/tianzhang.vue

+ 9 - 0
src/api/tianzhangzhi.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 获取左侧田长列表
+export function getTianzhangList() {
+  return request({
+    url: '/center-resources/VisuForestTianzhangzhiController/selectTianzhangList',
+    method: 'post',
+  })
+}

+ 6 - 6
src/router/index.js

@@ -69,9 +69,9 @@ export const constantRoutes = [{
 		}
 	},
   {
-		path: '/tianzhang',
-		name: 'tianzhang',
-		component: () => import('@/views/tianzhang'),
+		path: '/tianzhangzhi',
+		name: 'tianzhangzhi',
+		component: () => import('@/views/tianzhangzhi'),
 		meta: {
 			title: '田长制'
 		}
@@ -129,9 +129,9 @@ export const constantRoutesNew = [{
 		}
 	},
   {
-    path: '/tianzhang',
-    name: 'tianzhang',
-    component: () => import('@/views/tianzhang'),
+    path: '/tianzhangzhi',
+    name: 'tianzhangzhi',
+    component: () => import('@/views/tianzhangzhi'),
     meta: {
       title: '田长制'
     }

+ 14 - 209
src/views/tianzhang.vue

@@ -10,17 +10,17 @@
           <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
             <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
             <div class="this-title">
-              <span>网格列表</span>
+              <span>田长列表</span>
               <dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;"/>
             </div>
-            <div class="i-list-con h-25">
+            <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 visuTianzhangList" @click="getLeaderTrack(item.id)">
                   <div class="icon icon-mid el-icon-user"></div>
                   <div class="icon-text personnel-name">
-                    <h6>{{ item.nickName }}</h6>
-                    <h5>{{ item.deptName }}</h5>
+                    <h6>姓名:{{ item.tianName }}</h6>
+                    <h6>电话:{{ item.tianPhone }}</h6>
                   </div>
                 </div>
               </div>
@@ -37,7 +37,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 visuTianzhangList" @click="getLeaderTrack(item.userId)">
                   <div class="icon icon-mid el-icon-user"></div>
                   <div class="icon-text personnel-name">
                     <h6>{{ item.nickName }}</h6>
@@ -64,7 +64,7 @@
             <div class="i-list-con h-27">
               <div class="h-19 overflow-y">
                 <div class="d-l-con" :class="{on:listCurrentIndex2==item.planName}"
-                     v-for="(item,index) in xunLinListOne"
+                     v-for="(item,index) in visuTianzhangList"
                      @click="getPointList(item.id)">
                   <div class="d-l-l-text">
                     <i class="i-small"></i>
@@ -85,7 +85,7 @@
             <div class="i-list-con h-27">
               <div class="h-19 overflow-y">
                 <div class="d-l-con" :class="{on:listCurrentIndex2==item.planName}"
-                     v-for="(item,index) in xunLinListOne"
+                     v-for="(item,index) in visuTianzhangList"
                      @click="getPointList(item.id)">
                   <div class="d-l-l-text">
                     <i class="i-small"></i>
@@ -112,13 +112,8 @@
 
 <script>
 import {
-  getForestLeader,
-  getLeaderTrack,
-  getTrackList,
-  getPointList,
-  getPlanList,
-  getRy
-} from '@/api/leader'
+  getTianzhangList,
+} from '@/api/tianzhangzhi'
 
 import supermap from '@/components/supermap' //超图
 import vheader from '@/components/v-header.vue' //一体化共用头部
@@ -146,12 +141,7 @@ export default {
       indentright: '',
       indentText: '收起左右栏',
       indentdisabled: false,
-      visuForestCloudRYBO: [], //人员类型列表
-      peopleList: [], //人员列表
-      connectList: [], //画线
-      xunLinListOne: [], //巡林计划
-      zrs: 0, //总人数
-      zxrs: 0 //在线人数
+      visuTianzhangList: [], //人员类型列表
     }
   },
   created() {
@@ -232,114 +222,11 @@ export default {
       this.iconCurrentIndex1 = '1'
       this.listCurrentIndex1 = ''
       this.listCurrentIndex2 = ''
-      //获取左侧菜单列表
-      getRy().then(res => {
-        that.visuForestCloudRYBO = res.data.visuForestCloudRYBO
-        that.zrs = res.data.visuForestCloudRyZxBO.zrs
-        that.zxrs = res.data.visuForestCloudRyZxBO.zxrs
-        this.personnelChart()
-      })
-      //获取巡林计划
-      // getPlanList().then(res => {
-      //   this.xunLinListOne = res.data
-      // })
-      // // 获取轨迹列表
-      // getTrackList().then(res => {
-      //   this.xunLinListOne = res.data
-      // })
-      // 获取人员列表
-      // getForestLeader(linJob, linType).then(res => {
-      getForestLeader().then(res => {
-        this.peopleList = res.data;
-        console.log("人员",res.data)
-      })
-      this.connectList = []
-      // this.$refs.supermap.clearC() //clearC undefined
-    },
-    //获取左侧人员列表
-    getForestLeader(linJob, linType) {
-      this.listCurrentIndex1 = ''
-      this.listCurrentIndex2 = ''
-      this.iconCurrentIndex1 = linJob
-      this.peopleList = []
-      getForestLeader(linJob, linType).then(res => {
-        this.peopleList = res.data;
-      })
-      this.connectList = []
-      this.$refs.supermap.clearC()
-    },
-    //点击左侧人员列表获取轨迹
-    getLeaderTrack(personId) {
-      getTrackList(personId).then(res => {
-        console.log("轨迹",res.data);
-        if(res.data.length > 0){// 当前资源人员有巡查轨迹 获取最新一条轨迹
-          this.xunLinListOne = res.data;
-          this.getPointList(res.data[0].id);
-        }else {// 清空上一用户落点
-          this.xunLinListOne = [{"timeBegin": "当前资源人员", "timeEnd": "暂无巡查轨迹"}];
-          this.$refs.supermap.clearC()
-        }
-      })
-    },
-    getLeaderTrack_original(userId) {
-      this.listCurrentIndex1 = userId
-      let that = this
-      this.connectList = []
-      getLeaderTrack(userId).then(res => {
-        // this.xunLinListOne = res.data;
-        // 获取右侧轨迹列表
-        // getPlanList().then(res => {
-        //   this.xunLinListOne = 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()
-        }
-      })
-    },
-
-    getPointList(trackId) {
-      let that = this;
-      this.connectList = [];
-      getPointList(trackId).then(res => {
-        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()
-        }
+      //获取田长列表
+      getTianzhangList().then(res => {
+        that.visuTianzhangList = res.data
       })
     },
-    setConnectList(points, planName) {
-      this.listCurrentIndex2 = planName
-      this.connectList = []
-      if (points != null && points != '') {
-        this.connectList = JSON.parse(points)
-        this.$refs.supermap.setConnectTwoList(this.connectList, 'red')
-      }
-    },
 
     //吉祥物收起左右框
     indent() {
@@ -357,88 +244,6 @@ export default {
         this.indentText = '收起左右栏'
       }
     },
-    //人员chart
-    personnelChart() {
-      // 基于准备好的dom,初始化echarts实例
-      let myChart = echarts.init(document.getElementById('personnel-chart'))
-      // 绘制图表
-      const handred = this.zrs
-      let point = this.zxrs
-      myChart.setOption({
-        title: [{
-          text: '总人数:' + handred + '人' + '\n' + '\n' + '在线人数:' + point + '人',
-          x: '48%',
-          y: '25%',
-          textStyle: {
-            fontWeight: 'normal',
-            color: '#02d6fc',
-            fontSize: '14'
-          }
-        }],
-        series: [{
-          name: 'circle',
-          type: 'pie',
-          center: ['22%', '50%'],
-          radius: ['60%', '70%'],
-          clockWise: true,
-          label: {
-            normal: {
-              position: 'center'
-
-            }
-          },
-          itemStyle: {
-            normal: {
-              label: {
-                show: false
-              },
-              labelLine: {
-                show: false
-              }
-            }
-          },
-          data: [{
-            value: point,
-            name: '当前在线',
-            label: {
-              show: true, //单独显示该数据项
-              formatter: '{c}人',
-              labelLayout: {
-                top: '50%'
-              },
-              textStyle: {
-                color: '#02d6fc',
-                fontSize: 14
-              }
-            },
-            itemStyle: {
-              normal: {
-                color: { // 完成的圆环的颜色
-                  colorStops: [{
-                    offset: 0,
-                    color: '#02d6fc' // 0% 处的颜色
-                  }, {
-                    offset: 1,
-                    color: '#367bec' // 100% 处的颜色
-                  }]
-                },
-                label: {
-                  show: false
-                },
-                labelLine: {
-                  show: false
-                }
-              }
-            }
-          }, {
-            value: handred - point,
-            itemStyle: {
-              color: '#666'
-            }
-          }]
-        }]
-      })
-    }
   }
 
 }