diff --git a/src/views/safetyenvironmental/archive/components/info.vue b/src/views/safetyenvironmental/archive/components/info.vue index 6be671b..5e0703d 100644 --- a/src/views/safetyenvironmental/archive/components/info.vue +++ b/src/views/safetyenvironmental/archive/components/info.vue @@ -244,7 +244,7 @@ export default { getData() { return new Promise((resolve) => { requestFN( - '/safetyenvironmental/V2/goShow', + '/safetyenvironmental/goShow', { INSPECTION_ID: this.$parent.INSPECTION_ID } diff --git a/src/views/safetyenvironmental/inspected/components/list.vue b/src/views/safetyenvironmental/inspected/components/list.vue index d98ad9d..f784ce2 100644 --- a/src/views/safetyenvironmental/inspected/components/list.vue +++ b/src/views/safetyenvironmental/inspected/components/list.vue @@ -142,7 +142,6 @@
- @@ -191,7 +190,6 @@ import waves from '@/directive/waves' // waves directive import { upload } from '@/utils/upload' import formatDate from '@/utils/dateformat' import SelectTree from '@/components/SelectTree' -import { inspectedList } from '../Mock' export default { components: { Pagination, WriteSign, SelectTree }, @@ -293,7 +291,7 @@ export default { getList() { this.listLoading = true requestFN( - '/safetyenvironmental/V2/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, + '/safetyenvironmental/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, { ...this.search, INSPECTION_TIME_START: this.search.INSPECTION_TIME[0], @@ -302,7 +300,7 @@ export default { ).then((data) => { this.listLoading = false this.varList = data.varList - this.total = data.page.totalResult + this.total = data.page.totalCount this.hasButton() this.pd = data.pd }).catch((e) => { @@ -323,7 +321,7 @@ export default { /** 处理确认按钮 */ handleConfirm(row) { this.resetForm(row) - this.hiddenCount(row.INSPECTION_ID) + // this.hiddenCount(row.INSPECTION_ID) this.dialogFormEdit = true }, /** 上传文件前的钩子处理函数 */ @@ -344,7 +342,7 @@ export default { hiddenCount(INSPECTION_ID) { this.listLoading = true requestFN( - '/safetyenvironmental/V2/hiddencount', + '/safetyenvironmental/hiddencount', { INSPECTION_ID: INSPECTION_ID } diff --git a/src/views/safetyenvironmental/inspection/components/info.vue b/src/views/safetyenvironmental/inspection/components/info.vue index 20562f6..2f3d3bb 100644 --- a/src/views/safetyenvironmental/inspection/components/info.vue +++ b/src/views/safetyenvironmental/inspection/components/info.vue @@ -306,7 +306,7 @@ export default { getData() { return new Promise((resolve) => { requestFN( - '/safetyenvironmental/V2/goShow', + '/safetyenvironmental/goShow', { INSPECTION_ID: this.$parent.INSPECTION_ID } diff --git a/src/views/safetyenvironmental/inspection/components/list.vue b/src/views/safetyenvironmental/inspection/components/list.vue index 6b746e3..76367a3 100644 --- a/src/views/safetyenvironmental/inspection/components/list.vue +++ b/src/views/safetyenvironmental/inspection/components/list.vue @@ -99,7 +99,7 @@ {{ INSPECT_NAME }}{{ safetyTotal }} - {{ INSPECT_NAME }}{{ safetyTotal }} + {{ INSPECT_NAME }}{{ total }} 涉及隐患总数:{{ hiddenTotal }} @@ -360,7 +360,7 @@ export default { getList() { this.listLoading = true requestFN( - '/safetyenvironmental/V2/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, + '/safetyenvironmental/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, { ...this.search, INSPECTION_TIME_START: this.search.INSPECTION_TIME[0], @@ -371,7 +371,7 @@ export default { this.varList = data.varList this.safetyTotal = data.safetyTotal this.hiddenTotal = data.hiddenTotal - this.total = data.page.totalResult + this.total = data.page.totalCount this.hasButton() this.pd = data.pd }).catch((e) => { @@ -474,7 +474,7 @@ export default { }).then(() => { this.listLoading = true requestFN( - '/safetyenvironmental/V2/hide', + '/safetyenvironmental/hide', { INSPECTION_ID: id, hide: '1' diff --git a/src/views/safetyenvironmental/inspector/components/list.vue b/src/views/safetyenvironmental/inspector/components/list.vue index cd4baaa..1bd133e 100644 --- a/src/views/safetyenvironmental/inspector/components/list.vue +++ b/src/views/safetyenvironmental/inspector/components/list.vue @@ -92,7 +92,7 @@ fiexd="left" align="center"/> - + @@ -121,7 +121,7 @@