فهرست منبع

feat: 数据大屏字号颜色调整

Moss 1 سال پیش
والد
کامیت
25d3522196

+ 2 - 2
src/views/bigViews/dataView1/components/accessoryStatistics.vue

@@ -78,13 +78,13 @@
 		width: 25%;
 		height: 50%;
 		.title {
-			font-size: 14px;
+			font-size: 12px;
 			color: #ffffff;
 			margin-bottom: 8px;
 		}
 		.num {
 			color: #33a8c9;
-			font-size: 18px;
+			font-size: 14px;
 			font-weight: bold;
 		}
 	}

+ 14 - 7
src/views/bigViews/dataView1/components/orderAmountTrend.vue

@@ -10,6 +10,7 @@
 import * as echarts from 'echarts';
 import moduleEnclosure from '@/components/moduleEnclosure.vue';
 import { getOrderTrend } from '@/api/bigView.js';
+import { csize } from '@/utils/const.js';
 
 export default {
   components: {
@@ -78,15 +79,15 @@ export default {
           icon: 'circle',
           data: ['新增销售金额', '新增辅材金额', '新增配件金额', '新增增值金额'],
           textStyle: {
-            color: '#ffffff'
+            color: '#A9BBCC'
           },
           right: 0,
         },
         grid: {
-          left: '3%',
-          right: '4%',
-          bottom: '3%',
-          containLabel: true
+          x: csize(40),
+          y: csize(40),
+          x2: csize(20),
+          y2: csize(20),
         },
         toolbox: {
           // feature: {
@@ -96,9 +97,12 @@ export default {
         xAxis: {
           type: 'category',
           boundaryGap: false,
+          axisLabel: {
+            fontSize: csize(12),
+          },
           axisLine: {
             lineStyle: {
-              color: '#ffffff', // x轴文字颜色
+              color: '#8AB1DC', // x轴文字颜色
             }
           },
           splitLine: {
@@ -117,9 +121,12 @@ export default {
             nameLocation: "start",
             align: 'right'
           },
+          axisLabel: {
+            fontSize: csize(12),
+          },
           axisLine: {
             lineStyle: {
-              color: '#ffffff', // y轴文字颜色
+              color: '#8AB1DC', // y轴文字颜色
             }
           },
           splitLine: {

+ 7 - 0
src/views/bigViews/dataView1/components/orderStatistics.vue

@@ -76,12 +76,19 @@
   justify-content: space-between;
   .row {
     display: flex;
+    align-items: center;
     &.th {
       font-weight: bold;
       color: #26A3CE;
     }
     &.td {
       color: #ffffff;
+			div:last-child {
+				color: #e4f824;
+			}
+      div:nth-child(1) {
+        font-size: 12px;
+      }
     }
     div {
       flex: 1;

+ 6 - 5
src/views/bigViews/dataView1/components/orderTrend.vue

@@ -91,14 +91,14 @@ export default {
           right: '10',
           data: ['新增销售单', '新增辅材单', '新增配件单', '新增增值单'],
           textStyle: {
-            color: '#ffffff',
+            color: '#A9BBCC',
           },
         },
         grid: {
-          left: '3%',
-          right: '4%',
-          bottom: '3%',
-          containLabel: true
+          x: csize(50),
+          y: csize(50),
+          x2: csize(20),
+          y2: csize(20),
         },
         xAxis: [
           {
@@ -108,6 +108,7 @@ export default {
               interval: Math.floor(times.length / 10),
               showMinLabel: true, //是否显示最小 tick 的 label
               showMaxLabel: true, //是否显示最大 tick 的 label
+              fontSize: csize(12),
             },
             axisLine: {
               show: false,

+ 4 - 0
src/views/bigViews/dataView1/components/workOrderStatistics.vue

@@ -84,6 +84,7 @@
   justify-content: space-between;
   .row {
     display: flex;
+    align-items: center;
     &.th {
       font-weight: bold;
       color: #26A3CE;
@@ -93,6 +94,9 @@
 			div:last-child {
 				color: #e4f824;
 			}
+      div:nth-child(1) {
+        font-size: 12px;
+      }
     }
     div {
       flex: 1;

+ 22 - 9
src/views/bigViews/dataView1/components/workOrderTrend.vue

@@ -17,6 +17,7 @@ import vScrollView from 'v-scroll-view'
 import moduleEnclosure from '@/components/moduleEnclosure.vue';
 import * as echarts from 'echarts';
 import { getWorkorderTrend } from '@/api/bigView.js';
+import { csize } from '@/utils/const.js';
 
 export default {
   components: {
@@ -99,27 +100,36 @@ export default {
           icon: 'circle',
           data: ['已完工', '未完工'],
           textStyle: {
-            color: '#ffffff'
+            color: '#A9BBCC'
           },
           right: 0,
         },
-        grid: {
-          left: '3%',
-          right: '4%',
-          bottom: '3%',
-          containLabel: true
-        },
+        // grid: {
+        //   left: '3%',
+        //   right: '4%',
+        //   bottom: '3%',
+        //   containLabel: true
+        // },
         toolbox: {
           // feature: {
           //   saveAsImage: {}
           // }
         },
+        grid: {
+          x: csize(40),
+          y: csize(40),
+          x2: csize(20),
+          y2: csize(20),
+        },
         xAxis: {
           type: 'category',
           boundaryGap: false,
+          axisLabel: {
+            fontSize: csize(12),
+          },
           axisLine: {
             lineStyle: {
-              color: '#ffffff', // x轴文字颜色
+              color: '#8AB1DC', // x轴文字颜色
             }
           },
           splitLine: {
@@ -138,9 +148,12 @@ export default {
             nameLocation: "start",
             // align: 'right'
           },
+          axisLabel: {
+            fontSize: csize(12),
+          },
           axisLine: {
             lineStyle: {
-              color: '#ffffff', // y轴文字颜色
+              color: '#8AB1DC', // y轴文字颜色
             }
           },
           splitLine: {

+ 2 - 9
src/views/mallManagement/order/order_list/index.vue

@@ -1663,13 +1663,10 @@ export default {
 						html += `
               <tr align="center">
               <td>${item.goodsName || ''}</td>
-              <td>${item.goodsSpecName || ''}</td>
               <td>${item.goodsMaterialUnit ? unitMap[item.goodsMaterialUnit] : ''}</td>
               <td>${item.num}</td>
               <td>${item.price}</td>
               <td>${item.payAmount}</td>
-              <td>${data.storageName || ''}</td>
-              <td>${data.remark || ''}</td>
               </tr>
             `
 					})
@@ -1762,23 +1759,19 @@ export default {
 	          word-wrap: break-word;
 	          word-break: break-all;">
 				<tr align="center">
-					<td width="300">商品名称</td>
-					<td width="100">规格</td>
+					<td width="400">商品名称</td>
 					<td>单位</td>
 					<td>数量</td>
 					<td>单价</td>
 					<td>金额</td>
-					<td>仓库</td>
-					<td>备注</td>
 				</tr>
 	            ${html}
 				<tr align="center" align="center">
 				  <td>小计: </td>
-				  <td colspan="2"></td>
+				  <td colspan="1"></td>
 				  <td>${num}</td>
 				  <td></td>
 				  <td>${totalAmount}</td>
-				  <td colspan="2">金额总计: ${totalAmount}</td>
 				</tr>
 	        </table>
 	      </div>