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

projects/mesxc-zhp #323

Merged
juzi merged 3 commits from projects/mesxc-zhp into projects/mesxc-test 2024-04-10 16:26:37 +08:00
Conversation 0 Commits 3 Files Changed 9 +31 -24
8 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fef8824844 - Show all commits

7
.env.dev
View File

@ -1,8 +1,8 @@
###
# @Author: Do not edit
# @Date: 2023-08-29 09:40:39
# @LastEditTime: 2024-04-03 11:22:19
# @LastEditors: DY
# @LastEditTime: 2024-04-09 08:44:55
# @LastEditors: zhp
# @Description:
###
# 开发环境配置
@ -20,10 +20,11 @@ VUE_APP_TITLE = MES系统
# VUE_APP_BASE_API = 'http://192.168.1.8:48082'
# VUE_APP_BASE_API = 'http://192.168.4.173:9001'
# VUE_APP_BASE_API = 'http://192.168.1.104:48082'
VUE_APP_BASE_API = 'http://192.168.0.33:48082'
# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
# VUE_APP_BASE_API = 'http://192.168.1.62: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.78:48082'
# socket地址
VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'

2
src/api/base/qualityHotMaterial.js
View File

@ -2,7 +2,7 @@
/*
* @Author: zhp
* @Date: 2023-11-06 15:38:12
* @LastEditTime: 2023-12-15 15:29:16
* @LastEditTime: 2024-04-09 15:14:40
* @LastEditors: zhp
* @Description:
*/

2
src/api/base/qualityScrapLog.js
View File

@ -1,7 +1,7 @@
/*
* @Author: zhp
* @Date: 2023-11-07 15:02:37
* @LastEditTime: 2023-11-07 18:32:07
* @LastEditTime: 2024-04-09 15:14:42
* @LastEditors: zhp
* @Description:
*/

6
src/api/monitoring/statisticalData.js
View File

@ -1,7 +1,7 @@
/*
* @Author: zhp
* @Date: 2023-11-07 14:10:18
* @LastEditTime: 2023-11-16 17:49:52
* @LastEditTime: 2024-04-09 09:17:02
* @LastEditors: zhp
* @Description:
*/
@ -18,14 +18,14 @@ export function getStatisticalDataPage(query) {
export function getWorkOrderList(query) {
return request({
url: '/base/core-work-order/listbyfilter',
url: 'base/quality-inspection-record/listbyfilter',
method: 'get',
params: query,
})
}
export function getProductList(query) {
return request({
url: '/base/core-product/listAll',
url: 'base/statistical-data/listAll',
method: 'get',
params: query,
})

5
src/views/OperationalOverview/components/coldDoubleYChart.vue
View File

@ -2,7 +2,7 @@
<!--
* @Author: zhp
* @Date: 2023-09-21 09:06:28
* @LastEditTime: 2024-04-03 16:28:40
* @LastEditTime: 2024-04-09 15:24:39
* @LastEditors: zhp
* @Description:
-->
@ -225,6 +225,9 @@ export default {
scale: true,
type: 'value',
name: '良品率/%',
max: 100,//最大值
min: 0,//最小值
interval: 20,//间隔
nameTextStyle: {// y轴上方单位的颜色
color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
align: "left",

5
src/views/OperationalOverview/components/doubleYChart .vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-09-21 09:06:28
* @LastEditTime: 2024-04-03 17:09:12
* @LastEditTime: 2024-04-09 15:24:28
* @LastEditors: zhp
* @Description:
-->
@ -224,6 +224,9 @@ export default {
scale: true,
type: 'value',
name: '良品率/%',
max: 100,//最大值
min: 0,//最小值
interval: 20,//间隔
nameTextStyle: {// y轴上方单位的颜色
color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
align: "left",

2
src/views/quality/base/qualityScrapLog/add-or-updata.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-11-06 15:15:30
* @LastEditTime: 2024-03-22 17:13:16
* @LastEditTime: 2024-04-09 15:14:08
* @LastEditors: zhp
* @Description:
-->

26
src/views/quality/base/qualityScrapLog/index.vue
View File

@ -26,7 +26,7 @@ import {
getQualityScrapLogPage,
deleteQualityScrapLog,
getWorkOrderList,
getTeamList
// getTeamList
} from '@/api/base/qualityScrapLog';
const tableProps = [
@ -189,18 +189,18 @@ export default {
// console.log(this.formConfig[0].selectOptions);
// this.listQuery.total = response.data.total;
})
getTeamList().then((res) => {
console.log(res);
// console.log(response);
this.formConfig[1].selectOptions = res.data.map((item) => {
return {
name: item.name,
id: item.id
}
})
// console.log(this.formConfig[0].selectOptions);
// this.listQuery.total = response.data.total;
})
// getTeamList().then((res) => {
// console.log(res);
// // console.log(response);
// this.formConfig[1].selectOptions = res.data.map((item) => {
// return {
// name: item.name,
// id: item.id
// }
// })
// // console.log(this.formConfig[0].selectOptions);
// // this.listQuery.total = response.data.total;
// })
},
getDataList() {
this.dataListLoading = true;