From 8e9634c375bdcb12365d73ef455bd78106720ff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= <zhongchunyang@rocan.com.cn>
Date: Fri, 2 Feb 2024 09:29:19 +0800
Subject: [PATCH] =?UTF-8?q?el-select=E9=BB=98=E8=AE=A4=E5=AE=BD=E5=BA=A6?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/header/index.vue         | 19 ++++++++++++++-----
 src/styles/element.scss                       |  1 +
 src/views/auth/userList/popupEdit.vue         |  7 +++----
 .../govern/manage/basic/popupVersion.vue      |  4 ++--
 src/views/govern/manage/basic/template.vue    |  1 -
 src/views/govern/manage/basic/version.vue     |  1 -
 src/views/govern/manage/factory.vue           |  5 ++---
 .../setting/dictionary/list/popupEdit.vue     |  2 --
 8 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue
index e860912..6177074 100644
--- a/src/components/table/header/index.vue
+++ b/src/components/table/header/index.vue
@@ -81,7 +81,7 @@ const showUnfoldButton = ref(false)
 const headerFormSecondStyleOpen = {
     opacity: 1,
     height: 'auto',
-    padding: '13px 15px'
+    padding: '0 15px 13px 15px'
 }
 const headerFormSecondStyleClose = {
     opacity: 0,
@@ -116,7 +116,7 @@ const handlerHeight = () => {
 const computedSearchRow = () => {
     const headerForm = document.getElementById('header-form') as HTMLElement
     const headerFormSecond = document.getElementById('header-form-second') as HTMLElement
-    if(!headerForm) return
+    if (!headerForm) return
     // 判断是否需要折叠
     if (headerForm.scrollHeight > 50) {
         showUnfoldButton.value = true
@@ -197,9 +197,9 @@ defineExpose({ onComSearch, areaRef })
 
 #header-form-second,
 #header-form {
-    display: flex;
-    flex-wrap: wrap;
-    transition: all 0.3s;
+    // display: flex;
+    // flex-wrap: wrap;
+    // transition: all 0.3s;
 }
 
 .mlr-12 {
@@ -270,4 +270,13 @@ html.dark {
         }
     }
 }
+#header-form,
+#header-form-second {
+    :deep(.el-select) {
+        --el-select-width: 220px;
+    }
+    :deep(.el-input) {
+        --el-input-width: 220px;
+    }
+}
 </style>
diff --git a/src/styles/element.scss b/src/styles/element.scss
index c10dd43..8058ed3 100644
--- a/src/styles/element.scss
+++ b/src/styles/element.scss
@@ -129,3 +129,4 @@
         font-weight: 700;
     }
 }
+
diff --git a/src/views/auth/userList/popupEdit.vue b/src/views/auth/userList/popupEdit.vue
index ca40329..f63754f 100644
--- a/src/views/auth/userList/popupEdit.vue
+++ b/src/views/auth/userList/popupEdit.vue
@@ -12,8 +12,7 @@
                     <el-input v-model="form.password" placeholder="请输入密码" disabled />
                 </el-form-item>
                 <el-form-item label="权限类型" prop="type">
-                    <el-select
-                        style="width: 100%"
+                    <el-select 
                         v-model="form.type"
                         @change="changeValue"
                         disabled
@@ -28,7 +27,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="用户类型" prop="casualUser">
-                    <el-select style="width: 100%" v-model="form.casualUser" placeholder="请选择权限类型">
+                    <el-select  v-model="form.casualUser" placeholder="请选择权限类型">
                         <el-option
                             v-for="(item, index) in TypeOptions"
                             :label="item.label"
@@ -41,7 +40,7 @@
                     <Area style="width: 100%" v-model="form.deptId" />
                 </el-form-item>
                 <el-form-item label="角色" prop="role">
-                    <el-select style="width: 100%" v-model="form.role" placeholder="请选择角色" multiple collapse-tags>
+                    <el-select  v-model="form.role" placeholder="请选择角色" multiple collapse-tags>
                         <el-option
                             v-for="(item, index) in roleOptions"
                             :label="item.label"
diff --git a/src/views/govern/manage/basic/popupVersion.vue b/src/views/govern/manage/basic/popupVersion.vue
index 065a611..9a6259c 100644
--- a/src/views/govern/manage/basic/popupVersion.vue
+++ b/src/views/govern/manage/basic/popupVersion.vue
@@ -3,7 +3,7 @@
         <el-scrollbar>
             <el-form :inline="true" :model="form" label-width="120px" ref="formRef" :rules="rules">
                 <el-form-item label="装置类型:" prop="type">
-                    <el-select v-model="form.type" placeholder="请选择" style="width: 100%" @change="typeChange">
+                    <el-select v-model="form.type" placeholder="请选择"  @change="typeChange">
                         <el-option
                             v-for="item in TypeOptions"
                             :key="item.id"
@@ -13,7 +13,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="装置型号:" prop="devType">
-                    <el-select v-model="form.devType" placeholder="请选择" style="width: 100%" @change="devTypeChange">
+                    <el-select v-model="form.devType" placeholder="请选择"  @change="devTypeChange">
                         <el-option
                             v-for="item in DevTypeOptions"
                             :key="item.id"
diff --git a/src/views/govern/manage/basic/template.vue b/src/views/govern/manage/basic/template.vue
index 1a1c613..11cf3e4 100644
--- a/src/views/govern/manage/basic/template.vue
+++ b/src/views/govern/manage/basic/template.vue
@@ -9,7 +9,6 @@
                     <el-select
                         v-model="tableStore.table.params.devType"
                         placeholder="请选择"
-                        style="width: 100%"
                         clearable
                     >
                         <el-option
diff --git a/src/views/govern/manage/basic/version.vue b/src/views/govern/manage/basic/version.vue
index 71ed026..1035a75 100644
--- a/src/views/govern/manage/basic/version.vue
+++ b/src/views/govern/manage/basic/version.vue
@@ -6,7 +6,6 @@
                     <el-select
                         v-model="tableStore.table.params.devType"
                         placeholder="请选择"
-                        style="width: 100%"
                         clearable
                     >
                         <el-option
diff --git a/src/views/govern/manage/factory.vue b/src/views/govern/manage/factory.vue
index 7c8ed91..f44e772 100644
--- a/src/views/govern/manage/factory.vue
+++ b/src/views/govern/manage/factory.vue
@@ -85,7 +85,6 @@
                     <el-select
                         v-model='form.devType'
                         placeholder='请选择'
-                        style='width: 100%'
                         @change='formDevTypeChange'
                         clearable
                     >
@@ -98,7 +97,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label='设备型号:' prop='devModel' class='top'>
-                    <el-select v-model='form.devModel' placeholder='请选择' style='width: 100%' clearable>
+                    <el-select v-model='form.devModel' placeholder='请选择' clearable>
                         <el-option
                             v-for='item in formDevModelOptionsFilter'
                             :key='item.value'
@@ -108,7 +107,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label='通讯协议:' prop='devAccessMethod' class='top'>
-                    <el-select v-model='form.devAccessMethod' placeholder='请选择' style='width: 100%' clearable>
+                    <el-select v-model='form.devAccessMethod' placeholder='请选择' clearable>
                         <el-option label='MQTT' value='MQTT'></el-option>
                         <el-option label='CLD' value='cloud'></el-option>
                     </el-select>
diff --git a/src/views/setting/dictionary/list/popupEdit.vue b/src/views/setting/dictionary/list/popupEdit.vue
index 712354d..a5a4b61 100644
--- a/src/views/setting/dictionary/list/popupEdit.vue
+++ b/src/views/setting/dictionary/list/popupEdit.vue
@@ -16,7 +16,6 @@
                     <el-select
                         v-model='form.openLevel'
                         placeholder='选择开启等级'
-                        style='width: 100%'
                     >
                         <el-option
                             v-for='item in OpenLevel'
@@ -31,7 +30,6 @@
                     <el-select
                         v-model='form.openDescribe'
                         placeholder='选择开启算法'
-                        style='width: 100%'
                     >
                         <el-option
                             v-for='item in OpenDescribe'