数据采集更改

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

@@ -25,7 +25,7 @@
             >新增数据</span
           >
           <!-- DDLSD -->
-          <el-select
+<!--          <el-select
             v-model="taskValue"
             v-if="item.deviceType == 'DDLSD'"
             placeholder="请选择任务"
@@ -39,8 +39,8 @@
               :label="item.label"
               :value="item.value"
             />
-          </el-select>
-          <el-button
+          </el-select>-->
+<!--          <el-button
             class="ces"
             type="primary"
             style="position: absolute; right: 340px; z-index: 2"
@@ -68,11 +68,11 @@
               :label="item.label"
               :value="item.value"
             />
-          </el-select>
+          </el-select>-->
           <!-- DDLSD -->
           <!-- WKDLT -->
 
-          <el-input-number
+<!--          <el-input-number
             @click.stop
             style="
               position: absolute;
@@ -105,7 +105,7 @@
             @click.stop="setTipTemperature"
             :disabled="tipTemperatureDisabled"
             >设置温度</el-button
-          >
+          >-->
           <!-- WKDLT -->
           <el-button
             class="ces"
@@ -116,7 +116,7 @@
               startTest(item.deviceName, item.deviceNo, item.deviceType)
             "
             :disabled="
-              (item.deviceType == 'DDLSD' && !taskValue) || btnDisabled
+              ( !taskValue) || btnDisabled
             "
             >开始检测</el-button
           >
@@ -230,7 +230,7 @@ const setDiabledStatus = ref(false);
 const tableData = ref([]);
 const materialsData = ref([]);
 const router = useRouter();
-const taskValue = ref("");
+const taskValue = ref("1");
 const taskId = ref("1");
 const btnDisabled = ref(false);
 const toStartData = async (data) => {
@@ -321,8 +321,6 @@ const showLable = (key) => {
   switch (key) {
     case "tipTemperature":
       return "温度";
-    case "errCode":
-      return "错误代码";
     case "Finalangle":
       return "最终角度";
     case "Finaltime":
@@ -472,21 +470,20 @@ const configeObj = (type) => {
   switch (type) {
     //温湿度
     case "WXDJC":
-      return ["temp", "humidity","errCode"];
+      return ["temp", "humidity"];
     case "YBKC":
       return ["length"];
     case "GDC":
       return ["height"];
     case "WKDLT":
-      return ["ch1_temperature","ch2_temperature","errCode"];
+      return ["ch1_temperature","ch2_temperature"];
     //电动螺丝刀
     case "DDLSD":
       return [
         "Finaltorque",
         "Finalangle",
         "Finaltime",
-        "Tighteningresult",
-        "errCode",
+        "Tighteningresult"
       ];
     default:
       return ["数据1", "数据2", "数据3"];

src/views/traceability/components/collect.vue

@@ -80,24 +80,22 @@ const tableData = ref([]);
 const pageS = ref([]);
 const configeObj = (type) => {
   switch (type) {
-    //温湿度
+      //温湿度
     case "WXDJC":
-      return ["CH5Val", "CH6Val", "DataTimes"];
+      return ["temp", "humidity"];
     case "YBKC":
       return ["length"];
     case "GDC":
       return ["height"];
     case "WKDLT":
-      return ["tipTemperature"];
-    //电动螺丝刀
+      return ["ch1_temperature","ch2_temperature"];
+      //电动螺丝刀
     case "DDLSD":
       return [
-        "taskNo",
-        "torquetarget",
-        "tightenTorqueMax",
-        "warning",
-        "tightenResult",
-        "totalCycles",
+        "Finaltorque",
+        "Finalangle",
+        "Finaltime",
+        "Tighteningresult"
       ];
     default:
       return ["数据1", "数据2", "数据3"];
@@ -107,8 +105,6 @@ const showLable = (key) => {
   switch (key) {
     case "tipTemperature":
       return "温度";
-    case "errCode":
-      return "错误代码";
     case "Finalangle":
       return "最终角度";
     case "Finaltime":