修改生命设备展示字段以及导出字段，

huaxin-system/src/main/java/com/zehong/system/domain/TDevLifeCycle.java

@@ -21,7 +21,7 @@ public class TDevLifeCycle extends BaseEntity
     private Long id;
 
     /** 设备类型 */
-    @Excel(name = "设备类型")
+    @Excel(name = "设备类型" ,dictType = "cytle_dev_type")
     private String devType;
 
     public String getJianxiu() {
@@ -53,7 +53,7 @@ public class TDevLifeCycle extends BaseEntity
     private String devNo;
 
     /** 设备位置 */
-    @Excel(name = "设备位置")
+    @Excel(name = "安装位置")
     private String devAddr;
 
     /** 设备描述 */
@@ -122,12 +122,10 @@ public class TDevLifeCycle extends BaseEntity
 
     /** 最新保养日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "最新保养日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date currMaintenanceDate;
 
     /** 下次保养日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "下次保养日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date nextMaintenanceDate;
 
     private String soutext;

huaxin-web/src/views/cycle/components/CycleDetailInfo.vue

@@ -21,7 +21,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="13">
-          <el-form-item label="设备位置">
+          <el-form-item label="安装位置">
             <span v-if="form.devAddr">{{ form.devAddr }}</span>
             <span v-else>-</span>
           </el-form-item>

huaxin-web/src/views/cycle/index.vue

@@ -29,10 +29,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="设备位置" prop="devAddr">
+      <el-form-item label="安装位置" prop="devAddr">
         <el-input
           v-model="queryParams.devAddr"
-          placeholder="请输入设备位置"
+          placeholder="请输入安装位置"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -99,9 +99,10 @@
     <el-table v-loading="loading" :data="cycleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="设备类型" align="center" prop="devTypeName" width="120"/>
-      <el-table-column label="出厂编号" align="center" prop="devName" />
-      <el-table-column label="规格型号" align="center" prop="devNo" />
-      <el-table-column label="设备位置" align="center" prop="devAddr" :show-overflow-tooltip="true">
+      <el-table-column label="设备名称" align="center" prop="devName"/>
+      <el-table-column label="出厂编号" align="center" prop="devNo" />
+      <el-table-column label="规格型号" align="center" prop="devModel" />
+      <el-table-column label="安装位置" align="center" prop="devAddr" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span v-if="scope.row.devAddr==null">-</span>
           <span v-else>{{ scope.row.devAddr }}</span>
@@ -193,6 +194,13 @@
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="设备名称" prop="devName">
+              <el-input v-model="form.devName" placeholder="请输入设备名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="11">
             <el-form-item label="设备类型" prop="devType">
@@ -208,19 +216,19 @@
           </el-col>
           <el-col :span="13">
             <el-form-item label="出厂编号" prop="devName">
-              <el-input v-model="form.devName" placeholder="请输入出厂编号" />
+              <el-input v-model="form.devNo" placeholder="请输入出厂编号" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="11">
             <el-form-item label="规格型号" prop="devNo">
-              <el-input v-model="form.devNo" placeholder="请输入规格型号" style="width: 220px"/>
+              <el-input v-model="form.devModel" placeholder="请输入规格型号" style="width: 220px"/>
             </el-form-item>
           </el-col>
           <el-col :span="13">
-            <el-form-item label="设备位置" prop="devAddr">
-              <el-input v-model="form.devAddr" placeholder="请输入设备位置" />
+            <el-form-item label="安装位置" prop="devAddr">
+              <el-input v-model="form.devAddr" placeholder="请输入安装位置" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -537,6 +545,9 @@ export default {
       },
       // 表单校验
       rules: {
+        devName: [
+          { required: true, message: "设备名称不能为空", trigger: "blur" }
+        ],
         devType: [
           { required: true, message: "设备类型不能为空", trigger: "blur" }
         ],
@@ -547,7 +558,7 @@ export default {
           { required: true, message: "设备状态不能为空", trigger: "blur" }
         ],
         devAddr: [
-          { required: true, message: "设备位置不能为空", trigger: "blur" }
+          { required: true, message: "安装位置不能为空", trigger: "blur" }
         ]
       }
     };