彭宇 1 rok temu
rodzic
commit
c2d6941cf8
68 zmienionych plików z 3173 dodań i 2796 usunięć
  1. 1 1
      .env.development
  2. 1 1
      .env.production
  3. 1 1
      .env.staging
  4. 1 1
      package.json
  5. 17 0
      src/api/afforestation.js
  6. 16 0
      src/api/animal.js
  7. 54 28
      src/api/bigdata.js
  8. 8 3
      src/api/components/supermap.js
  9. 1 1
      src/api/dahua/dahua.js
  10. 3 3
      src/api/datacenter.js
  11. 18 0
      src/api/disaster.js
  12. 2 2
      src/api/event.js
  13. 29 28
      src/api/forest.js
  14. 1 1
      src/api/haikang/haikang.js
  15. 31 0
      src/api/leader.js
  16. 2 1
      src/api/login.js
  17. 4 5
      src/api/monitor.js
  18. 1 1
      src/api/vBottomMenu.js
  19. BIN
      src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-environment-key-enterprise.png
  20. BIN
      src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-environment-prohibition-area.png
  21. BIN
      src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-environment-source-pollution.png
  22. BIN
      src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-basic-linkage-force.png
  23. BIN
      src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-fire-force.png
  24. BIN
      src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-foam-liquid.png
  25. BIN
      src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-fulltime-station.png
  26. BIN
      src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-other-linkage-force.png
  27. BIN
      src/assets/icons/sj-icon-map/sj-icon-map-lc.png
  28. BIN
      src/assets/images/integrated/bigdata-header-nav-left.png
  29. BIN
      src/assets/images/integrated/bigdata-header-nav-re.png
  30. BIN
      src/assets/images/integrated/bigdata-header-nav-right.png
  31. BIN
      src/assets/images/integrated/btm-light.png
  32. BIN
      src/assets/images/integrated/light.png
  33. BIN
      src/assets/images/visual/header.png
  34. 47 44
      src/assets/styles/base.scss
  35. 4 7
      src/components/supermap.vue
  36. 5 4
      src/components/v-fastmenu.vue
  37. 20 7
      src/components/v-header.vue
  38. 782 676
      src/components/vBottomMenu.vue
  39. 1 1
      src/layout/components/Sidebar/Logo.vue
  40. 1 0
      src/main.js
  41. 14 74
      src/router/index.js
  42. 302 302
      src/views/bigdata/bigdata.vue
  43. 10 10
      src/views/bigdata/chart-deviceReportingEvents.vue
  44. 366 366
      src/views/bigdata/chart-equipmentDistribution.vue
  45. 11 12
      src/views/bigdata/chart-equipmentType.vue
  46. 11 19
      src/views/bigdata/chart-event.vue
  47. 40 40
      src/views/bigdata/chart-eventTrend.vue
  48. 0 171
      src/views/bigdata/chart-fireBrigade.vue
  49. 244 244
      src/views/bigdata/chart-fireCause.vue
  50. 8 7
      src/views/bigdata/chart-noBurningArea.vue
  51. 168 0
      src/views/bigdata/chart-fireHydrant.vue
  52. 148 0
      src/views/bigdata/chart-foamLiquid.vue
  53. 50 40
      src/views/bigdata/chart-gridStaff.vue
  54. 3 2
      src/views/bigdata/chart-keyArea.vue
  55. 0 179
      src/views/bigdata/chart-keyEnterprises.vue
  56. 11 10
      src/views/bigdata/chart-pollutionSource.vue
  57. 179 0
      src/views/bigdata/chart-waterIntake.vue
  58. 0 137
      src/views/bigdata/chart-weatherStation.vue
  59. 2 4
      src/views/bigdata/chart-weatherTrends.vue
  60. 7 17
      src/views/bigdata/tabbar.vue
  61. 157 48
      src/views/datacenter.vue
  62. 1 1
      src/views/eventLogUpload.vue
  63. 337 253
      src/views/eventdetailsdialog.vue
  64. 15 18
      src/views/forest.vue
  65. 6 8
      src/views/monitor.vue
  66. 23 9
      src/views/system/login.vue
  67. 1 1
      src/views/system/register.vue
  68. 8 8
      vue.config.js

+ 1 - 1
.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 通榆县乡村振兴监管平台
+VUE_APP_TITLE = 四平市态势感知平台
 
 # 开发环境配置
 ENV = 'development'

+ 1 - 1
.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 通榆县乡村振兴监管平台
+VUE_APP_TITLE = 四平市态势感知平台
 
 # 生产环境配置
 ENV = 'production'

+ 1 - 1
.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 通榆县乡村振兴监管平台
+VUE_APP_TITLE = 四平市态势感知平台
 
 NODE_ENV = production
 

+ 1 - 1
package.json

@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.4.0",
-  "description": "通榆县乡村振兴监管平台",
+  "description": "四平市态势感知平台",
   "author": "若依",
   "license": "MIT",
   "scripts": {

+ 17 - 0
src/api/afforestation.js

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

+ 16 - 0
src/api/animal.js

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

+ 54 - 28
src/api/bigdata.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 事件来源
+// 事件来源,类型统计
 export function getSjlylxtj(param) {
   //暂时传当年,以后再说
   if (param == null) {
@@ -8,25 +8,24 @@ export function getSjlylxtj(param) {
     param = {day: myDate.getFullYear()}
   }
   return request({
-    url: '/center-environment/VisuForestCloudBigDataController/getEventSourceAndTypeStatistics',
+    url: '/center-firecontrol/VisuForestCloudBigDataController/getEventSourceAndTypeStatistics',
     data: param,
     method: 'post',
   })
 }
 
-
-//污染源分布统计
-export function getWryfbtj() {
+//水鹤分布
+export function getShfbtj() {
   return request({
-    url: '/center-environment/VisuForestCloudBigDataController/selectBigDataSourcepollutionDeptCount',
+    url: '/center-firecontrol/VisuForestCloudBigDataController/selectBigDataWatercraneDeptCount',
     method: 'post',
   })
 }
 
 //设备类型统计
-export function getSblxtj() {
+export function getShlxtj() {
   return request({
-    url: '/center-environment/VisuForestCloudBigDataController/getCameaCount',
+    url: '/center-firecontrol/VisuForestCloudBigDataController/getCameaCount',
     method: 'post',
   })
 }
@@ -39,21 +38,21 @@ export function getZhxx(param) {
     param = {day: myDate.getFullYear()}
   }
   return request({
-    url: '/center-environment/VisuForestCloudBigDataController/selectBigDataZhxx',
+    url: '/center-firecontrol/VisuForestCloudBigDataController/selectBigDataZhxx',
     data: param,
     method: 'post',
   })
 }
 
-//起火原因统计
-export function getQhyytj(param) {
+//起火原因
+export function getQhyy(param) {
   //暂时传当年,以后再说
   if (param == null) {
     let myDate = new Date();
     param = {day: myDate.getFullYear()}
   }
   return request({
-    url: '/center-environment/VisuForestCloudBigDataController/selectEventByYearGroupByFireSource',
+    url: '/center-firecontrol/VisuForestCloudBigDataController/selectEventByYearGroupByFireSource',
     data: param,
     method: 'post',
   })
@@ -62,11 +61,12 @@ export function getQhyytj(param) {
 //重点区域
 export function getZdqy() {
   return request({
-    url: '/center-environment/VisuForestCloudBigDataController/selectBigDataImportareaDeptCount',
+    url: '/center-firecontrol/VisuForestCloudBigDataController/selectBigDataImportareaDeptCount',
     method: 'post',
   })
 }
 
+
 //设备上报事件数量
 export function getSbsbsjsl(param) {
   //暂时传当年,以后再说
@@ -75,16 +75,16 @@ export function getSbsbsjsl(param) {
     param = {day: myDate.getFullYear()}
   }
   return request({
-    url: '/center-environment/VisuForestCloudBigDataController/getAIEventNum',
+    url: '/center-firecontrol/VisuForestCloudBigDataController/getAIEventNum',
     data: param,
     method: 'post',
   })
 }
 
-//重点企业
-export function getZdqiye() {
+//取水口
+export function getQsk() {
   return request({
-    url: '/center-environment/VisuForestCloudBigDataController/selectBigDataKeyenterpriseDeptCount',
+    url: '/center-firecontrol/VisuForestCloudBigDataController/selectBigDataWaterintakeDeptCount',
     method: 'post',
   })
 }
@@ -97,22 +97,21 @@ export function getSjqs(param) {
     param = {day: myDate.getFullYear()}
   }
   return request({
-    url: '/center-environment/VisuForestCloudBigDataController/getEventTrend',
+    url: '/center-firecontrol/VisuForestCloudBigDataController/getEventTrend',
     data: param,
     method: 'post',
   })
 }
 
-//禁烧区分布
-export function getJsqfb() {
+//消防力量分布
+export function getXfllfb() {
   return request({
-    url: '/center-environment/VisuForestCloudBigDataController/selectBigDataProhibitionareaDeptCount',
+    url: '/center-firecontrol/VisuForestCloudBigDataController/selectBigDataFireforceDeptCount',
     method: 'post',
   })
 }
 
-
-//禁烧区分布
+//天气趋势
 export function getTqqs(param) {
   if (param == null) {
     let myDate = new Date();
@@ -123,15 +122,40 @@ export function getTqqs(param) {
     param = {day: myDate.getFullYear() + "-" + month}
   }
   return request({
-    url: '/center-environment/VisuForestCloudBigDataController/selectBigDataByYearMonthFegin',
-    data:param,
+    url: '/center-firecontrol/VisuForestCloudBigDataController/selectBigDataByYearMonthFegin',
+    data : param,
     method: 'post',
   })
 }
-//设备分布
+
+//专职站
+export function getZzz() {
+  return request({
+    url: '/center-firecontrol/VisuForestCloudBigDataController/selectBigDataFirecontrolFulltimeStationDeptCount',
+    method: 'post',
+  })
+}
+
+//消火栓
+export function getXhs() {
+  return request({
+    url: '/center-firecontrol/VisuForestCloudBigDataController/selectBigDataFirehydrantDeptCount',
+    method: 'post',
+  })
+}
+
+//泡沫液
+export function getPmy() {
+  return request({
+    url: '/center-firecontrol/VisuForestCloudBigDataController/selectBigDataFirecontrolFoamLiquidDeptCount',
+    method: 'post',
+  })
+}
+
+//泡沫液
 export function getSbfb() {
   return request({
-    url: '/center-environment/VisuForestCloudBigDataController/getSbfb',
+    url: '/center-firecontrol/VisuForestCloudBigDataController/getSbfb',
     method: 'post',
   })
 }
@@ -144,8 +168,10 @@ export function getRlt(param) {
     param = {day: myDate.getFullYear()}
   }
   return request({
-    url: '/center-environment/VisuForestCloudBigDataController/getHeatMap',
+    url: '/center-firecontrol/VisuForestCloudBigDataController/getHeatMap',
     method: 'post',
     data : param
   })
 }
+
+

+ 8 - 3
src/api/components/supermap.js

@@ -15,6 +15,7 @@ export const iconList = {
   'not-online': require('@/assets/images/cameraType/not-online.png'),
   'sensor': require('@/assets/images/cameraType/sensor.png'),
 
+
   //首页事件上报状态
   'sj-icon-map-xinshangbao': require('@/assets/icons/sj-icon-map/sj-icon-map-xinshangbao.png'),//新上报
   'sj-icon-map-cuiban': require('@/assets/icons/sj-icon-map/sj-icon-map-cuiban.png'),//催办
@@ -22,8 +23,12 @@ export const iconList = {
   'sj-icon-map-guidang': require('@/assets/icons/sj-icon-map/sj-icon-map-guidang.png'),//归档
   'sj-icon-map-banjie': require('@/assets/icons/sj-icon-map/sj-icon-map-banjie.png'),//办结
 
+
+
   //数据中心图标
-  'sj-icon-map-centerdata-t-environment-prohibition-area': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-environment-prohibition-area.png'),//禁烧区
-  'sj-icon-map-centerdata-t-environment-source-pollution': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-environment-source-pollution.png'),//污染源
-  'sj-icon-map-centerdata-t-environment-key-enterprise': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-environment-key-enterprise.png'),//重点企业
+  'sj-icon-map-centerdata-t-firecontrol-basic-linkage-force': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-basic-linkage-force.png'),//基本联动力量
+  'sj-icon-map-centerdata-t-firecontrol-foam-liquid': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-foam-liquid.png'),//泡沫液
+  'sj-icon-map-centerdata-t-firecontrol-other-linkage-force': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-other-linkage-force.png'),//其他消防力量
+  'sj-icon-map-centerdata-t-firecontrol-fire-force': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-fire-force.png'),//消防力量
+  'sj-icon-map-centerdata-t-firecontrol-fulltime-station': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-fulltime-station.png'),//专职站
 }

+ 1 - 1
src/api/dahua/dahua.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询摄像头列表
+// 查询摄像头
 export function getDahuaVideoServer() {
   return request({
     url: '/center-monitor/DahuaController/getDahuaVideoServer',

+ 3 - 3
src/api/datacenter.js

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

+ 18 - 0
src/api/disaster.js

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

+ 2 - 2
src/api/event.js

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

+ 29 - 28
src/api/forest.js

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

+ 1 - 1
src/api/haikang/haikang.js

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

+ 31 - 0
src/api/leader.js

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

+ 2 - 1
src/api/login.js

@@ -10,6 +10,7 @@ export function getSecretKey() {
     method: 'post'
   })
 }
+
 // 登录方法
 export function login(username, password, code, uuid) {
   return request({
@@ -73,7 +74,7 @@ export function getCodeImg() {
 //获取登录页基本信息
 export function fontConfig() {
   return request({
-    url: '/system/fontConfig/getSysFontConfig/Environment',
+    url: '/system/fontConfig/getSysFontConfig/Emergency',
     method: 'get',
   })
 }

+ 4 - 5
src/api/monitor.js

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

+ 1 - 1
src/api/vBottomMenu.js

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

BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-environment-key-enterprise.png


BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-environment-prohibition-area.png


BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-environment-source-pollution.png


BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-basic-linkage-force.png


BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-fire-force.png


BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-foam-liquid.png


BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-fulltime-station.png


BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-other-linkage-force.png


BIN
src/assets/icons/sj-icon-map/sj-icon-map-lc.png


BIN
src/assets/images/integrated/bigdata-header-nav-left.png


BIN
src/assets/images/integrated/bigdata-header-nav-re.png


BIN
src/assets/images/integrated/bigdata-header-nav-right.png


BIN
src/assets/images/integrated/btm-light.png


BIN
src/assets/images/integrated/light.png


BIN
src/assets/images/visual/header.png


+ 47 - 44
src/assets/styles/base.scss

@@ -4,7 +4,7 @@ $fontLED: led;
 
 //颜色
 $white: #fff;
-$inBlue: #26cbc6;
+$inBlue: #25bdcb;
 $subtitle: #638395;
 $inBlueHover: #07ffc1;
 $inYellow: #ffd014;
@@ -17,37 +17,37 @@ $eventBG: #0b284e;
 
 
 //渐变
-$GradualGreen: 180deg, rgba($color: #1a996f, $alpha: .8),
+$GradualGreen: 180deg, rgba($color: #138399, $alpha: .8),
 rgba($color: #04151e, $alpha: .8);
 
 $conBg: 180deg, rgba($color: #0f282c, $alpha: 1),
 rgba($color: #051216, $alpha: 1);
 
-$btmMemu: 180deg, rgba($color: #0a2011, $alpha: 1),
-rgba($color: #012a08, $alpha: 1);
+$btmMemu: 180deg, rgba($color: #0a1f20, $alpha: 1),
+rgba($color: #011d2a, $alpha: 1);
 
 $boxBG: 180deg, rgba($color: #0d2760, $alpha: 1),
 rgba($color: #081a41, $alpha: 1);
 
 //内阴影
-$shadowList: 0 0 1rem 0 rgba($color: #0b2523, $alpha: .8);
+$shadowList: 0 0 1rem 0 rgba($color: #0b1b25, $alpha: .8);
 $shadowTitle: 0 -0.2rem .5rem 0.3rem rgba($color: #15dbb4, $alpha: .09) inset;
-$shadowListHover: rgba($color: #21b387, $alpha: .7) 0px 0px 50px inset;
+$shadowListHover: rgba($color: #1cbfc2, $alpha: .7) 0px 0px 50px inset;
 $shadowListHoverI: 0 0 3px rgba($color: #41ff84, $alpha: .5), -0 -0 10px rgba($color: #41fff8, $alpha: .9);
 $shadowTip: 0 0 1rem 0 rgba($color: #34c7e7, $alpha: .8) inset;
 $shadowCount: 0 0 .5rem 0 rgba($color: #00c8ff, $alpha: 1) inset;
 
 //可视化 数字林业
-$fBlue: #38cb9a;
+$fBlue: #0bb3c2;
 $fBlueHover: #07ffc1;
 $fBlueG: #0bf3f7;
-$fListTitle: #20cbb2;
+$fListTitle: #0fc4d4;
 $barBgc: rgba($color: #102127, $alpha: .9);
-$barShadow: rgba($color: #17d1bc, $alpha: .8) 0px 0px 18px inset;
+$barShadow: rgba($color: #078ad1, $alpha: .8) 0px 0px 18px inset;
 $barBorder: solid rgba($color: #33467f, $alpha: .7);
 $tableBorder: solid rgba($color: #33467f, $alpha: .7);
 $countBorder: solid rgba($color: #00aeff, $alpha: .9);
-$searchBorder: solid rgba($color: #327f61, $alpha: 1);
+$searchBorder: solid rgba($color: #33727f, $alpha: 1);
 $searchBG: #102127;
 $deepBG: #09192f;
 //icon
@@ -79,18 +79,6 @@ $date-state2: #e68d3f;
 $date-state3: #d6333b;
 
 
-//视频摄像头预览弹层样式
-.videoCustomWidth {
-  width: 1070px !important;
-  height: 700px !important;
-}
-//电视墙视频摄像头预览弹层样式
-.TVWallCustomWidth {
-  width: 1150px !important;
-  height: 700px !important;
-}
-
-
 //公共
 body {
   height: 100%;
@@ -570,7 +558,20 @@ div::-webkit-scrollbar {
   height: 866px !important;
 }
 
+//视频摄像头预览弹层样式
+.videoCustomWidth {
+  width: 1070px !important;
+  height: 700px !important;
+}
+//电视墙视频摄像头预览弹层样式
+.TVWallCustomWidth {
+  width: 1150px !important;
+  height: 700px !important;
+}
+
 .dia-event-info {
+	
+
   .el-row {
     height: 780px;
   }
@@ -579,25 +580,27 @@ div::-webkit-scrollbar {
     height: 780px !important;
     position: absolute;
     z-index: 999;
-    button {
-      padding: 0 .3rem;
-      height: 1.5rem;
-      background-color: #112543;
-      color: $inBlue;
-      border: 1px $searchBorder;
-    }
-
-    button:hover {
-      text-shadow: 0 0 15px rgba($color: $inBlueHover, $alpha: 1.0);
-    }
-    .fire-m{
-      position: absolute;
-      right: 1rem;
-      bottom: 1rem;
-      z-index:100000;
-
-    }
     //超图绘制截屏
+	
+	button {
+	  padding: 0 .3rem;
+	  height: 1.5rem;
+	  background-color: #112543;
+	  color: $inBlue;
+	  border: 1px $searchBorder;
+	}
+	
+	button:hover {
+	  text-shadow: 0 0 15px rgba($color: $inBlueHover, $alpha: 1.0);
+	}
+	.fire-m{
+		position: absolute; 
+		right: 1rem; 
+		bottom: 1rem;
+		z-index:100000;
+		
+	}
+	
     .leaflet-pane .leaflet-overlay-pane {
       height: 780px !important;
       width: 1340px !important;
@@ -2855,7 +2858,7 @@ div::-webkit-scrollbar {
 }
 
 .el-dialog:not(.is-fullscreen) {
-  margin-top: 10vh !important;
+  margin-top: 5vh !important;
 }
 
 
@@ -2925,8 +2928,8 @@ div::-webkit-scrollbar {
   background: $GradualGreen;
   margin-right: 5px;
   color: #3cd7ef;
-  background: -webkit-gradient(linear, right top, left top, from(#052b24), color-stop(#00335c), to(#052b1d));
-  background: linear-gradient(to left, #052b28, #00575c, #042b27);
+  background: -webkit-gradient(linear, right top, left top, from(#051d2b), color-stop(#00335c), to(#051d2b));
+  background: linear-gradient(to left, #051d2b, #00335c, #051d2b);
 }
 
 .el-tabs__item:hover {
@@ -2940,7 +2943,7 @@ div::-webkit-scrollbar {
   font-size: 15px;
   font-weight: bolder;
   background: linear-gradient(to left, #051d2b, #0ba9c8, #051d2b);
-  box-shadow: rgba($color: #13c231, $alpha: .8) 0px 0px 15px inset;
+  box-shadow: rgba($color: #0ca1c2, $alpha: .8) 0px 0px 15px inset;
 }
 
 

+ 4 - 7
src/components/supermap.vue

@@ -1187,13 +1187,10 @@ export default {
       }
     },
     dropLocation: function(lat, lng) { //落点定位
-
-      this.map.flyTo([lat, lng], 14, { duration: 2 })
-
-      // this.controlLevel(12)
-      // setTimeout(() => {
-      //   this.map.panTo([lat, lng])
-      // }, 1000)
+      this.map.flyTo([lat, lng], 13, { duration: 2 })
+    },
+    dropLocation10: function(lat, lng) { //落点定位
+      this.map.flyTo([lat, lng], 10, { duration: 2 })
     },
     controlLevel: function(level) { //控制地图缩放级别
       this.map.setZoom(level)

+ 5 - 4
src/components/v-fastmenu.vue

@@ -22,7 +22,8 @@
 						<el-button type="primary" size="small" @click="resetPwd">修改密码</el-button>
 						<el-button type="warning" size="small" @click="logout">退出登录</el-button>
 					</div>
-          <el-link type="primary" @click="backToMainPage" style="border-top: 1px solid #334780;" icon="el-icon-s-home">回到首页</el-link>
+          <el-link type="primary" @click="backToMainPage" style="border-top: 1px solid #334780;" icon="el-icon-s-home">返回首页</el-link>
+<!--					<a href="#"><i class="el-icon-monitor"></i>管理系统</a>-->
 				</div>
 				<div slot="reference" style="text-align: center; width:4rem;height:3rem;">
 					<img src="@/assets/images/mascot-small.png" />
@@ -74,7 +75,7 @@ import { getUserProfile } from "@/api/system/user";
         let mo = href.lastIndexOf(":") > 6  ? href.lastIndexOf(":") : href.lastIndexOf("/")
         let ip = href.substr(href.indexOf("://")+3,mo);
         let url =href.substr(0,mo)
-        let toUrl = url +":15001/newpage"
+        let toUrl = url +":15001/index58"
         window.location.href = toUrl
       },
       getUser(){
@@ -204,8 +205,8 @@ import { getUserProfile } from "@/api/system/user";
 
 	}
 	.el-popover{
-		background:#0c2127;
-		border:1px solid #334780;
+		background:$searchBG;
+		border:1px $barBorder;
 		box-shadow:$shadowListHover;
 		border-radius: 1rem;
 	}

+ 20 - 7
src/components/v-header.vue

@@ -5,19 +5,19 @@
 		<!--中间LOGO -->
 		<div class="title">
 			<!-- <img src="@/assets/images/integrated/bigdata-header-nav-left2.png" /> -->
-			<h3><img class="logo" src="@/assets/images/integrated/logo-small.png" />通榆县乡村振兴监管平台 {{titlename}}
+			<h3><img class="logo" src="@/assets/images/integrated/logo-small.png" />{{systemTitle.title}} {{titlename}}
 			</h3>
 			<!-- <img src="@/assets/images/integrated/bigdata-header-nav-right2.png" /> -->
 		</div>
 
 		<!--中间导航-->
 		<div class="bignav">
-			<img src="@/assets/images/integrated/bigdata-header-nav-left.png" />
+			<img src="@/assets/images/integrated/bigdata-header-nav-left2.png" />
 			<router-link v-for="(navbar,index) in navbar" :key="index+'1'" :to="navbar.path"  class="bignav-list"
 				exact>
 				<a>{{navbar.meta.title}}</a>
 			</router-link>
-			<img src="@/assets/images/integrated/bigdata-header-nav-right.png" />
+			<img src="@/assets/images/integrated/bigdata-header-nav-right2.png" />
 		</div>
 		<!-- 右侧5个中心 -->
 		<VfastMenu></VfastMenu>
@@ -28,6 +28,11 @@
 	import {constantRoutes} from '@/router/index'//navbar导航引用了router路由的数组
 	import Clock from '@/components/clock.vue' // 时钟+天气
 	import VfastMenu from '@/components/v-fastmenu.vue' // 头部右侧菜单
+  import {
+    fontConfig
+  } from '@/api/login'
+
+
 	export default{
 		components:{
 			VfastMenu,
@@ -35,14 +40,22 @@
 
 		},
 		created(){
-			this.navbar
+      this.fontConfig()
+      this.navbar
 		},
 		data(){
 			return{
-
+        systemTitle: {
+          title: '',  //标题
+        },
 			}
 		},
 		methods:{
+      fontConfig(){
+        fontConfig().then(res => {
+          this.systemTitle.title = res.data.fontTitle;
+        })
+      },
 		},
 		computed:{
 			titlename(){
@@ -68,7 +81,7 @@
 		display: flex;
 		align-items: center;
 		z-index: 1000;
-		position: absolute;
+		position: fixed;
 		top: 0;
 
 		.title {
@@ -104,7 +117,7 @@
 			align-items: center;
 
 			.bignav-list {
-				background: url(../assets/images/integrated/bigdata-header-nav-re.png) repeat-x center;
+				background: url(../assets/images/integrated/bigdata-header-nav-re2.png) repeat-x center;
 				float: left;
 				display: flex;
 				justify-content: cetner;

Plik diff jest za duży
+ 782 - 676
src/components/vBottomMenu.vue


+ 1 - 1
src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '通榆县乡村振兴监管平台',
+      title: '四平市态势感知平台',
       logo: logoImg
     }
   }

+ 1 - 0
src/main.js

@@ -28,6 +28,7 @@ import './permission' // permission control
 //DataV动效组件
 import dataV from '@jiaminghi/data-view'
 
+
 // //WebSocket封装方法
 // import * as socketApi from '@/api/socket'
 // Vue.prototype.socketApi = socketApi

+ 14 - 74
src/router/index.js

@@ -35,12 +35,12 @@ export const constantRoutes = [
 		redirect: 'forest',
 	},
 	{
-		//生态云图
+		//应急云图
 		path: '/forest',
 		name: 'forest',
 		component: () => import('@/views/forest'),
 		meta: {
-			title: '生态云图'
+			title: '应急云图'
 		}
 	},
 	{
@@ -61,45 +61,15 @@ export const constantRoutes = [
 			title: '监控中心'
 		}
 	},
-  // {
-	// 	path: '/',
-	// 	name: '',
-	// 	component: () => import('@/views/monitor'),
-	// 	meta: {
-	// 		title: '土壤墒情'
-	// 	}
-	// },
-  // {
-	// 	path: '/',
-	// 	name: '',
-	// 	component: () => import('@/views/monitor'),
-	// 	meta: {
-	// 		title: '污染源'
-	// 	}
-	// }, {
-	// 	path: '/',
-	// 	name: '',
-	// 	component: () => import('@/views/monitor'),
-	// 	meta: {
-	// 		title: '水质环境'
-	// 	}
-	// },
-  // {
-  //   path: '/',
-  //   name: '',
-  //   component: () => import('@/views/monitor'),
-  //   meta: {
-  //     title: '大气环境'
-  //   }
-  // },
-  {
-    path: '/bigdata',
-    name: 'bigdata',
-    component: () => import('@/views/bigdata/bigdata'),
-    meta: {
-      title: '统计分析'
-    }
-  },
+	{
+		//统计分析
+		path: '/bigdata',
+		name: 'bigdata',
+		component: () => import('@/views/bigdata/bigdata'),
+		meta: {
+			title: '统计分析'
+		}
+	},
 ]
 
 
@@ -110,12 +80,12 @@ export const constantRoutesNew = [{
 		redirect: 'forest',
 	},
 	{
-		//生态云图
+		//应急云图
 		path: '/forest',
 		name: 'forest',
 		component: () => import('@/views/forest'),
 		meta: {
-			title: '生态云图'
+			title: '应急云图'
 		}
 	},
 	{
@@ -136,38 +106,8 @@ export const constantRoutesNew = [{
 			title: '监控中心'
 		}
 	},
-  , {
-    path: '/',
-    name: '',
-    component: () => import('@/views/monitor'),
-    meta: {
-      title: '土壤墒情'
-    }
-  },
-  {
-    path: '/',
-    name: '',
-    component: () => import('@/views/monitor'),
-    meta: {
-      title: '污染源'
-    }
-  }, {
-    path: '/',
-    name: '',
-    component: () => import('@/views/monitor'),
-    meta: {
-      title: '水质环境'
-    }
-  },
-  {
-    path: '/',
-    name: '',
-    component: () => import('@/views/monitor'),
-    meta: {
-      title: '大气环境'
-    }
-  },
   {
+    //统计分析
     path: '/bigdata',
     name: 'bigdata',
     component: () => import('@/views/bigdata/bigdata'),

+ 302 - 302
src/views/bigdata/bigdata.vue

@@ -5,13 +5,13 @@
     <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">{{ systemTitle.title }}-{{ systemTitle.subTitle }}-统计分析</h3>
       </div>
       <div class="bignav">
         <img src="@/assets/images/integrated/bigdata-header-nav-left.png"/>
         <router-link v-for="(navbar,index) in navbar " :key="index" :to="navbar.path" class="bignav-list"
                      :class="index===navbar.length-1?'on':''" exact>
-          {{navbar.name}}
+          {{ navbar.name }}
         </router-link>
         <img src="@/assets/images/integrated/bigdata-header-nav-right.png"/>
       </div>
@@ -29,9 +29,9 @@
         </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>
-          <chartPollutionSource></chartPollutionSource>
+          <chartWaterCrane></chartWaterCrane>
         </div>
         <div class="b-con">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
@@ -72,9 +72,9 @@
         </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>
-          <chartKeyEnterprises></chartKeyEnterprises>
+          <chartWaterIntake></chartWaterIntake>
         </div>
         <div class="b-con">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
@@ -88,9 +88,9 @@
       <div class="bigdata-list wid-li-3 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>
+            <span>消防力量分布</span>
           </div>
-          <chartNoBurningArea></chartNoBurningArea>
+          <chartFireFighting></chartFireFighting>
         </div>
         <div class="b-con">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
@@ -100,26 +100,26 @@
         </div>
       </div>
       <!-- 第五纵向-->
-      <!--<div class="bigdata-list wid-li-3 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>-->
-      <!--<chartGridStaff></chartGridStaff>-->
-      <!--</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>-->
-      <!--</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>-->
-      <!--</div>-->
-      <!--<chartWeatherStation></chartWeatherStation>-->
-      <!--</div>-->
-      <!--</div>-->
+      <div class="bigdata-list wid-li-3 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>
+          <chartFullTimeStation></chartFullTimeStation>
+        </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>
+          </div>
+          <chartFireHydrant></chartFireHydrant>
+        </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>
+          </div>
+          <chartFoamLiquid></chartFoamLiquid>
+        </div>
+      </div>
       <!-- 第六纵向-->
       <div class="bigdata-list wid-li-1 m-l-15">
         <div class="b-con mg-b-20 taller">
@@ -135,343 +135,343 @@
 </template>
 
 <script>
-  import tabbar from './tabbar.vue' //区域切换
-  import bigdataSupermap from '@/components/supermap' //超图
-
-  //echarts
-  import chartEvent from './chart-event.vue' //1  事件、、
-  import chartPollutionSource from './chart-pollutionSource.vue' //2  污染源分布、、
-  import chartEquipmentType from './chart-equipmentType.vue' //3  公司、、
-  import chartFireCause from './chart-fireCause.vue' //4  起火原因、、
-  import chartDeviceReportingEvents from './chart-deviceReportingEvents.vue' //5  设备上报数量、、
-  import chartEventTrend from './chart-eventTrend.vue' //6  事件趋势、、
-  import chartKeyArea from './chart-keyArea.vue' //7  重点区域、、
-  import chartKeyEnterprises from './chart-keyEnterprises.vue' //8  重点企业、、
-  import chartWeatherTrends from './chart-weatherTrends.vue' //9  天气趋势、、
-  import chartNoBurningArea from './chart-noBurningArea.vue' //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 {getRlt} from '@/api/bigdata'
-
-  export default {
-    components: {
-      bigdataSupermap,
-      tabbar,
-      chartEvent,
-      chartPollutionSource,
-      chartEquipmentType,
-      chartFireCause,
-      chartDeviceReportingEvents,
-      chartEventTrend,
-      chartKeyArea,
-      chartKeyEnterprises,
-      chartWeatherTrends,
-      chartNoBurningArea,
-      // chartFireBrigade,
-      // chartGridStaff,
-      // chartWeatherStation,
-      chartEquipmentDistribution
-    },
-    data() {
-      return {
-        visited: '',
-        navbar: [
-          {
-            //生态云图
-            path: '/forest',
-            name: '生态云图'
-          },
-          {
-            //数据中心
-            path: '/datacenter',
-            name: '数据中心'
-          },
-          {
-            //监控中心
-            path: '/monitor',
-            name: '监控中心'
-          },
-          // {
-          //   path: '/',
-          //   name: '土壤墒情'
-          // },
-          // {
-          //   path: '/',
-          //   name: '污染源'
-          // }, {
-          //   path: '/',
-          //   name: '水质环境'
-          // },
-          // {
-          //   path: '/',
-          //   name: '大气环境'
-          // },
-          {
-            path: '/bigdata',
-            name: '统计分析'
-          }
-        ],
-        total: 0, //事件总数
-        untreated: 0, //事件-未处理
-        processing: 0 // 事件-处理中
+import tabbar from './tabbar.vue' //区域切换
+import bigdataSupermap from '@/components/supermap' //超图
+
+//echarts
+import chartEvent from './chart-event.vue' //1  事件、、
+import chartWaterCrane from './chart-waterCrane.vue' //2  水鹤分布、、
+import chartEquipmentType from './chart-equipmentType.vue' //3  公司、、
+import chartFireCause from './chart-fireCause.vue' //4  起火原因、、
+import chartDeviceReportingEvents from './chart-deviceReportingEvents.vue' //5  设备上报数量、、
+import chartEventTrend from './chart-eventTrend.vue' //6  事件趋势、、
+import chartKeyArea from './chart-keyArea.vue' //7  重点区域、、
+import chartWaterIntake from './chart-waterIntake.vue' //8  取水口、、
+import chartWeatherTrends from './chart-weatherTrends.vue' //9  天气趋势、、
+import chartFireFighting from './chart-fireFighting.vue' //10 消防力量分布、、
+import chartFireHydrant from './chart-fireHydrant.vue' //12 消火栓、、
+import chartFullTimeStation from './chart-fullTimeStation.vue' //13 专职站、、
+import chartFoamLiquid from './chart-foamLiquid.vue' //14 泡沫液、、
+import chartEquipmentDistribution from './chart-equipmentDistribution' //16 设备分布、、
+
+import { getRlt } from '@/api/bigdata'
+import {
+  fontConfig
+} from '@/api/login'
+
+export default {
+  components: {
+    bigdataSupermap,
+    tabbar,
+    chartEvent,
+    chartWaterCrane,
+    chartEquipmentType,
+    chartFireCause,
+    chartDeviceReportingEvents,
+    chartEventTrend,
+    chartKeyArea,
+    chartWaterIntake,
+    chartWeatherTrends,
+    chartFireFighting,
+    chartFireHydrant,
+    chartFullTimeStation,
+    chartFoamLiquid,
+    chartEquipmentDistribution
+  },
+  data() {
+    return {
+      systemTitle: {
+        title: '',  //标题
+        subTitle: ''//副标题
+      },
+      visited: '',
+      navbar: [{
+        //应急云图
+        path: '/forest',
+        name: '应急云图'
+      },
+        {
+          //数据中心
+          path: '/datacenter',
+          name: '数据中心'
+        },
+        {
+          //监控中心
+          path: '/monitor',
+          name: '监控中心'
+        },
+        {
+          //统计分析
+          path: '/bigdata',
+          name: '统计分析'
+        }
 
-      }
-    },
-    methods: {
-
-      rlt() {
-        let that = this
-        getRlt().then(resp => {
-          setTimeout(() => {
-            //事件分布
-            that.$refs.bigdataSupermap.loadHeatMap(resp.data)
-          }, 5000)
-        })
-      }
+      ],
+      total: 0, //事件总数
+      untreated: 0, //事件-未处理
+      processing: 0 // 事件-处理中
+    }
+  },
+  methods: {
+    fontConfig() {
+      fontConfig().then(res => {
+        this.systemTitle.title = res.data.fontTitle;
+        this.systemTitle.subTitle = res.data.subTitle;
+      })
     },
-    mounted() {
-      this.rlt()
+    rlt() {
+      let that = this
+      getRlt().then(resp => {
+        setTimeout(() => {
+          //事件分布
+          that.$refs.bigdataSupermap.loadHeatMap(resp.data)
+        }, 5000)
+      })
     }
+  },
+  created() {
+    this.fontConfig()
+  },
+  mounted() {
+    this.rlt()
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  @import '@/assets/styles/base.scss';
+@import '@/assets/styles/base.scss';
 
 
-  .bigdata-con {
-    width: -webkit-fit-content;
-    height: 100%;
-    background: #01020c;
+.bigdata-con {
+  width: -webkit-fit-content;
+  height: 100%;
+  background: #01020c;
 
-    .el-loading-mask {
-      background: none;
+  .el-loading-mask {
+    background: none;
+  }
+
+  .header {
+    height: 3rem;
+    display: flex;
+    align-items: center;
+
+    .header-left {
+      position: fixed;
+      left: 10px;
+      top: 5px;
+      display: flex;
+      align-items: center;
+      color: $inBlue;
+      font-family: $fontFk;
+
+      .title {
+        margin: 0 auto;
+        text-align: center;
+        background-image: -webkit-linear-gradient(bottom, rgba($color: #00f6ff, $alpha: 1.0), rgba($color: #005aff, $alpha: 1.0));
+        -webkit-background-clip: text;
+        -webkit-text-fill-color: transparent;
+        color: #fff;
+        font-size: 28px;
+      }
     }
 
-    .header {
-      height: 3rem;
+    .bignav {
+      height: 40px;
+      position: fixed;
+      left: 50%;
+      transform: translateX(-50%);
+      top: 0;
+      z-index: 1000;
+      border-radius: 5px;
       display: flex;
+      justify-content: cetner;
       align-items: center;
 
-      .header-left {
-        position: fixed;
-        left: 10px;
-        top: 5px;
+      .bignav-list {
+        background: url(../../assets/images/integrated/bigdata-header-nav-re.png) repeat-x center;
+        float: left;
         display: flex;
+        justify-content: cetner;
         align-items: center;
-        color: $inBlue;
-        font-family: $fontFk;
-
-        .title {
-          margin: 0 auto;
-          text-align: center;
-          background-image: -webkit-linear-gradient(bottom, rgba($color: #00f6ff, $alpha: 1.0), rgba($color: #005aff, $alpha: 1.0));
-          -webkit-background-clip: text;
-          -webkit-text-fill-color: transparent;
-          color: #fff;
-          font-size: 22px;
-        }
+        color: #fff;
+        height: 40px;
+        font-size: 12px;
+        padding: 0 23px;
+        cursor: pointer;
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+        transition: all 0.3s ease-in-out;
       }
 
-      .bignav {
-        height: 40px;
-        position: fixed;
-        left: 50%;
-        transform: translateX(-50%);
-        top: 0;
-        z-index: 1000;
-        border-radius: 5px;
-        display: flex;
-        justify-content: cetner;
-        align-items: center;
+      .router-link-active,
+      .bignav-list:hover {
+        filter: brightness(2.3);
+        -webkit-transform: translateY(2px);
+        transform: translateY(2px);
+        color: $inBlueHover;
+        border-bottom: 1px solid $inBlueHover;
+        transition: all 0.3s ease-in-out;
 
-        .bignav-list {
-          background: url(../../assets/images/integrated/bigdata-header-nav-re.png) repeat-x center;
-          float: left;
-          display: flex;
-          justify-content: cetner;
-          align-items: center;
-          color: #fff;
-          height: 40px;
-          font-size: 12px;
-          padding: 0 23px;
-          cursor: pointer;
-          -webkit-transform: translateY(0);
-          transform: translateY(0);
-          transition: all 0.3s ease-in-out;
-        }
+      }
+    }
 
-        .router-link-active,
-        .bignav-list:hover {
-          filter: brightness(2.3);
-          -webkit-transform: translateY(2px);
-          transform: translateY(2px);
-          color: $inBlueHover;
-          border-bottom: 1px solid $inBlueHover;
-          transition: all 0.3s ease-in-out;
 
-        }
-      }
+  }
 
+  .bigdata-body {
+    margin: 15px;
+    display: flex;
+    align-items: top;
+    // justify-content: center;
 
-    }
+  }
 
-    .bigdata-body {
-      margin: 15px;
-      display: flex;
-      align-items: top;
-      // justify-content: center;
+  .flex-r {
+    display: flex;
+    flex-direction: row !important;
+    align-content: flex-start;
+    justify-content: space-between
+  }
+
+  .bigdata-list {
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
 
+    .twins-con {
+      width: 100% !important;
     }
 
-    .flex-r {
-      display: flex;
-      flex-direction: row !important;
-      align-content: flex-start;
-      justify-content: space-between
+    .b-49 {
+      width: 49% !important;
     }
 
-    .bigdata-list {
-      display: flex;
-      flex-direction: column;
-      flex-wrap: wrap;
+    .b-con {
+      width: 100%;
+      height: 28.5vh;
 
-      .twins-con {
-        width: 100% !important;
-      }
+      box-shadow: 0 0 1px rgba($color: #163696, $alpha: .1),
+      -0 -0 30px rgba($color: #163696, $alpha: .5) inset;
 
-      .b-49 {
-        width: 49% !important;
+      // display: flex;
+      // flex-direction: column;
+      .b-tit {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        padding: 10px;
+
+        span {
+          font-size: 15px;
+          color: #00ceec;
+          margin-left: 5px;
+          text-shadow: 0 0 3px rgba($color: #41ff84, $alpha: .5),
+          -0 -0 10px rgba($color: #41fff8, $alpha: .9);
+        }
       }
 
-      .b-con {
+      .twins {
         width: 100%;
-        height: 28.5vh;
-
-        box-shadow: 0 0 1px rgba($color: #163696, $alpha: .1),
-        -0 -0 30px rgba($color: #163696, $alpha: .5) inset;
+        display: flex;
+        position: relative;
 
-        // display: flex;
-        // flex-direction: column;
-        .b-tit {
+        .count {
           width: 100%;
+          color: #fff;
+          font-size: 12px;
+          position: absolute;
           display: flex;
           align-items: center;
-          padding: 10px;
-
-          span {
-            font-size: 15px;
-            color: #00ceec;
-            margin-left: 5px;
-            text-shadow: 0 0 3px rgba($color: #41ff84, $alpha: .5),
-            -0 -0 10px rgba($color: #41fff8, $alpha: .9);
-          }
-        }
-
-        .twins {
-          width: 100%;
-          display: flex;
-          position: relative;
+          left: 1rem;
+          top: 9px;
+          z-index: 100;
 
-          .count {
-            width: 100%;
-            color: #fff;
-            font-size: 12px;
-            position: absolute;
+          .count-z {
             display: flex;
-            align-items: center;
-            left: 1rem;
-            top: 9px;
-            z-index: 100;
-
-            .count-z {
-              display: flex;
-              margin: 0 .5rem;
-
-              span {
-                margin-left: .4rem;
-                font-size: 1rem;
-                color: #2ee0fb !important;
-                font-weight: bolder;
-              }
+            margin: 0 .5rem;
+
+            span {
+              margin-left: .4rem;
+              font-size: 1rem;
+              color: #2ee0fb !important;
+              font-weight: bolder;
             }
+          }
 
 
-          }
         }
-
       }
 
-      .tall {
-        height: 59vh !important;
-      }
+    }
 
-      .taller {
-        height: 89.5vh !important;
-      }
+    .tall {
+      height: 59vh !important;
+    }
 
-      .three {
-        display: flex;
-        flex-direction: column;
-      }
+    .taller {
+      height: 89.5vh !important;
+    }
 
-      .el-row {
-        width: 100%;
-      }
+    .three {
+      display: flex;
+      flex-direction: column;
+    }
 
+    .el-row {
+      width: 100%;
+    }
 
-      .bigdata-map {
-        width: 100%;
-        height: 59vh;
-        position: relative;
-        background: #00101f;
 
-        .event-count {
-          color: #fff;
-          font-size: 14px;
-          font-weight: bolder;
-          padding: 10px;
-          background-color: #000000;
-          position: absolute;
-          top: 10px;
-          left: 10px;
-          z-index: 1000;
+    .bigdata-map {
+      width: 100%;
+      height: 59vh;
+      position: relative;
+      background: #00101f;
+
+      .event-count {
+        color: #fff;
+        font-size: 14px;
+        font-weight: bolder;
+        padding: 10px;
+        background-color: #000000;
+        position: absolute;
+        top: 10px;
+        left: 10px;
+        z-index: 1000;
 
-          span {
-            font-size: 16px;
-            color: #d50000;
-          }
+        span {
+          font-size: 16px;
+          color: #d50000;
         }
-
       }
 
     }
 
-    .wid-li-1 {
-      width: 396px;
-    }
+  }
 
-    .wid-li-2 {
-      width: 760px;
-    }
+  .wid-li-1 {
+    width: 396px;
+  }
 
-    .wid-li-3 {
-      width: 850px;
-    }
+  .wid-li-2 {
+    width: 760px;
+  }
 
-    .wid-li-4 {
-      width: 304px;
-    }
+  .wid-li-3 {
+    width: 850px;
+  }
 
-    .mg-b-20 {
-      margin-bottom: 2vh;
-    }
+  .wid-li-4 {
+    width: 304px;
+  }
 
-    .m-l-15 {
-      margin-left: .5%;
-    }
+  .mg-b-20 {
+    margin-bottom: 2vh;
   }
-</style>
 
+  .m-l-15 {
+    margin-left: .5%;
+  }
+}
+</style>

+ 10 - 10
src/views/bigdata/chart-deviceReportingEvents.vue

@@ -15,24 +15,24 @@
     data() {
       return {
         count: 0,
-        data_sbsbsjsl_num:[],
-        data_sbsbsjsl_reportor:[]
+        data_sbsjsbsl_num:[],
+        data_sbsjsbsl_reportor:[]
       }
     },
     mounted() {
-      this.sbsbsjsl()
+      this.sbsbsjsl();
     },
 
     methods: {
+      // 出处 http://192.144.199.210:8080/editor/index.html?chart_id=2nuQSYycLWN0P_EG
       sbsbsjsl() {
         let that = this
-        getSbsbsjsl().then(resp => {
-          that.data_sbsbsjsl_reportor = resp.data.reportor
-          that.data_sbsbsjsl_num = resp.data.num
-          that.myEcharts()
+        getSbsbsjsl(null).then(resp => {
+          that.data_sbsjsbsl_num = resp.data.num
+          that.data_sbsjsbsl_reportor = resp.data.reportor
+          this.myEcharts()
         })
       },
-      // 出处 http://192.144.199.210:8080/editor/index.html?chart_id=2nuQSYycLWN0P_EG
 
       myEcharts() {
         let that = this
@@ -57,7 +57,7 @@
 
           xAxis: {
             type: 'category',
-            data: that.data_sbsbsjsl_reportor,
+            data: that.data_sbsjsbsl_reportor,
             axisLine: {
               lineStyle: {
                 color: '#1cc6a1'
@@ -106,7 +106,7 @@
                 barBorderRadius: 12,
               },
             },
-            data: that.data_sbsbsjsl_num
+            data: that.data_sbsjsbsl_num
           }]
         };
 

+ 366 - 366
src/views/bigdata/chart-equipmentDistribution.vue

@@ -1,395 +1,395 @@
 <!-- **************************************NO.16 摄像头*************************************** -->
 <template>
-	<div class="chart-container">
-		<!-- <div id="camera1" style="width: 100%; height:25vh; ">
-		</div> -->
-		<div id="camera2" style="width: 100%; height:85vh; ">
-		</div>
-		<!-- <div id="camera3" style="width: 100%; height:30vh; ">
-		</div> -->
-	</div>
+  <div class="chart-container">
+    <!-- <div id="camera1" style="width: 100%; height:25vh; ">
+        </div> -->
+    <div id="camera2" style="width: 100%; height:85vh; ">
+    </div>
+    <!-- <div id="camera3" style="width: 100%; height:30vh; ">
+        </div> -->
+  </div>
 </template>
 
 <script>
-	import * as echarts from 'echarts';
+  import * as echarts from 'echarts';
   import {getSbfb} from '@/api/bigdata'
-	export default {
-		name: 'camera',
-		data() {
-			return {
-				count: 0,
+
+  export default {
+    name: 'camera',
+    data() {
+      return {
+        count: 0,
         data_sbfb:[]
-			}
-		},
-		mounted() {
-			// this.myEcharts1();
-			this.sbfb();
-			// this.myEcharts3();
+      }
+    },
+    mounted() {
+      this.sbfb()
+      // this.myEcharts1();
+      this.myEcharts2();
+      // this.myEcharts3();
 
-		},
+    },
 
-		methods: {
-		  sbfb(){
-		    let that = this
-		    getSbfb().then(resp =>{
-         that.data_sbfb = resp.data
-          that.myEcharts2()
+    methods: {
+      sbfb() {
+        let that = this
+        getSbfb().then(resp => {
+          that.myEcharts2();
         })
       },
-			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=TMyJh73uiXkeu3_v
-			myEcharts1() {
-				var chartDom = document.getElementById('camera1');
-				var myChart = echarts.init(chartDom);
-				var option;
-				const dfColor = ['#92E1FF', '#0097FB', '#30ECA6', '#FFC227', '#FF4848'];
-				option = {
-					dataset: {
-						dimensions: ['name', '摄像头'],
-						source: [{
-								name: '双辽市',
-								'摄像头': 50
-							},
-							{
-								name: '梨树县',
-								'摄像头': 40
-							},
-							{
-								name: '伊通县',
-								'摄像头': 30
-							},
-							{
-								name: '铁东区',
-								'摄像头': 20
-							},
-							{
-								name: '铁西区',
-								'摄像头': 30
-							}
-						]
-					},
-					tooltip: {
-						trigger: 'item',
-						position: function(point, params, dom, rect, size) {
-							const x = point[0];
-							const y = point[1];
-				 		const viewWidth = size.viewSize[0];
-							const viewHeight = size.viewSize[1];
-							const boxWidth = size.contentSize[0];
-				 		const boxHeight = size.contentSize[1];
-							let posX = 0;
-							let posY = 0;
-				 		if (x < boxWidth) {
-								// 左边放不开
-								posX = 5;
-							} else {
-								// 左边放的下
-								posX = x - boxWidth;
-							}
-							if (y < boxHeight) {
-								// 上边放不开
-								posY = 5;
-							} else {
-								// 上边放得下
-								posY = y - boxHeight;
-							}
-							return [posX, posY];
-						},
-					},
-					angleAxis: {
-						max(value) {
-							return value.max * 1.1;
-						},
-						axisLabel: {
-							show: false
-						},
-						axisTick: {
-							show: false
-						},
-				  axisLine: {
-							show: false
-						},
-						splitLine: {
-							show: false
-						},
-						startAngle: 270
-					},
-					radiusAxis: {
-						type: 'category',
-						minorTick: {
-							show: false
-						},
-						axisLine: {
-							show: false
-						},
-						axisTick: {
-							show: false
-						},
-						axisLabel: {
-							show: false
-						},
-					},
-					polar: {
-				 	radius: ['40%', '90%'],
-				 },
-					// angleAxis:{
-					//     clockwise:false
-					// },
-					series: [{
-						type: 'bar',
-						coordinateSystem: 'polar',
-						itemStyle: {
-				  	color(params) {
-								const idx = params.dataIndex;
-								return dfColor[idx];
-							},
-						},
-						barWidth: 5,
-						roundCap: true,
-						showBackground: true,
-						backgroundStyle: {
-							color: 'RGBA(0, 69, 117, 0.5)',
-						},
-					}],
-				};
-				option && myChart.setOption(option);
-			},
+      // 出处 http://192.144.199.210:8080/editor/index.html?chart_id=TMyJh73uiXkeu3_v
+      myEcharts1() {
+        var chartDom = document.getElementById('camera1');
+        var myChart = echarts.init(chartDom);
+        var option;
+        const dfColor = ['#92E1FF', '#0097FB', '#30ECA6', '#FFC227', '#FF4848'];
+        option = {
+          dataset: {
+            dimensions: ['name', '摄像头'],
+            source: [{
+              name: '双辽市',
+              '摄像头': 50
+            },
+              {
+                name: '梨树县',
+                '摄像头': 40
+              },
+              {
+                name: '伊通县',
+                '摄像头': 30
+              },
+              {
+                name: '铁东区',
+                '摄像头': 20
+              },
+              {
+                name: '铁西区',
+                '摄像头': 30
+              }
+            ]
+          },
+          tooltip: {
+            trigger: 'item',
+            position: function (point, params, dom, rect, size) {
+              const x = point[0];
+              const y = point[1];
+              const viewWidth = size.viewSize[0];
+              const viewHeight = size.viewSize[1];
+              const boxWidth = size.contentSize[0];
+              const boxHeight = size.contentSize[1];
+              let posX = 0;
+              let posY = 0;
+              if (x < boxWidth) {
+                // 左边放不开
+                posX = 5;
+              } else {
+                // 左边放的下
+                posX = x - boxWidth;
+              }
+              if (y < boxHeight) {
+                // 上边放不开
+                posY = 5;
+              } else {
+                // 上边放得下
+                posY = y - boxHeight;
+              }
+              return [posX, posY];
+            },
+          },
+          angleAxis: {
+            max(value) {
+              return value.max * 1.1;
+            },
+            axisLabel: {
+              show: false
+            },
+            axisTick: {
+              show: false
+            },
+            axisLine: {
+              show: false
+            },
+            splitLine: {
+              show: false
+            },
+            startAngle: 270
+          },
+          radiusAxis: {
+            type: 'category',
+            minorTick: {
+              show: false
+            },
+            axisLine: {
+              show: false
+            },
+            axisTick: {
+              show: false
+            },
+            axisLabel: {
+              show: false
+            },
+          },
+          polar: {
+            radius: ['40%', '90%'],
+          },
+          // angleAxis:{
+          //     clockwise:false
+          // },
+          series: [{
+            type: 'bar',
+            coordinateSystem: 'polar',
+            itemStyle: {
+              color(params) {
+                const idx = params.dataIndex;
+                return dfColor[idx];
+              },
+            },
+            barWidth: 5,
+            roundCap: true,
+            showBackground: true,
+            backgroundStyle: {
+              color: 'RGBA(0, 69, 117, 0.5)',
+            },
+          }],
+        };
+        option && myChart.setOption(option);
+      },
 
-			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=pAD_0lcRq_zOGf_k
-			myEcharts2() {
+      // 出处 http://192.144.199.210:8080/editor/index.html?chart_id=pAD_0lcRq_zOGf_k
+      myEcharts2() {
         let that = this
-				var chartDom = document.getElementById('camera2');
-				var myChart = echarts.init(chartDom);
-				var option;
-				const dfColor = ['#92E1FF', '#0097FB', '#30ECA6', '#FFC227', '#FF4848'];
-				option = {
-					dataset: {
-						source: that.data_sbfb,
-					},
-					tooltip: {
-						trigger: 'item',
+        var chartDom = document.getElementById('camera2');
+        var myChart = echarts.init(chartDom);
+        var option;
+        const dfColor = ['#92E1FF', '#0097FB', '#30ECA6', '#FFC227', '#FF4848'];
+        option = {
+          dataset: {
+            source: that.data_sbfb,
+          },
+          tooltip: {
+            trigger: 'item',
 
-					},
-					grid: {
-						top: "0%",
-						left: "6%",
-						// right: "4%",
-						bottom: "5%",
-						width: '75%',
-						containLabel: true,
-					},
-					xAxis: {
-						show: false,
-						type: "value",
-					},
-					yAxis: {
-						type: "category", // 不设置类目轴,抽离的dataset数据展示不出来
-						inverse: true,
-						axisLabel: {
-							show: true,
-							textStyle: {
-								color: '#5deaff',
-								fontSize: '12'
-							}
-						},
-				  splitLine: {
-							show: false
-						},
-						axisTick: {
-							show: false
-						},
-						axisLine: {
-							show: false
-						},
-					},
+          },
+          grid: {
+            top: "0%",
+            left: "6%",
+            // right: "4%",
+            bottom: "5%",
+            width: '75%',
+            containLabel: true,
+          },
+          xAxis: {
+            show: false,
+            type: "value",
+          },
+          yAxis: {
+            type: "category", // 不设置类目轴,抽离的dataset数据展示不出来
+            inverse: true,
+            axisLabel: {
+              show: true,
+              textStyle: {
+                color: '#5deaff',
+                fontSize: '12'
+              }
+            },
+            splitLine: {
+              show: false
+            },
+            axisTick: {
+              show: false
+            },
+            axisLine: {
+              show: false
+            },
+          },
 
-					series: [{
+          series: [{
 
-						type: "bar",
-						animationCurve: "easeOutBack",
-						barWidth: 8,
-						label: {
-							show: true,
-							position: "right",
-							offset: [0, 0],
-							color: "#88dfd5",
-							// fontSize: "12",
-							style: {
-				   	fill: "#fff"
-							},
-						},
-						backgroundBar: {
-							show: true,
-							style: {
-								fill: "rgba(97,152,255,0.30)",
-							},
-						},
-						barStyle: {
-							stroke: "rgba(41,244,236,1)",
-						},
-						gradient: {
-							color: ["rgba(41,244,236,1)", "rgba(41,244,236,0)"],
-						},
-						itemStyle: {
-							label: {
-								show: true
-							},
-							labelLine: {
-								show: false,
-							},
-							color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
-				 				offset: 0,
-									color: "rgba(41,244,236,0)"
-								},
-								{
-									offset: 1,
-									color: "rgba(41,244,236,1)"
-								},
-							]),
-							borderColor: "#a2f9f7",
-							shadowBlur: 16,
-							shadowColor: "#a2f9f7",
-						},
-					}, ],
-				};
-				option && myChart.setOption(option);
-			},
-			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=ELjN7o3m72tLtmbv
-			myEcharts3() {
-				var chartDom = document.getElementById('camera3');
-				var myChart = echarts.init(chartDom);
-				var option;
-				option = {
-					color: ['#3D91F7', '#61BE67'],
-					tooltip: {},
-					legend: {
-						show: true,
-						icon: "circle",
-						bottom: 30,
-						center: 0,
-						itemWidth: 14,
-						itemHeight: 14,
-						itemGap: 21,
-						orient: "horizontal",
-						data: ['a', 'b'],
-						textStyle: {
-							color: '#8C8C8C'
-						},
-					},
-
-					radar: {
-						// shape: 'circle',
-						radius: '80%',
-						triggerEvent: true,
-						name: {
-							textStyle: {
-								color: '#fff',
-								fontSize: '10',
-								borderRadius: 3,
-								padding: [3, 5]
-							}
-						},
-						nameGap: '2',
-						indicator: [{ //[4300, 10000, 28000, 35000, 50000, 19000, 21000]
-								name: '型号1',
-								max: 6500
-							},
-							{
-								name: '型号2',
-								max: 16000
-							},
-							{
-								name: '型号3',
-								max: 30000
-							},
-							{
-								name: '型号4',
-								max: 38000
-							},
-							{
-								name: '型号5',
-								max: 52000
-							},
-							{
-								name: '型号6',
-								max: 25000
-							},
-							{
-								name: '型号7',
-								max: 25000
-							}
-						],
-						splitArea: {
-							areaStyle: {
-								color: [
-									'rgba(222,134,85, 0.1)', 'rgba(222,134,85, 0.2)',
-									'rgba(222,134,85, 0.4)', 'rgba(222,134,85, 0.6)',
-									'rgba(222,134,85, 0.8)', 'rgba(222,134,85, 1)'
-								].reverse()
-							}
-						},
-						// axisLabel:{//展示刻度
-						//     show: true
-						// },
-						axisLine: { //指向外圈文本的分隔线样式
-							lineStyle: {
-								color: 'rgba(0,0,0,0)'
-							}
-						},
-						splitLine: {
-							lineStyle: {
-								width: 2,
-								color: [
-									'rgba(224,134,82, 0.1)', 'rgba(224,134,82, 0.2)',
-									'rgba(224,134,82, 0.4)', 'rgba(224,134,82, 0.6)',
-									'rgba(224,134,82, 0.8)', 'rgba(224,134,82, 1)'
-								].reverse()
-							}
-						},
+            type: "bar",
+            animationCurve: "easeOutBack",
+            barWidth: 8,
+            label: {
+              show: true,
+              position: "right",
+              offset: [0, 0],
+              color: "#88dfd5",
+              // fontSize: "12",
+              style: {
+                fill: "#fff"
+              },
+            },
+            backgroundBar: {
+              show: true,
+              style: {
+                fill: "rgba(97,152,255,0.30)",
+              },
+            },
+            barStyle: {
+              stroke: "rgba(41,244,236,1)",
+            },
+            gradient: {
+              color: ["rgba(41,244,236,1)", "rgba(41,244,236,0)"],
+            },
+            itemStyle: {
+              label: {
+                show: true
+              },
+              labelLine: {
+                show: false,
+              },
+              color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
+                offset: 0,
+                color: "rgba(41,244,236,0)"
+              },
+                {
+                  offset: 1,
+                  color: "rgba(41,244,236,1)"
+                },
+              ]),
+              borderColor: "#a2f9f7",
+              shadowBlur: 16,
+              shadowColor: "#a2f9f7",
+            },
+          },],
+        };
+        option && myChart.setOption(option);
+      },
+      // 出处 http://192.144.199.210:8080/editor/index.html?chart_id=ELjN7o3m72tLtmbv
+      myEcharts3() {
+        var chartDom = document.getElementById('camera3');
+        var myChart = echarts.init(chartDom);
+        var option;
+        option = {
+          color: ['#3D91F7', '#61BE67'],
+          tooltip: {},
+          legend: {
+            show: true,
+            icon: "circle",
+            bottom: 30,
+            center: 0,
+            itemWidth: 14,
+            itemHeight: 14,
+            itemGap: 21,
+            orient: "horizontal",
+            data: ['a', 'b'],
+            textStyle: {
+              color: '#8C8C8C'
+            },
+          },
 
-					},
+          radar: {
+            // shape: 'circle',
+            radius: '80%',
+            triggerEvent: true,
+            name: {
+              textStyle: {
+                color: '#fff',
+                fontSize: '10',
+                borderRadius: 3,
+                padding: [3, 5]
+              }
+            },
+            nameGap: '2',
+            indicator: [{ //[4300, 10000, 28000, 35000, 50000, 19000, 21000]
+              name: '型号1',
+              max: 6500
+            },
+              {
+                name: '型号2',
+                max: 16000
+              },
+              {
+                name: '型号3',
+                max: 30000
+              },
+              {
+                name: '型号4',
+                max: 38000
+              },
+              {
+                name: '型号5',
+                max: 52000
+              },
+              {
+                name: '型号6',
+                max: 25000
+              },
+              {
+                name: '型号7',
+                max: 25000
+              }
+            ],
+            splitArea: {
+              areaStyle: {
+                color: [
+                  'rgba(222,134,85, 0.1)', 'rgba(222,134,85, 0.2)',
+                  'rgba(222,134,85, 0.4)', 'rgba(222,134,85, 0.6)',
+                  'rgba(222,134,85, 0.8)', 'rgba(222,134,85, 1)'
+                ].reverse()
+              }
+            },
+            // axisLabel:{//展示刻度
+            //     show: true
+            // },
+            axisLine: { //指向外圈文本的分隔线样式
+              lineStyle: {
+                color: 'rgba(0,0,0,0)'
+              }
+            },
+            splitLine: {
+              lineStyle: {
+                width: 2,
+                color: [
+                  'rgba(224,134,82, 0.1)', 'rgba(224,134,82, 0.2)',
+                  'rgba(224,134,82, 0.4)', 'rgba(224,134,82, 0.6)',
+                  'rgba(224,134,82, 0.8)', 'rgba(224,134,82, 1)'
+                ].reverse()
+              }
+            },
 
-					series: [{
-						name: '型号统计',
-						type: 'radar',
-						//areaStyle: {normal: {}},
-						areaStyle: {
-							normal: {
-								color: 'rgba(252,211,3, 0.3)'
-							}
-						},
-						symbolSize: 0,
-						lineStyle: {
-							normal: {
-								color: 'rgba(252,211,3, 1)',
-								width: 1
-				  	}
-						},
-						data: [{
-							value: [4300, 10000, 28000, 35000, 50000, 19000, 21000],
-							name: '型号统计',
+          },
 
+          series: [{
+            name: '型号统计',
+            type: 'radar',
+            //areaStyle: {normal: {}},
+            areaStyle: {
+              normal: {
+                color: 'rgba(252,211,3, 0.3)'
+              }
+            },
+            symbolSize: 0,
+            lineStyle: {
+              normal: {
+                color: 'rgba(252,211,3, 1)',
+                width: 1
+              }
+            },
+            data: [{
+              value: [4300, 10000, 28000, 35000, 50000, 19000, 21000],
+              name: '型号统计',
 
 
-						}]
-					}]
-				};
-				option && myChart.setOption(option);
-			},
+            }]
+          }]
+        };
+        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;
-	}
+  .chart-container {
+    width: 100%;
+    height: auto;
+    position: relative;
+    padding-bottom: 10px;
+    display: flex;
+    flex-direction: column;
+  }
 </style>

+ 11 - 12
src/views/bigdata/chart-equipmentType.vue

@@ -8,16 +8,16 @@
 
 <script>
   import * as echarts from 'echarts';
-  import {getSblxtj} from '@/api/bigdata'
+  import {getShlxtj} from '@/api/bigdata'
 
   export default {
     name: 'enterprise',
     data() {
       return {
         count: 0,
-        data_sblxtj_deviceCount: [],
-        data_sblxtj_deviceType: [],
-        deviceTypeCount:[]
+        data_deviceCount: [],
+        data_deviceType: [],
+        deviceTypeCount: []
       }
     },
     mounted() {
@@ -36,14 +36,14 @@
       },
       sblxtj() {
         let that = this
-        getSblxtj().then(resp => {
-          that.data_sblxtj_deviceCount = resp.data.deviceCount
-          that.data_sblxtj_deviceType = resp.data.deviceType
+        getShlxtj().then(resp => {
+          that.data_deviceCount = resp.data.deviceCount
+          that.data_deviceType = resp.data.deviceType
           for (let i = 0; i < resp.data.deviceCount.length; i++) {
             that.deviceTypeCount.push({
               value: resp.data.deviceCount[i],
               name: resp.data.deviceType[i],
-              itemStyle: { color: that.color16() }
+              itemStyle: {color: that.color16()}
             })
           }
           that.myEcharts()
@@ -57,7 +57,7 @@
         var myChart = echarts.init(chartDom);
         var color = ['#02CDFF', '#62FBE7', '#7930FF', '#E148EB', '#ecb935']
         var option;
-        var value = that.data_sblxtj_deviceCount;
+        var value = that.data_deviceCount;
         var temp = 0;
         option = {
 
@@ -74,11 +74,11 @@
             },
             itemWidth: 19,
             top: '2%',
-            data: that.data_sblxtj_deviceType
+            data: ['双辽市', '梨树县', '伊通县', '铁东区', '铁西区'],
           },
           series: [
             {
-              name: '设备类型统计',
+              name: '企业分布',
               type: 'funnel',
               top: '25%',
               left: '10%',
@@ -90,7 +90,6 @@
                 color: '#07faa9',
                 formatter: function () {
                   for (var i in value) {
-                    console.log(value[i]);
                     if (i == temp) {
                       temp++;
                       return value[i];

+ 11 - 19
src/views/bigdata/chart-event.vue

@@ -17,8 +17,8 @@
     data() {
       return {
         count: 0,
-        data_sjlylxtj_source:[],
-        data_sjlylxtj_type:[]
+        data_type:[],
+        data_source:[]
       }
     },
     mounted() {
@@ -29,24 +29,21 @@
 
       sjlylxtj() {
         let that = this
-        getSjlylxtj().then(resp => {
-          that.data_sjlylxtj_source = resp.data.source
-          that.data_sjlylxtj_type = resp.data.type
+        getSjlylxtj(null).then(resp => {
+          that.data_type = resp.data.type
+          that.data_source = resp.data.source
           that.myEcharts()
           that.myEcharts2()
         })
       },
       // 出处 https://echarts.apache.org/examples/zh/editor.html?c=pie-borderRadius
       //http://192.144.199.210:8080/editor/index.html?chart_id=K8nTnNyu0caN65uT
-
       myEcharts() {
         let that = this
         var chartDom = document.getElementById('event');
         var myChart = echarts.init(chartDom);
         var color = ['#02CDFF', '#62FBE7', '#7930FF', '#E148EB', '#ecb935']
         var option;
-
-
         option = {
           color: color,
           tooltip: {
@@ -75,7 +72,7 @@
               labelLine: {
                 show: false
               },
-              data: that.data_sjlylxtj_type
+              data: that.data_type
             },
 
           ]
@@ -92,7 +89,7 @@
           'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAM8AAAAOBAMAAAB6G1V9AAAAD1BMVEX////Kysrk5OTj4+TJycoJ0iFPAAAAG0lEQVQ4y2MYBaNgGAMTQQVFOiABhlEwCugOAMqzCykGOeENAAAAAElFTkSuQmCC';
         let color = ['#FF8700', '#ffc300', '#00e473', '#009DFF', '#0034ff', '#E148EB'];
         var option;
-        let chartData = that.data_sjlylxtj_source
+        let chartData = that.data_source;
         let arrName = [];
         let arrValue = [];
         let sum = 0;
@@ -102,7 +99,7 @@
         // 数据处理
         chartData.forEach((v, i) => {
           arrName.push(v.name);
-          arrValue.push(parseInt(v.value));
+          arrValue.push(v.value);
           sum = sum + v.value;
         });
 
@@ -123,7 +120,7 @@
             },
             data: [
               {
-                value: parseInt(v.value),
+                value: v.value,
                 name: v.name,
                 itemStyle: {
                   normal: {
@@ -133,7 +130,7 @@
                 }
               },
               {
-                value: parseInt(sum) - parseInt(v.value),
+                value: sum - v.value,
                 name: '',
                 itemStyle: {
                   color: 'rgba(0,0,0,0)',
@@ -173,11 +170,7 @@
               },
             ],
           });
-          if(parseInt(sum)==0||parseInt(v.value)==0){
-            v.percent = 0+ '%'
-          }else{
-            v.percent = ((parseInt(v.value) / parseInt(sum)) * 100).toFixed(1) + '%';
-          }
+          v.percent = ((v.value / sum) * 100).toFixed(1) + '%';
           lineYAxis.push({
             value: i,
             textStyle: {
@@ -212,7 +205,6 @@
               axisLabel: {
                 formatter: function (params) {
                   let item = chartData[params];
-                  console.log(item);
                   return (
                     '{circle|●}{name|' +
                     item.name +

+ 40 - 40
src/views/bigdata/chart-eventTrend.vue

@@ -1,48 +1,48 @@
 <!-- **************************************NO.6 矿坑*************************************** -->
 <template>
-	<div class="chart-container">
-		<div id="pit" style="width: 100%; height:24vh;">
-		</div>
-	</div>
+  <div class="chart-container">
+    <div id="pit" style="width: 100%; height:24vh;">
+    </div>
+  </div>
 </template>
 
 <script>
-	import * as echarts from 'echarts';
+  import * as echarts from 'echarts';
   import {getSjqs} from '@/api/bigdata'
-	export default {
-		name: 'pit',
-		data() {
-			return {
-				count: 0,
-        data_sjqs_month:[],
-        data_sjqs_num:[]
-			}
-		},
-		mounted() {
-			this.sjqs()
-		},
 
-		methods: {
-			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=udduEFcFiEYEEj4Q
+  export default {
+    name: 'pit',
+    data() {
+      return {
+        count: 0,
+        data_sjqs_month: [],
+        data_sjqs_num: []
+      }
+    },
+    mounted() {
+      this.sjqs()
+    },
 
-      sjqs(){
+    methods: {
+      // 出处 http://192.144.199.210:8080/editor/index.html?chart_id=udduEFcFiEYEEj4Q
+
+      sjqs() {
         let that = this
-        getSjqs().then(resp=>{
+        getSjqs().then(resp => {
           that.data_sjqs_month = resp.data.mouth
           that.data_sjqs_num = resp.data.num
           that.myEcharts()
         })
       },
-
-			myEcharts() {
+      myEcharts() {
         let that = this
-				var chartDom = document.getElementById('pit');
-				var myChart = echarts.init(chartDom);
-				var color = ['#02CDFF', '#62FBE7', '#7930FF','#ef5f9d','#ecb935'];
-				var option;
+        var chartDom = document.getElementById('pit');
+        var myChart = echarts.init(chartDom);
+        var color = ['#02CDFF', '#62FBE7', '#7930FF', '#ef5f9d', '#ecb935'];
+        var option;
         option = {
           xAxis: {
-            data:that.data_sjqs_month,
+            data: that.data_sjqs_month,
           },
           yAxis: {
             axisLabel: {
@@ -87,25 +87,25 @@
               shadowColor: 'rgba(194, 47, 67)',
               shadowBlur: 0,
               shadowOffsetX: 0,
-              data: that.data_sjqs_num
+              data:  that.data_sjqs_num,
             },
           ],
         };
-				option && myChart.setOption(option);
-			},
+        option && myChart.setOption(option);
+      },
 
-		},
+    },
 
 
-	}
+  }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-	.chart-container {
-		width: 100%;
-		height: 100%;
-		position: relative;
-		padding-bottom: 10px;
-		display: flex;
-	}
+  .chart-container {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    padding-bottom: 10px;
+    display: flex;
+  }
 </style>

+ 0 - 171
src/views/bigdata/chart-fireBrigade.vue

@@ -1,171 +0,0 @@
-<!-- **************************************NO.12 处理中心*************************************** -->
-<template>
-	<div class="chart-container">
-		<div id="processing" style="width: 100%; height:23vh;">
-		</div>
-	</div>
-</template>
-
-<script>
-	import * as echarts from 'echarts';
-	export default {
-		name: 'processing',
-		data() {
-			return {
-				count: 0
-			}
-		},
-		mounted() {
-			this.myEcharts()
-
-		},
-
-		methods: {
-			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=vNg2RQ3LrePk4CnZ
-			myEcharts() {
-
-
-				var chartDom = document.getElementById('processing');
-				var myChart = echarts.init(chartDom);
-				var color = ['#0E7CE2', '#FF8352', '#E271DE', '#F8456B', '#00FFFF', '#4AEAB0'];
-				var option;
-				let dataList = [{
-				    name: '双辽市',
-				    value: '56'
-				}, {
-				    name: '梨树县',
-				    value: '75'
-				}, {
-				    name: '伊通县',
-				    value: '85'
-				}, {
-				    name: '铁东区',
-				    value: '78'
-				}, {
-				    name: '铁西区',
-				    value: '76'
-				}];
-				
-				option = {
-				        grid: {
-				            left: "16%", //距离左边的距离
-				            right: "12%", //距离右边的距离
-				            bottom: "15%", //距离下边的距离
-				            top: "10%" //距离上边的距离
-				        },
-				        title: {
-				            text: '',
-				            left: 26,
-				            top: 26,
-				            textStyle: {
-				                color: '#FFFFFF',
-				                fontSize: 15,
-				                fontWeight: 50000,
-				                fontFamily: 'PingFang SC'
-				            }
-				        },
-				        tooltip: {
-				            trigger: "axis",
-				            axisPointer: {
-				                type: "shadow",
-				                crossStyle: {
-				                    color: "#134d74"
-				                }
-				            },
-				        },
-				        xAxis: [{
-				            type: "category",
-				            data: ['双辽市', '梨树县', '伊通县', '铁东区', '铁西区'],
-				            axisLabel: {
-				                textStyle: {
-				                    color: "#42a7ff",
-				                    fontSize: 10,
-				                }
-				            },
-				            axisLine: {
-				                show: false
-				            },
-				            axisTick: {
-				                show: false
-				            }
-				        }],
-				        yAxis: [{
-				                type: "value",
-				                axisLabel: {
-				                    formatter: "{value}%",
-				                    textStyle: {
-				                        color: "#42a7ff",
-				                        fontSize: 10,
-				                    },
-				                },
-				                splitLine: {
-				                    lineStyle: {
-				                        color: "#1f3335"
-				                    }
-				                },
-				                axisLine: {
-				                    show: false
-				                },
-				                axisTick: {
-				                    show: false
-				                }
-				            },
-				            
-				        ],
-				        dataZoom: [{
-				            type: 'inside',
-				            start: 0,
-				            end: dataList.length > 15 ? 35 : 100
-				        }],
-				        series: [{
-				                name: "",
-				                type: "bar",
-				                data: dataList,
-				                barGap: '-100%',
-				                barCategoryGap: '80%',
-				                itemStyle: {
-				                    normal: {
-				                        color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-				                                offset: 0,
-				                                color: 'rgba(27,168,240,1)'
-				                            },
-				                            {
-				                                offset: 1,
-				                                color: 'rgba(32,40,95,0.3)'
-				                            }
-				                        ])
-				                    },
-				                    emphasis: {
-				                        color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-				                                offset: 0,
-				                                color: 'rgba(27,168,240,1)'
-				                            },
-				                            {
-				                                offset: 1,
-				                                color: 'rgba(27,168,240,0.3)'
-				                            }
-				                        ])
-				                    }
-				                },
-				            },
-				            
-				        ]
-				};
-				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>

+ 244 - 244
src/views/bigdata/chart-fireCause.vue

@@ -1,278 +1,278 @@
 <!-- **************************************NO.4 隐患*************************************** -->
 <template>
-	<div class="chart-container">
-		<div id="danger" style="width: 100%; height:23vh;">
-		</div>
-	</div>
+  <div class="chart-container">
+    <div id="danger" style="width: 100%; height:23vh;">
+    </div>
+  </div>
 </template>
 
 <script>
-	import * as echarts from 'echarts';
-  import {getQhyytj} from '@/api/bigdata'
-	export default {
-		name: 'danger',
-		data() {
-			return {
-				count: 0,
-        data_qhyytj_firesource:[],
-        data_qhyytj_num:[]
-			}
-		},
-		mounted() {
-      this.qhyytj()
-		},
+  import * as echarts from 'echarts';
+  import {getQhyy} from '@/api/bigdata'
 
-		methods: {
+  export default {
+    name: 'danger',
+    data() {
+      return {
+        count: 0,
+        data_qhyy_firesource:[],
+        data_qhyy_num:[]
+      }
+    },
+    mounted() {
+      this.qhyy()
+    },
 
-		  qhyytj(){
-		    let that = this
-		    getQhyytj().then(resp =>{
-          that.data_qhyytj_firesource = resp.data.firesource
-          that.data_qhyytj_num = resp.data.num
+    methods: {
+      // 出处 http://192.144.199.210:8080/editor/index.html?chart_id=XWNjkKJQ3NBt1FK6
+
+      qhyy() {
+        let that = this
+        getQhyy().then(resp => {
+          that.data_qhyy_firesource = resp.data.firesource
+          that.data_qhyy_num = resp.data.num
           that.myEcharts()
         })
       },
-			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=XWNjkKJQ3NBt1FK6
 
-			myEcharts() {
-		    let that = this
-				var chartDom = document.getElementById('danger');
-				var myChart = echarts.init(chartDom);
-				var color = ['#02CDFF', '#62FBE7', '#7930FF', '#E148EB', '#ecb935']
-				var option;
-				let data =that.data_qhyytj_num
-				let indicator =that.data_qhyytj_firesource
-				option = {
+      myEcharts() {
+        let that = this
+        var chartDom = document.getElementById('danger');
+        var myChart = echarts.init(chartDom);
+        var color = ['#02CDFF', '#62FBE7', '#7930FF', '#E148EB', '#ecb935']
+        var option;
+        let data = that.data_qhyy_num
+        let indicator = that.data_qhyy_firesource
+        option = {
 
-					radar: {
-						center: ['50%', '50%'],
-						radius: '89%',
-						name: {
-							formatter: function(name, indicator) {
-								let arr;
-								//   if(name=='开卡绑定数'||name=='渠道批量办理业务'){
-								//         arr = [
-								//         '{a|'+name+'}{b|'+indicator.value+'万}'
-								//     ]
-								//   }else{
-								arr = [
-									'{a|' + name + '}'
-								]
-								//   }
+          radar: {
+            center: ['50%', '50%'],
+            radius: '89%',
+            name: {
+              formatter: function (name, indicator) {
+                let arr;
+                //   if(name=='开卡绑定数'||name=='渠道批量办理业务'){
+                //         arr = [
+                //         '{a|'+name+'}{b|'+indicator.value+'万}'
+                //     ]
+                //   }else{
+                arr = [
+                  '{a|' + name + '}'
+                ]
+                //   }
 
-								return arr.join('\n')
-							},
-							textStyle: {
-								rich: { //根据文字的组设置格式
-									a: {
-										color: '#13ffdc',
-										fontSize: 12,
-										fontFamily: 'Source Han Sans CN',
-									},
-									// b:{
-									//     fontSize:14,
-									//     verticalAlign:'top',
-									//     width:57,
-									//     color:'#8E88FE',
-									//     fontWeight:600,
-									//     align:'center'
-									// },
-								}
+                return arr.join('\n')
+              },
+              textStyle: {
+                rich: { //根据文字的组设置格式
+                  a: {
+                    color: '#13ffdc',
+                    fontSize: 12,
+                    fontFamily: 'Source Han Sans CN',
+                  },
+                  // b:{
+                  //     fontSize:14,
+                  //     verticalAlign:'top',
+                  //     width:57,
+                  //     color:'#8E88FE',
+                  //     fontWeight:600,
+                  //     align:'center'
+                  // },
+                }
 
-							}
-						},
-						nameGap: 0,
-						indicator: indicator,
-						splitLine: {
-							show: false
+              }
+            },
+            nameGap: 0,
+            indicator: indicator,
+            splitLine: {
+              show: false
 
-						},
-						splitArea: {
-							show: false
-						},
-						axisLine: {
-							show: false
-						}
-					},
-					series: [{
-							// name: '家庭融合包',
-							type: 'radar',
-							data: [data],
-							// value:14,
-							label: {
-								show: true,
-								formatter: function(params) {
-									console.log(params)
-									return params.value ;
-								},
-								color: '#ffffff',
-								// position:[-20,-10,-10,-10],
-								align: 'right',
-								distance: 10,
-								align: 'right'
-							},
-							symbolSize: [6, 6],
-							lineStyle: { //边缘颜色
-								width: 0
-							},
-							itemStyle: {
-								borderWidth: 1,
-								color: '#fff',
-								borderColor: '#F2F063',
-							},
-							areaStyle: {
-								color: '#7D77F1',
-								opacity: 0.6
-							}
-						},
-						{
-							type: 'radar',
-							data: [
-								[1000, 1000, 1000, 1000, 1000, 1000],
-							],
-							symbol: 'none',
-							lineStyle: {
-								width: 0
-							},
-							itemStyle: {
-								color: '#4175F5'
-							},
+            },
+            splitArea: {
+              show: false
+            },
+            axisLine: {
+              show: false
+            }
+          },
+          series: [{
+            // name: '家庭融合包',
+            type: 'radar',
+            data: [data],
+            // value:14,
+            label: {
+              show: true,
+              formatter: function (params) {
+                return params.value;
+              },
+              color: '#ffffff',
+              // position:[-20,-10,-10,-10],
+              align: 'right',
+              distance: 10,
+              align: 'right'
+            },
+            symbolSize: [6, 6],
+            lineStyle: { //边缘颜色
+              width: 0
+            },
+            itemStyle: {
+              borderWidth: 1,
+              color: '#fff',
+              borderColor: '#F2F063',
+            },
+            areaStyle: {
+              color: '#7D77F1',
+              opacity: 0.6
+            }
+          },
+            {
+              type: 'radar',
+              data: [
+                [1000, 1000, 1000, 1000, 1000, 1000],
+              ],
+              symbol: 'none',
+              lineStyle: {
+                width: 0
+              },
+              itemStyle: {
+                color: '#4175F5'
+              },
 
-							areaStyle: {
-								color: '#4175F5',
-								opacity: 0.06
-							}
-						},
-						{
-							type: 'radar',
-							data: [
-								[900, 900, 900, 900, 900, 900],
-							],
+              areaStyle: {
+                color: '#4175F5',
+                opacity: 0.06
+              }
+            },
+            {
+              type: 'radar',
+              data: [
+                [900, 900, 900, 900, 900, 900],
+              ],
 
-							symbol: 'none',
-							lineStyle: {
-								width: 0
-							},
-							itemStyle: {
-								color: '#2C72C8'
-							},
+              symbol: 'none',
+              lineStyle: {
+                width: 0
+              },
+              itemStyle: {
+                color: '#2C72C8'
+              },
 
-							areaStyle: {
-								color: '#2C72C8',
-								opacity: 0.12
-							}
-						},
-						{
-							type: 'radar',
-							data: [
-								[800, 800, 800, 800, 800, 800]
-							],
+              areaStyle: {
+                color: '#2C72C8',
+                opacity: 0.12
+              }
+            },
+            {
+              type: 'radar',
+              data: [
+                [800, 800, 800, 800, 800, 800]
+              ],
 
-							symbol: 'none',
-							lineStyle: {
-								width: 0
-							},
-							itemStyle: {
-								color: '#4175F5'
-							},
+              symbol: 'none',
+              lineStyle: {
+                width: 0
+              },
+              itemStyle: {
+                color: '#4175F5'
+              },
 
-							areaStyle: {
-								color: '#4175F5',
-								opacity: 0.18
-							}
-						},
-						{
-							type: 'radar',
-							data: [
-								[700, 700, 700, 700, 700, 700]
-							],
+              areaStyle: {
+                color: '#4175F5',
+                opacity: 0.18
+              }
+            },
+            {
+              type: 'radar',
+              data: [
+                [700, 700, 700, 700, 700, 700]
+              ],
 
-							symbol: 'none',
-							lineStyle: {
-								width: 0
-							},
-							itemStyle: {
-								color: '#4175F5'
-							},
+              symbol: 'none',
+              lineStyle: {
+                width: 0
+              },
+              itemStyle: {
+                color: '#4175F5'
+              },
 
-							areaStyle: {
-								color: '#4175F5',
-								opacity: 0.19
-							}
-						},
-						{
-							type: 'radar',
-							data: [
-								[600, 600, 600, 600, 600, 600],
-							],
+              areaStyle: {
+                color: '#4175F5',
+                opacity: 0.19
+              }
+            },
+            {
+              type: 'radar',
+              data: [
+                [600, 600, 600, 600, 600, 600],
+              ],
 
-							symbol: 'none',
-							lineStyle: {
-								width: 0
-							},
-							itemStyle: {
-								color: '#4175F5'
-							},
+              symbol: 'none',
+              lineStyle: {
+                width: 0
+              },
+              itemStyle: {
+                color: '#4175F5'
+              },
 
-							areaStyle: {
-								color: '#4175F5',
-								opacity: 0.17
-							}
-						},
-						{
-							type: 'radar',
-							data: [
-								[500, 500, 500, 500, 500, 500],
-							],
-							symbol: 'none',
-							lineStyle: {
-								width: 0
-							},
-							itemStyle: {
-								color: '#4175F5'
-							},
+              areaStyle: {
+                color: '#4175F5',
+                opacity: 0.17
+              }
+            },
+            {
+              type: 'radar',
+              data: [
+                [500, 500, 500, 500, 500, 500],
+              ],
+              symbol: 'none',
+              lineStyle: {
+                width: 0
+              },
+              itemStyle: {
+                color: '#4175F5'
+              },
 
-							areaStyle: {
-								color: '#4175F5',
-								opacity: 0.16
-							}
-						},
-						{
-							type: 'radar',
-							data: [
-								[400, 400, 400, 400, 400, 400],
-							],
+              areaStyle: {
+                color: '#4175F5',
+                opacity: 0.16
+              }
+            },
+            {
+              type: 'radar',
+              data: [
+                [400, 400, 400, 400, 400, 400],
+              ],
 
-							symbol: 'none',
-							lineStyle: {
-								width: 0
-							},
-							itemStyle: {
-								color: '#4175F5'
-							},
+              symbol: 'none',
+              lineStyle: {
+                width: 0
+              },
+              itemStyle: {
+                color: '#4175F5'
+              },
 
-							areaStyle: {
-								color: '#4175F5',
-								opacity: 0.13
-							}
-						},
-					]
-				};
-				option && myChart.setOption(option);
-			},
+              areaStyle: {
+                color: '#4175F5',
+                opacity: 0.13
+              }
+            },
+          ]
+        };
+        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;
-	}
+  .chart-container {
+    width: 100%;
+    height: auto;
+    position: relative;
+    padding-bottom: 10px;
+    display: flex;
+  }
 </style>

+ 8 - 7
src/views/bigdata/chart-noBurningArea.vue

@@ -8,28 +8,29 @@
 
 <script>
   import * as echarts from 'echarts';
-  import {getJsqfb} from '@/api/bigdata'
+  import {getXfllfb} from '@/api/bigdata'
 
   export default {
     name: 'collection',
     data() {
       return {
         count: 0,
-        data_jsqfb:[]
+        data_xfllfb: []
       }
     },
     mounted() {
-      this.jsqfb()
+      this.xfllfb()
     },
 
     methods: {
-      jsqfb() {
+      xfllfb() {
         let that = this
-        getJsqfb().then(resp => {
-          that.data_jsqfb = resp.data
+        getXfllfb().then(resp => {
+          that.data_xfllfb = resp.data
           that.myEcharts()
         })
       },
+
       // 出处 http://192.144.199.210:8080/editor/index.html?chart_id=UDNqxg4NZdRORp80
       myEcharts() {
         let that = this
@@ -39,7 +40,7 @@
         var option;
         let bgColor = '#fff';
         let title = '总量';
-        let echartData = that.data_jsqfb
+        let echartData = that.data_xfllfb
 
         let formatNumber = function (num) {
           let reg = /(?=(\B)(\d{3})+$)/g;

+ 168 - 0
src/views/bigdata/chart-fireHydrant.vue

@@ -0,0 +1,168 @@
+<!-- **************************************NO.12 处理中心*************************************** -->
+<template>
+  <div class="chart-container">
+    <div id="processing" style="width: 100%; height:23vh;">
+    </div>
+  </div>
+</template>
+
+<script>
+  import * as echarts from 'echarts';
+  import {getXhs} from '@/api/bigdata'
+
+  export default {
+    name: 'processing',
+    data() {
+      return {
+        count: 0,
+        data_xhs:[],
+        data_xhx_name:[]
+      }
+    },
+    mounted() {
+      this.xhs()
+    },
+
+    methods: {
+      xhs() {
+        let that = this
+        getXhs().then(resp => {
+          that.data_xhs = resp.data
+          that.data_xhs.forEach(function (item,index) {
+            that.data_xhx_name.push(item.name)
+          })
+          that.myEcharts()
+        })
+      },
+      // 出处 http://192.144.199.210:8080/editor/index.html?chart_id=vNg2RQ3LrePk4CnZ
+      myEcharts() {
+        let that = this
+        var chartDom = document.getElementById('processing');
+        var myChart = echarts.init(chartDom);
+        var color = ['#0E7CE2', '#FF8352', '#E271DE', '#F8456B', '#00FFFF', '#4AEAB0'];
+        var option;
+        let dataList = that.data_xhs
+
+        option = {
+          grid: {
+            left: "16%", //距离左边的距离
+            right: "12%", //距离右边的距离
+            bottom: "15%", //距离下边的距离
+            top: "10%" //距离上边的距离
+          },
+          title: {
+            text: '',
+            left: 26,
+            top: 26,
+            textStyle: {
+              color: '#FFFFFF',
+              fontSize: 15,
+              fontWeight: 50000,
+              fontFamily: 'PingFang SC'
+            }
+          },
+          tooltip: {
+            trigger: "axis",
+            axisPointer: {
+              type: "shadow",
+              crossStyle: {
+                color: "#134d74"
+              }
+            },
+          },
+          xAxis: [{
+            type: "category",
+            data: that.data_xhx_name,
+            axisLabel: {
+              textStyle: {
+                color: "#42a7ff",
+                fontSize: 10,
+              }
+            },
+            axisLine: {
+              show: false
+            },
+            axisTick: {
+              show: false
+            }
+          }],
+          yAxis: [{
+            type: "value",
+            axisLabel: {
+              formatter: "{value}%",
+              textStyle: {
+                color: "#42a7ff",
+                fontSize: 10,
+              },
+            },
+            splitLine: {
+              lineStyle: {
+                color: "#1f3335"
+              }
+            },
+            axisLine: {
+              show: false
+            },
+            axisTick: {
+              show: false
+            }
+          },
+
+          ],
+          dataZoom: [{
+            type: 'inside',
+            start: 0,
+            end: dataList.length > 15 ? 35 : 100
+          }],
+          series: [{
+            name: "",
+            type: "bar",
+            data: dataList,
+            barGap: '-100%',
+            barCategoryGap: '80%',
+            itemStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                  offset: 0,
+                  color: 'rgba(27,168,240,1)'
+                },
+                  {
+                    offset: 1,
+                    color: 'rgba(32,40,95,0.3)'
+                  }
+                ])
+              },
+              emphasis: {
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                  offset: 0,
+                  color: 'rgba(27,168,240,1)'
+                },
+                  {
+                    offset: 1,
+                    color: 'rgba(27,168,240,0.3)'
+                  }
+                ])
+              }
+            },
+          },
+
+          ]
+        };
+        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>

+ 148 - 0
src/views/bigdata/chart-foamLiquid.vue

@@ -0,0 +1,148 @@
+<!-- **************************************NO.14 泡沫液*************************************** -->
+<template>
+  <div class="chart-container">
+    <div id="foam" style="width: 100%; height:23vh;">
+    </div>
+  </div>
+</template>
+
+<script>
+  import * as echarts from 'echarts';
+  import {getPmy} from '@/api/bigdata'
+
+  export default {
+    name: 'foam',
+    data() {
+      return {
+        count: 0,
+        data_pmy_name:[],
+        data_pmy_value:[]
+      }
+    },
+    mounted() {
+      this.pmy()
+
+    },
+
+    methods: {
+
+      pmy() {
+        let that = this
+        getPmy().then(resp => {
+          that.data_pmy_name = resp.data.name
+          that.data_pmy_value = resp.data.value
+          that.myEcharts()
+        })
+      },
+      // 出处 http://192.144.199.210:8080/editor/index.html?chart_id=daPJGrcYMpZanpxR
+      myEcharts() {
+        let that = this
+        var chartDom = document.getElementById('foam');
+        var myChart = echarts.init(chartDom);
+        var zdslColorList = ['#D0A00E', '#34DA62', '#00C0E9', '#0096F3', '#33CCFF'];
+        var option;
+        option = {
+          grid: {
+            top: '5%',
+            left: '10%',
+            right: '12%',
+            bottom: '0',
+            containLabel: true
+          },
+          tooltip: {},
+          xAxis: {
+            show: false,
+            type: 'value'
+          },
+          yAxis: [{
+            type: 'category',
+            inverse: true,
+            data: that.data_pmy_name,
+            axisLabel: {
+              show: true,
+              textStyle: {
+                color: '#ADD6FF',
+                fontSize: '12'
+              }
+            },
+            splitLine: {
+              show: false
+            },
+            axisTick: {
+              show: false
+            },
+            axisLine: {
+              show: false
+            },
+          },
+            {
+              splitLine: {
+                show: false
+              },
+              axisTick: {
+                show: false
+              },
+              axisLine: {
+                show: false
+              },
+              axisLabel: {
+                show: true,
+                textStyle: {
+                  color: '#ADD6FF',
+                  fontSize: '12'
+                }
+              },
+              data:that.data_pmy_value
+            }
+          ],
+
+          series: [{
+            name: "受理数", // bar图的外边框
+            type: "bar",
+            barWidth: "20%",
+            yAxisIndex: 0,
+            data: [500, 500, 500, 500, 500].map((item, i) => {
+              return {
+                value: item,
+                itemStyle: {
+                  color: "rgba(0,0,0,0)",
+                  barBorderColor: zdslColorList[i],
+                  borderWidth: 1,
+                  shadowColor: "#33CCFF",
+                  shadowBlur: 4
+                }
+              }
+            }),
+          },
+            {
+              name: "受理数", //这个是Bar图
+              type: 'bar',
+              yAxisIndex: 1,
+              barWidth: "10%",
+              data: [150, 298, 206, 75, 154]
+            }
+          ],
+          itemStyle: {
+            color: function (params) {
+              return zdslColorList[params.dataIndex]
+            }
+          }
+        }
+        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>

+ 50 - 40
src/views/bigdata/chart-gridStaff.vue

@@ -1,32 +1,42 @@
 <!-- **************************************NO.13 消火栓*************************************** -->
 <template>
-	<div class="chart-container">
-		<div id="hydrant" style="width: 100%; height:55vh;">
-		</div>
-	</div>
+  <div class="chart-container">
+    <div id="hydrant" style="width: 100%; height:55vh;">
+    </div>
+  </div>
 </template>
 
 <script>
-	import * as echarts from 'echarts';
-	export default {
-		name: 'hydrant',
-		data() {
-			return {
-				count: 0
-			}
-		},
-		mounted() {
-			this.myEcharts()
+  import * as echarts from 'echarts';
+  import {getZzz} from '@/api/bigdata'
 
-		},
+  export default {
+    name: 'hydrant',
+    data() {
+      return {
+        count: 0,
+        data_zzz: []
+      }
+    },
+    mounted() {
+      this.zzz()
+    },
 
-		methods: {
-			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=Ve9zCnhVwZvXTdD0
-			myEcharts() {
+    methods: {
+      zzz() {
+        let that = this
+        getZzz().then(resp => {
+          that.data_zzz = resp.data
+          that.myEcharts()
+        })
+      },
 
+      // 出处 http://192.144.199.210:8080/editor/index.html?chart_id=Ve9zCnhVwZvXTdD0
+      myEcharts() {
+        let that = this
+        var chartDom = document.getElementById('hydrant');
+        var myChart = echarts.init(chartDom);
 
-				var chartDom = document.getElementById('hydrant');
-				var myChart = echarts.init(chartDom);
         function rand(m, n) {
           if (!n) {
             return Math.floor(Math.random() * m);
@@ -55,17 +65,17 @@
           return val;
         }
 
-        var arr = [];
-        for (var i = 0; i < 10; i++) {
-          arr.push({
-            name: '类目名称' + rand(99),
-            amount: rand(99999) / 100 // 采购金额
-          });
-        }
+        var arr = that.data_zzz
+        // for (var i = 0; i < 10; i++) {
+        //   arr.push({
+        //     name: '类目名称' + rand(99),
+        //     amount: rand(99999) / 100 // 采购金额
+        //   });
+        // }
 
         var max = getMax(arr, 'amount'),
           angleAxisData = getValArr(arr, 'name');
-        $.each(arr, function(i, e) {
+        $.each(arr, function (i, e) {
           e.value = (e.amount / max * 100).toFixed(2);
         });
         var option = {
@@ -137,7 +147,7 @@
             type: 'bar',
             data: arr,
             itemStyle: {
-              color: function(params) {
+              color: function (params) {
                 var colorList = ['#5cc6ca', '#d87a7f', '#f5b97f', '#5ab1ef', '#b6a2de', '#8d98b3', '#e5d02d', '#97b552', '#956f6d', '#d0579c'];
                 return colorList[params.dataIndex];
               }
@@ -145,21 +155,21 @@
             coordinateSystem: 'polar',
           }]
         };
-				option && myChart.setOption(option);
-			},
+        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;
-	}
+  .chart-container {
+    width: 100%;
+    height: auto;
+    position: relative;
+    padding-bottom: 10px;
+    display: flex;
+  }
 </style>

+ 3 - 2
src/views/bigdata/chart-keyArea.vue

@@ -19,15 +19,16 @@
       }
     },
     mounted() {
-      this.zdqy()
+      this.zdqy();
     },
 
     methods: {
+
       zdqy() {
         let that = this
         getZdqy().then(resp => {
           that.data_zdqy = resp.data
-          that.myEcharts()
+          this.myEcharts()
         })
       },
       // 出处 http://192.144.199.210/forum.php?mod=viewthread&tid=6785&highlight=%E6%9F%B1%E7%8A%B6%E5%9B%BE

+ 0 - 179
src/views/bigdata/chart-keyEnterprises.vue

@@ -1,179 +0,0 @@
-<!-- **************************************NO.8 养殖场分布*************************************** -->
-<template>
-	<div class="chart-container">
-		<div id="farm" style="width: 100%; height:23vh;">
-		</div>
-	</div>
-</template>
-
-<script>
-	import * as echarts from 'echarts';
-  import {getZdqiye} from '@/api/bigdata'
-	export default {
-		name: 'farm',
-		data() {
-			return {
-				count: 0,
-        data_zdqiye_name:[],
-        data_zdqiye_value:[]
-			}
-		},
-		mounted() {
-			this.zdqiye()
-
-		},
-
-		methods: {
-
-		  zdqiye(){
-		    let that = this
-		    getZdqiye().then(resp =>{
-          that.data_zdqiye_name = resp.data.name
-          that.data_zdqiye_value = resp.data.value
-          that.myEcharts()
-        })
-      },
-			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=KH0XpN7nyKZZae11
-
-			myEcharts() {
-        let that = this
-				var chartDom = document.getElementById('farm');
-				var myChart = echarts.init(chartDom);
-				var color = ['#02CDFF', '#62FBE7', '#7930FF', '#ef5f9d', '#ecb935'];
-				var option;
-				var data =  that.data_zdqiye_value
-				option = {
-				    color: ["#41FF80"],
-				    title: {
-				        show: false
-				    },
-				    grid: {
-				        top: '15%',
-				        right: '12%',
-				        bottom: '22%',
-				        left: '15%'
-				    },
-				    tooltip: {
-				        show: false
-				    },
-				    xAxis: {
-				        data: that.data_zdqiye_name,
-				        axisLine: {
-				            show: true, //隐藏X轴轴线
-				            lineStyle: {
-				                color: '#2D455A'
-				            }
-				        },
-				        axisTick: {
-				            show: false //隐藏X轴刻度
-				        },
-				        axisLabel: {
-				            show: true,
-				            margin: 14,
-				            fontSize: 10,
-				            textStyle: {
-				                color: '#ffffff' //X轴文字颜色
-				            }
-				        }
-				    },
-				    yAxis: [{
-				        type: 'value',
-				        gridIndex: 0,
-				        interval: 25,
-				        // splitNumber: 4,
-				        splitLine: {
-				            show: true,
-				            lineStyle: {
-				                type: 'solid',
-				                color: '#325A9F',
-				                width: 1
-				            }
-				        },
-				        axisTick: {
-				            show: false
-				        },
-				        axisLine: {
-				            show: false
-				        },
-				        axisLabel: {
-				            show: true,
-				            formatter: '{value}',
-				            fontSize: 10,
-				            textStyle: {
-				                color: '#6ad8ff' //X轴文字颜色
-				            }
-				        }
-				    }],
-				    series: [{
-				            name: '养殖场分布',
-				            type: 'bar',
-				            barWidth: 8,
-				            itemStyle: {
-				                normal: {
-				                    label: {
-				                        show: true, //开启显示
-				                        position: 'top', //在上方显示
-				                        textStyle: { //数值样式
-				                            color: '#fff',
-				                        }
-				                    },
-				                    color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
-				                            offset: 0,
-				                            color: '#fffa55'
-				                        },
-				                        {
-				                            offset: 0.5,
-				                            color: '#55ff18'
-				                        },
-				                        {
-				                            offset: 1,
-				                            color: '#29eeff'
-				                        }
-				                    ])
-				                }
-				            },
-				            data:data,
-				            z: 10,
-				            zlevel: 0
-				        },
-				        {
-				            // 分隔
-				            type: 'pictorialBar',
-				            itemStyle: {
-				                normal: {
-				                    color: '#0F375F'
-				                }
-				            },
-				            symbolRepeat: 'fixed',
-				            symbolMargin: 2,
-				            symbol: 'rect',
-				            symbolClip: true,
-				            symbolSize: [8, 2],
-				            symbolPosition: 'start',
-				            symbolOffset: [0, -1],
-				            // symbolBoundingData: this.total,
-				            data:data,
-				            width: "100%",
-				            z: 0,
-				            zlevel: 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>

Plik diff jest za duży
+ 11 - 10
src/views/bigdata/chart-pollutionSource.vue


+ 179 - 0
src/views/bigdata/chart-waterIntake.vue

@@ -0,0 +1,179 @@
+<!-- **************************************NO.8 养殖场分布*************************************** -->
+<template>
+  <div class="chart-container">
+    <div id="farm" style="width: 100%; height:23vh;">
+    </div>
+  </div>
+</template>
+
+<script>
+  import * as echarts from 'echarts';
+  import {getQsk} from '@/api/bigdata'
+
+  export default {
+    name: 'farm',
+    data() {
+      return {
+        count: 0,
+        data_qsk_name:[],
+        data_qsk_value:[]
+      }
+    },
+    mounted() {
+      this.qsk()
+
+    },
+
+    methods: {
+      // 出处 http://192.144.199.210:8080/editor/index.html?chart_id=KH0XpN7nyKZZae11
+
+      qsk() {
+        let that = this
+        getQsk().then(resp => {
+          that.data_qsk_name = resp.data.name
+          that.data_qsk_value = resp.data.value
+          that.myEcharts()
+        })
+      },
+      myEcharts() {
+        let that = this
+        var chartDom = document.getElementById('farm');
+        var myChart = echarts.init(chartDom);
+        var color = ['#02CDFF', '#62FBE7', '#7930FF', '#ef5f9d', '#ecb935'];
+        var option;
+        var data = that.data_qsk_value
+        option = {
+          color: ["#41FF80"],
+          title: {
+            show: false
+          },
+          grid: {
+            top: '15%',
+            right: '12%',
+            bottom: '22%',
+            left: '15%'
+          },
+          tooltip: {
+            show: false
+          },
+          xAxis: {
+            data:that.data_qsk_name,
+            axisLine: {
+              show: true, //隐藏X轴轴线
+              lineStyle: {
+                color: '#2D455A'
+              }
+            },
+            axisTick: {
+              show: false //隐藏X轴刻度
+            },
+            axisLabel: {
+              show: true,
+              margin: 14,
+              fontSize: 10,
+              textStyle: {
+                color: '#ffffff' //X轴文字颜色
+              }
+            }
+          },
+          yAxis: [{
+            type: 'value',
+            gridIndex: 0,
+            interval: 25,
+            // splitNumber: 4,
+            splitLine: {
+              show: true,
+              lineStyle: {
+                type: 'solid',
+                color: '#325A9F',
+                width: 1
+              }
+            },
+            axisTick: {
+              show: false
+            },
+            axisLine: {
+              show: false
+            },
+            axisLabel: {
+              show: true,
+              formatter: '{value}',
+              fontSize: 10,
+              textStyle: {
+                color: '#6ad8ff' //X轴文字颜色
+              }
+            }
+          }],
+          series: [{
+            name: '养殖场分布',
+            type: 'bar',
+            barWidth: 8,
+            itemStyle: {
+              normal: {
+                label: {
+                  show: true, //开启显示
+                  position: 'top', //在上方显示
+                  textStyle: { //数值样式
+                    color: '#fff',
+                  }
+                },
+                color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
+                  offset: 0,
+                  color: '#fffa55'
+                },
+                  {
+                    offset: 0.5,
+                    color: '#55ff18'
+                  },
+                  {
+                    offset: 1,
+                    color: '#29eeff'
+                  }
+                ])
+              }
+            },
+            data: data,
+            z: 10,
+            zlevel: 0
+          },
+            {
+              // 分隔
+              type: 'pictorialBar',
+              itemStyle: {
+                normal: {
+                  color: '#0F375F'
+                }
+              },
+              symbolRepeat: 'fixed',
+              symbolMargin: 2,
+              symbol: 'rect',
+              symbolClip: true,
+              symbolSize: [8, 2],
+              symbolPosition: 'start',
+              symbolOffset: [0, -1],
+              // symbolBoundingData: this.total,
+              data: data,
+              width: "100%",
+              z: 0,
+              zlevel: 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>

+ 0 - 137
src/views/bigdata/chart-weatherStation.vue

@@ -1,137 +0,0 @@
-<!-- **************************************NO.14 泡沫液*************************************** -->
-<template>
-	<div class="chart-container">
-		<div id="foam" style="width: 100%; height:23vh;">
-		</div>
-	</div>
-</template>
-
-<script>
-	import * as echarts from 'echarts';
-	export default {
-		name: 'foam',
-		data() {
-			return {
-				count: 0
-			}
-		},
-		mounted() {
-			this.myEcharts()
-
-		},
-
-		methods: {
-			// 出处 http://192.144.199.210:8080/editor/index.html?chart_id=daPJGrcYMpZanpxR
-			myEcharts() {
-
-
-				var chartDom = document.getElementById('foam');
-				var myChart = echarts.init(chartDom);
-				var zdslColorList = ['#D0A00E', '#34DA62', '#00C0E9', '#0096F3', '#33CCFF'];
-				var option;
-				  option = {
-				      grid: {
-				          top: '5%',
-				          left: '10%',
-				          right: '12%',
-				          bottom: '0',
-				          containLabel: true
-				      },
-				      tooltip: {
-				      },
-				      xAxis: {
-				          show: false,
-				          type: 'value'
-				      },
-				      yAxis: [{
-				              type: 'category',
-							  inverse:true,
-				              data: ['双辽市', '梨树县', '伊通县', '铁东区', '铁西区'],
-				              axisLabel: {
-				                  show: true,
-				                  textStyle: {
-				                      color: '#ADD6FF',
-				                      fontSize: '12'
-				                  }
-				              },
-				              splitLine: {
-				                  show: false
-				              },
-				              axisTick: {
-				                  show: false
-				              },
-				              axisLine: {
-				                  show: false
-				              },
-				          },
-				          {
-				              splitLine: {
-				                  show: false
-				              },
-				              axisTick: {
-				                  show: false
-				              },
-				              axisLine: {
-				                  show: false
-				              },
-				              axisLabel: {
-				                  show: true,
-				                  textStyle: {
-				                      color: '#ADD6FF',
-				                      fontSize: '12'
-				                  }
-				              },
-				              data: [150, 298, 206, 75, 154]
-				          }
-				      ],
-				 
-				      series: [{
-				              name: "受理数", // bar图的外边框
-				              type: "bar",
-				              barWidth: "20%",
-				              yAxisIndex: 0,
-				              data: [500, 500, 500, 500, 500].map((item, i) => {
-				                  return {
-				                      value: item,
-				                      itemStyle: {
-				                          color: "rgba(0,0,0,0)",
-				                          barBorderColor: zdslColorList[i],
-				                          borderWidth: 1,
-				                          shadowColor: "#33CCFF",
-				                          shadowBlur: 4
-				                      }
-				                  }
-				              }),
-				          },
-				          {
-				              name: "受理数", //这个是Bar图
-				              type: 'bar',
-				              yAxisIndex: 1,
-				              barWidth: "10%",
-				              data: [150, 298, 206, 75, 154]
-				          }
-				      ],
-				      itemStyle: {
-				          color: function(params) {
-				              return zdslColorList[params.dataIndex]
-				          }
-				      }
-				  }
-				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>

+ 2 - 4
src/views/bigdata/chart-weatherTrends.vue

@@ -35,12 +35,11 @@
           that.myEcharts()
         })
       },
-
       myEcharts() {
         let that = this
         var chartDom = document.getElementById('farmtype');
         var myChart = echarts.init(chartDom);
-        var xData =that.data_tqqs_day;
+        var xData = that.data_tqqs_day
         var option;
         option = {
           backgroundColor: '#232d36',
@@ -210,8 +209,7 @@
           ]
         };
         option && myChart.setOption(option);
-      }
-      ,
+      },
 
     },
 

+ 7 - 17
src/views/bigdata/tabbar.vue

@@ -8,27 +8,18 @@
         </div>
       </el-col>
     </el-row>
-    <el-row :gutter="20">
+    <!--<el-row :gutter="20">
       <el-col :span="4" v-for="(item,index) in data_zhxx_event" :key="index">
         <div class="list-content">
           <span>{{item.value}}</span>
           <h5>{{item.name}}</h5>
         </div>
       </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :span="4">
-        <div class="list-content">
-          <span>{{data_zhxx_device}}</span>
-          <h5>设备</h5>
-        </div>
-      </el-col>
-    </el-row>
+    </el-row>-->
   </div>
 </template>
 
 <script>
-
   import {getZhxx} from '@/api/bigdata'
 
   export default {
@@ -36,7 +27,6 @@
       return {
         data_zhxx_data: [],
         data_zhxx_event: [],
-        data_zhxx_device: 0,
         //tab默认停留项el-tab-pane > name = "?"
         activeName: 'sp',
         //地区分类tabtitle
@@ -145,20 +135,20 @@
         ]
       };
     },
+
     mounted() {
-      this.zhxx(null);
+      this.zhxx()
     },
     methods: {
+
       zhxx() {
         let that = this
         getZhxx().then(resp => {
-          console.log(resp)
-          that.data_zhxx_device = resp.data.device
-          that.data_zhxx_data = resp.data.data
-          that.data_zhxx_event = resp.data.event
+          that.data_zhxx_data = [...resp.data.event, ...resp.data.data]
         })
       },
 
+
       handleClick(tab, event) {
         console.log(tab, event);
       }

+ 157 - 48
src/views/datacenter.vue

@@ -8,7 +8,7 @@
       <!-- 左侧 -->
       <div class="leftbar w-10" ref="left">
         <div class="forthis">
-          <dv-border-box-13 :color="['#0e7957', '#0da24c']" backgroundColor="#09140e" style="padding-bottom: 1rem;">
+          <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
             <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
             <div class="i-list-con h-78">
               <div class="d-l-con-icon">
@@ -34,7 +34,7 @@
       <!-- 右侧 -->
       <div class="rightbar" ref="right">
         <div class="forthis">
-          <dv-border-box-13 :color="['#0e7957', '#0da24c']" backgroundColor="#09140e" style="padding-bottom: 1rem;">
+          <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
             <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
             <div class="this-title">
               <span>数据分布</span>
@@ -117,7 +117,6 @@ export default {
       //右侧资源
       deptGroupList: [],
       source: [],
-
     }
   },
 
@@ -255,7 +254,6 @@ export default {
       })
 
     },
-
     // 弹层方法
     showEventInfo1() {
       this.eventInfoVisible1 = true
@@ -271,9 +269,8 @@ export default {
         //截取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))
+            .icon.split('_').slice(-1))
         })
-        console.log(that.resourcesList)
 
       })
     },
@@ -303,8 +300,8 @@ export default {
               keepBindPopup: false,
               isAggregation: false
             }
-            if (resourceTable == 'centerdata_t_environment_key_enterprise') { //重点企业
-              markersMap.icon = 'sj-icon-map-centerdata-t-environment-key-enterprise'
+            if (resourceTable == 'centerdata_t_firecontrol_basic_linkage_force') { //基本联动力量
+              markersMap.icon = 'sj-icon-map-centerdata-t-firecontrol-basic-linkage-force'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -319,37 +316,48 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>企业名称:' + res.data.resourceList[i].name +
+                '                  <h4>单位名称:' + res.data.resourceList[i].company +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
+                '</div>'
+            } else if (resourceTable == 'centerdata_t_firecontrol_fire_force') { //消防力量
+              markersMap.icon = 'sj-icon-map-centerdata-t-firecontrol-fire-force'
+              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].address +
-                '</h4>' +
+                '                  <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].legalPerson +
-                '</h4>' +
+                '                  <h4>地址:' + res.data.resourceList[i].address + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>联系电话:' + res.data.resourceList[i].contactsPhone +
-                '</h4>' +
+                '                  <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].contact + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_environment_prohibition_area') { //禁烧区
-              markersMap.icon = 'sj-icon-map-centerdata-t-environment-prohibition-area'
+            } else if (resourceTable == 'centerdata_t_firecontrol_foam_liquid') { //泡沫液
+              markersMap.icon = 'sj-icon-map-centerdata-t-firecontrol-foam-liquid'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -364,33 +372,64 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>禁烧区名称:' + res.data.resourceList[i].name + '</h4>' +
+                '                  <h4>单位名称:' + res.data.resourceList[i].company +
+                '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>地址:' + res.data.resourceList[i].address + '</h4>' +
+                '                  <h4>联系人:' + res.data.resourceList[i].contacts +
+                '</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>'
+            } else if (resourceTable == 'centerdata_t_firecontrol_fulltime_station') { //专职站
+              markersMap.icon = 'sj-icon-map-centerdata-t-firecontrol-fulltime-station'
+              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].principal + '</h4>' +
+                '                  <h4>地址:' + res.data.resourceList[i].address +
+                '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>联系电话:' + res.data.resourceList[i].contactsPhone + '</h4>' +
+                '                  <h4>负责人:' + res.data.resourceList[i].principal + '</h4>' +
                 '                </div>' +
                 '                </div>' +
-                '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_environment_source_pollution') { //污染源
-              markersMap.icon = 'sj-icon-map-centerdata-t-environment-source-pollution'
+                '                </span>' +
+                '<span>' +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                '                  <h4>电话:' + res.data.resourceList[i].contactsPhone + '</h4>' +
+                '                </div>' +
+                '                </div>' +
+                '                </span>' +
+                '</div>'
+            } else if (resourceTable == 'centerdata_t_firecontrol_other_linkage_force') { //其他联动力量
+              markersMap.icon = 'sj-icon-map-centerdata-t-firecontrol-other-linkage-force'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -405,7 +444,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>污染源名称:' + res.data.resourceList[i].name +
+                '                  <h4>单位名称:' + res.data.resourceList[i].company +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -413,13 +452,27 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>地址:' + res.data.resourceList[i].address +
+                '                  <h4>单位电话:' + res.data.resourceList[i].companyPhone +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '<span>' +
-                '</div>'
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                '                  <h4>联系人:' + res.data.resourceList[i].contacts +
+                '</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>'
             }
             that.markersList.push(markersMap)
           }
@@ -446,8 +499,8 @@ export default {
               keepBindPopup: false,
               isAggregation: false
             }
-            if (that.resourceTable == 'centerdata_t_environment_key_enterprise') { //重点企业
-              markersMap.icon = 'sj-icon-map-centerdata-t-environment-key-enterprise'
+            if (that.resourceTable == 'centerdata_t_firecontrol_basic_linkage_force') { //基本联动力量
+              markersMap.icon = 'sj-icon-map-centerdata-t-firecontrol-basic-linkage-force'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -462,37 +515,48 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>企业名称:' + res.data.resourceList[i].name +
+                '                  <h4>单位名称:' + res.data.resourceList[i].company +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
+                '</div>'
+            } else if (that.resourceTable == 'centerdata_t_firecontrol_fire_force') { //消防力量
+              markersMap.icon = 'sj-icon-map-centerdata-t-firecontrol-fire-force'
+              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].address +
-                '</h4>' +
+                '                  <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].legalPerson +
-                '</h4>' +
+                '                  <h4>地址:' + res.data.resourceList[i].address + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>联系电话:' + res.data.resourceList[i].contactsPhone +
-                '</h4>' +
+                '                  <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].contact + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span></div>'
-            } else if (that.resourceTable == 'centerdata_t_environment_prohibition_area') { //禁烧区
-              markersMap.icon = 'sj-icon-map-centerdata-t-environment-prohibition-area'
+            } else if (that.resourceTable == 'centerdata_t_firecontrol_foam_liquid') { //泡沫液
+              markersMap.icon = 'sj-icon-map-centerdata-t-firecontrol-foam-liquid'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -507,33 +571,64 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>禁烧区名称:' + res.data.resourceList[i].name + '</h4>' +
+                '                  <h4>单位名称:' + res.data.resourceList[i].company +
+                '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>地址:' + res.data.resourceList[i].address + '</h4>' +
+                '                  <h4>联系人:' + res.data.resourceList[i].contacts +
+                '</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>'
+            } else if (that.resourceTable == 'centerdata_t_firecontrol_fulltime_station') { //专职站
+              markersMap.icon = 'sj-icon-map-centerdata-t-firecontrol-fulltime-station'
+              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].principal + '</h4>' +
+                '                  <h4>地址:' + res.data.resourceList[i].address +
+                '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>联系电话:' + res.data.resourceList[i].contactsPhone + '</h4>' +
+                '                  <h4>负责人:' + res.data.resourceList[i].principal + '</h4>' +
                 '                </div>' +
                 '                </div>' +
-                '                </span></div>'
-            } else if (that.resourceTable == 'centerdata_t_environment_source_pollution') { //污染源
-              markersMap.icon = 'sj-icon-map-centerdata-t-environment-source-pollution'
+                '                </span>' +
+                '<span>' +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                '                  <h4>电话:' + res.data.resourceList[i].contactsPhone + '</h4>' +
+                '                </div>' +
+                '                </div>' +
+                '                </span>' +
+                '</div>'
+            } else if (that.resourceTable == 'centerdata_t_firecontrol_other_linkage_force') { //其他联动力量
+              markersMap.icon = 'sj-icon-map-centerdata-t-firecontrol-other-linkage-force'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -548,7 +643,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>污染源名称:' + res.data.resourceList[i].name +
+                '                  <h4>单位名称:' + res.data.resourceList[i].company +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -556,13 +651,27 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>地址:' + res.data.resourceList[i].address +
+                '                  <h4>单位电话:' + res.data.resourceList[i].companyPhone +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '<span>' +
-                '</div>'
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                '                  <h4>联系人:' + res.data.resourceList[i].contacts +
+                '</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>'
             }
             that.markersList.push(markersMap)
           }

+ 1 - 1
src/views/eventLogUpload.vue

@@ -125,7 +125,7 @@ export default {
       let fileUrl=[]
       if(this.fileList!=null&&this.fileList.length>0){
         for (let i = 0; i < this.fileList.length; i++) {
-          let file={attachPath:this.fileList[i].url,fileName:this.fileList[i].webName,busIndx:  "bus_indx_forest",busSource: "PC"}
+          let file={attachPath:this.fileList[i].url,fileName:this.fileList[i].webName,busIndx: "bus_indx_forest",busSource: "PC"}
           fileUrl.push(file)
         }
       }

Plik diff jest za duży
+ 337 - 253
src/views/eventdetailsdialog.vue


+ 15 - 18
src/views/forest.vue

@@ -9,7 +9,7 @@
       <div class="leftbar" ref="left">
         <!-- 1 基本情况 -->
         <div class="forthis">
-          <dv-border-box-13 :color="['#0e7957', '#0da24c']" backgroundColor="#09140e" style="padding-bottom: 1rem;">
+          <dv-border-box-13 backgroundColor="rgba(7, 19, 20, .90)" style="padding-bottom: 1rem;" :color="['#0c4b53', '#18caca']">
             <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
             <div class="this-title">
               <span>基本情况</span>
@@ -24,9 +24,9 @@
             </div>
           </dv-border-box-13>
         </div>
-        <!-- 2 事件统计11-->
+        <!-- 2 事件统计-->
         <div class="forthis">
-          <dv-border-box-13 :color="['#0e7957', '#0da24c']" backgroundColor="#09140e" style="padding-bottom: 1rem;">
+          <dv-border-box-13 backgroundColor="rgba(7, 19, 20, .90)" style="padding-bottom: 1rem;" :color="['#0c4b53', '#18caca']">
             <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
             <div class="i-list-con h-29-5">
               <div class="d-l-con">
@@ -81,7 +81,7 @@
         </div>
         <!-- 3 组织机构 -->
         <div class="forthis">
-          <dv-border-box-13 :color="['#0e7957', '#0da24c']" backgroundColor="#09140e" style="padding-bottom: 1rem;">
+          <dv-border-box-13 backgroundColor="rgba(7, 19, 20, .90)" style="padding-bottom: 1rem;" :color="['#0c4b53', '#18caca']">
             <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
             <div class="i-list-con h-27" style="padding-left: 1rem;">
               <el-collapse accordion>
@@ -112,7 +112,7 @@
         <div class="right-item1">
           <!-- 天气 -->
           <div class="forthis">
-            <dv-border-box-13 :color="['#0e7957', '#0da24c']" backgroundColor="#09140e">
+             <dv-border-box-13 backgroundColor="rgba(7, 19, 20, .90)"  :color="['#0c4b53', '#18caca']">
               <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
               <div class="i-list-con small-bottom-margin h-18">
                 <el-row :gutter="20" v-if="todatWeather">
@@ -236,7 +236,7 @@
           </div>
           <!-- 曝光台 -->
           <div class="forthis">
-            <dv-border-box-13 :color="['#0e7957', '#0da24c']" backgroundColor="#09140e" style="padding-bottom: 1rem;">
+            <dv-border-box-13 backgroundColor="rgba(7, 19, 20, .90)" style="padding-bottom: 1rem;" :color="['#0c4b53', '#18caca']">
               <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
               <div class="this-title">
                 <span>曝光台</span>
@@ -262,7 +262,7 @@
           </div>
           <!-- 事件列表 -->
           <div class="forthis">
-            <dv-border-box-13 :color="['#0e7957', '#0da24c']" backgroundColor="#09140e" style="padding-bottom: 1rem;">
+            <dv-border-box-13 backgroundColor="rgba(7, 19, 20, .90)" style="padding-bottom: 1rem;" :color="['#0c4b53', '#18caca']">
               <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
               <div class="this-title">
                 <span>事件列表</span>
@@ -279,9 +279,9 @@
                 <div class="d-l-con padding-box nowrap" v-for="(item,index) in eventList"
                      @click="dropLocation(item.latitude,item.longitude)" data-html2canvas-ignore>
                   <div class="bgt-img">
-                    <img v-if="item.picturePath!=null&&item.picturePath!=''&& item.pictureType=='image'"
+                    <img v-if="item.picturePath!=null&&item.picturePath!=''&& item.pictureType == 'image'"
                          :src="item.picturePath"
-                         style="width: 93px;height: 64px" loading="lazy"/>
+                         style="width: 93px;height: 64px"  loading="lazy"/>
                     <img v-else src="../assets/images/integrated/event-img-sub.png" style="width: 93px;height: 64px"/>
                   </div>
                   <div class="bgt-info">
@@ -343,7 +343,7 @@
         <div class="right-item2">
           <!-- 日历 -->
           <div class="forthis">
-            <dv-border-box-13 :color="['#0e7957', '#0da24c']" backgroundColor="#09140e" style="padding-bottom: 1rem;">
+            <dv-border-box-13 backgroundColor="rgba(7, 19, 20, .90)" style="padding-bottom: 1rem;" :color="['#0c4b53', '#18caca']">
               <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
               <div class="i-list-con small-bottom-margin h-30">
                 <dateChoose @selectDay="selectDay"></dateChoose>
@@ -352,7 +352,7 @@
           </div>
           <!-- 事件分类 -->
           <div class="forthis">
-            <dv-border-box-13 :color="['#0e7957', '#0da24c']" backgroundColor="#09140e" style="padding-bottom: 1rem;">
+            <dv-border-box-13 backgroundColor="rgba(7, 19, 20, .90)" style="padding-bottom: 1rem;" :color="['#0c4b53', '#18caca']">
               <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
               <div class="this-title">
                 <span>事件分类</span>
@@ -366,7 +366,7 @@
           </div>
           <!-- 上报排行 -->
           <div class="forthis">
-            <dv-border-box-13 :color="['#0e7957', '#0da24c']" backgroundColor="#09140e" style="padding-bottom: 1rem;">
+            <dv-border-box-13 backgroundColor="rgba(7, 19, 20, .90)" style="padding-bottom: 1rem;" :color="['#0c4b53', '#18caca']">
               <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
               <div class="this-title">
                 <span>上报排行</span>
@@ -477,7 +477,6 @@ export default {
         this.getExposureStage(this.getCurrentDataStr(),true);
       }
     }, 120000)
-
   },
   data() {
     return {
@@ -625,7 +624,7 @@ export default {
             '                </div>' +
             '                </div>' +
             '                </span>'
-          if (this.eventList[i].picturePath != null && this.eventList[i].picturePath != '' && this.eventList[i].pictureType=='image') {
+          if (this.eventList[i].pictureType == 'image' && this.eventList[i].picturePath != null && this.eventList[i].picturePath != '') {
             markersMap.bindPopupHtml += '<span>' +
               '                  <div class="d-l-con">' +
               '                  <div class="d-l-l-text">' +
@@ -950,12 +949,10 @@ export default {
             if (this.eventList[i].eventStatusValue == 'forest_event_status_1' && this.eventList[i].urgeCount == 0) {
               markersMap.click = 'showEventDialog'
               markersMap.icon = 'sj-icon-map-xinshangbao'
-              markersMap.isAggregation = true
             }
             if (this.eventList[i].eventStatusValue == 'forest_event_status_1' && this.eventList[i].urgeCount > 0) {
               markersMap.click = 'showEventDialog'
               markersMap.icon = 'sj-icon-map-cuiban'
-              markersMap.isAggregation = true
             } else if (this.eventList[i].eventStatusValue == 'forest_event_status_2') {
               markersMap.click = 'showEventDialog'
               markersMap.icon = 'sj-icon-map-qianshou'
@@ -967,7 +964,6 @@ export default {
             } else if (this.eventList[i].eventStatusValue == 'forest_event_status_6') {
               markersMap.click = 'showEventDialog'
               markersMap.icon = 'sj-icon-map-guidang'
-              markersMap.isAggregation = true
             }
             markersMap.parameter = this.eventList[i].eventCode
             markersMap.lng = this.eventList[i].longitude
@@ -994,7 +990,7 @@ export default {
               '                </div>' +
               '                </div>' +
               '                </span>'
-            if (this.eventList[i].picturePath != null && this.eventList[i].picturePath != '' && this.eventList[i].pictureType=='image') {
+            if (this.eventList[i].pictureType == 'image' && this.eventList[i].picturePath != null && this.eventList[i].picturePath != '') {
               markersMap.bindPopupHtml += '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
@@ -1143,6 +1139,7 @@ export default {
         this.$refs.bottomMenu.showChild = false
         this.$refs.bottomMenu.showBanChild = false
         this.$refs.bottomMenu.showChangChild = false
+        // window.open('http://192.168.0.200/');
       } else if (click == 'forestban') {
         this.$refs.supermap.isEditableLayers = false
         this.$refs.bottomMenu.showChild = false

+ 6 - 8
src/views/monitor.vue

@@ -8,7 +8,7 @@
       <!-- 左侧 -->
       <div class="leftbar" ref="left">
         <div class="forthis">
-          <dv-border-box-13 :color="['#0e7957', '#0da24c']" backgroundColor="#09140e" style="padding-bottom: 1rem;">
+          <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
             <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
             <div class="this-title">
               <span>事态感知</span>
@@ -92,7 +92,7 @@
           </dv-border-box-13>
         </div>
         <div class="forthis">
-          <dv-border-box-13 :color="['#0e7957', '#0da24c']" backgroundColor="#09140e" style="padding-bottom: 1rem;">
+          <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
             <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
             <div class="this-title">
               <span>重点区域</span>
@@ -110,7 +110,6 @@
         </div>
       </div>
       <vBottomMenu ref="bottomMenu"></vBottomMenu>
-
     </div>
     <eventLocation ref="eventLocation"></eventLocation>
     <TVWall ref="TVWall"></TVWall>
@@ -412,7 +411,7 @@ export default {
       //获取左侧动态感知设备
       let that = this
       selectDeviceType().then(res => {
-        that.cameraMarkersList=[]
+        that.cameraMarkersList = []
         that.visuForestCloudMapDeviceBOList = res.data.visuForestCloudMapDeviceBOList
 
         that.region = res.data.visuForestCloudTodaySjfbBOList
@@ -451,7 +450,6 @@ export default {
             markersMap.lng = res.data.visuForestCloudCameraBOList[i].longitude
             markersMap.lat = res.data.visuForestCloudCameraBOList[i].latitude
             markersMap.radius = res.data.visuForestCloudCameraBOList[i].cameraRadius
-
             markersMap.bindPopupHtml = '<div class="map-tip">' +
               '<span>' +
               '                  <div class="d-l-con">' +
@@ -582,7 +580,7 @@ export default {
               '                </div>' +
               '                </span>' +
               '</div>'
-            that.cameraMarkersList.push(markersMap)
+            this.cameraMarkersList.push(markersMap)
             //   cameraAccount: "1"
             // cameraCode: "1000010"
             // cameraFactory: "2"
@@ -721,7 +719,7 @@ export default {
         cbConnectClose: function(bNormalClose) {
           // 异常断开:bNormalClose = false
           // JS_Disconnect正常断开:bNormalClose = true
-          console.log('cbConnectClose')
+
           that.oWebControl = null
         }
       })
@@ -799,7 +797,7 @@ export default {
           keyLength: 1024
         })
       }).then(function(oData) {
-        console.log(oData)
+
         if (oData.responseMsg.data) {
           that.pubKey = oData.responseMsg.data
           callback()

+ 23 - 9
src/views/system/login.vue

@@ -48,10 +48,10 @@
 	import StarBackground from '@/components/star'
 	import {
 		getCodeImg,fontConfig,getSecretKey
-  } from '@/api/login'
-  import {
+	} from '@/api/login'
+	import {
     encryptedData
-  } from '@/api/encrypt'
+	} from '@/api/encrypt'
 	import Cookies from 'js-cookie'
 	import {
 		encrypt,
@@ -69,9 +69,9 @@
 		data() {
 			return {
         backgroudImg:'', //背景图片
-        systemTitle:{
-          title:'通榆县乡村振兴综合监管平台',  //标题
-          subTitle:'数字环保'  ,//副标题
+        systemTitle: {
+          title: '',  //标题
+          subTitle: '',//副标题  数字应急
         },
 				codeUrl: '',
 				loginForm: {
@@ -117,7 +117,7 @@
 		created() {
 			this.getCode()
 			this.getCookie()
-      this.fontConfig();
+      this.fontConfig()
 		},
 		methods: {
       fontConfig(){
@@ -127,7 +127,8 @@
           this.backgroudImg = res.data.picUrl;
         })
       },
-			getCode() {
+
+      getCode() {
 				getCodeImg().then(res => {
 					this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff
 					if (this.captchaOnOff) {
@@ -167,6 +168,18 @@
 							Cookies.remove('password')
 							Cookies.remove('rememberMe')
 						}
+						// this.$store.dispatch('Login', this.loginForm).then(() => {
+						// 	console.log('!@!@!@', this.redirect)
+						// 	this.$router.push({
+						// 		//path: this.redirect || '/'
+						// 		path: '/'
+						// 	}).catch(() => {})
+						// }).catch(() => {
+						// 	this.loading = false
+						// 	if (this.captchaOnOff) {
+						// 		this.getCode()
+						// 	}
+						// })
             //登录前先获取密码加密传输的公钥,对密码进行加密
             getSecretKey().then(res => {
               const encryptedPassword = encryptedData(res.data,this.loginForm.password);
@@ -183,7 +196,8 @@
                 }
               })
             })
-					}
+
+          }
 				})
 			}
 		}

+ 1 - 1
src/views/system/register.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">通榆县乡村振兴监管平台</h3>
+      <h3 class="title">四平市态势感知平台</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />

+ 8 - 8
vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '通榆县乡村振兴监管平台' // 网页标题
+const name = process.env.VUE_APP_TITLE || '四平市态势感知平台' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
@@ -34,11 +34,11 @@ module.exports = {
     host: '0.0.0.0',
     port: port,
     open: true,
-
-    // https:{
-    //   cert : fs.readFileSync(ssl_path.join(__dirname,'src/ssl/supermap.pem')),
-    //   key : fs.readFileSync(ssl_path.join(__dirname,'src/ssl/supermap.key'))
+    // https: {
+    //   cert: fs.readFileSync(ssl_path.join(__dirname, 'src/ssl/supermap.pem')),
+    //   key: fs.readFileSync(ssl_path.join(__dirname, 'src/ssl/supermap.key'))
     // },
+
     /**
      * 昨夜星辰昨夜风
      * 画廊西畔桂堂东
@@ -48,12 +48,12 @@ module.exports = {
      * 寻找附件-有缘人@阿弥陀佛
      * @param attach_ids
      */
+
     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://36.49.108.22:3031`,
-        // target: `http://192.168.1.119:3031`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
@@ -65,7 +65,7 @@ module.exports = {
   css: {
     loaderOptions: {
       sass: {
-        sassOptions: { outputStyle: 'expanded' }
+        sassOptions: {outputStyle: 'expanded'}
       }
     }
   },