diff --git a/yanzhu-bigscreen/public/bimImages/1.png b/yanzhu-bigscreen/public/bimImages/1.png
new file mode 100644
index 00000000..ad43a030
Binary files /dev/null and b/yanzhu-bigscreen/public/bimImages/1.png differ
diff --git a/yanzhu-bigscreen/public/bimImages/2.png b/yanzhu-bigscreen/public/bimImages/2.png
new file mode 100644
index 00000000..67d50585
Binary files /dev/null and b/yanzhu-bigscreen/public/bimImages/2.png differ
diff --git a/yanzhu-bigscreen/public/bimImages/3.png b/yanzhu-bigscreen/public/bimImages/3.png
new file mode 100644
index 00000000..cfe8c4d6
Binary files /dev/null and b/yanzhu-bigscreen/public/bimImages/3.png differ
diff --git a/yanzhu-bigscreen/public/bimImages/pitMonitor.png b/yanzhu-bigscreen/public/bimImages/pitMonitor.png
new file mode 100644
index 00000000..0ed75985
Binary files /dev/null and b/yanzhu-bigscreen/public/bimImages/pitMonitor.png differ
diff --git a/yanzhu-bigscreen/public/bimImages/power.png b/yanzhu-bigscreen/public/bimImages/power.png
new file mode 100644
index 00000000..af6da13c
Binary files /dev/null and b/yanzhu-bigscreen/public/bimImages/power.png differ
diff --git a/yanzhu-bigscreen/public/bimImages/towerMonitor.png b/yanzhu-bigscreen/public/bimImages/towerMonitor.png
new file mode 100644
index 00000000..12d0093e
Binary files /dev/null and b/yanzhu-bigscreen/public/bimImages/towerMonitor.png differ
diff --git a/yanzhu-bigscreen/public/bimImages/videoMonitor.png b/yanzhu-bigscreen/public/bimImages/videoMonitor.png
new file mode 100644
index 00000000..95eea9df
Binary files /dev/null and b/yanzhu-bigscreen/public/bimImages/videoMonitor.png differ
diff --git a/yanzhu-bigscreen/public/index.html b/yanzhu-bigscreen/public/index.html
index 58ed880d..c97d6709 100644
--- a/yanzhu-bigscreen/public/index.html
+++ b/yanzhu-bigscreen/public/index.html
@@ -49,7 +49,8 @@
-
+
+
\ No newline at end of file
+
diff --git a/yanzhu-bigscreen/src/router/index.js b/yanzhu-bigscreen/src/router/index.js
index 591d0c04..c98d615f 100644
--- a/yanzhu-bigscreen/src/router/index.js
+++ b/yanzhu-bigscreen/src/router/index.js
@@ -49,9 +49,16 @@ const routes = [
{
path: "/greenCarbon",
name: "greenCarbon",
- meta: { nav: 23 },
+ meta: { nav: 6 },
component: () =>
- import(/* webpackChunkName: "progress" */ "../views/greenCarbon.vue"),
+ import(/* webpackChunkName: "greenCarbon" */ "../views/greenCarbon.vue"),
+ },
+ {
+ path: "/bimManage",
+ name: "bimManage",
+ meta: { nav: 7 },
+ component: () =>
+ import(/* webpackChunkName: "bimManage" */ "../views/bimManage.vue"),
},
{
path: "/videoMonitor",
diff --git a/yanzhu-bigscreen/src/views/bimManage.vue b/yanzhu-bigscreen/src/views/bimManage.vue
new file mode 100644
index 00000000..734a3923
--- /dev/null
+++ b/yanzhu-bigscreen/src/views/bimManage.vue
@@ -0,0 +1,552 @@
+
+
+
+
+
+
+
+
+
![]()
+
![]()
+
aaa
+
+
+
+
+
+
+
+
diff --git a/yanzhu-ui-vue3/src/views/bim/bimSetting/ModelFloorTree.vue b/yanzhu-ui-vue3/src/views/bim/bimSetting/ModelFloorTree.vue
index f92d70b4..bc62848b 100644
--- a/yanzhu-ui-vue3/src/views/bim/bimSetting/ModelFloorTree.vue
+++ b/yanzhu-ui-vue3/src/views/bim/bimSetting/ModelFloorTree.vue
@@ -144,6 +144,11 @@ export default {
console.log("加载模型成功");
cb && cb();
this.$emit("change");
+ setTimeout(()=>{
+ api.Camera.getViewPort(p=>{
+ this.$emit("modelAdd",p);
+ });
+ },1000);
}
);
},
diff --git a/yanzhu-ui-vue3/src/views/bim/bimSetting/index.vue b/yanzhu-ui-vue3/src/views/bim/bimSetting/index.vue
index e9c84683..393c0463 100644
--- a/yanzhu-ui-vue3/src/views/bim/bimSetting/index.vue
+++ b/yanzhu-ui-vue3/src/views/bim/bimSetting/index.vue
@@ -1,55 +1,30 @@