isv-robot 2 éve
szülő
commit
08aadaa840

+ 1 - 1
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;

+ 2 - 2
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;

+ 8 - 8
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;

+ 4 - 4
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
           },

+ 2 - 2
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 + '    '
             }

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

@@ -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: {
@@ -315,8 +315,8 @@ export default {
                   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: {

+ 10 - 9
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;
     }
   }
 }

+ 3 - 2
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 ;