大喇叭

src/api/forest.js

@@ -355,3 +355,10 @@ export function getLatestNotice() {
     params: {},
   })
 }
+// 搜索物资
+export function selectNearHorn(param) {
+  return request({
+    url:`/center-monitor/broadcast/selectNearHorn/${param.type}/${param.type}/${param.type}/${param.type}`,
+    method: 'get'
+  })
+}

src/assets/iconfont/iconfont.json

@@ -6,6 +6,90 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "37023277",
+      "name": "大喇叭",
+      "font_class": "big-horn",
+      "unicode": "e664",
+      "unicode_decimal": 58980
+    },
+    {
+      "icon_id": "680694",
+      "name": "确认",
+      "font_class": "queren",
+      "unicode": "e6f8",
+      "unicode_decimal": 59128
+    },
+    {
+      "icon_id": "4065592",
+      "name": "催办",
+      "font_class": "cuiban",
+      "unicode": "e770",
+      "unicode_decimal": 59248
+    },
+    {
+      "icon_id": "5809108",
+      "name": "归档",
+      "font_class": "guidang",
+      "unicode": "e667",
+      "unicode_decimal": 58983
+    },
+    {
+      "icon_id": "5809119",
+      "name": "办结",
+      "font_class": "banjie",
+      "unicode": "e66c",
+      "unicode_decimal": 58988
+    },
+    {
+      "icon_id": "25076147",
+      "name": "上报",
+      "font_class": "shangbao",
+      "unicode": "e6bf",
+      "unicode_decimal": 59071
+    },
+    {
+      "icon_id": "27856542",
+      "name": "已签收",
+      "font_class": "yiqianshou",
+      "unicode": "e6af",
+      "unicode_decimal": 59055
+    },
+    {
+      "icon_id": "36358348",
+      "name": "交通精细化摄像头",
+      "font_class": "jiaotongjingxihuashexiangtou",
+      "unicode": "e65f",
+      "unicode_decimal": 58975
+    },
+    {
+      "icon_id": "36789955",
+      "name": "水质断面",
+      "font_class": "shuizhiduanmian",
+      "unicode": "e661",
+      "unicode_decimal": 58977
+    },
+    {
+      "icon_id": "36973250",
+      "name": "水质断面-copy",
+      "font_class": "shuizhiduanmian-copy",
+      "unicode": "100e9",
+      "unicode_decimal": 65769
+    },
+    {
+      "icon_id": "1104530",
+      "name": "其它类_森林防火 ",
+      "font_class": "centerdata-t-forest-keyfireproofplots",
+      "unicode": "e9d9",
+      "unicode_decimal": 59865
+    },
+    {
+      "icon_id": "12837817",
+      "name": "危险企业",
+      "font_class": "centerdata-t-emergency-idlh-enterprises",
+      "unicode": "e65e",
+      "unicode_decimal": 58974
+    },
+    {
       "icon_id": "14191056",
       "name": "喇叭广播",
       "font_class": "labaguangbo",

src/views/eventdetailsdialog.vue

@@ -230,6 +230,7 @@
                   ref="supermapDialog"
                   style="position: absolute; top: 0; left: 0"
                   :mapDiv="'forestWarmSuperMap'"
+                  @jump="jump"
                   :mapSite="{
                     doubleClickZoom: false,
                     dragging: false,
@@ -2085,8 +2086,8 @@ import {
   userFeginlist,
   eventExamine,
   eventHandling,
-  initByCameras,
-} from "@/api/forest";
+  initByCameras, selectNearHorn
+} from '@/api/forest'
 import { joinConferences } from "@/api/meeting";
 import { treeselectAll as deptTreeselect } from "@/api/system/dept";
 import { getHaiKangVideoServer } from "@/api/haikang/haikang";
@@ -2412,6 +2413,13 @@ export default {
           icon: "sj-icon-jkzx",
           bg: "#f5ad1b",
         });
+        _this.resourcesList.push({
+          resourceName: "云广播",
+          type: "ygb",
+          count: "1",
+          icon: "sj-icon-big-horn",
+          bg: "#841bf5",
+        });
       });
     },
     /************************************责任制-开始****************************************/
@@ -2734,7 +2742,7 @@ export default {
           type: type,
           radius: this.radius,
         };
-        if (type != "sxt") {
+        if (type != "sxt"&&type!='ygb') {
           fireControlViewPoint(param).then((res) => {
             if (res.data != null && res.data.pointList.length > 0) {
               this.resourcesListCheck.push(type);
@@ -2830,7 +2838,7 @@ export default {
               this.$message.warning("当前点位附近无资源数据");
             }
           });
-        } else {
+        } else  {
           this.listResourceByWz(type);
         }
       }
@@ -2851,100 +2859,168 @@ export default {
           latitude: this.latitude,
           radius: this.radius,
         };
-        listResourceByWz(param).then((res) => {
-          if (res.data != null && res.data.length > 0) {
-            this.resourcesListCheck.push(type);
-            var markersList = [];
-            for (let i = 0; i < res.data.length; i++) {
-              let markersMap = {
-                lng: 124.59,
-                lat: 43.02,
-                icon: "marker",
-                bindPopupHtml: "",
-                click: "",
-                parameter: "",
-                keepBindPopup: false,
-                isAggregation: true,
-              };
+        if(type=='sxt')
+        {
+          listResourceByWz(param).then((res) => {
+            if (res.data != null && res.data.length > 0) {
+              this.resourcesListCheck.push(type);
+              var markersList = [];
+              for (let i = 0; i < res.data.length; i++) {
+                let markersMap = {
+                  lng: 124.59,
+                  lat: 43.02,
+                  icon: "marker",
+                  bindPopupHtml: "",
+                  click: "",
+                  parameter: "",
+                  keepBindPopup: false,
+                  isAggregation: true,
+                };
 
-              if (res.data[i].cameraUse == 1) {
-                if (res.data[i].workingStatus == 0) {
-                  markersMap.icon = 'sj-icon-map-centerdata-slmonitor'
-                  markersMap.click = 'preview'
-                } else if (res.data[i].workingStatus == 1) {
-                  markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor'
-                  markersMap.click = ''
-                }
+                if (res.data[i].cameraUse == 1) {
+                  if (res.data[i].workingStatus == 0) {
+                    markersMap.icon = 'sj-icon-map-centerdata-slmonitor'
+                    markersMap.click = 'preview'
+                  } else if (res.data[i].workingStatus == 1) {
+                    markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor'
+                    markersMap.click = ''
+                  }
 
-              } else if (res.data[i].cameraUse == 2) {
-                if (res.data[i].workingStatus == 0) {
-                  markersMap.icon = "camera";
-                  markersMap.click = 'preview'
-                } else if (res.data[i].workingStatus == 1) {
-                  markersMap.icon = "camera-not";
-                  markersMap.click = ''
-                }
-              } else if (res.data[i].cameraUse == 3) {
-                if (res.data[i].workingStatus == 0) {
-                  markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
-                  markersMap.click = 'preview'
-                } else if (res.data[i].workingStatus == 1) {
-                  markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor-traffic'
-                  markersMap.click = ''
-                }
+                } else if (res.data[i].cameraUse == 2) {
+                  if (res.data[i].workingStatus == 0) {
+                    markersMap.icon = "camera";
+                    markersMap.click = 'preview'
+                  } else if (res.data[i].workingStatus == 1) {
+                    markersMap.icon = "camera-not";
+                    markersMap.click = ''
+                  }
+                } else if (res.data[i].cameraUse == 3) {
+                  if (res.data[i].workingStatus == 0) {
+                    markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
+                    markersMap.click = 'preview'
+                  } else if (res.data[i].workingStatus == 1) {
+                    markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor-traffic'
+                    markersMap.click = ''
+                  }
 
-              } else if (res.data[i].cameraUse == 4) {
-                if (res.data[i].workingStatus == 0) {
-                  markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
-                  markersMap.click = 'preview'
-                } else if (res.data[i].workingStatus == 1) {
-                  markersMap.icon = 'sj-icon-map-not-centerdata-sand-quarry-camera'
-                  markersMap.click = ''
-                }
+                } else if (res.data[i].cameraUse == 4) {
+                  if (res.data[i].workingStatus == 0) {
+                    markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
+                    markersMap.click = 'preview'
+                  } else if (res.data[i].workingStatus == 1) {
+                    markersMap.icon = 'sj-icon-map-not-centerdata-sand-quarry-camera'
+                    markersMap.click = ''
+                  }
 
-              } else if (res.data[i].cameraUse == 5) {
-                if (res.data[i].workingStatus == 0) {
-                  markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir-camera'
-                  markersMap.click = 'preview'
-                } else if (res.data[i].workingStatus == 1) {
-                  markersMap.icon = 'sj-icon-map-not-centerdata-t-hydraulic-reservoir-camera'
-                  markersMap.click = ''
+                } else if (res.data[i].cameraUse == 5) {
+                  if (res.data[i].workingStatus == 0) {
+                    markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir-camera'
+                    markersMap.click = 'preview'
+                  } else if (res.data[i].workingStatus == 1) {
+                    markersMap.icon = 'sj-icon-map-not-centerdata-t-hydraulic-reservoir-camera'
+                    markersMap.click = ''
+                  }
+                }
+                if (res.data[i].cameraCode != null) {
+                  //markersMap.click = "preview";
+                  // markersMap.parameter = res.data[i].cameraCode
+                  markersMap.parameter = {
+                    code: res.data[i].cameraCode,
+                    type: res.data[i].cameraFactory
+                      ? res.data[i].cameraFactory
+                      : 1,
+                    name: res.data[i].cameraName,
+                  };
                 }
+                markersMap.lng = res.data[i].longitude;
+                markersMap.lat = res.data[i].latitude;
+                markersMap.bindPopupHtml =
+                  '<div class="map-tip">' +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>资源名称：" +
+                  res.data[i].cameraName +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "</div>";
+                markersList.push(markersMap);
               }
-              if (res.data[i].cameraCode != null) {
-                //markersMap.click = "preview";
-                // markersMap.parameter = res.data[i].cameraCode
-                markersMap.parameter = {
-                  code: res.data[i].cameraCode,
-                  type: res.data[i].cameraFactory
-                    ? res.data[i].cameraFactory
-                    : 1,
-                  name: res.data[i].cameraName,
+            }
+            setTimeout(() => {
+              this.$refs.supermapDialog.setMarkersByType(markersList, type);
+            }, 1000);
+          });
+        }else if(type=='ygb')
+        {
+          let param = {
+            longitude: this.longitude,
+            latitude: this.latitude,
+            radius: this.radius,
+            type:'8'
+          };
+          selectNearHorn(param).then((res) => {
+            if (res.data != null && res.data.length > 0) {
+              this.resourcesListCheck.push(type);
+              var markersList = [];
+              for (let i = 0; i < res.data.length; i++) {
+                let markersMap = {
+                  lng: 124.59,
+                  lat: 43.02,
+                  icon: "big-horn",
+                  click: "jump",
+                  parameter: "",
+                  name: "",
+                  keepBindPopup: false,
+                  isAggregation: false,
                 };
+                if (res.data[i].broadcastUse == '1') {
+                  markersMap.icon = "big-horn-emergency";
+                } else if (res.data[i].broadcastUse == '2') {
+                  markersMap.icon = "big-horn";
+                }
+                // if (res.data[i].cameraCode != null) {
+                //   //markersMap.click = "preview";
+                //   // markersMap.parameter = res.data[i].cameraCode
+                //   markersMap.parameter = {
+                //     code: res.data[i].cameraCode,
+                //     type: res.data[i].cameraFactory
+                //       ? res.data[i].cameraFactory
+                //       : 1,
+                //     name: res.data[i].cameraName,
+                //   };
+                // }
+                markersMap.lng = res.data[i].longitude;
+                markersMap.lat = res.data[i].latitude;
+                markersMap.bindPopupHtml =
+                  '<div class="map-tip">' +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>资源名称：" +
+                  res.data[i].name +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "</div>";
+                markersList.push(markersMap);
               }
-            markersMap.lng = res.data[i].longitude;
-            markersMap.lat = res.data[i].latitude;
-            markersMap.bindPopupHtml =
-              '<div class="map-tip">' +
-              "<span>" +
-              '                  <div class="d-l-con">' +
-              '                  <div class="d-l-l-text">' +
-              "                  <h4>资源名称：" +
-              res.data[i].cameraName +
-              "</h4>" +
-              "                </div>" +
-              "                </div>" +
-              "                </span>" +
-              "</div>";
-            markersList.push(markersMap);
-          }
-        }
+            }
             setTimeout(() => {
               this.$refs.supermapDialog.setMarkersByType(markersList, type);
             }, 1000);
-        });
+          });
+        }
+
       }
     },
+  jump() {
+    // 跳转云广播页面
+    window.open("https://sts.sty1818.com");
+  },
     // 返回图片列表
     assetTypeAnImage(filePath) {
       let imageList = [];

src/views/firespread.vue

@@ -136,6 +136,7 @@
                 <!-- 地图 -->
                 <supermapDialog1 ref="supermapDialog1" style="position: absolute; top:0;left: 0;"
                                  :mapDiv="'forestWarmSuperMap'"
+                                 @jump="jump"
                                  :mapSite="{doubleClickZoom:true,dragging:true,scrollWheelZoom:true}" :codes="['9fa5']"
                                  :isSideBySide="false" @preview="preview" :mapToolShowBH="mapToolShowBH"/>
                 <!-- 地图end -->
@@ -1114,7 +1115,7 @@ import {
   eventExamine,
   fireControlViewList,
   fireControlViewPoint,
-  sendMessage,
+  sendMessage, selectNearHorn
 } from '@/api/forest'
 import {
   treeselectAll as deptTreeselect
@@ -1584,6 +1585,13 @@ export default {
           icon: "sj-icon-jkzx",
           bg: "#f5ad1b",
         });
+        _this.resourcesList1.push({
+          resourceName: "云广播",
+          type: "ygb",
+          count: "1",
+          icon: "sj-icon-big-horn",
+          bg: "#841bf5",
+        });
       });
     },
     fireControlViewPoint(type) {
@@ -1601,7 +1609,7 @@ export default {
           type: type,
           radius: that.radius
         }
-        if (type != 'sxt') {
+        if (type != 'sxt'&&type != 'ygb') {
           fireControlViewPoint(param).then(res => {
             if (res.data != null && res.data.pointList.length > 0) {
               that.resourcesListCheck.push(type)
@@ -1875,81 +1883,75 @@ export default {
       }
     },
     listResourceByWz(type) {
-      let that=this;
-      if (that.resourcesListCheck.indexOf(type) > -1) {
-        that.resourcesListCheck.splice(that.resourcesListCheck.indexOf(type), 1)
+      if (this.resourcesListCheck.indexOf(type) > -1) {
+        this.resourcesListCheck.splice(
+          this.resourcesListCheck.indexOf(type),
+          1
+        );
         setTimeout(() => {
-          that.$refs.supermapDialog1.clearMByType(type)
-        }, 1000)
+          this.$refs.supermapDialog.clearMByType(type);
+        }, 1000);
       } else {
         //搜索物资
         let param = {
-          longitude: that.longitude,
-          latitude: that.latitude,
-          radius: that.radius
-        }
-        listResourceByWz(param).then(res => {
-          if (res.data != null && res.data.length > 0) {
-            that.resourcesListCheck.push(type)
-            var markersList = []
-            for (let i = 0; i < res.data.length; i++) {
-              let markersMap = {
-                lng: 124.59,
-                lat: 43.02,
-                icon: 'marker',
-                bindPopupHtml: '',
-                click: '',
-                parameter: '',
-                keepBindPopup: false,
-                isAggregation: true
-              }
-                if(res.data[i].cameraUse==1)
-                {
-                  if(res.data[i].workingStatus==0)
-                  {
-                    markersMap.icon='sj-icon-map-centerdata-slmonitor'
-                    markersMap.click='preview'
-                  }else if (res.data[i].workingStatus==1)
-                  {
-                    markersMap.icon='sj-icon-map-not-centerdata-slmonitor'
-                    markersMap.click=''
+          longitude: this.longitude,
+          latitude: this.latitude,
+          radius: this.radius,
+        };
+        if(type=='sxt')
+        {
+          listResourceByWz(param).then((res) => {
+            if (res.data != null && res.data.length > 0) {
+              this.resourcesListCheck.push(type);
+              var markersList = [];
+              for (let i = 0; i < res.data.length; i++) {
+                let markersMap = {
+                  lng: 124.59,
+                  lat: 43.02,
+                  icon: "marker",
+                  bindPopupHtml: "",
+                  click: "",
+                  parameter: "",
+                  keepBindPopup: false,
+                  isAggregation: true,
+                };
+
+                if (res.data[i].cameraUse == 1) {
+                  if (res.data[i].workingStatus == 0) {
+                    markersMap.icon = 'sj-icon-map-centerdata-slmonitor'
+                    markersMap.click = 'preview'
+                  } else if (res.data[i].workingStatus == 1) {
+                    markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor'
+                    markersMap.click = ''
                   }
 
-                } else  if (res.data[i].cameraUse == 2){
-                  if(res.data[i].workingStatus==0)
-                  {
+                } else if (res.data[i].cameraUse == 2) {
+                  if (res.data[i].workingStatus == 0) {
                     markersMap.icon = "camera";
-                    markersMap.click='preview'
-                  }else if (res.data[i].workingStatus==1)
-                  {
+                    markersMap.click = 'preview'
+                  } else if (res.data[i].workingStatus == 1) {
                     markersMap.icon = "camera-not";
-                    markersMap.click=''
+                    markersMap.click = ''
                   }
-                }  else if (res.data[i].cameraUse == 3) {
-                  if(res.data[i].workingStatus==0)
-                  {
+                } else if (res.data[i].cameraUse == 3) {
+                  if (res.data[i].workingStatus == 0) {
                     markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
-                    markersMap.click='preview'
-                  }else if (res.data[i].workingStatus==1)
-                  {
+                    markersMap.click = 'preview'
+                  } else if (res.data[i].workingStatus == 1) {
                     markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor-traffic'
-                    markersMap.click=''
+                    markersMap.click = ''
                   }
 
-                }
-                else if (res.data[i].cameraUse == 4) {
-                  if(res.data[i].workingStatus==0)
-                  {
+                } else if (res.data[i].cameraUse == 4) {
+                  if (res.data[i].workingStatus == 0) {
                     markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
-                    markersMap.click='preview'
-                  }else if (res.data[i].workingStatus==1)
-                  {
+                    markersMap.click = 'preview'
+                  } else if (res.data[i].workingStatus == 1) {
                     markersMap.icon = 'sj-icon-map-not-centerdata-sand-quarry-camera'
-                    markersMap.click=''
+                    markersMap.click = ''
                   }
 
-                }
-                else if (res.data[i].cameraUse == 5) {
+                } else if (res.data[i].cameraUse == 5) {
                   if (res.data[i].workingStatus == 0) {
                     markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir-camera'
                     markersMap.click = 'preview'
@@ -1959,34 +1961,105 @@ export default {
                   }
                 }
                 if (res.data[i].cameraCode != null) {
-                  // markersMap.click = 'preview'
+                  //markersMap.click = "preview";
                   // markersMap.parameter = res.data[i].cameraCode
-                  markersMap.parameter = {code:res.data[i].cameraCode,
-                    type:res.data[i].cameraFactory?res.data[i].cameraFactory:1,name:res.data[i].cameraName}
+                  markersMap.parameter = {
+                    code: res.data[i].cameraCode,
+                    type: res.data[i].cameraFactory
+                      ? res.data[i].cameraFactory
+                      : 1,
+                    name: res.data[i].cameraName,
+                  };
                 }
-
-
-              markersMap.lng = res.data[i].longitude
-              markersMap.lat = res.data[i].latitude
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>资源名称：' + res.data[i].cameraName + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '</div>'
-              markersList.push(markersMap)
+                markersMap.lng = res.data[i].longitude;
+                markersMap.lat = res.data[i].latitude;
+                markersMap.bindPopupHtml =
+                  '<div class="map-tip">' +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>资源名称：" +
+                  res.data[i].cameraName +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "</div>";
+                markersList.push(markersMap);
+              }
             }
-          }
             setTimeout(() => {
-              that.$refs.supermapDialog1.setMarkersByType(markersList, type)
-            }, 1000)
+              this.$refs.supermapDialog.setMarkersByType(markersList, type);
+            }, 1000);
+          });
+        }else if(type=='ygb')
+        {
+          let param = {
+            longitude: this.longitude,
+            latitude: this.latitude,
+            radius: this.radius,
+            type:'8'
+          };
+          selectNearHorn(param).then((res) => {
+            if (res.data != null && res.data.length > 0) {
+              this.resourcesListCheck.push(type);
+              var markersList = [];
+              for (let i = 0; i < res.data.length; i++) {
+                let markersMap = {
+                  lng: 124.59,
+                  lat: 43.02,
+                  icon: "big-horn",
+                  click: "jump",
+                  parameter: "",
+                  name: "",
+                  keepBindPopup: false,
+                  isAggregation: false,
+                };
+                if (res.data[i].broadcastUse == '1') {
+                  markersMap.icon = "big-horn-emergency";
+                } else if (res.data[i].broadcastUse == '2') {
+                  markersMap.icon = "big-horn";
+                }
+                // if (res.data[i].cameraCode != null) {
+                //   //markersMap.click = "preview";
+                //   // markersMap.parameter = res.data[i].cameraCode
+                //   markersMap.parameter = {
+                //     code: res.data[i].cameraCode,
+                //     type: res.data[i].cameraFactory
+                //       ? res.data[i].cameraFactory
+                //       : 1,
+                //     name: res.data[i].cameraName,
+                //   };
+                // }
+                markersMap.lng = res.data[i].longitude;
+                markersMap.lat = res.data[i].latitude;
+                markersMap.bindPopupHtml =
+                  '<div class="map-tip">' +
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>资源名称：" +
+                  res.data[i].name +
+                  "</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>" +
+                  "</div>";
+                markersList.push(markersMap);
+              }
+            }
+            setTimeout(() => {
+              this.$refs.supermapDialog.setMarkersByType(markersList, type);
+            }, 1000);
+          });
+        }
 
-        })
       }
     },
+    jump() {
+      // 跳转云广播页面
+      window.open("https://sts.sty1818.com");
+    },
     // 返回图片列表
     assetTypeAnImage(filePath) {
       let imageList = []

vue.config.js

@@ -52,9 +52,9 @@ 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://121.36.228.66:3031`,
         // target: `http://192.168.2.118:3031`,
-          //target: `http://192.168.31.235:3031`,
+          target: `http://192.168.31.235:3031`,
         //  target: `https://29613561xe.eicp.vip`,
         changeOrigin: true,
         pathRewrite: {