一体机报工之后退出不用重新选择订单。

src/layout/components/header.vue

@@ -1,27 +1,14 @@
 <template>
   <div class="commonHeader">
     <div style="width: 155px">
-      <svg-icon
-        v-if="routeMeta.back"
-        icon-class="back"
-        size="48"
-        @click="commonBack"
-      />
+      <svg-icon v-if="routeMeta.back" icon-class="back" size="48" @click="commonBack" />
       <!-- <svg-icon v-else icon-class="LOGO" style="height: 48px; width: 155px" /> -->
     </div>
-    <div
-      v-if="wsdData.temp && route.path.includes('pro-steps')"
-      style="width: 288px; font-size: 20px"
-    >
+    <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 && route.path.includes('pro-steps')"
-      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 }}
@@ -33,12 +20,7 @@
     <div>
       <el-space>
         <div>
-          <svg-icon
-            class="activeNotice"
-            icon-class="shutdown"
-            size="47"
-            @click="toExitApp"
-          />
+          <svg-icon class="activeNotice" icon-class="shutdown" size="47" @click="toExitApp" />
         </div>
         <!--         <div>
           <svg-icon
@@ -49,12 +31,7 @@
           />
         </div> -->
         <div>
-          <svg-icon
-            class="activeNotice"
-            icon-class="lingdang"
-            size="48"
-            @click="messageStatus = !messageStatus"
-          />
+          <svg-icon class="activeNotice" icon-class="lingdang" size="48" @click="messageStatus = !messageStatus" />
         </div>
         <!--        <div class="task">-->
         <!--          <el-progress-->
@@ -65,11 +42,7 @@
         <!--          <div class="process">任务进度: {{ processCount }}%</div>-->
         <!--        </div>-->
 
-        <el-dropdown
-          ref="dropdown1"
-          trigger="contextmenu"
-          @command="handleCommand"
-        >
+        <el-dropdown ref="dropdown1" trigger="contextmenu" @command="handleCommand">
           <div @click="showClick">
             <div class="name">{{ userStore.user.username }}</div>
             <div class="work">{{ userStore.user.station }}</div>
@@ -88,9 +61,7 @@
               <!--              <el-dropdown-item command="a">Action 1</el-dropdown-item>-->
               <el-dropdown-item command="b">退出登录</el-dropdown-item>
               <!--              <el-dropdown-item command="c" divided>Action 3</el-dropdown-item>-->
-              <el-dropdown-item command="c"
-                >{{ notice ? "关闭" : "打开" }}触摸提示
-              </el-dropdown-item>
+              <el-dropdown-item command="c">{{ notice ? "关闭" : "打开" }}触摸提示 </el-dropdown-item>
             </el-dropdown-menu>
           </template>
         </el-dropdown>
@@ -184,10 +155,8 @@ const commonBack = (itemValue) => {
     })
       .then(() => {
         emitter.emit(EventsNames.PROCESS_REDER);
-        setTimeout(() => {
-          wsdData.value = {};
-          dltData.value = {};
-        }, 2000);
+        wsdData.value = {};
+        dltData.value = {};
         router.back();
       })
       .catch(() => {});

src/views/process/components/steps.vue

@@ -1,71 +1,37 @@
 <template>
   <div class="body">
     <TransitionGroup name="list">
-      <div
-        class="steps"
-        v-for="(item, index) in opsArray"
-        :key="index"
-        @click="boxClick(item, index)"
-      >
+      <div class="steps" v-for="(item, index) in opsArray" :key="index" @click="boxClick(item, index)">
         <div
           :class="
             item.exists == true
               ? selectStepIndex == index
                 ? 'stepBox stepBoxHover'
-                : item.canDo === 0 ? 'stepBox' : 'stepBox1'
+                : item.canDo === 0
+                  ? 'stepBox'
+                  : 'stepBox1'
               : 'stepBox stepExistsHover'
           "
         >
           <div style="display: flex; align-items: center">
-            <div
-              :class="
-                selectStepIndex == index
-                  ? 'stepIndex stepIndexHover'
-                  : 'stepIndex'
-              "
-            >
-              <span
-                :class="
-                  selectStepIndex == index
-                    ? 'indexText hoverTextColor'
-                    : 'indexText'
-                "
-                >{{ index + 1 }}</span
-              >
+            <div :class="selectStepIndex == index ? 'stepIndex stepIndexHover' : 'stepIndex'">
+              <span :class="selectStepIndex == index ? 'indexText hoverTextColor' : 'indexText'">{{ index + 1 }}</span>
             </div>
             <div class="midTextBox">
-              <div
-                :class="
-                  selectStepIndex == index
-                    ? 'stepName stepNameHover'
-                    : 'stepName'
-                "
-              >
+              <div :class="selectStepIndex == index ? 'stepName stepNameHover' : 'stepName'">
                 {{ item.operationName }}
               </div>
-              <div
-                :class="
-                  selectStepIndex == index
-                    ? 'stepStation stepStationHover'
-                    : 'stepStation'
-                "
-              >
+              <div :class="selectStepIndex == index ? 'stepStation stepStationHover' : 'stepStation'">
                 {{ item.operationCode }}
               </div>
             </div>
           </div>
-          <div
-            :class="
-              selectStepIndex == index ? 'timeBox timeBoxHover' : 'timeBox'
-            "
-          >
+          <div :class="selectStepIndex == index ? 'timeBox timeBoxHover' : 'timeBox'">
             {{ item.completeNum }}
           </div>
         </div>
         <Transition>
-          <div v-if="item.exists != true" class="existsText">
-            注：该工位计划上未分配此任务！
-          </div>
+          <div v-if="item.exists != true" class="existsText">注：该工位计划上未分配此任务！</div>
         </Transition>
         <div class="line" v-if="index != opsArray.length - 1"></div>
       </div>
@@ -73,12 +39,7 @@
     <el-empty v-if="!opsArray" description="暂无数据" />
     <!-- 弹窗 -->
 
-    <el-dialog
-      v-model="centerDialogVisible"
-      width="500"
-      align-center
-      style="border-radius: 16px"
-    >
+    <el-dialog v-model="centerDialogVisible" width="500" align-center style="border-radius: 16px">
       <template #header>
         <div class="titleText" style="text-align: center">通知</div>
       </template>
@@ -120,7 +81,9 @@ emitter.on(EventsNames.PROCESS_STEPINDEX, (val: any) => {
   selectStepIndex.value = val;
 });
 emitter.on(EventsNames.PROCESS_REDER, () => {
-  selectStepIndex.value = null;
+  // selectStepIndex.value = null;
+  let item = ordersDataArray.value[selectOrderIndex.value].ops[selectStepIndex.value];
+  boxClick(item, selectStepIndex.value);
 });
 // const setStepIndex = () => {
 //   for (let i = 0; i < props.opsArray.length; i++) {
@@ -132,8 +95,7 @@ emitter.on(EventsNames.PROCESS_REDER, () => {
 // };
 const boxClick = (item, index) => {
   if (item.exists != true) return;
-  selectSeqArray.value =
-    ordersDataArray.value[selectOrderIndex.value].ops[index].seqs;
+  selectSeqArray.value = ordersDataArray.value[selectOrderIndex.value].ops[index].seqs;
   store.odersData.operationId = item.operationId;
   store.processInfo.operationCode = item.operationCode;
   store.processInfo.operationName = item.operationName;
@@ -217,7 +179,6 @@ onBeforeUnmount(() => {
   box-shadow: 0px 1px 1px 1px #00000025;
 }
 
-
 .stepBoxHover {
   box-shadow: 0px 0px 0px 0px;
   background-color: $select-hover;

src/views/process/orders.vue

@@ -1,40 +1,23 @@
 <template>
   <div>
-    <div class="commonTitle">
-      {{ activeName == "ok" ? "已完成工单" : "待完成工单" }}[{{ ordersSum }}]
-    </div>
+    <div class="commonTitle">{{ activeName == "ok" ? "已完成工单" : "待完成工单" }}[{{ ordersSum }}]</div>
 
-    <el-tabs
-      v-model="activeName"
-      class="demo-tabs"
-      type="card"
-      @tab-click="handleClick"
-    >
+    <el-tabs v-model="activeName" class="demo-tabs" type="card" @tab-click="handleClick">
       <el-tab-pane label="未完成" name="false" />
       <el-tab-pane label="已完成" name="ok" />
     </el-tabs>
-    <el-scrollbar
-      class="barHeight"
-      ref="wrapRef"
-      @scroll="handleScroll"
-      v-loading="map.get('getProcessOrders')"
-    >
+    <el-scrollbar class="barHeight" ref="wrapRef" @scroll="handleScroll" v-loading="map.get('getProcessOrders')">
       <!-- <el-scrollbar class="barHeight" ref="wrapRef" @scroll="handleScroll"> -->
 
       <Order
         v-for="(item, index) in ordersDataArray"
         :key="index"
-        @click="setSlectIndex(index,item)"
+        @click="setSlectIndex(index, item)"
         :hoverStatus="index == selectIndex ? true : false"
         :item="item"
       />
 
-      <div
-        class="describeText notice"
-        v-if="ordersQuery.pageNo == ordersQuery.totalPages"
-      >
-        已经到底啦~
-      </div>
+      <div class="describeText notice" v-if="ordersQuery.pageNo == ordersQuery.totalPages">已经到底啦~</div>
     </el-scrollbar>
     <Empty v-if="ordersDataArray.length < 1" />
   </div>
@@ -43,7 +26,7 @@
 import Order from "@/views/process/components/order.vue";
 import { useProcessStore } from "@/store";
 import { useDictionaryStore } from "@/store";
-import { getOrders,getOrderDetails } from "@/api/process";
+import { getOrders, getOrderDetails } from "@/api/process";
 import { emitter, EventsNames } from "@/utils/common";
 import { useCommonStoreHook } from "@/store";
 const dictS = useDictionaryStore();
@@ -74,10 +57,10 @@ const getOrdersData = async () => {
   }
 };
 
-const getOps = async (item,index) => {
-  const { code, data } = await getOrderDetails({workOrderCode: item.workOrderCode});
+const getOps = async (item, index) => {
+  const { code, data } = await getOrderDetails({ workOrderCode: item.workOrderCode });
   if (code == "200") {
-    ordersDataArray.value[index].ops = data
+    ordersDataArray.value[index].ops = data;
   }
 };
 //重新刷新当前页码数据
@@ -111,16 +94,12 @@ const setSlectIndex = async (index: number, item) => {
     selectedOderStatus.value = false;
     return;
   }
-  await getOps(item, index)
+  await getOps(item, index);
   selectIndex.value = index;
-  store.odersData.productLineId =
-      ordersDataArray.value[selectIndex.value].productLineId;
-  store.odersData.workOrderCode =
-      ordersDataArray.value[selectIndex.value].workOrderCode;
-  store.processInfo.materialName =
-      ordersDataArray.value[selectIndex.value].materialName;
-  store.processInfo.materialModel =
-      ordersDataArray.value[selectIndex.value].materialModel;
+  store.odersData.productLineId = ordersDataArray.value[selectIndex.value].productLineId;
+  store.odersData.workOrderCode = ordersDataArray.value[selectIndex.value].workOrderCode;
+  store.processInfo.materialName = ordersDataArray.value[selectIndex.value].materialName;
+  store.processInfo.materialModel = ordersDataArray.value[selectIndex.value].materialModel;
   store.odersData.operationId = "";
   store.processInfo.operationCode = "";
   store.processInfo.operationName = "";
@@ -130,7 +109,7 @@ const setSlectIndex = async (index: number, item) => {
   emit("getindex", selectIndex.value);
 };
 const handleClick = async (tab: TabsPaneContext, event: Event) => {
-  await setSlectIndex(null,null);
+  await setSlectIndex(null, null);
   store.odersData.productLineId = "";
   store.odersData.workOrderCode = "";
   store.processInfo.materialName = "";
@@ -139,10 +118,7 @@ const handleClick = async (tab: TabsPaneContext, event: Event) => {
 //滚动事件
 const handleScroll = (obj: obj) => {
   //当发生滚动触底时
-  if (
-    wrapRef.value.wrapRef.scrollHeight ==
-    Math.ceil(obj.scrollTop) + wrapRef.value.wrapRef.clientHeight
-  ) {
+  if (wrapRef.value.wrapRef.scrollHeight == Math.ceil(obj.scrollTop) + wrapRef.value.wrapRef.clientHeight) {
     if (ordersQuery.value.pageNo < ordersQuery.value.totalPages) {
       ordersQuery.value.pageNo = ordersQuery.value.pageNo + 1;
       getOrdersData();
@@ -165,10 +141,10 @@ watch(
 );
 onMounted(() => {
   getOrdersData();
-  emitter.on(EventsNames.PROCESS_REDER, () => {
-    resetOrdersDataArray();
-    setSlectIndex(null,null);
-  });
+  // emitter.on(EventsNames.PROCESS_REDER, () => {
+  //   resetOrdersDataArray();
+  //   setSlectIndex(null,null);
+  // });
 });
 </script>