From 6522aaa499c34daa71d22ce7dbab76bdac93e404 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Thu, 28 Nov 2024 16:26:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=99=E6=B1=9F=E6=97=A0?=
 =?UTF-8?q?=E7=BA=BFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/echarts/MyEchart.vue                   |  2 +-
 src/stores/config.ts                                  |  2 +-
 .../govern/device/control/analysisList/index.vue      |  2 +-
 .../govern/device/control/offLineDataImport/index.vue | 11 ++++++-----
 src/views/govern/device/control/tabs/trend.vue        |  7 +++----
 src/views/govern/device/planData/index.vue            |  9 ++++-----
 src/views/govern/setting/statisticalType/binding.vue  |  9 +++++++--
 7 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/components/echarts/MyEchart.vue b/src/components/echarts/MyEchart.vue
index 57fea0b..b27fb74 100644
--- a/src/components/echarts/MyEchart.vue
+++ b/src/components/echarts/MyEchart.vue
@@ -90,7 +90,7 @@ const initChart = () => {
             itemStyle: {},
             // textStyle: {
             fontSize: 12,
-            padding: [2, 0, 0, 0], //[上、右、下、左]
+            // padding: [2, 0, 0, 0], //[上、右、下、左]
             // },
             itemWidth: 15,
             itemHeight: 10,
diff --git a/src/stores/config.ts b/src/stores/config.ts
index 65ad801..07c4062 100644
--- a/src/stores/config.ts
+++ b/src/stores/config.ts
@@ -14,7 +14,7 @@ export const useConfig = defineStore(
             // 后台布局方式，可选值<Default|Classic|Streamline|Double>
             layoutMode: 'Classic',
             // 后台主页面切换动画，可选值<slide-right|slide-left|el-fade-in-linear|el-fade-in|el-zoom-in-center|el-zoom-in-top|el-zoom-in-bottom>
-            mainAnimation: 'slide-right',
+            mainAnimation: 'el-fade-in',
             // 是否暗黑模式
             isDark: false,
             elementUiPrimary: ['#002B6A', '#002B6A'],
diff --git a/src/views/govern/device/control/analysisList/index.vue b/src/views/govern/device/control/analysisList/index.vue
index 9323e69..5969fc2 100644
--- a/src/views/govern/device/control/analysisList/index.vue
+++ b/src/views/govern/device/control/analysisList/index.vue
@@ -36,7 +36,7 @@ const deviceData = ref({})
 const { push, options, currentRoute } = useRouter()
 const tableStore: any = new TableStore({
     url: '/cs-device-boot/portableOfflLog/queryMainLogPage',
-    publicHeight: 400,
+    publicHeight: 420,
     method: 'POST',
     column: [
         // { width: '60', type: 'checkbox', fixed: 'left' },
diff --git a/src/views/govern/device/control/offLineDataImport/index.vue b/src/views/govern/device/control/offLineDataImport/index.vue
index dee7b89..45405a4 100644
--- a/src/views/govern/device/control/offLineDataImport/index.vue
+++ b/src/views/govern/device/control/offLineDataImport/index.vue
@@ -7,10 +7,7 @@
                 <el-button :loading="loading" style="margin-left: 10px" type="primary" @click="submitUpload">
                     上传离线数据
                 </el-button>
-                <el-button type="primary" @click="handleUpload" :loading="loading"
-                    :disabled="offLineFileList.length == 0 || disableHandleUpload">
-                    开始上传
-                </el-button>
+               
                 <el-button type="primary" @click="removeAllFile" :loading="loading"
                     :disabled="offLineFileList.length == 0">
                     重置上传文件
@@ -45,7 +42,11 @@
         <template #footer>
             <div class="dialog-footer">
                 <!-- <el-button @click="close">取消</el-button> -->
-                <el-button type="primary" @click="close">确定</el-button>
+                <!-- <el-button type="primary" @click="close">确定</el-button> -->
+                <el-button type="primary" @click="handleUpload" :loading="loading"
+                    :disabled="offLineFileList.length == 0 || disableHandleUpload">
+                    开始上传
+                </el-button>
             </div>
         </template>
     </el-dialog>
diff --git a/src/views/govern/device/control/tabs/trend.vue b/src/views/govern/device/control/tabs/trend.vue
index 2e117eb..9b59ad9 100644
--- a/src/views/govern/device/control/tabs/trend.vue
+++ b/src/views/govern/device/control/tabs/trend.vue
@@ -245,15 +245,14 @@ const init = async () => {
                         echartsData.value = {
                             legend: {
                                 itemWidth: 20,
-                                itemHeight: 10,
-                                itemGap: 10,
+                                itemHeight: 20,
+                                itemStyle: { opacity: 0 },//去圆点
                                 type: 'scroll', // 开启滚动分页
                                 // orient: 'vertical', // 垂直排列
                                 top: 5,
                                 right: 70,
-
                                 width: 550,
-                                height: 50
+                                // height: 50
                             },
                             grid: {
                                 top: '80px',
diff --git a/src/views/govern/device/planData/index.vue b/src/views/govern/device/planData/index.vue
index 4a508e6..c1f2444 100644
--- a/src/views/govern/device/planData/index.vue
+++ b/src/views/govern/device/planData/index.vue
@@ -501,14 +501,13 @@ const init = (flag: boolean) => {
                             },
                             legend: {
                                 itemWidth: 20,
-                                itemHeight: 10,
-                                itemGap: 15,
+                                itemHeight: 20,
+                                itemStyle: { opacity: 0 },//去圆点
                                 type: 'scroll', // 开启滚动分页
-                                // orient: 'vertical', // 垂直排列
-                                top: 5,
                                 right: 70,
                                 width: 550,
-                                height: 50
+                             
+                                // height: 50
                             },
                             grid: {
                                 top: '80px',
diff --git a/src/views/govern/setting/statisticalType/binding.vue b/src/views/govern/setting/statisticalType/binding.vue
index 216782d..066027a 100644
--- a/src/views/govern/setting/statisticalType/binding.vue
+++ b/src/views/govern/setting/statisticalType/binding.vue
@@ -1,6 +1,6 @@
 <template>
     <el-dialog class="cn-operate-dialog statistical-type-binding" v-model="dialogVisible" title="绑定指标"
-        style="width: 1040px">
+        style="width: 1040px" @closed="close">
         <el-scrollbar style="padding-right: 0">
             <div class="box">
                 <div class="box-left">
@@ -66,7 +66,7 @@
 
         <template #footer>
             <span class="dialog-footer">
-                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button @click="close">取消</el-button>
                 <el-button type="primary" @click="submit">确认</el-button>
             </span>
         </template>
@@ -393,6 +393,11 @@ const submit = async () => {
         dialogVisible.value = false
     })
 }
+const close = () => {
+    searchKey.value = ''
+    searchKey1.value = ''
+    dialogVisible.value = false
+}
 
 defineExpose({ open })
 </script>