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

src/api/afforestation.js

@@ -3,14 +3,14 @@ import request from '@/utils/request'
 // 获取
 export function getAfforestation(year) {
   return request({
-    url: '/center-fire/VisuAfforestationController/getAfforestation?year='+year,
+    url: '/center-water/VisuAfforestationController/getAfforestation?year='+year,
     method: 'get',
   })
 }
 // 点击左侧人员列表获取轨迹
 export function getAfforestationArea(afforestationId) {
   return request({
-    url: '/center-fire/VisuAfforestationController/getAfforestationArea?afforestationId='+afforestationId,
+    url: '/center-water/VisuAfforestationController/getAfforestationArea?afforestationId='+afforestationId,
     method: 'get',
   })
 }

src/api/animal.js

@@ -3,14 +3,14 @@ import request from '@/utils/request'
 // 获取初始化数据
 export function getInit() {
   return request({
-    url: '/center-fire/VisuForestAnimalController/init',
+    url: '/center-water/VisuForestAnimalController/init',
     method: 'get',
   })
 }
 // 点击左侧动物列表
 export function selectForestAnimalListByType(type) {
   return request({
-    url: '/center-fire/VisuForestAnimalController/selectForestAnimalListByType/'+type,
+    url: '/center-water/VisuForestAnimalController/selectForestAnimalListByType/'+type,
     method: 'get',
   })
 }

src/api/bigdata.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 事件来源，类型统计
 export function getEventSourceAndTypeStatistics(param) {
   return request({
-    url: '/center-fire/VisuForestCloudBigDataController/getEventSourceAndTypeStatistics',
+    url: '/center-water/VisuForestCloudBigDataController/getEventSourceAndTypeStatistics',
     method: 'post',
     data: param
   })
@@ -13,7 +13,7 @@ export function getEventSourceAndTypeStatistics(param) {
 // 设备类型统计
 export function getCameaCount() {
   return request({
-    url: '/center-fire/VisuForestCloudBigDataController/getCameaCount',
+    url: '/center-water/VisuForestCloudBigDataController/getCameaCount',
     method: 'post',
   })
 }
@@ -21,7 +21,39 @@ export function getCameaCount() {
 // 设备分布
 export function getSbfb() {
   return request({
-    url: '/center-fire/VisuForestCloudBigDataController/getSbfb',
+    url: '/center-water/VisuForestCloudBigDataController/getSbfb',
+    method: 'post',
+  })
+}
+
+// 闸口资源统计
+export function getG1() {
+  return request({
+    url: '/center-water/VisuForestCloudBigDataController/selectWaterGateDeptCount',
+    method: 'post',
+  })
+}
+
+// 水利工程资源统计
+export function getG2() {
+  return request({
+    url: '/center-water/VisuForestCloudBigDataController/selectWaterProjectDeptCount',
+    method: 'post',
+  })
+}
+
+// 河段资源统计
+export function getG3() {
+  return request({
+    url: '/center-water/VisuForestCloudBigDataController/selectReachWaterDeptCount',
+    method: 'post',
+  })
+}
+
+// 河流资源统计
+export function getG4() {
+  return request({
+    url: '/center-water/VisuForestCloudBigDataController/selectRiverWaterDeptCount',
     method: 'post',
   })
 }
@@ -29,7 +61,7 @@ export function getSbfb() {
 //林场分布统计
 export function getLcfbtj() {
   return request({
-    url: '/center-fire/VisuForestCloudBigDataController/selectBigDataFarmDeptCount',
+    url: '/center-water/VisuForestCloudBigDataController/selectBigDataFarmDeptCount',
     method: 'post'
   })
 }
@@ -42,7 +74,7 @@ export function getQhyytj(param) {
     param = {day: myDate.getFullYear()}
   }
   return request({
-    url: '/center-fire/VisuForestCloudBigDataController/selectEventByYearGroupByFireSource',
+    url: '/center-water/VisuForestCloudBigDataController/selectEventByYearGroupByFireSource',
     data: param,
     method: 'post'
   })
@@ -51,7 +83,7 @@ export function getQhyytj(param) {
 //重点区域
 export function getZdqy() {
   return request({
-    url: '/center-fire/VisuForestCloudBigDataController/selectBigDataImportareaDeptCount',
+    url: '/center-water/VisuForestCloudBigDataController/selectBigDataImportareaDeptCount',
     method: 'post'
   })
 }
@@ -64,7 +96,7 @@ export function getSbsbsjsl(param) {
     param = {day: myDate.getFullYear()}
   }
   return request({
-    url: '/center-fire/VisuForestCloudBigDataController/getAIEventNum',
+    url: '/center-water/VisuForestCloudBigDataController/getAIEventNum',
     data: param,
     method: 'post'
   })
@@ -73,7 +105,7 @@ export function getSbsbsjsl(param) {
 //珍惜古树
 export function getZxgs() {
   return request({
-    url: '/center-fire/VisuForestCloudBigDataController/selectBigDataTreesDeptCount',
+    url: '/center-water/VisuForestCloudBigDataController/selectBigDataTreesDeptCount',
     method: 'post'
   })
 }
@@ -86,7 +118,7 @@ export function getSjqs(param) {
     param = {day: myDate.getFullYear()}
   }
   return request({
-    url: '/center-fire/VisuForestCloudBigDataController/getEventTrend',
+    url: '/center-water/VisuForestCloudBigDataController/getEventTrend',
     data: param,
     method: 'post'
   })
@@ -95,7 +127,7 @@ export function getSjqs(param) {
 //网格分布
 export function getWgfb() {
   return request({
-    url: '/center-fire/VisuForestCloudBigDataController/selectBigDataFridDeptCount',
+    url: '/center-water/VisuForestCloudBigDataController/selectBigDataFridDeptCount',
     method: 'post'
   })
 }
@@ -112,7 +144,7 @@ export function getTqqs(param) {
     param = {day: myDate.getFullYear() + "-" + month}
   }
   return request({
-    url: '/center-fire/VisuForestCloudBigDataController/selectBigDataByYearMonthFegin',
+    url: '/center-water/VisuForestCloudBigDataController/selectBigDataByYearMonthFegin',
     data: param,
     method: 'post'
   })
@@ -121,7 +153,7 @@ export function getTqqs(param) {
 //网格人员
 export function getWgry() {
   return request({
-    url: '/center-fire/VisuForestCloudBigDataController/selectBigDataFridLZDeptCount',
+    url: '/center-water/VisuForestCloudBigDataController/selectBigDataFridLZDeptCount',
     method: 'post'
   })
 }
@@ -129,7 +161,7 @@ export function getWgry() {
 //防火队
 export function getFhd() {
   return request({
-    url: '/center-fire/VisuForestCloudBigDataController/selectBigDataFireTeamDeptCount',
+    url: '/center-water/VisuForestCloudBigDataController/selectBigDataFireTeamDeptCount',
     method: 'post'
   })
 }
@@ -137,7 +169,7 @@ export function getFhd() {
 //气象站
 export function getQxz() {
   return request({
-    url: '/center-fire/VisuForestCloudBigDataController/selectBigDataWeatherStationDeptCount',
+    url: '/center-water/VisuForestCloudBigDataController/selectBigDataWeatherStationDeptCount',
     method: 'post'
   })
 }
@@ -150,7 +182,7 @@ export function getZhxx(param) {
     param = {day: myDate.getFullYear()}
   }
   return request({
-    url: '/center-fire/VisuForestCloudBigDataController/selectBigDataZhxx',
+    url: '/center-water/VisuForestCloudBigDataController/selectBigDataZhxx',
     data: param,
     method: 'post'
   })
@@ -164,7 +196,7 @@ export function getRlt(param) {
     param = {day: myDate.getFullYear()}
   }
   return request({
-    url: '/center-fire/VisuForestCloudBigDataController/getHeatMap',
+    url: '/center-water/VisuForestCloudBigDataController/getHeatMap',
     method: 'post',
     data : param
   })

src/api/datacenter.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取左侧菜单列表
 export function getResource() {
   return request({
-    url: '/center-fire/VisuForestDataCenterController/getResource',
+    url: '/center-water/VisuForestDataCenterController/getResource',
     method: 'post',
   })
 }
@@ -11,7 +11,7 @@ export function getResource() {
 //点击左侧菜单列表查询落点
 export function getResourcePoint(resourceTable) {
   return request({
-    url: '/center-fire/VisuForestDataCenterController/getResourcePoint',
+    url: '/center-water/VisuForestDataCenterController/getResourcePoint',
     method: 'post',
     data:{"resourceTable":resourceTable}
   })
@@ -19,7 +19,7 @@ export function getResourcePoint(resourceTable) {
 //点击右侧菜单列表查询落点
 export function getResourcePointByDeptId(resourceTable,deptId) {
   return request({
-    url: '/center-fire/VisuForestDataCenterController/getResourcePoint',
+    url: '/center-water/VisuForestDataCenterController/getResourcePoint',
     method: 'post',
     data:{"resourceTable":resourceTable,"deptId":deptId}
   })

src/api/disaster.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取初始化数据
 export function getInit(year) {
   return request({
-    url: '/center-fire/VisuForestFireLossController/init',
+    url: '/center-water/VisuForestFireLossController/init',
     method: 'post',
     data:{"year":year}
   })
@@ -11,7 +11,7 @@ export function getInit(year) {
 // 点击列表获取数据
 export function selectFireLoseByid(param) {
   return request({
-    url: '/center-fire/VisuForestFireLossController/selectFireLoseByid',
+    url: '/center-water/VisuForestFireLossController/selectFireLoseByid',
     method: 'post',
     data:param
   })

src/api/event.js

@@ -3,14 +3,14 @@ import request from '@/utils/request'
 //获取附近事件
 export function getNearEvent(longitude,latitude) {
   return request({
-    url: '/center-fire/VisuForestEventCenterController/getNearEvent?longitude='+longitude+"&latitude="+latitude,
+    url: '/center-water/VisuForestEventCenterController/getNearEvent?longitude='+longitude+"&latitude="+latitude,
     method: 'get',
   })
 }
 //获取附近摄像头
 export function getNearCamera(longitude,latitude) {
   return request({
-    url: '/center-fire/VisuForestEventCenterController/getNearCamera?longitude='+longitude+"&latitude="+latitude+"&type=1",
+    url: '/center-water/VisuForestEventCenterController/getNearCamera?longitude='+longitude+"&latitude="+latitude+"&type=1",
     method: 'get',
   })
 }

src/api/forest.js

@@ -3,14 +3,14 @@ import request from '@/utils/request'
 // 左侧获取部门信息
 export function getBaseInfo() {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getBaseInfo',
+    url: '/center-water/WaterController/getBaseInfo',
     method: 'post',
   })
 }
 // 左侧获取事件信息统计
 export function getTodayEvents(param,loading) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getTodayEvents',
+    url: '/center-water/WaterController/getTodayEvents',
     method: 'post',
     data: param,
     headers: {
@@ -21,7 +21,7 @@ export function getTodayEvents(param,loading) {
 // 左侧获取事件部门数量
 export function getDeptEventCount(param,loading) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getDeptEventCount',
+    url: '/center-water/WaterController/getDeptEventCount',
     method: 'post',
     data: param,
     headers: {
@@ -32,7 +32,7 @@ export function getDeptEventCount(param,loading) {
 // 右侧获取天气
 export function getWeather(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getWeather',
+    url: '/center-water/WaterController/getWeather',
     method: 'post',
     data: param
   })
@@ -42,7 +42,7 @@ export function getWeather(param) {
 // 右侧获取事件列表
 export function getEventList(param,loading) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getEventList',
+    url: '/center-water/WaterController/getEventList',
     method: 'post',
     data: param,
     headers: {
@@ -53,7 +53,7 @@ export function getEventList(param,loading) {
 // 右侧获取曝光台列表
 export function getExposureStage(param,loading) {
   return request({
-    url: 'center-fire/VisuForestCloudMapController/getExposureStage',
+    url: 'center-water/WaterController/getExposureStage',
     method: 'post',
     data: param,
     headers: {
@@ -65,7 +65,7 @@ export function getExposureStage(param,loading) {
 // 获取事件详情
 export function getEventDetail(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getEventDetail',
+    url: '/center-water/WaterController/getEventDetail',
     method: 'post',
     data: param
   })
@@ -73,7 +73,7 @@ export function getEventDetail(param) {
 // 获取日历颜色状态
 export function getEventByCalendar(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getEventByCalendar',
+    url: '/center-water/WaterController/getEventByCalendar',
     method: 'post',
     data: param
   })
@@ -81,7 +81,7 @@ export function getEventByCalendar(param) {
 // 获取事件分类
 export function getEventByEventType(param,loading) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getEventByEventType',
+    url: '/center-water/WaterController/getEventByEventType',
     method: 'post',
     data: param,
     headers: {
@@ -92,7 +92,7 @@ export function getEventByEventType(param,loading) {
 // 获取上报排名
 export function getEventByReportorOrder(param,loading) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getEventByReportorOrder',
+    url: '/center-water/WaterController/getEventByReportorOrder',
     method: 'post',
     data: param,
     headers: {
@@ -119,7 +119,7 @@ export function sendEventLog(param) {
 // 事件处理流程
 export function updateCentereventTEventcatalogueStatus(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/updateCentereventTEventcatalogueStatus',
+    url: '/center-water/WaterController/updateCentereventTEventcatalogueStatus',
     method: 'post',
     data: param
   })
@@ -127,7 +127,7 @@ export function updateCentereventTEventcatalogueStatus(param) {
 // 事件处理流程-事件类型
 export function listSJfl(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/listSJfl',
+    url: '/center-water/WaterController/listSJfl',
     method: 'post',
     data: param
   })
@@ -135,21 +135,21 @@ export function listSJfl(param) {
 // 事件处理流程-关联预案
 export function listYuAn() {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/listYuAn',
+    url: '/center-water/WaterController/listYuAn',
     method: 'post'
   })
 }
 // 事件处理流程-签收部门
 export function selectByeventCode(eventCode) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/selectByeventCode/'+eventCode,
+    url: '/center-water/WaterController/selectByeventCode/'+eventCode,
     method: 'post'
   })
 }
 // 事件处理流程-联动
 export function sendTask(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/sendTask',
+    url: '/center-water/WaterController/sendTask',
     method: 'post',
     data:param
   })
@@ -157,14 +157,14 @@ export function sendTask(param) {
 // 任务接口
 export function selectTaskBO() {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/selectTaskBO',
+    url: '/center-water/WaterController/selectTaskBO',
     method: 'post',
   })
 }
 // 搜索物资
 export function listResourceByWz(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/listResourceByWz',
+    url: '/center-water/WaterController/listResourceByWz',
     method: 'post',
     data:param
   })
@@ -172,7 +172,7 @@ export function listResourceByWz(param) {
 // 任务领取部门列表
 export function selectTaskDtpts(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/selectTaskDtpts',
+    url: '/center-water/WaterController/selectTaskDtpts',
     method: 'post',
     data:param
   })
@@ -180,7 +180,7 @@ export function selectTaskDtpts(param) {
 // 任务领取
 export function receiveTask(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/receiveTask',
+    url: '/center-water/WaterController/receiveTask',
     method: 'post',
     data:param
   })
@@ -188,7 +188,7 @@ export function receiveTask(param) {
 // 任务拒绝
 export function refusedTask(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/refusedTask',
+    url: '/center-water/WaterController/refusedTask',
     method: 'post',
     data:param
   })
@@ -196,7 +196,7 @@ export function refusedTask(param) {
 // 事件调整关联预案
 export function updateYjYuAn(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/updateYjYuAn',
+    url: '/center-water/WaterController/updateYjYuAn',
     method: 'post',
     data:param
   })
@@ -204,7 +204,7 @@ export function updateYjYuAn(param) {
 // 事件详情截图直接上传日志
 export function uploadBase64(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/uploadBase64',
+    url: '/center-water/WaterController/uploadBase64',
     method: 'post',
     data:param
   })
@@ -213,7 +213,7 @@ export function uploadBase64(param) {
 // 通过事件code查询事件责任部门
 export function centereventtdepteventList(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/centereventtdepteventList',
+    url: '/center-water/WaterController/centereventtdepteventList',
     method: 'post',
     data:param
   })
@@ -221,7 +221,7 @@ export function centereventtdepteventList(param) {
 // 通过责任部门查询责任人
 export function dutysystemList(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/dutysystemList',
+    url: '/center-water/WaterController/dutysystemList',
     method: 'post',
     data:param
   })
@@ -230,7 +230,7 @@ export function dutysystemList(param) {
 // 事件责任制添加联系人
 export function dutysystemAdd(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/dutysystemAdd',
+    url: '/center-water/WaterController/dutysystemAdd',
     method: 'post',
     data:param
   })
@@ -238,7 +238,7 @@ export function dutysystemAdd(param) {
 // 事件责任制删除联系人
 export function dutysystemRemove(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/dutysystemRemove',
+    url: '/center-water/WaterController/dutysystemRemove',
     method: 'get',
     params:param
   })
@@ -246,7 +246,7 @@ export function dutysystemRemove(param) {
 // 事件短信联系人
 export function userFeginlist(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/userFeginlist',
+    url: '/center-water/WaterController/userFeginlist',
     method: 'post'
   })
 }

src/api/haikang/haikang.js

@@ -11,7 +11,7 @@ export function getHaiKangVideoServer(param) {
 // 查询电视墙
 export function tvCameraList() {
   return request({
-    url: '/center-fire/VisuForestMonitorCenterController/tvCameraList',
+    url: '/center-water/VisuForestMonitorCenterController/tvCameraList',
     method: 'get',
   })
 }

src/api/leader.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取左侧
 export function getRy() {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getRy',
+    url: '/center-water/WaterController/getRy',
     method: 'post',
   })
 }
@@ -11,21 +11,21 @@ export function getRy() {
 // 获取左侧人员列表
 export function getForestLeader(linJob,linType) {
   return request({
-    url: '/center-fire/VisuForestLeaderController/getForestLeader?linJob='+linJob+"&linType="+linType,
+    url: '/center-water/VisuForestLeaderController/getForestLeader?linJob='+linJob+"&linType="+linType,
     method: 'get',
   })
 }
 // 点击左侧人员列表获取轨迹
 export function getLeaderTrack(trackById) {
   return request({
-    url: '/center-fire/VisuForestLeaderController/getLeaderTrack?trackById='+trackById,
+    url: '/center-water/VisuForestLeaderController/getLeaderTrack?trackById='+trackById,
     method: 'get',
   })
 }
 // 巡林计划
 export function getPlanList(trackById) {
   return request({
-    url: '/center-fire/VisuForestLeaderController/getPlanList',
+    url: '/center-water/VisuForestLeaderController/getPlanList',
     method: 'get',
   })
 }

src/api/monitor.js

@@ -3,14 +3,14 @@ import request from '@/utils/request'
 // 获取左侧动态感知设备
 export function selectDeviceType() {
   return request({
-    url: '/center-fire/VisuForestMonitorCenterController/selectDeviceType',
+    url: '/center-water/VisuForestMonitorCenterController/selectDeviceType',
     method: 'post',
   })
 }
 // 根据设备类型查看列表
 export function selectCameraByDeptId(deptId) {
   return request({
-    url: '/center-fire/VisuForestMonitorCenterController/selectCameraByDeptId',
+    url: '/center-water/VisuForestMonitorCenterController/selectCameraByDeptId',
     method: 'post',
     data:{"deptId":deptId}
   })
@@ -18,14 +18,14 @@ export function selectCameraByDeptId(deptId) {
 // 获取重点区域列表
 export function selectKeyAreaList() {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/importarealistFegin',
+    url: '/center-water/WaterController/importarealistFegin',
     method: 'get',
   })
 }
 // 获取重点区域
 export function getRegionalFlag(id) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getRegionalFlag/'+id,
+    url: '/center-water/WaterController/getRegionalFlag/'+id,
     method: 'get',
   })
 }

src/api/vBottomMenu.js

@@ -4,7 +4,7 @@ import request from '@/utils/request'
 // 获取林场列表
 export function selectFarmByDeptId(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/selectFarmByDeptId',
+    url: '/center-water/WaterController/selectFarmByDeptId',
     method: 'post',
     data: param
   })

src/assets/iconfont/iconfont.css

@@ -24,7 +24,7 @@
 .sj-icon-szxf:before {
   content: "\e641";
 }
-/* 数字林业 */
+/* 数字水利 */
 .sj-icon-szly:before {
   content: "\e660";
 }
@@ -126,35 +126,81 @@
 .sj-icon-landing:before {
   content: "\e930";
 }
+
 /* 气象站 */
 .sj-icon-weatherstation:before {
   content: "\e602";
 }
+/* 沙场资源 */
+.sj-icon-battlefield:before {
+  content: "\e602";
+}
+
 /* 林场 */
 .sj-icon-farm:before {
   content: "\e61d";
 }
+/* 河道蓝线资源 */
+.sj-icon-blueline:before {
+  content: "\e61d";
+}
+
 /* 森林防火队 */
 .sj-icon-fireteam:before {
   content: "\e622";
 }
+/* 垃圾站资源 */
+.sj-icon-station:before {
+  content: "\e622";
+}
+
 /* 水鹤 */
 .sj-icon-watercrane:before {
   content: "\e63d";
 }
+/* 排污口资源 */
+.sj-icon-sewage:before {
+  content: "\e63d";
+}
+
 /* 水源 */
 .sj-icon-channel:before {
   content: "\e61f";
 }
+/* 河段资源 */
+.sj-icon-reach:before {
+  content: "\e61f";
+}
+
 /* 隐患 */
 .sj-icon-yinhuanzhilix:before {
   content: "\e629";
 }
+/* 水库资源 */
+.sj-icon-reservoir:before {
+  content: "\e629";
+}
+
 /* 病虫害 */
 .sj-icon-bch:before {
   content: "\e73f";
 }
-
+/* 河流资源 */
+.sj-icon-river:before {
+  content: "\e633";
+}
+/* 涉水桥涵资源 */
+.sj-icon-culvert:before {
+  content: "\e672";
+}
+/* 闸门资源 */
+.sj-icon-gate:before {
+  content: "\e61b";
+}
+/* 水利工程资源 */
+.sj-icon-project:before {
+  content: "\e930";
+}
 
 /* 状态 */
 /* 未处理 */

src/assets/styles/base.scss

@@ -37,7 +37,7 @@ $shadowListHoverI: 0 0 3px rgba($color: #41ff84, $alpha: .5), -0 -0 10px rgba($c
 $shadowTip: 0 0 1rem 0 rgba($color: #387ee7, $alpha: .8) inset;
 $shadowCount: 0 0 .5rem 0 rgba($color: #00c8ff, $alpha: 1) inset;
 
-//可视化 数字林业
+//可视化 数字水利
 $fBlue: #03c6e2;
 $fBlueHover: #07ffc1;
 $fBlueG: #0bf3f7;
@@ -1963,7 +1963,7 @@ div::-webkit-scrollbar {
   padding: 0 .5rem;
   box-shadow: $shadowList;
   flex-wrap: wrap;
-  //数字林业
+  //数字水利
   .event-count {
     width: 100%;
     display: flex;
@@ -3138,7 +3138,7 @@ div::-webkit-scrollbar {
 
 
 
-// 20220927 林业修改
+// 20220927 水利修改
 .no_hover:hover{
 	background: none!important;
 	box-shadow: initial;

src/router/index.js

@@ -34,12 +34,12 @@ export const constantRoutes = [{
 		redirect: 'forest',
 	},
 	{
-		//林业中心
+		//水利中心
 		path: '/forest',
 		name: 'forest',
 		component: () => import('@/views/forest'),
 		meta: {
-			title: '林业云图'
+			title: '水利云图'
 		}
 	},
 	{
@@ -116,12 +116,12 @@ export const constantRoutesNew = [{
 		redirect: 'forest',
 	},
 	{
-		//林业中心
+		//水利中心
 		path: '/forest',
 		name: 'forest',
 		component: () => import('@/views/forest'),
 		meta: {
-			title: '林业云图'
+			title: '水利云图'
 		}
 	},
 	{

src/views/bigdata/bigdata.vue

@@ -5,7 +5,7 @@
     <div class="header">
       <!-- title -->
       <div class="header-left"><img class="logo" src="@/assets/images/integrated/logo-small.png"/>
-        <h3 class="title">通榆县乡村振兴监管平台-数字林业-统计分析</h3>
+        <h3 class="title">通榆县乡村振兴监管平台-数字水利-统计分析</h3>
       </div>
       <div class="bignav">
         <img src="@/assets/images/integrated/bigdata-header-nav-left.png"/>
@@ -29,7 +29,7 @@
         </div>
         <div class="b-con mg-b-20">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-            <span>林场分布统计</span>
+            <span>沙场资源分布统计</span>
           </div>
           <chartForestFarm></chartForestFarm>
         </div>
@@ -54,7 +54,7 @@
       <div class="bigdata-list wid-li-3 m-l-15 flex-r">
         <div class="b-con mg-b-20 b-49">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-            <span>起火原因统计</span>
+            <span>河道蓝线统计</span>
           </div>
           <chartFireCause></chartFireCause>
         </div>
@@ -66,13 +66,13 @@
         </div>
         <div class="b-con mg-b-20 b-49">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-            <span>重点区域</span>
+            <span>排污口资源统计</span>
           </div>
           <chartKeyArea></chartKeyArea>
         </div>
         <div class="b-con mg-b-20 b-49">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-            <span>珍惜古树</span>
+            <span>垃圾站资源统计</span>
           </div>
           <chartAncientTree></chartAncientTree>
         </div>
@@ -109,25 +109,52 @@
         </div>
         <div class="b-con mg-b-20 b-49">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-            <span>防火队</span>
+            <span>水库资源</span>
           </div>
           <chartFireBrigade></chartFireBrigade>
         </div>
         <div class="b-con mg-b-20 b-49">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-            <span>气象站</span>
+            <span>涉水桥涵资源</span>
           </div>
           <chartWeatherStation></chartWeatherStation>
         </div>
       </div>
       <!-- 第六纵向-->
-      <div class="bigdata-list wid-li-1 m-l-15">
-        <div class="b-con mg-b-20 taller">
+      <div class="bigdata-list wid-li-1 m-l-15 flex-r">
+        <div class="b-con mg-b-20 tall">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
             <span>设备分布</span>
           </div>
           <chartEquipmentDistribution></chartEquipmentDistribution>
         </div>
+        <div class="b-con">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>河流资源统计</span>
+          </div>
+          <chartPitG4></chartPitG4>
+        </div>
+      </div>
+      <!-- 第七纵向-->
+      <div class="bigdata-list wid-li-1 m-l-15">
+        <div class="b-con mg-b-20">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>闸口资源统计</span>
+          </div>
+          <chartPitG1></chartPitG1>
+        </div>
+        <div class="b-con mg-b-20">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>水利工程资源统计</span>
+          </div>
+          <chartPitG2></chartPitG2>
+        </div>
+        <div class="b-con">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>河段资源统计</span>
+          </div>
+          <chartPitG3></chartPitG3>
+        </div>
       </div>
     </div>
 
@@ -153,6 +180,10 @@ import chartFireBrigade from './chart-fireBrigade.vue' //12 防火队、、
 import chartGridStaff from './chart-gridStaff.vue' //13 网格人员、、
 import chartWeatherStation from './chart-weatherStation.vue' //14 气象站、、
 import chartEquipmentDistribution from './chart-equipmentDistribution' //16 设备分布、、
+import chartPitG1 from './chart-pit' //17 闸口资源统计、、
+import chartPitG2 from './chart-firecontrol' //18 水利工程资源统计、、
+import chartPitG3 from './chart-hydrant' //19 河段资源统计、、
+import chartPitG4 from './chart-waterintake' //20 河流资源统计、、
 
 import {getRlt} from '@/api/bigdata'
 
@@ -173,7 +204,11 @@ export default {
     chartFireBrigade,
     chartGridStaff,
     chartWeatherStation,
-    chartEquipmentDistribution
+    chartEquipmentDistribution,
+    chartPitG1,
+    chartPitG2,
+    chartPitG3,
+    chartPitG4,
   },
   data() {
 
@@ -181,9 +216,9 @@ export default {
       visited: '',
       navbar: [
         {
-          //林业中心
+          //水利中心
           path: '/forest',
-          name: '林业云图'
+          name: '水利云图'
         },
         {
           //数据中心

src/views/bigdata/chart-fireCause.vue

@@ -30,6 +30,7 @@
         getQhyytj(null).then(resp => {
           that.data = resp.data.num
           that.indicator = resp.data.firesource
+          console.log("河道蓝线统计", resp.data.firesource)
           that.myEcharts()
         })
       },

src/views/bigdata/chart-firecontrol.vue

@@ -0,0 +1,142 @@
+<!-- **************************************NO.18 消防*************************************** -->
+<template>
+	<div class="chart-container">
+		<div id="chartPitG2" style="width: 100%; height:25vh; ">
+		</div>
+	</div>
+</template>
+
+<script>
+	import * as echarts from 'echarts';
+  import {getG2} from '@/api/bigdata'
+	export default {
+		name: 'chartPitG2',
+		data() {
+			return {
+        source: [],
+				count: 0
+			}
+		},
+		mounted() {
+			// this.myEcharts1();
+      this.getG2()
+		},
+
+		methods: {
+      getG2() {
+        let that = this
+        getG2().then(res => {
+          this.source = res.data
+          console.log("水利工程资源统计", res.data)
+          that.myEcharts1()
+        })
+      },
+			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=f46x0t0c7883X-D6
+			myEcharts1() {
+				var chartDom = document.getElementById('chartPitG2');
+				var myChart = echarts.init(chartDom);
+				var option;
+				 option = {
+				    tooltip: {
+				        trigger: 'axis',
+				        axisPointer: {
+				            type: 'shadow'
+				        }
+				    },
+				    grid:{
+				        top:'15%',
+				        left:'10%',
+				        right:'10%',
+				        buttom:'15%',
+				    },
+				     xAxis: {
+				        type: 'category',
+				        axisLine: {
+				            lineStyle: {
+				                color: 'rgba(255,255,255,0.12)',
+				            },
+				        },
+				        axisLabel: {
+				            margin: 10,
+				            color: '#e2e9ff',
+				            textStyle: {
+				                fontSize: 10
+				            },
+				        },
+				        axisTick:{
+				            show:false,
+				        },
+				         // data: ['双辽市', '梨树县', '伊通县', '铁东区', '铁西区']
+				         data: this.source.name
+				    },
+				    yAxis: {
+				        nameTextStyle:{
+				            color:'#fff',
+				        },
+				        type: 'value',
+				         axisLine: {
+				             show:false,
+				            lineStyle: {
+				                color: 'rgba(255,255,255,0.12)'
+				            },
+				        },
+				        axisLabel: {
+							 show:false,
+				            formatter: '{value}',
+				            color: '#e2e9ff',
+				        },
+				         splitLine: {
+				            lineStyle: {
+				                color: 'rgba(255,255,255,0.12)'
+				            }
+				        },
+				        axisTick:{
+				            show:true,
+
+				            lineStyle:{
+				                color:'#fff',
+				            },
+				        },
+				    },
+				    series: [{
+				        itemStyle:{
+				            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+				                    offset: 0,
+				                    color: 'rgba(0,244,255,1)'
+				                }, {
+				                    offset: 1,
+				                    color: 'rgba(0,77,167,1)'
+				                }], false),
+				                barBorderRadius: 10,
+				                opacity:0.8
+				        },
+				        barWidth:10,
+				        label:{
+				            show:true,
+				            position:['0','-20'],
+				            color:'#fff',
+				        },
+				        // data: [120, 200, 150, 80, 70],
+				        data: this.source.value,
+				        type: 'bar',
+				    }]
+				};
+				option && myChart.setOption(option);
+			},
+
+		},
+
+
+	}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+	.chart-container {
+		width: 100%;
+		height: auto;
+		position: relative;
+		padding-bottom: 10px;
+		display: flex;
+		flex-direction: column;
+	}
+</style>

src/views/bigdata/chart-forestFarm.vue

@@ -29,6 +29,7 @@
         var that = this
         getLcfbtj().then(response => {
           that.chartData = response.data
+          console.log("沙场资源分布统计", response.data)
           that.myEcharts()
         })
       },

src/views/bigdata/chart-hydrant.vue

@@ -0,0 +1,222 @@
+<!-- **************************************NO.13 消火栓*************************************** -->
+<template>
+	<div class="chart-container">
+		<div id="chartPitG3" style="width: 100%; height:23vh;">
+		</div>
+	</div>
+</template>
+
+<script>
+	import * as echarts from 'echarts';
+  import {getG3} from '@/api/bigdata'
+	export default {
+		name: 'chartPitG3',
+		data() {
+			return {
+        source: [],
+				count: 0
+			}
+		},
+		mounted() {
+			// this.myEcharts()
+			this.getG3()
+
+		},
+
+		methods: {
+      getG3() {
+        let that = this
+        getG3().then(res => {
+          this.source = res.data
+          console.log("河段资源统计", res.data)
+          that.myEcharts()
+        })
+      },
+			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=Ve9zCnhVwZvXTdD0
+			myEcharts() {
+
+
+				var chartDom = document.getElementById('chartPitG3');
+				var myChart = echarts.init(chartDom);
+				var color = ['#0E7CE2', '#FF8352', '#E271DE', '#F8456B', '#00FFFF', '#4AEAB0'];
+				var option;
+        var trafficWay = this.source;
+				var data = [];
+				var color = ['#F6C558', '#25EFBD', '#21bad6', '#3283F5', '#E44660'];
+				for (var i = 0; i < trafficWay.length; i++) {
+				    data.push(
+				        {
+				            value: trafficWay[i].value,
+				            name: trafficWay[i].name,
+				            itemStyle: {
+				                normal: {
+				                    borderWidth: 8,
+				                    shadowBlur: 0,
+				                    borderColor: color[i],
+				                    shadowColor: color[i],
+				                },
+				            },
+				        },
+				        {
+				            value: 3,
+				            name: '',
+				            labelLine:{
+				              show:false
+				            },
+				            itemStyle: {
+				                normal: {
+				                    label: {
+				                        show: false,
+				                    },
+				                    labelLine: {
+				                        show: false,
+				                    },
+				                    color: 'rgba(0, 0, 0, 0)',
+				                    borderColor: 'rgba(0, 0, 0, 0)',
+				                    borderWidth: 0,
+				                },
+				            },
+				        }
+				    );
+				}
+				var seriesOption = [
+				    {
+				        name: '',
+				        type: 'pie',
+				        clockWise:true,
+				        radius: [70, 70],
+				        hoverAnimation: true,
+				        itemStyle: {
+				            normal: {
+				                label: {
+				                    show: true
+				                },
+				            },
+				        },
+				        data: data,
+				        labelLine: {
+				            normal: {
+				                length: 20,
+				                length2: 20,
+				                lineStyle: {
+				                    type: 'solid',
+				                    color: '#31FFFF',
+				                },
+				            },
+				        },
+				        label: {
+				            normal: {
+				                formatter: function (params) {
+				                    var result = '';
+				                    if (params.name) {
+				                        result +=  params.name+'{blue|' + params.value  + '}';
+				                    }
+				                    return result;
+				                },
+				                borderWidth: 0,
+				                borderRadius: 4,
+				                padding: [60, 0],
+				                height: 10,
+				                fontSize: 10,
+				                align: 'center',
+				                color: '#DEDEDE',
+				                rich: {
+				                    blue: {
+				                        fontSize: 10,
+				                        lineHeight: 5,
+				                        color: '#31FFFF',
+				                        padding: [0, 5],
+				                    },
+				                },
+				            },
+				        },
+				    },
+				    {
+				        type: 'pie',
+				        radius: [60, 60],
+				        hoverAnimation: false,
+				        clockWise: false,
+				        itemStyle: {
+				            normal: {
+				                borderColor: 'rgba(2,178,247,0.2)',
+				                borderWidth: 10,
+				            },
+				        },
+				        label: {
+				            show: false,
+				        },
+				        data: [200],
+				    },
+				    {
+				        type: 'pie',
+				        radius: [0, '20%'],
+				        zlevel: 3,
+				        silent: true,
+				        label: {
+				            normal: {
+				                show: false,
+				            },
+				        },
+				        labelLine: {
+				            normal: {
+				                show: false,
+				            },
+				        },
+				        data: [
+				            {
+				                value: 6,
+				                name: '总数',
+				                itemStyle: {
+				                    normal: {
+				                        color: {
+				                            x: 0,
+				                            y: 0,
+				                            x2: 1,
+				                            y2: 0,
+				                            type: 'linear',
+				                            global: false,
+				                            colorStops: [
+				                                {
+				                                    offset: 0,
+				                                    color: 'rgba(2,178,247,0.2)',
+				                                },
+				                                {
+				                                    offset: 1,
+				                                    color: 'rgba(2,178,247,0.2)',
+				                                },
+				                            ],
+				                        },
+				                    },
+				                },
+				            },
+				        ],
+				    },
+				];
+				option = {
+				    color: color,
+				    tooltip: {
+				        show: false,
+				    },
+				    toolbox: {
+				        show: false,
+				    },
+				    series: seriesOption,
+				};
+				option && myChart.setOption(option);
+			},
+
+		},
+
+
+	}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+	.chart-container {
+		width: 100%;
+		height: auto;
+		position: relative;
+		padding-bottom: 10px;
+		display: flex;
+	}
+</style>

src/views/bigdata/chart-keyArea.vue

@@ -29,6 +29,7 @@
         let that = this
         getZdqy().then(resp => {
           that.data = resp.data
+          // console.log("排污口统计", resp.data)
           that.myEcharts()
         })
       },

src/views/bigdata/chart-pit.vue

@@ -0,0 +1,92 @@
+<!-- **************************************NO.6 矿坑*************************************** -->
+<template>
+	<div class="chart-container">
+		<div id="pitG1" style="width: 100%; height:23vh;">
+		</div>
+	</div>
+</template>
+
+<script>
+	import * as echarts from 'echarts';
+  import {getG1} from '@/api/bigdata'
+	export default {
+		name: 'pitG1',
+		data() {
+			return {
+        source: [],
+				count: 0
+			}
+		},
+		mounted() {
+			// this.myEcharts()
+			this.getG1()
+
+		},
+
+		methods: {
+      getG1() {
+        let that = this
+        getG1().then(res => {
+          this.source = res.data
+          console.log("闸口资源统计", res.data)
+          that.myEcharts()
+        })
+      },
+			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=udduEFcFiEYEEj4Q
+
+			myEcharts() {
+
+
+				var chartDom = document.getElementById('pitG1');
+				var myChart = echarts.init(chartDom);
+				var color = ['#02CDFF', '#62FBE7', '#7930FF','#ef5f9d','#ecb935'];
+				var option;
+				option = {
+
+				    color:color,
+				    tooltip : {
+				        trigger: 'item',
+				        formatter: "{b}: {c}"
+				    },
+				    toolbox: {
+				        show : true,
+
+				    },
+
+				    series : [
+				        {
+				            name:'业务警种',
+				            type:'pie',
+				            roseType: true,
+				            radius : ['50%', '70%'],
+				            label: {
+				              show: true,
+				              formatter: "{b} {c}",
+							  textStyle: {
+							      fontSize: 10 ,
+
+							  }
+
+				            },
+				            data:this.source
+				        }
+				    ]
+				};
+				option && myChart.setOption(option);
+			},
+
+		},
+
+
+	}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+	.chart-container {
+		width: 100%;
+		height: auto;
+		position: relative;
+		padding-bottom: 10px;
+		display: flex;
+	}
+</style>

src/views/bigdata/chart-waterintake.vue

@@ -0,0 +1,100 @@
+<!-- **************************************NO.15 取水口*************************************** -->
+<template>
+	<div class="chart-container">
+		<div id="chartPitG4" style="width: 100%; height:23vh;">
+		</div>
+	</div>
+</template>
+
+<script>
+	import * as echarts from 'echarts';
+  import {getG4} from '@/api/bigdata'
+	export default {
+		name: 'chartPitG4',
+		data() {
+			return {
+        source: [],
+				count: 0
+			}
+		},
+		mounted() {
+			// this.myEcharts()
+			this.getG4()
+
+		},
+
+		methods: {
+      getG4() {
+        let that = this
+        getG4().then(res => {
+          this.source = res.data
+          console.log("河流资源统计", res.data)
+          that.myEcharts()
+        })
+      },
+			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=AQ8Ea8ewtkr0NVzH
+			myEcharts() {
+
+
+				var chartDom = document.getElementById('chartPitG4');
+				var myChart = echarts.init(chartDom);
+				var option;
+				  option = {
+				     color: ['#1890FF', '#12DDA1', '#F78048', '#FFB026', '#FD4D63', 'rgba(255,255,255,.5)'],
+				     tooltip: {
+				         trigger: 'item',
+				         padding: [10, 10, 10, 10],
+				         formatter: '{b} :<br/> {d}%',
+				     },
+				     series: [
+				         {
+				             name: '',
+				             type: 'pie',
+				             radius: ['36%', '66%'],
+				             center: ['50%', '50%'],
+				             label: {
+				                 fontSize: 10,
+				                 color: '#00a0e5',
+				                 formatter: '{b} {c}',
+				                 // 自定义富文本样式
+
+				             },
+				             labelLine: {
+				                 show: true,
+				                 // length: 6,
+				                 // length2: 15
+				             },
+				             data: this.source,
+				         },
+				         {
+				             type: 'pie',
+				             radius: ['36%', '43%'],
+				             center: ['50%', '50%'],
+				             silent: true,
+				             data: [
+				                 {
+				                     name: '',
+				                     value: 1,
+				                 },
+				             ],
+				         },
+				     ],
+				 };
+				option && myChart.setOption(option);
+			},
+
+		},
+
+
+	}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+	.chart-container {
+		width: 100%;
+		height: auto;
+		position: relative;
+		padding-bottom: 10px;
+		display: flex;
+	}
+</style>

src/views/datacenter.vue

@@ -332,7 +332,7 @@ export default {
               keepBindPopup: false,
               isAggregation: false
             }
-            if (resourceTable == 'centerdata_t_forest_weatherstation') { //气象站
+            if (resourceTable == 'centerdata_t_hydraulic_battlefield') { //沙场资源
               markersMap.icon = 'sj-icon-map-centerdata-t-forest-weatherstation'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
@@ -348,7 +348,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>地址：' + res.data.resourceList[i].weatherstationAddress +
+                '                  <h4>地址：' + res.data.resourceList[i].address +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -356,7 +356,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人：' + res.data.resourceList[i].weatherstationPerson +
+                '                  <h4>联系人：' + res.data.resourceList[i].legalPerson +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -364,12 +364,12 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>电话：' + res.data.resourceList[i].weatherstationTel +
+                '                  <h4>电话：' + res.data.resourceList[i].contactsPhone +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_farm') { //林场
+            } else if (resourceTable == 'centerdata_t_hydraulic_channel_blueline') { //蓝线河道
               markersMap.icon = 'sj-icon-map-centerdata-t-forest-farm'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
@@ -385,25 +385,25 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>林场名称：' + res.data.resourceList[i].farmName + '</h4>' +
+                '                  <h4>河道蓝线资源名称：' + res.data.resourceList[i].name + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人：' + res.data.resourceList[i].farmPerson + '</h4>' +
+                '                  <h4>河长姓名：' + res.data.resourceList[i].riverLeader + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>电话：' + res.data.resourceList[i].farmTel + '</h4>' +
+                '                  <h4>联系电话：' + res.data.resourceList[i].contactsPhone + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_landing') { //起降点
+            } else if (resourceTable == 'centerdata_t_hydraulic_garbage_station') { //垃圾站
               markersMap.icon = 'sj-icon-map-centerdata-t-forest-landing'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
@@ -419,7 +419,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>起降点名称：' + res.data.resourceList[i].landingName +
+                '                  <h4>垃圾站名称：' + res.data.resourceList[i].name +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -427,7 +427,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人：' + res.data.resourceList[i].landingPerson +
+                '                  <h4>负责人：' + res.data.resourceList[i].principal +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -435,11 +435,11 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>电话：' + res.data.resourceList[i].landingTel + '</h4>' +
+                '                  <h4>联系电话：' + res.data.resourceList[i].contactsPhone + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_channel') { //水源渠道
+            } else if (resourceTable == 'centerdata_t_hydraulic_outlet_sewage') { //排污口
               markersMap.icon = 'sj-icon-map-centerdata-t-forest-channel'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
@@ -455,7 +455,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>渠道名称：' + res.data.resourceList[i].channelName +
+                '                  <h4>排污口名称：' + res.data.resourceList[i].联系电话 +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -463,7 +463,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人：' + res.data.resourceList[i].channelPerson +
+                '                  <h4>排污量：' + res.data.resourceList[i].sewageAmount +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -471,11 +471,11 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>电话：' + res.data.resourceList[i].channelTel + '</h4>' +
+                '                  <h4>排污阀值：' + res.data.resourceList[i].sewageThreshold + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_checkpoint') { //防火检查站
+            } else if (resourceTable == 'centerdata_t_hydraulic_reach') { //河段
               markersMap.icon = 'sj-icon-map-centerdata-t-forest-checkpoint'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
@@ -491,7 +491,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>检查站名称：' + res.data.resourceList[i].checkpointName +
+                '                  <h4>所属河流：' + res.data.resourceList[i].river +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -499,7 +499,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>地址：' + res.data.resourceList[i].checkpointAddress +
+                '                  <h4>起点：' + res.data.resourceList[i].startpoint +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -507,7 +507,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人：' + res.data.resourceList[i].checkpointPerson +
+                '                  <h4>终点：' + res.data.resourceList[i].destination +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -515,12 +515,12 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>电话：' + res.data.resourceList[i].checkpointTel +
+                '                  <h4>河长姓名：' + res.data.resourceList[i].riverLeader +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_waterintake') { //取水口
+            } else if (resourceTable == 'centerdata_t_hydraulic_reservoir') { //水库
               markersMap.icon = 'sj-icon-map-centerdata-t-forest-waterintake'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
@@ -536,7 +536,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>取水口名称：' + res.data.resourceList[i].waterintakeName +
+                '                  <h4>水库资源名称：' + res.data.resourceList[i].name +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -544,7 +544,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人：' + res.data.resourceList[i].waterintakePerson +
+                '                  <h4>联系人：' + res.data.resourceList[i].principal +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -552,12 +552,12 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>电话：' + res.data.resourceList[i].waterintakeTel +
+                '                  <h4>电话：' + res.data.resourceList[i].contactsPhone +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_watercrane') { //水鹤
+            } else if (resourceTable == 'centerdata_t_hydraulic_river') { //河流
               markersMap.icon = 'sj-icon-map-centerdata-t-forest-watercrane'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
@@ -573,7 +573,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>水鹤名称：' + res.data.resourceList[i].watercraneName +
+                '                  <h4>河流名称：' + res.data.resourceList[i].name +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -594,7 +594,7 @@ export default {
                 '                </div>' +
                 '                </div>' +
                 '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_firehydrant') { //消火栓
+            } else if (resourceTable == 'centerdata_t_hydraulic_wade_bridge_culvert') { //涉水桥涵
               markersMap.icon = 'sj-icon-map-centerdata-t-forest-firehydrant'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
@@ -610,7 +610,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>消火栓名称：' + res.data.resourceList[i].firehydrantName +
+                '                  <h4>涉水桥涵名称：' + res.data.resourceList[i].name +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -639,7 +639,7 @@ export default {
                 '                </div>' +
                 '                </div>' +
                 '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_fireteam') { //森林防火队
+            } else if (resourceTable == 'centerdata_t_hydraulic_water_gate') { //闸门
               markersMap.icon = 'sj-icon-map-centerdata-t-forest-fireteam'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
@@ -655,7 +655,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>森林防火队名称：' + res.data.resourceList[i].fireteamName +
+                '                  <h4>闸口资源名称：' + res.data.resourceList[i].name +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -663,7 +663,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人：' + res.data.resourceList[i].fireteamPerson +
+                '                  <h4>地址：' + res.data.resourceList[i].address +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -671,7 +671,43 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>电话：' + res.data.resourceList[i].fireteamTel + '</h4>' +
+                '                  <h4>闸口高度：' + res.data.resourceList[i].heightMouth + '</h4>' +
+                '                </div>' +
+                '                </div>' +
+                '                </span></div>'
+            } else if (resourceTable == 'centerdata_t_hydraulic_water_project') { //水利工程
+              markersMap.icon = 'sj-icon-map-centerdata-t-forest-fireteam'
+              markersMap.lng = res.data.resourceList[i].longitude
+              markersMap.lat = res.data.resourceList[i].latitude
+              markersMap.bindPopupHtml = '<div class="map-tip">' +
+                '<span>' +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                '                  <h4>经纬度：' + res.data.resourceList[i].longitude + ',' + res
+                  .data.resourceList[i].latitude + '</h4>' +
+                '                </div>' +
+                '                </div>' +
+                '                </span>' +
+                '<span>' +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                '                  <h4>水利工程资源名称：' + res.data.resourceList[i].name +
+                '</h4>' +
+                '                </div>' +
+                '                </div>' +
+                '                </span>' +
+                '<span>' +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                '                  <h4>负责人：' + res.data.resourceList[i].principal +
+                '</h4>' +
+                '                </div>' +
+                '                </div>' +
+                '                </span>' +
+                '<span>' +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                '                  <h4>联系方式：' + res.data.resourceList[i].contactsPhone + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span></div>'

src/views/forest.vue

@@ -1,4 +1,4 @@
-<!--可视化公共模板 林业-->
+<!--可视化公共模板 水利-->
 <template>
   <div class="visual-con">
     <!--头部-->

vue.config.js

@@ -52,8 +52,8 @@ 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://117.78.49.164:3031`,
+        target: `http://127.0.0.1:3031`,
+        // target: `http://192.168.2.118:3031`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''