Browse Source

feature/点击设备记录接口调试

dy 1 year ago
parent
commit
02b17a2082

+ 1 - 1
.env.development

@@ -13,7 +13,7 @@ VITE_APP_UPLOAD_URL = 'http://192.168.101.4:9000'
 # 线上接口地址
 # VITE_APP_API_URL = http://vapi.youlai.tech
 # 开发接口地址
- VITE_APP_API_URL = 'http://192.168.101.4:8079'
+ VITE_APP_API_URL = 'http://192.168.101.90:8079'
 
 ``
 # 是否启用 Mock 服务

+ 19 - 0
src/api/prosteps/dianjian.ts

@@ -0,0 +1,19 @@
+import request from "@/utils/request";
+
+//获取当前列表
+export function checkList(data: any) {
+  return request({
+    url: "/api/v1/process/check/list",
+    method: "post",
+    data,
+  });
+}
+
+//更新
+export function checkUpdate(data: any) {
+  return request({
+    url: "/api/v1/process/check/update",
+    method: "post",
+    data: data,
+  });
+}

+ 19 - 0
src/api/prosteps/shebeijilu.ts

@@ -0,0 +1,19 @@
+import request from "@/utils/request";
+
+//获取当前列表
+export function equitList(data: any) {
+  return request({
+    url: "/api/v1/process/equit/list",
+    method: "post",
+    data,
+  });
+}
+
+//更新
+export function equitUpdate(data: any) {
+  return request({
+    url: "/api/v1/process/equit/update",
+    method: "post",
+    data: data,
+  });
+}

+ 60 - 12
src/views/pro-steps/components/dianjian.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="stepsViewScroll">
-    <div class="recordBox" v-for="item in 7">
+    <div class="recordBox" v-for="(item, index) in checkListData" :key="index">
       <div class="leftMsg">
         <div class="msgHeader">
-          <div class="titleText">外围尺寸</div>
-          <div class="describeText">单位:cm</div>
+          <div class="titleText">{{ item.checkName }}</div>
+          <div class="describeText">单位:{{ item.unit }}</div>
         </div>
         <div class="msgFooter">
-          <div class="describeText">单位:cm</div>
-          <div class="describeText">单位:cm</div>
-          <div class="describeText">单位:cm</div>
+          <div class="describeText">标准值:{{ item.standard }}</div>
+          <div class="describeText">上限值:{{ item.upper }}</div>
+          <div class="describeText">下限值:{{ item.lower }}</div>
         </div>
       </div>
       <div class="rightOperate">
@@ -18,10 +18,12 @@
         <div class="operate">
           <div class="describeText operateText">结果</div>
           <div class="operateBox">
-            <div class="operateBtn" :style="setBoxStatus('qualified')">
+            <div class="operateBtn" @click="hege(index)"
+              :style="item.result == '1' ? setBoxStatus('1') : setBoxStatus('')">
               合格
             </div>
-            <div class="operateBtn" :style="setBoxStatus('unqualified')">
+            <div class="operateBtn" @click="buhege(index)"
+              :style="item.result == '2' ? setBoxStatus('2') : setBoxStatus('')">
               不合格
             </div>
           </div>
@@ -32,22 +34,68 @@
 </template>
 
 <script lang="ts" setup>
+import { checkList, checkUpdate } from "@/api/prosteps/dianjian";
+import { useProcessStore } from "@/store";
 defineOptions({ name: "Dianjian" });
+const checkListData = ref([]);
+const store = useProcessStore();
+const getCheckList = async () => {
+  // const { data } = await checkList({
+  //   operationId: Number(store.odersData.operationId),
+  //   processId: Number(store.scanInfo.id),
+  //   pageSize: 9999,
+  //   pageNo: 1,
+  // });
+  const { data } = await checkList({
+    operationId: 2,
+    processId: 15,
+    pageSize: 9999,
+    pageNo: 1,
+  });
+  checkListData.value = data;
+};
+const updateCheck = async (item, res) => {
+  // const {data} = await checkUpdate({
+  //   id: 2,
+  //   operationCheckId: 15,
+  //   operator: 9999,
+  //   processId: 1,
+  //   result:,
+  //   sortNum:,
+  //   stepInstanceId:''
+  // });
+  await checkUpdate({
+    id: item.id,
+    result: res,
+  }).then(() => {
+    ElMessage.success("操作成功");
+    item.result = res;
+  });
+};
 const setBoxStatus = (status: string) => {
   let style = "";
   switch (status) {
-    case "qualified":
+    case "1":
       style = "background-color: #64BB5C;color: white;";
       break;
-    case "unqualified":
+    case "2":
       style = "background-color: #E84026;color: white;";
       break;
     default:
-      style = "background-color: #00000015;color: white;";
+      style = "background-color: #00000015;color: black;";
       break;
   }
   return style;
 };
+const hege = async (index) => {
+  updateCheck(checkListData.value[index], "1");
+};
+const buhege = async (index) => {
+  updateCheck(checkListData.value[index], "2");
+};
+onMounted(() => {
+  getCheckList();
+});
 </script>
 
 <style lang="scss" scoped>
@@ -63,7 +111,7 @@ const setBoxStatus = (status: string) => {
 }
 
 .recordBox {
-  width: 600px;
+  min-width: 600px;
   height: 210px;
   background-color: white;
   border-radius: 16px;

+ 25 - 16
src/views/pro-steps/components/shebeijilu.vue

@@ -1,19 +1,11 @@
 <template>
   <div class="stepsViewScroll">
-    <div class="recordBox" v-for="item in 7">
-      <!-- <div class="">
-        <div class="msgHeader">
-          <div class="titleText">外围尺寸</div>
-        </div>
-        <div class="msgFooter">
-          <div class="describeText">单位:cm</div>
-        </div>
-      </div> -->
-      <div class="headerText titleText">高低温试验箱</div>
+    <div class="recordBox" v-for="(item, index) in equitListData" :key="index">
+      <div class="headerText titleText">{{ item.equitType }}</div>
       <div class="describeBox">
         <div class="describeText">精度要求</div>
         <div class="describeText" style="color: black">
-          高温:50~100℃ 低温:-5~-10℃ ±1℃
+          {{ item.accuracy }}
         </div>
       </div>
       <!-- 变量控制样式 -->
@@ -23,10 +15,10 @@
           <div class="info">
             <div>
               <div class="describeText" style="text-align: left">
-                高低温试验箱001
+                {{ item.equitName }}
               </div>
               <div class="describeText" style="text-align: left">
-                sds12313213213213231
+                {{ item.equitCode }}
               </div>
             </div>
           </div>
@@ -36,7 +28,7 @@
                 检定有效期
               </div>
               <div class="describeText" style="text-align: right">
-                2026-11-11
+                {{ item.validDate }}
               </div>
             </div>
           </div>
@@ -47,12 +39,29 @@
 </template>
 
 <script lang="ts" setup>
+import { equitList, equitUpdate } from "@/api/prosteps/shebeijilu";
+import { useProcessStore } from "@/store";
 defineOptions({ name: "Shebeijilu" });
+const store = useProcessStore();
+const equitListData = ref([]);
+const getEquitList = async () => {
+  const { data } = await equitList({
+    operationId: 5,
+    processId: 2,
+    pageSize: 9999,
+    pageNo: 1,
+  });
+  equitListData.value = [...data, ...data];
+};
+const equitCheck = async () => {
+  await equitUpdate({});
+};
+onMounted(() => {
+  getEquitList();
+});
 </script>
 
 <style lang="scss" scoped>
-
-
 .recordBox {
   width: 600px;
   height: 210px;