فهرست منبع

新主题,先不要发版

ZaiZai 1 سال پیش
والد
کامیت
173433ff9e
4فایلهای تغییر یافته به همراه59 افزوده شده و 55 حذف شده
  1. 2 2
      package.json
  2. 11 12
      src/styles/page/using/bim.scss
  3. 37 37
      src/views/using/bim.vue
  4. 9 4
      yarn.lock

+ 2 - 2
package.json

@@ -18,10 +18,10 @@
         "dayjs": "^1.11.10",
         "echarts": "^5.4.2",
         "element-plus": "^2.4.1",
-        "hc-vue3-ui": "^2.3.5",
+        "hc-vue3-ui": "^2.3.6",
         "js-base64": "^3.7.5",
         "js-cookie": "^3.0.5",
-        "js-fast-way": "^0.2.9",
+        "js-fast-way": "^0.3.0",
         "js-md5": "^0.8.3",
         "js-web-screen-shot": "^1.9.9",
         "nprogress": "^0.2.0",

+ 11 - 12
src/styles/page/using/bim.scss

@@ -1,10 +1,11 @@
-.el-card.hc-bim-card-box .el-card__body .hc-card-main-box {
+.hc-bim-card-box {
     .el-scrollbar__bar {
         right: -15px;
     }
     .bim-echarts-box {
         height: 500px;
         padding: 0;
+        box-shadow: none;
         .bim-echarts {
             position: relative;
             height: 100%;
@@ -12,8 +13,9 @@
         }
     }
     .bim-table-box {
-        height: 340px;
+        height: auto;
         margin-top: 24px;
+        box-shadow: none;
         .table-btn-icon {
             background: white;
             border-radius: 50px;
@@ -32,22 +34,19 @@
         }
     }
 }
-
 html.dark {
-    .el-card.hc-bim-card-box {
-        border: 0;
-        box-shadow: none;
-        --el-card-padding: 24px 0;
-        --el-card-border-radius: 0;
-        .el-card__body {
-            padding-bottom: 0;
-        }
+    .hc-bim-card-box {
         .bim-echarts-box {
             border: 1px solid var(--el-color-primary);
         }
         .bim-table-box {
-            height: 360px;
             padding: 0;
+            border: 0;
+            margin-top: 14px;
+            border-radius: 0;
+            .el-card__body {
+                padding: 0;
+            }
         }
     }
 }

+ 37 - 37
src/views/using/bim.vue

@@ -1,23 +1,23 @@
 <template>
-    <HcCard scrollbar ui="hc-bim-card-box">
-        <HcCardItem ui="bim-echarts-box">
-            <div id="bimId" class="bim-echarts"/>
-        </HcCardItem>
-        <HcCardItem ui="bim-table-box" style="height: auto;">
-            <HcTable :isIndex="false" :column="tableColumn" :datas="tableData">
-                <template #action="{row,index}">
+    <hc-body scrollbar ui="hc-bim-card-box">
+        <hc-new-card ui="bim-echarts-box">
+            <div id="bimId" class="bim-echarts" />
+        </hc-new-card>
+        <hc-new-card ui="bim-table-box">
+            <HcTable :is-index="false" :column="tableColumn" :datas="tableData" is-new>
+                <template #action="{ row, index }">
                     <div class="table-btn-icon">
-                        <HcIcon name="file-search"/>
+                        <HcIcon name="file-search" />
                     </div>
                 </template>
             </HcTable>
-        </HcCardItem>
-    </HcCard>
+        </hc-new-card>
+    </hc-body>
 </template>
 
 <script setup>
-import {onMounted, ref} from "vue";
-import bimApi from "~api/using/bim.js";
+import { onMounted, ref } from 'vue'
+import bimApi from '~api/using/bim'
 
 onMounted(() => {
     getModelviewApi()
@@ -36,34 +36,34 @@ const getModelviewApi = async () => {
 
 const bim3D = ref(null)
 const initBimface = (viewToken) => {
-    let loaderConfig = new BimfaceSDKLoaderConfig();
+    let loaderConfig = new BimfaceSDKLoaderConfig()
     loaderConfig.viewToken = viewToken
     BimfaceSDKLoader.load(loaderConfig, (viewMetaData) => {
-        let domShow = document.getElementById('bimId');
-        let webAppConfig = new Glodon.Bimface.Application.WebApplication3DConfig();
-        webAppConfig.domElement = domShow;
-        let app = new Glodon.Bimface.Application.WebApplication3D(webAppConfig);
-        app.addView(viewToken);
-        let viewer3D = app.getViewer();
+        let domShow = document.getElementById('bimId')
+        let webAppConfig = new Glodon.Bimface.Application.WebApplication3DConfig()
+        webAppConfig.domElement = domShow
+        let app = new Glodon.Bimface.Application.WebApplication3D(webAppConfig)
+        app.addView(viewToken)
+        let viewer3D = app.getViewer()
 
         //设置背景色
-        let monochrome = new Glodon.Web.Graphics.Color(9, 11, 98, 0);
-        viewer3D.setBackgroundColor(monochrome);
+        let monochrome = new Glodon.Web.Graphics.Color(9, 11, 98, 0)
+        viewer3D.setBackgroundColor(monochrome)
 
         bim3D.value = viewer3D
 
         //加载完成监听
-        viewer3D.addEventListener(Glodon.Bimface.Viewer.Viewer3DEvent.ViewAdded, initModel);
+        viewer3D.addEventListener(Glodon.Bimface.Viewer.Viewer3DEvent.ViewAdded, initModel)
 
         //新增模型监听
         //this.viewer3D.addEventListener(Glodon.Bimface.Viewer.Viewer3DEvent.ModelAdded, this.translateModel);
 
         //点击监听
-        viewer3D.addEventListener(Glodon.Bimface.Viewer.Viewer3DEvent.MouseClicked, setTableData);
+        viewer3D.addEventListener(Glodon.Bimface.Viewer.Viewer3DEvent.MouseClicked, setTableData)
     }, (error) => {
         console.log(error)
         //this.$message.error(error);
-    });
+    })
 }
 
 //加载完成监听
@@ -71,27 +71,27 @@ const initModel = () => {
     const modalFileId = '2019513822914752'
     bim3D.value?.getModel(modalFileId).overrideAllComponentsColor(new Glodon.Web.Graphics.Color('#6D6D6D'))
     setTimeout(() => {
-        bim3D.value?.setModelScale(modalFileId, { x: 0, y: 0, z: 0 }, 7);
-        bim3D.value?.render();
-    }, 1);
+        bim3D.value?.setModelScale(modalFileId, { x: 0, y: 0, z: 0 }, 7)
+        bim3D.value?.render()
+    }, 1)
 }
 
 //表格
 const tableColumn = ref([
-    {key:'construction', name: '施工部位'},
-    {key:'date', name: '施工日期', width: 180, align: 'center'},
-    {key:'leading', name: '现场负责人', width: 160, align: 'center'},
-    {key:'supervisor', name: '监理', width: 120, align: 'center'},
-    {key:'dataType', name: '资料状态', width: 120, align: 'center'},
-    {key:'measureType', name: '计量状态', width: 120, align: 'center'},
-    {key:'action', name: '查看', width: 90, align: 'center'},
+    { key:'construction', name: '施工部位' },
+    { key:'date', name: '施工日期', width: 180, align: 'center' },
+    { key:'leading', name: '现场负责人', width: 160, align: 'center' },
+    { key:'supervisor', name: '监理', width: 120, align: 'center' },
+    { key:'dataType', name: '资料状态', width: 120, align: 'center' },
+    { key:'measureType', name: '计量状态', width: 120, align: 'center' },
+    { key:'action', name: '查看', width: 90, align: 'center' },
 ])
 const tableData = ref([])
 
 //点击监听
 const setTableData = (data) => {
     if (data?.objectId !== '63-98-67-14-88-28-D9-3C-BE-AD-19-02-C4-21-DA-0A') {
-        tableData.value = [];
+        tableData.value = []
         return
     }
     tableData.value = [
@@ -110,7 +110,7 @@ const setTableData = (data) => {
             supervisor: '杨昌玮',
             dataType: '已审批',
             measureType:'已计量',
-        },{
+        }, {
             construction: '[EK0+423.807瞿塘峡互通E匝道桥17#桥墩17-2人工挖孔桩成桩检查]',
             date: '2021.11.22~2021.12.20',
             leading: '陈远红、朱永波',
@@ -181,7 +181,7 @@ const setTableData = (data) => {
             supervisor: '杨昌玮',
             dataType: '已审批',
             measureType:'已计量',
-        }
+        },
     ]
 }
 </script>

+ 9 - 4
yarn.lock

@@ -1329,10 +1329,10 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-hc-vue3-ui@^2.3.5:
-  version "2.3.5"
-  resolved "http://47.110.251.215:9000/hc-vue3-ui/-/hc-vue3-ui-2.3.5.tgz#7fc3f55bce6db0b2635e4dfb420d7f54340eba36"
-  integrity sha512-+Fb7ru8D2Xln6E1Mxs+nfylQSRUM/AraFAbLKrLwjzrf7VNACmBjvwNP7qQIsEvN4tERo17/Jkt8Sw6uq/l89A==
+hc-vue3-ui@^2.3.6:
+  version "2.3.6"
+  resolved "http://47.110.251.215:9000/hc-vue3-ui/-/hc-vue3-ui-2.3.6.tgz#85f467be377ff856f980e12290f3744cc547ee62"
+  integrity sha512-CM+XRWUeppY0u7I9/8TD5j4si9ai0rF+tzCsIi2anKfVk3p/eqT6OS5MFIjhS8HxGZdcws2poSYWwlDlztAj5w==
   dependencies:
     axios "^1.6.0"
     dayjs "^1.11.10"
@@ -1455,6 +1455,11 @@ js-fast-way@^0.2.9:
   resolved "http://47.110.251.215:9000/js-fast-way/-/js-fast-way-0.2.9.tgz#fd193f1a63644315331274474232d18d2c494c35"
   integrity sha512-ORSz9K/vLBu0Xo9dXgAS9nbqi35BsooPZYj1EpkjOWEVQ8hz3dUFGwTG2r7huZyxxnWd2fXoZwSe0X77aPwhlg==
 
+js-fast-way@^0.3.0:
+  version "0.3.0"
+  resolved "http://47.110.251.215:9000/js-fast-way/-/js-fast-way-0.3.0.tgz#787fe8a5a8949620fc77f646e636e2440bf7086b"
+  integrity sha512-Ed0+crf2RQJ9S7EdcIerYQ1nasWYHIal/D5LsqQne0Gx+DN69kQKpk0q754f/qIiF9yVRrnav6rT0CzTmFnjvA==
+
 js-md5@^0.8.3:
   version "0.8.3"
   resolved "http://47.110.251.215:9000/js-md5/-/js-md5-0.8.3.tgz#921bab7efa95bfc9d62b87ee08a57f8fe4305b69"