Moss 1 рік тому
батько
коміт
bdfeb5a852

+ 1 - 1
src/components/head.vue

@@ -128,7 +128,7 @@ export default {
   .aszhongjian {
     font-family: Source Han Sans CN;
     font-weight: 500;
-    font-size: 36px;
+    font-size: 30px;
     color: #FFFFFF;
     line-height: 35px;
     background: linear-gradient(0deg, #FFFFFF 0%, #B0D7FF 100%);

+ 43 - 28
src/views/bigViews/dataView1/components/mapdata.vue

@@ -44,7 +44,7 @@
           </div>
           <div v-if="list_.length" class="pingtaixianshisheng" style="width: 100%;height: auto;min-height: 100px;">
             <div class="shengbiaoti"
-              style="font-size: 16px;border-bottom: 1px solid #50C9FD; line-height: 38px; margin-bottom: 8px;display: flex;justify-content: space-between;align-items: center;box-sizing: border-box;position: relative;padding-right: 30px;">
+              style="font-size: 14px;border-bottom: 1px solid #50C9FD; line-height: 38px; margin-bottom: 8px;display: flex;justify-content: space-between;align-items: center;box-sizing: border-box;position: relative;padding-right: 30px;">
               <!-- <span>{{ isSelectBool }}</span> -->
               <span>{{ userInfo && userInfo.city }}</span>
               <span>总已完工 {{ cityInfo.num }}单/台 总未完工 <span>{{ cityInfo.numWwg }}</span>单/台</span>
@@ -55,59 +55,64 @@
               <table style="width:100%;">
                 <thead style="width:100%;">
                   <tr>
-                    <th style="color: #50C9FD;font-size:14px;width: 17.5%;text-align: left;">
+                    <th style="color: #50C9FD;font-size:12px;width: 17.5%;text-align: left;">
                       <div align="left">街道</div>
                     </th>
-                    <th style="color: #50C9FD;font-size:14px;width: 16.5%;text-align: left;">
-                      <div align="left">安装完工/未完工</div>
+                    <th style="color: #50C9FD;font-size:12px;width: 16.5%;text-align: left;">
+                      <div align="left">安装完工/未完工(台)</div>
                     </th>
-                    <th style="color: #50C9FD;font-size:14px;width: 16.5%;text-align: left;">
-                      <div align="left">维修完工/未完工</div>
+                    <th style="color: #50C9FD;font-size:12px;width: 16.5%;text-align: left;">
+                      <div align="left">维修完工/未完工(台)</div>
                     </th>
-                    <th style="color: #50C9FD;font-size:14px;width: 16.5%;text-align: left;">
-                      <div align="left">清洗完工/未完工</div>
+                    <th style="color: #50C9FD;font-size:12px;width: 16.5%;text-align: left;">
+                      <div align="left">清洗完工/未完工(台)</div>
                     </th>
-                    <th style="color: #50C9FD;font-size:14px;width: 16.5%;text-align: left;">
-                      <div align="left">增值完工/未完工</div>
+                    <th style="color: #50C9FD;font-size:12px;width: 16.5%;text-align: left;">
+                      <div align="left">增值完工/未完工(台)</div>
                     </th>
-                    <th style="color: #50C9FD;font-size:14px;width: 16.5%;text-align: left;">
-                      <div align="left">维保完工/未完工</div>
+                    <th style="color: #50C9FD;font-size:12px;width: 16.5%;text-align: left;">
+                      <div align="left">维保完工/未完工(台)</div>
                     </th>
                   </tr>
                 </thead>
                 <tbody>
                   <tr v-for="(item, index) in list_" :key="index">
                     <td>
-                      <div class="bkiuybhlinjm" style="font-size: 14px;">{{ item.streetName }}</div>
+                      <div class="bkiuybhlinjm left" style="font-size: 14px;">{{ item.streetName }}</div>
                     </td>
                     <td>
                       <div class="bkiuybhlinjm">
-                        <span style="font-size: 14px;">{{ item.azgd }}台</span>
-                        <span style="font-size: 14px;"><span style="color:#50C9FD">{{ item.azgdwwg }}</span>台</span>
+                        <span style="font-size: 14px;">{{ item.azgd }}</span>
+                        <span style="padding: 0 2px;">/</span>
+                        <span style="font-size: 14px;"><span style="color:#50C9FD">{{ item.azgdwwg }}</span></span>
                       </div>
                     </td>
                     <td>
                       <div class="bkiuybhlinjm">
-                        <span style="font-size: 14px;">{{ item.wxgd }}台</span>
-                        <span style="font-size: 14px;"><span style="color:#50C9FD">{{ item.wxgdwwg }}</span>台</span>
+                        <span style="font-size: 14px;">{{ item.wxgd }}</span>
+                        <span style="padding: 0 2px;">/</span>
+                        <span style="font-size: 14px;"><span style="color:#50C9FD">{{ item.wxgdwwg }}</span></span>
                       </div>
                     </td>
                     <td>
                       <div class="bkiuybhlinjm">
-                        <span style="font-size: 14px;">{{ item.qxgd }}台</span>
-                        <span style="font-size: 14px;"><span style="color:#50C9FD">{{ item.qxgdwwg }}</span>台</span>
+                        <span style="font-size: 14px;">{{ item.qxgd }}</span>
+                        <span style="padding: 0 2px;">/</span>
+                        <span style="font-size: 14px;"><span style="color:#50C9FD">{{ item.qxgdwwg }}</span></span>
                       </div>
                     </td>
                     <td>
                       <div class="bkiuybhlinjm">
-                        <span style="font-size: 14px;">{{ item.zzgd }}台</span>
-                        <span style="font-size: 14px;"><span style="color:#50C9FD">{{ item.zzgdwwg }}</span>台</span>
+                        <span style="font-size: 14px;">{{ item.zzgd }}</span>
+                        <span style="padding: 0 2px;">/</span>
+                        <span style="font-size: 14px;"><span style="color:#50C9FD">{{ item.zzgdwwg }}</span></span>
                       </div>
                     </td>
                     <td>
                       <div class="bkiuybhlinjm">
-                        <span style="font-size: 14px;">{{ item.wbgd }}台</span>
-                        <span style="font-size: 14px;"><span style="color:#50C9FD">{{ item.wbgdwwg }}</span>台</span>
+                        <span style="font-size: 14px;">{{ item.wbgd }}</span>
+                        <span style="padding: 0 2px;">/</span>
+                        <span style="font-size: 14px;"><span style="color:#50C9FD">{{ item.wbgdwwg }}</span></span>
                       </div>
                     </td>
                   </tr>
@@ -290,6 +295,7 @@ export default {
                 borderColor: cityColors[city],
               },
               emphasis: {
+                label: { show: true, color: "#ffffff", },
                 areaColor: 'none',
                 borderColor: 1
               }
@@ -328,9 +334,10 @@ export default {
               shadowBlur: 10,
             },
             emphasis: {
+              label: { show: true, color: "#ffffff", },
               areaColor: 'none',
-              borderWidth: 1
-            },
+              borderColor: 1
+            }
           },
           select: {
             // 地图选中区域样式
@@ -378,7 +385,12 @@ export default {
             map: 'china',
             ...mapcon,
             geoIndex: 0,
-            data: seriesData
+            data: seriesData,
+            emphasis: {
+              label: { show: true, color: "#ffffff", },
+              areaColor: 'none',
+              borderColor: 1
+            }
           }]
         };
         // 使用配置项生成图表
@@ -574,10 +586,13 @@ export default {
   padding: 8px 0;
   color: #fff;
   box-sizing: border-box;
-  padding-right: 8px;
+  padding-right: 30px;
   width: 100%;
   display: flex;
   flex-direction: row;
-  justify-content: space-between;
+  justify-content: center;
+  &.left {
+    justify-content: flex-start;
+  }
 }
 </style>

+ 4 - 3
src/views/bigViews/dataView1/components/orderAmountTrend.vue

@@ -112,15 +112,16 @@ export default {
             }
           },
           splitLine: {
-            show: true,
+            show: false,
             lineStyle: {
-              color: '#364D95', // x轴辅助线颜色
+              color: 'rgba(256, 256, 256, 0.1)', // x轴辅助线颜色
             }
           },
           data: this.getDate()
         },
         yAxis: {
           type: 'value',
+          minInterval: 1,
           name: "(元)",
           nameTextStyle: {
             color: "#aaa",
@@ -138,7 +139,7 @@ export default {
           splitLine: {
             show: true,
             lineStyle: {
-              color: '#364D95', // y轴辅助线颜色
+              color: 'rgba(256, 256, 256, 0.1)', // y轴辅助线颜色
             }
           }
         },

+ 2 - 1
src/views/bigViews/dataView1/components/orderTrend.vue

@@ -126,6 +126,7 @@ export default {
         yAxis: [
           {
             type: 'value',
+            minInterval: 1,
             name: '(单/台)',
             nameTextStyle: {
               color: "#aaa",
@@ -146,7 +147,7 @@ export default {
             },
             splitLine: {
               lineStyle: {
-                color: '#364D95',
+                color: 'rgba(256, 256, 256, 0.1)',
               },
             },
             axisTick: {

+ 1 - 1
src/views/bigViews/dataView1/components/trendChart.vue

@@ -166,7 +166,7 @@ export default {
             },
             splitLine: {
               lineStyle: {
-                color: '#364D95',
+                color: 'rgba(256, 256, 256, 0.1)',
               },
             },
             axisTick: {

+ 13 - 3
src/views/bigViews/dataView1/components/workOrderTrend.vue

@@ -165,15 +165,16 @@ export default {
             }
           },
           splitLine: {
-            show: true,
+            show: false,
             lineStyle: {
-              color: '#364D95', // x轴辅助线颜色
+              color: 'rgba(256, 256, 256, 0.1)', // x轴辅助线颜色
             }
           },
           data: this.getDate()
         },
         yAxis: {
           type: 'value',
+          minInterval: 1,
           name: "(单/台)",
           nameTextStyle: {
             color: "#aaa",
@@ -182,6 +183,15 @@ export default {
           },
           axisLabel: {
             fontSize: csize(12),
+            // 使用 formatter 函数格式化刻度标签
+            // formatter: function(value) {
+            //   // 判断是否为整数
+            //   if (value % 1 === 0) {
+            //     return value; // 如果是整数,则直接返回
+            //   } else {
+            //     return ''; // 如果不是整数,返回空字符串,即不显示
+            //   }
+            // }
           },
           axisLine: {
             lineStyle: {
@@ -191,7 +201,7 @@ export default {
           splitLine: {
             show: true,
             lineStyle: {
-              color: '#364D95', // y轴辅助线颜色
+              color: 'rgba(256, 256, 256, 0.1)', // y轴辅助线颜色
             }
           }
         },