From 50253a443ff091527736edd55e94624118115a4b Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Fri, 26 May 2023 18:06:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E5=B8=83=E5=9B=BE?=
 =?UTF-8?q?=20back?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/FactoryView/threeMap.vue                     | 2 +-
 src/views/MechanicalView_dajian/content/statusBar.vue  | 7 ++++++-
 src/views/MechanicalView_dajian/index.vue              | 2 +-
 src/views/MechanicalView_hanjie/content/statusBar.vue  | 7 ++++++-
 src/views/MechanicalView_jijia/content/statusBar.vue   | 7 ++++++-
 src/views/MechanicalView_jingjia/content/statusBar.vue | 7 ++++++-
 src/views/MechanicalView_jingshi/content/statusBar.vue | 7 ++++++-
 src/views/realtimeSecurityJixiefenchang/index.vue      | 2 +-
 8 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/views/FactoryView/threeMap.vue b/src/views/FactoryView/threeMap.vue
index eae77f1..b3327af 100644
--- a/src/views/FactoryView/threeMap.vue
+++ b/src/views/FactoryView/threeMap.vue
@@ -609,7 +609,7 @@ const init = () => {
             // console.log("非正常坐标", "{x:" + (+selected.point.x - 0.83).toFixed(2) + ",y:2 ,z:" + (selected.point.z + 3.52).toFixed(2) + "}");
             let workerShop = intersects[0]?.object?.name
             if (workerShopRoute.hasOwnProperty(workerShop) && !edit) {
-                router.push({ path: workerShopRoute[workerShop] })
+                router.push({ path: workerShopRoute[workerShop],query:{isBack:'back'} })
             }
 
         }
diff --git a/src/views/MechanicalView_dajian/content/statusBar.vue b/src/views/MechanicalView_dajian/content/statusBar.vue
index 9330e16..a980954 100644
--- a/src/views/MechanicalView_dajian/content/statusBar.vue
+++ b/src/views/MechanicalView_dajian/content/statusBar.vue
@@ -13,7 +13,9 @@
        <!-- <div class="DirectionalSign">
          
        </div> -->
-       <div class="back"><Back/></div>
+       <div class="back" v-if="isBack">
+        <Back/>
+      </div>
        <div class="iconTip">
          <ul>
            <li v-for="item in iconList" :key="item.id" >
@@ -36,6 +38,9 @@
 import {reactive, ref, watch} from "vue"
 import { useMechanicalViewStore } from "@/store/module/MechanicalView";
 import Back from "@/components/back/index.vue";
+import {useRoute} from "vue-router"
+const route = useRoute()
+const isBack = route.query.isBack||false
 const store = useMechanicalViewStore();
 const afterDisplay = ref("none")
 const beforeDisplay = ref("block")
diff --git a/src/views/MechanicalView_dajian/index.vue b/src/views/MechanicalView_dajian/index.vue
index 9725240..8dc9fb3 100644
--- a/src/views/MechanicalView_dajian/index.vue
+++ b/src/views/MechanicalView_dajian/index.vue
@@ -12,7 +12,7 @@
     <div class="content-AerialView" ref="Acontent">
       <mapDom ref="mapdomref"></mapDom>
       <devBar :width="size.oWidth" :height="size.oHeight"></devBar>
-      <Back />
+      <!-- <Back /> -->
     </div>
   </div>
 </template>
diff --git a/src/views/MechanicalView_hanjie/content/statusBar.vue b/src/views/MechanicalView_hanjie/content/statusBar.vue
index abb7c2b..67db849 100644
--- a/src/views/MechanicalView_hanjie/content/statusBar.vue
+++ b/src/views/MechanicalView_hanjie/content/statusBar.vue
@@ -13,7 +13,9 @@
        <!-- <div class="DirectionalSign">
          
        </div> -->       
-       <div class="back"><Back/></div>
+       <div class="back" v-if="isBack">
+        <Back/>
+      </div>
        <div class="iconTip">
          <ul>
            <li v-for="item in iconList" :key="item.id" >
@@ -36,6 +38,9 @@
 import {reactive, ref, watch} from "vue"
 import { useMechanicalViewStore } from "@/store/module/MechanicalView";
 import Back from "@/components/back/index.vue";
+import {useRoute} from "vue-router"
+const route = useRoute()
+const isBack = route.query.isBack||false
 const store = useMechanicalViewStore();
 const afterDisplay = ref("none")
 const beforeDisplay = ref("block")
diff --git a/src/views/MechanicalView_jijia/content/statusBar.vue b/src/views/MechanicalView_jijia/content/statusBar.vue
index db77191..a1e3e7d 100644
--- a/src/views/MechanicalView_jijia/content/statusBar.vue
+++ b/src/views/MechanicalView_jijia/content/statusBar.vue
@@ -13,7 +13,9 @@
        <!-- <div class="DirectionalSign">
          
        </div> -->
-       <div class="back"><Back/></div>
+       <div class="back" v-if="isBack">
+        <Back/>
+      </div>
        <div class="iconTip">
          <ul>
            <li v-for="item in iconList" :key="item.id" >
@@ -36,6 +38,9 @@
 import {reactive, ref, watch} from "vue"
 import { useMechanicalViewStore } from "@/store/module/MechanicalView";
 import Back from "@/components/back/index.vue";
+import {useRoute} from "vue-router"
+const route = useRoute()
+const isBack = route.query.isBack||false
 const store = useMechanicalViewStore();
 const afterDisplay = ref("none")
 const beforeDisplay = ref("block")
diff --git a/src/views/MechanicalView_jingjia/content/statusBar.vue b/src/views/MechanicalView_jingjia/content/statusBar.vue
index a681835..f2aa046 100644
--- a/src/views/MechanicalView_jingjia/content/statusBar.vue
+++ b/src/views/MechanicalView_jingjia/content/statusBar.vue
@@ -14,7 +14,9 @@
          
        </div> -->
        
-      <div class="back"><Back/></div>
+      <div class="back"  v-if="isBack">
+        <Back/>
+      </div>
        <div class="iconTip">
          <ul>
            <li v-for="item in iconList" :key="item.id" >
@@ -37,6 +39,9 @@
 import {reactive, ref, watch} from "vue"
 import { useMechanicalViewStore } from "@/store/module/MechanicalView";
 import Back from "@/components/back/index.vue";
+import {useRoute} from "vue-router"
+const route = useRoute()
+const isBack = route.query.isBack||false
 
 const store = useMechanicalViewStore();
 const afterDisplay = ref("none")
diff --git a/src/views/MechanicalView_jingshi/content/statusBar.vue b/src/views/MechanicalView_jingshi/content/statusBar.vue
index abb7c2b..67db849 100644
--- a/src/views/MechanicalView_jingshi/content/statusBar.vue
+++ b/src/views/MechanicalView_jingshi/content/statusBar.vue
@@ -13,7 +13,9 @@
        <!-- <div class="DirectionalSign">
          
        </div> -->       
-       <div class="back"><Back/></div>
+       <div class="back" v-if="isBack">
+        <Back/>
+      </div>
        <div class="iconTip">
          <ul>
            <li v-for="item in iconList" :key="item.id" >
@@ -36,6 +38,9 @@
 import {reactive, ref, watch} from "vue"
 import { useMechanicalViewStore } from "@/store/module/MechanicalView";
 import Back from "@/components/back/index.vue";
+import {useRoute} from "vue-router"
+const route = useRoute()
+const isBack = route.query.isBack||false
 const store = useMechanicalViewStore();
 const afterDisplay = ref("none")
 const beforeDisplay = ref("block")
diff --git a/src/views/realtimeSecurityJixiefenchang/index.vue b/src/views/realtimeSecurityJixiefenchang/index.vue
index 4bedd2d..9c34fda 100644
--- a/src/views/realtimeSecurityJixiefenchang/index.vue
+++ b/src/views/realtimeSecurityJixiefenchang/index.vue
@@ -12,7 +12,7 @@
     <div class="header">
       <div class="title">
 
-        <header2  ref="headerref" :width="'100%'" :height="'150px'" :title="t('messages.realtimeSecurityJixie')" :titleTip="titleTip" :typeFun="['AbnormalData','time']" :alarmType="['saving','pressure']"></header2>
+        <header2  ref="headerref" :width="'100%'" :height="'150px'" :title="t('messages.realtimeSecurity')" :titleTip="titleTip" :typeFun="['AbnormalData','time']" :alarmType="['saving']"></header2>
       </div>
     </div>