Browse Source

柯赛看板调整,根据客户需求修改

xiaost 8 months ago
parent
commit
279f3df81c

+ 9 - 0
src/components/totalechart/bottom1UpChart/chart.vue

@@ -77,6 +77,9 @@ export default {
               fontWeight: "bold",
               color:"inherit",
             },
+            itemStyle: {
+              color: "#ABA5FC"
+            },
           },
           {
             name: '闲置中',
@@ -94,6 +97,9 @@ export default {
              // color:"inherit",
               color:'#fff'
             },
+            itemStyle: {
+              color: "#11ea4d"
+            },
           },
           {
             name: '故障',
@@ -107,6 +113,9 @@ export default {
               color:"inherit",
             },
             data:[],
+            itemStyle: {
+              color: "#f4cc03"
+            },
             emphasis: {
               focus: 'series'
             }

+ 3 - 0
src/components/totalechart/bottom2RChart/chart.vue

@@ -69,6 +69,9 @@ export default {
               focus: 'series'
             },
             data:[],
+            itemStyle: {
+              color: "#8CF9B8"
+            },
             label: {
               show: true,
               position: 'top',

+ 7 - 15
src/components/totalechart/up1Chart/chart.vue

@@ -114,12 +114,6 @@ export default {
           xAxis: [{
             type: 'category',
             gridIndex: 0,
-           // position: 'bottom',
-           axisLine: true,
-           axisLabel: {
-              color: 'rgba(255,255,255,.8)',
-              fontSize: 12
-            },
             data:  newData.xAxis0
           },
           {
@@ -143,20 +137,15 @@ export default {
             max:100,
             splitNumber: 3,
             min: 90,//newData.minData0,
-            axisLine: {
-              lineStyle: {
-                opacity: 0
-              }
-            },
-            splitLine: {
+           /* splitLine: {
               show: true,
               lineStyle: {
                 color: '#fff',
-                opacity: 0.1
+                opacity: 0.3
               }
-            },
+            },*/
             axisLabel: {
-              color: 'rgba(255,255,255,.8)',
+             // color: 'rgba(255,255,255,.8)',
               fontSize: 12,
               formatter: '{value}%',
             }
@@ -208,6 +197,9 @@ export default {
               xAxisIndex: 1,
               yAxisIndex: 1,
               barWidth: 20,
+              itemStyle: {
+                color: "#8CF9B8"
+              },
               label: {
                 show: true,
                 position: 'top',

+ 7 - 14
src/components/totalechart/up1dChart/chart.vue

@@ -116,11 +116,6 @@ export default {
             type: 'category',
             gridIndex: 0,
            // position: 'bottom',
-           axisLine: true,
-           axisLabel: {
-              color: 'rgba(255,255,255,.8)',
-              fontSize: 12
-            },
             data:  newData.xAxis0
           },
           {
@@ -145,20 +140,15 @@ export default {
             max:100,
             min: 90,
             //min:newData.minData0,
-            axisLine: {
-              lineStyle: {
-                opacity: 0
-              }
-            },
-            splitLine: {
+           /* splitLine: {
               show: true,
               lineStyle: {
                 color: '#fff',
-                opacity: 0.1
+                opacity: 0.3
               }
-            },
+            },*/
             axisLabel: {
-              color: 'rgba(255,255,255,.8)',
+          //    color: 'rgba(255,255,255,.8)',
               fontSize: 12,
               formatter: '{value}%',
             }
@@ -210,6 +200,9 @@ export default {
               data: newData.yAxis1,
               xAxisIndex: 1,
               yAxisIndex: 1,
+              itemStyle: {
+                color: "#8CF9B8"
+              },
               label: {
                 show: true,
                 position: 'top',

+ 4 - 4
src/components/totalechart/up3Chart/index.vue

@@ -83,7 +83,9 @@
                             name: '工单达成数',
                             type: 'bar',
                             data: newData.actData,
-                            label: {
+                            itemStyle: {
+                              color: "#8CF9B8"
+                            },    label: {
                               show: true,
                               position: 'right',
                               fontSize:18,
@@ -91,9 +93,7 @@
                               color:  "inherit"
                             },
                             barWidth: 18,
-                            itemStyle: {
-                              color: "#8CF9B8"
-                            },
+
                           }
                       ]
                     }

+ 4 - 3
src/components/warehousechart/bottom1Chart/index.vue

@@ -40,7 +40,7 @@ export default {
           },
           legend: {
             textStyle: {
-              fontSize: 18
+              fontSize: 20
             },
             itemWidth: 29,
             itemHeight: 19
@@ -56,7 +56,7 @@ export default {
               type: 'category',
               data:newData.xAxiss,
               axisLabel: {
-                fontSize: 16,
+                fontSize: 17,
                 fontWeight: "bold"
               }
             }
@@ -72,7 +72,8 @@ export default {
               },
               axisLabel: {
                 formatter: '{value}%',
-                fontSize: 16
+                fontSize: 17,
+                fontWeight: "bold"
               },
               splitLine: {
                 show: true,

+ 4 - 4
src/components/warehousechart/up1Chart/chart.vue

@@ -31,12 +31,12 @@ export default {
       handler (newData) {
         this.options = {
           color: [
-            "#37a2da",
-            "#32c5e9",
-            "#37a2da",
-            "#32c5e9",
             "#ff9f7f",
             "#fb7293",
+            "#ff9f7f",
+            "#fb7293",
+            "#37a2da",
+            "#32c5e9",
             "#e7bcf3",
             "#8378ea"
           ],

+ 1 - 1
src/views/total/up2.vue

@@ -4,7 +4,7 @@
       <div class="d-flex ai-center flex-column body-box">
          <div class="up">
             <div
-              class="bg-color-black item"
+              class=" item"
               v-for="item in titleItem"
               :key="item.title"
           >

+ 2 - 2
src/views/total/up3.vue

@@ -29,7 +29,7 @@
               </div>
            </div>
            <div class="fs-xxl fw-b mt-2">
-              金额{{inAmount}}
+              金额{{inAmount}}W
             </div>
             </div>
           </div>
@@ -43,7 +43,7 @@
               </div>
             </div>
              <div class="fs-xxl fw-b mt-2 ">
-              金额{{outAmount}}
+              金额{{outAmount}}W
             </div>
           </div>
         </div>

+ 11 - 4
src/views/warehouse/bottom1.vue

@@ -2,7 +2,7 @@
   <div id="bottom2">
     <div class="bg-color-black">
       <div class="d-flex pt-1 pl-2 jc-center">
-        <span class="fs-xxl text mx-2 fw-b">近一个月来料合格率</span>
+        <span class="fs-xxl text mx-2 fw-b">近7天来料合格率</span>
       </div>
       <div class="body-box">
         <div class="pt-2 " >
@@ -62,9 +62,9 @@ export default {
             let xAxis0 = new Array();
             let mindata = 100;
 
-            //30天内
+            //7天内
             let ndata = new Array();
-            for (let i =29 ;i>=0;i--){
+            for (let i =6 ;i>=0;i--){
               let formattedDate;
               if(i == 0){
                 formattedDate = this.$moment().format('MM/DD');
@@ -92,7 +92,14 @@ export default {
               data: ndata,
               symbolSize: 4,
               lineStyle: {
-                width: 3
+                width: 4
+              },
+              label: {
+                show: true,
+                position: 'top',
+                fontSize:15,
+                color:'inherit',
+                fontWeight: "bold"
               },
               emphasis: {
                 focus: 'series'

+ 1 - 1
src/views/warehouse/up3.vue

@@ -18,7 +18,7 @@ export default {
   data() {
     return {
       config: {
-        header: ['类别','总数量', '低于安全库存数'],
+        header: ['物料编号','总数量', '低于安全库存数'],
         data: [],
         rowNum: 10, //表格行数
         headerHeight: 40,