diff --git a/src/assets/board/finalAssembly.jpg b/src/assets/board/finalAssembly.jpg index 84bbdb2..b0b1c57 100644 Binary files a/src/assets/board/finalAssembly.jpg and b/src/assets/board/finalAssembly.jpg differ diff --git a/src/layout/boardIndex.vue b/src/layout/boardIndex.vue index ba41037..c2caf12 100644 --- a/src/layout/boardIndex.vue +++ b/src/layout/boardIndex.vue @@ -60,8 +60,8 @@ export default { background-image: url("../assets/board/logo.png"); background-repeat: no-repeat; background-size: 100% 100%; - width: 8vw; - height:3vw; + width: 6vw; + height: 2.3vw; position: absolute; top: 1%; left: 1%; diff --git a/src/layout/components/AppMain2.vue b/src/layout/components/AppMain2.vue index eb71e2a..ac60950 100644 --- a/src/layout/components/AppMain2.vue +++ b/src/layout/components/AppMain2.vue @@ -75,8 +75,8 @@ export default { background-image: url("../../assets/board/logo.png"); background-repeat: no-repeat; background-size: 100% 100%; - width: 8vw; - height:3vw; + width: 6vw; + height: 2.3vw; position: absolute; top: 1%; left: 1%; diff --git a/src/views/board/finalAssembly/index.vue b/src/views/board/finalAssembly/index.vue index 8c61064..0ce4005 100644 --- a/src/views/board/finalAssembly/index.vue +++ b/src/views/board/finalAssembly/index.vue @@ -11,23 +11,19 @@
{{ info.bz }}
{{ info.sxsl }}
-
产品条码
-
{{ info.tm }}
-
扫描时间
-
{{ info.sj }}
-
产品型号
-
{{ info.xh }}
-
订单编号
-
{{ info.bh }}
-
订单数量
-
{{ info.ddsl }}
-
上线数量
-
{{ info.sxsl2 }}
-
提示信息
-
{{ info.tsxx }}
+
产品条码： {{ info.tm }}
+
扫描时间： {{ info.sj }}
+
产品型号： {{ info.xh }}
+
订单编号： {{ info.bh }}
+
订单数量： {{ info.ddsl }}
+
上线数量： {{ info.sxsl2 }}
+
提示信息： {{ info.tsxx }}
+
+ 序号 +
订单号
@@ -38,7 +34,10 @@ 计划数量
- 上线数量 + 当日上线数量 +
+
+ 订单上线数量
上线进度 @@ -63,6 +62,10 @@ class="scrollTableItem"> {{ item.value1 }}
+
+ {{ item.value1 }} +
{{ item.value2 }} @@ -75,6 +78,10 @@ class="scrollTableItem"> {{ item.value4 }}
+
+ {{ item.value4 }} +
{{ item.value5 }} @@ -113,8 +120,8 @@ export default { data() { return { title: [ - '当日小时产量统计', - '当日型号产量统计', + '总装上线小时统计', + '总装上线型号统计', '生产统计', ], titlePosition: [ @@ -381,7 +388,7 @@ export default { text-overflow: ellipsis; text-align: center; display: inline-block; - width: 16.6%; + width: calc(100% / 8); } .chart1 { @@ -402,8 +409,8 @@ export default { .title1 { position: absolute; - top: 12.5%; - left: 12.7%; + top: 12.1%; + left: 11.3%; transform: translate(-50%, -50%); font-size: 1.2vw; color: #d6eaed; @@ -411,171 +418,108 @@ export default { .title2 { position: absolute; - top: 12.5%; - left: 87.2%; + top: 12.1%; + left: 88.5%; transform: translate(-50%, -50%); font-size: 1.2vw; color: #d6eaed; + white-space: nowrap; } .nowClass { position: absolute; - top: 20%; - left: 12.7%; + top: 21%; + left: 11.3%; + font-size: 1.8vw; + letter-spacing: 4px; transform: translate(-50%, -50%); - font-size: 1.2vw; color: #d6eaed; } .num { position: absolute; - top: 20%; - left: 87.2%; + top: 21%; + left: 88.5%; transform: translate(-50%, -50%); - font-size: 1.2vw; + font-size: 1.8vw; + letter-spacing: 4px; color: #d6eaed; } .info1Title { position: absolute; - top: 9%; - left: 23.5%;; - width: 8.5%; - font-size: 1.1vw; - color: #55c280; - text-align: center; + top: 11.1%; + left: 23%; + width: 24%; + font-size: 1vw; + color: #fff9; + text-align: left; } -.info1 { - position: absolute; - top: 9%; - left: 32%; - width: 18%; - font-size: 1.2vw; - color: #d6eaed; - text-align: center; -} .info2Title { position: absolute; - top: 9%; - left: 50%; - width: 8.5%; - font-size: 1.1vw; - color: #55c280; - text-align: center; -} - -.info2 { - position: absolute; - top: 9%; - left: 58.5%; - width: 18%; - font-size: 1.2vw; - color: #d6eaed; - text-align: center; + top: 11.1%; + left: 52.7%; + width: 24%; + font-size: 1vw; + color: #fff9; + text-align: left; } .info3Title { position: absolute; - top: 13.5%; - left: 23.5%;; - width: 8.5%; - font-size: 1.1vw; - color: #55c280; - text-align: center; + top: 14.8%; + left: 23%; + width: 24%; + font-size: 1vw; + color: #fff9; + text-align: left; } -.info3 { - position: absolute; - top: 13.5%; - left: 32%; - width: 18%; - font-size: 1.2vw; - color: #d6eaed; - text-align: center; -} .info4Title { position: absolute; - top: 13.5%; - left: 50%; - width: 8.5%; - font-size: 1.1vw; - color: #55c280; - text-align: center; -} - -.info4 { - position: absolute; - top: 13.5%; - left: 58.5%; - width: 18%; - font-size: 1.2vw; - color: #d6eaed; - text-align: center; + top: 14.8%; + left: 52.7%; + width: 24%; + font-size: 1vw; + color: #fff9; + text-align: left; } .info5Title { position: absolute; - top: 18%; - left: 23.5%;; - width: 8.5%; - font-size: 1.1vw; - color: #55c280; - text-align: center; -} - -.info5 { - position: absolute; - top: 18%; - left: 32%; - width: 18%; - font-size: 1.2vw; - color: #d6eaed; - text-align: center; + top: 18.4%; + left: 23%; + width: 24%; + font-size: 1vw; + color: #fff9; + text-align: left; } .info6Title { position: absolute; - top: 18%; - left: 50%; - width: 8.5%; - font-size: 1.1vw; - color: #55c280; - text-align: center; + top: 18.3%; + left: 52.7%; + width: 24%; + font-size: 1vw; + color: #fff9; + text-align: left; } -.info6 { - position: absolute; - top: 18%; - left: 58.5%; - width: 18%; - font-size: 1.2vw; - color: #d6eaed; - text-align: center; -} .info7Title { position: absolute; - top: 22.5%; - left: 23.5%;; - width: 8.5%; - font-size: 1.1vw; - color: #55c280; - text-align: center; + top: 22%; + left: 23%; + width: 24%; + font-size: 1vw; + color: #fff9; + text-align: left; } -.info7 { - position: absolute; - top: 22.5%; - left: 32%; - width: 18%; - font-size: 1.2vw; - color: #d6eaed; - text-align: center; -} diff --git a/src/views/board/foaming/index.vue b/src/views/board/foaming/index.vue index da13ed4..1c30226 100644 --- a/src/views/board/foaming/index.vue +++ b/src/views/board/foaming/index.vue @@ -1362,6 +1362,622 @@
+ +
+
+
+ 工位 +
+
+ 型号 +
+
+ 状态 +
+
+ 目标 +
+
+ 计划 +
+
+ 累计 +
+
+ 达成率 +
+
+ {{ hourArr[0] }} +
+
+ {{ hourArr[1] }} +
+
+ {{ hourArr[2] }} +
+
+ {{ hourArr[3] }} +
+
+ {{ hourArr[4] }} +
+
+ {{ hourArr[5] }} +
+
+ {{ hourArr[6] }} +
+
+ {{ hourArr[7] }} +
+
+ {{ hourArr[8] }} +
+
+ {{ hourArr[9] }} +
+
+ {{ hourArr[10] }} +
+
+ {{ hourArr[11] }} +
+
+ + + + + + +
+
+
+ {{ item.value1 }} +
+
+ {{ item.value2 }} +
+
+ {{ item.value3 }} +
+
+ {{ item.value4 }} +
+
+ {{ item.value5 }} +
+
+ {{ item.value6 }} +
+
+ {{ item.value7 }} +
+
+ {{ item.value8 }} +
+
+ {{ item.value9 }} +
+
+ {{ item.value10 }} +
+
+ {{ item.value11 }} +
+
+ {{ item.value12 }} +
+
+ {{ item.value13 }} +
+
+ {{ item.value14 }} +
+
+ {{ item.value15 }} +
+
+ {{ item.value16 }} +
+
+ {{ item.value17 }} +
+
+ {{ item.value18 }} +
+
+ {{ item.value19 }} +
+
+
+ +
+ + +
+
+
+ 工位 +
+
+ 型号 +
+
+ 状态 +
+
+ 目标 +
+
+ 计划 +
+
+ 累计 +
+
+ 达成率 +
+
+ {{ hourArr[0] }} +
+
+ {{ hourArr[1] }} +
+
+ {{ hourArr[2] }} +
+
+ {{ hourArr[3] }} +
+
+ {{ hourArr[4] }} +
+
+ {{ hourArr[5] }} +
+
+ {{ hourArr[6] }} +
+
+ {{ hourArr[7] }} +
+
+ {{ hourArr[8] }} +
+
+ {{ hourArr[9] }} +
+
+ {{ hourArr[10] }} +
+
+ {{ hourArr[11] }} +
+
+ + + + + + +
+
+
+ {{ item.value1 }} +
+
+ {{ item.value2 }} +
+
+ {{ item.value3 }} +
+
+ {{ item.value4 }} +
+
+ {{ item.value5 }} +
+
+ {{ item.value6 }} +
+
+ {{ item.value7 }} +
+
+ {{ item.value8 }} +
+
+ {{ item.value9 }} +
+
+ {{ item.value10 }} +
+
+ {{ item.value11 }} +
+
+ {{ item.value12 }} +
+
+ {{ item.value13 }} +
+
+ {{ item.value14 }} +
+
+ {{ item.value15 }} +
+
+ {{ item.value16 }} +
+
+ {{ item.value17 }} +
+
+ {{ item.value18 }} +
+
+ {{ item.value19 }} +
+
+
+ +
+ + +
+
+
+ 工位 +
+
+ 型号 +
+
+ 状态 +
+
+ 目标 +
+
+ 计划 +
+
+ 累计 +
+
+ 达成率 +
+
+ {{ hourArr[0] }} +
+
+ {{ hourArr[1] }} +
+
+ {{ hourArr[2] }} +
+
+ {{ hourArr[3] }} +
+
+ {{ hourArr[4] }} +
+
+ {{ hourArr[5] }} +
+
+ {{ hourArr[6] }} +
+
+ {{ hourArr[7] }} +
+
+ {{ hourArr[8] }} +
+
+ {{ hourArr[9] }} +
+
+ {{ hourArr[10] }} +
+
+ {{ hourArr[11] }} +
+
+ + + + + + +
+
+
+ {{ item.value1 }} +
+
+ {{ item.value2 }} +
+
+ {{ item.value3 }} +
+
+ {{ item.value4 }} +
+
+ {{ item.value5 }} +
+
+ {{ item.value6 }} +
+
+ {{ item.value7 }} +
+
+ {{ item.value8 }} +
+
+ {{ item.value9 }} +
+
+ {{ item.value10 }} +
+
+ {{ item.value11 }} +
+
+ {{ item.value12 }} +
+
+ {{ item.value13 }} +
+
+ {{ item.value14 }} +
+
+ {{ item.value15 }} +
+
+ {{ item.value16 }} +
+
+ {{ item.value17 }} +
+
+ {{ item.value18 }} +
+
+ {{ item.value19 }} +
+
+
+ +
+ + +
+
+
+ 工位 +
+
+ 型号 +
+
+ 状态 +
+
+ 目标 +
+
+ 计划 +
+
+ 累计 +
+
+ 达成率 +
+
+ {{ hourArr[0] }} +
+
+ {{ hourArr[1] }} +
+
+ {{ hourArr[2] }} +
+
+ {{ hourArr[3] }} +
+
+ {{ hourArr[4] }} +
+
+ {{ hourArr[5] }} +
+
+ {{ hourArr[6] }} +
+
+ {{ hourArr[7] }} +
+
+ {{ hourArr[8] }} +
+
+ {{ hourArr[9] }} +
+
+ {{ hourArr[10] }} +
+
+ {{ hourArr[11] }} +
+
+ + + + + + +
+
+
+ {{ item.value1 }} +
+
+ {{ item.value2 }} +
+
+ {{ item.value3 }} +
+
+ {{ item.value4 }} +
+
+ {{ item.value5 }} +
+
+ {{ item.value6 }} +
+
+ {{ item.value7 }} +
+
+ {{ item.value8 }} +
+
+ {{ item.value9 }} +
+
+ {{ item.value10 }} +
+
+ {{ item.value11 }} +
+
+ {{ item.value12 }} +
+
+ {{ item.value13 }} +
+
+ {{ item.value14 }} +
+
+ {{ item.value15 }} +
+
+ {{ item.value16 }} +
+
+ {{ item.value17 }} +
+
+ {{ item.value18 }} +
+
+ {{ item.value19 }} +
+
+
+ +
+
diff --git a/src/views/board/foaming/index2.vue b/src/views/board/foaming/index2.vue index d1dc315..0c9e077 100644 --- a/src/views/board/foaming/index2.vue +++ b/src/views/board/foaming/index2.vue @@ -162,6 +162,7 @@ export default { '发泡料温度监控', '门体发泡生产统计', ], + status1:0, meter1: 0, meter2: 0, titlePosition: [ diff --git a/src/views/board/scanDown/index.vue b/src/views/board/scanDown/index.vue index a1ee045..a759064 100644 --- a/src/views/board/scanDown/index.vue +++ b/src/views/board/scanDown/index.vue @@ -54,27 +54,27 @@
- {{ item.value1 }} + {{ item.COLUMN_A }}
- AA-001 + {{ item.COLUMN_B }}
- {{ item.value3 }} + {{ item.COLUMN_C }}
- {{ item.value4 }} + {{ item.COLUMN_D }}
- {{ item.value6 }} + {{ item.COLUMN_E }}
- 2023-01-01 00:00:00 + {{ item.COLUMN_F }}
@@ -169,7 +169,7 @@ export default { RequestDataSet: [ { e: 'cp-1-01', - i: "", + i: "scada_cp_cp_cl_01('CX_01')", f: (e) => { this.$refs.chart1.setData({ tooltip: { @@ -190,7 +190,7 @@ export default { legend: { show: true, itemGap: 50, - data: e.y.map(val => val.name), + data: ['实际产量','目标产量'], textStyle: { color: "#f9f9f9", borderColor: "#fff", @@ -229,7 +229,7 @@ export default { opacity: 0.3, }, }, - data: e.x, + data: e.map(val=>val.X_VALUE), }, ], yAxis: [ @@ -267,7 +267,7 @@ export default { ], series: [ { - name: e.y[0].name, + name: '实际产量', type: "bar", barWidth: '70%', label: { @@ -283,7 +283,7 @@ export default { barBorderRadius: 5, color: function (val) { console.log() - if (e.y[0].data[val.dataIndex] >= e.y[1].data[val.dataIndex]) { + if (e[val.dataIndex].Y_VALUE_ONE >= e[val.dataIndex].Y_VALUE_TWO) { return '#30e391' } else { return '#FE70A6' @@ -292,10 +292,10 @@ export default { }, }, }, - data: e.y[0].data, + data: e.map(val=>val.Y_VALUE_ONE), }, { - name: e.y[1].name, + name: '目标产量', type: "line", // smooth: true, //是否平滑曲线显示 // symbol:'circle', // 默认是空心圆（中间是白色的），改成实心圆 @@ -324,7 +324,7 @@ export default { // tooltip: { // show: false // }, - data: e.y[1].data, + data: e.map(val=>val.Y_VALUE_TWO), }, ], }) @@ -339,7 +339,7 @@ export default { }, { e: 'cp-1-03', - i: "", + i: "scada_cp_zj_01('CX_01')", f: (e) => { this.$refs.chart2.setData({ grid: { @@ -360,7 +360,7 @@ export default { }, legend: { itemWidth: 3 * vw, - data: e.y.map(val => val.name), + data: ['不良数','一次不合格率','目标'], textStyle: { color: "#d1e6eb", margin: 15, @@ -378,7 +378,7 @@ export default { }, }, type: 'category', - data: e.x, + data: e.map(val=>val.X_VALUE), axisPointer: { type: 'shadow' } @@ -420,13 +420,13 @@ export default { ], series: [ { - name: e.y[0].name, + name: '不良数', type: 'bar', itemStyle: { normal: { color: function (val) { console.log() - if (e.y[1].data[val.dataIndex] < e.y[2].data[val.dataIndex]) { + if (e[val.dataIndex].Y_VALUE_TWO < 3) { return '#30e391' } else { return '#FE70A6' @@ -435,7 +435,7 @@ export default { }, }, }, - data: e.y[0].data, + data: e.map(val=>val.Y_VALUE_ONE), label: { show: true, position: 'top', @@ -446,10 +446,10 @@ export default { }, }, { - name: e.y[1].name, + name: '不合格率', type: 'line', yAxisIndex: 1, - data: e.y[1].data, + data: e.map(val=>val.Y_VALUE_TWO), itemStyle: { normal: { color: '#F9A25B', @@ -457,10 +457,10 @@ export default { }, }, { - name: e.y[2].name, + name: '目标', type: 'line', yAxisIndex: 1, - data: e.y[2].data, + data: e.map(val=>3), itemStyle: { normal: { color: '#0DB99D', @@ -480,21 +480,21 @@ export default { }, { e: 'cp-1-05', - i: "", + i: "scada_cp_rk_jp_01('CX_01')", f: (e) => { - this.loss = e + this.loss = e[0].X_VALUE + this.meter = e[0].Y_VALUE } }, { e: 'cp-1-06', i: "", f: (e) => { - this.meter = e } }, { e: 'cp-1-07', - i: "", + i: "scada_cp_rk_loss_01('CX_01')", f: (e) => { this.$refs.chart3.setData({ tooltip: { @@ -510,7 +510,7 @@ export default { containLabel: true, }, xAxis: { - data: e.x, + data: e.map(val=>val.X_VALUE), axisLine: { lineStyle: { color: "#0177d4", @@ -576,7 +576,7 @@ export default { ), }, }, - data: e.y.data, + data: e.map(val=>val.Y_VALUE), }, ], }) @@ -584,7 +584,7 @@ export default { }, { e: 'cp-1-08', - i: "", + i: "scada_cp_rk_order_01('CX_01')", f: (e) => { this.scrollTableData = e } @@ -600,7 +600,7 @@ export default { RequestDataSet1: [ { e: 'cp-2-01', - i: "", + i: "scada_cp_cp_cl_01('CX_02')", f: (e) => { this.$refs.chart1.setData({ tooltip: { @@ -621,7 +621,7 @@ export default { legend: { show: true, itemGap: 50, - data: e.y.map(val => val.name), + data: ['实际产量','目标产量'], textStyle: { color: "#f9f9f9", borderColor: "#fff", @@ -660,7 +660,7 @@ export default { opacity: 0.3, }, }, - data: e.x, + data: e.map(val=>val.X_VALUE), }, ], yAxis: [ @@ -698,7 +698,7 @@ export default { ], series: [ { - name: e.y[0].name, + name: '实际产量', type: "bar", barWidth: '70%', label: { @@ -714,7 +714,7 @@ export default { barBorderRadius: 5, color: function (val) { console.log() - if (e.y[0].data[val.dataIndex] >= e.y[1].data[val.dataIndex]) { + if (e[val.dataIndex].Y_VALUE_ONE >= e[val.dataIndex].Y_VALUE_TWO) { return '#30e391' } else { return '#FE70A6' @@ -723,10 +723,10 @@ export default { }, }, }, - data: e.y[0].data, + data: e.map(val=>val.Y_VALUE_ONE), }, { - name: e.y[1].name, + name: '目标产量', type: "line", // smooth: true, //是否平滑曲线显示 // symbol:'circle', // 默认是空心圆（中间是白色的），改成实心圆 @@ -755,7 +755,7 @@ export default { // tooltip: { // show: false // }, - data: e.y[1].data, + data: e.map(val=>val.Y_VALUE_TWO), }, ], }) @@ -770,7 +770,7 @@ export default { }, { e: 'cp-2-03', - i: "", + i: "scada_cp_zj_01('CX_02')", f: (e) => { this.$refs.chart2.setData({ grid: { @@ -791,7 +791,7 @@ export default { }, legend: { itemWidth: 3 * vw, - data: e.y.map(val => val.name), + data: ['不良数','一次不合格率','目标'], textStyle: { color: "#d1e6eb", margin: 15, @@ -809,7 +809,7 @@ export default { }, }, type: 'category', - data: e.x, + data: e.map(val=>val.X_VALUE), axisPointer: { type: 'shadow' } @@ -851,13 +851,13 @@ export default { ], series: [ { - name: e.y[0].name, + name: '不良数', type: 'bar', itemStyle: { normal: { color: function (val) { console.log() - if (e.y[1].data[val.dataIndex] < e.y[2].data[val.dataIndex]) { + if (e[val.dataIndex].Y_VALUE_TWO < 3) { return '#30e391' } else { return '#FE70A6' @@ -866,7 +866,7 @@ export default { }, }, }, - data: e.y[0].data, + data: e.map(val=>val.Y_VALUE_ONE), label: { show: true, position: 'top', @@ -877,10 +877,10 @@ export default { }, }, { - name: e.y[1].name, + name: '不合格率', type: 'line', yAxisIndex: 1, - data: e.y[1].data, + data: e.map(val=>val.Y_VALUE_TWO), itemStyle: { normal: { color: '#F9A25B', @@ -888,10 +888,10 @@ export default { }, }, { - name: e.y[2].name, + name: '目标', type: 'line', yAxisIndex: 1, - data: e.y[2].data, + data: e.map(val=>3), itemStyle: { normal: { color: '#0DB99D', @@ -911,9 +911,10 @@ export default { }, { e: 'cp-2-05', - i: "", + i: "scada_cp_rk_jp_01('CX_02')", f: (e) => { - this.loss = e + this.loss = e[0].X_VALUE + this.meter = e[0].Y_VALUE } }, { @@ -925,7 +926,7 @@ export default { }, { e: 'cp-2-07', - i: "", + i: "scada_cp_rk_loss_01('CX_02')", f: (e) => { this.$refs.chart3.setData({ tooltip: { @@ -941,7 +942,7 @@ export default { containLabel: true, }, xAxis: { - data: e.x, + data: e.map(val=>val.X_VALUE), axisLine: { lineStyle: { color: "#0177d4", @@ -1007,7 +1008,7 @@ export default { ), }, }, - data: e.y.data, + data: e.map(val=>val.Y_VALUE), }, ], }) @@ -1015,7 +1016,7 @@ export default { }, { e: 'cp-2-08', - i: "", + i: "scada_cp_rk_order_01('CX_02')", f: (e) => { this.scrollTableData = e } diff --git a/src/views/model/dataCentre.vue b/src/views/model/dataCentre.vue index a8c5e84..f265d1f 100644 --- a/src/views/model/dataCentre.vue +++ b/src/views/model/dataCentre.vue @@ -9,6 +9,7 @@
{{ time }}
{{ date }}
+ 合计：{{ hj }}
@@ -87,12 +88,13 @@ export default { name: '南海诸岛', value: Math.random() * 200 }], + hj:1000, title: [ '三日清单', '产品发布', '场景升级', '重点工序监控', - '订单履约率（周）', + '订单履约率', '产品市场', '用户评价', '质量分析',