From 523858cbdebb123f87ca81d81858e38956b43921 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen>
Date: Thu, 8 Dec 2022 16:17:23 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91-=E7=A6=85=E9=81=93bug?=
 =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9-=E4=B8=8B=E5=8D=882?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/screen/HomePage.vue                            | 6 ++++--
 src/views/screen/incomePayments/NotReceivedEcharts.vue   | 1 -
 src/views/screen/incomePayments/index.vue                | 9 +++++++++
 .../screen/preparationRevision/GeneralSituationChart.vue | 2 --
 .../screen/preparationRevision/ReleasePlanChart.vue      | 1 -
 src/views/screen/preparationRevision/index.vue           | 7 +++++++
 src/views/screen/util/BarAndLineOptions.js               | 4 ++--
 src/views/screen/util/PieOptions.js                      | 4 +---
 8 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/views/screen/HomePage.vue b/src/views/screen/HomePage.vue
index 722954d..90c20ab 100644
--- a/src/views/screen/HomePage.vue
+++ b/src/views/screen/HomePage.vue
@@ -223,8 +223,10 @@ export default {
 ::v-deep ::-webkit-scrollbar-thumb{
   background: #445a9c;
 }
-::v-deep ::-webkit-scrollbar-corner {
-  //background: black;
+// 下拉框-清除图标的背景色
+::v-deep .ant-select-selection__clear {
+  background: #293f6a;
+  color: #fff;
 }
 
 </style>
diff --git a/src/views/screen/incomePayments/NotReceivedEcharts.vue b/src/views/screen/incomePayments/NotReceivedEcharts.vue
index 103dc7c..f9b8e2b 100644
--- a/src/views/screen/incomePayments/NotReceivedEcharts.vue
+++ b/src/views/screen/incomePayments/NotReceivedEcharts.vue
@@ -182,7 +182,6 @@ export default {
       // echartsData = this.initPoint(echartsData, color)
       // let chartDom = document.getElementById('notReceivedScreen')
       // let myChart = echarts.init(chartDom)
-      console.log('-------echartsData--------', echartsData)
       let option = {
         legend: {
           left:'15%',
diff --git a/src/views/screen/incomePayments/index.vue b/src/views/screen/incomePayments/index.vue
index e9a89b8..2dc2d0b 100644
--- a/src/views/screen/incomePayments/index.vue
+++ b/src/views/screen/incomePayments/index.vue
@@ -245,6 +245,12 @@ export default {
 }
 
 .screen-department-select{
+  &::-webkit-scrollbar-track{
+    background: #293f6a!important;
+  }
+  &::-webkit-scrollbar-thumb{
+    background: #445a9c!important;
+  }
   background-color: #181F55;
   .ant-select-dropdown-content{
     background-color: #181F55;
@@ -273,6 +279,9 @@ export default {
       color: white;
     }
   }
+  .ant-empty-description{
+    color: #fff;
+  }
 }
 
 </style>
\ No newline at end of file
diff --git a/src/views/screen/preparationRevision/GeneralSituationChart.vue b/src/views/screen/preparationRevision/GeneralSituationChart.vue
index cd2cc38..0cd2d59 100644
--- a/src/views/screen/preparationRevision/GeneralSituationChart.vue
+++ b/src/views/screen/preparationRevision/GeneralSituationChart.vue
@@ -113,7 +113,6 @@ export default {
   //   获取数据
     getData() {
       StanderProjectGeneralSituation().then(res => {
-        console.log(res)
         if(res.success) {
           let result = res.result || {}
           this.releaseData[0].value = result.stdGb
@@ -150,7 +149,6 @@ export default {
           }
         ]
       }
-      console.log('-------deepMerge(commonOption, releaseChart0ption)-------', deepMerge(commonOption, releaseChart0ption))
       createPieChart('releaseChart', deepMerge(commonOption, releaseChart0ption))
 
       let researchChart0ption = {
diff --git a/src/views/screen/preparationRevision/ReleasePlanChart.vue b/src/views/screen/preparationRevision/ReleasePlanChart.vue
index cdc8099..3154a10 100644
--- a/src/views/screen/preparationRevision/ReleasePlanChart.vue
+++ b/src/views/screen/preparationRevision/ReleasePlanChart.vue
@@ -197,7 +197,6 @@ export default {
           }
         ]
       }
-      console.log('------option------', option)
       createBarAndLineChart('releasePlanChart', option)
     }
   },
diff --git a/src/views/screen/preparationRevision/index.vue b/src/views/screen/preparationRevision/index.vue
index de59bcd..824f4e4 100644
--- a/src/views/screen/preparationRevision/index.vue
+++ b/src/views/screen/preparationRevision/index.vue
@@ -193,6 +193,13 @@ export default {
 </style>
 <style lang="less">
 .ant-select-screen {
+  .ant-select-dropdown-content > ul::-webkit-scrollbar-track{
+    background: #293f6a;
+    ////border-color: transparent;
+  }
+  .ant-select-dropdown-content > ul::-webkit-scrollbar-thumb{
+    background: #445a9c;
+  }
   background-color: #181F55;
 
   .ant-select-dropdown-menu-item {
diff --git a/src/views/screen/util/BarAndLineOptions.js b/src/views/screen/util/BarAndLineOptions.js
index 27129c7..58996bc 100644
--- a/src/views/screen/util/BarAndLineOptions.js
+++ b/src/views/screen/util/BarAndLineOptions.js
@@ -174,8 +174,8 @@ export const BarAndLineOptions = {
       },
       splitLine: {
         lineStyle: {
-          color: '#7599E8',
-          type: 'dashed'
+          color: 'rgba(117, 153, 232, 0.5)',
+          type: 'solid'
         }
       },
       type: 'value',
diff --git a/src/views/screen/util/PieOptions.js b/src/views/screen/util/PieOptions.js
index 696c1d4..a80ec32 100644
--- a/src/views/screen/util/PieOptions.js
+++ b/src/views/screen/util/PieOptions.js
@@ -121,8 +121,7 @@ export const PieOptions = {
       label: {
         show: true,
         color: '#7599E8',
-        // formatter: '{b}: {d}%',
-        formatter: '{b}: {c}',
+        formatter: '{b}: {d}%'
       }
     }
   ]
@@ -134,7 +133,6 @@ export function createPieChart(idName, option) {
   echarts.dispose(chartDom)
   // debugger
   let chartOption = deepMerge({}, PieOptions, option)
-  console.log('-----chartOption-------', chartOption)
   let myChart = echarts.init(chartDom)
   chartOption && myChart.setOption(chartOption)
   window.addEventListener('resize', () => {