diff --git a/public/data.json b/public/data.json index 1418567..d23579d 100644 --- a/public/data.json +++ b/public/data.json @@ -269,6 +269,302 @@ "value17": "100", "value18": "100", "value19": "100" + }, + { + "value1": "7", + "value2": "A-06", + "value3": "生产中", + "value4": "1000", + "value5": "1000%", + "value6": "100%", + "value7": "100", + "value8": "100", + "value9": "100", + "value10": "100", + "value11": "100", + "value12": "100", + "value13": "100", + "value14": "100", + "value15": "100", + "value16": "100", + "value17": "100", + "value18": "100", + "value19": "100" + }, + { + "value1": "8", + "value2": "A-06", + "value3": "生产中", + "value4": "1000", + "value5": "1000%", + "value6": "100%", + "value7": "100", + "value8": "100", + "value9": "100", + "value10": "100", + "value11": "100", + "value12": "100", + "value13": "100", + "value14": "100", + "value15": "100", + "value16": "100", + "value17": "100", + "value18": "100", + "value19": "100" + }, + { + "value1": "9", + "value2": "A-06", + "value3": "生产中", + "value4": "1000", + "value5": "1000%", + "value6": "100%", + "value7": "100", + "value8": "100", + "value9": "100", + "value10": "100", + "value11": "100", + "value12": "100", + "value13": "100", + "value14": "100", + "value15": "100", + "value16": "100", + "value17": "100", + "value18": "100", + "value19": "100" + }, + { + "value1": "10", + "value2": "A-06", + "value3": "生产中", + "value4": "1000", + "value5": "1000%", + "value6": "100%", + "value7": "100", + "value8": "100", + "value9": "100", + "value10": "100", + "value11": "100", + "value12": "100", + "value13": "100", + "value14": "100", + "value15": "100", + "value16": "100", + "value17": "100", + "value18": "100", + "value19": "100" + } + ], + "table31": [ + { + "value1": "1", + "value2": "A-07", + "value3": "生产中", + "value4": "1000", + "value5": "1000%", + "value6": "100%", + "value7": "100", + "value8": "100", + "value9": "100", + "value10": "100", + "value11": "100", + "value12": "100", + "value13": "100", + "value14": "100", + "value15": "100", + "value16": "100", + "value17": "100", + "value18": "100", + "value19": "100" + }, + { + "value1": "2", + "value2": "A-08", + "value3": "生产中", + "value4": "1000", + "value5": "1000%", + "value6": "100%", + "value7": "100", + "value8": "100", + "value9": "100", + "value10": "100", + "value11": "100", + "value12": "100", + "value13": "100", + "value14": "100", + "value15": "100", + "value16": "100", + "value17": "100", + "value18": "100", + "value19": "100" + }, + { + "value1": "3", + "value2": "A-09", + "value3": "生产中", + "value4": "1000", + "value5": "1000%", + "value6": "100%", + "value7": "100", + "value8": "100", + "value9": "100", + "value10": "100", + "value11": "100", + "value12": "100", + "value13": "100", + "value14": "100", + "value15": "100", + "value16": "100", + "value17": "100", + "value18": "100", + "value19": "100" + }, + { + "value1": "4", + "value2": "A-010", + "value3": "生产中", + "value4": "1000", + "value5": "1000%", + "value6": "100%", + "value7": "100", + "value8": "100", + "value9": "100", + "value10": "100", + "value11": "100", + "value12": "100", + "value13": "100", + "value14": "100", + "value15": "100", + "value16": "100", + "value17": "100", + "value18": "100", + "value19": "100" + }, + { + "value1": "5", + "value2": "A-11", + "value3": "生产中", + "value4": "1000", + "value5": "1000%", + "value6": "100%", + "value7": "100", + "value8": "100", + "value9": "100", + "value10": "100", + "value11": "100", + "value12": "100", + "value13": "100", + "value14": "100", + "value15": "100", + "value16": "100", + "value17": "100", + "value18": "100", + "value19": "100" + }, + { + "value1": "6", + "value2": "A-12", + "value3": "生产中", + "value4": "1000", + "value5": "1000%", + "value6": "100%", + "value7": "100", + "value8": "100", + "value9": "100", + "value10": "100", + "value11": "100", + "value12": "100", + "value13": "100", + "value14": "100", + "value15": "100", + "value16": "100", + "value17": "100", + "value18": "100", + "value19": "100" + }, + { + "value1": "7", + "value2": "A-12", + "value3": "生产中", + "value4": "1000", + "value5": "1000%", + "value6": "100%", + "value7": "100", + "value8": "100", + "value9": "100", + "value10": "100", + "value11": "100", + "value12": "100", + "value13": "100", + "value14": "100", + "value15": "100", + "value16": "100", + "value17": "100", + "value18": "100", + "value19": "100" + }, + { + "value1": "8", + "value2": "A-12", + "value3": "生产中", + "value4": "1000", + "value5": "1000%", + "value6": "100%", + "value7": "100", + "value8": "100", + "value9": "100", + "value10": "100", + "value11": "100", + "value12": "100", + "value13": "100", + "value14": "100", + "value15": "100", + "value16": "100", + "value17": "100", + "value18": "100", + "value19": "100" + }, + { + "value1": "9", + "value2": "A-12", + "value3": "生产中", + "value4": "1000", + "value5": "1000%", + "value6": "100%", + "value7": "100", + "value8": "100", + "value9": "100", + "value10": "100", + "value11": "100", + "value12": "100", + "value13": "100", + "value14": "100", + "value15": "100", + "value16": "100", + "value17": "100", + "value18": "100", + "value19": "100" + }, + { + "value1": "10", + "value2": "A-12", + "value3": "生产中", + "value4": "1000", + "value5": "1000%", + "value6": "100%", + "value7": "100", + "value8": "100", + "value9": "100", + "value10": "100", + "value11": "100", + "value12": "100", + "value13": "100", + "value14": "100", + "value15": "100", + "value16": "100", + "value17": "100", + "value18": "100", + "value19": "100" } ], "table32": [ @@ -399,6 +695,38 @@ "value19": "100" } ], + "table33": [ + { + "value1": "1", + "value2": "A-01", + "value3": "2023-01-01" + }, + { + "value1": "2", + "value2": "A-02", + "value3": "2023-01-01" + }, + { + "value1": "3", + "value2": "A-03", + "value3": "2023-01-01" + }, + { + "value1": "4", + "value2": "A-04", + "value3": "2023-01-01" + }, + { + "value1": "5", + "value2": "A-05", + "value3": "2023-01-01" + }, + { + "value1": "6", + "value2": "A-06", + "value3": "2023-01-01" + } + ], "table4": [ { "value1": "01", diff --git a/src/views/board/caseShell/index2.vue b/src/views/board/caseShell/index2.vue index 01119ba..826f09d 100644 --- a/src/views/board/caseShell/index2.vue +++ b/src/views/board/caseShell/index2.vue @@ -9,7 +9,7 @@ :style="'top:'+(titlePosition[k]&&titlePosition[k].top||0)+'%;left:'+(titlePosition[k]&&titlePosition[k].left||0)+'%'"> {{ i }} -
平均节拍:{{meter}}
+
平均节拍:{{ meter }}
@@ -111,7 +111,7 @@ export default { return { linerNum: 50, caseNum: 44, - meter:30, + meter: 30, title: [ '工单计划', '小时统计', @@ -160,7 +160,7 @@ export default { } }, mounted() { - getData().then(e=>{ + getData().then(e => { this.scrollTableData = e.table1 this.$refs.chart1.setData({ tooltip: { @@ -279,7 +279,7 @@ export default { containLabel: true, }, legend: { - data: e.chart2.y.map(val=>val.name), + data: e.chart2.y.map(val => val.name), right: 'center', top: 0, textStyle: { @@ -594,7 +594,7 @@ export default { text-overflow: ellipsis; text-align: center; display: inline-block; - width:calc(100% / 7); + width: calc(100% / 7); } .chart1 { @@ -638,7 +638,8 @@ export default { color: #fff; letter-spacing: 1px; } -.meter{ + +.meter { position: absolute; top: 19.7%; left: 61.5%; diff --git a/src/views/board/foaming/index.vue b/src/views/board/foaming/index.vue index 5d4ce08..72f85ac 100644 --- a/src/views/board/foaming/index.vue +++ b/src/views/board/foaming/index.vue @@ -484,8 +484,8 @@ export default { }, 30 * 1000) getData().then(e => { this.scrollTableData = e.table2 - this.scrollTableData1 = e.table3 - this.scrollTableData2 = e.table32 + this.scrollTableData1 = e.table3.slice(0,6) + this.scrollTableData2 = e.table32.slice(0,6) this.$refs.chart1.setData({ tooltip: { trigger: "axis", diff --git a/src/views/board/foaming/index2.vue b/src/views/board/foaming/index2.vue index 877bc3e..418dae6 100644 --- a/src/views/board/foaming/index2.vue +++ b/src/views/board/foaming/index2.vue @@ -1,26 +1,23 @@