zhangys36 %!s(int64=2) %!d(string=hai) anos
pai
achega
a1d7c6d3b7

+ 1 - 1
src/layout/components/Sidebar/Logo.vue

@@ -25,7 +25,7 @@ export default {
   },
   data() {
     return {
-      title: '变电配电大数据可视化系统',
+      title: '系统',
       logo: logo
     }
   }

+ 1 - 1
src/permission.js

@@ -60,7 +60,7 @@ router.beforeEach(async(to, from, next) => {
       next()
     } else {
       // other pages that do not have permission to access are redirected to the login page.
-      next(`/login?redirect=${to.path}`)
+      next(`/dashboard-screen?redirect=${to.path}`)
       NProgress.done()
     }
   }

+ 1 - 1
src/settings.js

@@ -1,5 +1,5 @@
 module.exports = {
-  title: '变电配电大数据可视化系统',
+  title: '系统',
 
   /**
    * @type {boolean} true | false

+ 1 - 1
src/utils/get-page-title.js

@@ -1,6 +1,6 @@
 import defaultSettings from '@/settings'
 
-const title = defaultSettings.title || '变电配电大数据可视化系统'
+const title = defaultSettings.title || '系统'
 
 export default function getPageTitle(pageTitle) {
   if (pageTitle) {

+ 5 - 2
src/views/dashboard-screen/chard-wrap/card-wrap.vue

@@ -39,15 +39,18 @@ export default {
     background-repeat: no-repeat;
     background-size: auto 34px;
     background-position: left bottom;
-    font-size: 26px;
+    font-size: 24px;
     color: white;
     padding-left: 15%;
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;
+    display: flex;
+    align-items: center;
+    justify-content: center;
 
     & > .h-c-wrap {
-      vertical-align: top;
+      line-height: 1;
     }
   }
 

+ 1 - 1
src/views/dashboard-screen/index.vue

@@ -8,7 +8,7 @@
         </div>
         <div class="o-item">
           <CardWrap>
-            <span slot="title">试验计划兑现情况</span>
+<!--            <span slot="title">试验计划兑现情况</span>-->
             <div slot="content">
               <SyjhdxqkChart />
             </div>

+ 104 - 96
src/views/dashboard-screen/syjhdxqk/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="chart-wrap">
-    <v-chart autoresize :option="option"/>
+    <v-chart autoresize :option="option" />
   </div>
 </template>
 
@@ -48,32 +48,40 @@ export default {
           bottom: 10,
           top: 40
         },
-        xAxis: {
-          axisLabel: {
-            color: '#c0c3cd',
-            fontSize: 14,
-            interval: 0
-          },
-          axisTick: {
-            lineStyle: {
-              color: '#384267'
+        xAxis: [
+          {
+            type: 'category',
+            axisTick: {
+              show: false
             },
-            show: true
-          },
-          splitLine: {
-            show: false
-          },
-          axisLine: {
-            lineStyle: {
-              color: '#384267',
-              width: 1,
-              type: 'dashed'
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: '#fff'
+              }
             },
-            show: true
-          },
-          data: ['第一季度', '第二季度', '第三季度', '第四季度'],
-          type: 'category'
-        },
+            data: ['第一季度', '第二季度', '第三季度', '第四季度']
+          }, {
+            type: 'category',
+            axisLine: {
+              show: false
+            },
+            axisTick: {
+              show: false
+            },
+            axisLabel: {
+              show: false
+            },
+            splitArea: {
+              show: false
+            },
+            splitLine: {
+              show: false
+            },
+            data: ['第一季度', '第二季度', '第三季度', '第四季度']
+          }
+        ],
+
         yAxis: {
           axisLabel: {
             color: '#c0c3cd',
@@ -105,86 +113,86 @@ export default {
         },
         series: [
           {
-            data: [200, 85, 112, 275,],
+            name: '开关分合',
             type: 'bar',
-            barMaxWidth: 'auto',
-            barWidth: 30,
+            xAxisIndex: 1,
+
             itemStyle: {
-              color: {
-                x: 0,
-                y: 0,
-                x2: 0,
-                y2: 1,
-                type: 'linear',
-                global: false,
-                colorStops: [
-                  {
-                    offset: 0,
-                    color: '#0b9eff'
-                  },
-                  {
-                    offset: 1,
-                    color: '#63caff'
-                  }
-                ]
+              normal: {
+                show: true,
+                color: '#277ace',
+                barBorderRadius: 50,
+                borderWidth: 0,
+                borderColor: '#333'
               }
             },
-            label: {
-              show: true,
-              position: 'top',
-              distance: 10,
-              color: '#fff'
-            }
-          },
-          {
-            data: [1, 1, 1, 1, 1, 1, 1, 1],
-            type: 'pictorialBar',
-            barMaxWidth: '20',
-            symbol: 'diamond',
-            symbolOffset: [0, '50%'],
-            symbolSize: [30, 15]
-          },
-          {
-            data: [200, 85, 112, 275],
-            type: 'pictorialBar',
-            barMaxWidth: '20',
-            symbolPosition: 'end',
-            symbol: 'diamond',
-            symbolOffset: [0, '-50%'],
-            symbolSize: [30, 12],
-            zlevel: 2
-          },
-          {
-            data: [741, 741, 741, 741],
+            barWidth: '20%',
+            data: [100, 100, 100, 100]
+          }, {
+            name: '单体',
             type: 'bar',
-            barMaxWidth: 'auto',
-            barWidth: 30,
-            barGap: '-100%',
-            zlevel: -1
-          },
-          {
-            data: [1, 1, 1, 1, 1, 1, 1, 1],
-            type: 'pictorialBar',
-            barMaxWidth: '20',
-            symbol: 'diamond',
-            symbolOffset: [0, '50%'],
-            symbolSize: [30, 15],
-            zlevel: -2
+            xAxisIndex: 1,
+
+            itemStyle: {
+              normal: {
+                show: true,
+                color: '#277ace',
+                barBorderRadius: 50,
+                borderWidth: 0,
+                borderColor: '#333'
+              }
+            },
+            barWidth: '20%',
+            barGap: '100%',
+            data: [150, 150, 150, 150]
           },
-          {
-            data: [741, 741, 741, 741],
-            type: 'pictorialBar',
-            barMaxWidth: '20',
-            symbolPosition: 'end',
-            symbol: 'diamond',
-            symbolOffset: [0, '-50%'],
-            symbolSize: [30, 12],
-            zlevel: -1
-          }
+          // {
+          //   name: '开关分合(完成)',
+          //   type: 'bar',
+          //   barMaxWidth: 'auto',
+          //   barWidth: 30,
+          //   itemStyle: {
+          //     color: {
+          //       x: 0,
+          //       y: 0,
+          //       x2: 0,
+          //       y2: 1,
+          //       type: 'linear',
+          //       global: false,
+          //       colorStops: [
+          //         {
+          //           offset: 0,
+          //           color: '#0b9eff'
+          //         },
+          //         {
+          //           offset: 1,
+          //           color: '#63caff'
+          //         }
+          //       ]
+          //     }
+          //   },
+          //   label: {
+          //     show: true,
+          //     position: 'top',
+          //     distance: 10,
+          //     color: '#fff'
+          //   }
+          // },
+          // {
+          //   name: '单体(完成)',
+          //   data: [200, 85, 112, 275],
+          //   type: 'pictorialBar',
+          //   barMaxWidth: '20',
+          //   symbolPosition: 'end',
+          //   symbol: 'diamond',
+          //   symbolOffset: [0, '-50%'],
+          //   symbolSize: [30, 12],
+          //   zlevel: 2
+          // }
         ],
         tooltip: {
           trigger: 'axis',
-          show: false
+          show: true
         }
       }
 

+ 1 - 1
src/views/dashboard/index.vue

@@ -2,7 +2,7 @@
   <el-card class="content-z ddd" style="display: flex;justify-content: center">
     <img :src="index" alt="" style="margin-top:20px;height: 65%">
     <h3 class="wl">WELCOME</h3>
-    <h3 class="title">欢迎进入变电配电大数据可视化系统</h3>
+    <h3 class="title">欢迎进入系统</h3>
   </el-card>
 </template>