Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev

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" >

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-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-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" }

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>