Merge branch 'dev' of gitlab.suntrayoa.com:geqilin/zhxf_vue into dev

src/pages/ol/demo/index.vue

@@ -640,20 +640,10 @@ export default {
         this.$message.warning('只能收藏资源点')
         return
       }
-      let dForm = {}
-      if (node.isDefence && node.level == 6) {
-        //如果是防区
-        dForm = {
+      let dForm = {
         resourceId: node.id,
-          byx1: '1',
         stationId: this.checkedData.sId
       }
-      } else {
-        dForm = {
-          resourceId: node.id,
-          stationId: this.checkedData.sId
-        }
-      }
       this.$http({
         url: this.$http.adornUrlEq('/liEnshrine/save'),
         method: 'post',
@@ -797,6 +787,11 @@ export default {
             if (this.mapList && this.treeData) {
               this.mapList.forEach((element) => {
                 element.readPath = this.urlPath + element.filePath
+                data.list.forEach((el) => {
+                  if (element.stationId === el.id) {
+                    element.name = el.stationName + element.name
+                  }
+                })
               })
               this.checkedData.stationId = this.station.id
               this.checkedData.stationName = this.station.stationName