Procházet zdrojové kódy

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

YaolongHan před 4 roky
rodič
revize
d007d70d5c

+ 3 - 2
src/components/edit/attr_select.vue

@@ -296,6 +296,7 @@ import bus from "@/bus";
 import "vue-swatches/dist/vue-swatches.css";
 import { SLineStyle } from "@saga-web/graph/lib";
 import { uploadImg, queryGlsmsLocation,queryGlsmsAsset } from "@/api/editer.js";
+import {getUrlMsg}  from '@/components/urlMsg.js'
 export default {
   name: "attr_select",
   props: ["type", "focusItemList"],
@@ -538,7 +539,7 @@ export default {
        }else{
          params = {locationList:['']};
        }
-       queryGlsmsLocation({plazaId: '1000423'},params).then(res=>{
+       queryGlsmsLocation({plazaId: getUrlMsg().projectId},params).then(res=>{
          this.spinning = false;
          if(res.data.result =='success'){
            this.attrCards = res.data.data||[];
@@ -553,7 +554,7 @@ export default {
        }else{
          params = {assetnumList:['']};
        }
-       queryGlsmsAsset({plazaId: '1000423'},params).then(res=>{
+       queryGlsmsAsset({plazaId: getUrlMsg().projectId},params).then(res=>{
          this.spinning = false;
          if(res.data.result =='success'){
            this.attrCards = res.data.data||[];

+ 4 - 2
src/components/edit/edit-dialog.vue

@@ -66,6 +66,8 @@
     import searchTree from "@/components/edit/search_tree";
     import {queryGlsmsasset ,getQuerySmsxt,getPlazaFloor,getQuerySmsxtBy,queryWzfldl,queryWzflByDl,queryGlsmsLocation} from "@/api/editer";
     import bus from "@/bus";
+    import {getUrlMsg}  from '@/components/urlMsg.js'
+
     export default {
         name: "edit-dialog",
         components: {searchTree},
@@ -192,7 +194,7 @@
           //获取表格数据
           queryGlsmsasset(){
             let data = {
-              plazaId: '1000423',//广场id 必填
+              plazaId: getUrlMsg().projectId,//广场id 必填
               page: this.page,//页数
               size: this.size,//条数
             }
@@ -294,7 +296,7 @@
           //获取楼层
           getPlazaFloor(){
               let data = {
-                plazaId:'1000423'
+                plazaId:getUrlMsg().projectId
               }
             getPlazaFloor(data).then(res =>{
               if(res.result == 'success'){

+ 6 - 4
src/components/edit/left_toolbar.vue

@@ -99,10 +99,10 @@
                 <div class="title">{{item.Name}}</div>
                 <ul class="example">
                   <li
-                    @click="getexampleItem(items,indexs)"
+                    @click="getexampleItem(items,indexs,index)"
                     v-for="(items,indexs) in item.GraphElements"
                     :key="indexs"
-                    :class="[activeIndex==indexs?'active-li':'']"
+                    :class="[activeIndexs==indexs &&activeIndex==index ?'active-li':'']"
                   >
                     <img
                       :class="['item',`item-${items.Type}`]"
@@ -261,7 +261,8 @@ export default {
       itemList: [], //图例数组
       categoryIdS: [],
       categoryId: "",
-      activeIndex: -1, //选中的图例
+      activeIndex: -1, //选中的图例的父级
+      activeIndexs: -1, //选中的图例
       drawerVisible: false,
       spinning: false,
       showDrawerItem: {},
@@ -342,8 +343,9 @@ export default {
         a.isChoice = false;
       });
     },
-    getexampleItem(item,index) {
+    getexampleItem(item,indexs,index) {
       this.activeIndex = index;
+      this.activeIndexs = indexs;
       this.$emit("toolActionClick", item);
     },
     // 提取元素

+ 22 - 0
src/components/urlMsg.js

@@ -0,0 +1,22 @@
+export function getUrlMsg() {
+    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("&");
+console.log("paramsArr", paramsArr);
+const obj = {};
+paramsArr.map(item => {
+    const arr = item.split("=");
+    obj[arr[0]] = arr[1];
+});
+// this.urlMsg = obj;
+    return  obj
+}