projects/mesxc-zhp
do větve projects/mesxc-test
před před 6 měsíci
@@ -1,7 +1,7 @@ | |||||
### | ### | ||||
# @Author: Do not edit | # @Author: Do not edit | ||||
# @Date: 2023-08-29 09:40:39 | # @Date: 2023-08-29 09:40:39 | ||||
# @LastEditTime: 2024-03-13 08:40:35 | |||||
# @LastEditTime: 2024-03-13 14:57:16 | |||||
# @LastEditors: zhp | # @LastEditors: zhp | ||||
# @Description: | # @Description: | ||||
### | ### | ||||
@@ -25,7 +25,7 @@ VUE_APP_BASE_API = 'http://192.168.0.33:48082' | |||||
# VUE_APP_BASE_API = 'http://192.168.1.78:48082' | # VUE_APP_BASE_API = 'http://192.168.1.78:48082' | ||||
# VUE_APP_BASE_API = 'http://192.168.1.47:48082' | # VUE_APP_BASE_API = 'http://192.168.1.47:48082' | ||||
# socket地址 | # socket地址 | ||||
VUE_APP_Socket_API = 'ws://192.168.0.33:48082' | |||||
VUE_APP_Socket_API = 'ws://192.168.0.30:8888' | |||||
VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081' | VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081' | ||||
# 积木报表指向地址 | # 积木报表指向地址 | ||||
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Author: zhp | * @Author: zhp | ||||
* @Date: 2024-01-24 15:15:24 | * @Date: 2024-01-24 15:15:24 | ||||
* @LastEditTime: 2024-03-11 15:51:20 | |||||
* @LastEditTime: 2024-03-13 15:21:30 | |||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @Description: | * @Description: | ||||
--> | --> | ||||
@@ -100,11 +100,13 @@ export default { | |||||
await this.urlOptions.getDataListURL(this.listQuery).then(response => { | await this.urlOptions.getDataListURL(this.listQuery).then(response => { | ||||
this.tableData = response.data.filter(item => { | this.tableData = response.data.filter(item => { | ||||
this.proLineList.forEach(it => { | this.proLineList.forEach(it => { | ||||
if (item.lineId === it.id) { | |||||
if (item.lineId === it.id) { | |||||
item.lineName = it.name | item.lineName = it.name | ||||
item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? item.originalGlassStatisticsTrend + '%' : null | |||||
item.actualProductTrend = item.actualProductTrend ? item.actualProductTrend + '%' : null | |||||
item.originalGlassPassTrend = item.originalGlassPassTrend ? item.originalGlassPassTrend * 100 + '%' : null | |||||
item.dailyOutputTrend = item.dailyOutputTrend ? parseFloat((item.dailyOutputTrend * 100).toFixed(2)) + '%' : null | |||||
item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null | |||||
item.actualProductTrend = item.actualProductTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null | |||||
item.originalGlassPassTrend = item.originalGlassPassTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null | |||||
} | } | ||||
}) | }) | ||||
if (item.det === false) { | if (item.det === false) { | ||||
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Author: Do not edit | * @Author: Do not edit | ||||
* @Date: 2023-12-13 14:10:04 | * @Date: 2023-12-13 14:10:04 | ||||
* @LastEditTime: 2024-03-11 16:10:25 | |||||
* @LastEditTime: 2024-03-13 15:27:43 | |||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @Description: | * @Description: | ||||
--> | --> | ||||
@@ -197,6 +197,12 @@ const cols = [ | |||||
}, | }, | ||||
methods: { | methods: { | ||||
updateData() { | updateData() { | ||||
this.data.forEach((ele, index) => { | |||||
delete ele.dailyOutputTrend | |||||
delete ele.originalGlassStatisticsTrend | |||||
delete ele.actualProductTrend | |||||
delete ele.originalGlassPassTrend | |||||
}); | |||||
updateGlass(this.data).then(response => { | updateGlass(this.data).then(response => { | ||||
updateGlassRemark(this.sum).then(res => { | updateGlassRemark(this.sum).then(res => { | ||||
this.$modal.msgSuccess("修改成功"); | this.$modal.msgSuccess("修改成功"); | ||||
@@ -81,9 +81,10 @@ export default { | |||||
this.proLineList.forEach(it => { | this.proLineList.forEach(it => { | ||||
if (item.lineId === it.id) { | if (item.lineId === it.id) { | ||||
item.lineName = it.name | item.lineName = it.name | ||||
item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? item.originalGlassStatisticsTrend + '%' : null | |||||
item.actualProductTrend = item.actualProductTrend ? item.actualProductTrend + '%' : null | |||||
item.originalGlassPassTrend = item.originalGlassPassTrend ? item.originalGlassPassTrend * 100 + '%' : null | |||||
item.dailyOutputTrend = item.dailyOutputTrend ? parseFloat((item.dailyOutputTrend * 100).toFixed(2)) + '%' : null | |||||
item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null | |||||
item.actualProductTrend = item.actualProductTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null | |||||
item.originalGlassPassTrend = item.originalGlassPassTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null | |||||
} | } | ||||
}) | }) | ||||
if (item.det === false) { | if (item.det === false) { | ||||
@@ -172,9 +172,10 @@ export default { | |||||
this.proLineList.forEach(it => { | this.proLineList.forEach(it => { | ||||
if (item.lineId === it.id) { | if (item.lineId === it.id) { | ||||
item.lineName = it.name | item.lineName = it.name | ||||
item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? item.originalGlassStatisticsTrend + '%' : null | |||||
item.actualProductTrend = item.actualProductTrend ? item.actualProductTrend + '%' : null | |||||
item.originalGlassPassTrend = item.originalGlassPassTrend ? item.originalGlassPassTrend * 100 + '%' : null | |||||
item.dailyOutputTrend = item.dailyOutputTrend ? parseFloat((item.dailyOutputTrend * 100).toFixed(2)) + '%' : null | |||||
item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null | |||||
item.actualProductTrend = item.actualProductTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null | |||||
item.originalGlassPassTrend = item.originalGlassPassTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null | |||||
} | } | ||||
}) | }) | ||||
if (item.det === false) { | if (item.det === false) { | ||||
@@ -82,9 +82,10 @@ export default { | |||||
this.tableData = response.data.filter(item => { | this.tableData = response.data.filter(item => { | ||||
this.proLineList.forEach(it => { | this.proLineList.forEach(it => { | ||||
if (item.lineId === it.id) { | if (item.lineId === it.id) { | ||||
item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? item.originalGlassStatisticsTrend + '%' : null | |||||
item.actualProductTrend = item.actualProductTrend ? item.actualProductTrend + '%' : null | |||||
item.originalGlassPassTrend = item.originalGlassPassTrend ? item.originalGlassPassTrend * 100 + '%' : null | |||||
item.dailyOutputTrend = item.dailyOutputTrend ? parseFloat((item.dailyOutputTrend * 100).toFixed(2)) + '%' : null | |||||
item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null | |||||
item.actualProductTrend = item.actualProductTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null | |||||
item.originalGlassPassTrend = item.originalGlassPassTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null | |||||
item.lineName = it.name | item.lineName = it.name | ||||
} | } | ||||
}) | }) | ||||
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Author: zhp | * @Author: zhp | ||||
* @Date: 2023-12-12 13:45:25 | * @Date: 2023-12-12 13:45:25 | ||||
* @LastEditTime: 2024-03-12 11:17:53 | |||||
* @LastEditTime: 2024-03-13 15:28:18 | |||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @Description: | * @Description: | ||||
--> | --> | ||||
@@ -47,7 +47,8 @@ | |||||
<el-table-column prop="inputTrend" label="增减" align="center"> | <el-table-column prop="inputTrend" label="增减" align="center"> | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input> | <el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input> | ||||
<span v-else>{{ scope.row.inputTrend ? scope.row.inputTrend + '%' : undefined}} </span> | |||||
<span v-else>{{ scope.row.inputTrend ? parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : | |||||
undefined}} </span> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
</el-table-column> | </el-table-column> | ||||
@@ -70,7 +71,8 @@ | |||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled"> | <el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled"> | ||||
</el-input> | </el-input> | ||||
<span v-else>{{ scope.row.goodProductTrend ? scope.row.goodProductTrend + '%' : undefined }} </span> | |||||
<span v-else>{{ scope.row.goodProductTrend ? parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + | |||||
'%' : undefined }} </span> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
</el-table-column> | </el-table-column> | ||||
@@ -91,7 +93,8 @@ | |||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled"> | <el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled"> | ||||
</el-input> | </el-input> | ||||
<span v-else>{{ scope.row.missCheckTrend ? scope.row.missCheckTrend + '%' : undefined }} </span> | |||||
<span v-else>{{ scope.row.missCheckTrend ? parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : | |||||
undefined }} </span> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
</el-table-column> | </el-table-column> | ||||
@@ -114,7 +117,9 @@ | |||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled"> | <el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled"> | ||||
</el-input> | </el-input> | ||||
<span v-else>{{ scope.row.goodProductPassTrend ? scope.row.goodProductPassTrend + '%' : undefined }} | |||||
<span v-else>{{ scope.row.goodProductPassTrend ? parseFloat((scope.row.goodProductPassTrend * | |||||
100).toFixed(2)) + | |||||
'%' : undefined }} | |||||
</span> | </span> | ||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
@@ -527,10 +532,16 @@ export default { | |||||
} | } | ||||
}) | }) | ||||
let updateArr = this.list | let updateArr = this.list | ||||
updateArr.forEach((ele, index) => { | |||||
delete ele.inputTrend | |||||
delete ele.goodProductTrend | |||||
delete ele.missCheckTrend | |||||
delete ele.goodProductPassTrend | |||||
}); | |||||
// console.log(JSON.stringify(updateArr[1])) | // console.log(JSON.stringify(updateArr[1])) | ||||
const result = await Promise.all([ | const result = await Promise.all([ | ||||
await updateSumProductionDataList(obj), | await updateSumProductionDataList(obj), | ||||
await updateProductionDataList(updateArr), | |||||
await updateProductionDataList(updateArr) | |||||
]) | ]) | ||||
console.log(result); | console.log(result); | ||||
if (result[0].data == true && result[1].data == true) { | if (result[0].data == true && result[1].data == true) { | ||||
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Author: zhp | * @Author: zhp | ||||
* @Date: 2023-12-12 13:45:25 | * @Date: 2023-12-12 13:45:25 | ||||
* @LastEditTime: 2024-03-12 11:14:04 | |||||
* @LastEditTime: 2024-03-13 15:29:17 | |||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @Description: | * @Description: | ||||
--> | --> | ||||
@@ -49,7 +49,8 @@ | |||||
<el-table-column prop="inputTrend" label="增减" align="center"> | <el-table-column prop="inputTrend" label="增减" align="center"> | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input> | <el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input> | ||||
<span v-else>{{ scope.row.inputTrend ? scope.row.inputTrend + '%' : undefined }} </span> | |||||
<span v-else>{{ scope.row.inputTrend ? parseFloat((scope.row.inputTrend * | |||||
100).toFixed(2)) + '%' : undefined }} </span> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
</el-table-column> | </el-table-column> | ||||
@@ -72,7 +73,8 @@ | |||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled"> | <el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled"> | ||||
</el-input> | </el-input> | ||||
<span v-else>{{ scope.row.goodProductTrend ? scope.row.goodProductTrend + '%' : undefined }} </span> | |||||
<span v-else>{{ scope.row.goodProductTrend ? parseFloat((scope.row.goodProductTrend * | |||||
100).toFixed(2)) + '%' : undefined }} </span> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
</el-table-column> | </el-table-column> | ||||
@@ -93,7 +95,8 @@ | |||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled"> | <el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled"> | ||||
</el-input> | </el-input> | ||||
<span v-else>{{ scope.row.missCheckTrend ? scope.row.missCheckTrend +'%' : undefined }} </span> | |||||
<span v-else>{{ scope.row.missCheckTrend ? parseFloat((scope.row.missCheckTrend * | |||||
100).toFixed(2)) +'%' : undefined }} </span> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
</el-table-column> | </el-table-column> | ||||
@@ -116,7 +119,8 @@ | |||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled"> | <el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled"> | ||||
</el-input> | </el-input> | ||||
<span v-else>{{ scope.row.goodProductPassTrend ? scope.row.goodProductPassTrend + '%' :undefined }} | |||||
<span v-else>{{ scope.row.goodProductPassTrend ? parseFloat((scope.row.goodProductPassTrend * | |||||
100).toFixed(2))+ '%' :undefined }} | |||||
</span> | </span> | ||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
@@ -531,6 +535,12 @@ export default { | |||||
} | } | ||||
}) | }) | ||||
let updateArr = this.list | let updateArr = this.list | ||||
updateArr.forEach((ele, index) => { | |||||
delete ele.inputTrend | |||||
delete ele.goodProductTrend | |||||
delete ele.missCheckTrend | |||||
delete ele.goodProductPassTrend | |||||
}); | |||||
// console.log(JSON.stringify(updateArr[1])) | // console.log(JSON.stringify(updateArr[1])) | ||||
const result = await Promise.all([ | const result = await Promise.all([ | ||||
await updateSumProductionDataList(obj), | await updateSumProductionDataList(obj), | ||||
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Author: zhp | * @Author: zhp | ||||
* @Date: 2023-12-12 13:45:25 | * @Date: 2023-12-12 13:45:25 | ||||
* @LastEditTime: 2024-03-13 10:44:26 | |||||
* @LastEditTime: 2024-03-13 15:29:26 | |||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @Description: | * @Description: | ||||
--> | --> | ||||
@@ -50,7 +50,8 @@ | |||||
<el-table-column prop="inputTrend" label="增减" align="center"> | <el-table-column prop="inputTrend" label="增减" align="center"> | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input> | <el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input> | ||||
<span v-else>{{ scope.row.inputTrend ? scope.row.inputTrend + '%' : undefined }} </span> | |||||
<span v-else>{{ scope.row.inputTrend ? parseFloat((scope.row.inputTrend * | |||||
100).toFixed(2)) + '%' : undefined }} </span> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
</el-table-column> | </el-table-column> | ||||
@@ -73,7 +74,8 @@ | |||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled"> | <el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled"> | ||||
</el-input> | </el-input> | ||||
<span v-else>{{ scope.row.goodProductTrend ? scope.row.goodProductTrend + '%' : undefined }} </span> | |||||
<span v-else>{{ scope.row.goodProductTrend ? parseFloat((scope.row.goodProductTrend * | |||||
100).toFixed(2)) + '%' : undefined }} </span> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
</el-table-column> | </el-table-column> | ||||
@@ -94,7 +96,8 @@ | |||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled"> | <el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled"> | ||||
</el-input> | </el-input> | ||||
<span v-else>{{ scope.row.missCheckTrend ? scope.row.missCheckTrend + '%' : undefined }} </span> | |||||
<span v-else>{{ scope.row.missCheckTrend ? parseFloat((scope.row.missCheckTrend * | |||||
100).toFixed(2)) + '%' : undefined }} </span> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
</el-table-column> | </el-table-column> | ||||
@@ -117,7 +120,8 @@ | |||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled"> | <el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled"> | ||||
</el-input> | </el-input> | ||||
<span v-else>{{ scope.row.goodProductPassTrend ? scope.row.goodProductPassTrend + '%' : undefined }} | |||||
<span v-else>{{ scope.row.goodProductPassTrend ? parseFloat((scope.row.goodProductPassTrend * | |||||
100).toFixed(2)) + '%' :undefined }} | |||||
</span> | </span> | ||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
@@ -501,6 +505,12 @@ export default { | |||||
} | } | ||||
}) | }) | ||||
let updateArr = this.list | let updateArr = this.list | ||||
updateArr.forEach((ele, index) => { | |||||
delete ele.inputTrend | |||||
delete ele.goodProductTrend | |||||
delete ele.missCheckTrend | |||||
delete ele.goodProductPassTrend | |||||
}); | |||||
// console.log(JSON.stringify(updateArr[1])) | // console.log(JSON.stringify(updateArr[1])) | ||||
const result = await Promise.all([ | const result = await Promise.all([ | ||||
await updateSumProductionDataList(obj), | await updateSumProductionDataList(obj), | ||||
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Author: zhp | * @Author: zhp | ||||
* @Date: 2023-12-12 13:45:25 | * @Date: 2023-12-12 13:45:25 | ||||
* @LastEditTime: 2024-03-12 11:15:05 | |||||
* @LastEditTime: 2024-03-13 15:29:35 | |||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @Description: | * @Description: | ||||
--> | --> | ||||
@@ -52,7 +52,8 @@ | |||||
<el-table-column prop="inputTrend" label="增减" align="center"> | <el-table-column prop="inputTrend" label="增减" align="center"> | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input> | <el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input> | ||||
<span v-else>{{ scope.row.inputTrend ? scope.row.inputTrend + '%' : undefined }} </span> | |||||
<span v-else>{{ scope.row.inputTrend ? parseFloat((scope.row.inputTrend * | |||||
100).toFixed(2)) + '%' : undefined }} </span> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
</el-table-column> | </el-table-column> | ||||
@@ -75,7 +76,8 @@ | |||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled"> | <el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled"> | ||||
</el-input> | </el-input> | ||||
<span v-else>{{ scope.row.goodProductTrend ? scope.row.goodProductTrend + '%' : undefined }} </span> | |||||
<span v-else>{{ scope.row.goodProductTrend ? parseFloat((scope.row.goodProductTrend * | |||||
100).toFixed(2)) + '%' : undefined }} </span> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
</el-table-column> | </el-table-column> | ||||
@@ -96,7 +98,8 @@ | |||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled"> | <el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled"> | ||||
</el-input> | </el-input> | ||||
<span v-else>{{ scope.row.missCheckTrend ? scope.row.missCheckTrend + '%' : undefined }} | |||||
<span v-else>{{ scope.row.missCheckTrend ? parseFloat((scope.row.missCheckTrend * | |||||
100).toFixed(2)) + '%' : undefined }} | |||||
</span> | </span> | ||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
@@ -120,7 +123,8 @@ | |||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled"> | <el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled"> | ||||
</el-input> | </el-input> | ||||
<span v-else>{{ scope.row.goodProductPassTrend ? scope.row.goodProductPassTrend + '%' : undefined }} | |||||
<span v-else>{{ scope.row.goodProductPassTrend ? parseFloat((scope.row.goodProductPassTrend * | |||||
100).toFixed(2)) + '%' : undefined }} | |||||
</span> | </span> | ||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
@@ -445,6 +449,12 @@ export default { | |||||
} | } | ||||
}) | }) | ||||
let updateArr = this.list | let updateArr = this.list | ||||
updateArr.forEach((ele, index) => { | |||||
delete ele.inputTrend | |||||
delete ele.goodProductTrend | |||||
delete ele.missCheckTrend | |||||
delete ele.goodProductPassTrend | |||||
}); | |||||
// console.log(JSON.stringify(updateArr[1])) | // console.log(JSON.stringify(updateArr[1])) | ||||
const result = await Promise.all([ | const result = await Promise.all([ | ||||
await updateSumProductionDataList(obj), | await updateSumProductionDataList(obj), | ||||