已修改 src/views/pro/traceability/components/collectionCom.vue

src/views/pro-steps/components/screwdriver.vue

@@ -25,14 +25,13 @@
             >新增数据</span
           >
 
-
           <el-select
             v-model="taskId"
             v-if="item.deviceType == 'DDLSD'"
             placeholder="选择任务号"
             size="large"
             @click.stop=""
-            style="position: absolute; right: 180px; z-index: 2; width: 140px"
+            style="position: absolute; right: 300px; z-index: 2; width: 140px"
           >
             <el-option
               v-for="item in options2"
@@ -41,6 +40,16 @@
               :value="item.value"
             />
           </el-select>
+
+          <el-button
+              class="ces"
+              type="primary"
+              style="position: absolute; right: 180px; z-index: 2"
+              v-if="item.deviceType == 'DDLSD'"
+              @click.stop="setTipTemperature"
+              :disabled="tipTemperatureDisabled"
+          >设置程序</el-button
+          >
           <!-- DDLSD -->
           <!-- WKDLT -->
 
@@ -185,7 +194,7 @@ const tipTemperatureDisabled = ref(false);
 const setTipTemperature = async () => {
   try {
     tipTemperatureDisabled.value = true;
-    const { code } = await setUpData1({ tipTemperature: tipTemperature.value });
+    const { code } = await setUpData1({ taskId: taskId.value });
     if (code == "200") {
       ElMessage.success("设置成功！");
     }
@@ -313,8 +322,12 @@ const showLable = (key) => {
       return "持续时间";
     case "DataTimes":
       return "采集时间";
-    case "result":
+    case "tighteningresult":
       return "拧紧结果";
+    case "ng":
+      return "NG";
+    case "alarm":
+      return "警报";
     case "error":
       return "警报";
     case "length":
@@ -406,7 +419,9 @@ const configeObj = (type) => {
         "torque",
         "angle",
         "duration",
-        "result",
+        "tighteningresult",
+        "ng",
+        "alarm"
       ];
     default:
       return ["数据1", "数据2", "数据3"];

src/views/traceability/components/collect.vue

@@ -96,7 +96,9 @@ const configeObj = (type) => {
         "torque",
         "angle",
         "duration",
-        "result",
+        "tighteningresult",
+          "ng",
+          "alarm"
       ];
     default:
       return ["数据1", "数据2", "数据3"];
@@ -116,8 +118,12 @@ const showLable = (key) => {
       return "持续时间";
     case "DataTimes":
       return "采集时间";
-    case "result":
+    case "tighteningresult":
       return "拧紧结果";
+    case "ng":
+      return "NG";
+    case "alarm":
+      return "警报";
     case "error":
       return "警报";
     case "length":