彭宇 2 vuotta sitten
vanhempi
commit
8fcb2c11a6

+ 0 - 17
src/api/components/supermap.js

@@ -14,23 +14,6 @@ export const iconList = {
   'camera-not': require('@/assets/images/cameraType/camera-not.png'),
   'not-online': require('@/assets/images/cameraType/not-online.png'),
   'sensor': require('@/assets/images/cameraType/sensor.png'),
-  'sj-icon-map-fhjcz': require('@/assets/icons/sj-icon-map/sj-icon-map-fhjcz.png'),
-  'sj-icon-map-lc': require('@/assets/icons/sj-icon-map/sj-icon-map-lc.png'),
-  'sj-icon-map-qjd': require('@/assets/icons/sj-icon-map/sj-icon-map-qjd.png'),
-  'sj-icon-map-qsk': require('@/assets/icons/sj-icon-map/sj-icon-map-qsk.png'),
-  'sj-icon-map-qxz': require('@/assets/icons/sj-icon-map/sj-icon-map-qxz.png'),
-  'sj-icon-map-sh': require('@/assets/icons/sj-icon-map/sj-icon-map-sh.png'),
-  'sj-icon-map-slfh': require('@/assets/icons/sj-icon-map/sj-icon-map-slfh.png'),
-  'sj-icon-map-syqd': require('@/assets/icons/sj-icon-map/sj-icon-map-syqd.png'),
-  'sj-icon-map-xhs': require('@/assets/icons/sj-icon-map/sj-icon-map-xhs.png'),
-  //今日事件图标
-  'sj-icon-map-wcl': require('@/assets/icons/sj-icon-map/sj-icon-map-wcl.png'),
-  'sj-icon-map-clz': require('@/assets/icons/sj-icon-map/sj-icon-map-clz.png'),
-  'sj-icon-map-ywc': require('@/assets/icons/sj-icon-map/sj-icon-map-ywc.png'),
-  'sj-icon-map-rg': require('@/assets/icons/sj-icon-map/sj-icon-map-rg.png'),
-  'sj-icon-map-hx': require('@/assets/icons/sj-icon-map/sj-icon-map-hx.png'),
-  'sj-icon-map-kk': require('@/assets/icons/sj-icon-map/sj-icon-map-kk.png'),
-
 
 
   //首页事件弹窗资源

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


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


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


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


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


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


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


+ 17 - 273
src/views/datacenter.vue

@@ -60,11 +60,6 @@
         </div>
       </div>
       <vBottomMenu ref="bottomMenu"></vBottomMenu>
-      <!--      <el-tooltip :content="indentText" placement="top" :disabled="indentdisabled">-->
-      <!--        <div class="mascot" ref="mascot" :class="indentStyle" @click="indent"><img-->
-      <!--          src="@/assets/images/mascot.png"/>-->
-      <!--        </div>-->
-      <!--      </el-tooltip>-->
 
     </div>
     <eventLocation ref="eventLocation"></eventLocation>
@@ -122,12 +117,6 @@ export default {
       //右侧资源
       deptGroupList: [],
       source: [],
-      //左右缩进
-      indentStyle: '',
-      indentleft: '',
-      indentright: '',
-      indentText: '收起左右栏',
-      indentdisabled: false
 
     }
   },
@@ -267,24 +256,6 @@ export default {
 
     },
 
-    //吉祥物收起左右框
-    indent() {
-      let list = document.getElementsByClassName('el-tooltip__popper')
-      list[list.length - 1].style.display = 'none'
-      if (this.indentStyle == '') {
-        this.indentStyle = 'indent-style'
-        this.indentleft = 'indent-left'
-        this.indentright = 'indent-right'
-        this.indentText = '展开左右栏'
-      } else if (this.indentText == '展开左右栏') {
-        this.indentStyle = ''
-        this.indentleft = ''
-        this.indentright = ''
-        this.indentText = '收起左右栏'
-      }
-    },
-
-    // 弹层方法
     // 弹层方法
     showEventInfo1() {
       this.eventInfoVisible1 = true
@@ -475,197 +446,8 @@ export default {
               keepBindPopup: false,
               isAggregation: false
             }
-            if (that.resourceTable == 'centerdata_t_forest_weatherstation') { //气象站
-              markersMap.icon = 'sj-icon-map-qxz'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              markersMap.icon = 'icon_qxz'
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度:' + res.data.resourceList[i].longitude + ',' + res
-                  .data.resourceList[i].latitude + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>地址:' + res.data.resourceList[i].weatherstationAddress +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].weatherstationPerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].weatherstationTel +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (that.resourceTable == 'centerdata_t_forest_farm') { //林场
-              markersMap.icon = 'sj-icon-map-lc'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度:' + res.data.resourceList[i].longitude + ',' + res
-                  .data.resourceList[i].latitude + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>林场名称:' + res.data.resourceList[i].farmName + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].farmPerson + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].farmTel + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (that.resourceTable == 'centerdata_t_forest_landing') { //起降点
-              markersMap.icon = 'sj-icon-map-qjd'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度:' + res.data.resourceList[i].longitude + ',' + res
-                  .data.resourceList[i].latitude + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>起降点名称:' + res.data.resourceList[i].landingName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].landingPerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].landingTel + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (that.resourceTable == 'centerdata_t_forest_channel') { //水源渠道
-              markersMap.icon = 'sj-icon-map-syqd'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              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].channelName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].channelPerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].channelTel + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (that.resourceTable == 'centerdata_t_forest_checkpoint') { //防火检查站
-              markersMap.icon = 'sj-icon-map-fhjcz'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度:' + res.data.resourceList[i].longitude + ',' + res
-                  .data.resourceList[i].latitude + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>检查站名称:' + res.data.resourceList[i].checkpointName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>地址:' + res.data.resourceList[i].checkpointAddress +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].checkpointPerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].checkpointTel +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (that.resourceTable == 'centerdata_t_forest_waterintake') { //取水口
-              markersMap.icon = 'sj-icon-map-qsk'
+            if (that.resourceTable == 'centerdata_t_environment_key_enterprise') { //重点企业
+              markersMap.icon = 'sj-icon-map-centerdata-t-environment-key-enterprise'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -680,15 +462,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>' +
@@ -696,28 +470,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].waterintakeTel +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (that.resourceTable == 'centerdata_t_forest_watercrane') { //水鹤
-              markersMap.icon = 'sj-icon-map-sh'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度:' + res.data.resourceList[i].longitude + ',' + res
-                  .data.resourceList[i].latitude + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>水鹤名称:' + res.data.resourceList[i].watercraneName +
+                '                  <h4>地址:' + res.data.resourceList[i].address +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -725,7 +478,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].watercranePerson +
+                '                  <h4>企业法人:' + res.data.resourceList[i].legalPerson +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -733,13 +486,13 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].watercraneTel +
+                '                  <h4>联系电话:' + res.data.resourceList[i].contactsPhone +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span></div>'
-            } else if (that.resourceTable == 'centerdata_t_forest_firehydrant') { //消火栓
-              markersMap.icon = 'sj-icon-map-xhs'
+            } else if (that.resourceTable == 'centerdata_t_environment_prohibition_area') { //禁烧区
+              markersMap.icon = 'sj-icon-map-centerdata-t-environment-prohibition-area'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -754,37 +507,33 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>消火栓名称:' + res.data.resourceList[i].firehydrantName +
-                '</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].firehydrantAddress +
-                '</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].firehydrantPerson +
-                '</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].firehydrantTel +
-                '</h4>' +
+                '                  <h4>联系电话:' + res.data.resourceList[i].contactsPhone + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span></div>'
-            } else if (that.resourceTable == 'centerdata_t_forest_fireteam') { //森林防火队
-              markersMap.icon = 'sj-icon-map-slfh'
+            } else if (that.resourceTable == 'centerdata_t_environment_source_pollution') { //污染源
+              markersMap.icon = 'sj-icon-map-centerdata-t-environment-source-pollution'
               markersMap.lng = res.data.resourceList[i].longitude
               markersMap.lat = res.data.resourceList[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -799,7 +548,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>森林防火队名称:' + res.data.resourceList[i].fireteamName +
+                '                  <h4>污染源名称:' + res.data.resourceList[i].name +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -807,18 +556,13 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].fireteamPerson +
+                '                  <h4>地址:' + res.data.resourceList[i].address +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].fireteamTel + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
+                '</div>'
             }
             that.markersList.push(markersMap)
           }

+ 3 - 2
vue.config.js

@@ -51,8 +51,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://192.168.1.113:3031`,
-        target: `http://117.78.49.164:3031`,
+        // target: `http://127.0.0.1:3031`,
+        // target: `http://117.78.49.164:3031`,
+        target: `http://192.168.1.119:3031`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''