Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhbigscreen into dev

2024-06-27 01:14:28 +08:00 · 2024-06-27 01:14:28 +08:00 · 083066ccb5
parent e68c873e1e 5fd0617e30
commit 083066ccb5
9 changed files with 331 additions and 117 deletions
--- a/public/newmap/BIMGISEngine.js
+++ b/public/newmap/BIMGISEngine.js
--- a/public/newmap/index.html
+++ b/public/newmap/index.html
@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=1.0, initial-scale=1.0" />
+    <title>Document</title>
+    <script src="./BIMGISEngine.js"></script>
+    <style type="text/css">
+        body,html{
+            padding:0px;
+            margin: 0px;
+            overflow: hidden;
+        }
+    </style>
+  </head>
+  <body style="padding: 0px;">
+    <div id="gl_UEgineContainer" style="position: absolute;width:100%;height:100vh"></div>
+    <script>
+      //配置参数
+      //    第四步： 初始化Api
+      var filepath =
+        "http://192.168.126.200:81/Tools/output/model/5511735543582612394/root.glt"; //模型加载地址填写至此
+      //filepath="http://192.168.126.200:81/Tools/output/model/Examples/root.glt"
+      var api = new SAPI(
+        {
+          serverIP: `192.168.126.200`, //服务ip地址
+          port: 8000, //HTTP端口
+          container: `gl_UEgineContainer`, //[必须]容器id
+          secretKey:
+            "cbe8c300dfb0280d71bf6546087c6d2fa49260085f53fca8c7985b43ea81b20dc358fbf858d10d7d3324f9ea70b0331d8dc2c9223128b097ca22b68a6474753f258c47f45b34485a2edb350010e2f42cd5b388af45c6b070850288d284cbbbcd3d9dece4fe3612ac3050ceb8c6f96167dacbb11feb139bdc581d2bb89c4c29963d94c9cac057787beefd6fdb7b7fcace76d20ae002407410817c63b8ada364828a94867b381ae88ecd6668e8ca6b6d286dce7e5d799b0a175d5afe5554a43322fe0821394937a5ec4e7b1a14ad027992dae362b7584e5908b9db97bf945b86ad9d102172b1f90bd23013404ec41c18c93282a8f0c4278b094aac2870036e9468918c6819c02334fbc0f8ac6323953580d32b1cdbecb9bf3a247a6ca71dc6cfdf5ff49ef171f53e3084d7cfa131fd75565dccbfab533a0fef277050951ab91fcb8da15cff8a0a81ef5d5afe5554a43322fe0821394937a5ec4e7b1a14ad027992dae362b7584e5908b9db97bf945b86ad385ce2c805b0590210a8d2386e4f0a467b61e5b39a0300e7184d8dbba49a8569a30af95bbcb8a935ccd8737a8d59b0cca4d53873574d062a3a6090d0f582280ba3a7aebc0a7081f10629576cd3e789641f913957c57308994fdc9df330134f94052efc320a8c1a143e939c0e3b1ad476cf3630a2823a9a2d90e800d9b0be613ba7550ed054853e32510f8a6ea5c1dff9c3d61f7cf5f649cb25f0dbad9f7f66e3b446946685cead0cfac91bea061f4ff49a2f853c245297edc3d61f7cf5f649cb0f9b84173857a7b67c27928b58b4a6a65f517a43f106335ecc43571d292f54baa4596f82cf86665b367e01045009c18a2b543696b93a5bd44ca8168b5252351564bd9c490f16c1dea9075f305b1a7def6c4ca2f14918862751c9e2d23ef0bdaf41a12aca7dc1e17d6d0dca7bbdc42edf9c6396ffcf10044da26ecd334722494fc515b205e9624a4468762f63f0143583d1eeaaa85ff95ee50d8f953f44140ab40f29957f914b2241b8b27d8339b99808ee5afe26e9586ab5d8af37e5c4ae79e6405163f66e9923582cb5306674c6b68b830e510037806b9875f87ee7f76c8bdb0accf57366c2592cfabfd8a259742c4425f74ed075c660e38156b326e2f4461369f266ad62ac2edf64d1767ac6ea3d83c9ba33a4517541406791c384c597539cc1ffcdbe8f3563a1b379ce7a4782c59d98e1a918296acf4d25cb6d36cd9ab509afd54a7169bd5ac9799b7f642ad3588d5af5d673a07f23ae31cca9890fec461948b71b5d3292dc1088d769b6cce52fe1da21a053b44a16e15e3f8253971ef20b10b7b200fbc7c3d3f71e19f74e660313cf3630a2823a9a2d0acd9cb22f32e975d8b70082aab5ddbcb644d89a77efad286dee59796b124081510f8a6ea5c1dff9cb0f31d9a93422d1de95a0001376b8d685af667dd7ebaf4bdfc4840ac1126277417910a2ed0df6e3ca2026459a491059689206d702832f51afafd0506174e868c12cc462769b2e685be04514c976edd04ca2ef020dc56bee8321afe91a1dcbb1afafd0506174e8680f18f43fcd13957eef440c21db889c81888bce192514399191b48af868eda487753151533a27704469e5635404d6fdfb753151533a277044afdd825f7197f289753151533a27704484b9cf9eccaf749638930dbe9049f2ae36689b286e75a81e016aa63061505f57a8c1113b833628e3a18dff8ae8ac8eaa7a4fba6045bc9b4b", // token.txt文件内容填写至此
+          openEarth: false, //[可选]开启场景
+          bgColor: "rgba(135 ,206 ,250,1)", //[可选]bim模式场景背景色
+          sceneTime: [8, 2022, 2, 14, 13, 0], //[可选]场景时间
+        },
+        () => {
+          console.log("初始化成功"); //初始化成功后在进行其他操作，如加载模型等;
+          api.Model.add(
+            filepath, //模型加载地址
+            "175",
+            () => {
+              console.log("模型加载成功");
+            },
+            {
+              FlyTo: true,
+            }
+          );
+        }
+      );
+    </script>
+  </body>
+</html>
--- a/src/components/header.vue
+++ b/src/components/header.vue
@ -298,6 +298,12 @@ export default {
                            return it;
                        })]
                    }
+                    if(this.localStorage1==null){
+                        this.localStorage1={text: '产发集团', id: 0};
+                    }
+                    if(this.localStorage2==null){
+                        this.localStorage2={};
+                    }
                    this.setScreenLiSel1(this.localStorage1,true);
                    this.checkIsDetailSubPage();                   
                });
@ -376,6 +382,12 @@ export default {
            try {
                this.localStorage1 = JSON.parse(localStorage.getItem("data1"))
                this.localStorage2 = JSON.parse(localStorage.getItem("data2"))
+                if(this.localStorage1==null){
+                    this.localStorage1={};                    
+                }
+                if(this.localStorage2==null){
+                    this.localStorage2={};
+                }
            } catch (e) {

            }
--- a/src/pages/components/AttendanceDetailDialog.vue
+++ b/src/pages/components/AttendanceDetailDialog.vue
@ -90,7 +90,7 @@ export default {
        },
        loadData() {
            let postData = {
-                attendanceTime: this.$dt(new Date()).format("YYYY-MM-DD"),
+                attendanceTime:this.$dt(new Date()).format("YYYY-MM-DD"),
                projectId: this.projectId,
                pageSize: this.size,
                pageNum: this.index,
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@ -41,7 +41,10 @@
                    </el-col>
                    <el-col :span="12">
                        <module-one-2-1 class="center-image" label="集团项目区域分布">   
+                            <iframe src="http://192.168.126.200:12020/#/model/3a13046b-f33a-4754-ed84-48246d128ca1" style="width:100%;height:100%;border:none"></iframe>
+                            <!--
                            <iframe src="newmap/index.html" style="width:100%;height:100%;border:none" ></iframe>                            
+                            -->
                            <!--
                                <iframe src="#/map" style="width:100%;height:100%;border:none" v-if="!isLocalhost"></iframe>
                            -->                         
--- a/src/pages/photography.vue
+++ b/src/pages/photography.vue
@ -79,13 +79,13 @@ export default {
    },

    mounted() {
-        this.$bus.$on("projectChange", debounce(res => {
+        this.$bus.$on("projectChange", debounce(res => {            
            this.prj = res;
            this.prjs=this.$root.projects||this.prjs;
            this.dept=this.$root.dept||this.dept;
            this.loadData2();
        }));
-        if (this.$root.hasInitHeader) {
+        if (this.$root.hasInitHeader) {            
            this.initMe();
        }
    },
@ -99,7 +99,9 @@ export default {
        },
        loadData2() {
            this.info=null;
-            
+            this.prj = this.$root.project;
+            this.prjs=this.$root.projects||this.prjs;
+            this.dept=this.$root.dept||this.dept;
                this.$api.project.listPhotography(this.prj.id, this.dept.id || 0).then(d => {
                    let tmps = (d.data || []).map(it => {
                        it.images = this.$tryToJson(it.imageUrl);
--- a/src/pages/projectDetail.vue
+++ b/src/pages/projectDetail.vue
@ -95,7 +95,7 @@
                  今日出勤
                </div>
              </div>
-              <img src="images/icon2001.png" v-show="laborPersonnelTotal > 0"
+              <img src="images/icon2001.png" v-show="laborPersonnelTotal > 0 "
                style="position: absolute; cursor: pointer; right: 20px; top: 12px" @click="doShowAttendanceDetail" />
              <el-row :key="elDeptWorks">
                <el-col :span="8">
--- a/src/pages/projectSafety.vue
+++ b/src/pages/projectSafety.vue
@ -498,7 +498,11 @@ export default {
        },
        doSpecialRowClick(row) {
            if(this.isOneProject()){
-                row=this.$root.projects[1];
+                if(this.projectInfo.id==0){
+                    row=this.$root.projects[1];
+                }else{
+                    row=this.projectInfo;                    
+                }
                row.projectId=row.id;
            }
            row.title = row.projectName + "特种作业人员清单";
--- a/src/router/index.js
+++ b/src/router/index.js
@ -1,137 +1,278 @@
-import Vue from 'vue'
-import VueRouter from 'vue-router'
+import Vue from "vue";
+import VueRouter from "vue-router";

-Vue.use(VueRouter)
+Vue.use(VueRouter);

 const routes = [
  {
-    path: '/',
-    name: 'index',
-    meta:{nav:1,},
-    component: () => import(/* webpackChunkName: "index" */ '../pages/index.vue')
-  },  
+    path: "/",
+    name: "index",
+    meta: { nav: 1 },
+    component: () =>
+      import(/* webpackChunkName: "index" */ "../pages/index.vue"),
+  },
  {
-    path: '/map',
-    name: 'map',
-    meta:{nav:100,},
-    component: () => import(/* webpackChunkName: "map" */ '../pages/map.vue')
+    path: "/map",
+    name: "map",
+    meta: { nav: 100 },
+    component: () => import(/* webpackChunkName: "map" */ "../pages/map.vue"),
  }, 
  {
-    path: '/detail',
-    name: 'detail',
-    meta:{nav:2,},
-    component: () => import(/* webpackChunkName: "detail" */ '../pages/projectDetail.vue')
-  }, 
+    path: "/detail",
+    name: "detail",
+    meta: { nav: 2 },
+    component: () =>
+      import(/* webpackChunkName: "detail" */ "../pages/projectDetail.vue"),
+  },
  {
-    path: '/progress',
-    name: 'progress',
-    meta:{nav:5,},
-    component: () => import(/* webpackChunkName: "progress" */ '../pages/projectProgress.vue')
-  }
-  , 
+    path: "/prjSafety",
+    name: "prjSafety",
+    meta: { nav: 21 },
+    component: () =>
+      import(/* webpackChunkName: "safety" */ "../pages/projectSafety.vue"),
+  },
  {
-    path: '/quality',
-    name: 'quality',
-    meta:{nav:4,},
-    component: () => import(/* webpackChunkName: "quality" */ '../pages/projectQuality.vue')
-  } , 
+    path: "/prjQuality",
+    name: "prjQuality",
+    meta: { nav: 22 },
+    component: () =>
+      import(/* webpackChunkName: "quality" */ "../pages/projectQuality.vue"),
+  },
  {
-    path: '/concreteStrength',
-    name: 'concreteStrength',
-    meta:{nav:27,},
-    component: () => import(/* webpackChunkName: "concreteStrength" */ '../pages/quality/concreteStrength.vue')
-  } , 
+    path: "/prjProgress",
+    name: "prjProgress",
+    meta: { nav: 23 },
+    component: () =>
+      import(/* webpackChunkName: "progress" */ "../pages/projectProgress.vue"),
+  },
  {
-    path: '/standardCuringRoom',
-    name: 'standardCuringRoom',
-    meta:{nav:26,},
-    component: () => import(/* webpackChunkName: "standardCuringRoom" */ '../pages/quality/standardCuringRoom.vue')
-  }
-  , 
+    path: "/prjEngin",
+    name: "prjEngin",
+    meta: { nav: 24 },
+    component: () =>
+      import(/* webpackChunkName: "video" */ "../pages/projectEngin.vue"),
+  },
  {
-    path: '/safety',
-    name: 'safety',
-    meta:{nav:3,},
-    component: () => import(/* webpackChunkName: "safety" */ '../pages/projectSafety.vue')
-  }
-  , {
-    path: '/distributionBox',
-    name: 'distributionBox',
-    meta:{nav:23,},
-    component: () => import(/* webpackChunkName: "distributionBox" */ '../pages/safe/distributionBox.vue')
-  }
-  , {
-    path: '/dumbwaiter',
-    name: 'dumbwaiter',
-    meta:{nav:24,},
-    component: () => import(/* webpackChunkName: "dumbwaiter" */ '../pages/safe/dumbwaiter.vue')
-  }, {
-    path: '/personnelPosition',
-    name: 'personnelPosition',
-    meta:{nav:25,},
-    component: () => import(/* webpackChunkName: "personnelPosition" */ '../pages/safe/personnelPosition.vue')
-  }
-  , {
-    path: '/excavation',
-    name: 'excavation',    
-    meta:{nav:22,},
-    component: () => import(/* webpackChunkName: "excavation" */ '../pages/safe/excavation.vue')
-  }
-  , {
-    path: '/towerCrane',
-    name: 'towerCrane',
-    meta:{nav:21,},
-    component: () => import(/* webpackChunkName: "towerCrane" */ '../pages/safe/towerCrane.vue')
-  }
-  , 
+    path: "/prjVideo",
+    name: "prjVideo",
+    meta: { nav: 25 },
+    component: () =>
+      import(/* webpackChunkName: "video" */ "../pages/projectVideo.vue"),
+  },
  {
-    path: '/video',
-    name: 'video',
-    meta:{nav:61,},
-    component: () => import(/* webpackChunkName: "video" */ '../pages/projectVideo.vue')
-  }, 
+    path: "/prjAiVideo",
+    name: "aiVprjAiVideoideo",
+    meta: { nav: 26 },
+    component: () =>
+      import(/* webpackChunkName: "video" */ "../pages/toAIVideoProject.vue"),
+  },
  {
-    path: '/aiVideo',
-    name: 'aiVideo',
-    meta:{nav:62,},
-    component: () => import(/* webpackChunkName: "video" */ '../pages/toAIVideoProject.vue')
-  }, 
+    path: "/prjPhotography",
+    name: "prjPhotography",
+    meta: { nav: 27 },
+    component: () =>
+      import(/* webpackChunkName: "video" */ "../pages/photography.vue"),
+  },
  {
-    path: '/engin',
-    name: 'engin',
-    meta:{nav:7,},
-    component: () => import(/* webpackChunkName: "video" */ '../pages/projectEngin.vue')
-  }, 
+    path: "/towerCrane",
+    name: "towerCrane",
+    meta: { nav: 28 },
+    component: () =>
+      import(
+        /* webpackChunkName: "towerCrane" */ "../pages/safe/towerCrane.vue"
+      ),
+  },
  {
-    path: '/enginBUser',
-    name: 'enginBUser',
-    meta:{nav:7,},
-    component: () => import(/* webpackChunkName: "video" */ '../pages/projectEnginBUser.vue')
-  }, 
+    path: "/excavation",
+    name: "excavation",
+    meta: { nav: 29 },
+    component: () =>
+      import(
+        /* webpackChunkName: "excavation" */ "../pages/safe/excavation.vue"
+      ),
+  },
  {
-    path: '/enginAuditing',
-    name: 'enginAuditing',
-    meta:{nav:71,},
-    component: () => import(/* webpackChunkName: "video" */ '../pages/engin/auditingPage.vue')
-  }, 
+    path: "/distributionBox",
+    name: "distributionBox",
+    meta: { nav: 30 },
+    component: () =>
+      import(
+        /* webpackChunkName: "distributionBox" */ "../pages/safe/distributionBox.vue"
+      ),
+  },
  {
-    path: '/photography',
-    name: 'photography',
-    meta:{nav:63,},
-    component: () => import(/* webpackChunkName: "video" */ '../pages/photography.vue')
+    path: "/dumbwaiter",
+    name: "dumbwaiter",
+    meta: { nav: 31 },
+    component: () =>
+      import(
+        /* webpackChunkName: "dumbwaiter" */ "../pages/safe/dumbwaiter.vue"
+      ),
+  },
+  {
+    path: "/personnelPosition",
+    name: "personnelPosition",
+    meta: { nav: 32 },
+    component: () =>
+      import(
+        /* webpackChunkName: "personnelPosition" */ "../pages/safe/personnelPosition.vue"
+      ),
+  },
+  {
+    path: "/concreteStrength",
+    name: "concreteStrength",
+    meta: { nav: 33 },
+    component: () =>
+      import(
+        /* webpackChunkName: "concreteStrength" */ "../pages/quality/concreteStrength.vue"
+      ),
+  },
+  {
+    path: "/standardCuringRoom",
+    name: "standardCuringRoom",
+    meta: { nav: 33 },
+    component: () =>
+      import(
+        /* webpackChunkName: "standardCuringRoom" */ "../pages/quality/standardCuringRoom.vue"
+      ),
+  },
+  {
+    path: "/progress",
+    name: "progress",
+    meta: { nav: 5 },
+    component: () =>
+      import(/* webpackChunkName: "progress" */ "../pages/projectProgress.vue"),
+  },
+  {
+    path: "/quality",
+    name: "quality",
+    meta: { nav: 4 },
+    component: () =>
+      import(/* webpackChunkName: "quality" */ "../pages/projectQuality.vue"),
+  },
+
+  {
+    path: "/safety",
+    name: "safety",
+    meta: { nav: 3 },
+    component: () =>
+      import(/* webpackChunkName: "safety" */ "../pages/projectSafety.vue"),
+  },
+  {
+    path: "/video",
+    name: "video",
+    meta: { nav: 60 },
+    component: () =>
+      import(/* webpackChunkName: "video" */ "../pages/projectVideo.vue"),
+  },
+  {
+    path: "/aiVideo",
+    name: "aiVideo",
+    meta: { nav: 61 },
+    component: () =>
+      import(/* webpackChunkName: "video" */ "../pages/toAIVideoProject.vue"),
+  },{
+    path: "/photography",
+    name: "photography",
+    meta: { nav: 62 },
+    component: () =>
+      import(/* webpackChunkName: "video" */ "../pages/photography.vue"),
+  },
+  {
+    path: "/videoTowerCrane",
+    name: "videoTowerCrane",
+    meta: { nav: 63 },
+    component: () =>
+      import(
+        /* webpackChunkName: "towerCrane" */ "../pages/safe/towerCrane.vue"
+      ),
+  },
+  {
+    path: "/videoExcavation",
+    name: "videoExcavation",
+    meta: { nav: 64 },
+    component: () =>
+      import(
+        /* webpackChunkName: "excavation" */ "../pages/safe/excavation.vue"
+      ),
+  },
+  {
+    path: "/videoDistributionBox",
+    name: "videoDistributionBox",
+    meta: { nav: 65 },
+    component: () =>
+      import(
+        /* webpackChunkName: "distributionBox" */ "../pages/safe/distributionBox.vue"
+      ),
+  },
+  {
+    path: "/videoDumbwaiter",
+    name: "videoDumbwaiter",
+    meta: { nav: 66 },
+    component: () =>
+      import(
+        /* webpackChunkName: "dumbwaiter" */ "../pages/safe/dumbwaiter.vue"
+      ),
+  },
+  {
+    path: "/videoPersonnelPosition",
+    name: "videoPersonnelPosition",
+    meta: { nav: 67 },
+    component: () =>
+      import(
+        /* webpackChunkName: "personnelPosition" */ "../pages/safe/personnelPosition.vue"
+      ),
+  },
+  {
+    path: "/videoStandardCuringRoom",
+    name: "videoStandardCuringRoom",
+    meta: { nav: 68},
+    component: () =>
+      import(
+        /* webpackChunkName: "concreteStrength" */ "../pages/quality/concreteStrength.vue"
+      ),
+  },
+  {
+    path: "/videoConcreteStrength",
+    name: "videoConcreteStrength",
+    meta: { nav: 69 },
+    component: () =>
+      import(
+        /* webpackChunkName: "standardCuringRoom" */ "../pages/quality/standardCuringRoom.vue"
+      ),
+  },
+  {
+    path: "/engin",
+    name: "engin",
+    meta: { nav: 7 },
+    component: () =>
+      import(/* webpackChunkName: "video" */ "../pages/projectEngin.vue"),
+  },
+  {
+    path: "/enginBUser",
+    name: "enginBUser",
+    meta: { nav: 7 },
+    component: () =>
+      import(/* webpackChunkName: "video" */ "../pages/projectEnginBUser.vue"),
+  },
+  {
+    path: "/enginAuditing",
+    name: "enginAuditing",
+    meta: { nav: 71 },
+    component: () =>
+      import(/* webpackChunkName: "video" */ "../pages/engin/auditingPage.vue"),
  },
  {
    path: '/yanZhuGZAI',
    name: 'yanZhuGZAI',
    component: () => import(/* webpackChunkName: "gzaiBox" */ '../pages/gzaiBox/index.vue')
  }   
-]
+  
+];
 const router = new VueRouter({
-  mode: 'hash',
+  mode: "hash",
  base: process.env.BASE_URL,
-  routes
-})
-export {
-  routes
-}
-export default router
+  routes,
+});
+export { routes };
+export default router;