diff --git a/src/api/base/insert.js b/src/api/base/insert.js index acabce7..6ced9b3 100644 --- a/src/api/base/insert.js +++ b/src/api/base/insert.js @@ -50,7 +50,7 @@ export const editEdgeDeviceApi = (data) => { /** 根据id查询边代设备 */ export const queryEdgeDeviceByIdApi = (id) => { - return request.get(`/base/tbBdRecord/${id}`) + return request.get(`/base/tbBdRecord/getInner/${id}`) } /** 删除边代设备 */ diff --git a/src/components/TableModel/index.vue b/src/components/TableModel/index.vue index 2c1d577..be96bbb 100644 --- a/src/components/TableModel/index.vue +++ b/src/components/TableModel/index.vue @@ -1,540 +1,457 @@ diff --git a/src/views/base/edgeInsert/components/form-insert-all.vue b/src/views/base/edgeInsert/components/form-insert-all.vue index a47eb9d..1048155 100644 --- a/src/views/base/edgeInsert/components/form-insert-all.vue +++ b/src/views/base/edgeInsert/components/form-insert-all.vue @@ -145,9 +145,9 @@ export default { // this.projectParams.remarks = '' // 查询所属设备 queryEdgeDeviceByIdApi(this.editParams.id).then(res => { - this.projectParams.auditUserName = res.data.auditUserName - res.data.recordList.forEach(item => { + res.rows.forEach(item => { this.$refs.tableRef.tableList.unshift(item) + this.projectParams.auditUserName = item.auditUserName }) }).catch(err => {}) this.subSort = 2 diff --git a/src/views/base/edgeInsert/components/form-insert-approve.vue b/src/views/base/edgeInsert/components/form-insert-approve.vue index f6a5e30..46eb07b 100644 --- a/src/views/base/edgeInsert/components/form-insert-approve.vue +++ b/src/views/base/edgeInsert/components/form-insert-approve.vue @@ -132,7 +132,7 @@ export default { this.projectParams.remarks = '' // 查询所属设备 queryEdgeDeviceByIdApi(this.editParams.id).then(res => { - res.data.recordList.forEach(item => { + res.rows.forEach(item => { this.$refs.tableRef.tableList.unshift(item) }) }).catch(err => {}) diff --git a/src/views/base/edgeInsert/components/form-insert.vue b/src/views/base/edgeInsert/components/form-insert.vue index 62ae288..74e9351 100644 --- a/src/views/base/edgeInsert/components/form-insert.vue +++ b/src/views/base/edgeInsert/components/form-insert.vue @@ -151,7 +151,7 @@ export default { Object.assign(this.projectParams, this.editParams) // 查询所属设备 queryEdgeDeviceByIdApi(this.editParams.id).then(res => { - res.data.recordList.forEach(item => { + res.rows.forEach(item => { this.$refs.tableRef.tableList.unshift(item) }) }).catch(err => {}) diff --git a/src/views/base/edgeInsert/config.js b/src/views/base/edgeInsert/config.js index 2dd0fd5..ef5dbb2 100644 --- a/src/views/base/edgeInsert/config.js +++ b/src/views/base/edgeInsert/config.js @@ -2,7 +2,7 @@ export const formLabel = [ { f_label: '项目部名称', f_model: 'departName', f_type: 'ipt' }, { f_label: '工程名称', f_model: 'proName', f_type: 'ipt' }, { f_label: '申请人', f_model: 'relUser', f_type: 'ipt' }, - { f_label: '申请时间', f_model: 'auditStatus', f_type: 'date', }, + { f_label: '申请时间', f_model: 'applyTime', f_type: 'date', }, ] export const columnsList = [ { t_props: 'departName', t_label: '申请项目部', }, diff --git a/src/views/base/edgeInsert/index.vue b/src/views/base/edgeInsert/index.vue index 2c58b5a..9c3536e 100644 --- a/src/views/base/edgeInsert/index.vue +++ b/src/views/base/edgeInsert/index.vue @@ -134,6 +134,7 @@ export default { }, handleExamData(v) { this.editParams = v + console.log(v) this.dialogConfigApprove.outerVisible = true this.dialogConfigApprove.outerTitle = '审核' // this.dialogConfig.dialogWidth = '50%' diff --git a/src/views/base/warnAlert/config.js b/src/views/base/warnAlert/config.js index c70ad8e..aefe169 100644 --- a/src/views/base/warnAlert/config.js +++ b/src/views/base/warnAlert/config.js @@ -15,8 +15,7 @@ import { export const formLabel = [ { f_label: '设备名称', f_model: 'devName', f_type: 'ipt' }, { f_label: '设备类型', f_model: 'devType', f_type: 'sel',f_selList: [] }, - { f_label: '预警日期', f_model: 'startTime', f_type: 'dateRange' }, - + { f_label: '预警日期', f_model: 'time', f_type: 'dateRange' , dateType:['startTime','endTime']}, ] export const columnsList = [