change

src/config/mork02.js

@@ -9,7 +9,7 @@ export const getAllBigScreen = () => {
                 "small_model": "BKB01",
                 "batch_number": "00250621001",
                 "weight": "5",
-                "dd_status": "1"
+                "dd_status": "未开始"
             },
             {
                 "customer": "海宁晶科（浙江）",
@@ -18,7 +18,7 @@ export const getAllBigScreen = () => {
                 "small_model": "TKB373",
                 "batch_number": "00250623034",
                 "weight": "4",
-                "dd_status": "1"
+                "dd_status": "未开始"
             },
             {
                 "customer": "海宁晶科（浙江）",
@@ -27,7 +27,7 @@ export const getAllBigScreen = () => {
                 "small_model": "TKB373",
                 "batch_number": "00250623034",
                 "weight": "186",
-                "dd_status": "1"
+                "dd_status": "未开始"
             },
             {
                 "customer": "海宁晶科（浙江）",
@@ -36,7 +36,7 @@ export const getAllBigScreen = () => {
                 "small_model": "TKB373",
                 "batch_number": "00250623034",
                 "weight": "186",
-                "dd_status": "1"
+                "dd_status": "未开始"
             },
             {
                 "customer": "海宁晶科（尖山）二期",
@@ -45,7 +45,7 @@ export const getAllBigScreen = () => {
                 "small_model": "BKB71",
                 "batch_number": "00250620028",
                 "weight": "11",
-                "dd_status": "2"
+                "dd_status": "进行中"
             },
             {
                 "customer": "海宁晶科（尖山）二期",
@@ -54,7 +54,7 @@ export const getAllBigScreen = () => {
                 "small_model": "BKB71",
                 "batch_number": "00250620028",
                 "weight": "17",
-                "dd_status": "2"
+                "dd_status": "进行中"
             },
             {
                 "customer": "海宁晶科（尖山）二期",
@@ -63,7 +63,7 @@ export const getAllBigScreen = () => {
                 "small_model": "TKB381",
                 "batch_number": "00250620015",
                 "weight": "84",
-                "dd_status": "2"
+                "dd_status": "进行中"
             },
             {
                 "customer": "海宁晶科（尖山）二期",
@@ -72,7 +72,7 @@ export const getAllBigScreen = () => {
                 "small_model": "TKB381",
                 "batch_number": "00250620015",
                 "weight": "30",
-                "dd_status": "2"
+                "dd_status": "进行中"
             },
             {
                 "customer": "海宁晶科（尖山）二期",
@@ -81,7 +81,7 @@ export const getAllBigScreen = () => {
                 "small_model": "TKB381",
                 "batch_number": "00250620015",
                 "weight": "30",
-                "dd_status": "2"
+                "dd_status": "进行中"
             },
             {
                 "customer": "海宁晶科（尖山）二期",
@@ -90,7 +90,7 @@ export const getAllBigScreen = () => {
                 "small_model": "TKB381",
                 "batch_number": "00250620015",
                 "weight": "30",
-                "dd_status": "3"
+                "dd_status": "已完成"
             },
             {
                 "customer": "海宁晶科（尖山）二期",
@@ -99,7 +99,7 @@ export const getAllBigScreen = () => {
                 "small_model": "TKB381",
                 "batch_number": "00250620015",
                 "weight": "30",
-                "dd_status": "1"
+                "dd_status": "未开始"
             },
             {
                 "customer": "海宁晶科（尖山）二期",
@@ -108,7 +108,7 @@ export const getAllBigScreen = () => {
                 "small_model": "TKB529",
                 "batch_number": "00250620016",
                 "weight": "72",
-                "dd_status": "3"
+                "dd_status": "已完成"
             },
             {
                 "customer": "海宁晶科（尖山）二期",
@@ -117,7 +117,7 @@ export const getAllBigScreen = () => {
                 "small_model": "NKLB16",
                 "batch_number": "00250621253",
                 "weight": "12",
-                "dd_status": "3"
+                "dd_status": "已完成"
             },
             {
                 "customer": "山西晶科",
@@ -126,7 +126,7 @@ export const getAllBigScreen = () => {
                 "small_model": "TKB551",
                 "batch_number": "00250624144",
                 "weight": "20",
-                "dd_status": "3"
+                "dd_status": "已完成"
             },
             {
                 "customer": "山西晶科",
@@ -135,7 +135,7 @@ export const getAllBigScreen = () => {
                 "small_model": "TKB551",
                 "batch_number": "00250624145",
                 "weight": "20",
-                "dd_status": "3"
+                "dd_status": "已完成"
             },
             {
                 "customer": "山西晶科",
@@ -144,7 +144,7 @@ export const getAllBigScreen = () => {
                 "small_model": "NKLB190",
                 "batch_number": "00250623203",
                 "weight": "4",
-                "dd_status": "1"
+                "dd_status": "未开始"
             },
             {
                 "customer": "眉山通威",
@@ -153,7 +153,7 @@ export const getAllBigScreen = () => {
                 "small_model": "H658TC52C5",
                 "batch_number": "00250623028",
                 "weight": "160",
-                "dd_status": "2"
+                "dd_status": "进行中"
             },
             {
                 "customer": "眉山通威",
@@ -162,7 +162,7 @@ export const getAllBigScreen = () => {
                 "small_model": "H658TC52C5",
                 "batch_number": "00250623028",
                 "weight": "160",
-                "dd_status": "3"
+                "dd_status": "已完成"
             },
             {
                 "customer": "眉山通威",
@@ -171,7 +171,7 @@ export const getAllBigScreen = () => {
                 "small_model": "TWL04",
                 "batch_number": "00250620026",
                 "weight": "10",
-                "dd_status": "1"
+                "dd_status": "未开始"
             },
             {
                 "customer": "眉山通威",
@@ -180,7 +180,7 @@ export const getAllBigScreen = () => {
                 "small_model": "TWL04",
                 "batch_number": "00250624003",
                 "weight": "310",
-                "dd_status": "3"
+                "dd_status": "已完成"
             },
             {
                 "customer": "眉山通威",
@@ -189,7 +189,7 @@ export const getAllBigScreen = () => {
                 "small_model": "TWL04",
                 "batch_number": "00250624003",
                 "weight": "310",
-                "dd_status": "3"
+                "dd_status": "已完成"
             },
             {
                 "customer": "眉山通威",
@@ -198,7 +198,7 @@ export const getAllBigScreen = () => {
                 "small_model": "TWL04",
                 "batch_number": "00250623029",
                 "weight": "30",
-                "dd_status": "1"
+                "dd_status": "未开始"
             }
         ],
         "fhsituation": {
@@ -207,18 +207,100 @@ export const getAllBigScreen = () => {
         },
         "bzsituation": [
             {
-                "bz_situation": "1",
+                "bz_situation": "未开始",
                 "bz_proportion": "0.26"
             },
             {
-                "bz_situation": "2",
+                "bz_situation": "进行中",
                 "bz_proportion": "0.19"
             },
             {
-                "bz_situation": "3",
+                "bz_situation": "已完成",
                 "bz_proportion": "0.54"
             }
         ],
+        "ypsituation": [
+            {
+                "customer": "美国Mission Solar（国外）",
+                "batch": "00250619016",
+                "dd_status": "未开始"
+            },
+            {
+                "customer": "美国Mission Solar（国外）",
+                "batch": "00250620118",
+                "dd_status": "未开始"
+            },
+            {
+                "customer": "美国Mission Solar（国外）",
+                "batch": "00250620119",
+                "dd_status": "未开始"
+            },
+            {
+                "customer": "台湾桃园工厂",
+                "batch": "00250621104",
+                "dd_status": "未开始"
+            },
+            {
+                "customer": "台湾桃园工厂",
+                "batch": "00250618022",
+                "dd_status": "进行中"
+            },
+            {
+                "customer": "英发德耀",
+                "batch": "00250620035",
+                "dd_status": "进行中"
+            },
+            {
+                "customer": "英发德耀",
+                "batch": "00250618035",
+                "dd_status": "进行中"
+            },
+            {
+                "customer": "彭山通威",
+                "batch": "00250620113",
+                "dd_status": "进行中"
+            },
+            {
+                "customer": "中建材（浚鑫）",
+                "batch": "00250623101",
+                "dd_status": "已完成"
+            },
+            {
+                "customer": "扬州阿特斯",
+                "batch": "00250623119",
+                "dd_status": "已完成"
+            },
+            {
+                "customer": "扬州阿特斯",
+                "batch": "00250623120",
+                "dd_status": "已完成"
+            },
+            {
+                "customer": "华晟无锡-上海直发",
+                "batch": "00250623201",
+                "dd_status": "已完成"
+            },
+            {
+                "customer": "徐州弘元",
+                "batch": "00250623114",
+                "dd_status": "已完成"
+            },
+            {
+                "customer": "徐州弘元",
+                "batch": "00250623115",
+                "dd_status": "进行中"
+            },
+            {
+                "customer": "眉山通威",
+                "batch": "00250623112",
+                "dd_status": "进行中"
+            },
+            {
+                "customer": "日月光能",
+                "batch": "00250623129",
+                "dd_status": "未开始"
+            }
+        ],
         "drbzsituation": {
             "plan_weight": "1721.0",
             "finish_weight": "934.0"

src/pages_960/modules/home/index2.vue

@@ -250,7 +250,7 @@ export default {
         series: [
           {
             type: 'pie',
-            radius: ['43%', '70%'],
+            radius: ['38%', '70%'],
             label: {
               normal: {
                 show: false,
@@ -285,10 +285,8 @@ export default {
       ]
       var option = {
         legend: {
-          // orient: 'vertical',
           orient: 'horizontal',
           top: '4%',
-          // right: 0,
           textStyle: {
             color: '#fff',
             fontWeight: 'bold',
@@ -297,14 +295,14 @@ export default {
           itemGap: 10.86,
           itemWidth: 14.16,
           itemHeight: 7.38,
-          // data: dataName
           data: ['计划重量', '已完成重量']
         },
-        color: ['#32c5ff', '#f7b502'],
+        color: ['#0966E8', '#ffee0e'],
         series: [
           {
+            name: '当日包装完成情况',
             type: 'pie',
-            radius: ['43%', '70%'],
+            radius: '70%',
             label: {
               normal: {
                 show: false,
@@ -320,10 +318,17 @@ export default {
             labelLine: {
               show: true
             },
-            data: data
+            data: data,
+            emphasis: {
+              itemStyle: {
+                shadowBlur: 10,
+                shadowOffsetX: 0,
+                shadowColor: 'rgba(0, 0, 0, 0.5)'
+              }
+            }
           }
         ]
-      }
+      };
       this.myChart2.setOption(option, true)
     },
     setEchart3 () {
@@ -362,7 +367,7 @@ export default {
         series: [
           {
             type: 'pie',
-            radius: ['43%', '70%'],
+            radius: ['38%', '70%'],
             label: {
               normal: {
                 show: false,