From 771c384ec662ce92b3650d47e5106070a3a516e1 Mon Sep 17 00:00:00 2001
From: wangqi <3188864257@qq.com>
Date: Tue, 7 Jan 2025 19:22:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AD=97=E6=AE=B5=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/deviceInfo/components/data-filter.vue    |  4 ++--
 src/pages/deviceStorage/components/data-filter.vue |  4 ++--
 src/pages/deviceTest/testPlan/index.vue            |  1 -
 src/pages/ota/upgradeTask/utils.ts                 |  2 +-
 src/pages/system/config/index.vue                  |  2 --
 src/pages/system/deviceField/index.vue             | 11 ++++++++---
 src/pages/system/manufacturer/index.vue            |  1 -
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/pages/deviceInfo/components/data-filter.vue b/src/pages/deviceInfo/components/data-filter.vue
index 044836c..4f0bb11 100644
--- a/src/pages/deviceInfo/components/data-filter.vue
+++ b/src/pages/deviceInfo/components/data-filter.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="storage-data-filter">
+  <el-scrollbar class="storage-data-filter">
     <div class="time-item">
       <el-config-provider :locale="locale">
         <span>开始时间:</span>
@@ -81,7 +81,7 @@
       />
       <EdfsButton inner-text="重置" style="width: 100%" @click="onReset" />
     </div>
-  </div>
+  </el-scrollbar>
 </template>
 
 <script setup lang="ts">
diff --git a/src/pages/deviceStorage/components/data-filter.vue b/src/pages/deviceStorage/components/data-filter.vue
index 8bf04c2..bfe2f8e 100644
--- a/src/pages/deviceStorage/components/data-filter.vue
+++ b/src/pages/deviceStorage/components/data-filter.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="storage-data-filter">
+  <el-scrollbar  class="storage-data-filter">
     <div class="time-item">
       <el-config-provider :locale="locale">
         <span>开始时间:</span>
@@ -66,7 +66,7 @@
         @click="onSearch"
       />
     </div>
-  </div>
+  </el-scrollbar>
 </template>
 
 <script setup lang="ts">
diff --git a/src/pages/deviceTest/testPlan/index.vue b/src/pages/deviceTest/testPlan/index.vue
index 85989bd..c6b3192 100644
--- a/src/pages/deviceTest/testPlan/index.vue
+++ b/src/pages/deviceTest/testPlan/index.vue
@@ -39,7 +39,6 @@
               type="primary"
               plain
               @click="openDlg('create')"
-              v-hasPermi="['system:user:create']"
             >
               <Icon icon="ep:plus" /> 新增
             </el-button>
diff --git a/src/pages/ota/upgradeTask/utils.ts b/src/pages/ota/upgradeTask/utils.ts
index b9d66bc..25cd2c8 100644
--- a/src/pages/ota/upgradeTask/utils.ts
+++ b/src/pages/ota/upgradeTask/utils.ts
@@ -12,7 +12,7 @@ export const tableColumns = [
   {
     label: '固件版本',
     prop: 'version',
-    width: '6%',
+    width: '8%',
   },
 
   {
diff --git a/src/pages/system/config/index.vue b/src/pages/system/config/index.vue
index e2a1df4..2fbec0a 100644
--- a/src/pages/system/config/index.vue
+++ b/src/pages/system/config/index.vue
@@ -13,8 +13,6 @@
             v-model="isEnableFileStorage"
             active-color="#13ce66"
             inactive-color="#ff4949"
-            active-text="开启"
-            inactive-text="关闭"
           />
         </div>
       </div>
diff --git a/src/pages/system/deviceField/index.vue b/src/pages/system/deviceField/index.vue
index d1adbba..0b4967c 100644
--- a/src/pages/system/deviceField/index.vue
+++ b/src/pages/system/deviceField/index.vue
@@ -31,13 +31,14 @@
     :action="categoryAction"
     :isShow="isShowCategoryDlg"
     :row="categoryEditRow"
-    :treeData="categoryTreeData"
-    @on-close="isShowCategoryDlg = false"
+    :treeData="cloneDeep(categoryTreeData)"
+    @on-close="onClone"
     @on-save="onSaveCategory"
   />
 </template>
 
 <script setup lang="ts">
+import { cloneDeep } from 'lodash'
 import {
   deleteCategory,
   getCategoryTree,
@@ -90,7 +91,11 @@ async function onDeleteCategory(row: ICategoryTree) {
 
 function onSaveCategory() {
   loadDeviceTypeTree()
+}
+
+function onClone() {
   isShowCategoryDlg.value = false
+  categoryEditRow.value = undefined
 }
 
 onMounted(() => {
@@ -106,7 +111,7 @@ onMounted(() => {
   height: 100%;
   column-gap: 10px;
   .category-box {
-   //  flex: 0.6;
+    //  flex: 0.6;
   }
   .cause-box {
     flex: 0.6;
diff --git a/src/pages/system/manufacturer/index.vue b/src/pages/system/manufacturer/index.vue
index 5dce908..51274ed 100644
--- a/src/pages/system/manufacturer/index.vue
+++ b/src/pages/system/manufacturer/index.vue
@@ -47,7 +47,6 @@
               type="primary"
               plain
               @click="openDlg('create')"
-              v-hasPermi="['system:user:create']"
             >
               <Icon icon="ep:plus" /> 新增
             </el-button>