农业可视化前端页面

public/supermap/libs/leaflet/1.7.1/leaflet.css

@@ -250,7 +250,7 @@ svg.leaflet-image-layer.leaflet-interactive path {
 /* visual tweaks */
 
 .leaflet-container {
-    background: #fff;
+    background: #ddd;
     outline: 0;
 }
 .leaflet-container a {
@@ -503,8 +503,8 @@ svg.leaflet-image-layer.leaflet-interactive path {
 }
 .leaflet-popup-content-wrapper,
 .leaflet-popup-tip {
-    background: rgba(20, 111, 190, 0.9);
-    color: #fff;
+    background: white;
+    color: #333;
     box-shadow: 0 3px 14px rgba(0,0,0,0.4);
 }
 .leaflet-container a.leaflet-popup-close-button {
@@ -517,7 +517,7 @@ svg.leaflet-image-layer.leaflet-interactive path {
     width: 18px;
     height: 14px;
     font: 16px/14px Tahoma, Verdana, sans-serif;
-    color: #fff;
+    color: #c3c3c3;
     text-decoration: none;
     font-weight: bold;
     background: transparent;
@@ -569,7 +569,7 @@ svg.leaflet-image-layer.leaflet-interactive path {
     background-color: #fff;
     border: 1px solid #fff;
     border-radius: 3px;
-    color: #fff;
+    color: #222;
     white-space: nowrap;
     -webkit-user-select: none;
     -moz-user-select: none;

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-agriculture/VisuAfforestationController/getAfforestation?year='+year,
     method: 'get',
   })
 }
 // 点击左侧人员列表获取轨迹
 export function getAfforestationArea(afforestationId) {
   return request({
-    url: '/center-fire/VisuAfforestationController/getAfforestationArea?afforestationId='+afforestationId,
+    url: '/center-agriculture/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-agriculture/VisuForestAnimalController/init',
     method: 'get',
   })
 }
 // 点击左侧动物列表
 export function selectForestAnimalListByType(type) {
   return request({
-    url: '/center-fire/VisuForestAnimalController/selectForestAnimalListByType/'+type,
+    url: '/center-agriculture/VisuForestAnimalController/selectForestAnimalListByType/'+type,
     method: 'get',
   })
 }

src/api/datacenter.js

@@ -3,15 +3,16 @@ import request from '@/utils/request'
 // 获取左侧菜单列表
 export function getResource() {
   return request({
-    url: '/center-fire/VisuForestDataCenterController/getResource',
-    method: 'post',
+    // url: '/center-agriculture/VisuForestDataCenterController/getResource',
+    url: '/center-agriculture/data/SumLandInfo',
+    method: 'get',
   })
 }
 
 //点击左侧菜单列表查询落点
 export function getResourcePoint(resourceTable) {
   return request({
-    url: '/center-fire/VisuForestDataCenterController/getResourcePoint',
+    url: '/center-agriculture/VisuForestDataCenterController/getResourcePoint',
     method: 'post',
     data:{"resourceTable":resourceTable}
   })
@@ -19,8 +20,18 @@ export function getResourcePoint(resourceTable) {
 //点击右侧菜单列表查询落点
 export function getResourcePointByDeptId(resourceTable,deptId) {
   return request({
-    url: '/center-fire/VisuForestDataCenterController/getResourcePoint',
+    url: '/center-agriculture/VisuForestDataCenterController/getResourcePoint',
     method: 'post',
     data:{"resourceTable":resourceTable,"deptId":deptId}
   })
 }
+
+
+//点击左侧获取获取右侧部门列表(新)
+export function getFindAllType(type) {
+  return request({
+    url: '/center-agriculture/data/FindAllType?type='+type,
+    method: 'get',
+    // data:{"type":type}
+  })
+}

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-agriculture/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-agriculture/VisuForestFireLossController/selectFireLoseByid',
     method: 'post',
     data:param
   })

src/api/event.js

@@ -3,35 +3,35 @@ import request from '@/utils/request'
 // 获取左侧菜单列表
 export function getTodayEvent() {
   return request({
-    url: '/center-fire/VisuForestEventCenterController/getTodayEvent',
+    url: '/center-agriculture/VisuForestEventCenterController/getTodayEvent',
     method: 'post',
   })
 }
 // 点击今日事件前三个按钮列表
 export function getEventStatusList(eventStatus) {
   return request({
-    url: '/center-fire/VisuForestEventCenterController/getEventList?eventStatus='+eventStatus,
+    url: '/center-agriculture/VisuForestEventCenterController/getEventList?eventStatus='+eventStatus,
     method: 'post',
   })
 }
 // 点击今日事件后三个按钮列表
 export function getEventSourceList(eventSource) {
   return request({
-    url: '/center-fire/VisuForestEventCenterController/getEventList?eventSource='+eventSource,
+    url: '/center-agriculture/VisuForestEventCenterController/getEventList?eventSource='+eventSource,
     method: 'post',
   })
 }
 // 点击部门
 export function getEventListByDeptIdList(deptId) {
   return request({
-    url: '/center-fire/VisuForestEventCenterController/getEventList?deptId='+deptId,
+    url: '/center-agriculture/VisuForestEventCenterController/getEventList?deptId='+deptId,
     method: 'post',
   })
 }
 // 点击类型
 export function getEventListByTypeList(eventType) {
   return request({
-    url: '/center-fire/VisuForestEventCenterController/getEventList?eventType='+eventType,
+    url: '/center-agriculture/VisuForestEventCenterController/getEventList?eventType='+eventType,
     method: 'post',
   })
 }
@@ -64,14 +64,14 @@ export function getImgUrl(data) {
 //获取附近事件
 export function getNearEvent(longitude,latitude) {
   return request({
-    url: '/center-fire/VisuForestEventCenterController/getNearEvent?longitude='+latitude+"&latitude="+latitude,
+    url: '/center-agriculture/VisuForestEventCenterController/getNearEvent?longitude='+latitude+"&latitude="+latitude,
     method: 'get',
   })
 }
 //获取附近摄像头
 export function getNearCamera(longitude,latitude) {
   return request({
-    url: '/center-fire/VisuForestEventCenterController/getNearCamera?longitude='+latitude+"&latitude="+latitude,
+    url: '/center-agriculture/VisuForestEventCenterController/getNearCamera?longitude='+latitude+"&latitude="+latitude,
     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-agriculture/fire/getBaseInfo',
     method: 'post',
   })
 }
 // 左侧获取事件信息统计
 export function getTodayEvents(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getTodayEvents',
+    url: '/center-agriculture/fire/getTodayEvents',
     method: 'post',
     data: param
   })
@@ -18,7 +18,7 @@ export function getTodayEvents(param) {
 // 左侧获取事件部门数量
 export function getDeptEventCount(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getDeptEventCount',
+    url: '/center-agriculture/fire/getDeptEventCount',
     method: 'post',
     data: param
   })
@@ -26,7 +26,7 @@ export function getDeptEventCount(param) {
 // 右侧获取天气
 export function getWeather(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getWeather',
+    url: '/center-agriculture/fire/getWeather',
     method: 'post',
     data: param
   })
@@ -36,7 +36,7 @@ export function getWeather(param) {
 // 右侧获取事件列表
 export function getEventList(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getEventList',
+    url: '/center-agriculture/fire/getEventList',
     method: 'post',
     data: param
   })
@@ -44,7 +44,7 @@ export function getEventList(param) {
 // 右侧获取曝光台列表
 export function getExposureStage(param) {
   return request({
-    url: 'center-fire/VisuForestCloudMapController/getExposureStage',
+    url: 'center-agriculture/fire/getExposureStage',
     method: 'post',
     data: param
   })
@@ -53,7 +53,7 @@ export function getExposureStage(param) {
 // 获取事件详情
 export function getEventDetail(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getEventDetail',
+    url: '/center-agriculture/fire/getEventDetail',
     method: 'post',
     data: param
   })
@@ -61,7 +61,7 @@ export function getEventDetail(param) {
 // 获取日历颜色状态
 export function getEventByCalendar(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getEventByCalendar',
+    url: '/center-agriculture/fire/getEventByCalendar',
     method: 'post',
     data: param
   })
@@ -69,7 +69,7 @@ export function getEventByCalendar(param) {
 // 获取事件分类
 export function getEventByEventType(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getEventByEventType',
+    url: '/center-agriculture/fire/getEventByEventType',
     method: 'post',
     data: param
   })
@@ -77,7 +77,7 @@ export function getEventByEventType(param) {
 // 获取上报排名
 export function getEventByReportorOrder(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/getEventByReportorOrder',
+    url: '/center-agriculture/fire/getEventByReportorOrder',
     method: 'post',
     data: param
   })
@@ -101,7 +101,7 @@ export function sendEventLog(param) {
 // 事件处理流程
 export function updateCentereventTEventcatalogueStatus(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/updateCentereventTEventcatalogueStatus',
+    url: '/center-agriculture/fire/updateCentereventTEventcatalogueStatus',
     method: 'post',
     data: param
   })
@@ -109,7 +109,7 @@ export function updateCentereventTEventcatalogueStatus(param) {
 // 事件处理流程-事件类型
 export function listSJfl(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/listSJfl',
+    url: '/center-agriculture/fire/listSJfl',
     method: 'post',
     data: param
   })
@@ -117,21 +117,21 @@ export function listSJfl(param) {
 // 事件处理流程-关联预案
 export function listYuAn() {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/listYuAn',
+    url: '/center-agriculture/fire/listYuAn',
     method: 'post'
   })
 }
 // 事件处理流程-签收部门
 export function selectByeventCode(eventCode) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/selectByeventCode/'+eventCode,
+    url: '/center-agriculture/fire/selectByeventCode/'+eventCode,
     method: 'post'
   })
 }
 // 事件处理流程-联动
 export function sendTask(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/sendTask',
+    url: '/center-agriculture/fire/sendTask',
     method: 'post',
     data:param
   })
@@ -139,14 +139,14 @@ export function sendTask(param) {
 // 任务接口
 export function selectTaskBO() {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/selectTaskBO',
+    url: '/center-agriculture/fire/selectTaskBO',
     method: 'post',
   })
 }
 // 搜索物资
 export function listResourceByWz(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/listResourceByWz',
+    url: '/center-agriculture/fire/listResourceByWz',
     method: 'post',
     data:param
   })
@@ -154,7 +154,7 @@ export function listResourceByWz(param) {
 // 任务领取部门列表
 export function selectTaskDtpts(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/selectTaskDtpts',
+    url: '/center-agriculture/fire/selectTaskDtpts',
     method: 'post',
     data:param
   })
@@ -162,7 +162,7 @@ export function selectTaskDtpts(param) {
 // 任务领取
 export function receiveTask(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/receiveTask',
+    url: '/center-agriculture/fire/receiveTask',
     method: 'post',
     data:param
   })
@@ -170,7 +170,7 @@ export function receiveTask(param) {
 // 任务拒绝
 export function refusedTask(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/refusedTask',
+    url: '/center-agriculture/fire/refusedTask',
     method: 'post',
     data:param
   })
@@ -178,7 +178,7 @@ export function refusedTask(param) {
 // 事件调整关联预案
 export function updateYjYuAn(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/updateYjYuAn',
+    url: '/center-agriculture/fire/updateYjYuAn',
     method: 'post',
     data:param
   })
@@ -186,7 +186,7 @@ export function updateYjYuAn(param) {
 // 事件详情截图直接上传日志
 export function uploadBase64(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/uploadBase64',
+    url: '/center-agriculture/fire/uploadBase64',
     method: 'post',
     data:param
   })

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-agriculture/fire/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-agriculture/VisuForestLeaderController/getForestLeader?linJob='+linJob+"&linType="+linType,
     method: 'get',
   })
 }
 // 点击左侧人员列表获取轨迹
 export function getLeaderTrack(trackById) {
   return request({
-    url: '/center-fire/VisuForestLeaderController/getLeaderTrack?trackById='+trackById,
+    url: '/center-agriculture/VisuForestLeaderController/getLeaderTrack?trackById='+trackById,
     method: 'get',
   })
 }
 // 巡林计划
 export function getPlanList(trackById) {
   return request({
-    url: '/center-fire/VisuForestLeaderController/getPlanList',
+    url: '/center-agriculture/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-agriculture/monitor/selectDeviceType',
     method: 'post',
   })
 }
 // 根据设备类型查看列表
 export function selectCameraByDeptId(deptId) {
   return request({
-    url: '/center-fire/VisuForestMonitorCenterController/selectCameraByDeptId',
+    url: '/center-agriculture/monitor/selectCameraByDeptId',
     method: 'post',
     data:{"deptId":deptId}
   })

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-agriculture/VisuForestCloudMapController/selectFarmByDeptId',
     method: 'post',
     data: param
   })

src/assets/styles/base.scss

@@ -1333,7 +1333,7 @@ div::-webkit-scrollbar {
 
         h4 {
           display: flex;
-          color: #04080c;
+          color: #04080c !important;
         }
       }
     }
@@ -3138,4 +3138,4 @@ div::-webkit-scrollbar {
 
 .d-l-l-text h4{
 	color:#fff!important;
-}
+}

src/components/supermap.vue

@@ -653,7 +653,6 @@ export default {
             }).openPopup(markerClick.getLatLng())
           } else {
             markerClick.on('mouseover', function() {
-              let html = markersList[i].bindPopupHtml
               this.bindPopup(html).openPopup(this.getLatLng())
             }).on('mouseout', function() {
               this.closePopup()
@@ -712,7 +711,6 @@ export default {
             }).openPopup(markerClick.getLatLng())
           } else {
             markerClick.on('mouseover', function() {
-              let html = markersList[i].bindPopupHtml
               this.bindPopup(html).openPopup(this.getLatLng())
             }).on('mouseout', function() {
               this.closePopup()
@@ -855,13 +853,12 @@ export default {
       }
     },
     dropLocation: function(lat, lng) { //落点定位
+      // this.map.flyTo([lat, lng], 14, { duration: 2 })
 
-      this.map.flyTo([lat, lng], 14, { duration: 2 })
-
-      // this.controlLevel(12)
-      // setTimeout(() => {
-      //   this.map.panTo([lat, lng])
-      // }, 1000)
+      this.controlLevel(12)
+      setTimeout(() => {
+        this.map.panTo([lat, lng])
+      }, 1000)
     },
     controlLevel: function(level) { //控制地图缩放级别
       this.map.setZoom(level)

src/components/vBottomMenu.vue

@@ -124,82 +124,82 @@
     <div class="btm-right">
       <el-popover placement="top" trigger="click">
         <div class="btm-r-pop-info">
-          <div class="btm-r-pop-info-box" v-for="(item,index) in taskList">
-            <div class="btm-r-pop-info-tit">
-              <h3>{{ item.taskSourceValue }}</h3>
-            </div>
-            <div class="btm-r-pop-info-con">
-              <div class="btm-r-pop-info-list">
-                <div class="btm-r-pop-info-list-name">标题</div>
-                <div class="btm-r-pop-info-list-text">{{ item.taskTitle }}</div>
-              </div>
-              <div class="btm-r-pop-info-list">
-                <div class="btm-r-pop-info-list-name">发起人</div>
-                <div class="btm-r-pop-info-list-text">{{ item.sendPersonName }}</div>
-              </div>
-              <div class="btm-r-pop-info-list">
-                <div class="btm-r-pop-info-list-name">发起时间</div>
-                <div class="btm-r-pop-info-list-text">{{ item.taskSendTime }}</div>
-              </div>
-              <div class="btm-r-pop-info-list">
-                <div class="btm-r-pop-info-list-name">关联事件</div>
-                <div class="btm-r-pop-info-list-text">{{ item.eventName }}</div>
-              </div>
-              <div class="btm-r-pop-info-list">
-                <div class="btm-r-pop-info-list-name">催办状态</div>
-                <div class="btm-r-pop-info-list-text" style="color: red" v-if="item.isUrged==1">任务催办中，请及时处理！！</div>
-                <div class="btm-r-pop-info-list-text" v-else>正常</div>
-              </div>
-            </div>
-            <div class="btm-r-pop-info-btm">
-              <el-link type="success" @click="showEventDialog( item.eventCode )">查看详情</el-link>
-              <div class="btm-r-pop-info-btm-btn">
-                <el-button type="danger" @click="selectTaskDtpts(item.taskId,item.eventCode,'jj')">拒绝</el-button>
-                <el-button type="primary" @click="selectTaskDtpts(item.taskId,item.eventCode,'lq')">领取</el-button>
-              </div>
-            </div>
-          </div>
+          <!--<div class="btm-r-pop-info-box" v-for="(item,index) in taskList">-->
+            <!--<div class="btm-r-pop-info-tit">-->
+              <!--<h3>{{ item.taskSourceValue }}</h3>-->
+            <!--</div>-->
+            <!--<div class="btm-r-pop-info-con">-->
+              <!--<div class="btm-r-pop-info-list">-->
+                <!--<div class="btm-r-pop-info-list-name">标题</div>-->
+                <!--<div class="btm-r-pop-info-list-text">{{ item.taskTitle }}</div>-->
+              <!--</div>-->
+              <!--<div class="btm-r-pop-info-list">-->
+                <!--<div class="btm-r-pop-info-list-name">发起人</div>-->
+                <!--<div class="btm-r-pop-info-list-text">{{ item.sendPersonName }}</div>-->
+              <!--</div>-->
+              <!--<div class="btm-r-pop-info-list">-->
+                <!--<div class="btm-r-pop-info-list-name">发起时间</div>-->
+                <!--<div class="btm-r-pop-info-list-text">{{ item.taskSendTime }}</div>-->
+              <!--</div>-->
+              <!--<div class="btm-r-pop-info-list">-->
+                <!--<div class="btm-r-pop-info-list-name">关联事件</div>-->
+                <!--<div class="btm-r-pop-info-list-text">{{ item.eventName }}</div>-->
+              <!--</div>-->
+              <!--<div class="btm-r-pop-info-list">-->
+                <!--<div class="btm-r-pop-info-list-name">催办状态</div>-->
+                <!--<div class="btm-r-pop-info-list-text" style="color: red" v-if="item.isUrged==1">任务催办中，请及时处理！！</div>-->
+                <!--<div class="btm-r-pop-info-list-text" v-else>正常</div>-->
+              <!--</div>-->
+            <!--</div>-->
+            <!--<div class="btm-r-pop-info-btm">-->
+              <!--<el-link type="success" @click="showEventDialog( item.eventCode )">查看详情</el-link>-->
+              <!--<div class="btm-r-pop-info-btm-btn">-->
+                <!--<el-button type="danger" @click="selectTaskDtpts(item.taskId,item.eventCode,'jj')">拒绝</el-button>-->
+                <!--<el-button type="primary" @click="selectTaskDtpts(item.taskId,item.eventCode,'lq')">领取</el-button>-->
+              <!--</div>-->
+            <!--</div>-->
+          <!--</div>-->
         </div>
-        <el-badge :value="taskCount" slot="reference">
-          <el-button size="small" icon="el-icon-bank-card" @click="refreshTaskList">任务</el-button>
-        </el-badge>
+        <!--<el-badge :value="taskCount" slot="reference">-->
+          <!--<el-button size="small" icon="el-icon-bank-card" @click="refreshTaskList">任务</el-button>-->
+        <!--</el-badge>-->
       </el-popover>
       <el-popover placement="top" trigger="click">
         <div class="btm-r-pop-info">
-          <div class="btm-r-pop-info-box" v-for="(item,index) in 0">
-            <div class="btm-r-pop-info-tit">
-              <h3>火险任务</h3>
-            </div>
-            <div class="btm-r-pop-info-con">
-              <div class="btm-r-pop-info-list">
-                <div class="btm-r-pop-info-list-name">标题</div>
-                <div class="btm-r-pop-info-list-text">四平阿斯利康大姐夫啊路上的风景可丽金啊水电分离家</div>
-              </div>
-              <div class="btm-r-pop-info-list">
-                <div class="btm-r-pop-info-list-name">发起人</div>
-                <div class="btm-r-pop-info-list-text">张三</div>
-              </div>
-              <div class="btm-r-pop-info-list">
-                <div class="btm-r-pop-info-list-name">发起时间</div>
-                <div class="btm-r-pop-info-list-text">2022-09-05 12:12:15</div>
-              </div>
-              <div class="btm-r-pop-info-list">
-                <div class="btm-r-pop-info-list-name">关联事件</div>
-                <div class="btm-r-pop-info-list-text">啊萨杜拉副科级啊萨杜拉副科级</div>
-              </div>
-            </div>
-            <div class="btm-r-pop-info-btm">
-              <el-link type="success">查看详情</el-link>
-              <div class="btm-r-pop-info-btm-btn">
-                <el-button type="danger">拒绝</el-button>
-                <el-button type="primary">领取</el-button>
-              </div>
-            </div>
-          </div>
+          <!--<div class="btm-r-pop-info-box" v-for="(item,index) in 0">-->
+            <!--<div class="btm-r-pop-info-tit">-->
+              <!--<h3>火险任务</h3>-->
+            <!--</div>-->
+            <!--<div class="btm-r-pop-info-con">-->
+              <!--<div class="btm-r-pop-info-list">-->
+                <!--<div class="btm-r-pop-info-list-name">标题</div>-->
+                <!--<div class="btm-r-pop-info-list-text">四平阿斯利康大姐夫啊路上的风景可丽金啊水电分离家</div>-->
+              <!--</div>-->
+              <!--<div class="btm-r-pop-info-list">-->
+                <!--<div class="btm-r-pop-info-list-name">发起人</div>-->
+                <!--<div class="btm-r-pop-info-list-text">张三</div>-->
+              <!--</div>-->
+              <!--<div class="btm-r-pop-info-list">-->
+                <!--<div class="btm-r-pop-info-list-name">发起时间</div>-->
+                <!--<div class="btm-r-pop-info-list-text">2022-09-05 12:12:15</div>-->
+              <!--</div>-->
+              <!--<div class="btm-r-pop-info-list">-->
+                <!--<div class="btm-r-pop-info-list-name">关联事件</div>-->
+                <!--<div class="btm-r-pop-info-list-text">啊萨杜拉副科级啊萨杜拉副科级</div>-->
+              <!--</div>-->
+            <!--</div>-->
+            <!--<div class="btm-r-pop-info-btm">-->
+              <!--<el-link type="success">查看详情</el-link>-->
+              <!--<div class="btm-r-pop-info-btm-btn">-->
+                <!--<el-button type="danger">拒绝</el-button>-->
+                <!--<el-button type="primary">领取</el-button>-->
+              <!--</div>-->
+            <!--</div>-->
+          <!--</div>-->
         </div>
-        <el-badge :value="0" slot="reference">
-          <el-button size="small" icon="el-icon-chat-line-round">消息</el-button>
-        </el-badge>
+        <!--<el-badge :value="0" slot="reference">-->
+          <!--<el-button size="small" icon="el-icon-chat-line-round">消息</el-button>-->
+        <!--</el-badge>-->
       </el-popover>
 
       <el-badge type="primary">
@@ -457,13 +457,13 @@ export default {
           click: 'editableLayers'
         },
         {
-          name: '林班',
+          name: '养殖场',
           icon: 'iconfont sj-icon-lbzy',
           click: 'forestban'
         },
 
         {
-          name: '林场',
+          name: '农场',
           icon: 'iconfont sj-icon-lczy',
           click: 'forestchang'
         },
@@ -842,8 +842,8 @@ export default {
   height: 2.5rem;
   display: flex;
   align-items: center;
-	
-	
+
+
 	z-index:9999;
 
   .light {

src/router/index.js

@@ -39,7 +39,7 @@ export const constantRoutes = [{
 		name: 'forest',
 		component: () => import('@/views/forest'),
 		meta: {
-			title: '林业云图'
+			title: '农业云图'
 		}
 	},
 	{
@@ -113,7 +113,7 @@ export const constantRoutesNew = [{
 		name: 'forest',
 		component: () => import('@/views/forest'),
 		meta: {
-			title: '林业云图'
+			title: '农业云图'
 		}
 	},
 	{

src/views/datacenter.vue

@@ -14,11 +14,11 @@
               <div class="d-l-con-icon">
                 <div class="icon-con" :class="{on:iconCurrentIndex==item.resourceTable}"
                      v-for="(item,index) in resourcesList"
-                     v-on:click="indentleftSetMarkers(item.resourceTable)">
+                     v-on:click="indentleftSetMarkers(item.key)">
                   <div class="iconfont icon icon-normal" :class="item.icon"></div>
                   <div class="icon-text">
                     <h6>{{ item.count }}</h6>
-                    <h5>{{ item.resourceName }}</h5>
+                    <h5>{{ item.name }}</h5>
                   </div>
                 </div>
               </div>
@@ -43,13 +43,12 @@
             <div class="i-list-con h-73">
               <div class="overflow-y" style="height: 39vh">
                 <div class="d-l-con" :class="{on:listCurrentIndex==item.deptId}"
-                     v-for="(item,index) in deptGroupList"
-                     v-on:click="indentleftByDeptIdSetMarkers(item.deptId)">
+                     v-for="(item,index) in deptGroupList">
                   <div class="d-l-l-text">
                     <i class="i-small"></i>
                     <h4>{{ item.deptName }}</h4>
                   </div>
-                  <div class="d-l-l-count">{{ item.count }}</div>
+                  <div class="d-l-l-count">{{ item.eventCount }}</div>
                 </div>
               </div>
               <div class="overflow-y" style="height: 34vh;">
@@ -76,7 +75,8 @@
 import {
   getResource,
   getResourcePoint,
-  getResourcePointByDeptId
+  getResourcePointByDeptId,
+  getFindAllType
 } from '@/api/datacenter'
 
 import supermap from '@/components/supermap' //超图
@@ -103,7 +103,8 @@ export default {
     /** ----------------------------------底部按钮公用组件结束------------------------------------- */
   },
   mounted() {
-    this.getResource()
+    this.getResource();
+    // this.dataChat();
   },
   data() {
     return {
@@ -119,6 +120,7 @@ export default {
       resourceTable: '',
       //左侧资源
       resourcesList: [],
+      // resourcesMap: {},
       //右侧资源
       deptGroupList: [],
       source: [],
@@ -296,166 +298,68 @@ export default {
       let that = this
       //获取左侧菜单列表
       getResource().then(res => {
-        that.resourcesList = res.data
-        //截取data.resourceTable字段中“_”分隔符最后一个作为关键字,重新拼接成前端需要的图标:class,格式sj-icon-xxxx,将其set回原数组
-        res.data.forEach(function(data, index) {
-          that.$set(that.resourcesList[index], 'icon', 'sj' + '-' + 'icon' + '-' + data
-            .resourceTable.split('_').slice(-1))
-        })
-        console.log(that.resourcesList)
-
+        const resourcesMap = res.data;
+        for(let key in resourcesMap){
+          const map = {};
+          if(key == 'buzhu'){map.name="补助次数";}
+          if(key == 'gengdi'){map.name="耕地面积";}
+          if(key == 'hezuoshe'){map.name="合作社数量";}//
+          if(key == 'huafei'){map.name="化肥库存";}
+          if(key == 'nongji'){map.name="农机站数量";}//
+          if(key == 'nongju'){map.name="农具站数量";}//
+          if(key == 'xubao'){map.name="畜保站数量";}//
+          if(key == 'yangzhi'){map.name="养殖及粪污处理点";}//
+          if(key == 'zhibao'){map.name="植保数量";}
+          if(key == 'zhongzhi'){map.name="种植产量";}
+          if(key == 'zhongzi'){map.name="种子库存";}
+          map.icon='sj-icon-'+key;
+          map.count=resourcesMap[key];
+          map.key=key;
+          that.resourcesList.push(map);
+        }
       })
     },
-    indentleftSetMarkers(resourceTable) {
-      this.iconCurrentIndex = resourceTable
+    indentleftSetMarkers(type) {
       let that = this
-      that.resourceTable = resourceTable
-      that.markersList = []
-      that.source = []
-      //点击左侧地图落点
-      getResourcePoint(resourceTable).then(res => {
-        that.deptGroupList = res.data.deptGroupList
-        if (res.data.deptGroupList != null && res.data.deptGroupList.length > 0) {
-          for (let i = 0; i < res.data.deptGroupList.length; i++) {
-            let aa = [res.data.deptGroupList[i].deptName, res.data.deptGroupList[i].count]
-            that.source.push(aa)
+      getFindAllType(type).then(res => {
+        that.deptGroupList = res.data.dept;
+        that.source = [];
+        //点击左侧地图落点
+        if (res.data != null && res.data.dept.length > 0) {
+          for (let i = 0; i < res.data.dept.length; i++) {
+            let aa = [res.data.dept[i].deptName, res.data.dept[i].eventCount];
+            that.source.push(aa);
           }
         }
-        if (res.data.resourceList != null && res.data.resourceList.length > 0) {
-          for (let i = 0; i < res.data.resourceList.length; i++) {
+        this.dataChat();
+        if (res.data != null && res.data.list.length > 0) {
+          for (let i = 0; i < res.data.list.length; i++) {
             let markersMap = {
               lng: 124.59,
               lat: 43.02,
+
               icon: 'marker',
               bindPopupHtml: '',
               click: '',
               keepBindPopup: false,
               isAggregation: false
             }
-            if (resourceTable == 'centerdata_t_forest_weatherstation') { //气象站
-              markersMap.icon = 'sj-icon-map-qxz'
-              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].weatherstationAddress +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人：' + res.data.resourceList[i].weatherstationPerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话：' + res.data.resourceList[i].weatherstationTel +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_farm') { //林场
-              markersMap.icon = 'sj-icon-map-lc'
-              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].farmName + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人：' + res.data.resourceList[i].farmPerson + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话：' + res.data.resourceList[i].farmTel + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_landing') { //起降点
-              markersMap.icon = 'sj-icon-map-qjd'
-              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].landingName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人：' + res.data.resourceList[i].landingPerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话：' + res.data.resourceList[i].landingTel + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_channel') { //水源渠道
-              markersMap.icon = 'sj-icon-map-syqd'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
+            if(type=='hezuoshe'||type=='nongji'||type=='nongju'||type=='xubao'||type=='yangzhi'){
+              markersMap.icon = 'sj-icon-map-qxz';
+              markersMap.lng = res.data.list[i].longitude;
+              markersMap.lat = res.data.list[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>' +
+                '                  <h4>经纬度：' + res.data.list[i].longitude + ',' + res.data.list[i].latitude + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>渠道名称：' + res.data.resourceList[i].channelName +
+                '                  <h4>地址：' + res.data.list[i].address +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -463,228 +367,19 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人：' + res.data.resourceList[i].channelPerson +
+                '                  <h4>名称：' + res.data.list[i].name +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话：' + res.data.resourceList[i].channelTel + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_checkpoint') { //防火检查站
-              markersMap.icon = 'sj-icon-map-fhjcz'
-              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].checkpointName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>地址：' + res.data.resourceList[i].checkpointAddress +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人：' + res.data.resourceList[i].checkpointPerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话：' + res.data.resourceList[i].checkpointTel +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_waterintake') { //取水口
-              markersMap.icon = 'sj-icon-map-qsk'
-              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].waterintakeName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人：' + res.data.resourceList[i].waterintakePerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话：' + res.data.resourceList[i].waterintakeTel +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_watercrane') { //水鹤
-              markersMap.icon = 'sj-icon-map-sh'
-              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].watercraneName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人：' + res.data.resourceList[i].watercranePerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话：' + res.data.resourceList[i].watercraneTel +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_firehydrant') { //消火栓
-              markersMap.icon = 'sj-icon-map-xhs'
-              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].firehydrantName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>地址：' + res.data.resourceList[i].firehydrantAddress +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人：' + res.data.resourceList[i].firehydrantPerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话：' + res.data.resourceList[i].firehydrantTel +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_fireteam') { //森林防火队
-              markersMap.icon = 'sj-icon-map-slfh'
-              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].fireteamName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人：' + res.data.resourceList[i].fireteamPerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话：' + res.data.resourceList[i].fireteamTel + '</h4>' +
-                '                </div>' +
-                '                </div>' +
                 '                </span></div>'
             }
-            that.markersList.push(markersMap)
           }
         }
-        this.dataChat()
-        that.$refs.supermap.clearM(false)
-        that.$refs.supermap.setMarkers(that.markersList)
-      })
+        that.$refs.supermap.clearM(false);
+        that.$refs.supermap.setMarkers(that.markersList);
+      });
     },
-    indentleftByDeptIdSetMarkers(deptId) {
+    indentleftByDeptIdSetMarkers(deptId) {//暂时无用
       this.listCurrentIndex = deptId
       let that = this
       //点击左侧地图落点

src/views/eventdetailsdialog.vue

@@ -48,10 +48,10 @@
                           <el-input type="number" v-model="radius" style="width: 80px;" placeholder="请输入搜索半径"/>
                         </div>
                       </div>
-					  
+
                     </dv-border-box-7>
                   </div>
-				  
+
                 </div>
                 <!-- 左侧资源end -->
                 <!-- 底部工具栏 -->
@@ -197,11 +197,11 @@
                                              @click="updateCentereventTEventcatalogueStatus('cf',false)">
                                     重复
                                   </el-button>
-                                  <el-button size="small"
-                                             icon="el-icon-phone" style="text-align:left"
-                                             @click="updateCentereventTEventcatalogueStatus('ld',false)">
-                                    联动
-                                  </el-button>
+                                  <!--<el-button size="small"-->
+                                             <!--icon="el-icon-phone" style="text-align:left"-->
+                                             <!--@click="updateCentereventTEventcatalogueStatus('ld',false)">-->
+                                    <!--联动-->
+                                  <!--</el-button>-->
                                   <el-button size="small"
                                              icon="el-icon-success" style="text-align:left"
                                              @click="updateCentereventTEventcatalogueStatus('bj',true)">

src/views/forest.vue

@@ -257,7 +257,7 @@
                     </div>
                   </div>
                 </div>
-				
+
               </div>
             </dv-border-box-13>
           </div>
@@ -461,7 +461,7 @@ export default {
     /** ----------------------------------weosocket开始------------------------------------- */
     // this.initWebSocket()
     /** ----------------------------------weosocket结束------------------------------------- */
-    this.selectTaskList()//获取任务
+    // this.selectTaskList()//获取任务
   },
   data() {
     return {

vue.config.js

@@ -53,7 +53,7 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
          // target: `https://127.0.0.1:3031`,
-         target: `https://117.78.49.164:3031`,
+         target: `https://192.168.31.106:3031`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''