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

src/api/vBottomMenu.js

@@ -1,6 +1,15 @@
 import request from '@/utils/request'
 
 
+// 获取林场层级树结构
+export function userDeptSelect(param) {
+  return request({
+    url: '/system/dept/userAllDeptSelectIncludeChildren',
+    method: 'get'
+  })
+}
+
+
 // 获取林场列表
 export function selectFarmByDeptId(param) {
   return request({
@@ -9,3 +18,17 @@ export function selectFarmByDeptId(param) {
     data: param
   })
 }
+// 获取林班层级树结构
+export function linBanTreeselect() {
+  return request({
+    url: '/center-fire/VisuForestCloudMapController/linBanTreeselect',
+    method: 'post',
+  })
+}
+// 获取林班列表
+export function selectBanBylinBanTreesId(id) {
+  return request({
+    url: '/center-fire/VisuForestCloudMapController/selectBanBylinBanTreesId/'+id,
+    method: 'get',
+  })
+}

src/components/TVWall.vue

@@ -2,7 +2,7 @@
   <div>
     <el-dialog title="电视墙" :visible.sync="TVWallVisible" v-if="TVWallVisible" customClass="TVWallCustomWidth"
                @close="cancelEventLocationShow()">
-      <!--<div @click="findCameraByEventCoordinate()">视频联动</div>-->
+      <div @click="findCameraByEventCoordinate()">视频联动</div>
 	  <!--<div class="forthis" style="width: 22%; position: absolute;left: 0;z-index: 9999999999999;">-->
 	  	<!--<div class="i-list-con" style="height: 46vh; overflow-y: scroll;">-->
 	  		<!--<span v-for="(item,index) in cameraList" :key="index">-->

src/components/supermap.vue

@@ -268,7 +268,6 @@
 			}
 		},
 		mounted() {
-			this.getspuerMapHost()
 			this.initMap()
 			//添加画图的提示信息
 			window.L.drawLocal.draw.toolbar = {
@@ -1451,27 +1450,29 @@
 				if (banCheckList != null && banCheckList.length > 0) {
 					for (let i = 0; i < banCheckList.length; i++) {
 
-            that.deckglLayer = window.L.supermap.tiledMapLayer(banCheckList[i].farmAddress, {})
+            that.deckglLayer = window.L.supermap.tiledMapLayer(banCheckList[i].supermapAddress, {})
             that.deckglLayerList_Data.push(that.deckglLayer)
             that.map.addLayer(that.deckglLayer)
-						if (banCheckList[i].farmAddress != null) {
+						if (banCheckList[i].supermapAddress != null) {
               var getFeatureBySQLParams = new SuperMap.GetFeaturesBySQLParameters({
                 queryParameter: {
                   name: banCheckList[i].name,
                 },
-                datasetNames: banCheckList[i].datasetNames,
+                datasetNames: [banCheckList[i].datasetNames],
                 maxFeatures:20000,
                 fromIndex: 0,
                 toIndex: 999999
               })
 
-              window.L.supermap.featureService("http://121.36.228.94:8090/iserver/services/data-baishan/rest/data")
-                .getFeaturesBySQL(getFeatureBySQLParams, function(serviceResult) {
-                  if (serviceResult.hasOwnProperty('result') && serviceResult.result
-                    .hasOwnProperty('features')) {
-                    that.lbtThemeLayer.addFeatures(serviceResult.result.features);
-                  }
-                }, SuperMap.DataFormat.ISERVER);
+              selectConfigKey('superMap.iserver.data').then(res => {
+                window.L.supermap.featureService(res.data)
+                  .getFeaturesBySQL(getFeatureBySQLParams, function(serviceResult) {
+                    if (serviceResult.hasOwnProperty('result') && serviceResult.result
+                      .hasOwnProperty('features')) {
+                      that.lbtThemeLayer.addFeatures(serviceResult.result.features);
+                    }
+                  }, SuperMap.DataFormat.ISERVER);
+              })
 						}
 					}
 				}
@@ -1523,29 +1524,25 @@
 			PlottingDrawCancel: function() {
 				this.plottingdrawControl.handler.disable()
 			},
-			getspuerMapHost() {
-				selectConfigKey('superMap.iserver.plot').then(res => {
-					this.host = res.data
-				})
-			},
 			dynamicPlotting: function() {
 				setTimeout(() => {
-					var host = this.host
-					var serverUrl = host + '/iserver/services/plot-jingyong/rest/plot/'
-
-					var me = this
-					this.plottingLayer = window.L.supermap.plotting.plottingLayer('plot',
-						serverUrl)
-					this.plottingLayer.spatialAnalystUrl =
-						host + '/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst'
-					this.plottingLayer.addTo(this.map)
-					this.plottingdrawControl = window.L.supermap.plotting.drawControl(this
-						.plottingLayer)
-					this.plottingdrawControl.addTo(this.map)
-					var editControl = window.L.supermap.plotting.editControl()
-					editControl.addTo(this.map)
-					window.L.supermap.plotting.initPlotPanel('plotPanel', serverUrl, this
-						.plottingdrawControl)
+          selectConfigKey('superMap.iserver.plot').then(res => {
+            var host = res.data
+            var serverUrl = host + '/iserver/services/plot-jingyong/rest/plot/'
+            var me = this
+            this.plottingLayer = window.L.supermap.plotting.plottingLayer('plot',
+              serverUrl)
+            this.plottingLayer.spatialAnalystUrl =
+              host + '/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst'
+            this.plottingLayer.addTo(this.map)
+            this.plottingdrawControl = window.L.supermap.plotting.drawControl(this
+              .plottingLayer)
+            this.plottingdrawControl.addTo(this.map)
+            var editControl = window.L.supermap.plotting.editControl()
+            editControl.addTo(this.map)
+            window.L.supermap.plotting.initPlotPanel('plotPanel', serverUrl, this
+              .plottingdrawControl)
+          })
 				}, 2000)
 			}
 			/** ----------------------------------动态绘制结束------------------------------------- */

src/components/vBottomMenu.vue

@@ -57,12 +57,12 @@
                 <!--                  placeholder="输入关键字进行过滤"-->
                 <!--                  v-model="filterbanText">-->
                 <!--                </el-input>-->
-                <el-tree :data="deptOptionsLiandong_baishan" ref="banDept" node-key="id" :check-strictly="true"
+                <el-tree :data="deptBanOptionsLiandong" ref="banDept" node-key="id"  :check-strictly="true"
                          :filter-node-method="filterbanNode" @node-click="handlebanNodeClick" :accordion="true" empty-text="加载中，请稍候"
                          :props="defaultProps"></el-tree>
               </div>
               <div class="forestban-right">
-                <el-input placeholder="请输入内容" prefix-icon="el-icon-search" v-model="filterban">
+                <el-input placeholder="请输入内容" prefix-icon="el-icon-search" v-model="filterban" @change="searchFilterban(filterchang)">
                 </el-input>
                 <el-checkbox-group v-model="banCheckList_Data">
                   <el-checkbox v-for="(item,index) in filterbanList" :label="item"
@@ -84,7 +84,7 @@
                 <!--                  placeholder="输入关键字进行过滤"-->
                 <!--                  v-model="filterchangText">-->
                 <!--                </el-input>-->
-                <el-tree :data="deptOptionsLiandong" ref="changDept" node-key="id"
+                <el-tree :data="deptChangOptionsLiandong" ref="changDept" node-key="id"
                          :check-strictly="true" :filter-node-method="filterchangNode"
                          @node-click="handlechangNodeClick" :accordion="true" empty-text="加载中，请稍候"
                          :props="defaultProps"></el-tree>
@@ -359,11 +359,8 @@ import {
   selectMessageById
 } from '@/api/forest'
 import {
-  selectFarmByDeptId
+  selectFarmByDeptId,linBanTreeselect,selectBanBylinBanTreesId,userDeptSelect
 } from '@/api/vBottomMenu'
-import {
-  treeselectAll as deptTreeselect
-} from '@/api/system/dept'
 import supermapTaskDialog from '@/components/supermap' //超图
 import TcPlayer from '@/components/TcPlayer' //视频预览
 import Cookies from 'js-cookie'
@@ -391,6 +388,7 @@ export default {
       filterbanText: '',
       filterchangText: '',
       filterbanList: [],
+      filterbanListAll: [],
       filterchangList: [],
       filterchangListAll: [],
       eventId: null,
@@ -455,31 +453,32 @@ export default {
           click: 'wrj'
         }
       ],
-      deptOptionsLiandong: [],
-      deptOptionsLiandong_baishan: [
-        {
-          label: '板石头国有林场',
-          id: 1,
-          children: [
-          ]
-        }, {
-          label: '五间房国有林场',
-          id: 2,
-          children: []
-        }, {
-          label: '三道沟国有林场',
-          id: 3,
-          children: []
-        }, {
-          label: '大镜沟国有林场',
-          id: 4,
-          children: []
-        }, {
-          label: '实验国有林场',
-          id: 5,
-          children: []
-        }
-      ],
+      deptChangOptionsLiandong: [],//查询林场部门树结构
+      deptBanOptionsLiandong: [],//查询林班层级树结构
+      // deptOptionsLiandong_baishan: [
+      //   {
+      //     label: '板石头国有林场',
+      //     id: 1,
+      //     children: [
+      //     ]
+      //   }, {
+      //     label: '五间房国有林场',
+      //     id: 2,
+      //     children: []
+      //   }, {
+      //     label: '三道沟国有林场',
+      //     id: 3,
+      //     children: []
+      //   }, {
+      //     label: '大镜沟国有林场',
+      //     id: 4,
+      //     children: []
+      //   }, {
+      //     label: '实验国有林场',
+      //     id: 5,
+      //     children: []
+      //   }
+      // ],
 
       defaultProps: {
         children: 'children',
@@ -499,12 +498,20 @@ export default {
     }
   },
   created() {
-    /** 查询部门树结构 */
-    deptTreeselect().then(response => {
-      this.deptOptionsLiandong = response.data
-    })
   },
   methods: {
+    deptTreeselect(){
+      /** 查询林场部门树结构 */
+      userDeptSelect().then(response => {
+        this.deptChangOptionsLiandong = response.data
+      })
+    },
+    linBanTreeselect(){
+      /** 查询林班层级树结构 */
+      linBanTreeselect().then(response => {
+        this.deptBanOptionsLiandong = response.data
+      })
+    },
     selectMessageById(id) {
       selectMessageById(id).then(response => {
         /** 获取消息列表 */
@@ -547,64 +554,68 @@ export default {
     handlebanNodeClick(node, data, value) {
       //获取林班列表
       this.filterban = ''
-      if(node.id==1){
-        this.filterbanList=[
-          {
-            farmAddress: 'http://121.36.228.94:8090/iserver/services/map-baishan/rest/maps/BanShiTouGuoYouLinChang',
-            farmName: '板石街道',
-            datasetNames: ['bs:banshijiedao'],
-            name: 'banshijiedao@bs'
-          },
-          {
-            farmAddress: 'http://121.36.228.94:8090/iserver/services/map-baishan/rest/maps/BanShiTouGuoYouLinChang',
-            farmName: '河口街道',
-            datasetNames: ['bs:hekoujiedao'],
-            name: 'hekoujiedao@bs'
-          },
-          {
-            farmAddress: 'http://121.36.228.94:8090/iserver/services/map-baishan/rest/maps/BanShiTouGuoYouLinChang',
-            farmName: '七道江镇',
-            datasetNames: ['bs:qidaojiangzhen'],
-            name: 'qidaojiangzhen@bs'
-          },
-        ]
-      }else if (node.id==2){
-        this.filterbanList=[
-          {
-            farmAddress: 'http://121.36.228.94:8090/iserver/services/map-baishan/rest/maps/WuJianFangGuoYouLinChang',
-            farmName: '六道江镇',
-            datasetNames: ['bs:WuJianFangGuoYouLinChang'],
-            name: 'WuJianFangGuoYouLinChang@bs'
-          },
-        ]
-      }else if (node.id==3){
-        this.filterbanList=[
-          {
-            farmAddress: 'http://121.36.228.94:8090/iserver/services/map-baishan/rest/maps/SanDaoGouGuoYouLinChang',
-            farmName: '三道沟镇',
-            datasetNames: ['bs:SanDaoGouGuoYouLinChang'],
-            name: 'SanDaoGouGuoYouLinChang@bs'
-          },
-        ]
-      }else if (node.id==4){
-        this.filterbanList=[
-          {
-            farmAddress: 'http://121.36.228.94:8090/iserver/services/map-baishan/rest/maps/DaJingGouGuoYouLinChang',
-            farmName: '红土崖镇',
-            datasetNames: ['bs:DaJingGouGuoYouLinChang'],
-            name: 'DaJingGouGuoYouLinChang@bs'
-          },
-        ]
-      }else if (node.id==5){
-        this.filterbanList=[
-          {
-            farmAddress: 'http://121.36.228.94:8090/iserver/services/map-baishan/rest/maps/ShiYanGuoYouLinChang',
-            farmName: '大阳岔镇',
-            datasetNames: ['bs:ShiYanGuoYouLinChang'],
-            name: 'ShiYanGuoYouLinChang@bs'
-          }
-        ]
-      }
+      selectBanBylinBanTreesId(node.id).then(res => {
+        this.filterbanList = res.data
+        this.filterbanListAll = res.data
+      })
+      // if(node.id==1){
+      //   this.filterbanList=[
+      //     {
+      //       farmAddress: 'http://121.36.228.94:8090/iserver/services/map-baishan/rest/maps/BanShiTouGuoYouLinChang',
+      //       farmName: '板石街道',
+      //       datasetNames: ['bs:banshijiedao'],
+      //       name: 'banshijiedao@bs'
+      //     },
+      //     {
+      //       farmAddress: 'http://121.36.228.94:8090/iserver/services/map-baishan/rest/maps/BanShiTouGuoYouLinChang',
+      //       farmName: '河口街道',
+      //       datasetNames: ['bs:hekoujiedao'],
+      //       name: 'hekoujiedao@bs'
+      //     },
+      //     {
+      //       farmAddress: 'http://121.36.228.94:8090/iserver/services/map-baishan/rest/maps/BanShiTouGuoYouLinChang',
+      //       farmName: '七道江镇',
+      //       datasetNames: ['bs:qidaojiangzhen'],
+      //       name: 'qidaojiangzhen@bs'
+      //     },
+      //   ]
+      // }else if (node.id==2){
+      //   this.filterbanList=[
+      //     {
+      //       farmAddress: 'http://121.36.228.94:8090/iserver/services/map-baishan/rest/maps/WuJianFangGuoYouLinChang',
+      //       farmName: '六道江镇',
+      //       datasetNames: ['bs:WuJianFangGuoYouLinChang'],
+      //       name: 'WuJianFangGuoYouLinChang@bs'
+      //     },
+      //   ]
+      // }else if (node.id==3){
+      //   this.filterbanList=[
+      //     {
+      //       farmAddress: 'http://121.36.228.94:8090/iserver/services/map-baishan/rest/maps/SanDaoGouGuoYouLinChang',
+      //       farmName: '三道沟镇',
+      //       datasetNames: ['bs:SanDaoGouGuoYouLinChang'],
+      //       name: 'SanDaoGouGuoYouLinChang@bs'
+      //     },
+      //   ]
+      // }else if (node.id==4){
+      //   this.filterbanList=[
+      //     {
+      //       farmAddress: 'http://121.36.228.94:8090/iserver/services/map-baishan/rest/maps/DaJingGouGuoYouLinChang',
+      //       farmName: '红土崖镇',
+      //       datasetNames: ['bs:DaJingGouGuoYouLinChang'],
+      //       name: 'DaJingGouGuoYouLinChang@bs'
+      //     },
+      //   ]
+      // }else if (node.id==5){
+      //   this.filterbanList=[
+      //     {
+      //       farmAddress: 'http://121.36.228.94:8090/iserver/services/map-baishan/rest/maps/ShiYanGuoYouLinChang',
+      //       farmName: '大阳岔镇',
+      //       datasetNames: ['bs:ShiYanGuoYouLinChang'],
+      //       name: 'ShiYanGuoYouLinChang@bs'
+      //     }
+      //   ]
+      // }
     },
     // 返回图片列表
     assetTypeAnImage(filePath) {
@@ -804,10 +815,12 @@ export default {
       window.choseLayerSwitchingList_Data(urlList)
     },
     forestban() {
+      alert(111)
       window.forestban()
       console.log('林班')
     },
     forestchang() {
+      alert(222)
       window.forestchang()
       console.log('林场')
     },
@@ -841,6 +854,20 @@ export default {
         this.filterchangList = this.filterchangListAll
       }
     },
+    searchFilterban(filterban) {
+      //林场列表搜索
+      let searchFilterbannew = []
+      if (filterban != null && filterban != '') {
+        for (var i = 0; i < this.filterbanListAll.length; i++) {
+          if (this.filterbanListAll[i].farmName.indexOf(filterban) > -1) {
+            searchFilterbannew.push(this.filterbanListAll[i])
+          }
+        }
+        this.filterbanList = searchFilterbannew
+      } else {
+        this.filterbanList = this.filterbanListAll
+      }
+    },
 
     //标记警报
     updateAlert() {

src/views/afforestation.vue

@@ -144,6 +144,8 @@ export default {
     bottomMenuList() {
       this.$refs.bottomMenu.selectTaskList()//获取任务列表
       this.$refs.bottomMenu.selectMessageList()//获取消息列表
+      this.$refs.bottomMenu.linBanTreeselect()//查询林班层级树结构
+      this.$refs.bottomMenu.deptTreeselect()//查询林场部门树结构
     },
     showDialog(click) {
       if (click == 'eventLocation') {

src/views/animal.vue

@@ -188,6 +188,8 @@ export default {
     bottomMenuList() {
       this.$refs.bottomMenu.selectTaskList()//获取任务列表
       this.$refs.bottomMenu.selectMessageList()//获取消息列表
+      this.$refs.bottomMenu.linBanTreeselect()//查询林班层级树结构
+      this.$refs.bottomMenu.deptTreeselect()//查询林场部门树结构
     },
     showDialog(click) {
       if (click == 'eventLocation') {

src/views/datacenter.vue

@@ -139,6 +139,8 @@ export default {
     bottomMenuList() {
       this.$refs.bottomMenu.selectTaskList()//获取任务列表
       this.$refs.bottomMenu.selectMessageList()//获取消息列表
+      this.$refs.bottomMenu.linBanTreeselect()//查询林班层级树结构
+      this.$refs.bottomMenu.deptTreeselect()//查询林场部门树结构
     },
     showDialog(click) {
       if (click == 'eventLocation') {

src/views/disaster.vue

@@ -451,6 +451,8 @@ export default {
     bottomMenuList() {
       this.$refs.bottomMenu.selectTaskList()//获取任务列表
       this.$refs.bottomMenu.selectMessageList()//获取消息列表
+      this.$refs.bottomMenu.linBanTreeselect()//查询林班层级树结构
+      this.$refs.bottomMenu.deptTreeselect()//查询林场部门树结构
     },
     showDialog(click) {
       if (click == 'eventLocation') {

src/views/forest.vue

@@ -1251,6 +1251,8 @@ export default {
       bottomMenuList() {
         this.$refs.bottomMenu.selectTaskList()//获取任务列表
         this.$refs.bottomMenu.selectMessageList()//获取消息列表
+        this.$refs.bottomMenu.linBanTreeselect()//查询林班层级树结构
+        this.$refs.bottomMenu.deptTreeselect()//查询林场部门树结构
       },
       showDialog(click) {
         if (click == 'eventLocation') {

src/views/leader.vue

@@ -190,6 +190,8 @@
       bottomMenuList() {
         this.$refs.bottomMenu.selectTaskList()//获取任务列表
         this.$refs.bottomMenu.selectMessageList()//获取消息列表
+        this.$refs.bottomMenu.linBanTreeselect()//查询林班层级树结构
+        this.$refs.bottomMenu.deptTreeselect()//查询林场部门树结构
       },
 			showDialog(click) {
 				if (click == 'eventLocation') {

src/views/monitor.vue

@@ -407,6 +407,8 @@ export default {
     bottomMenuList() {
       this.$refs.bottomMenu.selectTaskList()//获取任务列表
       this.$refs.bottomMenu.selectMessageList()//获取消息列表
+      this.$refs.bottomMenu.linBanTreeselect()//查询林班层级树结构
+      this.$refs.bottomMenu.deptTreeselect()//查询林场部门树结构
     },
     showDialog(click) {
       if (click == 'eventLocation') {

src/views/trees.vue

@@ -98,6 +98,8 @@ export default {
     bottomMenuList() {
       this.$refs.bottomMenu.selectTaskList()//获取任务列表
       this.$refs.bottomMenu.selectMessageList()//获取消息列表
+      this.$refs.bottomMenu.linBanTreeselect()//查询林班层级树结构
+      this.$refs.bottomMenu.deptTreeselect()//查询林场部门树结构
     },
     showDialog(click) {
       if (click == 'eventLocation') {

vue.config.js

@@ -9,7 +9,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
 
 const name = process.env.VUE_APP_TITLE || '四平市态势感知平台' // 网页标题
 
-const port = process.env.port || process.env.npm_config_port || 80 // 端口
+const port = process.env.port || process.env.npm_config_port || 81 // 端口
 
 const ssl_path = require('path')
 const fs = require('fs')
@@ -52,9 +52,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://127.0.0.1:3031`,
+        target: `http://127.0.0.1:3031`,
         // target: `http://192.168.2.118:3031`,
-        target: `http://121.36.228.66:3031`,
+        // target: `http://121.36.228.66:3031`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''