From f8006832e173193eb66df7d4ece841198639cea9 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Tue, 28 Mar 2023 16:07:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug#11108=E3=80=8110690=E3=80=8110754?=
 =?UTF-8?q?=E3=80=8110736=E3=80=8111118?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/media/DashBoard/components/Card.vue | 54 ++++++++++++++-----
 src/views/media/DashBoard/index.vue           |  2 +-
 .../system/Apply/Save/components/EditForm.vue |  4 +-
 src/views/system/Department/index.vue         |  2 +-
 4 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/src/views/media/DashBoard/components/Card.vue b/src/views/media/DashBoard/components/Card.vue
index 3f8110c8..41e4cc0e 100644
--- a/src/views/media/DashBoard/components/Card.vue
+++ b/src/views/media/DashBoard/components/Card.vue
@@ -80,25 +80,53 @@ const createChart = () => {
                 // minInterval: 1,
             },
             series: [
+                // {
+                //     name: '播放数量(人次)',
+                //     data: sData,
+                //     type: 'bar',
+                //     barWidth: 16,
+                //     itemStyle: {
+                //         color: '#2f54eb',
+                //     },
+                // },
+                // {
+                //     name: '播放数量(人次)',
+                //     type: 'line',
+                //     symbol: 'circle',
+                //     showSymbol: false,
+                //     smooth: true,
+                //     lineStyle: {
+                //         color: '#a5fff9',
+                //     },
+                //     data: sData,
+                // },
                 {
                     name: '播放数量(人次)',
                     data: sData,
-                    type: 'bar',
-                    barWidth: 16,
-                    itemStyle: {
-                        color: '#2f54eb',
-                    },
-                },
-                {
-                    name: '播放数量(人次)',
                     type: 'line',
-                    symbol: 'circle',
-                    showSymbol: false,
                     smooth: true,
-                    lineStyle: {
-                        color: '#a5fff9',
+                    symbolSize: 0, // 拐点大小
+                    color: '#ADC6FF',
+                    areaStyle: {
+                        color: {
+                            type: 'linear',
+                            x: 0,
+                            y: 0,
+                            x2: 0,
+                            y2: 1,
+                            colorStops: [
+                                {
+                                    offset: 0,
+                                    color: '#ADC6FF', // 100% 处的颜色
+                                },
+                                {
+                                    offset: 1,
+                                    color: '#FFFFFF', //   0% 处的颜色
+                                },
+                            ],
+                            global: false, // 缺省为 false
+                        },
                     },
-                    data: sData,
                 },
             ],
         };
diff --git a/src/views/media/DashBoard/index.vue b/src/views/media/DashBoard/index.vue
index 7d23194d..2ce4afe7 100644
--- a/src/views/media/DashBoard/index.vue
+++ b/src/views/media/DashBoard/index.vue
@@ -135,7 +135,7 @@ const aggPlayingFooter = ref<Footer[]>([]);
 const aggPlayingTotal = ref(0);
 const getAggPlayingData = () => {
     dashboardApi.aggPlaying().then((res) => {
-        aggTotal.value = res.result.playingTotal;
+        aggPlayingTotal.value = res.result.playingTotal;
         aggPlayingFooter.value = [
             {
                 title: '播放人数',
diff --git a/src/views/system/Apply/Save/components/EditForm.vue b/src/views/system/Apply/Save/components/EditForm.vue
index 0891bb05..0522c2c0 100644
--- a/src/views/system/Apply/Save/components/EditForm.vue
+++ b/src/views/system/Apply/Save/components/EditForm.vue
@@ -65,7 +65,7 @@
                         <div>
                             <j-image
                                 :preview="false"
-                                :src="getImage('/apply/provider3.png')"
+                                :src="getImage('/apply/provider4.png')"
                             />
                             <p>微信网站应用</p>
                         </div>
@@ -74,7 +74,7 @@
                         <div>
                             <j-image
                                 :preview="false"
-                                :src="getImage('/apply/provider4.png')"
+                                :src="getImage('/apply/provider3.png')"
                             />
                             <p>钉钉企业内部应用</p>
                         </div>
diff --git a/src/views/system/Department/index.vue b/src/views/system/Department/index.vue
index 1625481f..3ebef3e7 100644
--- a/src/views/system/Department/index.vue
+++ b/src/views/system/Department/index.vue
@@ -5,7 +5,7 @@
                 <LeftTree @change="(id) => (departmentId = id)" />
             </div>
             <div class="right">
-                <j-tabs v-model:activeKey="activeKey">
+                <j-tabs v-model:activeKey="activeKey" destroyInactiveTabPane>
                     <j-tab-pane key="product" tab="产品">
                         <Product
                             :parentId="departmentId"