|
|
|
@ -241,7 +241,7 @@
|
|
|
|
|
</el-table-column>
|
|
|
|
|
</el-table>
|
|
|
|
|
</el-card>
|
|
|
|
|
<el-card class="hl-card-info">
|
|
|
|
|
<!-- <el-card class="hl-card-info">
|
|
|
|
|
<template #header>
|
|
|
|
|
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">各产品合格率(%)</span>
|
|
|
|
|
</template>
|
|
|
|
@ -276,7 +276,7 @@
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
</el-table>
|
|
|
|
|
</el-card>
|
|
|
|
|
</el-card> -->
|
|
|
|
|
<el-card class="hl-card-info">
|
|
|
|
|
<template #header>
|
|
|
|
|
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">设备状态</span>
|
|
|
|
@ -403,21 +403,21 @@ const mockDataSwitchChange = async () => {
|
|
|
|
|
formData.value.ProductionOrderState.openMock = 0
|
|
|
|
|
formData.value.QuantityOfEachProductProduced.openMock = 0
|
|
|
|
|
formData.value.UtilizationRateOfEquipment.openMock = 0
|
|
|
|
|
formData.value.QualifiedRateOfEachProduct.openMock = 0
|
|
|
|
|
// formData.value.QualifiedRateOfEachProduct.openMock = 0
|
|
|
|
|
formData.value.EquipmentOperationState.openMock = 0
|
|
|
|
|
|
|
|
|
|
formData.value.ProductionStateList.data = oldProductionStateListdata.value
|
|
|
|
|
formData.value.ProductionOrderState.data = oldProductionOrderStatedata.value
|
|
|
|
|
formData.value.QuantityOfEachProductProduced.data = oldQuantityOfEachProductProduceddata.value
|
|
|
|
|
formData.value.UtilizationRateOfEquipment.data = oldUtilizationRateOfEquipmentdata.value
|
|
|
|
|
debugger
|
|
|
|
|
formData.value.QualifiedRateOfEachProduct.data = oldQualifiedRateOfEachProductdata.value
|
|
|
|
|
// debugger
|
|
|
|
|
// formData.value.QualifiedRateOfEachProduct.data = oldQualifiedRateOfEachProductdata.value
|
|
|
|
|
formData.value.EquipmentOperationState.data = oldEquipmentOperationStatedata.value
|
|
|
|
|
await ScreenApi.updateScreen(formData.value.ProductionStateList)
|
|
|
|
|
await ScreenApi.updateScreen(formData.value.ProductionOrderState)
|
|
|
|
|
await ScreenApi.updateScreen(formData.value.QuantityOfEachProductProduced)
|
|
|
|
|
await ScreenApi.updateScreen(formData.value.UtilizationRateOfEquipment)
|
|
|
|
|
await ScreenApi.updateScreen(formData.value.QualifiedRateOfEachProduct)
|
|
|
|
|
// await ScreenApi.updateScreen(formData.value.QualifiedRateOfEachProduct)
|
|
|
|
|
await ScreenApi.updateScreen(formData.value.EquipmentOperationState)
|
|
|
|
|
reload()
|
|
|
|
|
} else {
|
|
|
|
@ -426,7 +426,7 @@ const mockDataSwitchChange = async () => {
|
|
|
|
|
formData.value.ProductionOrderState.openMock = 1
|
|
|
|
|
formData.value.QuantityOfEachProductProduced.openMock = 1
|
|
|
|
|
formData.value.UtilizationRateOfEquipment.openMock = 1
|
|
|
|
|
formData.value.QualifiedRateOfEachProduct.openMock = 1
|
|
|
|
|
// formData.value.QualifiedRateOfEachProduct.openMock = 1
|
|
|
|
|
formData.value.EquipmentOperationState.openMock = 1
|
|
|
|
|
//如果mockdata里有值 页面显示模拟数据
|
|
|
|
|
//把mockData字符chuan串转成数组
|
|
|
|
@ -442,9 +442,9 @@ const mockDataSwitchChange = async () => {
|
|
|
|
|
formData.value.UtilizationRateOfEquipment.mockData = JSON.parse(
|
|
|
|
|
formData.value.UtilizationRateOfEquipment.mockData
|
|
|
|
|
)
|
|
|
|
|
formData.value.QualifiedRateOfEachProduct.mockData = JSON.parse(
|
|
|
|
|
formData.value.QualifiedRateOfEachProduct.mockData
|
|
|
|
|
)
|
|
|
|
|
// formData.value.QualifiedRateOfEachProduct.mockData = JSON.parse(
|
|
|
|
|
// formData.value.QualifiedRateOfEachProduct.mockData
|
|
|
|
|
// )
|
|
|
|
|
formData.value.EquipmentOperationState.mockData = JSON.parse(
|
|
|
|
|
formData.value.EquipmentOperationState.mockData
|
|
|
|
|
)
|
|
|
|
@ -477,17 +477,17 @@ const mockDataSwitchChange = async () => {
|
|
|
|
|
}
|
|
|
|
|
formData.value.UtilizationRateOfEquipment.data = Equipmentmock
|
|
|
|
|
}
|
|
|
|
|
if (formData.value.QualifiedRateOfEachProduct.mockData[0]?.length > 0) {
|
|
|
|
|
const EachProductmock = []
|
|
|
|
|
for (let i = 0; i < formData.value.QualifiedRateOfEachProduct.mockData[0].length; i++) {
|
|
|
|
|
const newRowmk = []
|
|
|
|
|
for (let j = 0; j < formData.value.QualifiedRateOfEachProduct.mockData.length; j++) {
|
|
|
|
|
newRowmk.push(formData.value.QualifiedRateOfEachProduct.mockData[j][i])
|
|
|
|
|
}
|
|
|
|
|
EachProductmock.push(newRowmk)
|
|
|
|
|
}
|
|
|
|
|
formData.value.QualifiedRateOfEachProduct.data = EachProductmock
|
|
|
|
|
}
|
|
|
|
|
// if (formData.value.QualifiedRateOfEachProduct.mockData[0]?.length > 0) {
|
|
|
|
|
// const EachProductmock = []
|
|
|
|
|
// for (let i = 0; i < formData.value.QualifiedRateOfEachProduct.mockData[0].length; i++) {
|
|
|
|
|
// const newRowmk = []
|
|
|
|
|
// for (let j = 0; j < formData.value.QualifiedRateOfEachProduct.mockData.length; j++) {
|
|
|
|
|
// newRowmk.push(formData.value.QualifiedRateOfEachProduct.mockData[j][i])
|
|
|
|
|
// }
|
|
|
|
|
// EachProductmock.push(newRowmk)
|
|
|
|
|
// }
|
|
|
|
|
// formData.value.QualifiedRateOfEachProduct.data = EachProductmock
|
|
|
|
|
// }
|
|
|
|
|
if (formData.value.EquipmentOperationState.mockData[0]?.length > 0) {
|
|
|
|
|
formData.value.EquipmentOperationState.data = formData.value.EquipmentOperationState.mockData
|
|
|
|
|
}
|
|
|
|
@ -550,16 +550,16 @@ const formData: any = ref({
|
|
|
|
|
openMock: 0,
|
|
|
|
|
mockData: [[], []]
|
|
|
|
|
},
|
|
|
|
|
QualifiedRateOfEachProduct: {
|
|
|
|
|
date: '20240328',
|
|
|
|
|
type: 'QualifiedRateOfEachProduct',
|
|
|
|
|
definition: {
|
|
|
|
|
'1D': ['product', 'qualifiedRate']
|
|
|
|
|
},
|
|
|
|
|
data: [[], []],
|
|
|
|
|
openMock: 0,
|
|
|
|
|
mockData: [[], []]
|
|
|
|
|
},
|
|
|
|
|
// QualifiedRateOfEachProduct: {
|
|
|
|
|
// date: '20240328',
|
|
|
|
|
// type: 'QualifiedRateOfEachProduct',
|
|
|
|
|
// definition: {
|
|
|
|
|
// '1D': ['product', 'qualifiedRate']
|
|
|
|
|
// },
|
|
|
|
|
// data: [[], []],
|
|
|
|
|
// openMock: 0,
|
|
|
|
|
// mockData: [[], []]
|
|
|
|
|
// },
|
|
|
|
|
EquipmentOperationState: {
|
|
|
|
|
date: '20240328',
|
|
|
|
|
type: 'EquipmentOperationState',
|
|
|
|
@ -597,7 +597,7 @@ const oldProductionStateListdata = ref([])
|
|
|
|
|
const oldProductionOrderStatedata = ref([])
|
|
|
|
|
const oldQuantityOfEachProductProduceddata = ref([])
|
|
|
|
|
const oldUtilizationRateOfEquipmentdata = ref([])
|
|
|
|
|
const oldQualifiedRateOfEachProductdata = ref([])
|
|
|
|
|
// const oldQualifiedRateOfEachProductdata = ref([])
|
|
|
|
|
const oldEquipmentOperationStatedata = ref([])
|
|
|
|
|
const getlist = async () => {
|
|
|
|
|
const datalist = await ScreenApi.getScreenAll()
|
|
|
|
@ -648,21 +648,23 @@ const getlist = async () => {
|
|
|
|
|
Equipmentmock.push(newRowmk)
|
|
|
|
|
}
|
|
|
|
|
formData.value.UtilizationRateOfEquipment.data = Equipmentmock
|
|
|
|
|
} else if (datalistitem.type == 'QualifiedRateOfEachProduct') {
|
|
|
|
|
oldQualifiedRateOfEachProductdata.value = datalistitem.data
|
|
|
|
|
} else
|
|
|
|
|
// if (datalistitem.type == 'QualifiedRateOfEachProduct') {
|
|
|
|
|
// oldQualifiedRateOfEachProductdata.value = datalistitem.data
|
|
|
|
|
|
|
|
|
|
formData.value.QualifiedRateOfEachProduct = datalistitem
|
|
|
|
|
datalistitem.mockData = JSON.parse(datalistitem.mockData)
|
|
|
|
|
const EachProductmock = []
|
|
|
|
|
for (let i = 0; i < datalistitem.mockData[0].length; i++) {
|
|
|
|
|
const newRowmk = []
|
|
|
|
|
for (let j = 0; j < datalistitem.mockData.length; j++) {
|
|
|
|
|
newRowmk.push(datalistitem.mockData[j][i])
|
|
|
|
|
}
|
|
|
|
|
EachProductmock.push(newRowmk)
|
|
|
|
|
}
|
|
|
|
|
formData.value.QualifiedRateOfEachProduct.data = EachProductmock
|
|
|
|
|
} else if (datalistitem.type == 'EquipmentOperationState') {
|
|
|
|
|
// formData.value.QualifiedRateOfEachProduct = datalistitem
|
|
|
|
|
// datalistitem.mockData = JSON.parse(datalistitem.mockData)
|
|
|
|
|
// const EachProductmock = []
|
|
|
|
|
// for (let i = 0; i < datalistitem.mockData[0].length; i++) {
|
|
|
|
|
// const newRowmk = []
|
|
|
|
|
// for (let j = 0; j < datalistitem.mockData.length; j++) {
|
|
|
|
|
// newRowmk.push(datalistitem.mockData[j][i])
|
|
|
|
|
// }
|
|
|
|
|
// EachProductmock.push(newRowmk)
|
|
|
|
|
// }
|
|
|
|
|
// formData.value.QualifiedRateOfEachProduct.data = EachProductmock
|
|
|
|
|
// } else
|
|
|
|
|
if (datalistitem.type == 'EquipmentOperationState') {
|
|
|
|
|
oldEquipmentOperationStatedata.value = datalistitem.data
|
|
|
|
|
|
|
|
|
|
formData.value.EquipmentOperationState = datalistitem
|
|
|
|
@ -728,28 +730,30 @@ const getlist = async () => {
|
|
|
|
|
} else {
|
|
|
|
|
formData.value.UtilizationRateOfEquipment.data = null
|
|
|
|
|
}
|
|
|
|
|
} else if (datalistitem.type == 'QualifiedRateOfEachProduct') {
|
|
|
|
|
oldQualifiedRateOfEachProductdata.value = datalistitem.data
|
|
|
|
|
// 进度追踪项目明细
|
|
|
|
|
formData.value.QualifiedRateOfEachProduct = datalistitem
|
|
|
|
|
// 遍历原始数据的第二维及后续元素,将它们按列添加到新的数组中
|
|
|
|
|
datalistitem.data = JSON.parse(datalistitem.data)
|
|
|
|
|
if (datalistitem.data != null && datalistitem.data.length > 0) {
|
|
|
|
|
const transposedData = []
|
|
|
|
|
for (let i = 0; i < datalistitem.data[0].length; i++) {
|
|
|
|
|
const newRow = []
|
|
|
|
|
for (let j = 0; j < datalistitem.data.length; j++) {
|
|
|
|
|
newRow.push(datalistitem.data[j][i])
|
|
|
|
|
}
|
|
|
|
|
transposedData.push(newRow)
|
|
|
|
|
}
|
|
|
|
|
// 更新formData
|
|
|
|
|
formData.value.QualifiedRateOfEachProduct.data = transposedData
|
|
|
|
|
} else {
|
|
|
|
|
formData.value.QualifiedRateOfEachProduct.data = null
|
|
|
|
|
}
|
|
|
|
|
// console.log(formData.value.ProgressTrackingOfProduction.data)
|
|
|
|
|
} else if (datalistitem.type == 'EquipmentOperationState') {
|
|
|
|
|
} else
|
|
|
|
|
// if (datalistitem.type == 'QualifiedRateOfEachProduct') {
|
|
|
|
|
// oldQualifiedRateOfEachProductdata.value = datalistitem.data
|
|
|
|
|
// // 进度追踪项目明细
|
|
|
|
|
// formData.value.QualifiedRateOfEachProduct = datalistitem
|
|
|
|
|
// // 遍历原始数据的第二维及后续元素,将它们按列添加到新的数组中
|
|
|
|
|
// datalistitem.data = JSON.parse(datalistitem.data)
|
|
|
|
|
// if (datalistitem.data != null && datalistitem.data.length > 0) {
|
|
|
|
|
// const transposedData = []
|
|
|
|
|
// for (let i = 0; i < datalistitem.data[0].length; i++) {
|
|
|
|
|
// const newRow = []
|
|
|
|
|
// for (let j = 0; j < datalistitem.data.length; j++) {
|
|
|
|
|
// newRow.push(datalistitem.data[j][i])
|
|
|
|
|
// }
|
|
|
|
|
// transposedData.push(newRow)
|
|
|
|
|
// }
|
|
|
|
|
// // 更新formData
|
|
|
|
|
// formData.value.QualifiedRateOfEachProduct.data = transposedData
|
|
|
|
|
// } else {
|
|
|
|
|
// formData.value.QualifiedRateOfEachProduct.data = null
|
|
|
|
|
// }
|
|
|
|
|
// // console.log(formData.value.ProgressTrackingOfProduction.data)
|
|
|
|
|
// } else
|
|
|
|
|
if (datalistitem.type == 'EquipmentOperationState') {
|
|
|
|
|
oldEquipmentOperationStatedata.value = datalistitem.data
|
|
|
|
|
formData.value.EquipmentOperationState = datalistitem
|
|
|
|
|
datalistitem.data = JSON.parse(datalistitem.data)
|
|
|
|
@ -794,14 +798,14 @@ const addUtilizationRateOfEquipment = () => {
|
|
|
|
|
formData.value.UtilizationRateOfEquipment.data.push(['', ''])
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//新增各产品合格率
|
|
|
|
|
const addQualifiedRateOfEachProduct = () => {
|
|
|
|
|
if (formData.value.QualifiedRateOfEachProduct.data == null) {
|
|
|
|
|
formData.value.QualifiedRateOfEachProduct.data = [['', '']]
|
|
|
|
|
} else {
|
|
|
|
|
formData.value.QualifiedRateOfEachProduct.data.push(['', ''])
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// //新增各产品合格率
|
|
|
|
|
// const addQualifiedRateOfEachProduct = () => {
|
|
|
|
|
// if (formData.value.QualifiedRateOfEachProduct.data == null) {
|
|
|
|
|
// formData.value.QualifiedRateOfEachProduct.data = [['', '']]
|
|
|
|
|
// } else {
|
|
|
|
|
// formData.value.QualifiedRateOfEachProduct.data.push(['', ''])
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
//新增设备状态
|
|
|
|
|
const addEquipmentOperationState = () => {
|
|
|
|
|
if (formData.value.EquipmentOperationState.data == null) {
|
|
|
|
@ -833,9 +837,9 @@ const handleDeleteEquipment = (index: number) => {
|
|
|
|
|
formData.value.UtilizationRateOfEquipment.data.splice(index, 1)
|
|
|
|
|
}
|
|
|
|
|
//删除各产品合格率
|
|
|
|
|
const handleDeleteProduct = (index: number) => {
|
|
|
|
|
formData.value.QualifiedRateOfEachProduct.data.splice(index, 1)
|
|
|
|
|
}
|
|
|
|
|
// const handleDeleteProduct = (index: number) => {
|
|
|
|
|
// formData.value.QualifiedRateOfEachProduct.data.splice(index, 1)
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
//删除设备状态
|
|
|
|
|
const handleDeletetionState = (index: number) => {
|
|
|
|
@ -852,7 +856,7 @@ const submitForm = async () => {
|
|
|
|
|
await ScreenApi.updateScreen(formData.value.ProductionOrderState)
|
|
|
|
|
await ScreenApi.updateScreen(formData.value.QuantityOfEachProductProduced)
|
|
|
|
|
await ScreenApi.updateScreen(formData.value.UtilizationRateOfEquipment)
|
|
|
|
|
await ScreenApi.updateScreen(formData.value.QualifiedRateOfEachProduct)
|
|
|
|
|
// await ScreenApi.updateScreen(formData.value.QualifiedRateOfEachProduct)
|
|
|
|
|
await ScreenApi.updateScreen(formData.value.EquipmentOperationState)
|
|
|
|
|
message.success(t('common.updateSuccess'))
|
|
|
|
|
getlist()
|
|
|
|
@ -899,21 +903,21 @@ const submitForm = async () => {
|
|
|
|
|
}, [])
|
|
|
|
|
formData.value.UtilizationRateOfEquipment.mockData = transposedArray2
|
|
|
|
|
//各产品合格率
|
|
|
|
|
formData.value.QualifiedRateOfEachProduct.mockData = JSON.parse(
|
|
|
|
|
JSON.stringify(formData.value.QualifiedRateOfEachProduct.data)
|
|
|
|
|
)
|
|
|
|
|
const QualifiedArray = formData.value.QualifiedRateOfEachProduct.mockData
|
|
|
|
|
const transposedArray3 = QualifiedArray.reduce((acc, curr) => {
|
|
|
|
|
curr.forEach((el, i) => {
|
|
|
|
|
if (!acc[i]) {
|
|
|
|
|
acc[i] = [el]
|
|
|
|
|
} else {
|
|
|
|
|
acc[i].push(el)
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
return acc
|
|
|
|
|
}, [])
|
|
|
|
|
formData.value.QualifiedRateOfEachProduct.mockData = transposedArray3
|
|
|
|
|
// formData.value.QualifiedRateOfEachProduct.mockData = JSON.parse(
|
|
|
|
|
// JSON.stringify(formData.value.QualifiedRateOfEachProduct.data)
|
|
|
|
|
// )
|
|
|
|
|
// const QualifiedArray = formData.value.QualifiedRateOfEachProduct.mockData
|
|
|
|
|
// const transposedArray3 = QualifiedArray.reduce((acc, curr) => {
|
|
|
|
|
// curr.forEach((el, i) => {
|
|
|
|
|
// if (!acc[i]) {
|
|
|
|
|
// acc[i] = [el]
|
|
|
|
|
// } else {
|
|
|
|
|
// acc[i].push(el)
|
|
|
|
|
// }
|
|
|
|
|
// })
|
|
|
|
|
// return acc
|
|
|
|
|
// }, [])
|
|
|
|
|
// formData.value.QualifiedRateOfEachProduct.mockData = transposedArray3
|
|
|
|
|
|
|
|
|
|
//设备状态
|
|
|
|
|
formData.value.EquipmentOperationState.mockData = JSON.parse(
|
|
|
|
@ -932,9 +936,11 @@ const submitForm = async () => {
|
|
|
|
|
item.data = oldQuantityOfEachProductProduceddata.value
|
|
|
|
|
} else if (item.type == 'UtilizationRateOfEquipment') {
|
|
|
|
|
item.data = oldUtilizationRateOfEquipmentdata.value
|
|
|
|
|
} else if (item.type == 'QualifiedRateOfEachProduct') {
|
|
|
|
|
item.data = oldQualifiedRateOfEachProductdata.value
|
|
|
|
|
} else if (item.type == 'EquipmentOperationState') {
|
|
|
|
|
} else
|
|
|
|
|
// if (item.type == 'QualifiedRateOfEachProduct') {
|
|
|
|
|
// item.data = oldQualifiedRateOfEachProductdata.value
|
|
|
|
|
// } else
|
|
|
|
|
if (item.type == 'EquipmentOperationState') {
|
|
|
|
|
item.data = oldEquipmentOperationStatedata.value
|
|
|
|
|
}
|
|
|
|
|
datalistitem.value.push(item)
|
|
|
|
|