From 037183003f00c8d61b867b60cfd3d6c48089d68e 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 14:45:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=85=E9=9A=9C=E5=BD=95=E6=B3=A2=EF=BC=9A?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4log=20=E8=AE=BE=E5=A4=87:=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E5=9E=8B=E5=8F=B7=E5=8F=82=E6=95=B0=E5=9C=A8?=
 =?UTF-8?q?=E6=9C=BA=E7=BB=84=E4=B8=8B=E4=B8=BA=E9=80=89=E6=8B=A9=EF=BC=8C?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E4=B8=BA=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/equipmentManagement/index.vue   | 41 ++++++++++++++-----
 .../src/views/backend/malfunction/index.vue   |  2 -
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
index 6507eda8..e331b391 100644
--- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
@@ -118,15 +118,21 @@
                     <el-row>
                         <el-col :span="12">
                             <el-form-item label="生产厂家:">
-                                <el-input disabled v-model="editDeviceData.madeinFactory" placeholder="请选择规格型号" clearable />
+                                <el-input :disabled="hasShowSelect" v-model="editDeviceData.madeinFactory" placeholder="请选择规格型号" clearable />
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="规格型号:">
-                                <!-- <el-input v-model="editDeviceData.model" style="width: 200px" placeholder="请输入规格型号" clearable /> -->
-                                <el-select v-model="editDeviceData.model" placeholder="请选择规格型号" style="width: 200px" @change="selectEditModel">
+                                <el-select
+                                    v-if="hasShowSelect"
+                                    v-model="editDeviceData.model"
+                                    placeholder="请选择规格型号"
+                                    style="width: 200px"
+                                    @change="selectEditModel"
+                                >
                                     <el-option v-for="item in modelList" :key="item.model" :value="item.model"></el-option>
                                 </el-select>
+                                <el-input v-else v-model="editDeviceData.model" style="width: 200px" placeholder="请输入规格型号" clearable />
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -287,14 +293,26 @@
                     <el-row>
                         <el-col :span="12">
                             <el-form-item label="生产厂家:">
-                                <el-input disabled v-model="editAddDeviceData.madeinFactory" placeholder="请选择规格型号" clearable />
+                                <el-input
+                                    :disabled="hasShowSelect"
+                                    v-model="editAddDeviceData.madeinFactory"
+                                    placeholder="请选择规格型号"
+                                    clearable
+                                />
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="规格型号:">
-                                <el-select v-model="editAddDeviceData.model" placeholder="请选择规格型号" style="width: 200px" @change="selectAddModel">
+                                <el-select
+                                    v-if="hasShowSelect"
+                                    v-model="editAddDeviceData.model"
+                                    placeholder="请选择规格型号"
+                                    style="width: 200px"
+                                    @change="selectAddModel"
+                                >
                                     <el-option v-for="item in modelList" :key="item.model" :value="item.model"></el-option>
                                 </el-select>
+                                <el-input v-else v-model="editAddDeviceData.model" placeholder="请输入规格型号" style="width: 200px"></el-input>
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -471,7 +489,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, onMounted, nextTick, watch } from 'vue'
+import { ref, reactive, computed, onMounted, nextTick, watch } from 'vue'
 import { Search, CirclePlusFilled, Upload, Download } from '@element-plus/icons-vue'
 import {
     equipTree,
@@ -734,13 +752,16 @@ const editDeviceData = reactive({
     nominalCapacity: null,
 })
 
+const hasShowSelect = computed(() => {
+    return queryParameter.value.equipmentTypeId === 10002
+})
 const modelList = ref<{ model: string; madeinFactory: string }[]>([])
 
 const getModelList = () => {
     theoreticalpowerCurveList().then((res) => {
         if (res.rows) {
-            console.log(res);
-            
+            console.log(res)
+
             modelList.value = (res.rows as any[]).map((item: any) => {
                 return {
                     model: item.model,
@@ -750,10 +771,10 @@ const getModelList = () => {
         }
     })
 }
-const selectEditModel = (value:string)=>{
+const selectEditModel = (value: string) => {
     editDeviceData.madeinFactory = modelList.value.find((item) => item.model == value)?.madeinFactory || ''
 }
-const selectAddModel = (value:string)=>{
+const selectAddModel = (value: string) => {
     editAddDeviceData.madeinFactory = modelList.value.find((item) => item.model == value)?.madeinFactory || ''
 }
 const size = ref<'default' | 'large' | 'small'>('default')
diff --git a/ui/dasadmin/src/views/backend/malfunction/index.vue b/ui/dasadmin/src/views/backend/malfunction/index.vue
index 9dcb51c0..b823a6ba 100644
--- a/ui/dasadmin/src/views/backend/malfunction/index.vue
+++ b/ui/dasadmin/src/views/backend/malfunction/index.vue
@@ -323,8 +323,6 @@ const pageSetting = reactive({
 const changePageSetting = () => {}
 
 const getListForAirBlower = () => {
-    console.log(activeName.value)
-
     const data = {
         deviceCode: curTreeData.value.code,
         startTime: dayjs(searchData.date[0]).format('YYYY-MM'),