Browse Source

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-editer into develop

haojianlong 4 năm trước cách đây
mục cha
commit
fc3ca2456a

+ 26 - 0
src/App.vue

@@ -5,6 +5,32 @@
 </template>
 
 <script>
+export default {
+  data(){
+    return {}
+  },
+  created() {
+    const href = window.location.href;
+    // 路由
+    // const route = href.split("?")[0];
+    // 参数处理
+    let params = href.split("?")[1];
+    if (!params) {
+      // 参数有问题
+      return false;
+    }
+    params = decodeURIComponent(params);
+    // params = "categoryId=NTXT&ProjectID=5&BuildingID=1&FloorID=1"; // mock 参数
+    const paramsArr = params.split("&");
+    const obj = {};
+    paramsArr.map(item => {
+      const arr = item.split("=");
+      obj[arr[0]] = arr[1];
+    });
+    this.urlMsg = obj;
+    this.$store.commit("SETSSOTOKEN", this.urlMsg.token);
+  }
+}
 </script>
 <style lang="less">
 #app {

+ 2 - 2
src/api/httputils.js

@@ -20,10 +20,10 @@ const axiosservice = axios.create({
 axiosservice.interceptors.request.use(
     (config) => {
         config.withCredentials = true // 允许携带token ,这个是解决跨域产生的相关问题
-        const token = store.getters["token"]
+        const token = store.getters["token"] ? store.getters["token"]:'admin:lengqiang'
         if (config.url.indexOf('mapapp') < 0) {
             config.headers = {
-                'sso-token': 'admin:lengqiang',
+                'sso-token': token,
                 isPreview: false, //默认false,当预览开启的时候是true
             }
         }

+ 6 - 2
src/components/baseEditer.vue

@@ -566,12 +566,16 @@ export default {
         if (res.Result == "success") {
           this.$message.success("发布成功");
           setTimeout(() => {
-            const data = `categoryId=${this.urlMsg.categoryId}&projectId=${this.urlMsg.projectId}&BuildingID=${this.urlMsg.BuildingID}&FloorID=${this.urlMsg.FloorID}&fmapID=${this.urlMsg.fmapID}`;
+             const token = this.$store.getters["token"];
+             const data = `categoryId=${this.urlMsg.categoryId}&projectId=${this.urlMsg.projectId}&BuildingID=${this.urlMsg.BuildingID}&FloorID=${this.urlMsg.FloorID}&fmapID=${this.urlMsg.fmapID}&token=${token}`;
             const url =
               window.location.origin +
               "/wandaEditer/drafts?" +
               encodeURIComponent(data);
             window.open(url, true);
+            // // 发布成功跳转草稿箱
+            // const token = this.$store.getters["token"];
+            // this.$router.push({ path: 'drafts', query: { projectId:this.urlMsg.projectId,BuildingID:this.urlMsg.BuildingID,fmapID:this.urlMsg.fmapID,token:token}})
           }, 1000);
         } else {
           this.$message.error(res.Message);
@@ -611,7 +615,7 @@ export default {
               this.graphId = res.Data;
               Message({
                 message: "保存成功!",
-                type: "error"
+                type: "success"
               });
               resolve(true);
             } else {

+ 31 - 13
src/components/edit/attr_select.vue

@@ -9,6 +9,7 @@
           <a-input-number
             v-model="lineWidth"
             :min="1"
+            :max="9"
             @change="changeLineWidth"
             style="width: 168px"
           />
@@ -92,6 +93,7 @@
           <a-input-number
             v-model="lineWidth"
             :min="1"
+            :max="9"
             @change="changeLineWidth"
             style="width: 168px"
           />
@@ -140,6 +142,7 @@
             <a-input-number
               v-model="lineWidth"
               :min="1"
+              :max="9"
               @change="changeLineWidth"
               style="width: 208px"
             />
@@ -194,6 +197,7 @@
               <a-input-number
                 v-model="lineWidth"
                 :min="1"
+                :max="9"
                 @change="changeLineWidth"
                 style="width: 168px"
               />
@@ -284,7 +288,7 @@
         </a-collapse-panel>
       </a-collapse>
     </div>
-    <editDialog  ref="dialog" :attrCards="attrCards" :typeEdit="type" :getmajorId="getmajorId" :sysNum="imageNum" :key="new Date().getTime()"/>
+    <editDialog  ref="dialog" :attrCards="attrCards"  :sysNum="imageNum" :key="new Date().getTime()"/>
     <!--    <editDialog ref="dialog" :typeEdit="2" :getmajorId="'1001'" :sysNum="5" />-->
   </div>
 </template>
@@ -481,6 +485,7 @@ export default {
     focusItemList: function(newval) {
       const Item = newval.itemList[0];
       this.getmajorId = Item.data.Properties.InfoSystemId;
+      this.imageNum = 1; //切换item初始化
       if (Item.data && Item.data.SubType) {
         this.SubType = Item.data.SubType;
       }else{
@@ -526,43 +531,56 @@ export default {
           }
         }
       }
-      const  location =[];
+      const  locationList =[];
+      const  assetnumList =[];
       let  params ={};
+      this.attrCards = [];
       Item.data.AttachObjectIds.map(item=>{
-        location.push(item.id)
+        if(item.type=='Zone'){
+          locationList.push(item.id)
+        }else if(item.type=='Image'){
+          assetnumList.push(item.id)
+        }
+
       })
-     if(newval.itemType == 'Zone'){
+     // if(newval.itemType == 'Zone'){
        this.spinning = true;
-       if(location.length){
-         params = {locationList:location}
+       if(locationList.length){
+         params = {locationList:locationList}
        }else{
          params = {locationList:['']};
        }
        queryGlsmsLocation({plazaId: getUrlMsg().projectId},params).then(res=>{
          this.spinning = false;
          if(res.data.result =='success'){
-           this.attrCards = res.data.data||[];
+           console.log(res.data);
+           if(res.data.data && res.data.data.length){
+             this.attrCards =  this.attrCards.concat(res.data.data)
+           }
          }else{
            this.$message.error('工程信息化中的位置信息获取失败')
          }
        })
-     }else if(newval.itemType == 'Image'){
+     // }else if(newval.itemType == 'Image'){
        this.spinning = true;
-       if(location.length){
-         params = {assetnumList:location}
+       if(assetnumList.length){
+         params = {assetnumList:assetnumList}
        }else{
          params = {assetnumList:['']};
        }
        queryGlsmsAsset({plazaId: getUrlMsg().projectId},params).then(res=>{
          this.spinning = false;
          if(res.data.result =='success'){
-           this.attrCards = res.data.data||[];
+           console.log(res.data);
+           if(res.data.data &&res.data.data.length){
+             this.attrCards = this.attrCards.concat(res.data.data)
+           }
          }else{
            this.$message.error('工程信息化中的设备信息获取失败')
          }
        })
-     }
-
+     // }
+      console.log(this.attrCards);
     }
   }
 };

+ 78 - 31
src/components/edit/edit-dialog.vue

@@ -12,15 +12,29 @@
       <div class="left">
         <div class="header">
           <div class="select">
-            <Select style="margin: 0 10px"
-                    v-model="majorId"
-                    @change="handleMajor"
-                    :hideClear='true'
-                    :selectdata="majorList"
-                    :placeholder="'请选择'"
-                    class="search-select"
-                    width="236" isReadOnly
-            />
+            <a-select style="width: 236px;margin: 0 10px" >
+              <a-select-opt-group>
+                <span slot="label">设备设施</span>
+                <a-select-option v-for="item in majorList" :value="item.id" @click="handleChange(item)">
+                  {{item.name}}
+                </a-select-option>
+              </a-select-opt-group>
+              <a-select-opt-group>
+                <span slot="label">位置区域</span>
+                <a-select-option v-for="item in locationList" :value="item.id" @click="handleChange(item)">
+                  {{item.name}}
+                </a-select-option>
+              </a-select-opt-group>
+            </a-select>
+<!--            <Select style="margin: 0 10px"-->
+<!--                    v-model="majorId"-->
+<!--                    @change="handleMajor"-->
+<!--                    :hideClear='true'-->
+<!--                    :selectdata="majorList"-->
+<!--                    :placeholder="'请选择'"-->
+<!--                    class="search-select"-->
+<!--                    width="236" isReadOnly-->
+<!--            />-->
           </div>
           <div class="search">
             <Select
@@ -41,7 +55,7 @@
           <searchTree  @getTreeId="getTreeId" :treeData="treeData"/>
         </div>
         <div class="checkbox">
-          <a-table :pagination="false" :row-key='typeEdit=="Zone"?"location":"assetnum"' :columns="typeEdit=='Image'?columnsSys:columnsLocal" :data-source="tableData"  :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,onSelect:onSelect }" :scroll="{ y: 340 }"  :loading="loading"/>
+          <a-table :pagination="false" :row-key='typeEdit=="Zone"?"location":"assetnum"' :columns="typeEdit=='Image'?columnsSys:typeEdit=='Zone'?columnsLocal:objSys" :data-source="tableData"  :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,onSelect:onSelect }" :scroll="{ y: 340 }"  :loading="loading"/>
           <a-pagination v-if="total>0" v-model="page" :total="total" show-less-items style="margin-left: auto;"  @change="handleTableChange"/>
         </div>
       </div>
@@ -72,8 +86,6 @@
         name: "edit-dialog",
         components: {searchTree},
       props:{
-        typeEdit:String , //用于区分是设备 还是  位置
-        getmajorId:String, //专业Id
         sysNum:Number ,//设备总数
         attrCards:Array
       },
@@ -87,10 +99,26 @@
                 dataFloor: [],
                 plainOptions: ['福建三明万达-供电系统-6楼-工程信息化中的区域编码ND182472e83742', '福建三明万达-供电系统-6楼-工程信息化中的区域编码ND18247283742'],
                 majorList: [],
+               locationList: [],
                 checkedList: [],
               keyword:'',
               classstructureid:'',
               locfl:'',
+              objSys : [
+                {
+                  title: '对象名称',
+                  dataIndex: 'sbjc',
+                  key: 'sbjc',
+                  width: '75%',
+                  scopedSlots: { customRender: 'sbjc' },
+                },
+                {
+                  title: '对象内码',
+                  dataIndex: 'sbjbm',
+                  key: 'sbjbm',
+                  width: '25%',
+                },
+              ],
               columnsSys : [
                 {
                   title: '设备名称',
@@ -130,13 +158,9 @@
               selectedRowKeys :[],
               arrList:[],
               selectList:[],
+              typeEdit:'',
             }
         },
-        computed:{
-          majorId(){
-            return this.typeEdit=='Zone'?'位置区域': this.getmajorId
-          },
-        },
       watch:{
         floorId(val){
           if(val==''){
@@ -157,9 +181,14 @@
                     let arr = [];
                     arr = JSON.parse(JSON.stringify( this.arrList))
                   arr.map(item =>{
-                      lists.push({id:item.location||item.assetnum,name:item.wzjc||item.sbjc})
+                    if(item.wzjc){
+                      lists.push({id:item.location||item.assetnum,name:item.wzjc||item.sbjc,type:'Zone'})
+                    }if(item.sbjc){
+                      lists.push({id:item.location||item.assetnum,name:item.wzjc||item.sbjc,type:'Image'})
+                    }
                     })
-                    bus.$emit('changeAttachObjectIds',lists)
+                  console.log(lists);
+                  bus.$emit('changeAttachObjectIds',lists)
                     bus.$emit('updateAttachMsg',lists)
                 },1000);
             },
@@ -167,10 +196,17 @@
                 this.visible = false;
               let arr = [];
               let lists = [];
+              console.log(this.selectList);
               arr = JSON.parse(JSON.stringify( this.selectList))
               arr.map(item =>{
-                lists.push({id:item.location||item.assetnum,name:item.wzjc||item.sbjc})
+                if(item.wzjc){
+                  lists.push({id:item.location||item.assetnum,name:item.wzjc||item.sbjc,type:'Zone'})
+                }if(item.sbjc){
+                  lists.push({id:item.location||item.assetnum,name:item.wzjc||item.sbjc,type:'Image'})
+                }
+
               })
+              console.log(lists);
               bus.$emit('changeAttachObjectIds',lists)
             },
             onSearch(value) {
@@ -179,6 +215,12 @@
             ChangeCheckbox(val) {
                 console.log(val)
             },
+          handleChange(val){
+            console.log(val);
+            this.tableData = [];
+            this.typeEdit = val.type;
+            this.getQuerySmsxtBy(val.id,val.type)
+          },
             handleMajor(val) {
               this.tableData = [];
               this.getQuerySmsxtBy(val.id)
@@ -272,6 +314,9 @@
                 this.$message.error('不能超过设备数')
                 return false;
               }
+            selectedRows.map(item=>{
+              item.type=this.typeEdit;
+            })
             this.arrList = [...this.arrList,...selectedRows]
             const obj = {}
             if(this.typeEdit=='Zone'){
@@ -318,7 +363,7 @@
           },
           //获取设备大类和位置大类
           getQuerySmsxt(){
-              if (this.typeEdit=='Image'){
+              // if (this.typeEdit=='Image'){
                 getQuerySmsxt({}).then(res =>{
                   if(res.result == 'success'){
                     if(res.data){
@@ -326,12 +371,13 @@
                       data.map(item=>{
                         item.id = item.code;
                         item.name = item.name;
+                        item.type='Image';
                       })
                       this.majorList  = data;
                     }
                   }
                 })
-              }else if(this.typeEdit =='Zone'){
+              // }else if(this.typeEdit =='Zone'){
 
                 queryWzfldl({}).then(res =>{
                 if(res.result == 'success'){
@@ -340,17 +386,18 @@
                     data.map(item=>{
                       item.id = item.dl;
                       item.name = item.dl;
+                      item.type='Zone'
                     })
-                    this.majorList  = data;
+                    this.locationList  = data;
                   }
                 }
               })
-            }
+            // }
 
           },
          // 获取设备大类下的分类和位置大类下的分类
-          getQuerySmsxtBy(smsxt){
-              if(this.typeEdit=='Image'){
+          getQuerySmsxtBy(smsxt,type){
+              if(type=='Image'){
               const data = {
                 smsxt:smsxt
               }
@@ -375,7 +422,7 @@
                   this.$message.error('获取失败');
                 }
               })
-            }else if(this.typeEdit=='Zone'){
+            }else if(type=='Zone'){
                 const data = {
                   dl:smsxt
                 }
@@ -413,10 +460,10 @@
             this.selectedRowKeys = [];
           }
           this.getQuerySmsxt();
-          //如果有专业就带过来
-          if(this.majorId){
-            this.getQuerySmsxtBy(this.majorId)
-          }
+          // //如果有专业就带过来
+          // if(this.majorId){
+          //   this.getQuerySmsxtBy(this.majorId)
+          // }
           this.getPlazaFloor();
 
         }

+ 2 - 2
src/components/edit/top_toolbar.vue

@@ -57,8 +57,8 @@
           <span>打散</span>
         </li>-->
         <li @click="lockItem">
-          <Icon :name="!isLock?'lock':'unlock'" />
-          <span>{{isLock?"解锁":"锁定"}}</span>
+          <Icon :name="isLock?'lock':'unlock'" />
+          <span>{{!isLock?"解锁":"锁定"}}</span>
         </li>
         <li @click="deleteItem">
           <img class="lock" :src="require(`./../../assets/images/delete.png`)" alt />

+ 6 - 5
src/components/mapClass/EditScence.ts

@@ -985,9 +985,10 @@ export class EditScence extends SGraphScene {
                 this.setCmd = 'choice'
             }
         }
-        // if (event.key == "Enter") {
-        //     this.cmd = 0
-        // }
+        // 删除键功能
+        if(event.code=='Delete'){
+            this.deleiteItem()
+        }
         return false
     }
 
@@ -1037,8 +1038,8 @@ export class EditScence extends SGraphScene {
     }
 
     /**
-     * 管线item修改锚点 
-     * 
+     * 管线item修改锚点
+     *
     */
     updateTipeAnc(event: SMouseEvent): void {
         if (this.grabItem instanceof TipelineItem){

+ 1 - 0
src/router/index.ts

@@ -27,4 +27,5 @@ const router = new VueRouter({
   routes
 })
 
+
 export default router

+ 11 - 4
src/store/index.ts

@@ -7,25 +7,32 @@ Vue.use(Vuex)
 export default new Vuex.Store({
   state: {
     GraphCategoryIds: ['NTXT'], //系统类型
-    TypeIdToGraphElement:{}, //typeid到图例元素的映射
+    TypeIdToGraphElement: {}, //typeid到图例元素的映射
+    token: null,
   },
   mutations: {
-    TypeIdToGraphElement(state,data){
+    TypeIdToGraphElement(state, data) {
       if (data.length) {
         state.TypeIdToGraphElement = {}
         data.forEach(t => {
           state.TypeIdToGraphElement[t.Id] = t;
         })
       }
-    }
+    },
+    SETSSOTOKEN(state, data) {
+      state.token = data
+    },
   },
   actions: {
     getElementType({ commit }, params) {
       getGraphElementType(params).then(res => {
-        commit('TypeIdToGraphElement',res.Content)
+        commit('TypeIdToGraphElement', res.Content)
       })
     }
   },
+  getters: {
+    token: (state) => state.token,
+  },
   modules: {
   }
 })

+ 14 - 0
src/utils/query.ts

@@ -0,0 +1,14 @@
+function query(search) {
+    const obj = {}
+    const _search = search || location.search.split('?')[1]
+    if (_search) {
+        _search.split('&').forEach((i) => {
+            const key = i.split('=')[0]
+            const value = i.split('=')[1]
+            obj[key] = value
+        })
+    }
+    return obj
+}
+
+export { query }

+ 98 - 52
src/views/drafts.vue

@@ -3,7 +3,8 @@
     <div class="tit">草稿箱</div>
     <div class="conent">
       <div class="left-nav">
-        <Tree :data="treeData" @change="change"></Tree>
+        <Tree :data="treeData" @change="change" v-if="treeData.length"></Tree>
+        <div v-else style="text-align: center;margin-top: 20px;">暂无数据</div>
         <!--          <el-tree ref="tree" :data="treeData" :props="defaultProps" @node-click="handleNodeClick"  node-key="id"    :expand-on-click-node="false"-->
         <!--                   :current-node-key="currentNodekey"-->
         <!--                   :default-expanded-keys="expandedkeys">-->
@@ -150,10 +151,14 @@ export default {
     // },
     //初始化获取蜂鸟所有底图数据
     init() {
+      const loadings = Loading.service({
+        lock: true,
+        text: "Loading",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)"
+      });
       // const loadings = this.$loading({type: 'global'});
       document.getElementById(`canvas`).focus();
-      this.scene = new EditScence();
-      this.clearGraphy();
       fengmap = new SFengParser(
         "fengMap",
         this.mapServerURL + "/fmap/" + this.fmapID,
@@ -170,6 +175,7 @@ export default {
           )
           .then(response => {
             // 获取楼层数据数据
+            loadings.close();
             this.getTreeData();
           });
       });
@@ -270,59 +276,78 @@ export default {
       console.log(items);
     },
     getTreeData() {
+      const loadings = Loading.service({
+        lock: true,
+        text: "Loading",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)"
+      });
       queryDraftGroup({ projectId: this.projectId }).then(res => {
         console.log(res);
+        loadings.close();
         if (res.Result == "success") {
           const data = res.Data;
-          (function recursion(newObj) {
-            newObj.map(function(item, index) {
-              item.id = item.Id || item.Gname;
-              item.name = item.Gcode;
+          this.systemName = '';
+          this.floorName = '';
+          this.floorId = '';
+          this.categoryId = '';
+          if(data.length){
+            (function recursion(newObj) {
+              newObj.map(function(item, index) {
+                item.id = item.Id || item.Gname;
+                item.name = item.Gcode;
 
-              item.checked = false;
-              if (item.Category && item.Category.length > 0) {
-                item.children = item.Category;
-                item.open = false;
-                recursion(item.Category);
-              }
+                item.checked = false;
+                if (item.Category && item.Category.length > 0) {
+                  item.children = item.Category;
+                  item.open = false;
+                  recursion(item.Category);
+                }
+              });
+            })(data);
+            data.forEach(ele => {
+              ele.children.forEach(item => {
+                if (item.children) {
+                  item.children.forEach(item1 => {
+                    item1.id = item.Id + item1.Gname;
+                  });
+                } else {
+                  item.id = ele.Id + item.Gname;
+                }
+              });
             });
-          })(data);
-          data.forEach(ele => {
-            ele.children.forEach(item => {
-              if (item.children) {
-                item.children.forEach(item1 => {
-                  item1.id = item.Id + item1.Gname;
-                });
-              } else {
-                item.id = ele.Id + item.Gname;
-              }
-            });
-          });
-          this.treeData = data;
-          if (this.treeData[0].children[0].children) {
-            this.treeData[0].open = true;
-            this.treeData[0].children[0].open = true;
-            this.treeData[0].children[0].children[0].checked = "checked";
-            this.systemName = this.treeData[0].children[0].Gcode;
-            this.floorName = this.treeData[0].children[0].children[0].Gcode;
-            this.floorId = this.treeData[0].children[0].Gname;
-            this.categoryId = this.treeData[0].children[0].Id;
-            // this.getLegend();
-            this.checkFloor(this.treeData[0].children[0].children[0].Gname);
-          } else {
-            this.treeData[0].open = true;
-            this.treeData[0].children[0].checked = "checked";
-            this.systemName = this.treeData[0].Gcode;
-            this.floorName = this.treeData[0].children[0].Gcode;
-            this.floorId = this.treeData[0].Gname;
-            this.categoryId = this.treeData[0].Id;
-            // this.getLegend();
-            this.checkFloor(this.treeData[0].children[0].Gname);
+            this.treeData = data;
+            if ( this.treeData[0].children[0].children) {
+              this.treeData[0].open = true;
+              this.treeData[0].children[0].open = true;
+              this.treeData[0].children[0].children[0].checked = "checked";
+              this.systemName = this.treeData[0].children[0].Gcode;
+              this.floorName = this.treeData[0].children[0].children[0].Gcode;
+              this.floorId = this.treeData[0].children[0].children[0].Gname;
+              this.categoryId = this.treeData[0].children[0].Id;
+              // this.getLegend();
+              this.checkFloor(this.treeData[0].children[0].children[0].Gname);
+            } else {
+              this.treeData[0].open = true;
+              this.treeData[0].children[0].checked = "checked";
+              this.systemName = this.treeData[0].Gcode;
+              this.floorName = this.treeData[0].children[0].Gcode;
+              this.floorId = this.treeData[0].children[0].Gname;
+              this.categoryId = this.treeData[0].Id;
+              // this.getLegend();
+              this.checkFloor(this.treeData[0].children[0].Gname);
+            }
+          }else{
+            this.treeData = data;
           }
+
         } else {
           this.treeData = [];
           this.$message.error("获取楼层结构失败");
         }
+      }).catch(()=>{
+        loadings.close();
+        this.$message.error('请求失败')
       });
     },
     //获取补充图例
@@ -364,6 +389,7 @@ export default {
         if (res.Result == "success") {
           this.$message.success("删除成功");
           this.getTreeData();
+          this.init();
           this.legendData = [];
         } else {
           this.$message.error(res.Message);
@@ -378,6 +404,7 @@ export default {
         spinner: "el-icon-loading",
         background: "rgba(0, 0, 0, 0.7)"
       });
+      console.log(this.floorId);
       const data = {
         BuildingID: this.BuildingID,
         CategoryID: this.categoryId,
@@ -414,15 +441,34 @@ export default {
      * @description t跳转editer编辑器
      */
     goToEditer() {
-      const data = `categoryId=${this.categoryId}&projectId=${this.projectId}&BuildingID=1&FloorID=${this.floorId}&FloorName=${this.floorName}&fmapID=${this.fmapID}`;
-      const url =
-        window.location.origin +
-        "/wandaEditer/editer?" +
-        encodeURIComponent(data);
-      window.open(url, true);
+      setTimeout(() => {
+        const token = this.$store.getters["token"];
+        const data = `categoryId=${this.categoryId}&projectId=${this.projectId}&BuildingID=1&FloorID=${this.floorId}&FloorName=${this.floorName}&fmapID=${this.fmapID}&token=${token}`;
+        const url =
+          window.location.origin +
+          "/wandaEditer/editer?" +
+          encodeURIComponent(data);
+        window.open(url, true);
+        // 发布成功跳转草稿箱
+        // const token = this.$store.getters["token"];
+        // this.$router.push({
+        //   path: "editer",
+        //   query: {
+        //     categoryId: this.categoryId,
+        //     projectId: this.projectId,
+        //     BuildingID: 1,
+        //     FloorName: this.floorName,
+        //     FloorID: this.floorId,
+        //     fmapID: this.fmapID,
+        //     token:token
+        //   }
+        // });
+      }, 1000);
     },
     // 切换草稿箱楼层
     checkFloor(floorid) {
+      this.scene = new EditScence();
+      this.clearGraphy();
       const loadings = Loading.service({
         lock: true,
         text: "Loading",
@@ -472,7 +518,7 @@ export default {
             this.getLegend();
           }
         });
-      },100);
+      }, 100);
     }
   },
   mounted() {

+ 2 - 2
vue.config.js

@@ -15,9 +15,9 @@ module.exports = {
                 },
             },
             '/serve': {
-                target: 'http://192.168.200.87:8088/',
+                // target: 'http://192.168.200.87:8088/',
                 // target: 'http://192.168.200.83:8085/',
-                // target: 'http://60.205.177.43:8080', //阿里云
+                target: 'http://60.205.177.43:8080', //阿里云
                 changeOrigin: true,
                 secure: false,
                 pathRewrite: {