fix:是否工装优化

src/api/device/index.ts

@@ -70,6 +70,22 @@ export function configList(params: any) {
   });
 }
 
+export function electricIronConfigEList(params: any) {
+  return request({
+    url: "/api/v1/device/config/iron",
+    method: "post",
+    data: params,
+  });
+}
+
+export function ironConfigAdd(params: any) {
+  return request({
+    url: "/api/v1/device/config/iron/add",
+    method: "post",
+    data: params,
+  });
+}
+
 export function configSave(params: any) {
   return request({
     url: "/api/v1/device/config/addBatch",

src/views/base/materials/index.vue

@@ -27,10 +27,18 @@
         ></template
       >
       <template #menu="{ row, index, type }">
-        <el-button @click="binding(row)" icon="el-icon-money" text type="primary"
+        <el-button
+          @click="binding(row)"
+          icon="el-icon-money"
+          text
+          type="primary"
           >BOM</el-button
         >
-        <el-button @click="drawing(row)" icon="el-icon-notebook" text type="primary"
+        <el-button
+          @click="drawing(row)"
+          icon="el-icon-notebook"
+          text
+          type="primary"
           >图纸</el-button
         >
       </template>
@@ -369,11 +377,13 @@ option.value = Object.assign(option.value, {
         },
       ],
     },
-    /*{
+    {
       label: "是否工装",
       prop: "frock",
       search: true,
       width: 90,
+      hide: true,
+      display: true,
       overHidden: true,
       filterable: true,
       type: "radio", //类型为单选框
@@ -395,7 +405,7 @@ option.value = Object.assign(option.value, {
           trigger: "blur",
         },
       ],
-    },*/
+    },
     {
       label: "筛选规范",
       prop: "selectionSpec",

src/views/device/allocate/index.vue

@@ -45,13 +45,13 @@
           :size="size"
           >记录</el-button
         >
-        <el-button
+        <!--        <el-button
           icon="el-icon-setting"
           text
           @click="showProExcel('153')"
           type="primary"
           >表格填充</el-button
-        >
+        >-->
         <!--        <el-button
           @click="handleExport(row)"
           icon="el-icon-download"

src/views/device/disable/index.vue

@@ -52,13 +52,13 @@
           size="small"
           >删除</el-button
         >
-        <el-button
+        <!--        <el-button
           icon="el-icon-setting"
           text
           @click="showProExcel('153')"
           type="primary"
           >表格填充</el-button
-        >
+        >-->
       </template>
     </avue-crud>
     <el-dialog

src/views/device/instance/index.vue

@@ -40,6 +40,16 @@
         ><i-ep-edit />模型
         </el-button>
       </template>-->
+      <template #menu="{ size, row, index }">
+        <el-button
+          type="primary"
+          link
+          size="small"
+          v-if="row.deviceName == '电烙铁' || row.deviceType == 'HJ'"
+          @click="showWarning(row)"
+          ><i-ep-warning />报警设置
+        </el-button>
+      </template>
       <template #menu-left="{ size }">
         <el-button
           :disabled="toDeleteIds.length < 1"
@@ -127,6 +137,26 @@
         <el-button @click="dialog.visible = false">取消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog
+      v-model="dialog2.visible"
+      :title="dialog2.title"
+      width="30%"
+      @close="dialog2.visible = false"
+    >
+      <el-timeline style="max-width: 500px; margin-left: 100px">
+        <el-form-item label="温度下限(℃)">
+          <el-input v-model="electric.lowerLimit" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="温度上限(℃)">
+          <el-input v-model="electric.upperLimit" style="width: 200px" />
+        </el-form-item>
+      </el-timeline>
+      <div class="dialog-footer" style="margin-top: 20px" align="center">
+        <el-button type="primary" @click="ironAdd">保 存</el-button>
+        <el-button @click="dialog2.visible = false">取消</el-button>
+      </div>
+    </el-dialog>
     <ExcelUpload ref="uploadRef" @finished="uploadFinished" />
   </div>
 </template>
@@ -134,7 +164,13 @@
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import { checkPerm } from "@/directive/permission";
-import { configSave, configList, deviceUpdateCollect } from "@/api/device";
+import {
+  configSave,
+  configList,
+  deviceUpdateCollect,
+  electricIronConfigEList,
+  ironConfigAdd,
+} from "@/api/device";
 import { useCommonStoreHook } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
@@ -182,10 +218,48 @@ const showParamsPage = (row) => {
     dialog.visible = true;
   });
 };
+
+const electric = ref(null);
+const showWarning = (row) => {
+  electricIronConfigEList({ deviceNo: row.deviceNo }).then((data) => {
+    electric.value = data.data;
+    dialog2.visible = true;
+  });
+};
 const dialog = reactive({
   title: "模型设置",
   visible: false,
 });
+
+const dialog2 = reactive({
+  title: "报警设置",
+  visible: false,
+});
+
+const ironAdd = () => {
+  console.log(electric);
+  let express = /^[+]?\d*(\.\d*)?(e[+-]?\d+)?$/;
+  if (!express.test(electric.value.lowerLimit)) {
+    ElMessage.error("下限值不合法!");
+    return;
+  }
+  if (!express.test(electric.value.upperLimit)) {
+    ElMessage.error("上限值不合法!");
+    return;
+  }
+  if (electric.value.upperLimit <= electric.value.lowerLimit) {
+    ElMessage.error("下限值不能大于等于上限值!");
+    return;
+  }
+  ironConfigAdd(electric.value).then((data) => {
+    if (data.code == "200") {
+      ElMessage.success("保存成功!");
+      dialog2.visible = false;
+    } else {
+      ElMessage.error(data.msg);
+    }
+  });
+};
 const handleSubmit = () => {
   //判断参数
   let errorData = pageData.value.filter((item) => !item.fieldCode);

src/views/device/maintenance/index.vue

@@ -65,13 +65,13 @@
           :size="size"
           >记录</el-button
         >
-        <el-button
+        <!--        <el-button
           icon="el-icon-setting"
           text
           @click="showProExcel('153')"
           type="primary"
           >表格填充</el-button
-        >
+        >-->
       </template>
     </avue-crud>
     <el-dialog

src/views/device/repair/index.vue

@@ -36,13 +36,13 @@
           :size="size"
           >流程</el-button
         >
-        <el-button
+        <!--        <el-button
           icon="el-icon-setting"
           text
           @click="showProExcel('153')"
           type="primary"
           >表格填充</el-button
-        >
+        >-->
         <!--        <el-button @click="maintenance(row,1)"
                    icon="el-icon-fold"
                    text

src/views/plan/order/index.vue

@@ -363,14 +363,30 @@ option.value = {
       ],
       change: ({ value, column }) => {
         if (value === "2") {
-          option.value.column[4].display = true;
-          option.value.column[6].disabled = true;
-          option.value.column[10].disabled = true;
+          option.value.column.forEach((item) => {
+            if (item.prop == "trackingNumber") {
+              item.display = true;
+            }
+            if (item.prop == "materialCode") {
+              item.disabled = true;
+            }
+            if (item.prop == "orderNum") {
+              item.disabled = true;
+            }
+          });
         }
         if (value === "1") {
-          option.value.column[4].display = false;
-          option.value.column[6].disabled = false;
-          option.value.column[10].disabled = false;
+          option.value.column.forEach((item) => {
+            if (item.prop == "trackingNumber") {
+              item.display = false;
+            }
+            if (item.prop == "materialCode") {
+              item.disabled = false;
+            }
+            if (item.prop == "orderNum") {
+              item.disabled = false;
+            }
+          });
         }
       },
     },