生产履历只显示有数据的。header温湿度显示只在开工页面。退出登录清空温湿度。

src/layout/components/header.vue

@@ -9,11 +9,19 @@
       />
       <!-- <svg-icon v-else icon-class="LOGO" style="height: 48px; width: 155px" /> -->
     </div>
-    <div v-if="wsdData.temp" style="width: 288px;font-size: 20px;">
-      温度:{{wsdData.temp}},湿度:{{wsdData.humidity}}
+    <div
+      v-if="wsdData.temp && route.path.includes('pro-steps')"
+      style="width: 288px; font-size: 20px"
+    >
+      温度:{{ wsdData.temp }},湿度:{{ wsdData.humidity }}
     </div>
-    <div v-if="dltData.ch1_temperature" style="width: 450px;font-size: 20px;">
-      电烙铁通道1:{{dltData.ch1_temperature}},电烙铁通道2:{{dltData.ch2_temperature}}
+    <div
+      v-if="dltData.ch1_temperature && route.path.includes('pro-steps')"
+      style="width: 450px; font-size: 20px"
+    >
+      电烙铁通道1:{{ dltData.ch1_temperature }},电烙铁通道2:{{
+        dltData.ch2_temperature
+      }}
     </div>
     <div v-if="routeMeta.back && routeMeta.title" class="middle-title">
       {{ routeMeta.title }}
@@ -32,7 +40,7 @@
             @click="toExitApp"
           />
         </div>
-<!--         <div>
+        <!--         <div>
           <svg-icon
             class="activeNotice"
             icon-class="hongDa_black"
@@ -114,28 +122,28 @@ const time = ref(dayjs().format("HH:mm:ss"));
 const processCount = ref(50);
 const messageStatus = ref(false);
 emitter.on(EventsNames.GETDATA_WSD_DATA, (name) => {
-  if(name){
-    wsdData.value = name
-  }else{
-    wsdData.value = {}
+  if (name) {
+    wsdData.value = name;
+  } else {
+    wsdData.value = {};
   }
 });
 emitter.on(EventsNames.GETDATA_WKDLT_DATA, (name) => {
-  if(name){
-    dltData.value = name
-  }else{
-    dltData.value = {}
+  if (name) {
+    dltData.value = name;
+  } else {
+    dltData.value = {};
   }
 });
 const headUrl = ref("");
 const wsdData = ref({
-  temp: '',
-  humidity: ''
-})
+  temp: "",
+  humidity: "",
+});
 const dltData = ref({
-  ch1_temperature: '',
-  ch2_temperature: ''
-})
+  ch1_temperature: "",
+  ch2_temperature: "",
+});
 
 let timer: any = -1;
 
@@ -177,8 +185,8 @@ const commonBack = (itemValue) => {
       .then(() => {
         emitter.emit(EventsNames.PROCESS_REDER);
         setTimeout(() => {
-          wsdData.value = {}
-          dltData.value = {}
+          wsdData.value = {};
+          dltData.value = {};
         }, 2000);
         router.back();
       })
@@ -193,6 +201,8 @@ const handleCommand = (command: string | number | object) => {
     logoutApi().then(() => {
       localStorage.setItem("token", "");
       // location.reload();
+      wsdData.value = {};
+      dltData.value = {};
       router.replace("/login");
     });
   }

src/views/login/index.vue

@@ -166,7 +166,7 @@ import { useRoute } from "vue-router";
 import defaultSettings from "@/settings";
 import { ThemeEnum } from "@/enums/ThemeEnum";
 import { watch } from "vue";
-import router from "@/router";
+
 // Stores
 const userStore = useUserStore();
 const settingsStore = useSettingsStore();
@@ -282,6 +282,7 @@ function getOrgList() {
  * 登录
  */
 const route = useRoute();
+const router = useRouter();
 
 function handleLogin() {
   loginFormRef.value.validate((valid: boolean) => {

src/views/process/components/operate.vue

@@ -10,11 +10,7 @@
     <template v-for="(item, index) in operationObjs" :key="index">
       <Transition>
         <div
-          v-if="
-          selectSeqArray.length > 0 && selectSeqIndex > -1
-                ? true
-                : false
-          "
+          v-if="selectSeqArray.length > 0 && selectSeqIndex > -1 ? true : false"
           class="operateBox"
           @click="handleClick(item)"
         >
@@ -95,7 +91,7 @@ const call = () => {
   .operateBox {
     height: 76px;
     width: 100%;
-    margin-bottom: 10px;
+    margin-top: 12px;
     background-color: white;
     border-radius: 16px;
     display: flex;

src/views/traceability/index.vue

@@ -140,7 +140,7 @@
             </template>
             <Traceability />
           </el-tab-pane>
-          <el-tab-pane name="f2">
+          <el-tab-pane name="f2" v-if="tabCountData.materials">
             <template #label>
               <el-badge
                 :type="activeName == 'f2' ? 'warning' : 'primary'"
@@ -152,7 +152,7 @@
               <Materials v-if="activeName == 'f2'" />
             </keep-alive>
           </el-tab-pane>
-          <el-tab-pane name="f3">
+          <el-tab-pane name="f3" v-if="tabCountData.record">
             <template #label>
               <el-badge
                 :type="activeName == 'f3' ? 'warning' : 'primary'"
@@ -166,7 +166,7 @@
               </template>
             </keep-alive>
           </el-tab-pane>
-          <el-tab-pane name="f4">
+          <el-tab-pane name="f4" v-if="tabCountData.checks">
             <template #label>
               <el-badge
                 :type="activeName == 'f4' ? 'warning' : 'primary'"
@@ -180,7 +180,7 @@
               </template>
             </keep-alive>
           </el-tab-pane>
-          <el-tab-pane name="f5">
+          <el-tab-pane name="f5" v-if="tabCountData.equit">
             <template #label>
               <el-badge
                 :type="activeName == 'f5' ? 'warning' : 'danger'"
@@ -194,7 +194,7 @@
               </template>
             </keep-alive>
           </el-tab-pane>
-          <el-tab-pane name="f6">
+          <el-tab-pane name="f6" v-if="tabCountData.fault">
             <template #label>
               <el-badge
                 :type="activeName == 'f6' ? 'warning' : 'danger'"
@@ -208,7 +208,7 @@
               </template>
             </keep-alive>
           </el-tab-pane>
-          <el-tab-pane name="f7">
+          <el-tab-pane name="f7" v-if="tabCountData.medias">
             <template #label>
               <el-badge
                 :type="activeName == 'f7' ? 'warning' : 'danger'"
@@ -222,7 +222,7 @@
               </template>
             </keep-alive>
           </el-tab-pane>
-          <el-tab-pane name="f8">
+          <el-tab-pane name="f8" v-if="tabCountData.excel">
             <template #label>
               <el-badge
                 :type="activeName == 'f8' ? 'warning' : 'danger'"
@@ -236,7 +236,7 @@
               </template>
             </keep-alive>
           </el-tab-pane>
-          <el-tab-pane name="f9">
+          <el-tab-pane name="f9" v-if="tabCountData.collect">
             <template #label>
               <el-badge
                 :type="activeName == 'f9' ? 'warning' : 'danger'"
@@ -302,14 +302,14 @@ onMounted(() => {
 @import "./style/index.scss";
 
 .mainContentBox {
-  padding: 20px 10%;
+  padding: 20px 40px;
   padding-top: 0;
 
   .contentBody {
     padding: 20px;
     background-color: white;
     border-radius: 16px;
-    height: calc(100vh - 110px);
+    height: calc(100vh - 100px);
     display: flex;
     flex-direction: column;