Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd

yanzhu-bigscreen/src/api/bim.js

@@ -108,6 +108,13 @@ const roamingGet=data=>{
   });
 }
 
+const getPlanList=projectId=>{
+   return request({
+    url: `/manage/plan/list?pageNum=1&pageSize=1000&projectId=${projectId}`,
+    method: "get"
+  });
+}
+
 export default {
   listBimModel,
   modelPropertyByExternalId,
@@ -121,5 +128,6 @@ export default {
   modelTreeAllChild,
   getTreeAllLeafChild,
   viewpointGet,
-  roamingGet
+  roamingGet,
+  getPlanList
 };

yanzhu-bigscreen/src/utils/request.js

@@ -16,7 +16,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 200000,
+  timeout: 20000000,
 });
 
 // request拦截器

yanzhu-bigscreen/src/views/bim4DSimulation.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="bim-4d-simulation main-page">
-    <div v-if="hasLoad">
+    <div v-if="hasLoad" class="div-plan">
-      <gantt-elastic :options="options" :tasks="taskList" @tasks-changed="tasksUpdate" @options-changed="optionsUpdate" @dynamic-style-changed="styleUpdate">
+      <gantt-elastic :options="options" :tasks="taskList" :dynamicStyle="planStyle" @tasks-changed="tasksUpdate" @options-changed="optionsUpdate" @dynamic-style-changed="styleUpdate">
-        <gantt-header slot="header" :options="optionList" v-if="1==2"></gantt-header>
+        <gantt-header slot="header" :options="optionList" v-if="1 == 2"></gantt-header>
       </gantt-elastic>
     </div>
   </div>
@@ -19,7 +19,7 @@ let options = {
   maxRows: 100,
   maxHeight: 500,
   title: {
-    label: "Your project title as html (link or whatever...)",
+    label: "任务列表",
     html: false,
   },
   row: {
@@ -27,7 +27,7 @@ let options = {
   },
   calendar: {
     hour: {
-      display: true,
+      display: false,
     },
   },
   chart: {
@@ -51,51 +51,30 @@ let options = {
       },
       {
         id: 2,
-        label: "Description",
+        label: "任务名称",
         value: "label",
         width: 200,
         expander: true,
         html: true,
-        events: {
-          click({ data, column }) {
-            alert("description clicked!\n" + data.label);
-          },
-        },
       },
       {
         id: 3,
-        label: "Assigned to",
+        label: "任务工期",
-        value: "user",
+        value: "days",
-        width: 130,
+        width: 120,
-        html: true,
-      },
-      {
-        id: 3,
-        label: "Start",
-        value: (task) => dayjs(task.start).format("YYYY-MM-DD"),
-        width: 78,
       },
       {
         id: 4,
-        label: "Type",
+        label: "开始时间",
-        value: "type",
+        value: "start",
-        width: 68,
+        width: 120,
       },
+
       {
         id: 5,
-        label: "%",
+        label: "结束时间",
-        value: "progress",
+        value: "end",
-        width: 35,
+        width: 120,
-        style: {
-          "task-list-header-label": {
-            "text-align": "center",
-            width: "100%",
-          },
-          "task-list-item-value-container": {
-            "text-align": "center",
-            width: "100%",
-          },
-        },
       },
     ],
   },
@@ -108,23 +87,36 @@ let options = {
     "Before/After": "时间跨度",
     "Display task list": "显示列头",
     weekdays: ["周日", "周一", "周二", "周三", "周四", "周五", "周六"],
-    months: [
+    months: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
-      "一月",
-      "二月",
-      "三月",
-      "四月",
-      "五月",
-      "六月",
-      "七月",
-      "八月",
-      "九月",
-      "十月",
-      "十一月",
-      "十二月",
-    ],
   },
 };
-
+let ganttStyle = {
+  "main-view": {
+    background: "#06445b81",
+  },
+  "main-container-wrapper": {
+    overflow: "hidden",
+    "border-top": "1px solid #eee",
+    "border-bottom": "1px solid #eee",
+  },
+  calendar: {
+    background: "transparent",
+  },
+  'chart-row-text': {
+      background:"transparent",
+      'border-radius': '0px',
+      color: '#fff',
+    },
+    'task-list-expander-border': {
+      fill: '#00f1ff',
+      stroke: '#003357',
+    },
+     'chart-expander-border': {
+      fill: '#00f1ff',
+      stroke: '#000000A0',
+    },
+    
+};
 export default {
   components: {
     ganttElastic,
@@ -134,10 +126,12 @@ export default {
   data() {
     return {
       dpi: "",
+      selProject: null,
       elId: 1,
       taskList: [],
       options,
       hasLoad: false,
+      planStyle: ganttStyle,
     };
   },
   beforeDestroy() {
@@ -157,204 +151,102 @@ export default {
         this.selProject = prj;
         this.elId++;
         //this.initEngine();
+        this.initPlanList();
       })
     );
     this.selProject = this.$store.getters.selProject;
     document.body.classList.add("is-sapi");
-    //this.initEngine();
+    this.initPlanList();
-    function getDate(hours) {
-      const currentDate = new Date();
-      const currentYear = currentDate.getFullYear();
-      const currentMonth = currentDate.getMonth();
-      const currentDay = currentDate.getDate();
-      const timeStamp = new Date(currentYear, currentMonth, currentDay, 0, 0, 0).getTime();
-      return new Date(timeStamp + hours * 60 * 60 * 1000).getTime();
-    }
-    this.taskList = [
-      {
-        id: 1,
-        label: "Make some noise",
-        user: '<a href="https://www.google.com/search?q=John+Doe" target="_blank" style="color:#0077c0;">John Doe</a>',
-        start: getDate(-24 * 5),
-        duration: 15 * 24 * 60 * 60 * 1000,
-        percent: 85,
-        type: "project",
-        //collapsed: true,
-      },
-      {
-        id: 2,
-        label: "With great power comes great responsibility",
-        user: '<a href="https://www.google.com/search?q=Peter+Parker" target="_blank" style="color:#0077c0;">Peter Parker</a>',
-        parentId: 1,
-        start: getDate(-24 * 4),
-        duration: 4 * 24 * 60 * 60 * 1000,
-        percent: 50,
-        type: "milestone",
-        collapsed: true,
-        style: {
-          base: {
-            fill: "#1EBC61",
-            stroke: "#0EAC51",
-          },
-        },
-      },
-      {
-        id: 3,
-        label: "Courage is being scared to death, but saddling up anyway.",
-        user: '<a href="https://www.google.com/search?q=John+Wayne" target="_blank" style="color:#0077c0;">John Wayne</a>',
-        parentId: 2,
-        start: getDate(-24 * 3),
-        duration: 2 * 24 * 60 * 60 * 1000,
-        percent: 100,
-        type: "task",
-      },
-      {
-        id: 4,
-        label: "Put that toy AWAY!",
-        user: '<a href="https://www.google.com/search?q=Clark+Kent" target="_blank" style="color:#0077c0;">Clark Kent</a>',
-        start: getDate(-24 * 2),
-        duration: 2 * 24 * 60 * 60 * 1000,
-        percent: 50,
-        type: "task",
-        dependentOn: [3],
-      },
-      {
-        id: 5,
-        label: "One billion, gajillion, fafillion... shabadylu...mil...shabady......uh, Yen.",
-        user: '<a href="https://www.google.com/search?q=Austin+Powers" target="_blank" style="color:#0077c0;">Austin Powers</a>',
-        parentId: 4,
-        start: getDate(0),
-        duration: 2 * 24 * 60 * 60 * 1000,
-        percent: 10,
-        type: "milestone",
-        style: {
-          base: {
-            fill: "#0287D0",
-            stroke: "#0077C0",
-          },
-        },
-      },
-      {
-        id: 6,
-        label: "Butch Mario and the Luigi Kid",
-        user: '<a href="https://www.google.com/search?q=Mario+Bros" target="_blank" style="color:#0077c0;">Mario Bros</a>',
-        parentId: 5,
-        start: getDate(24),
-        duration: 1 * 24 * 60 * 60 * 1000,
-        percent: 50,
-        type: "task",
-        collapsed: true,
-        style: {
-          base: {
-            fill: "#8E44AD",
-            stroke: "#7E349D",
-          },
-        },
-      },
-      {
-        id: 7,
-        label: "Devon, the old man wanted me, it was his dying request",
-        user: '<a href="https://www.google.com/search?q=Knight+Rider" target="_blank" style="color:#0077c0;">Knight Rider</a>',
-        parentId: 2,
-        dependentOn: [6],
-        start: getDate(24 * 2),
-        duration: 4 * 60 * 60 * 1000,
-        percent: 20,
-        type: "task",
-        collapsed: true,
-      },
-      {
-        id: 8,
-        label: "Hey, Baby! Anybody ever tell you I have beautiful eyes?",
-        user: '<a href="https://www.google.com/search?q=Johhny+Bravo" target="_blank" style="color:#0077c0;">Johhny Bravo</a>',
-        parentId: 7,
-        dependentOn: [7],
-        start: getDate(24 * 3),
-        duration: 1 * 24 * 60 * 60 * 1000,
-        percent: 0,
-        type: "task",
-      },
-      {
-        id: 9,
-        label: "This better be important, woman. You are interrupting my very delicate calculations.",
-        user: '<a href="https://www.google.com/search?q=Dexter\'s+Laboratory" target="_blank" style="color:#0077c0;">Dexter\'s Laboratory</a>',
-        parentId: 8,
-        dependentOn: [8, 7],
-        start: getDate(24 * 4),
-        duration: 4 * 60 * 60 * 1000,
-        percent: 20,
-        type: "task",
-        style: {
-          base: {
-            fill: "#8E44AD",
-            stroke: "#7E349D",
-          },
-        },
-      },
-      {
-        id: 10,
-        label: "current task",
-        user: '<a href="https://www.google.com/search?q=Johnattan+Owens" target="_blank" style="color:#0077c0;">Johnattan Owens</a>',
-        start: getDate(24 * 5),
-        duration: 24 * 60 * 60 * 1000,
-        percent: 0,
-        type: "task",
-      },
-      {
-        id: 11,
-        label: "test task",
-        user: '<a href="https://www.google.com/search?q=Johnattan+Owens" target="_blank" style="color:#0077c0;">Johnattan Owens</a>',
-        start: getDate(24 * 6),
-        duration: 24 * 60 * 60 * 1000,
-        percent: 0,
-        type: "task",
-      },
-      {
-        id: 12,
-        label: "test task",
-        user: '<a href="https://www.google.com/search?q=Johnattan+Owens" target="_blank" style="color:#0077c0;">Johnattan Owens</a>',
-        start: getDate(24 * 7),
-        duration: 24 * 60 * 60 * 1000,
-        percent: 0,
-        type: "task",
-        parentId: 11,
-      },
-      {
-        id: 13,
-        label: "test task",
-        user: '<a href="https://www.google.com/search?q=Johnattan+Owens" target="_blank" style="color:#0077c0;">Johnattan Owens</a>',
-        start: getDate(24 * 8),
-        duration: 24 * 60 * 60 * 1000,
-        percent: 0,
-        type: "task",
-      },
-      {
-        id: 14,
-        label: "test task",
-        user: '<a href="https://www.google.com/search?q=Johnattan+Owens" target="_blank" style="color:#0077c0;">Johnattan Owens</a>',
-        start: getDate(24 * 9),
-        duration: 24 * 60 * 60 * 1000,
-        percent: 0,
-        type: "task",
-      },
-      {
-        id: 15,
-        label: "test task",
-        user: '<a href="https://www.google.com/search?q=Johnattan+Owens" target="_blank" style="color:#0077c0;">Johnattan Owens</a>',
-        start: getDate(24 * 16),
-        duration: 24 * 60 * 60 * 1000,
-        percent: 0,
-        type: "task",
-      },
-    ];
-    this.hasLoad = true;
   },
   methods: {
-    tasksUpdate() {},
+    initPlanList() {
-    optionsUpdate() {},
+      if (this.selProject?.id) {
-    styleUpdate() {},
+        this.$api.bim.getPlanList(this.selProject.id).then((res) => {
+          this.taskList = (res.data || []).map((item) => {
+            let o = {
+              id: item.taskId,
+              user: '<a href="https://www.google.com/search?q=Johnattan+Owens" target="_blank" style="color:#0077c0;">Johnattan Owens</a>',
+              parentId: item.parentId == 0 ? null : item.parentId,
+              label: item.taskName,
+              start: item.planStartDate,
+              end: item.planEndDate,
+              duration: item.taskDuation * 24 * 60 * 60 * 1000,
+              days: item.taskDuation + "(天)",
+              collapsed: false,
+              gis: this.$tryToJson(item.bimId, {}),
+              type: item.parentId == 0 ? "project" : "milestone",
+              style: {
+                base: {
+                  fill: "#3da2ff",
+                  stroke: "#003357",
+                },
+              },
+              data: item,
+            };
+            return o;
+          });
+          this.hasLoad = true;
+        });
+      }
+    },
+    tasksUpdate() {
+      console.log("---tasksUpdate->");
+    },
+    optionsUpdate() {
+      console.log("---optionsUpdate>");
+    },
+    styleUpdate(a) {
+      console.log("--styleUpdate-->", a);
+    },
   },
 };
 </script>
 
-<style lang="less"></style>
+<style lang="less">
+.bim-4d-simulation {
+  .div-plan {
+    .gantt-elastic__main-view {
+      .gantt-elastic__task-list-header-column {
+        background: transparent !important;
+      }
+      .gantt-elastic__task-list-item-value {
+        color: deepskyblue !important;
+        background: transparent !important;
+      }
+      .gantt-elastic__main-view-container {
+        .gantt-elastic__calendar {
+          background: transparent !important;
+          .gantt-elastic__calendar-row-text {
+            color: deepskyblue !important;
+          }
+        }
+      }
+      .gantt-elastic__chart-calendar-container {
+        border-bottom: solid 1px rgb(238, 238, 238);
+      }
+      .gantt-elastic__calendar-row{
+        &.gantt-elastic__calendar-row--month{
+          border-bottom: solid 1px rgb(238, 238, 238);
+        }
+      }
+      .gantt-elastic__chart-scroll-container{
+        scrollbar-color: deepskyblue transparent;
+        scrollbar-track-color: transparent;
+        -ms-overflow-style: -ms-autohiding-scrollbar; /* IE and Edge */
+        scrollbar-width: thin; /* Firefox */
+        &::-webkit-scrollbar {
+          width: 8px;
+          height: 8px;
+        }
+        &::-webkit-scrollbar-thumb {
+          background-color: deepskyblue;
+          border-radius: 4px;
+        }
+        &::-webkit-scrollbar-track {
+          background-color: transparent;
+        }
+      }
+    }
+  }
+}
+</style>

yanzhu-bigscreen/src/views/bimBriefing.vue

@@ -22,7 +22,7 @@
                 }"
                 node-key="key"
                 @check="onCheckTree"
-                 :load="loadNode"
+                :load="loadNode"
                 lazy
                 show-checkbox></el-tree>
             </div>
@@ -35,7 +35,7 @@
     <div class="div-right" :class="{ isShow: leftShow, isHide: !leftShow }">
       <transition name="right">
         <div class="data-content" v-show="leftShow">
-          <div class="div-row r66">
+          <div class="div-row r100">
             <div class="row-title">
               <svg-icon icon-class="signal"></svg-icon>
               {{ title }}
@@ -115,7 +115,7 @@
             </div>
           </div>
 
-          <div class="div-row r33">
+          <div class="div-row r33" v-if="1==2">
             <div class="row-title">
               <svg-icon icon-class="signal"></svg-icon>
               进度信息
@@ -302,7 +302,7 @@ export default {
         this.getTreeChildren(node, resolve);
       }
     },
-     getTreeChildren(node, resolve) {
+    getTreeChildren(node, resolve) {
       let that = this;
       let data = node.data;
       this.$api.bim.getModelTree(data.modelId, data.glid).then((d) => {
@@ -379,11 +379,13 @@ export default {
       if (node.type == "root") {
         if (checked) {
           that.models.forEach((it) => {
+            it.visible = true;
             api.Model.setVisible(it.modelId, true);
             api.Model.original(it.modelId);
           });
         } else {
           that.models.forEach((it) => {
+            it.visible = false;
             api.Model.setVisible(it.modelId, false);
           });
         }
@@ -391,12 +393,14 @@ export default {
         if (checked) {
           api.Model.setVisible(node.modelId, true);
           api.Model.original(node.modelId);
+          this.models.find((mm) => mm.modelId == node.modelId).visible = true;
         } else {
           api.Model.setVisible(node.modelId, false);
+          this.models.find((mm) => mm.modelId == node.modelId).visible = false;
         }
       } else {
         let isPartLoad = false;
-        if (event.checkedKeys.length == 1 && checked) {
+        if (!this.models.find((mm) => mm.modelId == node.modelId).visible && checked) {
           isPartLoad = true;
         }
         let selFeatureIds = [];
@@ -415,10 +419,13 @@ export default {
         } else {
           if (isPartLoad) {
             api.Model.setVisible(node.modelId, true);
+            this.models.find((mm) => mm.modelId == node.modelId).visible = true;
             api.Model.original(node.modelId);
-            let tmpsIds2 = tmps.splice(0, 1000);
+            if(tmps.length>0){
-            api.Feature.showFeatures(tmpsIds2.join("#"));
+              let tmpsIds2 = tmps.splice(0, 1000);
-            this.setFeatueVisible(tmps, true);
+              api.Feature.showFeatures(tmpsIds2.join("#"));
+              this.setFeatueVisible(tmps, true);
+            }
           } else {
             this.setFeatueVisible(tmps, true);
           }
@@ -528,7 +535,13 @@ export default {
           projectId: this.selProject.id,
         })
         .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.$message.error("暂无模型，请先关联模型");
           } else {
@@ -537,7 +550,7 @@ export default {
               item.gis = JSON.parse(item.gisJson);
               this.addModel(item.lightweightName);
               this.doSelectMenu(7);
-               setTimeout(() => {
+              setTimeout(() => {
                 this.$refs.tree.setChecked(item.lightweightName, true, true);
               }, 3000);
             });
@@ -694,6 +707,9 @@ export default {
       &.r66 {
         height: calc(100% - 180px);
       }
+      &.r100{
+        height: 100%;
+      }
     }
   }
 
@@ -904,7 +920,7 @@ export default {
       span {
         font-size: 20px;
         position: relative;
-        top:-6px;
+        top: -6px;
       }
     }
 

yanzhu-bigscreen/src/views/bimRoaming.vue

@@ -124,7 +124,7 @@ export default {
       roamingLoading: true,
       selectedRoam: null,
       modelLoaded: false,
-      isPlay:false,
+      isPlay: false,
     };
   },
   mounted() {
@@ -216,12 +216,13 @@ export default {
     },
     playIRPause(data) {
       data.play = 2;
-      this.isPlay=false;
+      this.isPlay = false;
+
       bimRoadmApi.Camera.pauseImmersiveRoam(false);
     },
     playContinue(data) {
       data.play = 1;
-      this.isPlay=true;
+      this.isPlay = true;
       bimRoadmApi.Camera.pauseImmersiveRoam(true);
     },
     playCancle(data) {
@@ -261,14 +262,14 @@ export default {
         api.Camera.startImmersiveRoam([65.702301, 670.785328, 851.817162]);
         setTimeout(() => {
           this.selectedRoam = data;
-          this.isPlay=true;
+          this.isPlay = true;
           api.Camera.playImmersiveRoam({
             records: record,
             isLoopPlay: this.autoPlay,
             complete: function () {
               this.selectedRoam = null;
               data.play = 0;
-              this.isPlay=false;
+              this.isPlay = false;
             },
           });
         }, 400);
@@ -281,18 +282,20 @@ export default {
         this.$message.error("模型未加载完成，请稍后重试");
         return;
       }
-      if(this.isPlay){
+      if (this.isPlay) {
         this.playCancle();
       }
       let checked = event.checkedNodes.includes(node);
       if (node.type == "root") {
         if (checked) {
           that.models.forEach((it) => {
+            it.visible = true;
             api.Model.setVisible(it.modelId, true);
             api.Model.original(it.modelId);
           });
         } else {
           that.models.forEach((it) => {
+            it.visible = false;
             api.Model.setVisible(it.modelId, false);
           });
         }
@@ -300,12 +303,14 @@ export default {
         if (checked) {
           api.Model.setVisible(node.modelId, true);
           api.Model.original(node.modelId);
+          this.models.find((mm) => mm.modelId == node.modelId).visible = true;
         } else {
           api.Model.setVisible(node.modelId, false);
+          this.models.find((mm) => mm.modelId == node.modelId).visible = false;
         }
       } else {
         let isPartLoad = false;
-        if (event.checkedKeys.length == 1 && checked) {
+        if (!this.models.find((mm) => mm.modelId == node.modelId).visible && checked) {
           isPartLoad = true;
         }
         let selFeatureIds = [];
@@ -324,6 +329,7 @@ export default {
         } else {
           if (isPartLoad) {
             api.Model.setVisible(node.modelId, true);
+            this.models.find((mm) => mm.modelId == node.modelId).visible = true;
             api.Model.original(node.modelId);
             let tmpsIds2 = tmps.splice(0, 1000);
             api.Feature.showFeatures(tmpsIds2.join("#"));
@@ -433,7 +439,13 @@ export default {
           projectId: this.selProject.id,
         })
         .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.error("暂无模型，请先关联模型");
           } else {

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/utils/request.js

@@ -22,7 +22,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: import.meta.env.VITE_APP_BASE_API,
   // 超时
-  timeout: 60000,
+  timeout: 6000000,
 });
 
 // request拦截器

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>