diff --git a/src/api/base/proj.js b/src/api/base/proj.js index 63b22b0..39c0e09 100644 --- a/src/api/base/proj.js +++ b/src/api/base/proj.js @@ -10,6 +10,13 @@ export const queryProjListApi = (data) => { }) } +/** 工程类型查询 */ +export const queryProjTypeApi = (data) => { + return request.get('/base/tbProDepart/getDataList', { + params: data + }) +} + /** 工程名称查询 */ export const queryProjNameApi = (data) => { return request.get('/base/tbProject/getList', { diff --git a/src/views/base/edgeInsert/components/form-insert-all.vue b/src/views/base/edgeInsert/components/form-insert-all.vue index 004acf1..df6da58 100644 --- a/src/views/base/edgeInsert/components/form-insert-all.vue +++ b/src/views/base/edgeInsert/components/form-insert-all.vue @@ -60,8 +60,8 @@ - - + + - - + + @@ -145,6 +145,7 @@ export default { // this.projectParams.remarks = '' // 查询所属设备 queryEdgeDeviceByIdApi(this.editParams.id).then(res => { + this.projectParams.auditUserName = res.data.auditUserName res.data.recordList.forEach(item => { this.$refs.tableRef.tableList.unshift(item) }) @@ -320,7 +321,7 @@ export default { this.$modal.msgSuccess('操作成功') this.$emit('closeDialogApprove', true) } - + } }) }, @@ -337,7 +338,7 @@ export default { } }) }, - + }, } diff --git a/src/views/base/proj/components/form-project.vue b/src/views/base/proj/components/form-project.vue index 20f0eab..aac9da5 100644 --- a/src/views/base/proj/components/form-project.vue +++ b/src/views/base/proj/components/form-project.vue @@ -151,6 +151,7 @@ import { addProjApi, editProjApi, queryProjNameApi, + queryProjTypeApi, queryDeptApi, queryVolLevelApi } from '@/api/base/proj' @@ -286,6 +287,16 @@ export default { lat: item.lat } }) + // 获取工程类型下拉选 + let typeRes = await queryProjTypeApi({ + dictType: 'pro_type' + }) + /* this.provinceRange = provinceRes.data.map(item => { + return { + label: item.areaName, + value: item.areaId + } + }) */ // 获取省份下拉选 let provinceRes = await queryProvincesApi() this.provinceRange = provinceRes.data.map(item => {