Compare commits

..

No commits in common. "32b7abea82e6f0936896579ed1c56fbfc7b85f99" and "ccce85ce21addc9d92dc6c744e730ef52ca5af23" have entirely different histories.

4 changed files with 19 additions and 28 deletions

View File

@ -1,7 +1,7 @@
###
# @Author: Do not edit
# @Date: 2023-08-29 09:40:39
# @LastEditTime: 2024-01-29 16:29:24
# @LastEditTime: 2024-01-29 15:49:57
# @LastEditors: zhp
# @Description:
###
@ -16,13 +16,12 @@ VUE_APP_TITLE = MES系统
# VUE_APP_BASE_API = 'http://10.70.2.2:8080'
# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
# VUE_APP_BASE_API = 'http://192.168.1.20:48080'
# VUE_APP_BASE_API = 'http://192.168.1.20:48080'
# VUE_APP_BASE_API = 'http://192.168.2.173:48080'
# VUE_APP_BASE_API = 'http://192.168.1.49:48082'
# VUE_APP_BASE_API = 'http://192.168.1.8:48082'
# VUE_APP_BASE_API = 'http://192.168.4.159:48080'
# 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.1.104: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'

View File

@ -1,7 +1,7 @@
/*
* @Author: zhp
* @Date: 2023-12-04 14:10:37
* @LastEditTime: 2024-01-29 16:48:40
* @LastEditTime: 2024-01-29 10:42:49
* @LastEditors: zhp
* @Description:
*/
@ -77,15 +77,8 @@ export function getListByLineSection(query) {
export function getUserList(query) {
return request({
url: 'base/quality-inspection-box-btn-auth/getUserList',
url: 'system/user/page',
method: 'get',
params: query,
})
}
export function getPage(query) {
return request({
url: 'base/quality-inspection-box-btn-auth/page',
method: 'post',
data:query
})
}

View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-07-19 15:18:30
* @LastEditors: zhp
* @LastEditTime: 2024-01-29 16:17:04
* @LastEditTime: 2024-01-29 15:29:39
* @Description:
-->
<template>
@ -835,7 +835,7 @@ export default {
console.log(ele)
nameList.push(item.name)
outputNumList.push(ele.outputNum)
passRateList.push(ele.passRate)
passRateList.push(ele.passRate * 100)
}
}
})

View File

@ -27,7 +27,7 @@ import {
updateQualityInspectionBoxBtn,
deleteQualityInspectionBoxBtn,
getQualityInspectionBoxBtn,
getPage,
getQualityInspectionBoxBtnPage,
exportQualityInspectionBoxBtnExcel,
getUserList
} from '@/api/base/qualityInspectionBoxPermissions';
@ -42,7 +42,7 @@ export default {
data() {
return {
urlOptions: {
getDataListURL: getPage,
getDataListURL: getQualityInspectionBoxBtnPage,
deleteURL: deleteQualityInspectionBoxBtn,
// exportURL: exportFactoryExcel,
},
@ -115,8 +115,7 @@ export default {
listQuery: {
pageNo: 1,
pageSize: 10,
userName: null,
nickName:null
inspectionDetContent: null,
},
addOrUpdateVisible: false,
addOrEditTitle:'',
@ -134,17 +133,17 @@ export default {
};
},
created() {
// this.getDict()
this.getDict()
},
methods: {
// getDict() {
// // getUserList({
// // pageNo: 1,
// // pageSize:999
// // }).then((res) => {
// // this.searchBarFormConfig[0].selectOptions = res.data
// // })
// },
getDict() {
getUserList({
pageNo: 1,
pageSize:999
}).then((res) => {
this.searchBarFormConfig[0].selectOptions = res.data
})
},
getDataList() {
this.dataListLoading = true;
this.urlOptions.getDataListURL(this.listQuery).then(response => {