gs-bim-air 3.0.3 → 3.0.5

package/src/viewerWrapper/panels/collision/collisionPanel.ts

@@ -1,127 +0,0 @@
-import { CollisionObjects } from "gs-bim-air-core/gsDevFx/objects/collisionObjects";
-import Panel from "../panel";
-import { Viewer } from "gs-bim-air-core/gsDevFx/viewer";
-import { CollisionType } from "gs-longan";
-import renderObjectsService from "../../../api/renderObjectService";
-import { CollisionObject } from "gs-bim-air-core/gsDevFx/objects/collisionObject";
-import getRelatedIds from "../../module/getRelatedIds";
-import { TreeNodeObject } from "gs-bim-air-core/gsDevFx/objects/treeNodeObject";
-import { modelService } from "../../../api/modelService";
-
-export interface Collision {
-  // compaire: string;
-  segObj1: TreeNodeObject;
-  segObj2: TreeNodeObject;
-  // keyOne: number;
-  // keyTwo: number;
-  // pathOne: string;
-  // pathTwo: string;
-  collsionPos: number[];
-  collisionType: CollisionType;
-}
-import * as Panels from "gs-bim-air-core/panels";
-
-export default class CollisionPanel extends Panels.CollisionPanel {
-  collisions: CollisionObject[];
-  // collisionObjects: CollisionObjects;
-  // collisionObjectJsonList: any[];
-
-  panelComponent: Panel;
-  constructor(viewer: Viewer) {
-    super(viewer);
-  }
-
-  show() {
-    if (!this.panelComponent) {
-      this.panelComponent = new Panel(this, () => import("./interfaceCollisionPanel.vue"));
-    }
-    this.panelComponent.show();
-
-    // // let renderObject = this.viewer.process.renderObject;
-
-    // // let ids = getRelatedIds(this.viewer);
-
-    // // let collisionObjects = this.viewer.process.findRenderObject("CollisionObjects");
-    // // if (!collisionObjects) {
-    // //   collisionObjects = new CollisionObjects();
-    // //   this.viewer.process.addRenderObject(renderObject, collisionObjects);
-    // // }
-    // // renderObjectsService.getRenderObjectsRelated("CollisionObject", ids, this.viewer.options.tag).then((data: any) => {
-    // //   if (data) {
-    // //     this.collisionObjectJsonList = data;
-    // //     this.generateCollision();
-    // //     data.forEach((item) => {
-    // //       let collisionObject = new CollisionObject();
-    // //       collisionObject.deserialize(item);
-    // //       this.viewer.process.addRenderObject(collisionObjects, collisionObject);
-    // //     });
-    // //   }
-    // // });
-    // this.getCollisions();
-    super.show();
-  }
-
-  hide() {
-    this.panelComponent.hide();
-    super.hide();
-  }
-
-  // getCollisions(): Promise<any[]> {
-  //   let ids = getRelatedIds(this.viewer);
-
-  //   return modelService.getCollisions("", ids).then((data: any) => {
-  //     // this.collisions = data.map((item) => {
-  //     //   item.imageUrl = this.getImageUrl(item.imageId);
-  //     //   return item;
-  //     // });
-  //     this.collisions = data.sort((a, b) => new Date(b.createTime).getTime() - new Date(a.createTime).getTime());
-  //     this.generateCollision(this.collisions);
-  //     return this.collisions;
-  //   });
-  // }
-
-  // generateCollision(collisions) {
-  //   if (collisions) {
-  //     this.componentData = collisions;
-  //   }
-  // }
-
-  // deleteCollision(id) {
-  //   let viewPoint = this.collisions.find((obj) => obj.id === id) || null;
-
-  //   let index = this.collisions.indexOf(viewPoint);
-  //   return modelService.deleteCollision(id).then((data: any) => {
-  //     this.collisions.splice(index, 1);
-  //     // this.generateViewPointObjectList(this.collisions);
-  //   });
-  // }
-
-  // /**
-  //  *
-  //  * @param collisionName 碰撞名字
-  //  * @param oneTreeNodeObjects 碰撞的一组构件
-  //  * @param twoTreeNodeObjects 碰撞的另一组构件
-  //  * @param collisionType 碰撞类型
-  //  * @param softCollisionDistance 软碰撞距离
-  //  * @returns
-  //  */
-  // computeObjectCollisions(
-  //   collisionName: string,
-  //   oneTreeNodeObjects: TreeNodeObject[],
-  //   twoTreeNodeObjects: TreeNodeObject[],
-  //   collisionType: CollisionType,
-  //   softCollisionDistance?: number
-  //   // cb?: (total: number, current: number) => void,
-  //   // computeInvisible: boolean = true
-  // ): Promise<any> {
-  //   return modelService.createCollision({
-  //     name: collisionName,
-  //     type: collisionType,
-  //     distance: softCollisionDistance,
-  //     groups: [
-  //       { modelId: oneTreeNodeObjects[0].modelId, nodes: oneTreeNodeObjects.map((item) => item.path) },
-  //       { modelId: twoTreeNodeObjects[0].modelId, nodes: twoTreeNodeObjects.map((item) => item.path) },
-  //     ],
-  //   });
-  // }
-}

package/src/viewerWrapper/panels/collision/interfaceCollisionItemPanel.vue

@@ -1,219 +0,0 @@
-<template>
-  <!-- v-loading="collisionTableDataLoading"
-    :element-loading-text="collisionTableDataLoadingText"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)" -->
-  <div class="showCollision">
-    <el-table
-      :data="collisionTableData"
-      :row-class-name="tableRowClassName"
-      @row-click="tableRowClick"
-      :row-style="{ cursor: 'pointer' }"
-      height="70vh"
-      style="width: 100%">
-      <el-table-column type="index" label="碰撞ID" width="80"></el-table-column>
-      <el-table-column label="碰撞对比" min-width="200">
-        <template slot-scope="scope">
-          <span
-            :style="{
-              backgroundColor: activeRowIndex === scope.row.index ? 'rgba(255,0,0,0.5)' : '',
-            }">
-            {{ scope.row.name1 }}
-            <!-- {{ scope.row.segObj1.componentId }}  -->
-          </span>
-          ,
-          <br v-if="scope.row.name1.length > 14" />
-          <span
-            :style="{
-              backgroundColor: activeRowIndex === scope.row.index ? 'rgba(0,0,255,0.5)' : '',
-            }">
-            {{ scope.row.name2 }}
-            <!-- {{ scope.row.segObj2.componentId }} -->
-          </span>
-        </template>
-      </el-table-column>
-      <el-table-column label="类型" width="80" prop="type"></el-table-column>
-    </el-table>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Inject, Prop, Vue, Watch } from "vue-property-decorator";
-import CommandShowCollision from "./collisionItemPanel";
-import { uniqueByProperty } from "../../../utils/dataUtility";
-import { Viewer } from "gs-bim-air-core/gsDevFx/viewer";
-import CollisionItemPanel from "./collisionItemPanel";
-
-@Component({
-  components: {},
-})
-export default class InterfaceCollisionItemPanel extends Vue {
-  @Prop() componentData;
-  @Inject() getViewer;
-
-  calcSoftCollisionChecked = false;
-  calcTouchCollisionChecked = false;
-  collisionTableDataLoading = false;
-  collisionTableDataLoadingText = "0/0";
-  collisionTableData = [];
-  activeRowIndex = null;
-
-  get viewer(): Viewer {
-    return this.getViewer();
-  }
-
-  get commandData() {
-    let commandData = this.componentData || {
-      name: "",
-      isCompute: false,
-      data: "",
-      collisionTableDataLoadingText: "0/0",
-    };
-    if (commandData.collisionResult) {
-      this.getCollisionListJson(commandData.collisionResult);
-    }
-    if (commandData.name) {
-      this.$emit("setSubTitle", commandData.name);
-    }
-    if (commandData.collisionTableDataLoadingText) {
-      this.collisionTableDataLoadingText = commandData.collisionTableDataLoadingText;
-    }
-    return commandData;
-  }
-
-  @Watch("componentData", { deep: true })
-  onIsComputeChange(val, oldVal) {
-    if (this.componentData.isCompute) {
-      this.collisionCheck();
-    }
-    if (this.componentData.name) {
-      this.$emit("setSubTitle", this.componentData.name);
-    }
-    if (this.componentData.collisionResult) {
-      this.getCollisionListJson(this.componentData.collisionResult);
-    }
-    if (this.componentData.collisionTableDataLoadingText) {
-      this.collisionTableDataLoadingText = this.componentData.collisionTableDataLoadingText;
-    }
-  }
-
-  getCollisionListJson(data) {
-    this.collisionTableDataLoading = true;
-    // axios.get(`/file-service/files/${data}`).then((data: any) => {
-    // console.log("data", data);
-    // 碰撞对比列表去重
-    // this.collisionTableData = uniqueByProperty(data, "compaire");
-    this.collisionTableData = data;
-    this.collisionTableDataLoading = false;
-    // });
-  }
-
-  collisionCheck() {
-    if (this.commandData.isCompute) {
-      this.collisionTableDataLoading = true;
-    } else {
-      this.collisionTableDataLoading = false;
-    }
-  }
-
-  touchCollisionValueChange() {}
-
-  softCollisionValueChange() {}
-
-  tableRowClassName({ row, rowIndex }) {
-    // 把每一行的索引放进row
-    row.index = rowIndex;
-  }
-
-  tableRowClick(row) {
-    // let commandShowCollision = this.viewer.process.commandManager.currentCommand as CommandShowCollision;
-    this.viewer.panelManager.getPanelByName<CollisionItemPanel>("CollisionItemPanel").selectCollision(row);
-    console.log("tableRowClick", row);
-    this.activeRowIndex = row.index;
-  }
-
-  setData() {
-    this.$emit("setData", {
-      title: "模型碰撞",
-      // left: "calc(50% - 400px)",
-      right: "80px",
-      top: "20px",
-    });
-  }
-
-  mounted() {
-    this.setData();
-    this.collisionCheck();
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/scss/site";
-
-.showCollision {
-  padding: 0 10px;
-}
-
-:deep(.el-table) {
-  background: $model-theme;
-  // width: 600px;
-
-  .el-table__header-wrapper {
-    th {
-      background: $model-theme-light;
-      // background: transparent;
-      color: white;
-      border-bottom: 1px solid $model-theme-light;
-    }
-  }
-  tr {
-    background: transparent;
-  }
-
-  .el-table__body-wrapper {
-    tr {
-      // background: $model-theme-light;
-      background: transparent;
-      color: white;
-
-      td {
-        padding: 6px 0;
-        border-bottom: 1px solid $model-theme-light;
-      }
-    }
-  }
-
-  .el-table__body tr:hover > td {
-    background-color: #2d313f;
-  }
-}
-
-.el-table:before {
-  height: 0;
-}
-
-.setting-wrapper {
-  text-align: left;
-  display: flex;
-  justify-content: space-between;
-
-  .el-button {
-    // margin: 0 20px;
-  }
-
-  .el-checkbox {
-    color: white;
-    margin: 0 20px;
-  }
-
-  .el-slider {
-    width: 150px;
-    display: inline-block;
-    vertical-align: middle;
-    margin-left: 20px;
-    height: 32px;
-    margin-top: -3px;
-  }
-}
-</style>