From 586ac82a0934b36581712fb6b4474ab9ed90fb66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com> Date: Sat, 13 Jan 2024 18:24:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/board/getData.js | 2 + src/api/board/mixData.js | 10 +- src/views/board/caseShell/index2.vue | 16 +- src/views/board/finalAssembly/index.vue | 81 +++++--- src/views/board/foaming/index.vue | 260 +++++++++++++----------- src/views/board/foaming/index2.vue | 49 +++-- src/views/board/liner/index.vue | 4 +- src/views/board/pourInto/index2.vue | 118 +++++------ src/views/board/scanDown/index.vue | 95 +++++---- src/views/board/week/index.vue | 80 +++++--- src/views/model/equipment.vue | 212 +++++++++++++++++-- src/views/model/live.vue | 90 +++++--- 12 files changed, 660 insertions(+), 357 deletions(-) diff --git a/src/api/board/getData.js b/src/api/board/getData.js index 94f0e2b..100af82 100644 --- a/src/api/board/getData.js +++ b/src/api/board/getData.js @@ -41,3 +41,5 @@ export function getCurrentTeamTimeList(query) { data: query }) } + + diff --git a/src/api/board/mixData.js b/src/api/board/mixData.js index b57404d..9c42110 100644 --- a/src/api/board/mixData.js +++ b/src/api/board/mixData.js @@ -1,4 +1,4 @@ -import {generalInterfaceList, getSimulateData} from '@/api/board/getData' +import {generalInterfaceList, getFoamingData, getSimulateData} from '@/api/board/getData' let screenData = (e) => { if (e.data !== undefined) { @@ -24,6 +24,14 @@ export function mixData(params) { }))(screenData(val2) || []) }) } + if (type === 2) { + getFoamingData({ + "PRODUCT_LINE_CODE": "CX_01" + }).then(val2 => { + (params?.f || (() => { + }))(screenData(val2) || []) + }) + } } }) diff --git a/src/views/board/caseShell/index2.vue b/src/views/board/caseShell/index2.vue index fb7492d..6ab4f81 100644 --- a/src/views/board/caseShell/index2.vue +++ b/src/views/board/caseShell/index2.vue @@ -21,10 +21,13 @@ 产品型号
- 前板计划 + 计划数量
- 后板计划 + 前板完成 +
+
+ 后板完成
生产进度 @@ -43,18 +46,21 @@
{{ item.COLUMN_B }}
-
+
{{ item.COLUMN_C }}
{{ item.COLUMN_D }}
-
+
{{ item.COLUMN_E }}
{{ item.COLUMN_F }}
+
+ {{ item.COLUMN_G }} +
@@ -807,7 +813,7 @@ export default { text-overflow: ellipsis; text-align: center; display: inline-block; - width: calc(100% / 6); + width: calc(100% / 7); } .chart1 { diff --git a/src/views/board/finalAssembly/index.vue b/src/views/board/finalAssembly/index.vue index 0ce4005..d3d08b3 100644 --- a/src/views/board/finalAssembly/index.vue +++ b/src/views/board/finalAssembly/index.vue @@ -21,28 +21,28 @@
-
+
序号
-
+
订单号
-
+
产品型号
-
- 计划数量 +
+ 订单数量
-
- 当日上线数量 -
-
+
订单上线数量
-
+
+ 当日上线数量 +
+
上线进度
-
+
计划时间
@@ -59,35 +59,35 @@ >
- {{ item.value1 }} + class="scrollTableItem" style="width:5%"> + {{ index + 1 }}
+ class="scrollTableItem" style="width:15%"> {{ item.value1 }}
+ class="scrollTableItem" style="width:17.5%"> {{ item.value2 }}
+ class="scrollTableItem" style="width:12.5%"> {{ item.value3 }}
+ class="scrollTableItem" style="width:12.5%"> {{ item.value4 }}
- {{ item.value4 }} + class="scrollTableItem" style="width:12.5%"> + {{ item.value7 }}
+ class="scrollTableItem" style="width:12.5%"> {{ item.value5 }}
+ class="scrollTableItem" style="width:12.5%"> {{ item.value6 }}
@@ -141,7 +141,7 @@ export default { info: {}, scrollTableOption: { step: 0.5, // 数值越大速度滚动越快 - limitMoveNum: 5, // 开始无缝滚动的数据量 this.dataList.length + limitMoveNum: 10, // 开始无缝滚动的数据量 this.dataList.length hoverStop: true, // 是否开启鼠标悬停stop direction: 1, // 0向下 1向上 2向左 3向右 openWatch: true, // 开启数据实时监控刷新dom @@ -211,6 +211,22 @@ export default { { name: "数量", type: "bar", + label: { + normal: { + show: true, + formatter: (e) => { + if (e.data === 0) { + return '' + } else { + return e.data + } + }, + fontSize: 12, + fontWeight: "bold", + color: "#ffffff", + position: "top", + }, + }, barWidth: "30%", barMaxWidth: 50, itemStyle: { @@ -273,7 +289,7 @@ export default { fontSize: 10, }, splitLine: { - show: true, + show: false, lineStyle: { color: "#2d3d53", }, @@ -284,6 +300,7 @@ export default { { type: "bar", barWidth: '40%', + barMaxWidth: 50, itemStyle: { normal: { color: new echarts.graphic.LinearGradient( @@ -441,9 +458,10 @@ export default { top: 21%; left: 88.5%; transform: translate(-50%, -50%); - font-size: 1.8vw; + font-size: 3.6vw; letter-spacing: 4px; color: #d6eaed; + font-weight: 600; } .info1Title { @@ -451,7 +469,7 @@ export default { top: 11.1%; left: 23%; width: 24%; - font-size: 1vw; + font-size: 1.2vw; color: #fff9; text-align: left; } @@ -462,7 +480,7 @@ export default { top: 11.1%; left: 52.7%; width: 24%; - font-size: 1vw; + font-size: 1.2vw; color: #fff9; text-align: left; } @@ -473,7 +491,7 @@ export default { top: 14.8%; left: 23%; width: 24%; - font-size: 1vw; + font-size: 1.2vw; color: #fff9; text-align: left; } @@ -484,7 +502,7 @@ export default { top: 14.8%; left: 52.7%; width: 24%; - font-size: 1vw; + font-size: 1.2vw; color: #fff9; text-align: left; } @@ -495,7 +513,7 @@ export default { top: 18.4%; left: 23%; width: 24%; - font-size: 1vw; + font-size: 1.2vw; color: #fff9; text-align: left; } @@ -505,19 +523,18 @@ export default { top: 18.3%; left: 52.7%; width: 24%; - font-size: 1vw; + font-size: 1.2vw; color: #fff9; text-align: left; } - .info7Title { position: absolute; top: 22%; left: 23%; width: 24%; - font-size: 1vw; + font-size: 1.2vw; color: #fff9; text-align: left; } diff --git a/src/views/board/foaming/index.vue b/src/views/board/foaming/index.vue index b76fbab..6b1ebef 100644 --- a/src/views/board/foaming/index.vue +++ b/src/views/board/foaming/index.vue @@ -71,8 +71,8 @@ D
-
东线
-
西线
+
东线
+
西线
注射压力标准范围：10.0-14.0Mpa A、B组份枪头压力差≤1Mpa
发泡料温度标准范围:18.0-24.0℃
@@ -510,10 +510,11 @@ export default { barWidth: "40%", label: { show: true, - formatter:(e)=>{ - if(e.data === 0){ + formatter: (e) => { + if (e.data === 0) { return '' - }else{} + } else { + } return e.data }, position: "top", @@ -545,12 +546,10 @@ export default { { e: 'fp-1-05', i: "SCADA_INV_STATS_01('')", + t:2, f: (e) => { - // this.scrollTableData1 = e - getFoamingData({ - "PRODUCT_LINE_CODE": "CX_01" - }).then(e => { - let table = e.data?.map(val => { + console.log(JSON.stringify(e)) + let table = e.map(val => { return { value1: val.EQUIPMENT_CODE, value2: val.FIXTUREBOXTYPE, @@ -558,7 +557,7 @@ export default { value4: val.TARGET, value5: val.PLAN_SUM, value6: val.PRO_SUM, - value7: (val.PLAN_SUM === 0 ? 0 :((val.PRO_SUM / val.PLAN_SUM) * 100).toFixed(2) )+ '%', + value7: (val.PLAN_SUM === 0 ? 0 : ((val.PRO_SUM / val.PLAN_SUM) * 100).toFixed(2)) + '%', value8: val.ANHOUR, value9: val.TWOHOUR, value10: val.THREEHOUR, @@ -593,10 +592,7 @@ export default { value15: totalArr.map(val => val.value18).reduce((acc, curr) => acc + curr, 0), value16: totalArr.map(val => val.value19).reduce((acc, curr) => acc + curr, 0), } - }) - - - } + } }, { e: 'fp-1-06', @@ -667,10 +663,11 @@ export default { barWidth: "30%", label: { show: true, - formatter:(e)=>{ - if(e.data === 0){ + formatter: (e) => { + if (e.data === 0) { return '' - }else{} + } else { + } return e.data }, position: "top", @@ -708,10 +705,11 @@ export default { barGap: '40%', label: { show: true, - formatter:(e)=>{ - if(e.data === 0){ + formatter: (e) => { + if (e.data === 0) { return '' - }else{} + } else { + } return e.data }, position: "top", @@ -865,10 +863,11 @@ export default { label: { show: true, position: "top", - formatter:(e)=>{ - if(e.data === 0){ + formatter: (e) => { + if (e.data === 0) { return '' - }else{} + } else { + } return e.data }, textStyle: { @@ -901,7 +900,7 @@ export default { shadowBlur: 20, }, }, - data: e.map(val => val.Y_VALUE_ONE), + data: e.map(val => val.Y_VALUE_ONE === 0 ? null : val.Y_VALUE_ONE), }, { name: 'ISO温度', @@ -919,10 +918,11 @@ export default { label: { show: true, position: "top", - formatter:(e)=>{ - if(e.data === 0){ + formatter: (e) => { + if (e.data === 0) { return '' - }else{} + } else { + } return e.data }, textStyle: { @@ -956,7 +956,7 @@ export default { shadowBlur: 20, }, }, - data: e.map(val => val.Y_VALUE_TWO), + data: e.map(val => val.Y_VALUE_TWO === 0 ? null : val.Y_VALUE_TWO), }, ], }) @@ -990,7 +990,7 @@ export default { }, }, axisLabel: { - // interval: 0, + interval: 0, // rotate: 40, textStyle: { fontFamily: "Microsoft YaHei", @@ -1018,10 +1018,11 @@ export default { type: "bar", barWidth: "33%", label: { - formatter:(e)=>{ - if(e.data === 0){ + formatter: (e) => { + if (e.data === 0) { return '' - }else{} + } else { + } return e.data }, show: true, @@ -1066,6 +1067,7 @@ export default { f: (e) => { this.planNum = e[0].X_VALUE this.practicalNum = e[0].Y_VALUE_ONE + this.differenceNum = e[0].Y_VALUE_TWO } }, { @@ -1132,10 +1134,11 @@ export default { barMaxWidth: 40, label: { show: true, - formatter:(e)=>{ - if(e.data === 0){ + formatter: (e) => { + if (e.data === 0) { return '' - }else{} + } else { + } return e.data }, position: "top", @@ -1168,55 +1171,50 @@ export default { e: 'fp-2-05', i: "SCADA_INV_STATS_02('')", f: (e) => { - // this.scrollTableData1 = e - getFoamingData({ - "PRODUCT_LINE_CODE": "CX_02" - }).then(e => { - let table = e.data?.map(val => { - return { - value1: val.EQUIPMENT_CODE, - value2: val.FIXTUREBOXTYPE, - value3: val.FIXTURESTATUS, - value4: val.TARGET, - value5: val.PLAN_SUM, - value6: val.PRO_SUM, - value7: (val.PLAN_SUM === 0 ? 0 :((val.PRO_SUM / val.PLAN_SUM) * 100).toFixed(2) )+ '%', - value8: val.ANHOUR, - value9: val.TWOHOUR, - value10: val.THREEHOUR, - value11: val.FOURHOUR, - value12: val.FIVEHOUR, - value13: val.SIXHOUR, - value14: val.SEVENHOUR, - value15: val.EIGHTHOUR, - value16: val.NINEHOUR, - value17: val.TENHOUR, - value18: val.ELEVENHOUR, - value19: val.TWELVEHOUR, - } - }) - - this.scrollTableData1 = table - let totalArr = table - this.total = { - value1: ((totalArr.filter(val => val.value3 === '生产中').length / 6) * 100).toFixed(2), - value2: totalArr.map(val => val.value5).reduce((acc, curr) => acc + curr, 0), - value3: totalArr.map(val => val.value6).reduce((acc, curr) => acc + curr, 0), - value4: totalArr.map(val => val.value4).reduce((acc, curr) => acc + curr, 0) === 0 ? 0 : ((totalArr.map(val => val.value6).reduce((acc, curr) => acc + curr, 0) / totalArr.map(val => val.value4).reduce((acc, curr) => acc + curr, 0)) * 100).toFixed(2), - value5: totalArr.map(val => val.value8).reduce((acc, curr) => acc + curr, 0), - value6: totalArr.map(val => val.value9).reduce((acc, curr) => acc + curr, 0), - value7: totalArr.map(val => val.value10).reduce((acc, curr) => acc + curr, 0), - value8: totalArr.map(val => val.value11).reduce((acc, curr) => acc + curr, 0), - value9: totalArr.map(val => val.value12).reduce((acc, curr) => acc + curr, 0), - value10: totalArr.map(val => val.value13).reduce((acc, curr) => acc + curr, 0), - value11: totalArr.map(val => val.value14).reduce((acc, curr) => acc + curr, 0), - value12: totalArr.map(val => val.value15).reduce((acc, curr) => acc + curr, 0), - value13: totalArr.map(val => val.value16).reduce((acc, curr) => acc + curr, 0), - value14: totalArr.map(val => val.value17).reduce((acc, curr) => acc + curr, 0), - value15: totalArr.map(val => val.value18).reduce((acc, curr) => acc + curr, 0), - value16: totalArr.map(val => val.value19).reduce((acc, curr) => acc + curr, 0), + console.log(e) + let table = e.map(val => { + return { + value1: val.EQUIPMENT_CODE, + value2: val.FIXTUREBOXTYPE, + value3: val.FIXTURESTATUS, + value4: val.TARGET, + value5: val.PLAN_SUM, + value6: val.PRO_SUM, + value7: (val.PLAN_SUM === 0 ? 0 : ((val.PRO_SUM / val.PLAN_SUM) * 100).toFixed(2)) + '%', + value8: val.ANHOUR, + value9: val.TWOHOUR, + value10: val.THREEHOUR, + value11: val.FOURHOUR, + value12: val.FIVEHOUR, + value13: val.SIXHOUR, + value14: val.SEVENHOUR, + value15: val.EIGHTHOUR, + value16: val.NINEHOUR, + value17: val.TENHOUR, + value18: val.ELEVENHOUR, + value19: val.TWELVEHOUR, } }) + this.scrollTableData1 = table + let totalArr = table + this.total = { + value1: ((totalArr.filter(val => val.value3 === '生产中').length / 6) * 100).toFixed(2), + value2: totalArr.map(val => val.value5).reduce((acc, curr) => acc + curr, 0), + value3: totalArr.map(val => val.value6).reduce((acc, curr) => acc + curr, 0), + value4: totalArr.map(val => val.value5).reduce((acc, curr) => acc + curr, 0) === 0 ? 0 : ((totalArr.map(val => val.value6).reduce((acc, curr) => acc + curr, 0) / totalArr.map(val => val.value5).reduce((acc, curr) => acc + curr, 0)) * 100).toFixed(2), + value5: totalArr.map(val => val.value8).reduce((acc, curr) => acc + curr, 0), + value6: totalArr.map(val => val.value9).reduce((acc, curr) => acc + curr, 0), + value7: totalArr.map(val => val.value10).reduce((acc, curr) => acc + curr, 0), + value8: totalArr.map(val => val.value11).reduce((acc, curr) => acc + curr, 0), + value9: totalArr.map(val => val.value12).reduce((acc, curr) => acc + curr, 0), + value10: totalArr.map(val => val.value13).reduce((acc, curr) => acc + curr, 0), + value11: totalArr.map(val => val.value14).reduce((acc, curr) => acc + curr, 0), + value12: totalArr.map(val => val.value15).reduce((acc, curr) => acc + curr, 0), + value13: totalArr.map(val => val.value16).reduce((acc, curr) => acc + curr, 0), + value14: totalArr.map(val => val.value17).reduce((acc, curr) => acc + curr, 0), + value15: totalArr.map(val => val.value18).reduce((acc, curr) => acc + curr, 0), + value16: totalArr.map(val => val.value19).reduce((acc, curr) => acc + curr, 0), + } } }, { @@ -1289,10 +1287,11 @@ export default { label: { show: true, position: "top", - formatter:(e)=>{ - if(e.data === 0){ + formatter: (e) => { + if (e.data === 0) { return '' - }else{} + } else { + } return e.data }, textStyle: { @@ -1330,10 +1329,11 @@ export default { barGap: '40%', label: { show: true, - formatter:(e)=>{ - if(e.data === 0){ + formatter: (e) => { + if (e.data === 0) { return '' - }else{} + } else { + } return e.data }, position: "top", @@ -1486,10 +1486,11 @@ export default { }, label: { show: true, - formatter:(e)=>{ - if(e.data === 0){ + formatter: (e) => { + if (e.data === 0) { return '' - }else{} + } else { + } return e.data }, position: "top", @@ -1523,7 +1524,7 @@ export default { shadowBlur: 20, }, }, - data: e.map(val => val.Y_VALUE_ONE), + data: e.map(val => val.Y_VALUE_ONE === 0 ? null : val.Y_VALUE_ONE), }, { name: 'ISO温度', @@ -1540,10 +1541,11 @@ export default { }, label: { show: true, - formatter:(e)=>{ - if(e.data === 0){ + formatter: (e) => { + if (e.data === 0) { return '' - }else{} + } else { + } return e.data }, position: "top", @@ -1578,7 +1580,7 @@ export default { shadowBlur: 20, }, }, - data: e.map(val => val.Y_VALUE_TWO), + data: e.map(val => val.Y_VALUE_TWO === 0 ? null : val.Y_VALUE_TWO), }, ], }) @@ -1612,7 +1614,7 @@ export default { }, }, axisLabel: { - // interval: 0, + interval: 0, // rotate: 40, textStyle: { fontFamily: "Microsoft YaHei", @@ -1641,10 +1643,11 @@ export default { barWidth: "33%", label: { show: true, - formatter:(e)=>{ - if(e.data === 0){ + formatter: (e) => { + if (e.data === 0) { return '' - }else{} + } else { + } return e.data }, position: "top", @@ -2027,101 +2030,112 @@ export default { background: #00ff00; border-radius: 50%; } -.left1{ + +.left1 { background-image: url("../../../assets/board/left.png"); background-repeat: no-repeat; background-size: 100% 100%; position: absolute; - transform: translate(-50%,-50%); + transform: translate(-50%, -50%); top: 38%; left: 32%; width: 5vw; height: 4.05vw; - span{ + + span { position: absolute; - transform: translate(-50%,-50%); + transform: translate(-50%, -50%); top: 28%; left: 43%; font-size: 1vw; color: #fff; } } -.left2{ + +.left2 { background-image: url("../../../assets/board/right.png"); background-repeat: no-repeat; background-size: 100% 100%; position: absolute; - transform: translate(-50%,-50%); + transform: translate(-50%, -50%); top: 49%; left: 55%; width: 5vw; height: 2.86vw; - span{ + + span { position: absolute; - transform: translate(-50%,-50%); + transform: translate(-50%, -50%); top: 37%; left: 57%; font-size: 1vw; color: #fff; } } -.right1{ + +.right1 { background-image: url("../../../assets/board/right.png"); background-repeat: no-repeat; background-size: 100% 100%; position: absolute; - transform: translate(-50%,-50%); + transform: translate(-50%, -50%); top: 36%; left: 57%; width: 5vw; height: 2.86vw; - span{ + + span { position: absolute; - transform: translate(-50%,-50%); + transform: translate(-50%, -50%); top: 37%; left: 57%; font-size: 1vw; color: #fff; } } -.right2{ + +.right2 { background-image: url("../../../assets/board/right.png"); background-repeat: no-repeat; background-size: 100% 100%; position: absolute; - transform: translate(-50%,-50%); + transform: translate(-50%, -50%); top: 39%; left: 68%; width: 5vw; height: 2.86vw; - span{ + + span { position: absolute; - transform: translate(-50%,-50%); + transform: translate(-50%, -50%); top: 37%; left: 57%; font-size: 1vw; color: #fff; } } -.chartSpan1{ + +.chartSpan1 { position: absolute; - transform: translate(-50%,-50%); + transform: translate(-50%, -50%); top: 94.3%; left: 73%; font-size: 0.8vw; color: #fff; } -.chartSpan1{ + +.chartSpan1 { position: absolute; - transform: translate(-50%,-50%); + transform: translate(-50%, -50%); top: 94.3%; left: 73%; font-size: 0.8vw; color: #fff; } -.chartSpan2{ + +.chartSpan2 { position: absolute; - transform: translate(-50%,-50%); + transform: translate(-50%, -50%); top: 94.3%; left: 96%; font-size: 0.8vw; diff --git a/src/views/board/foaming/index2.vue b/src/views/board/foaming/index2.vue index f740631..b63b021 100644 --- a/src/views/board/foaming/index2.vue +++ b/src/views/board/foaming/index2.vue @@ -11,14 +11,15 @@ }}
- {{ (['0', '0', '0', '0']).concat((Math.abs(practicalNum - planNum)).toString().split('')).slice(-4).join('') }} + {{ (['0', '0', '0', '0']).concat(differenceNum.toString().split('')).slice(-4).join('') }}
{{ i }}
-
发泡线状态：
-
发泡机状态：
+
设备状态：
+
发泡线状态：
+
发泡机状态：
-
+
序号
-
+
型号
-
+
扫描时间
@@ -59,13 +60,13 @@ style="height: 84%;overflow: hidden;">
-
+
{{ item.COLUMN_A }}
-
+
{{ item.COLUMN_B }}
-
+
{{ item.COLUMN_C }}
@@ -146,6 +147,7 @@ import * as echarts from 'echarts' import {getData} from "@/api/board/getData"; import {mixData} from "@/api/board/mixData"; +let intervalFun = null export default { components: { vueSeamlessScroll, @@ -193,9 +195,9 @@ export default { }, ], show: 0, - planNum: 1000, - practicalNum: 1000, - differenceValue: 1000, + planNum: 0, + practicalNum: 0, + differenceNum:0, scrollTableOption: { step: 0.5, // 数值越大速度滚动越快 limitMoveNum: 9999999999, // 开始无缝滚动的数据量 this.dataList.length @@ -679,7 +681,7 @@ export default { }, }, axisLabel: { - // interval: 0, + interval: 0, // rotate: 40, textStyle: { fontFamily: "Microsoft YaHei", @@ -747,6 +749,7 @@ export default { console.log(e) this.planNum = e[0]?.X_VALUE || 0 this.practicalNum = e[0]?.Y_VALUE_ONE || 0 + this.differenceNum = e[0]?.Y_VALUE_TWO || 0 } }, { @@ -771,6 +774,18 @@ export default { this.RequestDataSet.forEach(val => { mixData(val) }) + intervalFun = setInterval(() => { + this.RequestDataSet.forEach(val => { + mixData(val) + }) + }, 1000 * 10) + }, + beforeDestroy() { + console.log(1) + if(intervalFun){ + clearInterval(intervalFun) + intervalFun = null + } }, methods: { setColor: (e, i) => { @@ -904,8 +919,8 @@ export default { .status1 { position: absolute; transform: translate(-50%, -50%); - top: 24.4%; - left: 36%; + top: 27.4%; + left: 37.5%; width: 1.5vw; height: 1.5vw; background: #00ff00; @@ -915,8 +930,8 @@ export default { .status2 { position: absolute; transform: translate(-50%, -50%); - top: 28.2%; - left: 36%; + top: 32.2%; + left: 37.5%; width: 1.5vw; height: 1.5vw; background: #00ff00; diff --git a/src/views/board/liner/index.vue b/src/views/board/liner/index.vue index e7ba365..701ca55 100644 --- a/src/views/board/liner/index.vue +++ b/src/views/board/liner/index.vue @@ -4,7 +4,7 @@
{{ team }}
{{ planNum }}
{{ practicalNum }}
-
{{ planNum - practicalNum }}
+
{{ differenceNum }}
{{ i }} @@ -141,6 +141,7 @@ export default { team: '', planNum: 0, practicalNum: 0, + differenceNum:0, scrollTableOption: { step: 0.5, limitMoveNum: 9999999999, @@ -160,6 +161,7 @@ export default { this.team = e[0].COLUMN_A this.planNum = e[0].COLUMN_B this.practicalNum = e[0].COLUMN_C + this.differenceNum = e[0].COLUMN_D } }, { diff --git a/src/views/board/pourInto/index2.vue b/src/views/board/pourInto/index2.vue index c04dd62..d2d2e7b 100644 --- a/src/views/board/pourInto/index2.vue +++ b/src/views/board/pourInto/index2.vue @@ -1,6 +1,6 @@