设备管理

itdmWeb/src/views/module-iTDM/itdmDevice/ItdmDeviceList.vue

@@ -6,12 +6,12 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="设备名称">
-              <a-input placeholder="请输入设备名称" v-model="queryParam.deviceName"></a-input>
+              <a-input placeholder="请输入设备名称" v-model="queryParam.deviceName" disabled></a-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="设备编号">
-              <a-input placeholder="请输入设备编号" v-model="queryParam.deviceNo"></a-input>
+            <a-form-item label="设备类型">
+              <a-input placeholder="请输入设备类型" v-model="queryParam.deviceType"></a-input>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
@@ -21,11 +21,6 @@
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="设备类型">
-                <a-input placeholder="请输入设备类型" v-model="queryParam.deviceType"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="是否已维护">
                 <j-dict-select-tag placeholder="请选择是否已维护" v-model="queryParam.isRepair" dictCode="is_repair"/>
               </a-form-item>
@@ -175,6 +170,11 @@
             dataIndex: 'deviceName'
           },
           {
+            title:'设备类型',
+            align:"center",
+            dataIndex: 'deviceType'
+          },
+          {
             title:'设备编号',
             align:"center",
             dataIndex: 'deviceNo'
@@ -185,11 +185,6 @@
             dataIndex: 'deviceStatus_dictText'
           },
           {
-            title:'设备类型',
-            align:"center",
-            dataIndex: 'deviceType'
-          },
-          {
             title:'维护时间',
             align:"center",
             dataIndex: 'repairTime'
@@ -200,6 +195,16 @@
             dataIndex: 'repairer'
           },
           {
+            title:'维护记录',
+            align:"center",
+            dataIndex: 'record'
+          },
+          {
+            title:'设备型号',
+            align:"center",
+            dataIndex: 'deviceModel'
+          },
+          {
             title:'本次运行开始时间',
             align:"center",
             dataIndex: 'runStartTime'
@@ -229,7 +234,7 @@
           deleteBatch: "/itdmDevice/itdmDevice/deleteBatch",
           exportXlsUrl: "/itdmDevice/itdmDevice/exportXls",
           importExcelUrl: "itdmDevice/itdmDevice/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -251,17 +256,19 @@
         fieldList.push({type:'string',value:'updateBy',text:'更新人',dictCode:''})
         fieldList.push({type:'datetime',value:'updateTime',text:'更新日期'})
         fieldList.push({type:'string',value:'deviceName',text:'设备名称',dictCode:''})
+        fieldList.push({type:'string',value:'deviceType',text:'设备类型',dictCode:''})
         fieldList.push({type:'string',value:'deviceNo',text:'设备编号',dictCode:''})
         fieldList.push({type:'int',value:'deviceStatus',text:'设备状态',dictCode:'device_status'})
-        fieldList.push({type:'string',value:'deviceType',text:'设备类型',dictCode:''})
         fieldList.push({type:'datetime',value:'repairTime',text:'维护时间'})
         fieldList.push({type:'string',value:'repairer',text:'维护人',dictCode:''})
+        fieldList.push({type:'string',value:'record',text:'维护记录',dictCode:''})
+        fieldList.push({type:'string',value:'deviceSpecification',text:'设备规格',dictCode:''})
+        fieldList.push({type:'string',value:'deviceModel',text:'设备型号',dictCode:''})
+        fieldList.push({type:'string',value:'deviceLife',text:'计量有效期',dictCode:''})
         fieldList.push({type:'datetime',value:'runStartTime',text:'本次运行开始时间'})
         fieldList.push({type:'int',value:'biaoshi',text:'设备运行标识',dictCode:'biaoshi'})
         fieldList.push({type:'int',value:'isRepair',text:'是否已维护',dictCode:'is_repair'})
         fieldList.push({type:'int',value:'equipmenttreeid',text:'设备树id',dictCode:''})
-        fieldList.push({type:'string',value:'deviceLife',text:'计量有效期',dictCode:''})
-        fieldList.push({type:'string',value:'spec',text:'规格型号',dictCode:''})
         fieldList.push({type:'string',value:'address',text:'安装地点',dictCode:''})
         fieldList.push({type:'int',value:'specid',text:'区域',dictCode:''})
         fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})

itdmWeb/src/views/module-iTDM/itdmDevice/modules/ItdmDeviceForm.vue

@@ -4,18 +4,13 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="更新人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="updateBy">
-              <a-input v-model="model.updateBy" placeholder="请输入更新人"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="更新日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="updateTime">
-              <j-date placeholder="请选择更新日期"  v-model="model.updateTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceName">
+              <a-input v-model="model.deviceName" placeholder="请输入设备名称"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceName">
-              <a-input v-model="model.deviceName" placeholder="请输入设备名称"  ></a-input>
+            <a-form-model-item label="设备类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceType">
+              <a-input v-model="model.deviceType" placeholder="请输入设备类型"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -29,11 +24,6 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="设备类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceType">
-              <a-input v-model="model.deviceType" placeholder="请输入设备类型"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
             <a-form-model-item label="维护时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairTime">
               <j-date placeholder="请选择维护时间"  v-model="model.repairTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
             </a-form-model-item>
@@ -44,6 +34,26 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
+            <a-form-model-item label="维护记录" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="record">
+              <a-input v-model="model.record" placeholder="请输入维护记录"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="设备规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceSpecification">
+              <a-input v-model="model.deviceSpecification" placeholder="请输入设备规格"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="设备型号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceModel">
+              <a-input v-model="model.deviceModel" placeholder="请输入设备型号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="计量有效期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceLife">
+              <a-input v-model="model.deviceLife" placeholder="请输入计量有效期"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
             <a-form-model-item label="本次运行开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="runStartTime">
               <j-date placeholder="请选择本次运行开始时间"  v-model="model.runStartTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
             </a-form-model-item>
@@ -64,16 +74,6 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="计量有效期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceLife">
-              <a-input v-model="model.deviceLife" placeholder="请输入计量有效期"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="规格型号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="spec">
-              <a-input v-model="model.spec" placeholder="请输入规格型号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
             <a-form-model-item label="安装地点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
               <a-input v-model="model.address" placeholder="请输入安装地点"  ></a-input>
             </a-form-model-item>
@@ -131,6 +131,9 @@
            deviceNo: [
               { required: true, message: '请输入设备编号!'},
            ],
+           deviceStatus: [
+              { required: true, message: '请输入设备状态!'},
+           ],
         },
         url: {
           add: "/itdmDevice/itdmDevice/add",