From 3823c3cb3ede20c63374a7b17a41b6b3f27b7612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Mon, 25 Mar 2024 16:57:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.dev | 2 +-
src/views/OperationalOverview/coldBoard.vue | 2 +-
.../components/coldDoubleYChart.vue | 8 ++--
.../components/pileBarChart.vue | 29 ++++++++-------
.../OperationalOverview/processingBoard.vue | 37 +++++++++----------
.../processEquValueBom/add-or-updata.vue | 2 +-
.../extend/processEquValueBom/attr-add.vue | 4 +-
.../extend/processEquValueBom/statusBtn.vue | 26 ++++++-------
src/views/login.vue | 10 ++---
.../base/qualityHotMaterial/add-or-updata.vue | 10 ++---
.../monitoring/materielDateFrom/index.vue | 4 +-
src/views/socialLogin.vue | 12 +++---
12 files changed, 74 insertions(+), 72 deletions(-)
diff --git a/.env.dev b/.env.dev
index 35ec1e31..ec8ac65b 100644
--- a/.env.dev
+++ b/.env.dev
@@ -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:
###
diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue
index dcea1163..dba2685b 100644
--- a/src/views/OperationalOverview/coldBoard.vue
+++ b/src/views/OperationalOverview/coldBoard.vue
@@ -1,7 +1,7 @@
diff --git a/src/views/OperationalOverview/components/coldDoubleYChart.vue b/src/views/OperationalOverview/components/coldDoubleYChart.vue
index 12279dae..e61dbcbf 100644
--- a/src/views/OperationalOverview/components/coldDoubleYChart.vue
+++ b/src/views/OperationalOverview/components/coldDoubleYChart.vue
@@ -2,7 +2,7 @@
@@ -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 {
}
diff --git a/src/views/OperationalOverview/components/pileBarChart.vue b/src/views/OperationalOverview/components/pileBarChart.vue
index e03ec577..90edc21a 100644
--- a/src/views/OperationalOverview/components/pileBarChart.vue
+++ b/src/views/OperationalOverview/components/pileBarChart.vue
@@ -1,7 +1,7 @@
@@ -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'
diff --git a/src/views/OperationalOverview/processingBoard.vue b/src/views/OperationalOverview/processingBoard.vue
index 22366bf1..3011c0cb 100644
--- a/src/views/OperationalOverview/processingBoard.vue
+++ b/src/views/OperationalOverview/processingBoard.vue
@@ -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:
-->
@@ -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)
+ `${index + 1 || ''}
+ `,
+ // formatDate(item.planStartTime) || '',
+ `
+ ${item.productionLineName || ''}
+ `,
+ `${item.sectionName || ''}`,
+ `${item.count || ''}`,
+ `${item.inspectionTypeName || ''}`,
+ ])
+ 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)
- `${index + 1 || ''}
- `,
- // formatDate(item.planStartTime) || '',
- `
- ${item.productionLineName || ''}
- `,
- `${item.sectionName || ''}`,
- `${item.count || ''}`,
- `${item.inspectionTypeName || ''}`,
- ])
- this.processConfig.data = processArr
- this.$refs['processScrollBoard'].updateRows(processArr)
}
},
// 数据发送
diff --git a/src/views/extend/processEquValueBom/add-or-updata.vue b/src/views/extend/processEquValueBom/add-or-updata.vue
index fb89cbe6..e1bce136 100644
--- a/src/views/extend/processEquValueBom/add-or-updata.vue
+++ b/src/views/extend/processEquValueBom/add-or-updata.vue
@@ -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:
-->
diff --git a/src/views/extend/processEquValueBom/attr-add.vue b/src/views/extend/processEquValueBom/attr-add.vue
index 873cf7a3..79e0521f 100644
--- a/src/views/extend/processEquValueBom/attr-add.vue
+++ b/src/views/extend/processEquValueBom/attr-add.vue
@@ -1,7 +1,7 @@
@@ -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 = []
diff --git a/src/views/extend/processEquValueBom/statusBtn.vue b/src/views/extend/processEquValueBom/statusBtn.vue
index 658cb3f7..d1b45563 100644
--- a/src/views/extend/processEquValueBom/statusBtn.vue
+++ b/src/views/extend/processEquValueBom/statusBtn.vue
@@ -1,7 +1,7 @@
@@ -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 = {}
diff --git a/src/views/login.vue b/src/views/login.vue
index a184edf1..61460fa4 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -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) {
diff --git a/src/views/quality/base/qualityHotMaterial/add-or-updata.vue b/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
index c7a415cc..58c54374 100644
--- a/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
+++ b/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
@@ -1,7 +1,7 @@
@@ -73,12 +73,12 @@
-
+
{{ item.name }}
-
+
-
+
-
+
diff --git a/src/views/quality/monitoring/materielDateFrom/index.vue b/src/views/quality/monitoring/materielDateFrom/index.vue
index a2191caf..cc52218d 100644
--- a/src/views/quality/monitoring/materielDateFrom/index.vue
+++ b/src/views/quality/monitoring/materielDateFrom/index.vue
@@ -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:
-->
@@ -64,7 +64,7 @@ const tableProps = [
{
prop: 'source',
label: '数据来源',
- filter: (val) => val == 1 ? '内部' : '外部'
+ filter: (val) => val == 1 ? '手动' : '自动'
},
{
prop: 'remark',
diff --git a/src/views/socialLogin.vue b/src/views/socialLogin.vue
index 9364cada..53b4790e 100644
--- a/src/views/socialLogin.vue
+++ b/src/views/socialLogin.vue
@@ -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,
};