Merge remote-tracking branch 'origin/visu_resources_01_siping_2.5d' into visu_resources_01_siping_2.5d

src/components/TVWall.vue

@@ -306,17 +306,6 @@ export default {
         } else {
           console.log('连接失败，下载客户端')
           this.alertReinstall()
-          this.isShowTipe && this.$modal.confirm({
-            title: '下载客户端',
-            content: '检测到您未安装部分插件,将影响部分功能使用，请下载后使用？',
-            onOk: () => {
-              //这里写下载方法
-              this.isShowTipe = false
-            },
-            onCancel: () => {
-              this.isShowTipe = false
-            }
-          });
         }
       })
       getDahuaVideoServer().then(newResponse => {
@@ -427,17 +416,6 @@ export default {
         } else {
           console.log('连接失败，下载客户端')
           this.alertReinstall()
-          this.isShowTipe && this.$modal.confirm({
-            title: '下载客户端',
-            content: '检测到您未安装部分插件,将影响部分功能使用，请下载后使用？',
-            onOk: () => {
-              //这里写下载方法
-              this.isShowTipe = false
-            },
-            onCancel: () => {
-              this.isShowTipe = false
-            }
-          });
         }
       })
       this.preview()

src/components/TVWalls.vue

@@ -302,17 +302,6 @@ export default {
         } else {
           console.log('连接失败，下载客户端')
           this.alertReinstall()
-          this.isShowTipe && this.$modal.confirm({
-            title: '下载客户端',
-            content: '检测到您未安装部分插件,将影响部分功能使用，请下载后使用？',
-            onOk: () => {
-              //这里写下载方法
-              this.isShowTipe = false
-            },
-            onCancel: () => {
-              this.isShowTipe = false
-            }
-          });
         }
       })
       this.preview()

src/components/supermap-2.5d.vue

@@ -30,6 +30,8 @@ export default {
       markerboxEntity: [],//地图落点实体
       connectBoxEntity: null,//地图线实体
       graphicsBoxEntity: null,//地图面实体
+      markerboxEntityRadius: [],//地图落点实体
+      connectBoxEntityTwo: null,//地图线实体
       /*************************原地图属性*********************/
       isEditableLayers: false, //绘图控件
 
@@ -51,6 +53,78 @@ export default {
   props: {},
   methods: {
     //移除之前添加的点
+    clearMRadius() {
+      this.viewer.entities.removeAll()
+      if (this.markerboxEntityRadius != null) {
+        this.viewer.entities.remove(this.markerboxEntityRadius)
+        this.markerboxEntityRadius = []
+      }
+    },
+    //移除之前添加的线
+    clearTwoC() {
+      // 查找ID为entityE的图形对象
+      this.viewer.entities.remove(this.connectBoxEntityTwo)
+    },
+    /**
+     * 地图落点-覆盖范围
+     */
+    setMarkersRadius(makerList) {
+      let that = this
+      that.handler = new Cesium.ScreenSpaceEventHandler(this.viewer.scene.canvas)
+      clearInterval(that.aac)
+      for (let i in makerList) {
+        let longitude = makerList[i].lng;
+        let latitude = makerList[i].lat;
+        let marker = that.viewer.entities.add({
+          name:"",
+          position: Cesium.Cartesian3.fromDegrees(longitude, latitude),
+          billboard: {
+            image: iconList[makerList[i].icon],
+            width: 48,
+            height: 48,
+            heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+            disableDepthTestDistance:Number.POSITIVE_INFINITY
+          },
+          description: makerList[i].bindPopupHtml,
+          click: makerList[i].click,
+          parameter: makerList[i].parameter
+        })
+        that.markerboxEntityRadius.push(marker)
+        //绘制摄像头的圈（覆盖范围）
+        that.viewer.entities.add({
+          position: Cesium.Cartesian3.fromDegrees(makerList[i].lng,makerList[i].lat,2),
+          ellipse: {
+            semiMinorAxis: makerList[i].radius,
+            semiMajorAxis: makerList[i].radius,
+            material: Cesium.Color.AQUA.withAlpha(0.5),
+            outline: true,
+            outlineColor: Cesium.Color.AQUA.withAlpha(0.5),
+            outlineWidth: 12,
+          },
+        });
+      }
+      that.viewer.scene.globe.depthTestAgainstTerrain = false
+      that.createLeftClickDescription()
+      that.createRightClickDescription()
+    },
+    /**
+     * 地图画线(贴地)
+     */
+    setConnectTwoList(connectList,color,withAlpha) {
+      let that = this
+      //Cesium.Color.fromCssColorString('#67ADDF')   16进制颜色设置
+      let material = Cesium.Color.fromCssColorString(color).withAlpha(withAlpha);
+      that.connectBoxEntityTwo = that.viewer.entities.add({
+        Type: 'Polyline',
+        polyline: {
+          positions: Cesium.Cartesian3.fromDegreesArray(connectList),
+          clampToGround: true,//贴地 true,不贴地  false
+          width: 5,
+          material: material
+        }
+      })
+    },
+    //移除之前添加的点
     clearM() {
       this.viewer.entities.removeAll()
       if (this.markerboxEntity != null) {
@@ -244,85 +318,6 @@ export default {
       that.createRightClickDescription()
     },
     /**
-     * 地图落点
-     */
-    setMarkers(makerList){
-      let that = this;
-      that.handler = new Cesium.ScreenSpaceEventHandler(this.viewer.scene.canvas);
-      clearInterval(that.aac);
-      for (let i in makerList) {
-        let longitude = makerList[i].lng;
-        let latitude = makerList[i].lat;
-        that.viewer.entities.add({
-          name:"",
-          position: Cesium.Cartesian3.fromDegrees(longitude, latitude),
-          billboard: {
-            image: iconList[makerList[i].icon],
-            width: 48,
-            height: 48,
-            heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
-            disableDepthTestDistance:Number.POSITIVE_INFINITY
-          },
-          description: makerList[i].bindPopupHtml,
-          click: makerList[i].click,
-          parameter: makerList[i].parameter,
-        });
-      }
-      // const carmodel = [];
-      // carmodel[0] = that.viewer.entities.add({
-      //   name:"",
-      //   position: Cesium.Cartesian3.fromDegrees(makerList[0].lng, makerList[0].lat),
-      //   billboard: {
-      //     image: iconList[makerList[0].icon],
-      //     width: 48,
-      //     height: 48,
-      //     heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
-      //     disableDepthTestDistance:Number.POSITIVE_INFINITY
-      //   },
-      //   description: makerList[0].bindPopupHtml,
-      //   click: makerList[0].click,
-      //   parameter: makerList[0].parameter,
-      // });
-      // carmodel[0].ellipse = {
-      //   semiMinorAxis: makerList[0].radius
-      //   semiMajorAxis: makerList[0].radius
-      //   height: 0.0,
-      //   material: Cesium.Color.RED.withAlpha(e),
-      //   outline: true,
-      //   outlineColor: Cesium.Color.BLUE.withAlpha(0.5),
-      //   outlineWidth: 2,
-      //   heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
-      // }
-      // carmodel[1] = that.viewer.entities.add({
-      //   name:"",
-      //   position: Cesium.Cartesian3.fromDegrees(makerList[1].lng, makerList[1].lat),
-      //   billboard: {
-      //     image: iconList[makerList[1].icon],
-      //     width: 48,
-      //     height: 48,
-      //     heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
-      //     disableDepthTestDistance:Number.POSITIVE_INFINITY
-      //   },
-      //   description: makerList[1].bindPopupHtml,
-      //   click: makerList[1].click,
-      //   parameter: makerList[1].parameter,
-      // });
-      // carmodel[0].ellipse = {
-      //   semiMinorAxis: makerList[0].radius
-      //   semiMajorAxis: makerList[0].radius
-      //   height: 0.0,
-      //   material: Cesium.Color.RED.withAlpha(e),
-      //   outline: true,
-      //   outlineColor: Cesium.Color.BLUE.withAlpha(0.5),
-      //   outlineWidth: 2,
-      //   heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
-      // }
-
-      that.viewer.scene.globe.depthTestAgainstTerrain=false;
-      that.createLeftClickDescription();
-      that.createRightClickDescription();
-    },
-    /**
      *鼠标左击事件是原来的气泡
      */
     createLeftClickDescription() {

src/views/eventdetailsdialog.vue

@@ -1598,6 +1598,10 @@ export default {
         return
       }else{
         let param = { eventCode: this.eventCode, reserve: this.sendGuanLianYuAn }
+        if(this.sendGuanLianYuAn==''||this.sendGuanLianYuAn==null){
+          this.$message.error(`请选择预案信息！`)
+          return
+        }
         updateYjYuAn(param).then(res => {
           //事件调整关联预案
           if (res.code == 200) {

src/views/leader.vue

@@ -390,9 +390,16 @@ export default {
     },
     // 巡查任务落点
     drawTaskPoint(patrolTrajectory) {
+        let list = JSON.parse(patrolTrajectory)
+        let data = []
+        for (var i = 0; i < list.length; i++) {
+          data.push(list[i].lng);
+          data.push(list[i].lat);
+        }
       setTimeout(() => {
         this.$refs.supermap.clearC();
-        this.$refs.supermap.setConnectList(JSON.parse(patrolTrajectory), '#04f');
+          this.$refs.supermap.clearTwoC();
+        this.$refs.supermap.setConnectList(data, '#04f',0.8);
       }, 1000)
     },
     //点击巡查轨迹时段 巡查轨迹落点
@@ -402,18 +409,15 @@ export default {
       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)
+						that.connectList.push(res.data[i].longitude)
+						that.connectList.push(res.data[i].latitude)
         }
         setTimeout(() => {
-          that.$refs.supermap.clearCTwo()
-          that.$refs.supermap.setConnectTwoList(this.connectList, '#f40')
+          that.$refs.supermap.clearTwoC()
+          that.$refs.supermap.setConnectTwoList(this.connectList, '#f40',0.8)
         }, 1000)
       } else {
-        that.$refs.supermap.clearCTwo()
+        that.$refs.supermap.clearTwoC()
       }
     },
     setConnectList(points, planName) {

src/views/tianzhangzhi.vue

@@ -8,23 +8,17 @@
       <div class="leftbar" ref="left">
         <div class="forthis">
           <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;"/>
+            <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;" />
             <div class="this-title">
               <span>田长列表</span>
-              <dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;"/>
+              <dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;" />
             </div>
             <div class="i-list-con h-27">
-              <el-input
-                v-model="name"
-                placeholder="请输入姓名"
-                clearable
-                size="small"
-                prefix-icon="el-icon-search"
-                style="margin-bottom: 20px"
-              />
+              <el-input v-model="name" placeholder="请输入姓名" clearable size="small" prefix-icon="el-icon-search"
+                style="margin-bottom: 20px" />
               <div class="d-l-con-icon">
                 <div class="icon-con" :class="{on:listCurrentIndex1==item.gridId}"
-                     v-for="(item,index) in visuTianzhangList2" @click="getGridList(item.gridId)">
+                  v-for="(item,index) in visuTianzhangList2" @click="getGridList(item.gridId)">
                   <div class="icon icon-mid el-icon-user"></div>
                   <div class="icon-text personnel-name">
                     <h6>姓名：{{ item.name }} </h6>
@@ -37,15 +31,15 @@
         </div>
         <div class="forthis">
           <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;"/>
+            <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;" />
             <div class="this-title">
               <span>网格信息</span>
-              <dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;"/>
+              <dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;" />
             </div>
             <div class="i-list-con h-27">
               <div class="d-l-con-icon">
                 <div class="icon-con" :class="{on:listCurrentIndex2==item. gridId}"
-                     v-for="(item,index) in visuGridLengthList" @click="selectGridLandInfo(item)">
+                  v-for="(item,index) in visuGridLengthList" @click="selectGridLandInfo(item)">
                   <div class="icon icon-mid el-icon-user"></div>
                   <div class="icon-text personnel-name">
                     <h6>网格名称：{{ item.gridNetworkName }}</h6>
@@ -58,23 +52,22 @@
         </div>
       </div>
       <!-- 地图 -->
-<!--      <supermap ref="supermap" style="width: 100%;height: 100vh;" :mapDiv="'forestMap'" class="indexSupermapClass"-->
-<!--                :mapSite="{doubleClickZoom:false}" :codes="['9fa5']" :isSideBySide="false"></supermap>-->
-      <supermap ref="supermap" style="width: 100%;height: 100vh;" ></supermap>
+      <!--      <supermap ref="supermap" style="width: 100%;height: 100vh;" :mapDiv="'forestMap'" class="indexSupermapClass"-->
+      <!--                :mapSite="{doubleClickZoom:false}" :codes="['9fa5']" :isSideBySide="false"></supermap>-->
+      <supermap ref="supermap" style="width: 100%;height: 100vh;"></supermap>
       <!-- 右侧 -->
       <div class="rightbar" ref="right">
         <div class="forthis">
           <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;"/>
+            <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;" />
             <div class="this-title">
               <span>资源耕地列表</span>
-              <dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;"/>
+              <dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;" />
             </div>
             <div class="i-list-con h-27">
               <div class="h-19 overflow-y">
-                <div class="d-l-con" :class="{on:listCurrentIndex3==item.id}"
-                     v-for="(item,index) in gengdiList"
-                     @click="getFlagList(item.id,1)">
+                <div class="d-l-con" :class="{on:listCurrentIndex3==item.id}" v-for="(item,index) in gengdiList"
+                  @click="getFlagList(item.id,1)">
                   <div class="d-l-l-text">
                     <i class="i-small"></i>
                     <h4>{{ item.name }}</h4>
@@ -86,16 +79,15 @@
         </div>
         <div class="forthis">
           <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;"/>
+            <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;" />
             <div class="this-title">
               <span>永久基本田列表</span>
-              <dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;"/>
+              <dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;" />
             </div>
             <div class="i-list-con h-27">
               <div class="h-19 overflow-y">
-                <div class="d-l-con" :class="{on:listCurrentIndex4==item.id}"
-                     v-for="(item,index) in yongjiutianList"
-                     @click="getFlagList(item.id,2)">
+                <div class="d-l-con" :class="{on:listCurrentIndex4==item.id}" v-for="(item,index) in yongjiutianList"
+                  @click="getFlagList(item.id,2)">
                   <div class="d-l-l-text">
                     <i class="i-small"></i>
                     <h4>{{ item.name }}</h4>
@@ -114,60 +106,59 @@
 </template>
 
 <script>
-import {
-  getTianzhangList,
-  selectVisuGridLength,
-  selectGridLandInfo,
-  getTianList,
-  getFlagList,
-  getGridList,
-  getFarmList,
-  getLandList,
-  remoteGetRegionalFlag
-} from '@/api/tianzhangzhi'
+  import {
+    getTianzhangList,
+    selectVisuGridLength,
+    selectGridLandInfo,
+    getTianList,
+    getFlagList,
+    getGridList,
+    getFarmList,
+    getLandList,
+    remoteGetRegionalFlag
+  } from '@/api/tianzhangzhi'
 
-import supermap from '@/components/supermap-2.5d' //超图
-import vheader from '@/components/v-header.vue' //一体化共用头部
-import vBottomMenu from '@/components/vBottomMenu.vue' //一体化公共底部菜单
-import eventLocation from '@/components/eventLocation.vue' //事件定位弹窗
-import TVWall from '@/components/TVWall.vue'
+  import supermap from '@/components/supermap-2.5d' //超图
+  import vheader from '@/components/v-header.vue' //一体化共用头部
+  import vBottomMenu from '@/components/vBottomMenu.vue' //一体化公共底部菜单
+  import eventLocation from '@/components/eventLocation.vue' //事件定位弹窗
+  import TVWall from '@/components/TVWall.vue'
 
-let echarts = require('echarts')
-export default {
-  components: {
-    supermap,
-    vheader,
-    vBottomMenu,
-    eventLocation,
-    TVWall
-  },
-  data() {
-    return {
-      listCurrentIndex1: '',
-      listCurrentIndex2: '',
-      name: '',
-      listCurrentIndex3: '',
-      listCurrentIndex4: '',
-      visuTianzhangList: [], //田长列表
-      visuTianzhangList2: [], //田长列表
-      visuGridLengthList: [], //网格网格长列表
-      gengdiList: [], //耕地列表
-      yongjiutianList: [], //永久田列表
-    }
-  },
-  created() {
-    this.getTianList()
-    /** ----------------------------------底部按钮公用组件开始------------------------------------- */
-    window.showDialog = this.showDialog
-    window.choseLayerSwitching = this.choseLayerSwitching
-    window.choseLayerSwitchingList = this.choseLayerSwitchingList
-    /** ----------------------------------底部按钮公用组件结束------------------------------------- */
-  },
-  mounted() {
-    this.bottomMenuList() //获取底部公共组件消息和任务
-  },
-  watch:
-    {
+  let echarts = require('echarts')
+  export default {
+    components: {
+      supermap,
+      vheader,
+      vBottomMenu,
+      eventLocation,
+      TVWall
+    },
+    data() {
+      return {
+        listCurrentIndex1: '',
+        listCurrentIndex2: '',
+        name: '',
+        listCurrentIndex3: '',
+        listCurrentIndex4: '',
+        visuTianzhangList: [], //田长列表
+        visuTianzhangList2: [], //田长列表
+        visuGridLengthList: [], //网格网格长列表
+        gengdiList: [], //耕地列表
+        yongjiutianList: [], //永久田列表
+      }
+    },
+    created() {
+      this.getTianList()
+      /** ----------------------------------底部按钮公用组件开始------------------------------------- */
+      window.showDialog = this.showDialog
+      window.choseLayerSwitching = this.choseLayerSwitching
+      window.choseLayerSwitchingList = this.choseLayerSwitchingList
+      /** ----------------------------------底部按钮公用组件结束------------------------------------- */
+    },
+    mounted() {
+      this.bottomMenuList() //获取底部公共组件消息和任务
+    },
+    watch: {
       name(val) {
         this.visuTianzhangList2 = [];
         for (let i in this.visuTianzhangList) {
@@ -177,188 +168,211 @@ export default {
         }
       }
     },
-  methods: {
-    selectGridLandInfo(data) {
-      if (data.gridFarmId != undefined) {
-        this.getLandList(data.gridFarmId)
-      }
-      if (data.gridLandId != undefined) {
-        this.getFarmList(data.gridLandId)
-      }
-    },
-    getGridList(gridId) {
-      let that = this
-      getGridList({leadType: "6", gridId: gridId}).then(function (response) {
-        console.log(JSON.stringify(response.data));
-        that.visuGridLengthList = response.data
-      })
-    },
+    methods: {
+      selectGridLandInfo(data) {
+        this.$refs.supermap.clearG()
+        if (data.gridFarmId != undefined) {
+          this.getLandList(data.gridFarmId)
+        }
+        if (data.gridLandId != undefined) {
+          this.getFarmList(data.gridLandId)
+        }
+      },
+      getGridList(gridId) {
+        let that = this
 
-    getLandList(gridLandId) {
-      let that = this
-      getLandList({gridLandId: gridLandId}).then(function (response) {
-        console.log(JSON.stringify(response.data));
-        that.gengdiList = response.data
-      })
-    },
+        this.gengdiList = []
+        this.yongjiutianList = []
+        this.visuGridLengthList = []
+        that.$refs.supermap.clearG()
+        getGridList({
+          leadType: "6",
+          gridId: gridId
+        }).then(function(response) {
+          console.log(JSON.stringify(response.data));
+          that.visuGridLengthList = response.data
+        })
+      },
 
-    getFarmList(gridFarmId) {
-      let that = this
-      getFarmList({gridFarmId: gridFarmId}).then(function (response) {
-        console.log(JSON.stringify(response.data));
-        that.yongjiutianList = response.data
-      })
-    },
+      getLandList(gridLandId) {
+        let that = this
+        getLandList({
+          gridLandId: gridLandId
+        }).then(function(response) {
+          console.log(JSON.stringify(response.data));
+          that.gengdiList = response.data
+        })
+      },
 
-    getFlagList(id, type) {
-      let that = this
-      getFlagList({id: id}).then(function (response) {
-        console.log(JSON.stringify(response.data));
+      getFarmList(gridFarmId) {
+        let that = this
+        getFarmList({
+          gridFarmId: gridFarmId
+        }).then(function(response) {
+          console.log(JSON.stringify(response.data));
+          that.yongjiutianList = response.data
+        })
+      },
 
-        that.$refs.supermap.clearG()
-        if (type == 1) {
+      getFlagList(id, type) {
+        let that = this
+        getFlagList({
+          id: id
+        }).then(function(response) {
+          console.log(JSON.stringify(response.data));
+          let list = []
+          for (var i = 0; i < response.data.length; i++) {
+            list.push(response.data[i].lng)
+            list.push(response.data[i].lat)
+          }
+          that.$refs.supermap.clearG()
+          if (type == 1) {
 
-          that.$refs.supermap.setGraphicsList(response.data, "green")
-        }
-        if (type == 2) {
+            that.$refs.supermap.setGraphicsList(list, "green", 0.8)
+          }
+          if (type == 2) {
 
-          that.$refs.supermap.setGraphicsList(response.data, "red")
-        }
+            that.$refs.supermap.setGraphicsList(list, "red", 0.8)
+          }
 
-      })
-    },
+        })
+      },
 
-    getTianList() {
-      let that = this
-      getTianList({leadType: "6"}).then(function (response) {
-        console.log(JSON.stringify(response.data));
-        that.visuTianzhangList = response.data
-        that.visuTianzhangList2 = response.data
-      })
-    },
-    getPointListByGd(id) {
-      //耕地地图展示区域
-      remoteGetRegionalFlag(id).then(res => {
-        this.listCurrentIndex3 = id
-        this.$refs.supermap.clearG()
-        this.$refs.supermap.setGraphicsList(res.data, "green")
-      })
-    },
-    getPointListByYjt(id) {
-      //永久田地图展示区域
-      remoteGetRegionalFlag(id).then(res => {
-        this.listCurrentIndex4 = id
-        this.$refs.supermap.clearGTwo()
-        this.$refs.supermap.setGraphicsTwoList(res.data, "red")
-      })
-    },
-    selectVisuGridLength(id) {
-      //田长获取网格网格长列表
-      selectVisuGridLength({chiefTianId: id}).then(res => {
-        this.$refs.supermap.clearGTwo()
-        this.$refs.supermap.clearG()
-        this.visuGridLengthList = res.data
-        this.listCurrentIndex1 = id
-      })
-    },
-    // selectGridLandInfo(id) {
-    //   //网格获取耕地和基本田列表
-    //   selectGridLandInfo({gridId: id}).then(res => {
-    //     this.$refs.supermap.clearGTwo()
-    //     this.$refs.supermap.clearG()
-    //     this.gengdiList = res.data.gd
-    //     this.yongjiutianList = res.data.yjt
-    //     this.listCurrentIndex2 = id
-    //   })
-    // },
-    /** ----------------------------------底部按钮公用组件开始------------------------------------- */
-    bottomMenuList() {
-      this.$refs.bottomMenu.selectTaskList()//获取任务列表
-      this.$refs.bottomMenu.selectMessageList()//获取消息列表
-    },
-    showDialog(click) {
-      if (click == 'eventLocation') {
-        this.$refs.eventLocation.showEventLocation()
-        this.$refs.supermap.isEditableLayers = false
-        this.$refs.bottomMenu.showChild = false
-        this.$refs.bottomMenu.showBanChild = false
-        this.$refs.bottomMenu.showChangChild = false
-      } else if (click == 'editableLayers') {
-        this.$refs.bottomMenu.showChild = false
-        this.$refs.bottomMenu.showBanChild = false
-        this.$refs.bottomMenu.showChangChild = false
-        if (!this.$refs.supermap.isEditableLayers) {
-          this.$refs.supermap.isEditableLayers = true
-        } else {
+      getTianList() {
+        let that = this
+        getTianList({
+          leadType: "6"
+        }).then(function(response) {
+          console.log(JSON.stringify(response.data));
+          that.visuTianzhangList = response.data
+          that.visuTianzhangList2 = response.data
+        })
+      },
+      getPointListByGd(id) {
+        //耕地地图展示区域
+        remoteGetRegionalFlag(id).then(res => {
+          this.listCurrentIndex3 = id
+          this.$refs.supermap.clearG()
+          this.$refs.supermap.setGraphicsList(res.data, "green")
+        })
+      },
+      getPointListByYjt(id) {
+        //永久田地图展示区域
+        remoteGetRegionalFlag(id).then(res => {
+          this.listCurrentIndex4 = id
+          this.$refs.supermap.clearGTwo()
+          this.$refs.supermap.setGraphicsTwoList(res.data, "red")
+        })
+      },
+      selectVisuGridLength(id) {
+        //田长获取网格网格长列表
+        selectVisuGridLength({
+          chiefTianId: id
+        }).then(res => {
+          this.$refs.supermap.clearGTwo()
+          this.$refs.supermap.clearG()
+          this.visuGridLengthList = res.data
+          this.listCurrentIndex1 = id
+        })
+      },
+      // selectGridLandInfo(id) {
+      //   //网格获取耕地和基本田列表
+      //   selectGridLandInfo({gridId: id}).then(res => {
+      //     this.$refs.supermap.clearGTwo()
+      //     this.$refs.supermap.clearG()
+      //     this.gengdiList = res.data.gd
+      //     this.yongjiutianList = res.data.yjt
+      //     this.listCurrentIndex2 = id
+      //   })
+      // },
+      /** ----------------------------------底部按钮公用组件开始------------------------------------- */
+      bottomMenuList() {
+        this.$refs.bottomMenu.selectTaskList() //获取任务列表
+        this.$refs.bottomMenu.selectMessageList() //获取消息列表
+      },
+      showDialog(click) {
+        if (click == 'eventLocation') {
+          this.$refs.eventLocation.showEventLocation()
+          this.$refs.supermap.isEditableLayers = false
+          this.$refs.bottomMenu.showChild = false
+          this.$refs.bottomMenu.showBanChild = false
+          this.$refs.bottomMenu.showChangChild = false
+        } else if (click == 'editableLayers') {
+          this.$refs.bottomMenu.showChild = false
+          this.$refs.bottomMenu.showBanChild = false
+          this.$refs.bottomMenu.showChangChild = false
+          if (!this.$refs.supermap.isEditableLayers) {
+            this.$refs.supermap.isEditableLayers = true
+          } else {
+            this.$refs.supermap.isEditableLayers = false
+          }
+        } else if (click == 'layerSwitching') {
+          this.$refs.supermap.isEditableLayers = false
+          this.$refs.bottomMenu.showBanChild = false
+          this.$refs.bottomMenu.showChangChild = false
+          if (!this.$refs.bottomMenu.showChild) {
+            this.$refs.bottomMenu.showChild = true
+          } else {
+            this.$refs.bottomMenu.showChild = false
+          }
+        } else if (click == 'TVWall') {
+          this.$refs.TVWall.showTVWall()
           this.$refs.supermap.isEditableLayers = false
-        }
-      } else if (click == 'layerSwitching') {
-        this.$refs.supermap.isEditableLayers = false
-        this.$refs.bottomMenu.showBanChild = false
-        this.$refs.bottomMenu.showChangChild = false
-        if (!this.$refs.bottomMenu.showChild) {
-          this.$refs.bottomMenu.showChild = true
-        } else {
           this.$refs.bottomMenu.showChild = false
-        }
-      } else if (click == 'TVWall') {
-        this.$refs.TVWall.showTVWall()
-        this.$refs.supermap.isEditableLayers = false
-        this.$refs.bottomMenu.showChild = false
-        this.$refs.bottomMenu.showBanChild = false
-        this.$refs.bottomMenu.showChangChild = false
-      } else if (click == 'forestban') {
-        this.$refs.supermap.isEditableLayers = false
-        this.$refs.bottomMenu.showChild = false
-        this.$refs.bottomMenu.showChangChild = false
-        if (!this.$refs.bottomMenu.showBanChild) {
-          this.$refs.bottomMenu.showBanChild = true
-        } else {
           this.$refs.bottomMenu.showBanChild = false
-        }
-      } else if (click == 'forestchang') {
-        this.$refs.supermap.isEditableLayers = false
-        this.$refs.bottomMenu.showBanChild = false
-        this.$refs.bottomMenu.showChild = false
-        if (!this.$refs.bottomMenu.showChangChild) {
-          this.$refs.bottomMenu.showChangChild = true
-        } else {
           this.$refs.bottomMenu.showChangChild = false
+        } else if (click == 'forestban') {
+          this.$refs.supermap.isEditableLayers = false
+          this.$refs.bottomMenu.showChild = false
+          this.$refs.bottomMenu.showChangChild = false
+          if (!this.$refs.bottomMenu.showBanChild) {
+            this.$refs.bottomMenu.showBanChild = true
+          } else {
+            this.$refs.bottomMenu.showBanChild = false
+          }
+        } else if (click == 'forestchang') {
+          this.$refs.supermap.isEditableLayers = false
+          this.$refs.bottomMenu.showBanChild = false
+          this.$refs.bottomMenu.showChild = false
+          if (!this.$refs.bottomMenu.showChangChild) {
+            this.$refs.bottomMenu.showChangChild = true
+          } else {
+            this.$refs.bottomMenu.showChangChild = false
+          }
         }
-      }
 
-    },
-    //选择图层
-    choseLayerSwitching(url, isClear) {
-      this.$refs.supermap.layerSwitching(url, isClear)
-    },
-    //选择图层(传递数组)
-    choseLayerSwitchingList(urlList) {
-      this.$refs.supermap.layerSwitchingList(urlList)
-    },
-    /** ----------------------------------底部按钮公用组件结束------------------------------------- */
+      },
+      //选择图层
+      choseLayerSwitching(url, isClear) {
+        this.$refs.supermap.layerSwitching(url, isClear)
+      },
+      //选择图层(传递数组)
+      choseLayerSwitchingList(urlList) {
+        this.$refs.supermap.layerSwitchingList(urlList)
+      },
+      /** ----------------------------------底部按钮公用组件结束------------------------------------- */
 
-    //初始化
-    getInit() {
-      let that = this
-      this.listCurrentIndex1 = ''
-      this.listCurrentIndex2 = ''
-      this.listCurrentIndex3 = ''
-      this.listCurrentIndex4 = ''
-      //获取田长列表
-      getTianzhangList().then(res => {
-        that.visuTianzhangList = res.data
-      })
-    },
-  }
+      //初始化
+      getInit() {
+        let that = this
+        this.listCurrentIndex1 = ''
+        this.listCurrentIndex2 = ''
+        this.listCurrentIndex3 = ''
+        this.listCurrentIndex4 = ''
+        //获取田长列表
+        getTianzhangList().then(res => {
+          that.visuTianzhangList = res.data
+        })
+      },
+    }
 
-}
+  }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-@import '@/assets/styles/base.scss';
+  @import '@/assets/styles/base.scss';
 
-.h-27 {
-  height: 27rem;
-}
-</style>
+  .h-27 {
+    height: 27rem;
+  }
+</style>