Forráskód Böngészése

设备资料库及设备台账相关提交

lipenghui 1 napja
szülő
commit
5f078fd0ea

+ 3 - 1
src/views/pms/device/IotDeviceForm.vue

@@ -23,6 +23,8 @@
                 v-model="formData.yfClass"
                 :options="yfclasses"
                 :props="{ expandTrigger: 'hover' }"
+                clearable
+                filterable
                 @change="handleYfClassChange" />
             </el-form-item>
           </el-col>
@@ -91,7 +93,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :label="t('iotDevice.assets')" prop="deviceStatus">
+            <el-form-item :label="t('iotDevice.assets')" prop="assetProperty">
               <el-select v-model="formData.assetProperty" placeholder="请选择" clearable>
                 <el-option
                   v-for="dict in getStrDictOptions(DICT_TYPE.PMS_ASSET_PROPERTY)"

+ 4 - 3
src/views/pms/device/IotDeviceFormAdd.vue

@@ -19,6 +19,7 @@
             <el-form-item :label="t('iotDevice.yfClass')" prop="yfClass">
               <el-cascader
                 style="width: 100%"
+                :disabled="formData.yfDeviceCode"
                 v-model="formData.yfClass"
                 :options="yfclasses"
                 :props="{ expandTrigger: 'hover' }"
@@ -29,7 +30,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item :label="t('iotDevice.yfCode')" prop="yfDeviceCode">
-              <el-input v-model="formData.yfDeviceCode" :disabled="formType==='update'" placeholder="请输入油服设备编码" />
+              <el-input v-model="formData.yfDeviceCode" :disabled="formData.yfDeviceCode" placeholder="请输入油服设备编码" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -93,7 +94,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :label="t('iotDevice.assets')" prop="deviceStatus">
+            <el-form-item :label="t('iotDevice.assets')" prop="assetProperty">
               <el-select v-model="formData.assetProperty" placeholder="请选择" clearable>
                 <el-option
                   v-for="dict in getStrDictOptions(DICT_TYPE.PMS_ASSET_PROPERTY)"
@@ -491,7 +492,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 brandChoose = (row) => {
   formData.value.brand = row.id

+ 1 - 1
src/views/system/tree/PmsTree.vue

@@ -31,7 +31,7 @@
             icon="fa:folder-open"
           />
           <Icon
-            style="vertical-align: middle;fill: currentColor;color:orange"
+            style="vertical-align: middle;fill: currentColor;color:dodgerblue"
             v-if="node.data.type === 'device'"
             icon="fa:tasks"
           />

+ 5 - 1
src/views/system/tree/index.vue

@@ -76,8 +76,9 @@
               <template #default="scope">
                 <div style="display: flex; align-items: center; gap: 5px;">
                 <Icon v-if="scope.row.fileType==='content'" icon="fa:folder-open"  color="orange"/>
+                  <Icon v-else-if="scope.row.fileType==='device'" icon="fa:folder-open"  color="blue"/>
                 <Icon v-else-if="scope.row.fileType==='pic'||scope.row.fileClassify==='jpg'||scope.row.fileClassify==='png'" icon="ep:picture-filled"  color="#2183D1"/>
-                <Icon v-else-if="scope.row.fileType==='file'&&scope.row.fileClassify==='pdf'" icon="fa-solid:file-pdf"  color="#E20012"/>
+                <Icon v-else-if="scope.row.fileType==='file'&&(scope.row.fileClassify==='pdf'||scope.row.fileClassify==='PDF')" icon="fa-solid:file-pdf"  color="#E20012"/>
                 <Icon v-else-if="scope.row.fileType==='file'&&(scope.row.fileClassify==='doc'||scope.row.fileClassify==='docx')" icon="fa:file-word-o"  color="blue"/>
                 <Icon v-else-if="scope.row.fileType==='file'&&(scope.row.fileClassify==='xls'||scope.row.fileClassify==='xlsx')" icon="fa-solid:file-excel"  color="#107C41"/>
                 <Icon v-else-if="scope.row.fileType==='file'&&(scope.row.fileClassify==='txt')" icon="fa:file-text-o" />
@@ -236,6 +237,7 @@ const formData = ref({
 })
 const handleDownload = async (url) => {
   try {
+    formLoading.value = true
     const response = await fetch(url)
     const blob = await response.blob()
     const downloadUrl = window.URL.createObjectURL(blob)
@@ -246,6 +248,7 @@ const handleDownload = async (url) => {
     link.click()
 
     URL.revokeObjectURL(downloadUrl)
+    formLoading.value = false
   } catch (error) {
     console.error('下载失败:', error)
   }
@@ -446,6 +449,7 @@ const getList = async () => {
   formLoading.value = true
   try {
     const data = await IotInfoApi.IotInfoApi.getChildContentFile(queryParams)
+    debugger
     list.value = data
   } finally {
     formLoading.value = false