lipenghui 4 місяців тому
батько
коміт
8e9fd87426

+ 1 - 1
.env.dev

@@ -4,7 +4,7 @@ NODE_ENV=production
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://1.94.244.160:91'
+VITE_BASE_URL='http://1.94.244.160:70'
 
 # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务
 VITE_UPLOAD_TYPE=server

+ 5 - 1
src/views/pms/device/DeviceUpload.vue

@@ -3,7 +3,7 @@
     <el-row>
       <div class="left-tree" :style="{ width: leftWidth + 'px' }">
         <ContentWrapNoBottom>
-          <FileTree @node-click="handleFileNodeClick" :deviceId="id" />
+          <FileTree @node-click="handleFileNodeClick" @success="successList" :deviceId="id" />
         </ContentWrapNoBottom>
       </div>
       <div class="divider-tree" @mousedown="startDrag"></div>
@@ -264,6 +264,10 @@ const getList = async () => {
     formLoading.value = false
   }
 }
+const successList = async (id) => {
+  queryParams.classId = id
+  await getList()
+}
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.pageNo = 1

+ 2 - 1
src/views/pms/device/FileTree.vue

@@ -152,6 +152,7 @@ const setHeight = () => {
 onMounted(async () => {
   await getTree()
   setHeight();
+  emits('success', fileList.value[0].id)
   window.addEventListener('resize', setHeight);
 });
 
@@ -286,7 +287,7 @@ const handleNodeClick = async (row: { [key: string]: any }) => {
   console.log(row)
   emits('node-click', row)
 }
-const emits = defineEmits(['node-click'])
+const emits = defineEmits(['node-click','success'])
 
 /** 监听deptName */
 watch(deptName, (val) => {

+ 6 - 6
src/views/pms/device/IotDeviceForm.vue

@@ -151,11 +151,6 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="铭牌信息" prop="nameplate">
-              <el-input v-model="formData.nameplate" placeholder="请输入铭牌信息" />
-            </el-form-item>
-          </el-col>
           <el-col :span="6">
             <el-form-item label="质保到期" prop="expires">
               <el-date-picker
@@ -167,6 +162,11 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="铭牌信息" prop="nameplate">
+              <el-input v-model="formData.nameplate" type="textarea" placeholder="请输入铭牌信息" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </div>
       <div class="title-div">
@@ -436,7 +436,7 @@ const brandChoose = (row) => {
   brandLabel.value = row.value
 }
 const modelChoose = (row) => {
-  formData.value.model = row.id
+  formData.value.model = row.name
   modelLabel.value = row.value
 }
 const customerChoose = (row) => {

+ 1 - 1
src/views/pms/iotinfo/IotInfoForm.vue

@@ -21,7 +21,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="附件" prop="filePath">
-        <UploadFile :is-show-tip="false" v-model="formData.filePath" :multiple="formType.value==='create'?true:1" />
+        <UploadFile :is-show-tip="false" v-model="formData.filePath" :multiple="formType.value==='create'" />
       </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />