lipenghui 11 цаг өмнө
parent
commit
23c9b2f5ce

+ 5 - 4
src/views/pms/device/DeviceInfo.vue

@@ -13,6 +13,11 @@
       <div style="flex: 2; height: 12em; margin-top: 23px">
         <el-form ref="formRef" :disabled="false" :model="formData" label-width="120px">
           <el-row>
+            <el-col :span="8">
+              <el-form-item :label="t('iotDevice.yfCode')" prop="yfDeviceCode">
+                {{ formData.yfDeviceCode }}
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item :label="t('chooseMaintain.deviceCode')" prop="deviceCode">
                 {{ formData.deviceCode }}
@@ -28,8 +33,6 @@
                 {{ formData.brandName }}
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
             <el-col :span="8">
               <el-form-item :label="t('iotDevice.dept')" prop="deptId">
                 {{ formData.deptName }}
@@ -45,8 +48,6 @@
                 {{ getDictLabel(DICT_TYPE.PMS_DEVICE_STATUS, formData.deviceStatus) }}
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
             <el-col :span="8">
               <el-form-item :label="t('devicePerson.assets')" prop="assetProperty">
                 {{ getDictLabel(DICT_TYPE.PMS_ASSET_PROPERTY, formData.assetProperty) }}

+ 9 - 7
src/views/pms/device/IotDeviceForm.vue

@@ -26,8 +26,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :label="t('iotDevice.yfCode')" prop="yfCode">
-              <el-input v-model="formData.yfCode" placeholder="请输入油服设备编码" />
+            <el-form-item :label="t('iotDevice.yfCode')" prop="yfDeviceCode">
+              <el-input v-model="formData.yfDeviceCode" placeholder="请输入油服设备编码" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -428,7 +428,7 @@ const yfclasses = ref([])
 const formData = ref({
   id: undefined,
   yfClass: undefined,
-  yfCode: undefined,
+  yfDeviceCode: undefined,
   enableDate: undefined,
   deviceCode: undefined,
   deviceName: undefined,
@@ -466,7 +466,7 @@ const formData = ref({
 })
 const formRules = reactive({
   yfClass: [{ required: true, message: '编码类别不能为空', trigger: 'blur' }],
-  yfCode: [{ required: true, message: '油服编码不能为空', trigger: 'blur' }],
+  yfDeviceCode: [{ required: true, message: '油服编码不能为空', trigger: 'blur' }],
   assetClass: [{ required: true, message: '资产类别不能为空', trigger: 'blur' }],
   deviceCode: [{ required: true, message: '设备编码不能为空', trigger: 'blur' }],
   deviceName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
@@ -483,7 +483,7 @@ const handleYfClassChange = async (value) =>{
   console.log(value)
   const prefix = value.join('')
   const last = await IotDeviceApi.getMaxCode(prefix)
-  formData.value.yfCode = prefix+last
+  formData.value.yfDeviceCode = prefix+last
 }
 const assetclasschange = () => {
   const assetClass = formData.value.assetClass
@@ -625,7 +625,7 @@ const submitForm = async () => {
       }))
       formData.value.templateJson = JSON.stringify(list.value)
     }
-    formData.value.yfClass = formData.value.yfClass.join('');
+    formData.value.yfClass = formData.value.yfClass.join(',');
     const data = formData.value as unknown as IotDeviceVO
     if (formType.value === 'create') {
       await IotDeviceApi.createIotDevice(data)
@@ -662,11 +662,13 @@ onMounted(async () => {
       formData.value.brandName = iotDevice.brandName;
       formData.value.manufacturerName = iotDevice.zzName;
       formData.value.supplierName = iotDevice.supplierName;
+      if (iotDevice.yfClass) {
+        formData.value.yfClass = iotDevice.yfClass.split(',');
+      }
       list.value = JSON.parse(iotDevice.templateJson);
       list.value.forEach((item) => {
         formData.value[item.code] = item.value;
       })
-      debugger
     } finally {
       formLoading.value = false
     }

+ 11 - 0
src/views/pms/device/index.vue

@@ -17,6 +17,15 @@
           :inline="true"
           label-width="68px"
         >
+          <el-form-item :label="t('iotDevice.yfCode')" prop="yfDeviceCode" style="margin-left: 20px">
+            <el-input
+              v-model="queryParams.yfDeviceCode"
+              :placeholder="t('iotDevice.yfCodeHolder')"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-200px"
+            />
+          </el-form-item>
           <el-form-item :label="t('iotDevice.code')" prop="deviceCode" style="margin-left: 20px">
             <el-input
               v-model="queryParams.deviceCode"
@@ -131,6 +140,7 @@
               {{ scope.$index + 1 }}
             </template>
           </el-table-column>
+          <el-table-column :label="t('iotDevice.yfCode')" sortable align="center" prop="yfDeviceCode" min-width="150"/>
           <el-table-column :label="t('iotDevice.code')" sortable align="center" prop="deviceCode" min-width="150"/>
           <el-table-column :label="t('iotDevice.name')" sortable align="center" prop="deviceName" min-width="250">
             <template #default="scope">
@@ -253,6 +263,7 @@ const queryParams = reactive({
   creator: undefined,
   sortingFields: [],
   assetClass: undefined,
+  yfDeviceCode: undefined,
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中