From f6770824806f3a92614a131917ac604e765f5148 Mon Sep 17 00:00:00 2001
From: zty <zty18395607196@163.com>
Date: Tue, 3 Dec 2024 15:21:21 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20tkx=20=E6=A3=80=E9=AA=8C=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E4=B8=B4=E6=9C=9F=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/em/equipment_form.vue | 11 +++++++++--
 src/views/em/equipmentjl.vue    | 30 +++++++++++++++++++++++++++---
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/views/em/equipment_form.vue b/src/views/em/equipment_form.vue
index 0a8d4f8e..2a817c0e 100644
--- a/src/views/em/equipment_form.vue
+++ b/src/views/em/equipment_form.vue
@@ -193,8 +193,15 @@
             </el-col>
             <el-col :md="12" :sm="24">
               <el-form-item label="检定周期(月)">
-                <el-input-number v-model="form.cycle" :precision="1" :min="0" controls-position="right"
-                  style="width: 100%;" placeholder="检定周期（月）" />
+                <el-input-number v-model="form.cycle" :min="0" controls-position="right"
+                
+                  placeholder="检定周期（月）" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="检定临期预警(天)">
+                <el-input-number v-model="form.check_days_number" :min="0" controls-position="right" 
+                  placeholder="临期预警" />
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/em/equipmentjl.vue b/src/views/em/equipmentjl.vue
index 34cdcdc6..0d6537c4 100644
--- a/src/views/em/equipmentjl.vue
+++ b/src/views/em/equipmentjl.vue
@@ -53,9 +53,10 @@
         </el-table-column>
         <el-table-column label="生产厂家" prop="factory" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="检定周期/月" prop="cycle" width="100">
+        <el-table-column label="检定日期" prop="check_date" ></el-table-column>
+        <el-table-column label="检定周期/月" prop="cycle" width="70">
         </el-table-column>
-        <el-table-column label="检定日期" prop="check_date" width="100">
+        <el-table-column label="设备状态" width="70">
           <template #default="scope">
             <el-tag v-if="scope.row.state === 10" type="success">
               {{ state_[scope.row.state] }}
@@ -71,7 +72,7 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="下次检定日期" prop="next_check_date" width="100">
+        <el-table-column label="下次检定日期" prop="next_check_date" width="70">
         </el-table-column>
         <el-table-column label="精度等级" prop="accuracy_level" show-overflow-tooltip>
         </el-table-column>
@@ -80,6 +81,23 @@
         <el-table-column label="设备负责人" prop="device_people" show-overflow-tooltip>
         </el-table-column>
         <el-table-column label="更新时间" prop="update_time"></el-table-column>
+        <el-table-column label="临期预警(天)" prop="check_days_number"></el-table-column>
+        <el-table-column label="检定状态" prop="state_measure" width="100">
+          <template #default="scope">
+            <el-tag v-if="scope.row.state_measure === 10" type="success">
+              {{ state_measure[scope.row.state_measure] }}
+            </el-tag>
+            <el-tag v-else-if="scope.row.state_measure === 20" type="warning">
+              {{ state_measure[scope.row.state_measure] }}
+            </el-tag>
+            <el-tag v-else-if="scope.row.state_measure === 30" type="danger">
+              {{ state_measure[scope.row.state_measure] }}
+            </el-tag>
+            <el-tag v-else-if="scope.row.state_measure === 40" type="normal">
+              {{ state_measure[scope.row.state_measure] }}
+            </el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="备注" show-overflow-tooltip>
           <template #default="scope">{{ scope.row.description }}</template>
         </el-table-column>
@@ -207,6 +225,12 @@ export default {
         20: 'B',
         30: 'C',
       },
+      state_measure: {
+        10: '正常',
+        20: '临期',
+        30: '过期',
+        40: '待检',
+        },
       options: [
         { id: 10, name: '正常' },
         { id: 20, name: '异常' }