diff --git a/src/components/baozuo-demo/BottomCharts.vue b/src/components/baozuo-demo/BottomCharts.vue index 7dca196..5e80a3a 100644 --- a/src/components/baozuo-demo/BottomCharts.vue +++ b/src/components/baozuo-demo/BottomCharts.vue @@ -275,12 +275,12 @@ export default { item["产品名称"], item["派工日期"], item["派工数量"], - createProgressCircle(item["工序进度"]*100), - createProgressCircle(item["进水调节"]*100), - createProgressCircle(item["按钮调解"]*100), - createProgressCircle(item["桶身调节"]*100), - createProgressCircle(item["桶身装底座"]*100), - createProgressCircle(item["包装"]*100), + createProgressCircle(item["工序进度"]*1000/10), + createProgressCircle(item["进水调节"]*1000/10), + createProgressCircle(item["按钮调解"]*1000/10), + createProgressCircle(item["桶身调节"]*1000/10), + createProgressCircle(item["桶身装底座"]*1000/10), + createProgressCircle(item["包装"]*1000/10), item["剩余数量"], ] }) diff --git a/src/components/baozuo-demo/CenterCmp.vue b/src/components/baozuo-demo/CenterCmp.vue index 18e75b2..b097d48 100644 --- a/src/components/baozuo-demo/CenterCmp.vue +++ b/src/components/baozuo-demo/CenterCmp.vue @@ -12,13 +12,19 @@
5
4
-
+
本月总产量
+
4
+
3
2
0
-
8
+
+
+
本月总产量
+
5
2
-
4
+
0
+
0
@@ -142,7 +148,7 @@ export default { const originalLeftData2 = [ { icon: require(`@/img/icons/12.png`), name: '派工数量', value: testRes.data.yx_v_scgdgk[0]["派工数量"] }, { icon: require(`@/img/icons/12.png`), name: '未完工数量', value: testRes.data.yx_v_scgdgk[0]["未完成数量"] }, - { icon: require(`@/img/icons/12.png`), name: '工单订成率', value: testRes.data.yx_v_scgdgk[0]["工单完成率"] } + { icon: require(`@/img/icons/12.png`), name: '工单完成率', value: (testRes.data.yx_v_scgdgk[0]["未完成数量"]/testRes.data.yx_v_scgdgk[0]["派工数量"]).toFixed(2)*100+'%' } ]; const originalRightData = [ @@ -201,7 +207,7 @@ export default { series: [ { type: 'gauge', - data: [ { name: 'itemA', value: testRes.data.yx_v_scgdgk[0]["工单完成率"] } ], + data: [ { name: 'itemA', value: (testRes.data.yx_v_scgdgk[0]["未完成数量"]/testRes.data.yx_v_scgdgk[0]["派工数量"]).toFixed(2)*100 } ], center: ['50%', '55%'], axisLabel: { formatter: '{value}%', diff --git a/src/components/baozuo-demo/LeftChart2.vue b/src/components/baozuo-demo/LeftChart2.vue index 2875f5c..2319b51 100644 --- a/src/components/baozuo-demo/LeftChart2.vue +++ b/src/components/baozuo-demo/LeftChart2.vue @@ -240,7 +240,7 @@ export default { color: '#fff' // 可选:设置字体颜色 }, // prettier-ignore - data:getRecentSixMonths(), + data:testRes.data.yx_v_bzcl6m.map(item=>{return item["month"]+"月"}), }, ], yAxis: [ diff --git a/src/components/baozuo-demo/test.js b/src/components/baozuo-demo/test.js index a8d816e..3f5fe79 100644 --- a/src/components/baozuo-demo/test.js +++ b/src/components/baozuo-demo/test.js @@ -69,6 +69,40 @@ const testRes = { } ], "yx_v_bzcl6m": [ + { + "month": 10, + "水件": 0, + "进水阀": 0, + "排水阀": 0, + "按钮": 0 + }, + { + "month": 11, + "水件": 0, + "进水阀": 0, + "排水阀": 0, + "按钮": 0 + }, + { + "month": 12, + "水件": 0, + "进水阀": 0, + "排水阀": 0, + "按钮": 0 + }, + { + "month": 1, + "水件": 0, + "进水阀": 0, + "排水阀": 0, + "按钮": 0 + }, { + "month": 2, + "水件": 0, + "进水阀": 0, + "排水阀": 0, + "按钮": 0 + }, { "month": 3, "水件": 48454,