dengrui 1 mese fa
parent
commit
0909ce3dfe

+ 6 - 6
src/views/pro-steps/components/duomeiticaiji.vue

@@ -140,12 +140,12 @@ const camera_ohos = () => {
   }
 };
 
-window.addEventListener("message", (event) => {
-  const data = JSON.parse(event.data);
-  if (data.fullUrl && data.messageKey && data.messageKey === "refreshView") {
-    getListData();
-  }
-});
+// window.addEventListener("message", (event) => {
+//   const data = JSON.parse(event.data);
+//   if (data.fullUrl && data.messageKey && data.messageKey === "refreshView") {
+//     getListData();
+//   }
+// });
 </script>
 
 <style lang="scss" scoped>

+ 16 - 15
src/views/pro-steps/index.vue

@@ -205,7 +205,7 @@
             </div> -->
           </div>
           <el-scrollbar
-            style="height: calc(100vh - 600px); padding-bottom: 20px"
+            style="height: calc(100vh - 660px); padding-bottom: 20px"
           >
             <Steps
               v-if="opsArray.length > 0"
@@ -220,7 +220,7 @@
                   font-size: 500;
                   font-size: 24px;
                   display: flex;
-                  height: calc(100vh - 630px);
+                  height: calc(100vh - 690px);
                   justify-content: center;
                   align-items: center;
                   background-color: #d5dade;
@@ -235,10 +235,11 @@
           <div
             style="
               width: 100%;
-              height: 200px;
+              height: 260px;
               display: flex;
               flex-direction: column;
               justify-content: space-evenly;
+              padding-bottom: 60px;
             "
           >
             <div>
@@ -1221,17 +1222,17 @@ const tableData = ref([
     error: 0,
   },
   {
-    user: "周杰伦",
+    user: "admin",
     num: 18,
     error: 0,
   },
   {
-    user: "周杰伦",
+    user: "admin",
     num: 12,
     error: 0,
   },
   {
-    user: "周杰伦",
+    user: "admin",
     num: 18,
     error: 1,
   },
@@ -1278,14 +1279,9 @@ const tableData3 = ref([
     boxCode: "LX-000123",
     num: 12,
     workOrderCode: "2025.12.125",
-    opName: "装配",
-  },
-  {
-    boxCode: "LX-000123",
-    num: 12,
-    workOrderCode: "2025.12.125",
-    opName: "装配",
+    opName: "调试",
   },
+
   {
     boxCode: "LX-000123",
     num: 12,
@@ -1348,11 +1344,11 @@ const options = [
   },
   {
     value: "2",
-    label: "维修",
+    label: "调试",
   },
   {
     value: "3",
-    label: "工装",
+    label: "测试",
   },
 ];
 const copyTextUsingTextarea = (text) => {
@@ -1591,6 +1587,11 @@ const getNameClass = (index) => {
 };
 //获取当前tags列表
 const getOpCompentArray = async () => {
+  ElMessage.success(
+    `${Number(
+      taskArray.value[taskIndex.value].ops[selectStepIndex.value].operationId
+    )}/${store.scanInfo.id}`
+  );
   const { data } = await getOpCompent(
     "/" +
       `${Number(

+ 1 - 0
src/views/process/components/scanCode.vue

@@ -59,6 +59,7 @@ const toProSteps = () => {
 const getScanData = async () => {
   const value = inputValue.value;
   inputValue.value = "";
+
   const { code, data, msg } = await getScan({
     operationId: Number(store.odersData.operationId),
     qrCode: value,

+ 5 - 1
src/views/repair/main/components/scanCode.vue

@@ -5,7 +5,11 @@
     <img class="imgIcon" src="@/assets/icons/shaoma.svg" @click="toProSteps" />
   </div>
   <div class="body">
-    <ScanCodeInput v-model="inputValue" @keyup.enter="setInputValue" @enterfnc="toProSteps" />
+    <ScanCodeInput
+      v-model="inputValue"
+      @keyup.enter="setInputValue"
+      @enterfnc="toProSteps"
+    />
   </div>
 </template>