@@ -1,7 +1,7 @@ | |||||
### | ### | ||||
# @Author: Do not edit | # @Author: Do not edit | ||||
# @Date: 2023-08-29 09:40:39 | # @Date: 2023-08-29 09:40:39 | ||||
# @LastEditTime: 2024-01-29 15:49:57 | |||||
# @LastEditTime: 2024-01-29 16:29:24 | |||||
# @LastEditors: zhp | # @LastEditors: zhp | ||||
# @Description: | # @Description: | ||||
### | ### | ||||
@@ -1,7 +1,7 @@ | |||||
/* | /* | ||||
* @Author: zhp | * @Author: zhp | ||||
* @Date: 2023-12-04 14:10:37 | * @Date: 2023-12-04 14:10:37 | ||||
* @LastEditTime: 2024-01-29 10:42:49 | |||||
* @LastEditTime: 2024-01-29 16:48:40 | |||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @Description: | * @Description: | ||||
*/ | */ | ||||
@@ -77,8 +77,15 @@ export function getListByLineSection(query) { | |||||
export function getUserList(query) { | export function getUserList(query) { | ||||
return request({ | return request({ | ||||
url: 'system/user/page', | |||||
url: 'base/quality-inspection-box-btn-auth/getUserList', | |||||
method: 'get', | method: 'get', | ||||
params: query, | params: query, | ||||
}) | }) | ||||
} | } | ||||
export function getPage(query) { | |||||
return request({ | |||||
url: 'base/quality-inspection-box-btn-auth/page', | |||||
method: 'post', | |||||
data:query | |||||
}) | |||||
} |
@@ -2,7 +2,7 @@ | |||||
* @Author: zwq | * @Author: zwq | ||||
* @Date: 2021-07-19 15:18:30 | * @Date: 2021-07-19 15:18:30 | ||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @LastEditTime: 2024-01-29 15:29:39 | |||||
* @LastEditTime: 2024-01-29 16:17:04 | |||||
* @Description: | * @Description: | ||||
--> | --> | ||||
<template> | <template> | ||||
@@ -835,7 +835,7 @@ export default { | |||||
console.log(ele) | console.log(ele) | ||||
nameList.push(item.name) | nameList.push(item.name) | ||||
outputNumList.push(ele.outputNum) | outputNumList.push(ele.outputNum) | ||||
passRateList.push(ele.passRate * 100) | |||||
passRateList.push(ele.passRate) | |||||
} | } | ||||
} | } | ||||
}) | }) | ||||
@@ -27,7 +27,7 @@ import { | |||||
updateQualityInspectionBoxBtn, | updateQualityInspectionBoxBtn, | ||||
deleteQualityInspectionBoxBtn, | deleteQualityInspectionBoxBtn, | ||||
getQualityInspectionBoxBtn, | getQualityInspectionBoxBtn, | ||||
getQualityInspectionBoxBtnPage, | |||||
getPage, | |||||
exportQualityInspectionBoxBtnExcel, | exportQualityInspectionBoxBtnExcel, | ||||
getUserList | getUserList | ||||
} from '@/api/base/qualityInspectionBoxPermissions'; | } from '@/api/base/qualityInspectionBoxPermissions'; | ||||
@@ -42,7 +42,7 @@ export default { | |||||
data() { | data() { | ||||
return { | return { | ||||
urlOptions: { | urlOptions: { | ||||
getDataListURL: getQualityInspectionBoxBtnPage, | |||||
getDataListURL: getPage, | |||||
deleteURL: deleteQualityInspectionBoxBtn, | deleteURL: deleteQualityInspectionBoxBtn, | ||||
// exportURL: exportFactoryExcel, | // exportURL: exportFactoryExcel, | ||||
}, | }, | ||||
@@ -115,7 +115,8 @@ export default { | |||||
listQuery: { | listQuery: { | ||||
pageNo: 1, | pageNo: 1, | ||||
pageSize: 10, | pageSize: 10, | ||||
inspectionDetContent: null, | |||||
userName: null, | |||||
nickName:null | |||||
}, | }, | ||||
addOrUpdateVisible: false, | addOrUpdateVisible: false, | ||||
addOrEditTitle:'', | addOrEditTitle:'', | ||||
@@ -133,17 +134,17 @@ export default { | |||||
}; | }; | ||||
}, | }, | ||||
created() { | created() { | ||||
this.getDict() | |||||
// this.getDict() | |||||
}, | }, | ||||
methods: { | 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() { | getDataList() { | ||||
this.dataListLoading = true; | this.dataListLoading = true; | ||||
this.urlOptions.getDataListURL(this.listQuery).then(response => { | this.urlOptions.getDataListURL(this.listQuery).then(response => { | ||||