Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/271pull/273/head
@@ -1,7 +1,7 @@ | |||
### | |||
# @Author: Do not edit | |||
# @Date: 2023-08-29 09:40:39 | |||
# @LastEditTime: 2024-03-22 14:18:33 | |||
# @LastEditTime: 2024-03-25 15:59:53 | |||
# @LastEditors: zhp | |||
# @Description: | |||
### | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2024-01-29 16:50:26 | |||
* @LastEditTime: 2024-03-13 09:07:37 | |||
* @LastEditTime: 2024-03-25 13:37:34 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -2,7 +2,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-09-21 09:06:28 | |||
* @LastEditTime: 2024-01-29 15:39:59 | |||
* @LastEditTime: 2024-03-25 16:56:54 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -158,7 +158,7 @@ export default { | |||
legend: { | |||
itemWidth: 10, | |||
itemHeight: 10, | |||
top: '1%', | |||
top: '20', | |||
// right: '20px', | |||
data: ['产线产量', '产线良品率'], | |||
textStyle: { | |||
@@ -286,7 +286,7 @@ export default { | |||
} | |||
</script> | |||
<style> | |||
.productChart{ | |||
/* .productChart{ | |||
top: -10px; | |||
} | |||
} */ | |||
</style> |
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-12-27 13:54:52 | |||
* @LastEditTime: 2024-03-13 09:04:11 | |||
* @LastEditTime: 2024-03-25 16:23:12 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -92,18 +92,20 @@ export default { | |||
methods: { | |||
initChart(nameList, topNameList, nameWasteList, passRateList, wasteList) { | |||
let rawData = [] | |||
rawData.push(passRateList,wasteList) | |||
// console.log(1) | |||
const totalData = []; | |||
for (let i = 0; i < rawData[0].length; ++i) { | |||
let sum = 0; | |||
for (let j = 0; j < rawData.length; ++j) { | |||
sum += rawData[j][i]; | |||
let colors = ['#0fdedb', '#2359ec'] | |||
if (passRateList && wasteList) { | |||
rawData.push(passRateList, wasteList) | |||
// console.log(1) | |||
const totalData = []; | |||
for (let i = 0; i < rawData[0].length; ++i) { | |||
let sum = 0; | |||
for (let j = 0; j < rawData.length; ++j) { | |||
sum += rawData[j][i]; | |||
} | |||
totalData.push(sum); | |||
} | |||
totalData.push(sum); | |||
console.log('total', totalData); | |||
} | |||
let colors = ['#0fdedb', '#2359ec' ] | |||
console.log('total', totalData); | |||
this.chart = echarts.init(document.getElementById(this.id)) | |||
const series = [ | |||
'良品', | |||
@@ -123,9 +125,9 @@ export default { | |||
formatter: (params) => Math.round(params.value * 1000) / 10 + '%' | |||
}, | |||
color:colors[sid], | |||
data: rawData[sid].map((d, did) => | |||
data: rawData.length != 0 ? rawData[sid].map((d, did) => | |||
totalData[did] <= 0 ? 0 : d / totalData[did] | |||
) | |||
) : [] | |||
}; | |||
}); | |||
// let series = [ | |||
@@ -172,6 +174,7 @@ export default { | |||
legend: { | |||
itemWidth: 12, | |||
itemHeight: 12, | |||
top:'30', | |||
icon: 'rect', | |||
textStyle: { | |||
color: '#ffffff' | |||
@@ -2,7 +2,7 @@ | |||
* @Author: zwq | |||
* @Date: 2021-07-19 15:18:30 | |||
* @LastEditors: zhp | |||
* @LastEditTime: 2024-03-22 16:40:46 | |||
* @LastEditTime: 2024-03-25 16:54:49 | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -605,10 +605,7 @@ export default { | |||
} | |||
}, | |||
created() { | |||
// this.fetchList('exception-alarm') | |||
// this.fetchList('inAndOutOfEachLine') | |||
// this.fetchList('order-process') | |||
// this.fetchList('line-chart-data') | |||
this.getData() | |||
this.init() | |||
setTimeout(() => { | |||
window.location.reload() | |||
@@ -671,6 +668,22 @@ export default { | |||
// removeEventListener('resize', resizeFun) | |||
// }, | |||
methods: { | |||
getData() { | |||
let processArr = qualityMonthList.map((item, index) => [ | |||
// console.log(item) | |||
`<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''} | |||
</span>`, | |||
// formatDate(item.planStartTime) || '', | |||
` | |||
<span style="color:rgba(255,255,255,0.5)" >${item.productionLineName || ''} | |||
</span>`, | |||
`<span style="color:rgba(255,255,255,0.5)">${item.sectionName || ''}</span>`, | |||
`<span style="color:rgba(255,255,255,0.5)">${item.count || ''}</span>`, | |||
`<span style="color:rgba(255,255,255,0.5)">${item.inspectionTypeName || ''}</span>`, | |||
]) | |||
this.processConfig.data = processArr | |||
this.$refs['processScrollBoard'].updateRows(processArr) | |||
}, | |||
// getList() { | |||
// // this.$axios.get( | |||
// // 'base/core-production-line/listAll', | |||
@@ -867,20 +880,6 @@ export default { | |||
// this.$nextTick(() => { | |||
this.$refs.productLineChart.initChart(nameList, passRateList, outputNumList) | |||
} else if (this.SJGInitWebSocket === 'inspection') { | |||
let processArr = qualityMonthList.map((item, index) => [ | |||
// console.log(item) | |||
`<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''} | |||
</span>`, | |||
// formatDate(item.planStartTime) || '', | |||
` | |||
<span style="color:rgba(255,255,255,0.5)" >${item.productionLineName || ''} | |||
</span>`, | |||
`<span style="color:rgba(255,255,255,0.5)">${item.sectionName || ''}</span>`, | |||
`<span style="color:rgba(255,255,255,0.5)">${item.count || ''}</span>`, | |||
`<span style="color:rgba(255,255,255,0.5)">${item.inspectionTypeName || ''}</span>`, | |||
]) | |||
this.processConfig.data = processArr | |||
this.$refs['processScrollBoard'].updateRows(processArr) | |||
} | |||
}, | |||
// 数据发送 | |||
@@ -2,7 +2,7 @@ | |||
* @Author: zwq | |||
* @Date: 2021-11-18 14:16:25 | |||
* @LastEditors: zhp | |||
* @LastEditTime: 2024-03-22 17:12:03 | |||
* @LastEditTime: 2024-03-25 14:07:31 | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-11-08 15:30:27 | |||
* @LastEditTime: 2023-12-04 15:19:33 | |||
* @LastEditTime: 2024-03-25 14:14:04 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -118,7 +118,7 @@ export default { | |||
this.$refs['dataForm'].resetFields(); | |||
if (this.dataForm.id) { | |||
getProcessEquValueBomDet({ | |||
id: this.dataForm.id | |||
id: this.dataForm.id, | |||
}).then((res) => { | |||
this.dataForm = res.data; | |||
const arr = [] | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-11-08 14:00:52 | |||
* @LastEditTime: 2023-11-09 09:59:53 | |||
* @LastEditTime: 2024-03-25 14:09:33 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -25,24 +25,24 @@ export default { | |||
}, | |||
data() { | |||
return { | |||
state: false | |||
// state: false | |||
} | |||
}, | |||
computed: { | |||
state() { | |||
return this.injectData.enabled === 1 ? true : false | |||
} | |||
}, | |||
// computed: { | |||
// readonly() { | |||
// return !!this.injectData.readonly | |||
// } | |||
// }, | |||
mounted() { | |||
this.mapToState() | |||
// this.mapToState() | |||
}, | |||
methods: { | |||
mapToState() { | |||
if (this.injectData.prop === 'enabled') { | |||
this.state = this.injectData.enabled === 1 ? true : false | |||
} | |||
}, | |||
// mapToState() { | |||
// if (this.injectData.prop === 'enabled') { | |||
// this.state = this.injectData.enabled === 1 ? true : false | |||
// } | |||
// }, | |||
changeHandler() { | |||
// let params = {} | |||
let payload = {} | |||
@@ -299,14 +299,14 @@ export default { | |||
getCookie() { | |||
// const username = getUsername(); | |||
// const password = getPassword(); | |||
// const rememberMe = getRememberMe(); | |||
const tenantName = getTenantName(); | |||
const rememberMe = getRememberMe() | |||
// const tenantName = getTenantName(); | |||
this.loginForm = { | |||
...this.loginForm, | |||
username: username ? username : this.loginForm.username, | |||
password: password ? password : this.loginForm.password, | |||
username: this.loginForm.username, | |||
password: this.loginForm.password, | |||
rememberMe: rememberMe ? getRememberMe() : false, | |||
tenantName: tenantName ? tenantName : this.loginForm.tenantName, | |||
tenantName: this.loginForm.tenantName, | |||
}; | |||
}, | |||
handleLogin(captchaParams) { | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-12-08 13:46:17 | |||
* @LastEditTime: 2024-03-21 10:40:52 | |||
* @LastEditTime: 2024-03-25 08:50:25 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -73,12 +73,12 @@ | |||
</el-form-item> | |||
</el-row> | |||
<el-row :gutter="24" v-for="(item,index) in ingredientList" :key="item.id"> | |||
<el-col :span="8"> | |||
<el-col :span="6"> | |||
<el-form-item label="成分"> | |||
{{ item.name }} | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-col :span="6"> | |||
<el-form-item :prop="'checkValueList.' + index + '.checkValue'" label="成分含量" | |||
:rules="[{ required: true, message: '成分含量不能为空', trigger: 'blur' }]"> | |||
<el-input oninput="value=value.replace(/[^\d]/g,'')" :disabled="isdetail" | |||
@@ -92,12 +92,12 @@ | |||
</span> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="4"> | |||
<el-col :span="6"> | |||
<el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最小值"> | |||
<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-col :span="6"> | |||
<el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最大值"> | |||
<el-input disabled style="width: 90%;margin-right: 10px;" v-model="item.maxValue"></el-input> | |||
</el-form-item> | |||
@@ -2,7 +2,7 @@ | |||
* @Author: zwq | |||
* @Date: 2023-08-01 14:55:51 | |||
* @LastEditors: zhp | |||
* @LastEditTime: 2024-03-21 15:14:04 | |||
* @LastEditTime: 2024-03-25 16:07:07 | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -64,7 +64,7 @@ const tableProps = [ | |||
{ | |||
prop: 'source', | |||
label: '数据来源', | |||
filter: (val) => val == 1 ? '内部' : '外部' | |||
filter: (val) => val == 1 ? '手动' : '自动' | |||
}, | |||
{ | |||
prop: 'remark', | |||
@@ -83,8 +83,8 @@ export default { | |||
captchaEnable: true, | |||
loginForm: { | |||
loginType: "uname", | |||
username: "admin", | |||
password: "admin123", | |||
username: "", | |||
password: "", | |||
rememberMe: false, | |||
captchaVerification: "", | |||
}, | |||
@@ -140,12 +140,12 @@ export default { | |||
this.$refs.verify.show() | |||
}, | |||
getCookie() { | |||
const username = getUsername(); | |||
const password = getPassword(); | |||
// const username = getUsername(); | |||
// const password = getPassword(); | |||
const rememberMe = getRememberMe(); | |||
this.loginForm = { | |||
username: username ? username : this.loginForm.username, | |||
password: password ? password : this.loginForm.password, | |||
username: this.loginForm.username, | |||
password: this.loginForm.password, | |||
rememberMe: rememberMe ? getRememberMe() : false, | |||
loginType: this.loginForm.loginType, | |||
}; | |||