添加前端页面

device-manager-ui/admin/src/views/device/drawerview.vue

@@ -7,24 +7,22 @@
     size="70%"
   >
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-      <el-tabs  style="margin-left:10px" v-model="activeName">
+      <el-tabs style="margin-left: 10px" v-model="activeName">
         <el-tab-pane label="设备详情" name="deviceDetail">
-          <view-show :form="viewInfo" :dict="dict" /> 
+          <view-show  :form="viewInfo" :dict="dict" />
         </el-tab-pane>
-        <el-tab-pane  label="告警记录" name="alarmLog">
-        <alarm-list :queryIn='{alarmDevice:form.id}' />
+        <el-tab-pane label="告警记录" name="alarmLog">
+          <alarm-list :queryIn="{ alarmDevice: form.id }" />
         </el-tab-pane>
         <el-tab-pane label="模块管理" name="model">
-        <module-list :queryIn='{deviceId:form.id}' />
+          <module-list :queryIn="{ deviceId: form.id }" />
         </el-tab-pane>
-
-
       </el-tabs>
       <el-form-item
         style="text-align: center; margin-left: -100px; margin-top: 10px"
       >
-        <el-button @click="deleteDevice">删除设备</el-button>
-        <el-button  type="primary"  @click="updateDevice()">修改信息</el-button>
+        <el-button @click="deleteDevice()">删除设备</el-button>
+        <el-button type="primary" @click="updateDevice()">修改信息</el-button>
       </el-form-item>
     </el-form>
   </el-drawer>
@@ -42,7 +40,7 @@ export default {
     ImageUpload,
     viewShow,
     alarmList,
-    moduleList
+    moduleList,
   },
   data() {
     return {
@@ -53,7 +51,7 @@ export default {
       title: "设备",
       // 是否显示弹出层
       open: false,
-      viewInfo:{},
+      viewInfo: {},
       direction: "rtl",
       toString: [
         "deviceFirmId",
@@ -93,7 +91,6 @@ export default {
     /** 新增 */
     add(row) {
       this.reset();
-
       this.urls.currUrl = this.pageInfo.addUrl;
       this.pageInfo.type = "add";
 
@@ -116,13 +113,20 @@ export default {
     cancel() {
       this.open = false;
     },
+
+    updateDevice() {
+        console.log("更新设备信息")
+
+
+    },
+
     /**获取数据后弹框 */
     afterRender(data) {
       this.open = true;
 
       console.log("form:", this.form);
-      Object.assign(this.viewInfo,this.form)
-      console.log("viewInfo",this.viewInfo)
+      Object.assign(this.viewInfo, this.form);
+      console.log("viewInfo", this.viewInfo);
       //    if(this.pageInfo.type=='add'){
       //     this.form.siteId = this.siteId;
       //     this.form.siteName = this.siteName;

device-manager-ui/admin/src/views/device/list.vue

@@ -206,7 +206,7 @@ export default {
     },
     /** 重写编辑方法 */
     toEdit(row) {
-      this.$refs.drawerViewform.edit(row);
+      this.$refs.drawerform.edit(row);
     },
     /** 重写查看方法 */
     toView(row) {

device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceEntity.java

@@ -4,8 +4,10 @@ import java.util.Date;
 import java.util.List;
 import java.util.ArrayList;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.base.framework.CustomJsonDateDeserializer;
 import com.mortals.xhx.module.device.model.vo.DeviceVo;
 /**
  * 设备实体对象
@@ -66,7 +68,6 @@ public class DeviceEntity extends DeviceVo {
     /**
      * 设备生产厂商名称
      */
-    @Excel(name = "设备生产厂商名称")
     private String deviceFirmname;
     /**
      * 设备来源(0.子设备，1.网关设备，2.直连设备)
@@ -95,6 +96,7 @@ public class DeviceEntity extends DeviceVo {
     /**
      * 保修期至
      */
+    @JsonDeserialize(using = CustomJsonDateDeserializer.class)
     private Date defectsLiabilityPeriod;
     /**
      * 负责人
@@ -111,6 +113,7 @@ public class DeviceEntity extends DeviceVo {
     /**
      * 设备图片
      */
+    @Excel(name = "设备图片",height = 90, type = Excel.Type.EXPORT, cellType = Excel.ColumnType.IMAGE)
     private String devicePhotoPath;
     /**
      * 设备访问ip
@@ -157,7 +160,7 @@ public class DeviceEntity extends DeviceVo {
      */
     private Integer deleted;
     /**
-     * 收不来源(0.旧设备，1.新设备)
+     * 设备来源(0.旧设备，1.新设备)
      */
     private Integer source;
 

device-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceVo.java

@@ -26,7 +26,6 @@ public class DeviceVo extends BaseEntityLong {
     /**
      * 平台编码
      */
-    @Excel(name = "平台",cacheDict = "platformDict")
     private String platformCode;
 
     /**