mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test

Browse Source
This commit is contained in:
gtz 2024-01-24 16:31:26 +08:00
commit af347f7380
8 changed files with 79 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/OperationalOverview/AGVBoard.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-07-19 15:18:30
* @LastEditors: zhp
* @LastEditTime: 2024-01-18 14:06:05
* @LastEditTime: 2024-01-19 16:31:53
* @Description:
-->
<template>
@ -14,7 +14,7 @@
}">
<img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.22em" alt="">
许昌安彩AGV原片周转看板
<h3 class="unit">单位：河南汇融科技服务有限公司</h3>
<h3 class="unit">单位：河南汇融数字科技有限公司</h3>
<h3 class="time">{{ times }}</h3>
<!-- <el-button
type="text"

31
src/views/OperationalOverview/coldBoard.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-07-19 15:18:30
* @LastEditors: zhp
* @LastEditTime: 2024-01-18 14:01:09
* @LastEditTime: 2024-01-22 16:04:14
* @Description:
-->
<template>
@ -14,7 +14,7 @@
}">
<img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.4em" alt="">
许昌安彩冷端看板
<h3 class="unit">单位：河南汇融科技服务有限公司</h3>
<h3 class="unit">单位：河南汇融数字科技有限公司</h3>
<h3 class="time">{{ times }}</h3>
<!-- <el-button
type="text"
@ -29,7 +29,7 @@
<el-row class="container-main flex-col" type="flex">
<el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="15" type="flex" class="flex-1">
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8">
<base-container :title="'切割数据'" :size="'small'" :title-icon="'eqAlarm'">
<base-container :title="'切割数据'" :size="'small'" :title-icon="'eqAlarm'">
<!-- <base-table1 :page="1" :limit="999" :show-index="false" :table-config="cutProps"
:table-data="cutTableDataList" /> -->
<dv-scroll-board :config="cutConfig" style="width:100%;height:350px" ref='cutScrollBoard' />
@ -403,6 +403,18 @@ export default {
this.beilv2 = _this.clientWidth / 1920
})()
}
// let obj = {
// 'a': 11111,
// 'b': 22222,
// 'c': 33333,
// 'd': 44444,
// 'e': 55555,
// }
// let index = 0
// for (let i in obj) {
// index++,
// console.log(index);
// }
// this.getList()
// const _this = this;
// window.onresize = () => {
@ -548,7 +560,11 @@ export default {
// FanInfo
if (this.funWsData.type === 'AnnealFanInfo') {
let arr = []
let index = 0
for (let i in this.funWsData.data.annealFanInfo) {
index++,
// let index = 1,
// index++
// arr.push({
// equipmentName: i,
// status: this.funWsData.data.annealFanInfo[i]
@ -570,7 +586,9 @@ export default {
}
if (this.funWsData.type === 'FanInfo') {
let arr = []
let index = 0
for (let i in this.funWsData.data.fanInfo) {
index++,
// arr.push({
// equipmentName: i,
// status: this.funWsData.data.fanInfo[i]
@ -578,12 +596,10 @@ export default {
arr.push([
// console.log(item)
`
<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
</span>`,
<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}</span>`,
// formatDate(item.planStartTime) || '',
`
<span style="color:rgba(255,255,255,0.5)" >${i || ''}
</span>`,
<span style="color:rgba(255,255,255,0.5)" >${i || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)">${this.funWsData.data.fanInfo[i] || ''}</span>`,
])
}
@ -643,7 +659,6 @@ export default {
])
this.cutConfig.data = cutArr
this.$refs['cutScrollBoard'].updateRows(cutArr)
} else if (this.cutWsData.type === 'cutting' && this.cutWsData.name === 'chart' && this.cutWsData.dateType === 'day') {
let nameList = []
let nameWasteList = []

2
src/views/OperationalOverview/components/pileBarChart.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-12-27 13:54:52
* @LastEditTime: 2024-01-17 10:09:36
* @LastEditTime: 2024-01-22 16:04:18
* @LastEditors: zhp
* @Description:
-->

26
src/views/OperationalOverview/processingBoard.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-07-19 15:18:30
* @LastEditors: zhp
* @LastEditTime: 2024-01-18 13:57:38
* @LastEditTime: 2024-01-22 14:37:50
* @Description:
-->
<template>
@ -14,7 +14,7 @@
}">
<img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.22em" alt="">
许昌安彩深加工看板
<h3 class="unit">单位：河南汇融科技服务有限公司</h3>
<h3 class="unit">单位：河南汇融数字科技有限公司</h3>
<h3 class="time">{{ times }}</h3>
<!-- <el-button
type="text"
@ -446,43 +446,43 @@ const qualityMonthTableProps = [
]
const qualityMonthList = [
{
productionLineName: 'Y61',
productionLineName: 'D61',
sectionName: '成型',
count: '3片',
inspectionTypeName: '细长泡'
},
{
productionLineName: 'Y62',
productionLineName: 'D62',
sectionName: '组合落板',
count: '4片',
inspectionTypeName: '细长泡'
},
{
productionLineName: 'Y61',
productionLineName: 'D61',
sectionName: '磨边',
count: '6片',
inspectionTypeName: '开口泡'
},
{
productionLineName: 'Y63',
productionLineName: 'D63',
sectionName: '清洗',
count: '5片',
inspectionTypeName: '结石'
},
{
productionLineName: 'Y64',
productionLineName: 'D64',
sectionName: '打孔',
count: '2片',
inspectionTypeName: '结石'
},
{
productionLineName: 'Y63',
productionLineName: 'D63',
sectionName: '成型',
count: '7片',
inspectionTypeName: '开口泡'
},
{
productionLineName: 'Y61',
productionLineName: 'D61',
sectionName: '上片',
count: '8片',
inspectionTypeName: '结石'
@ -615,8 +615,8 @@ export default {
this.initWebSocket()
this.SJGInitWebSocket()
this.getTimes()
this.$refs.EnergyMonitoringChart.initChart(['Y61', 'Y62', 'Y63', 'Y64', 'Y65',], [3134, 2323, 3232, 3233, 2321])
this.$refs.productLineChart.initChart(['Y61', 'Y62', 'Y63', 'Y64', 'Y65',], [98, 97, 98.7, 98.5, 98.3,], [3134, 2323, 3232, 3233, 2321])
// this.$refs.EnergyMonitoringChart.initChart(['Y61', 'Y62', 'Y63', 'Y64', 'Y65',], [3134, 2323, 3232, 3233, 2321])
// this.$refs.productLineChart.initChart(['Y61', 'Y62', 'Y63', 'Y64', 'Y65',], [98, 97, 98.7, 98.5, 98.3,], [3134, 2323, 3232, 3233, 2321])
const _this = this;
_this.beilv2 = document.documentElement.clientWidth / 1920
window.onresize = () => {
@ -843,7 +843,7 @@ export default {
// console.log(this.EnergyMonitoringNameList)
// console.log(this.EnergyMonitoringList)
// this.$nextTick(() => {
// this.$refs.productLineChart.initChart(Array.from(new Set(nameList)), passRateList, outputNumList)
this.$refs.productLineChart.initChart(Array.from(new Set(nameList)), passRateList, outputNumList)
} else {
console.log(this.qualityYearList);
@ -907,7 +907,7 @@ export default {
// console.log(this.EnergyMonitoringNameList)
// console.log(this.EnergyMonitoringList)
// this.$nextTick(() => {
// this.$refs.EnergyMonitoringChart.initChart(this.EnergyMonitoringNameList, this.EnergyMonitoringList)
this.$refs.EnergyMonitoringChart.initChart(this.EnergyMonitoringNameList, this.EnergyMonitoringList)
// })
}
},

3
src/views/base/packagingPrintModel/add-or-updata.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-10-17 16:50:19
* @LastEditTime: 2023-12-04 13:43:19
* @LastEditTime: 2024-01-22 09:55:32
* @LastEditors: zhp
* @Description:
-->
@ -282,7 +282,6 @@ export default {
this.$nextTick(() => {
this.$refs['dataForm'].resetFields();
if (this.dataForm.id) {
// 获取产品详情
getPackingModel(id).then((response) => {

19
src/views/quality/base/basicData/qualityInspectionBoxBtn/dialogForm.vue
View File

@ -140,10 +140,10 @@ export default {
init(obj) {
// console.log(productionLineId);
console.log(obj);
this.visible = true;
this.visible = true
// if(obj.id)
if (obj) {
this.dataForm.id = obj.id ? obj.id : ""
this.dataForm.id = obj.id || null;
}
this.$nextTick(() => {
this.$refs["dataForm"].resetFields()
@ -154,13 +154,16 @@ export default {
}).then((res) => {
console.log(res);
this.dataForm.inspectionDetIdList = res.data
this.dataForm.productionLineId = obj.productionLineId
this.getWorksectionList(obj.productionLineId)
this.dataForm.sectionId = obj.sectionId
})
}
if (this.dataForm.id) {
console.log(1111);
this.urlOptions.infoURL(obj.id).then(response => {
this.dataForm.id = response.data.id
this.dataForm.productionLineId = response.data.productionLineId
this.dataForm.sectionId = response.data.sectionId
// if (this.setData) {
// this.setDataForm()
// }
@ -261,10 +264,10 @@ export default {
this.$emit('update', this.dataForm);
},
async getCode(url) {
const response = await this.$axios(url);
return response.data;
},
// async getCode(url) {
// const response = await this.$axios(url);
// return response.data;
// },
},
};
</script>

45
src/views/quality/base/qualityHotMaterial/add-or-updata.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-12-08 13:46:17
* @LastEditTime: 2024-01-16 14:59:33
* @LastEditTime: 2024-01-22 15:29:53
* @LastEditors: zhp
* @Description:
-->
@ -92,13 +92,13 @@
</el-col>
<el-col :span="4">
<el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最小值"
:rules="[{ required: true, message: '最小值', trigger: 'blur' }]">
>
<el-input disabled style="width: 90%;margin-right: 10px;" v-model="item.minValue"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最大值"
:rules="[{ required: true, message: '最大值', trigger: 'blur' }]">
>
<el-input disabled style="width: 90%;margin-right: 10px;" v-model="item.maxValue"></el-input>
</el-form-item>
</el-col>
@ -257,6 +257,7 @@ export default {
methods: {
judgeValue(val, minValue, maxValue, index) {
if (val >= minValue && val <= maxValue) {
console.log(val)
this.dataForm.checkValueList[index].showIcon = true
this.dataForm.checkValueList[index].isStandard = true
} else {
@ -483,6 +484,7 @@ export default {
minValue: ele.minValue
}
})
console.log(valueList);
getQualityHotMaterialDetList({
mainId: response.data.id
}).then((result) => {
@ -490,7 +492,7 @@ export default {
return {
name: ele.checkName,
id: ele.id,
checkDetId: ele.id,
checkDetId: ele.checkDetId,
checkValue: ele.checkValue,
maxValue:null,
minValue: null
@ -501,28 +503,31 @@ export default {
return {
mainId: ele.mainId,
id: ele.id,
checkDetId: ele.id,
checkDetId: ele.checkDetId,
checkValue: ele.checkValue,
isStandard: true,
showIcon: false,
}
})
valueList.forEach((ele, index) => {
if (this.ingredientList[index].checkDetId >= ele.checkDetId) {
this.ingredientList[index].minValue = ele.minValue
this.ingredientList[index].maxValue = ele.maxValue
}
})
valueList.forEach((ele,index) => {
console.log(ele);
if (this.dataForm.checkValueList[index].checkDetId >= ele.checkDetId && this.dataForm.checkValueList[index].checkValue >= ele.minValue && this.dataForm.checkValueList[index].checkValue <= ele.maxValue) {
this.dataForm.checkValueList[index].showIcon = true
this.dataForm.checkValueList[index].isStandard = true
} else {
this.dataForm.checkValueList[index].showIcon = true
this.dataForm.checkValueList[index].isStandard = false
this.ingredientList.forEach((ele, i) => {
valueList.forEach((item, index) => {
if (ele.checkDetId == item.checkDetId) {
this.ingredientList[i].minValue = item.minValue
this.ingredientList[i].maxValue = item.maxValue
}
// })
})
})
valueList.forEach((ele, index) => {
this.dataForm.checkValueList.forEach((item, i) => {
if (ele.checkDetId == item.checkDetId && item.checkValue >= ele.minValue && item.checkValue <= ele.maxValue) {
console.log(1111)
item.showIcon = true
item.isStandard = true
} else {
item.showIcon = true
item.isStandard = false
}
})
})
})
});

5
src/views/quality/base/qualityHotMaterial/index.vue
View File

@ -53,8 +53,9 @@ const tableProps = [
label: '取样人'
},
{
prop: 'appearance',
label: '是否合格'
prop: 'checkResult',
label: '是否合格',
filter: (val) => val == false ? '不合格' : '合格' ,
},
{
prop: 'materialGrade',