修改计算选择BIM功能

yanzhu-ui-vue3/src/api/bim/bimModel.js

@@ -78,4 +78,12 @@ export function getModelFeatureInfo(name,externalId){
     url: "/manage/bim/modelInfo/getModelFeatureInfo/" + name+"?externalId="+externalId,
     method: "get"
   });
+}
+
+export function modelTreeAllLeafChildByGlids(name,glids){
+  return request({
+    url: "/manage/bim/modelInfo/modelTreeAllLeafChildByGlids/" + name,
+    method: "post",
+    data: glids
+  });
 }

yanzhu-ui-vue3/src/views/bim/bimSetting/ModelFloorTree.vue

@@ -9,27 +9,20 @@
         </el-icon>
       </span>
     </div>
-    <!-- <a-tree
+    <div class="scroll-box model-tree">
-            checkable
+      <el-tree
-            class="model-tree"
+        :key="treeKey"
-            :tree-data="modelTrees"
+        ref="tree"
-            :load-data="onLoadData"
+        :props="{
-            :replace-fields="replaceFields"
+          children: 'children',
-            @check="onCheckTree"
+          label: 'title',
-            v-model="checkedKeys"
+          isLeaf: 'leaf',
-            :selectedKeys="selectedKeys"
+        }"
-            @select="onSelect"
+        node-key="key"
-            default-expand-all
+        @check="onCheckTree"
-        >
+        :load="loadNode"
-            <template #title="{text}">
+        lazy
-                <span>
+        show-checkbox></el-tree>
-                    {{text.name}}
-                    <a-icon type="loading" v-show="text.disableCheckbox" />
-                </span>
-            </template>
-        </a-tree>-->
-    <div class="scroll-box">
-      <a-tree ref="tree" v-model:expandedKeys="expandedKeys" @check="onCheckTree" v-model:selectedKeys="selectedKeys" :tree-data="modelTrees" checkable default-expand-all :load-data="loadTree"></a-tree>
     </div>
   </div>
 </template>
@@ -51,6 +44,7 @@ export default {
         key: "glid",
         value: "glid",
       },
+      treeKey: 0,
       expandedKeys: [],
       visibleList: [], //结构树显示构件列表
       checkedKeys: [], //用于清除选中状态
@@ -98,6 +92,66 @@ export default {
     this.$nextTick(() => {});
   },
   methods: {
+    loadNode(node, resolve) {
+      let that = this;
+      if (node.level == 0) {
+        let nd = [
+          {
+            title: "项目模型",
+            level: 0,
+            type: "root",
+            key: "root",
+            children: [],
+            hadLoad: true,
+          },
+        ];
+
+        resolve(nd);
+        setTimeout(() => {
+          document.querySelectorAll(".model-floor-tree .model-tree .el-tree-node")[0].click();
+        }, 1000);
+      } else if (node.level == 1) {
+        let nd = [];
+
+        that.$parent.models.forEach((d) => {
+          let mnd = {
+            title: d.modelName,
+            level: 1,
+            type: "model",
+            hasLoad: false,
+            modelId: d.lightweightName,
+            key: d.lightweightName,
+            externalId: "0",
+            glid: "",
+            children: [],
+            data: d,
+          };
+          nd.push(mnd);
+        });
+        resolve(nd);
+      } else {
+        this.getTreeChildren(node, resolve);
+      }
+    },
+    getTreeChildren(node, resolve) {
+      let that = this;
+      let data = node.data;
+      getModelTree(data.modelId, data.glid).then((d) => {
+        let tmps = (d.data || []).map((it) => {
+          let title = it.externalId == 0 ? it.name : it.externalId;
+          title = title.replaceAll('"', "").replaceAll("'", "").replaceAll("\\", "");
+          it.title = title;
+          it.key = it.glid;
+          it.modelId = data.modelId;
+          it.type = "data";
+          it.leaf = +it.externalId != 0;
+          let o = this.convertFeatureInfo(it, data.modelId);
+          return o;
+        });
+        //addToAllFeatures(that, tmps);
+        resolve(tmps);
+      });
+    },
     loadTree(a, b, c) {
       return new Promise((resolve, reject) => {
         if (a.hasLoad) {
@@ -126,8 +180,17 @@ export default {
         });
       });
     },
+    convertFeatureInfo(o, modelId) {
+      o.modelId = modelId;
+      o.featureId = o.modelId + "^" + o.externalId;
+      o.name = o.name || "";
+      o.name = o.name.replaceAll('"', "").replaceAll("'", "").replaceAll("\\", "");
+      o.info = `[${o.externalId}]${o.groupname}-${o.name}`;
+      return o;
+    },
     addModel(modelId, cb) {
       let url = `${window.config.modelUrl}/Tools/output/model/${modelId}/root.glt`;
+      console.log("加载模型：" + url);
       api.Model.add(
         url,
         modelId,
@@ -144,79 +207,49 @@ export default {
         }
       );
     },
-    onCheckTree(heckedKeys, e) {
+    onCheckTree(checkNode, event) {
-      const checkNode = e.node.dataRef;
+      let checked = event.checkedNodes.includes(checkNode);
-      const checked = e.checked;
+      let models = this.$parent.models;
-      const halfChecked = e.node.halfChecked;
       if (checkNode.type == "root") {
         if (checked) {
-          checkNode.children.forEach((m) => {
+          models.forEach((m) => {
-            if (halfChecked) {
+            m.visible = true;
-              if (api.m_model.has(m.modelId)) {
+            if (api.m_model.has(m.modelId)) {
-                api.Model.remove(m.modelId);
+              api.Model.setVisible(m.modelId, true);
-              }
+              api.Model.original(m.modelId);
-              this.addModel(m.modelId);
-              this.$emit("change");
             } else {
-              if (api.m_model.has(m.modelId)) {
+              this.addModel(m.modelId);
-                api.Model.setVisible(m.modelId, true);
-                this.$emit("change");
-              } else {
-                this.addModel(m.modelId);
-              }
             }
           });
+          this.$emit("change");
         } else {
-          if (api.m_model.size == 0) {
+          models.forEach((m) => {
-            return;
+            api.Model.setVisible(m.modelId, false);
-          }
+            m.visible = false;
-          checkNode.children.forEach((m) => {
-            if (api.m_model.has(m.modelId)) {
-              api.Model.remove(m.modelId);
-              this.$emit("change");
-            }
           });
         }
         return;
       }
       if (checkNode.type == "model") {
         if (checked) {
-          if (halfChecked) {
+          api.Model.setVisible(checkNode.modelId, true);
-            if (api.m_model.has(checkNode.modelId)) {
+          api.Model.original(checkNode.modelId);
-              api.Model.remove(checkNode.modelId);
+          this.projectMessage.find((mm) => mm.modelId == checkNode.modelId).visible = true;
-            }
+          this.$emit("change");
-            this.addModel(checkNode.modelId);
-            this.$emit("change");
-          } else {
-            if (api.m_model.has(checkNode.modelId)) {
-              api.Model.setVisible(checkNode.modelId, true);
-              this.$emit("change");
-            } else {
-              this.addModel(checkNode.modelId);
-            }
-          }
         } else {
-          if (api.m_model.has(checkNode.modelId)) {
+          api.Model.setVisible(checkNode.modelId, false);
-            api.Model.remove(checkNode.modelId);
+          this.projectMessage.find((mm) => mm.modelId == checkNode.modelId).visible = false;
-            this.$emit("change");
+          this.$emit("change");
-          }
         }
         return;
       }
-      if (api.m_model.size == 0) {
+      this.showItem(checkNode, event);
-        let modelId = checkNode.modelId;
-        this.addModel(modelId, () => {
-          this.showItem(e, heckedKeys);
-        });
-      } else {
-        this.showItem(e, heckedKeys);
-      }
     },
-    async showItem(e, checkedKeys) {
+    async showItem(checkNode, event) {
-      const node = e.node.dataRef;
+      const node = checkNode;
-      const checked = e.checked;
+      let checked = event.checkedNodes.includes(checkNode);
       let isPartLoad = false;
-      if (checkedKeys.length == 1 && checked) {
+      if (!this.projectMessage.find((mm) => mm.modelId == node.modelId).visible && checked) {
         isPartLoad = true;
       }
       let selFeatureIds = [];
@@ -234,11 +267,20 @@ export default {
         this.setFeatueVisible(tmps, false);
       } else {
         if (isPartLoad) {
-          api.Model.setVisible(node.modelId, true);
+          let func = () => {
-          api.Model.original(node.modelId);
+            api.Model.original(node.modelId);
-          let tmpsIds2 = tmps.splice(0, 1000);
+            let tmpsIds2 = tmps.splice(0, 1000);
-          api.Feature.showFeatures(tmpsIds2.join("#"));
+            api.Feature.showFeatures(tmpsIds2.join("#"));
-          this.setFeatueVisible(tmps, true);
+            this.setFeatueVisible(tmps, true);
+          };
+          if (!api.m_model.has(node.modelId)) {
+            this.addModel(node.modelId, func);
+          } else {
+            api.Model.setVisible(node.modelId, true);
+            this.$parent.models.find((d) => d.modelId == node.modelId).visible = true;
+            api.Model.original(node.modelId);
+            func();
+          }
         } else {
           this.setFeatueVisible(tmps, true);
         }
@@ -247,6 +289,9 @@ export default {
     setFeatueVisible(featureIds, show) {
       let len = 1000;
       let cnt = featureIds.length;
+      if(cnt==0){
+        return;
+      }
       for (let i = 0; i < cnt; i += len) {
         api.Feature.setVisible(featureIds.slice(i, i + len).join("#"), show);
       }
@@ -262,71 +307,6 @@ export default {
         return o;
       });
     },
-    async showItem2(e) {
-      const checkNode = e.node.dataRef;
-      const checked = e.checked;
-      api.Model.setVisible(checkNode.modelId, true);
-      this.$emit("change");
-      let externalId = checkNode.externalId;
-      if (externalId != 0) {
-        if (checked) {
-          this.visibleList.push(externalId);
-          api.Feature.setVisible(this.visibleList.join("#"), true, checkNode.modelId, false);
-        } else {
-          this.visibleList = this.visibleList.filter((item) => item !== externalId);
-          api.Feature.setVisible(externalId, false, checkNode.modelId);
-        }
-      } else {
-        e.node.disableCheckbox = true;
-        const res = await getTreeAllLeafChild(checkNode.modelId, checkNode.glid);
-        let nodes = (res.data || []).map((d) => d.glid);
-        if (nodes.length > 0) {
-          if (checked) {
-            this.visibleList = this.MergeArray(nodes, this.visibleList);
-            api.Model.setVisible(checkNode.modelId, true);
-            this.$emit("change");
-            api.Feature.setVisible(this.visibleList.join("#"), true, checkNode.modelId, false);
-          } else {
-            this.visibleList = this.DelArray(this.visibleList, nodes);
-            api.Feature.setVisible(nodes.join("#"), false, checkNode.modelId);
-          }
-        }
-      }
-    },
-    MergeArray(arr1, arr2) {
-      var _arr = new Array();
-      for (var i = 0; i < arr1.length; i++) {
-        _arr.push(arr1[i]);
-      }
-      for (var i = 0; i < arr2.length; i++) {
-        var flag = true;
-        for (var j = 0; j < arr1.length; j++) {
-          if (arr2[i] == arr1[j]) {
-            flag = false;
-            break;
-          }
-        }
-        if (flag) {
-          _arr.push(arr2[i]);
-        }
-      }
-      return _arr;
-    },
-    DelArray(array1, array2) {
-      var result = [];
-      for (var i = 0; i < array1.length; i++) {
-        var k = 0;
-        for (var j = 0; j < array2.length; j++) {
-          if (array1[i] != array2[j]) {
-            k++;
-            if (k == array2.length) {
-              result.push(array1[i]);
-            }
-          }
-        }
-      }
-      return result;
-    },
   },
 };
 </script>
@@ -336,6 +316,7 @@ export default {
   position: absolute;
   width: 300px;
   top: 20px;
+  height: 80vh;
   left: 20px;
   color: #fff;
   background: #274754;
@@ -404,5 +385,29 @@ export default {
       text-align: left;
     }
   }
+  .model-tree {
+    height: calc(100% - 60px);
+    overflow-y: auto;
+    .el-tree {
+      background: transparent;
+      color: #eee;
+      .el-checkbox {
+        color: #45fdfe;
+      }
+      .el-tree-node {
+        &:focus {
+          & > .el-tree-node__content {
+            background: #3489d966;
+            &:hover {
+              background: #3489d966;
+            }
+          }
+        }
+        .el-tree-node__content:hover {
+          background: #3489d966;
+        }
+      }
+    }
+  }
 }
 </style>

yanzhu-ui-vue3/src/views/bim/bimSetting/index.vue

@@ -213,7 +213,13 @@ export default {
         comId: this.currentComId,
         projectId: this.currentPrjId,
       }).then((d) => {
-        this.models = d.rows || [];
+         this.models = (d.rows || []).map((it) => {
+          it.modelId = it.lightweightName;
+          it.visible=false;
+          it.checked = true;
+          it.gis = this.$tryToJson(it.gisJson || "{}", {});
+          return it;
+        });
         if (this.models.length == 0) {
           this.$modal.msgError("暂无模型，请先关联模型");
         } else {

yanzhu-ui-vue3/src/views/bim/sandTableSetting/index.vue

@@ -363,7 +363,7 @@ export default {
     },
     addModel(modelId, cb) {
       let url = `${window.config.modelUrl}/Tools/output/model/${modelId}/root.glt`;
-      console.log(modelId, url);
+      console.log("开始加载模型:",modelId, url);
       sandSettingApi.Model.add(
         url,
         modelId,

yanzhu-ui-vue3/src/views/manage/plan/bimSelectTools2.js

@@ -1,5 +1,5 @@
 import { modelTreeAllChild } from "@/api/bim/bim";
-import { getModelTree, getTreeAllLeafChild, getModelFeatureInfo, getModelFeatureInfos } from "@/api/bim/bimModel";
+import { getModelTree, getTreeAllLeafChild, getModelFeatureInfo, getModelFeatureInfos, modelTreeAllLeafChildByGlids } from "@/api/bim/bimModel";
 import { MergeArray, DelArray } from "@/utils/index";
 import { ElMessage } from "element-plus";
 function selectFeature(that, featureId) {
@@ -229,7 +229,6 @@ function getModelFeatures(that, modelId) {
       }
       that.allFeatures.push(o);
     });
-
   });
 }
 
@@ -261,7 +260,7 @@ function onCheckTree(that, node, event) {
   }
 }
 
-let maxLen=1000;
+let maxLen = 500;
 //根据选择控制构件的隐藏和显示
 async function setTreeNodeChecked(that, node, event) {
   let api = bimSelectionDlgApi;
@@ -270,23 +269,27 @@ async function setTreeNodeChecked(that, node, event) {
     if (checked) {
       that.models.forEach((it) => {
         api.Model.setVisible(it.modelId, true);
+        it.visible = true;
         api.Model.original(it.modelId);
       });
     } else {
       that.models.forEach((it) => {
         api.Model.setVisible(it.modelId, false);
+        it.visible = false;
       });
     }
   } else if (node.type == "model") {
     if (checked) {
       api.Model.setVisible(node.modelId, true);
+      that.models.find((d) => d.modelId == node.modelId).visible = true;
       api.Model.original(node.modelId);
     } else {
       api.Model.setVisible(node.modelId, false);
+      that.models.find((d) => d.modelId == node.modelId).visible = false;
     }
   } else {
     let isPartLoad = false;
-    if (event.checkedKeys.length == 1 && checked) {
+    if (!that.models.find((d) => d.modelId == node.modelId).visible && checked) {
       isPartLoad = true;
     }
     let selFeatureIds = [];
@@ -305,33 +308,46 @@ async function setTreeNodeChecked(that, node, event) {
       .filter((it) => !that.readlyParts.includes(it))
       .filter((it) => !selitemsFeatureIds.includes(it));
     if (!checked) {
-       setFeatueVisible(tmps,false);
+      setFeatueVisible(tmps, false);
     } else {
       if (isPartLoad) {
-        api.Model.setVisible(node.modelId, true);
-        api.Model.original(node.modelId);
         selitemsFeatureIds.forEach((it) => {
           tmps.push(it);
         });
-        let tmpsIds2=tmps.splice(0,maxLen);
+        if (tmps.length == 0) {
-        api.Feature.showFeatures(tmpsIds2.join("#"));
+          return;
-        setFeatueVisible(tmps,true)
+        }
+        let func = () => {
+          let tmpsIds2 = tmps.splice(0, maxLen);
+          api.Feature.showFeatures(tmpsIds2.join("#"));
+          setFeatueVisible(tmps, true);
+        };
+        if (!api.m_model.has(node.modelId)) {
+          that.addModel(node.modelId, func);
+        } else {
+          api.Model.setVisible(node.modelId, true);
+          that.models.find((d) => d.modelId == node.modelId).visible = true;
+          api.Model.original(node.modelId);
+          func();
+        }
       } else {
-        setFeatueVisible(tmps,true);
+        setFeatueVisible(tmps, true);
       }
     }
   }
   setFeatueShowOrHide(that);
 }
 
-function setFeatueVisible(featureIds,show){
+function setFeatueVisible(featureIds, show) {
-  let len=maxLen;
+  let len = maxLen;
-   let api = bimSelectionDlgApi;
+  let api = bimSelectionDlgApi;
-   let cnt=featureIds.length;
+  let cnt = featureIds.length;
-   for(let i=0;i<cnt;i+=len){
+  if (cnt == 0) {
-    api.Feature.setVisible(featureIds.slice(i,i+len).join("#"),show);
+    return;
-   }
+  }
-
+  for (let i = 0; i < cnt; i += len) {
+    api.Feature.setVisible(featureIds.slice(i, i + len).join("#"), show);
+  }
 }
 
 async function getNodeLeafs(that, node) {
@@ -499,6 +515,44 @@ function addToAllFeatures(that, features) {
   });
 }
 
+async function selectTreeData(that) {
+  let api = bimSelectionDlgApi;
+  let nodes = that.$refs.tree.getCheckedNodes();
+  if (nodes.length == 0) {
+    return;
+  }
+  let obj = {};
+  nodes.forEach((d) => {
+    let modelId = d.modelId;
+    if (!obj[modelId]) {
+      obj[modelId] = [];
+    }
+    obj[modelId].push(d.glid);
+  });
+  for (let modelId in obj) {
+    let glids = obj[modelId];
+    if (glids.length > 0) {
+      let res = await modelTreeAllLeafChildByGlids(modelId, glids);
+      (res.data || []).forEach((o) => {
+        o = convertFeatureInfo(o, modelId);
+        if (o.externalId != "0") {
+          if (!that.allParts.includes(o.featureId)) {
+            that.allParts.push(o.featureId);
+          }
+        }
+        that.allFeatures.push({
+          featureId: o.featureId,
+          info: o.info,
+        });
+        if (!that.selectItems.find((it) => it.featureId == o.featureId) && !that.readlyParts.includes(o.featureId) && !that.hideParts.includes(o.featureId)) {
+          that.selectItems.push(o);
+          api.Feature.setColor(o.featureId, "rgba(255,0,255,1)");
+        }
+      });
+    }
+  }
+}
+
 export default {
   selectSingle,
   initBim,
@@ -509,4 +563,5 @@ export default {
   boxSelection,
   hideSelection,
   loadNode,
+  selectTreeData,
 };

yanzhu-ui-vue3/src/views/manage/plan/bimSelectionDialog2.vue

@@ -76,6 +76,11 @@
             <svg-icon icon-class="boundselect" />
           </div>
         </el-tooltip>
+        <el-tooltip placement="top" content="全选树上所有已选择构件">
+          <div class="footer-btn" @click="doMenu(5)" :class="activeMenu == 5 ? 'is-active' : ''">
+            <svg-icon icon-class="skill" />
+          </div>
+        </el-tooltip>
         <el-tooltip placement="top" content="隐藏构件">
           <div class="footer-btn" @click="doMenu(4)" :class="activeMenu == 4 ? 'is-active' : ''">
             <svg-icon icon-class="hide" />
@@ -225,6 +230,9 @@ export default {
           this.activeMenu = 4;
           bimTools.hideSelection(this);
           break;
+        case 5:
+          bimTools.selectTreeData(this);
+          break;
       }
     },
     showDialog(plan) {
@@ -329,6 +337,7 @@ export default {
       }).then((d) => {
         this.models = (d.rows || []).map((it) => {
           it.modelId = it.lightweightName;
+          it.visible=false;
           it.checked = true;
           it.gis = this.$tryToJson(it.gisJson || "{}", {});
           return it;
@@ -345,6 +354,7 @@ export default {
     },
     addModel(modelId, cb) {
       let url = `${window.config.modelUrl}/Tools/output/model/${modelId}/root.glt`;
+      this.models.find(d=>d.modelId==modelId).visible=true;
       bimSelectionDlgApi.Model.add(
         url,
         modelId,
@@ -402,7 +412,7 @@ export default {
         height: calc(100% - 180px);
         border-radius: 5px;
         &.is-hide {
-          height: 45px;
+          height: 54px;
         }
         .div-left-title {
           height: 100%;
@@ -457,7 +467,7 @@ export default {
       position: absolute;
       bottom: 6vh;
       left: 50%;
-      margin-left: -75px;
+      margin-left: -120px;
       background: #274754;
       border-radius: 4px;
 

yanzhu-ui-vue3/src/views/manage/plan/index.vue

@@ -59,7 +59,9 @@
           <span v-else style="color: #8e9aaf">未关联BIM</span>
           <span style="margin-left: 8px; cursor: pointer">
             <el-tooltip append-to="" content="关联BIM模型" placement="top">
+              <span>
               <svg-icon icon-class="position" style="cursor: pointer" class="icon-blue" @click="handleBim(scope.row)" />
+              </span>
             </el-tooltip>
           </span>
           </template>