Browse Source

数据中心

wangzhe 2 years ago
parent
commit
c03f1fe0b5

BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-channel.png


BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-checkpoint.png


BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-farm.png


BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-firehydrant.png


BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-fireteam.png


BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-landing.png


BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-watercrane.png


BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-waterintake.png


BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-weatherstation.png


+ 9 - 9
src/views/datacenter.vue

@@ -161,7 +161,7 @@ export default {
     // 根据名称筛选资源点位
     searchByName() {
       this.$modal.msgSuccess("正在查询,请稍后...");
-      this.fireControlViewPoint(this.searchType, this.searchName);
+      this.indentleftSetMarkers(this.searchType, this.searchName);
     },
     /** ----------------------------------底部按钮公用组件开始------------------------------------- */
     bottomMenuList() {
@@ -460,8 +460,8 @@ export default {
           '                </span></div>'
       } else if (resourceTable == 'centerdata_t_hydraulic_channel_blueline') { //蓝线河道
         markersMap.icon = 'sj-icon-map-centerdata-t-forest-farm'
-        markersMap.lng = item.longitude
-        markersMap.lat = item.latitude
+        markersMap.lng = item.longitude;
+        markersMap.lat = item.latitude;
         markersMap.bindPopupHtml = '<div class="map-tip">' +
           '<span>' +
           '                  <div class="d-l-con">' +
@@ -566,7 +566,7 @@ export default {
         let longitude = item.longitude?item.longitude:item.startpoint_latitude;
         let latitude = item.latitude?item.latitude:item.startpoint_latitude;
         markersMap.lng = longitude;
-        markersMap.lat = latitude
+        markersMap.lat = latitude;
         markersMap.bindPopupHtml = '<div class="map-tip">' +
           '<span>' +
           '                  <div class="d-l-con">' +
@@ -681,8 +681,8 @@ export default {
           '                </span></div>'
       } else if (resourceTable == 'centerdata_t_hydraulic_wade_bridge_culvert') { //涉水桥涵
         markersMap.icon = 'sj-icon-map-centerdata-t-forest-firehydrant'
-        markersMap.lng = item.longitude
-        markersMap.lat = item.latitude
+        markersMap.lng = item.longitude;
+        markersMap.lat = item.latitude;
         markersMap.bindPopupHtml = '<div class="map-tip">' +
           '<span>' +
           '                  <div class="d-l-con">' +
@@ -712,9 +712,9 @@ export default {
           // '                  <div class="d-l-l-text">' +
           // '                  <h4>联系人:' + item.firehydrantPerson +
           // '</h4>' +
-          '                </div>' +
-          '                </div>' +
-          '                </span>' +
+          // '                </div>' +
+          // '                </div>' +
+          // '                </span>' +
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +

+ 2 - 3
vue.config.js

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