From ec17854c8ceb6076f5f63ae1a18473af9f443f8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Thu, 5 Dec 2024 17:08:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=EF=BC=9A=E6=9C=BA=E7=BB=84?=
 =?UTF-8?q?=E9=A2=9D=E5=AE=9A=E5=AE=B9=E9=87=8F=E4=BE=9D=E8=B5=96=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/equipmentManagement/index.vue   | 43 +++++++++++--------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
index 1b96fd15..9c75668a 100644
--- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
@@ -119,9 +119,9 @@
                         <el-col :span="12">
                             <el-form-item label="生产厂家:">
                                 <el-input
-                                    :disabled="hasShowSelect"
+                                    :disabled="hasSetOfMachines"
                                     v-model="editDeviceData.madeinFactory"
-                                    :placeholder="hasShowSelect ? '请选择规格型号' : '请输入生产厂家'"
+                                    :placeholder="hasSetOfMachines ? '请选择规格型号' : '请输入生产厂家'"
                                     clearable
                                 />
                             </el-form-item>
@@ -129,7 +129,7 @@
                         <el-col :span="12">
                             <el-form-item label="规格型号:">
                                 <el-select
-                                    v-if="hasShowSelect"
+                                    v-if="hasSetOfMachines"
                                     v-model="editDeviceData.model"
                                     placeholder="请选择规格型号"
                                     style="width: 200px"
@@ -226,11 +226,12 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item :label="editDeviceData.objectType == '风电场' ? '装机容量(MW):' : '额定容量(MW):'">
+                            <el-form-item :label="hasSetOfMachines ? '额定容量(MW):' : '装机容量(MW):'">
                                 <el-input-number
+                                    :disabled="hasSetOfMachines"
                                     style="width: 200px"
                                     :controls="false"
-                                    :placeholder="editDeviceData.objectType == '风电场' ? '请输入装机容量' : '请输入额定容量'"
+                                    :placeholder="hasSetOfMachines ? '请输入额定容量' : '请输入装机容量'"
                                     v-model="editDeviceData.nominalCapacity"
                                 />
                             </el-form-item>
@@ -299,9 +300,9 @@
                         <el-col :span="12">
                             <el-form-item label="生产厂家:">
                                 <el-input
-                                    :disabled="hasShowSelect"
+                                    :disabled="hasSetOfMachines"
                                     v-model="editAddDeviceData.madeinFactory"
-                                    :placeholder="hasShowSelect ? '请选择规格型号' : '请输入生产厂家'"
+                                    :placeholder="hasSetOfMachines ? '请选择规格型号' : '请输入生产厂家'"
                                     clearable
                                 />
                             </el-form-item>
@@ -309,7 +310,7 @@
                         <el-col :span="12">
                             <el-form-item label="规格型号:">
                                 <el-select
-                                    v-if="hasShowSelect"
+                                    v-if="hasSetOfMachines"
                                     v-model="editAddDeviceData.model"
                                     placeholder="请选择规格型号"
                                     style="width: 200px"
@@ -411,11 +412,12 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item :label="editAddDeviceData.objectType == '风电场' ? '装机容量(MW):' : '额定容量(MW):'">
+                            <el-form-item :label="hasSetOfMachines ? '额定容量(MW):' : '装机容量(MW):'">
                                 <el-input-number
+                                    :disabled="hasSetOfMachines"
                                     style="width: 200px"
                                     :controls="false"
-                                    :placeholder="editAddDeviceData.objectType == '风电场' ? '请输入装机容量' : '请输入额定容量'"
+                                    :placeholder="hasSetOfMachines ? '请输入额定容量' : '请输入装机容量'"
                                     v-model="editAddDeviceData.nominalCapacity"
                                 />
                             </el-form-item>
@@ -733,7 +735,7 @@ const addDeviceList = () => {
     editAddDeviceData.iotModelId = ''
     editAddDeviceData.belongLine = ''
     editAddDeviceData.standard = 0
-    editAddDeviceData.nominalCapacity = null
+    editAddDeviceData.nominalCapacity = ''
 }
 
 // 查看设备详情
@@ -756,13 +758,13 @@ const editDeviceData = reactive({
     id: '',
     belongLine: '',
     standard: 0,
-    nominalCapacity: null,
+    nominalCapacity: '',
 })
 
-const hasShowSelect = computed(() => {
+const hasSetOfMachines = computed(() => {
     return queryParameter.value.equipmentTypeId === 10002
 })
-const modelList = ref<{ model: string; madeinFactory: string }[]>([])
+const modelList = ref<{ model: string; madeinFactory: string; nominalCapacity: string }[]>([])
 
 const getModelList = () => {
     theoreticalpowerCurveList().then((res) => {
@@ -771,6 +773,7 @@ const getModelList = () => {
                 return {
                     model: item.model,
                     madeinFactory: item.madeinfactory,
+                    nominalCapacity: item.nominalCapacity,
                 }
             })
         }
@@ -778,9 +781,11 @@ const getModelList = () => {
 }
 const selectEditModel = (value: string) => {
     editDeviceData.madeinFactory = modelList.value.find((item) => item.model == value)?.madeinFactory || ''
+    editDeviceData.nominalCapacity = modelList.value.find((item) => item.model == value)?.nominalCapacity || ''
 }
 const selectAddModel = (value: string) => {
     editAddDeviceData.madeinFactory = modelList.value.find((item) => item.model == value)?.madeinFactory || ''
+    editAddDeviceData.nominalCapacity = modelList.value.find((item) => item.model == value)?.nominalCapacity || ''
 }
 const size = ref<'default' | 'large' | 'small'>('default')
 
@@ -938,7 +943,7 @@ const editAddDeviceData = reactive({
     iotModelId: '',
     belongLine: '',
     standard: 0,
-    nominalCapacity: null,
+    nominalCapacity: '',
 })
 const addhandleSwitchChange = (value: any) => {
     editAddDeviceData.standard = value ? 1 : 0
@@ -1060,15 +1065,15 @@ const measureData = reactive<{
     iotModelId: string
     autoUpdate: boolean
     measureType: ModelAttributeType
-    madeinFactory:string
-    model:string
+    madeinFactory: string
+    model: string
 }>({
     deviceId: '',
     iotModelId: '',
     autoUpdate: false,
     measureType: 138,
-    madeinFactory:'',
-    model:''
+    madeinFactory: '',
+    model: '',
 })
 const showMeasure = ref(false)
 const openMeasure = (data: any) => {