Merge branch 'kkkkk' of shuzhihua/pms-iot-vue into master

src/views/pms/device/IotDeviceForm.vue

@@ -168,6 +168,11 @@
               <el-input v-model="formData.assetOwnership" :disabled="isDetail" height="60px" />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="所在地点" prop="address">
+              <el-input v-model="formData.address" height="60px" />
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item :label="t('deviceForm.picture')" prop="picUrl">
               <UploadImg v-model="formData.picUrl" :disabled="isDetail" height="60px" />
@@ -541,7 +546,8 @@ const formData = ref({
   templateJson: undefined,
   assetClass: undefined,
   carNo: undefined,
-  deviceNo: undefined
+  deviceNo: undefined,
+  address: undefined
 })
 const formRules = reactive({
   yfClass: [
@@ -774,6 +780,7 @@ onMounted(async () => {
       formData.value.supplierName = iotDevice.supplierName
       formData.value.carNo = iotDevice.carNo
       formData.value.deviceNo = iotDevice.deviceNo
+      formData.value.address = iotDevice.address
       if (iotDevice.yfClass) {
         formData.value.yfClass = iotDevice.yfClass.split(',')
       }
@@ -839,7 +846,7 @@ const resetForm = () => {
 }
 
 .base-expandable-content.is-expanded {
-  min-height: 260px; /* 或者根据内容设定一个合适的最大高度 */
+  min-height: 350px; /* 或者根据内容设定一个合适的最大高度 */
 }
 .zz-expandable-content {
   max-height: 0; /* 初始高度为0 */

src/views/pms/device/IotDeviceFormAdd.vue

@@ -174,6 +174,11 @@
               <el-input v-model="formData.assetOwnership" :disabled="isDetail" height="60px" />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="所在地点" prop="address">
+              <el-input v-model="formData.address" height="60px" />
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item :label="t('deviceForm.picture')" prop="picUrl">
               <UploadImg v-model="formData.picUrl" :disabled="isDetail" height="60px" />
@@ -542,7 +547,8 @@ const formData = ref({
   templateJson: undefined,
   assetClass: undefined,
   carNo: undefined,
-  deviceNo: undefined
+  deviceNo: undefined,
+  address: undefined
 })
 const formRules = reactive({
   yfClass: [
@@ -567,9 +573,7 @@ const formRules = reactive({
   deviceStatus: [{ required: true, message: '设备状态不能为空', trigger: 'blur' }],
   assetProperty: [{ required: true, message: '资产性质不能为空', trigger: 'blur' }],
   manufacturerId: [{ required: true, message: '制造商id不能为空', trigger: 'blur' }],
-  manDate: [{ required: true, message: '生产日期不能为空', trigger: 'blur' }],
-  carNo: [{ required: true, message: '车牌号不能为空', trigger: 'blur' }],
-  deviceNo: [{ required: true, message: '设备号不能为空', trigger: 'blur' }]
+  manDate: [{ required: true, message: '生产日期不能为空', trigger: 'blur' }]
 })
 
 watch(
@@ -839,7 +843,7 @@ const resetForm = () => {
 }
 
 .base-expandable-content.is-expanded {
-  min-height: 360px; /* 或者根据内容设定一个合适的最大高度 */
+  min-height: 350px; /* 或者根据内容设定一个合适的最大高度 */
 }
 .zz-expandable-content {
   max-height: 0; /* 初始高度为0 */