diff --git a/src/api/yg/jbxx.js b/src/api/yg/jbxx.js index 945cd00..3275467 100644 --- a/src/api/yg/jbxx.js +++ b/src/api/yg/jbxx.js @@ -1,5 +1,21 @@ import request from '@/utils/request' +// 饼图 +export function getPie() { + return request({ + url: '/yg/jbxx/getPie', + method: 'get', + }) +} + +// 柱状图图 +export function getHistogram() { + return request({ + url: '/yg/jbxx/getHistogram', + method: 'get', + }) +} + // 查询水闸安全管理基本信息列表 export function listJbxx(query) { return request({ diff --git a/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/transform.vue b/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/transform.vue index d77b5e0..1e0561a 100644 --- a/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/transform.vue +++ b/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/transform.vue @@ -635,7 +635,7 @@ export default { } }); } else { - this.form.wageId = this.inFo.id; + this.form.wagaId = this.inFo.id; addHzxx(this.form).then((response) => { if (response.code === 200) { this.msgSuccess("新增成功"); diff --git a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/transform.vue b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/transform.vue index 4d9f43a..a1aee74 100644 --- a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/transform.vue +++ b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/transform.vue @@ -272,6 +272,7 @@ export default { fileList1: [], fileList2: [], visible: false, + remark: "", }; }, created() { @@ -487,7 +488,7 @@ export default { } }); // } else { - // this.form.wageId = this.inFo.id; + // this.form.wagaId = this.inFo.id; // addHzxx(this.form).then((response) => { // if (response.code === 200) { // this.msgSuccess("新增成功"); @@ -503,6 +504,7 @@ export default { notPass() { console.log("审核不通过"); this.form.status = "1"; + this.form.remark = this.remark; updateHzxx(this.form).then((response) => { if (response.code === 200) { this.msgSuccess("审核不通过"); diff --git a/src/views/safetyManage/floodControlManagement/sluice/tissue.vue b/src/views/safetyManage/floodControlManagement/sluice/tissue.vue index da7b0ca..5e5b697 100644 --- a/src/views/safetyManage/floodControlManagement/sluice/tissue.vue +++ b/src/views/safetyManage/floodControlManagement/sluice/tissue.vue @@ -126,8 +126,8 @@ { diff --git a/src/views/safetyManage/responsiblePersonManage/sluice/index.vue b/src/views/safetyManage/responsiblePersonManage/sluice/index.vue index c1d8d72..5883a35 100644 --- a/src/views/safetyManage/responsiblePersonManage/sluice/index.vue +++ b/src/views/safetyManage/responsiblePersonManage/sluice/index.vue @@ -112,8 +112,8 @@ @@ -441,7 +441,7 @@ export default { this.loading = false; }); }, - wageIdFormat(row) { + wagaIdFormat(row) { const id = row.wagaId; // const name = await new Promise(function (resolve, reject) { // getJbxx(id).then((res) => {