Ver código fonte

分值表更新

wanglt 5 meses atrás
pai
commit
b9a7f14f9d

+ 22 - 22
ygtx-ui/src/views/gxt/fanInspectionScore/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-position="top">
-      <el-form-item label="型" prop="fanType" label-position="top">
+      <el-form-item label="机型" prop="fanType" label-position="top">
         <el-select
           v-model="queryParams.fanType"
-          placeholder="请选择型"
+          placeholder="请选择机型"
           clearable
           filterable
           @change="handleQuery"
@@ -17,10 +17,10 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="检查类型" prop="inspectionTypeId" label-position="top">
+      <el-form-item label="维保类型" prop="inspectionTypeId" label-position="top">
         <el-select
           v-model="queryParams.inspectionTypeId"
-          placeholder="请选择检查类型"
+          placeholder="请选择维保类型"
           clearable
           @change="handleQuery"
         >
@@ -92,13 +92,13 @@
     <el-table v-loading="loading" :data="fanInspectionScoreList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="主键ID" align="center" prop="id" />
-      <el-table-column label="型" align="center" prop="fanType" />
-      <el-table-column label="检查类型" align="center" prop="inspectionTypeId">
+      <el-table-column label="机型" align="center" prop="fanType" />
+      <el-table-column label="维保类型" align="center" prop="inspectionTypeId">
         <template #default="scope">
           <dict-tag :options="gxt_inspection_type" :value="scope.row.inspectionTypeId" />
         </template>
       </el-table-column>
-      <el-table-column label="对应分值" align="center" prop="score" />
+      <el-table-column label="分值" align="center" prop="score" />
       <el-table-column label="启用状态" prop="status">
         <template #default="scope">
           <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
@@ -133,13 +133,13 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改风机类型检查分值对话框 -->
+    <!-- 添加或修改机型维保分值对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="formRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="型" prop="fanType">
+        <el-form-item label="机型" prop="fanType">
           <el-select
             v-model="form.fanType"
-            placeholder="请选择型"
+            placeholder="请选择机型"
             clearable
             filterable
           >
@@ -151,10 +151,10 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="检查类型" prop="inspectionTypeId">
+        <el-form-item label="维保类型" prop="inspectionTypeId">
           <el-select
             v-model="form.inspectionTypeId"
-            placeholder="请选择检查类型"
+            placeholder="请选择维保类型"
             clearable
           >
             <el-option
@@ -165,8 +165,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="对应分值" prop="score">
-          <el-input v-model="form.score" placeholder="请输入对应分值" />
+        <el-form-item label="分值" prop="score">
+          <el-input-number v-model="form.score" :precision="2" :step="0.1" controls-position="right" />
         </el-form-item>
         <el-form-item label="启用状态" prop="status">
           <el-radio-group v-model="form.status">
@@ -232,27 +232,27 @@ const data = reactive({
   },
   rules: {
     fanType: [
-      { required: true, message: "型不能为空", trigger: "change" }
+      { required: true, message: "机型不能为空", trigger: "change" }
     ],
     inspectionTypeId: [
-      { required: true, message: "检查类型不能为空", trigger: "change" }
+      { required: true, message: "维保类型不能为空", trigger: "change" }
     ],
     score: [
-      { required: true, message: "对应分值不能为空", trigger: "blur" }
+      { required: true, message: "分值不能为空", trigger: "blur" }
     ]
   }
 });
 
 const { queryParams, form, rules } = toRefs(data);
 
-/** 查询型列表 */
+/** 查询机型列表 */
 function getFanTypeList() {
   listFanTypes().then(response => {
     fanTypeOptions.value = response.data;
   });
 }
 
-/** 查询风机类型检查分值列表 */
+/** 查询机型维保分值列表 */
 function getList() {
   loading.value = true;
   listFanInspectionScore(queryParams.value).then(response => {
@@ -308,7 +308,7 @@ function handleSelectionChange(selection) {
 function handleAdd() {
   reset();
   open.value = true;
-  title.value = "添加风机类型检查分值";
+  title.value = "添加机型维保分值配置";
 }
 
 /** 修改按钮操作 */
@@ -322,7 +322,7 @@ function handleUpdate(row) {
       inspectionTypeId: response.data.inspectionTypeId ? String(response.data.inspectionTypeId) : null
     };
     open.value = true;
-    title.value = "修改风机类型检查分值";
+    title.value = "修改机型维保分值配置";
   });
 }
 
@@ -356,7 +356,7 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const deleteIds = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除风机类型检查分值编号为"' + deleteIds + '"的数据项?').then(function() {
+  proxy.$modal.confirm('是否确认删除机型维保分值配置编号为"' + deleteIds + '"的数据项?').then(function() {
     return delFanInspectionScore(deleteIds)
   }).then(() => {
     getList();

+ 12 - 12
ygtx-ui/src/views/gxt/scoreRuntime/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-position="top">
-      <el-form-item label="运行时长范围" prop="runtimeRange" label-position="top">
+      <el-form-item label="连续运行时长" prop="runtimeRange" label-position="top">
         <el-input
           v-model="queryParams.runtimeRange"
-          placeholder="请输入运行时长范围"
+          placeholder="请输入连续运行时长"
           clearable
           @keyup.enter="handleQuery"
         />
@@ -69,10 +69,10 @@
     <el-table v-loading="loading" :data="scoreRuntimeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" />
       <el-table-column label="主键ID" prop="id" />
-      <el-table-column label="运行时长范围" prop="runtimeRange" />
-      <el-table-column label="最小天数" prop="minHours" />
-      <el-table-column label="最大天数" prop="maxHours" />
-      <el-table-column label="对应分值" prop="score" />
+      <el-table-column label="连续运行时长" prop="runtimeRange" />
+      <!-- <el-table-column label="最小天数" prop="minHours" />
+      <el-table-column label="最大天数" prop="maxHours" /> -->
+      <el-table-column label="分值" prop="score" />
       <el-table-column label="启用状态" prop="status">
         <template #default="scope">
           <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
@@ -97,9 +97,9 @@
 
     <!-- 添加或修改运行时长分值配置对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="formRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="运行时长" prop="runtimeRange">
-          <el-input v-model="form.runtimeRange" placeholder="请输入运行时长范围" />
+      <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="连续运行时长" prop="runtimeRange">
+          <el-input v-model="form.runtimeRange" placeholder="请输入连续运行时长" />
         </el-form-item>
         <el-form-item label="最小天数" prop="minHours">
           <el-input-number v-model="form.minHours" controls-position="right" :min="0" />
@@ -107,7 +107,7 @@
         <el-form-item label="最大天数" prop="maxHours">
           <el-input-number v-model="form.maxHours" controls-position="right" :min="0" :max="999999"/>
         </el-form-item>
-        <el-form-item label="对应分值" prop="score">
+        <el-form-item label="分值" prop="score">
           <el-input-number v-model="form.score" controls-position="right" :precision="2" :step="0.1" />
         </el-form-item>
         <el-form-item label="启用状态" prop="status">
@@ -163,8 +163,8 @@ const data = reactive({
   },
   rules: {
     runtimeRange: [{ required: true, message: "运行时长范围不能为空", trigger: "blur" }],
-    minHours: [{ required: true, message: "最小小时数不能为空", trigger: "blur" }],
-    score: [{ required: true, message: "对应分值不能为空", trigger: "blur" }]
+    minHours: [{ required: true, message: "最小数不能为空", trigger: "blur" }],
+    score: [{ required: true, message: "分值不能为空", trigger: "blur" }]
   }
 })
 

+ 23 - 23
ygtx-ui/src/views/gxt/scoreproject/index.vue

@@ -1,18 +1,18 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-position="top">
-      <el-form-item label="项目代码" prop="maintenanceType" label-position="top">
+      <!-- <el-form-item label="检修类型代码" prop="maintenanceType" label-position="top">
         <el-input
           v-model="queryParams.maintenanceType"
-          placeholder="请输入项目代码"
+          placeholder="请输入检修类型代码"
           clearable
           @keyup.enter="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="项目名称" prop="projectName" label-position="top">
+      </el-form-item> -->
+      <el-form-item label="检修类型" prop="projectName" label-position="top">
         <el-input
           v-model="queryParams.projectName"
-          placeholder="请输入项目名称"
+          placeholder="请输入检修类型"
           clearable
           @keyup.enter="handleQuery"
         />
@@ -77,9 +77,9 @@
     <el-table v-loading="loading" :data="scoreprojectList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" />
       <el-table-column label="主键ID" align="center" prop="id" />
-      <el-table-column label="项目代码" align="center" prop="maintenanceType" />
-      <el-table-column label="项目名称" align="center" prop="projectName" />
-      <el-table-column label="完成一次的分值" align="center" prop="scorePerCompletion" />
+      <!-- <el-table-column label="检修类型代码" align="center" prop="maintenanceType" /> -->
+      <el-table-column label="检修类型" align="center" prop="projectName" />
+      <el-table-column label="分值" align="center" prop="scorePerCompletion" />
       <el-table-column label="启用状态" prop="status">
         <template #default="scope">
           <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
@@ -102,11 +102,11 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改项目分值对话框 -->
+    <!-- 添加或修改检修类型分值对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="formRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="项目代码" prop="maintenanceType">
-          <el-select v-model="form.maintenanceType" placeholder="请选择项目代码" @change="handleMaintenanceTypeChange">
+      <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="检修类型代码" prop="maintenanceType">
+          <el-select v-model="form.maintenanceType" placeholder="请选择检修类型代码" @change="handleMaintenanceTypeChange">
             <el-option
               v-for="dict in gxt_maintenance_type"
               :key="dict.value"
@@ -115,8 +115,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="项目名称" prop="projectName">
-          <el-input v-model="form.projectName" placeholder="请输入项目名称" readonly />
+        <el-form-item label="检修类型" prop="projectName">
+          <el-input v-model="form.projectName" placeholder="请输入检修类型" readonly />
         </el-form-item>
         <el-form-item label="分值" prop="scorePerCompletion">
           <el-input-number v-model="form.scorePerCompletion" :precision="2" :step="0.1" controls-position="right" />
@@ -172,20 +172,20 @@ const data = reactive({
   },
   rules: {
     maintenanceType: [
-      { required: true, message: "项目代码不能为空", trigger: "change" }
+      { required: true, message: "检修类型代码不能为空", trigger: "change" }
     ],
     projectName: [
-      { required: true, message: "项目名称不能为空", trigger: "blur" }
+      { required: true, message: "检修类型不能为空", trigger: "blur" }
     ],
     scorePerCompletion: [
-      { required: true, message: "完成一次的分值不能为空", trigger: "blur" }
+      { required: true, message: "分值不能为空", trigger: "blur" }
     ]
   }
 });
 
 const { queryParams, form, rules } = toRefs(data);
 
-/** 查询项目分值列表 */
+/** 查询检修类型分值列表 */
 function getList() {
   loading.value = true;
   listScoreproject(queryParams.value).then(response => {
@@ -237,7 +237,7 @@ function handleSelectionChange(selection) {
 function handleAdd() {
   reset();
   open.value = true;
-  title.value = "添加项目分值";
+  title.value = "添加检修类型分值配置";
 }
 
 /** 修改按钮操作 */
@@ -247,7 +247,7 @@ function handleUpdate(row) {
   getScoreproject(id).then(response => {
     form.value = response.data;
     open.value = true;
-    title.value = "修改项目分值";
+    title.value = "修改检修类型分值配置";
   });
 }
 
@@ -275,7 +275,7 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const deleteIds = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除项目分值编号为"' + deleteIds + '"的数据项?').then(function() {
+  proxy.$modal.confirm('是否确认删除检修类型分值配置编号为"' + deleteIds + '"的数据项?').then(function() {
     return delScoreproject(deleteIds)
   }).then(() => {
     getList();
@@ -290,9 +290,9 @@ function handleExport() {
   }, `scoreproject_${new Date().getTime()}.xlsx`)
 }
 
-/** 处理项目代码变更 */
+/** 处理检修类型代码变更 */
 function handleMaintenanceTypeChange(value) {
-  // 根据选择的项目代码设置对应的项目名称
+  // 根据选择的检修类型代码设置对应的检修类型
   const selectedItem = gxt_maintenance_type.value.find(item => item.value === value);
   if (selectedItem) {
     form.value.projectName = selectedItem.label;