Sfoglia il codice sorgente

资源前端页面地图中间图标

lchao 2 anni fa
parent
commit
70dbe5d892
2 ha cambiato i file con 34 aggiunte e 155 eliminazioni
  1. 24 150
      src/views/datacenter.vue
  2. 10 5
      vue.config.js

+ 24 - 150
src/views/datacenter.vue

@@ -332,7 +332,7 @@ export default {
               keepBindPopup: false,
               isAggregation: false
             }
-            if (resourceTable == 'centerdata_t_forest_weatherstation') { //气象站
+            if (resourceTable == 'centerdata_t_resources_illegal_construction') { //违建信息
               markersMap.icon = 'sj-icon-map-centerdata-t-forest-weatherstation'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
@@ -348,7 +348,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>地址:' + res.data.resourceList[i].weatherstationAddress +
+                '                  <h4>名称:' + res.data.resourceList[i].name +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -356,7 +356,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].weatherstationPerson +
+                '                  <h4>违建处理负责人:' + res.data.resourceList[i].person +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -364,12 +364,12 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].weatherstationTel +
+                '                  <h4>联系方式:' + res.data.resourceList[i].phone +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_farm') { //林场
+            } else if (resourceTable == 'centerdata_t_resources_deposit') { //矿臧资源
               markersMap.icon = 'sj-icon-map-centerdata-t-forest-farm'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
@@ -385,25 +385,25 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>林场名称:' + res.data.resourceList[i].farmName + '</h4>' +
+                '                  <h4>名称:' + res.data.resourceList[i].name + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].farmPerson + '</h4>' +
+                '                  <h4>联系人:' + res.data.resourceList[i].person + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].farmTel + '</h4>' +
+                '                  <h4>电话:' + res.data.resourceList[i].phone + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_landing') { //起降点
+            } else if (resourceTable == 'centerdata_t_resources_forest') { //森林资源管理信息
               markersMap.icon = 'sj-icon-map-centerdata-t-forest-landing'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
@@ -419,7 +419,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>起降点名称:' + res.data.resourceList[i].landingName +
+                '                  <h4>名称:' + res.data.resourceList[i].name +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -427,7 +427,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].landingPerson +
+                '                  <h4>占地范围:' + res.data.resourceList[i].zdfw +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -435,11 +435,11 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].landingTel + '</h4>' +
+                '                  <h4>占地面积(万公顷):' + res.data.resourceList[i].landArea + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_channel') { //水源渠道
+            } else if (resourceTable == 'centerdata_t_resources_geologic_hazard') { //地质灾害易发区
               markersMap.icon = 'sj-icon-map-centerdata-t-forest-channel'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
@@ -455,7 +455,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>渠道名称:' + res.data.resourceList[i].channelName +
+                '                  <h4>名称:' + res.data.resourceList[i].name +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -463,7 +463,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].channelPerson +
+                '                  <h4>联系人:' + res.data.resourceList[i].person +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -471,11 +471,11 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].channelTel + '</h4>' +
+                '                  <h4>电话:' + res.data.resourceList[i].phone + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_checkpoint') { //防火检查站
+            } else if (resourceTable == 'centerdata_t_resources_hydroenergy') { //水能资源
               markersMap.icon = 'sj-icon-map-centerdata-t-forest-checkpoint'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
@@ -491,7 +491,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>检查站名称:' + res.data.resourceList[i].checkpointName +
+                '                  <h4>名称:' + res.data.resourceList[i].name +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -499,7 +499,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>地址:' + res.data.resourceList[i].checkpointAddress +
+                '                  <h4>联系人:' + res.data.resourceList[i].person +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -507,7 +507,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].checkpointPerson +
+                '                  <h4>位置:' + res.data.resourceList[i].address +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -515,12 +515,12 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].checkpointTel +
+                '                  <h4>电话:' + res.data.resourceList[i].phone +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_waterintake') { //取水口
+            } else if (resourceTable == 'centerdata_t_resources_land') { //土地资源管理信息
               markersMap.icon = 'sj-icon-map-centerdata-t-forest-waterintake'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
@@ -536,15 +536,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>取水口名称:' + res.data.resourceList[i].waterintakeName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].waterintakePerson +
+                '                  <h4>名称:' + res.data.resourceList[i].name +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -552,129 +544,11 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].waterintakeTel +
+                '                  <h4>占地面积(万公顷):' + res.data.resourceList[i].landArea +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_watercrane') { //水鹤
-              markersMap.icon = 'sj-icon-map-centerdata-t-forest-watercrane'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度:' + res.data.resourceList[i].longitude + ',' + res
-                  .data.resourceList[i].latitude + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>水鹤名称:' + res.data.resourceList[i].watercraneName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].watercranePerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].watercraneTel +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_firehydrant') { //消火栓
-              markersMap.icon = 'sj-icon-map-centerdata-t-forest-firehydrant'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度:' + res.data.resourceList[i].longitude + ',' + res
-                  .data.resourceList[i].latitude + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>消火栓名称:' + res.data.resourceList[i].firehydrantName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>地址:' + res.data.resourceList[i].firehydrantAddress +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].firehydrantPerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].firehydrantTel +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (resourceTable == 'centerdata_t_forest_fireteam') { //森林防火队
-              markersMap.icon = 'sj-icon-map-centerdata-t-forest-fireteam'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度:' + res.data.resourceList[i].longitude + ',' + res
-                  .data.resourceList[i].latitude + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>森林防火队名称:' + res.data.resourceList[i].fireteamName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].fireteamPerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].fireteamTel + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
             }
             that.markersList.push(markersMap)
           }

+ 10 - 5
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 // 端口
 
@@ -18,7 +18,7 @@ const fs = require('fs')
 // 这里只列一部分,具体配置参考文档
 module.exports = {
   // 部署生产环境和开发环境下的URL。
-  // 默认情况下,Vue CLI 会假设你的应用是被部署在一个域名的根路径上
+  // 默认情况下,Vue CLI 会假设你的应用是被部署在一个域名的根路径上datacenter
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。
   publicPath: process.env.NODE_ENV === 'production' ? '/' : '/',
   // 在npm run build 或 yarn build 时 ,生成文件的目录名称(要和baseUrl的生产环境路径一致)(默认dist)
@@ -52,8 +52,13 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://127.0.0.1:3031`,
-        target: `http://117.78.49.164:3031`,
+        // target: `http://192.168.2.118:3031`,
+        //  target: `http://117.78.49.164:3031`,
+         // target: `http://192.168.1.122:3031`,
+         target: `http://127.0.0.1:3031`,
+         // target: `http://192.168.1.137:3031`,
+         // target: `https://117.78.49.164:3031`,
+         // target: `https://36.49.108.22:3031`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
@@ -65,7 +70,7 @@ module.exports = {
   css: {
     loaderOptions: {
       sass: {
-        sassOptions: {outputStyle: 'expanded'}
+        sassOptions: { outputStyle: 'expanded' }
       }
     }
   },