Merge remote-tracking branch 'origin/dashboard-screen' into dashboard-screen

src/main.js

@@ -53,6 +53,7 @@ Vue.component('VChart', ECharts)
 Vue.use(Antd)
 Vue.use(JDictSelectTag)
 Vue.use(JMultiSelectTag)
+Vue.mixin(datePickerZhMixin)
 /**
  * If you don't want to use mock-server
  * you want to use MockJs for mock api
@@ -99,6 +100,7 @@ Object.keys(filters).forEach(key => {
 Vue.config.productionTip = false
 
 import * as globalFunction from './utils/globalFunction.js'
+import {datePickerZhMixin} from "@/mixin/datePickerZh";
 
 Vue.use(globalFunction.EchartfontSize)
 new Vue({

src/mixin/datePickerZh.js

@@ -0,0 +1,11 @@
+import moment from 'moment'
+import locale from 'ant-design-vue/es/date-picker/locale/zh_CN'
+
+moment.locale('zh-cn')
+export const datePickerZhMixin = {
+  data() {
+    return {
+      locale
+    }
+  }
+}

src/views/dashboard-screen/chard-wrap/card-wrap.vue

@@ -39,7 +39,7 @@ export default {
     background-repeat: no-repeat;
     background-size: auto 2vw;
     background-position: left bottom;
-    font-size: 1vw;
+    font-size: 1.2vw;
     color: white;
     padding-left: 2vw;
     text-overflow: ellipsis;

src/views/dashboard-screen/chard-wrap/card-wrap2.vue

@@ -39,11 +39,11 @@ export default {
     flex-direction: column;
     align-items: center;
     justify-content: space-around;
-    font-size: 0.8vw;
+    font-size: 0.7vw;
     font-weight: 500;
     width: 100%;
     height: 100%;
-    color: white;
+    color: rgba(255, 255, 255, 0.75);
 
     &.o-left {
       grid-row-start: 1;

src/views/dashboard-screen/dlsdxl/index.vue

@@ -162,7 +162,7 @@ export default {
                 },
               }
             },
-            barWidth: this.EchartfontSize(10),
+            barWidth: this.EchartfontSize(8),
             itemStyle: {
               color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{offset: 0, color: '#205047'}, {
                 offset: 1,
@@ -202,10 +202,10 @@ export default {
               normal: {
                 show: true,
                 textStyle: {
-                  color: '#ffffff',
-                  fontSize: this.EchartfontSize(14)
+                  color: 'rgba(255,255,255,0.77)',
+                  fontSize: this.EchartfontSize(12)
                 },
-                position: [0, -this.EchartfontSize(18)],
+                position: [0, -this.EchartfontSize(16)],
                 formatter: (a, b) => {
                   return labelList[a.dataIndex]
                 }
@@ -251,7 +251,7 @@ $xHeight: 120px;
       justify-content: center;
 
       font-weight: 600;
-      color: white;
+      color: rgba(255,255,255,0.8);
 
       .label {
         height: 20px;
@@ -259,14 +259,14 @@ $xHeight: 120px;
         width: 100%;
         text-align: center;
         margin-bottom: -10px;
-        font-size: 16px;
+        font-size: 14px;
         mso-font-width: 400;
       }
 
       .cr-1, .cr-3 {
         font: 400 1.2vw hxb;
         flex-grow: 1;
-        font-size: 1.2vw;
+        font-size: 1.0vw;
         width: 100%;
         background-image: url("/static/images/shoudian_circular_1@2x.png");
         background-repeat: no-repeat;
@@ -280,7 +280,7 @@ $xHeight: 120px;
       .cr-2, .cr-4 {
         font: 400 1.2vw hxb;
         flex-grow: 1;
-        font-size: 1.2vw;
+        font-size: 1.0vw;
         width: 100%;
         background-image: url("/static/images/shoudian_circular_2@2x.png");
         background-repeat: no-repeat;

src/views/dashboard-screen/dlydtssx/index.vue

@@ -203,8 +203,8 @@ export default {
 
           },
           textStyle: {
-            fontSize: this.EchartfontSize(12),
-            color: '#ffffff'
+            fontSize: this.EchartfontSize(10),
+            color: 'rgba(255,255,255,0.8)',
           }
         },
         tooltip: {
@@ -236,8 +236,8 @@ export default {
             inside: true,
 
             textStyle: {
-              color: '#fff',
-              fontSize: this.EchartfontSize(16)
+              color: 'rgba(255,255,255,0.8)',
+              fontSize: this.EchartfontSize(12)
             },
             show: true
           },

src/views/dashboard-screen/index.vue

@@ -6,7 +6,7 @@
       </div>
       <div class="r-title">
         <span @click="$refs.datePicker.open = true" style="cursor: pointer"> {{ dateTitle }}</span>
-        <a-date-picker
+        <a-date-picker :showToday="true" :locale="locale"
           @click="$refs.datePicker.open = false"
           style="position: absolute;right:20px;top:10px;z-index: -1"
           ref="datePicker"
@@ -132,13 +132,14 @@ import ScreenSyjhbydxqk from '@/views/dashboard-screen/screen/ScreenSyjhbydxqk.v
 import ScreenDlts from '@/views/dashboard-screen/screen/screenDlts/screenDlts.vue'
 import ScreenSbxjdxqk from '@/views/dashboard-screen/screen/screenSbxjdxqk/screenSbxjdxqk.vue'
 import ScreenSjdr from '@/views/dashboard-screen/screen/sjdr/index.vue'
-
+// import 'moment/dist/locale/zh-cn'
+// import 'dayjs/locale/zh-cn'
 import * as _ from 'lodash'
 
 require('dayjs/locale/zh-cn')
 export default {
   name: 'Dashboard',
-  components: { ChartMap, Jryl, QbDlsbxjdx, Jxdxqk, Zydbsx, Dlbpds, Dlsdxl, CardWrap, SyjhdxqkChart, Dlydtssx },
+  components: {ChartMap, Jryl, QbDlsbxjdx, Jxdxqk, Zydbsx, Dlbpds, Dlsdxl, CardWrap, SyjhdxqkChart, Dlydtssx},
   data() {
     return {
       render: true,

src/views/dashboard-screen/jryl/index.vue

@@ -234,8 +234,8 @@ export default {
             show: false
           },
           axisLabel: {
-            fontSize: this.EchartfontSize(16),
-            color: '#ffffff',
+            fontSize: this.EchartfontSize(12),
+            color: 'rgba(255,255,255,0.8)',
             formatter: (name) => {
               return name + '    '
             }

src/views/dashboard-screen/jxdxqk/index.vue

@@ -357,16 +357,16 @@ export default {
         name: '完成',
         value: this.arrMap[0],
         itemStyle: {
-          opacity: 0.5,
-          color: 'rgba(33,229,248,0.8)'
+          opacity: 0.8,
+          color: 'rgba(33,229,248,1)'
         }
 
       }, {
         name: '剩余',
         value: this.arrMap[1],
         itemStyle: {
-          opacity: 0.5,
-          color: 'rgba(217,187,62,0.8)'
+          opacity: 0.8,
+          color: 'rgba(217,187,62,1)'
         }
       }
 
@@ -381,8 +381,8 @@ export default {
           type: 'pie',
           hoverAnimation: false, // 悬停不放大
           labelLine: {
-            length: this.EchartfontSize(20),
-            length2: this.EchartfontSize(60),
+            length: this.EchartfontSize(35),
+            length2: this.EchartfontSize(40),
             lineStyle: {
               width: this.EchartfontSize(2)
             }
@@ -400,11 +400,11 @@ export default {
             rich: {
               a: {
                 color: '#ffffff',
-                fontSize: this.EchartfontSize(14)
+                fontSize: this.EchartfontSize(18)
               },
               b: {
                 color: 'rgba(33,229,248)',
-                fontSize: this.EchartfontSize(14),
+                fontSize: this.EchartfontSize(18),
                 verticalAlign: 'top',
                 align: 'center'
 
@@ -447,14 +447,14 @@ export default {
 
   .bg {
     position: absolute;
-    z-index: 1;
+    z-index: -1;
     bottom: -16%;
     width: 100%;
     height: 100%;
     background-repeat: no-repeat;
     background-image: url(/static/images/chart_opacity_bg.png);
-    background-size: 22vh 15vh;
-    background-position: center 28%;
+    background-size: 22vh 84%;
+    background-position: center -10%;
   }
 }
 </style>

src/views/dashboard-screen/qb-dlsbxjdx/index.vue

@@ -43,7 +43,7 @@ export default {
           const keyMap = {
             [res?.info.series[0].name]: res.info.series[0].data[index],
             [res?.info.series[1].name]: res.info.series[1].data[index],
-            per: (res.info.series[1].data[index] * 100 / res.info.series[0].data[index]).toFixed(0)
+            per: res.info.series[0].data[index] <= 0 ? 0 : (res.info.series[1].data[index] * 100 / res.info.series[0].data[index]).toFixed(0)
           }
 
           this.arrMap[key] = keyMap
@@ -52,8 +52,8 @@ export default {
       window['max'] = maxs.reverse()
       window['values'] = values.reverse()
 
-      const cubeW = 6;
-      const cubeH = 12;
+      const cubeW = 6
+      const cubeH = 12
       const CubeLeft = echarts.graphic.extendShape({
         shape: {
           x: 0,
@@ -110,7 +110,7 @@ export default {
           bottom: -50,
           top: 20,
           width: '100%',
-          height: '100%',
+          height: '96%',
           containLabel: true
         },
         yAxis: {
@@ -139,7 +139,7 @@ export default {
         },
         xAxis: {
           type: 'value',
-          show: false,
+          show: true,
           axisLine: {
             show: false,
             lineStyle: {
@@ -295,8 +295,8 @@ export default {
                 formatter: (e) => {
                   return e.name
                 },
-                fontSize: this.EchartfontSize(14),
-                color: '#fff'
+                fontSize: this.EchartfontSize(12),
+                color: 'rgba(255,255,255,0.65)'
               }
             },
             itemStyle: {
@@ -310,13 +310,14 @@ export default {
 
               normal: {
                 show: true,
-                position: ['80%', '-125%'],
+                offset: [this.EchartfontSize(80), 0],
+                position: ['50%', '-120%'],
                 formatter: (e) => {
                   const ret = `${values[e.dataIndex]}/${maxs[e.dataIndex]}`
                   return ret
                 },
-                fontSize: this.EchartfontSize(14),
-                color: '#fff'
+                fontSize: this.EchartfontSize(13),
+                color: 'rgba(255,255,255,0.64)'
               }
             },
             itemStyle: {

src/views/dashboard-screen/screen/screenJxdxqk.vue

@@ -109,7 +109,8 @@ export default {
       }
 
       .bg {
-        background-size: 100% 75% !important;
+        background-size: 92% 80% !important;
+        background-position: center 0%;
       }
     }
   }

src/views/dashboard-screen/screen/screen_Bd_Dl_Ycxx/bd.vue

@@ -76,7 +76,7 @@ export default {
       // 表头
       columns: columns(this),
       url: {
-        list: '/show/bdyc/list',
+        list: '/show/bdyc/remainList',
         delete: '/business/catenary/bus/jcb/fdfxjyq/',
         tree: '/system/dept/treeSelect',
         exportXlsUrl: '/business/catenary/bus/jcb/fdfxjyq/export'

src/views/dashboard-screen/screen/screen_Bd_Dl_Ycxx/dl.vue

@@ -76,7 +76,7 @@ export default {
       // 表头
       columns: columns(this),
       url: {
-        list: '/show/dlyc/list',
+        list: '/show/dlyc/remainList',
         delete: '/business/catenary/bus/jcb/fdfxjyq/',
         tree: '/system/dept/treeSelect',
         exportXlsUrl: '/business/catenary/bus/jcb/fdfxjyq/export'

src/views/dashboard-screen/screen/sjdr/syjhdxqk/tab1.vue

@@ -26,17 +26,17 @@
           />
         </a-form-item>
         <a-form-item>
-          <a-date-picker valueFormat="YYYY-MM-DD" v-model="queryParam.testPlanDateStart" placeholder="计划时间（起始）"/>
+          <a-date-picker :showToday="true" :locale="locale"   valueFormat="YYYY-MM-DD" v-model="queryParam.testPlanDateStart" placeholder="计划时间（起始）"/>
         </a-form-item>
         <a-form-item>
-          <a-date-picker valueFormat="YYYY-MM-DD" v-model="queryParam.testPlanDateEnd" placeholder="计划时间（结束）"/>
+          <a-date-picker :showToday="true" :locale="locale"   valueFormat="YYYY-MM-DD" v-model="queryParam.testPlanDateEnd" placeholder="计划时间（结束）"/>
         </a-form-item>
 
         <a-form-item>
-          <a-date-picker valueFormat="YYYY-MM-DD" v-model="queryParam.completionDateStart" placeholder="实际时间（起始）"/>
+          <a-date-picker :showToday="true" :locale="locale"   valueFormat="YYYY-MM-DD" v-model="queryParam.completionDateStart" placeholder="实际时间（起始）"/>
         </a-form-item>
         <a-form-item>
-          <a-date-picker valueFormat="YYYY-MM-DD" v-model="queryParam.completionDateEnd" placeholder="实际时间（结束）"/>
+          <a-date-picker :showToday="true" :locale="locale"   valueFormat="YYYY-MM-DD" v-model="queryParam.completionDateEnd" placeholder="实际时间（结束）"/>
         </a-form-item>
 
         <a-form-item>

src/views/dashboard-screen/screen/sjdr/syjhdxqk/tab2.vue

@@ -40,17 +40,17 @@
           />
         </a-form-item>
         <a-form-item>
-          <a-date-picker valueFormat="YYYY-MM-DD" v-model="queryParam.testPlanDateStart" placeholder="计划时间（起始）"/>
+          <a-date-picker :showToday="true" :locale="locale"   valueFormat="YYYY-MM-DD" v-model="queryParam.testPlanDateStart" placeholder="计划时间（起始）"/>
         </a-form-item>
         <a-form-item>
-          <a-date-picker valueFormat="YYYY-MM-DD" v-model="queryParam.testPlanDateEnd" placeholder="计划时间（结束）"/>
+          <a-date-picker :showToday="true" :locale="locale"   valueFormat="YYYY-MM-DD" v-model="queryParam.testPlanDateEnd" placeholder="计划时间（结束）"/>
         </a-form-item>
 
         <a-form-item>
-          <a-date-picker valueFormat="YYYY-MM-DD" v-model="queryParam.completionDateStart" placeholder="实际时间（起始）"/>
+          <a-date-picker :showToday="true" :locale="locale"   valueFormat="YYYY-MM-DD" v-model="queryParam.completionDateStart" placeholder="实际时间（起始）"/>
         </a-form-item>
         <a-form-item>
-          <a-date-picker valueFormat="YYYY-MM-DD" v-model="queryParam.completionDateEnd" placeholder="实际时间（结束）"/>
+          <a-date-picker :showToday="true" :locale="locale"   valueFormat="YYYY-MM-DD" v-model="queryParam.completionDateEnd" placeholder="实际时间（结束）"/>
         </a-form-item>
 
         <a-form-item>

src/views/dashboard-screen/syjhdxqk/index.vue

@@ -66,7 +66,7 @@ export default {
         })
         this.arrMap = arrMap
       }
-      const baseWidth = this.EchartfontSize(16)
+      const baseWidth = this.EchartfontSize(14)
       const offsetWidth = this.EchartfontSize(14)
       const triangleHeight = 8
       this.option = {
@@ -83,8 +83,8 @@ export default {
           data: ['第一季度', '第二季度', '第三季度', '第四季度'],
           type: 'category',
           axisLabel: {
-            color: '#ffffff',
-            fontSize: this.EchartfontSize(14),
+            color: 'rgba(255,255,255,0.8)',
+            fontSize: this.EchartfontSize(12),
             formatter: (name) => {
               return `\n` + name
             }
@@ -222,9 +222,9 @@ export default {
             label: {
               show: true,
               distance: 10,
-              color: '#fff',
-              fontSize: this.EchartfontSize(12),
-              position: [-baseWidth - offsetWidth / this.EchartfontSize(10), -this.EchartfontSize(36)],
+              color: 'rgba(255,255,255,0.76)',
+              fontSize: this.EchartfontSize(10),
+              position: [-baseWidth - offsetWidth  / this.EchartfontSize(10), -this.EchartfontSize(30)],
               formatter: (evt) => {
                 const item = this.arrMap['开关分合计划']?.[evt.dataIndex] || {}
                 return `${item.value}\n /\n${item.total}`
@@ -360,9 +360,9 @@ export default {
             label: {
               show: true,
               distance: 10,
-              color: '#fff',
-              fontSize: this.EchartfontSize(12),
-              position: [baseWidth - offsetWidth / this.EchartfontSize(2), -this.EchartfontSize(36)],
+              color: 'rgba(255,255,255,0.76)',
+              fontSize: this.EchartfontSize(10),
+              position: [baseWidth + 4 - offsetWidth / this.EchartfontSize(2), -this.EchartfontSize(30)],
               formatter: (evt) => {
                 const item = this.arrMap['单体计划']?.[evt.dataIndex] || {}
                 return `${item.value}\n /\n${item.total}`
@@ -422,6 +422,7 @@ $xHeight: 120px;
       height: 20px;
       width: auto;
       object-fit: cover;
+      opacity: 0.7;
     }
   }
 }

src/views/dashboard-screen/zydbsx/index.vue

@@ -79,18 +79,19 @@ export default {
 .common-wrap {
   width: 100%;
   height: 100%;
-  color: white;
+  color: rgba(255, 255, 255, 0.78);
   display: flex;
   flex-direction: column;
   align-items: center;
   justify-content: space-around;
+  padding: 8px 0.6vw;
   /*控制整个滚动条*/
 
   .row-item {
     flex: 1;
     width: 100%;
 
-    font-size: 0.8vw;
+    font-size: 0.7vw;
     padding: 8px 28px;
     display: flex;
     flex-direction: column ;