添加前端页面

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

@@ -12,7 +12,7 @@
             <Field label="设备名称"  prop="deviceName" v-model="form.deviceName" placeholder="请输入设备名称"/> 
             <Field  label="设备编码" prop="deviceCode" v-model="form.deviceCode"  placeholder="请输入设备编码码"/>
             <Field  label="MAC地址" prop="deviceMac" v-model="form.deviceMac" placeholder="请输入设备的MAC地址"/>
-            <Field  label="平台类型" prop="platformId" v-model="form.platformId" type="select" :enumData="dict.platformId" placeholder="请选择平台类型"/>
+            <!-- <Field  label="平台类型" prop="platformId" v-model="form.platformId" type="select" :enumData="dict.platformId" placeholder="请选择平台类型"/> -->
             <Field  label="产品类型" prop="productId" v-model="form.productId" type="select" :enumData="dict.productId" placeholder="请选择产品类型"/>
             <Field label="设备生产商" placeholder="请选择设备生产商" prop="deviceFirmId" v-model="form.deviceFirmId" type="select" :enumData="dict.deviceFirmId" />
             <Field label="设备来源" prop="deviceSrc" v-model="form.deviceSrc" type="select" :enumData="dict.deviceSrc" placeholder="请选择设备来源"/>
@@ -37,7 +37,7 @@
             <Field    label="备注" :span="24" prop="deviceRemark"   v-model="form.deviceRemark" type="textarea" placeholder="请输入备注"/>         
 
             </el-row>
- <form-buttons @submit='submitForm' noCancelBtn />
+             <form-buttons @submit='submitForm' noCancelBtn />
         </el-form>
 
         </el-drawer>
@@ -71,6 +71,8 @@
                     "enabled",
                     "deviceFirmId"
                 ],
+                toDate:["defectsLiabilityPeriod"],
+                
                 // 表单校验
                 rules: {
                     deviceName: [

device-manager/src/main/java/com/mortals/xhx/base/framework/CustomJsonDateDeserializer.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
+import org.springframework.util.ObjectUtils;
 
 import java.io.IOException;
 import java.text.ParseException;
@@ -18,13 +19,20 @@ import java.util.Date;
 public class CustomJsonDateDeserializer extends JsonDeserializer<Date> {
 
     @Override
-    public Date deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
+    public Date deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String date = jp.getText();
-        try {
-            return format.parse(date);
-        } catch (ParseException e) {
-            throw new RuntimeException(e);
+
+        if (!ObjectUtils.isEmpty(date)) {
+            try {
+                return format.parse(date);
+            } catch (ParseException e) {
+                return null;
+            }
+        } else {
+            return null;
         }
+
+
     }
 }