From 1b2f1472a0dfb464d49a9ef252721caf1b5f1c76 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 14 五月 2024 14:24:44 +0800
Subject: [PATCH] 优化首页

---
 src/components/view/a6-device-management.vue |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index bf4cdcc..7d41b6b 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -108,7 +108,7 @@
 						</el-image>
 						<!-- 琛ㄥ崟 -->
 						<el-form :label-position="labelPosition" :model="formData" label-width="100px">
-							<el-form-item label="浠櫒鍚嶇О:">
+							<el-form-item label="浠櫒鍚嶇О:" required>
 							<el-input :disabled="isUp" v-model="formData.deviceName" size="small"></el-input>
 										</el-form-item>
 							<el-form-item label="浠櫒鍚嶇ОEN:">
@@ -350,7 +350,7 @@
             </el-form-item>
             <el-form-item label="褰撳墠鐘舵��:">
 							<el-select v-model="formData2.deviceStatus" placeholder="璇烽�夋嫨" size="small" style="width:100%">
-								<el-option v-for="item in deviceStatusList" :key="item.value" :label="item.label" :value="item.value">
+								<el-option v-for="item in deviceStatusList" :key="item.id" :label="item.label" :value="item.value">
 								</el-option>
 							</el-select>
 						</el-form-item>
@@ -552,6 +552,11 @@
 					category: "璁惧鐘舵��"
 				}).then(res => {
 					this.deviceStatusList = res.data
+          this.deviceStatusList.forEach(a=>{
+            if(!isNaN(a.value)){
+              a.value = parseInt(a.value)
+            }
+          })
 					this.componentData.tagField.deviceStatus.select = res.data
 				})
 				this.$axios.post(this.$api.enums.selectEnumByCategory, {
@@ -581,7 +586,7 @@
           this.componentData.tagField.insProductIds.select = []
           this.componentData.selectField.insProductIds.select = []
           this.options = res.data.map((m,i)=>{
-            m.id = i;
+            m.id = m.name;
             let children = m.children.map(n=>{
               n.label = n.name;
               n.value = n.id;
@@ -628,6 +633,9 @@
 				//row = 鐐瑰嚮瀵瑰簲琛屽�间竴琛屽��
 				//澶嶅埗缁檉ormData
 				this.formData = this.HaveJson(row);
+        if(typeof(row.insProductIds)==='number'){
+          row.insProductIds = row.insProductIds+''
+        }
 				this.formData.insProductIds = row.insProductIds ? row.insProductIds.split(',') : [];
 			},
 			beforeUpload(file) {
@@ -659,12 +667,12 @@
 				}
 			},
 			submitForm() {
-				this.upLoad = true;
 				delete this.formData.createTime
 				delete this.formData.updateTime
 				delete this.formData.createUser
 				delete this.formData.updateUser
         this.formData.insProductIds = this.formData.insProductIds.join()
+        this.upLoad = true;
 				this.$axios.post(this.$api.deviceScope.upDeviceParameter, this.formData, {
 					headers: {
 						'Content-Type': 'application/json'
@@ -686,7 +694,7 @@
 			},
 			submitForm2() {
 				this.upLoad2 = true;
-        this.formData.insProductIds = this.formData.insProductIds.join()
+        this.formData2.insProductIds = this.formData2.insProductIds.join()
 				this.$axios.post(this.$api.deviceScope.addDeviceParameter, this.formData2, {
 					headers: {
 						'Content-Type': 'application/json'

--
Gitblit v1.9.3