From 57077308dffad746bb7d00138a3501581a6d95df Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Sun, 23 Jul 2023 18:02:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E7=BB=9C=E6=8B=93=E6=89=91=E5=9B=BE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/FactoryView/threeMap.vue      | 5 ++++-
 src/views/FactoryViewTopo/index.vue     | 2 +-
 src/views/FactoryViewTopo/statusBar.vue | 1 -
 src/views/FactoryViewTopo/threeMap.vue  | 7 +++++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/views/FactoryView/threeMap.vue b/src/views/FactoryView/threeMap.vue
index c74fda2..4e3fb2c 100644
--- a/src/views/FactoryView/threeMap.vue
+++ b/src/views/FactoryView/threeMap.vue
@@ -281,8 +281,11 @@ const init = () => {
     createLableObj(mesh_dkcj, t('messages.ControllerRoom'), { x: 0, y: 60, z: 0 })
 
     //服装军团
-    const mesh_fzjt = createFloor(t('messages.FuZhuangLegion'), 192, 236.5, { x: -133, y: 0, z: -138 })
+    const mesh_fzjt = createFloor(t('messages.FuZhuangLegion'), 192, 175, { x: -133, y: 0, z: -107.25 })
     createLableObj(mesh_fzjt, t('messages.FuZhuangLegion'), { x: 0, y: 60, z: 0 })
+    //微工厂
+    const mesh_wgc = createFloor(t('messages.微工厂'), 192, 61.5, { x: -133, y: 0, z: -225.5 })
+    createLableObj(mesh_wgc, t('messages.微工厂'), { x: 0, y: 60, z: 0 })
     //配套车间
     const mesh_ptcj = createFloor(t('messages.BigPeiTao'), 110, 236.5, { x: 18.5, y: 0, z: -138 })
     createLableObj(mesh_ptcj, t('messages.BigPeiTao'), { x: 0, y: 60, z: 0 })
diff --git a/src/views/FactoryViewTopo/index.vue b/src/views/FactoryViewTopo/index.vue
index 3e63b6a..d9ae640 100644
--- a/src/views/FactoryViewTopo/index.vue
+++ b/src/views/FactoryViewTopo/index.vue
@@ -94,7 +94,7 @@ onMounted(()=>{
   // calcRate()
   let contentBox = Acontent.value;
   // let Timedombox=Timedom.value
-  window.document.title = "传感器分布图";
+  window.document.title = "数字化工厂物联拓扑图";
   WH(contentBox);
   window.addEventListener("resize", () => {
     if (timer) {
diff --git a/src/views/FactoryViewTopo/statusBar.vue b/src/views/FactoryViewTopo/statusBar.vue
index 4bae705..da72060 100644
--- a/src/views/FactoryViewTopo/statusBar.vue
+++ b/src/views/FactoryViewTopo/statusBar.vue
@@ -95,7 +95,6 @@ watch(
   (newVal, oldVal) => {
     //监听父组件宽高变化，随时重置本组件尺寸
     reset(newVal);
-    console.log(newVal);
     
   },
   { immediate: true, deep: true, flush: "post" }
diff --git a/src/views/FactoryViewTopo/threeMap.vue b/src/views/FactoryViewTopo/threeMap.vue
index 886f96f..b4e78fa 100644
--- a/src/views/FactoryViewTopo/threeMap.vue
+++ b/src/views/FactoryViewTopo/threeMap.vue
@@ -59,7 +59,7 @@ const requires = {
     'door': require("@/assets/img/Factory/door.jpg"),
     'sky': require("@/assets/img/Factory/sky.jpg"),
     //数字化工厂物联3D图
-    'titleFloor': require("@/assets/img/Factory/screen_title.png"),
+    'titleFloor': require("@/assets/img/Factory/screen_title_topo.png"),
     'guangmao': require("@/assets/img/Factory/guangmao.jpg"),
     'ac': require("@/assets/img/Factory/ac.jpg"),
     'wifi': require("@/assets/img/Factory/wifi.jpg"),
@@ -268,8 +268,11 @@ const init = () => {
     createLableObj(mesh_dkcj, t('messages.ControllerRoom'), { x: 0, y: 60, z: 0 })
 
     //服装军团
-    const mesh_fzjt = createFloor(t('messages.FuZhuangLegion'), 192, 236.5, { x: -133, y: 0, z: -138 })
+    const mesh_fzjt = createFloor(t('messages.FuZhuangLegion'), 192, 175, { x: -133, y: 0, z: -107.25 })
     createLableObj(mesh_fzjt, t('messages.FuZhuangLegion'), { x: 0, y: 60, z: 0 })
+    //微工厂
+    const mesh_wgc = createFloor(t('messages.微工厂'), 192, 61.5, { x: -133, y: 0, z: -225.5 })
+    createLableObj(mesh_wgc, t('messages.微工厂'), { x: 0, y: 60, z: 0 })
     //配套车间
     const mesh_ptcj = createFloor(t('messages.BigPeiTao'), 110, 236.5, { x: 18.5, y: 0, z: -138 })
     createLableObj(mesh_ptcj, t('messages.BigPeiTao'), { x: 0, y: 60, z: 0 })