From 24581b3c2df778e3cefe810360793bd8d7f77150 Mon Sep 17 00:00:00 2001
From: Wangxin <wangxin@icanag.com>
Date: Wed, 12 Nov 2025 21:26:53 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90web=E3=80=91=E9=A3=8E=E9=99=A9?=
 =?UTF-8?q?=E7=AD=89=E7=BA=A7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alops-ui/src/views/inMonitoring/assessment/index.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/assessment/index.vue b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/assessment/index.vue
index 5d3c8d53..59278022 100644
--- a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/assessment/index.vue
+++ b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/assessment/index.vue
@@ -41,7 +41,7 @@
               </el-table-column>
               <el-table-column label="风险等级" align="center" key="riskGrade" prop="riskGrade" width="120"  >
                 <template slot-scope="scope">
-                  <el-tag  :hit="false" :type="scope.row.riskGrade == '无风险'?'success':scope.row.riskGrade == '低'?'':scope.row.riskGrade == '中'?'danger':scope.row.riskGrade == '高'?'warning':'info'"> {{ scope.row.riskGrade }} </el-tag>
+                  <el-tag  :hit="false" :type="scope.row.riskGrade == '无风险'?'success':scope.row.riskGrade == '低风险'?'':scope.row.riskGrade == '中风险'?'danger':scope.row.riskGrade == '高风险'?'warning':'info'"> {{ scope.row.riskGrade }} </el-tag>
                 </template>
               </el-table-column>
               

From 7d33ce933d6012213c3da0cadd92817457fd226a Mon Sep 17 00:00:00 2001
From: Wangxin <wangxin@icanag.com>
Date: Wed, 12 Nov 2025 21:28:23 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90web=E3=80=91=20=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ALOps_sys_fe/alops-ui/src/views/device/deviceType/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ALOps_sys_fe/alops-ui/src/views/device/deviceType/index.vue b/ALOps_sys_fe/alops-ui/src/views/device/deviceType/index.vue
index 2a8c46ab..30ab9112 100644
--- a/ALOps_sys_fe/alops-ui/src/views/device/deviceType/index.vue
+++ b/ALOps_sys_fe/alops-ui/src/views/device/deviceType/index.vue
@@ -34,7 +34,7 @@
                 width="60"
                 type="index"
               ></el-table-column>
-              <el-table-column label="类型编号" align="center" key="id" prop="id"/>
+              <!-- <el-table-column label="类型编号" align="center" key="id" prop="id"/> -->
               <el-table-column label="设备类型名称" align="center" key="name" prop="name" :show-overflow-tooltip="true" />
               <el-table-column label="描述" align="center" key="description" prop="description" :show-overflow-tooltip="true" />
               <el-table-column label="图片" align="center" key="image" prop="image" :show-overflow-tooltip="true" >

From f095eb13ad64d9b33800360e1de37629becd1a97 Mon Sep 17 00:00:00 2001
From: Wangxin <wangxin@icanag.com>
Date: Wed, 12 Nov 2025 21:42:37 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90web=E3=80=91=20=E9=A2=84=E8=AE=A1?=
 =?UTF-8?q?=E5=B9=B4=E9=99=90=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ALOps_sys_fe/alops-ui/src/views/device/files/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ALOps_sys_fe/alops-ui/src/views/device/files/index.vue b/ALOps_sys_fe/alops-ui/src/views/device/files/index.vue
index 024d61fe..78a75fb4 100644
--- a/ALOps_sys_fe/alops-ui/src/views/device/files/index.vue
+++ b/ALOps_sys_fe/alops-ui/src/views/device/files/index.vue
@@ -76,7 +76,7 @@
               <el-table-column label="品牌型号" align="center" key="brand" prop="brand" width="120" />
               <el-table-column label="设备供应商" align="center" key="supplierName" prop="supplierName" width="120" />
               <el-table-column label="设备管理员" align="center" key="inCharge" prop="inCharge" width="120" />
-              <el-table-column label="预计年限" align="center" key="lifeCycle" prop="lifeCycle" width="120" />
+              <el-table-column label="预计使用年限" align="center" key="lifeCycle" prop="lifeCycle" width="120" />
               <el-table-column label="质保时间" align="center" key="warranty" prop="warranty"  width="120" />
               <el-table-column label="设备图片" align="center" key="equImage" prop="equImage" :show-overflow-tooltip="true" >
                 <template slot-scope="scope">
@@ -228,8 +228,8 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="预计年限" prop="lifeCycle">
-          <el-input v-model.number="form.lifeCycle" placeholder="请输入预计年限" maxlength="30" type="number" min="1" oninput="value=value.replace(/[^1-9]\d*/g, '')">
+        <el-form-item label="预计使用年限" prop="lifeCycle">
+          <el-input v-model.number="form.lifeCycle" placeholder="请输入预计使用年限" maxlength="30" type="number" min="1" oninput="value=value.replace(/[^1-9]\d*/g, '')">
             <template slot="append">年</template>
           </el-input>
         </el-form-item>
@@ -403,7 +403,7 @@ export default {
           { required: true, message: "设备管理员不能为空", trigger: "blur" },
         ],
         lifeCycle: [
-          { required: true, message: "预计年限不能为空", trigger: "blur" }
+          { required: true, message: "预计使用年限不能为空", trigger: "blur" }
         ],
         warranty: [
           { required: true, message: "质保年限不能为空", trigger: "blur" }