diff --git a/src/views/hiddenUtil/safetyFlowChart.vue b/src/views/hiddenUtil/safetyFlowChart.vue index 718c6be..d8caccb 100644 --- a/src/views/hiddenUtil/safetyFlowChart.vue +++ b/src/views/hiddenUtil/safetyFlowChart.vue @@ -58,7 +58,7 @@ export default { methods: { init(row) { this.SuperFlowData.dialogVisible = true - // this.getInformation(row) + this.getInformation(row) }, getInformation(row) { this.Loading = true diff --git a/src/views/safetyenvironmental/archive/components/info.vue b/src/views/safetyenvironmental/archive/components/info.vue index 48be245..6be671b 100644 --- a/src/views/safetyenvironmental/archive/components/info.vue +++ b/src/views/safetyenvironmental/archive/components/info.vue @@ -231,7 +231,7 @@ export default { this.iframeSrc = this.config.weburl + 'static/mapshow.html?t=' + Math.random() }, async mounted() { - // await this.getData() + await this.getData() }, methods: { formatTime(date, column) { @@ -244,7 +244,7 @@ export default { getData() { return new Promise((resolve) => { requestFN( - '/safetyenvironmental/goShow', + '/safetyenvironmental/V2/goShow', { INSPECTION_ID: this.$parent.INSPECTION_ID } diff --git a/src/views/safetyenvironmental/archive/components/list.vue b/src/views/safetyenvironmental/archive/components/list.vue index 35069a4..6996fae 100644 --- a/src/views/safetyenvironmental/archive/components/list.vue +++ b/src/views/safetyenvironmental/archive/components/list.vue @@ -92,8 +92,8 @@ align="center"/> - - + + @@ -210,23 +210,23 @@ export default { /** 获取列表 */ getList() { this.listLoading = true - // requestFN( - // '/safetyenvironmental/checkList?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, - // { - // ...this.search, - // ARCHIVE_USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID, - // INSPECTION_TIME_START: this.search.INSPECTION_TIME[0], - // INSPECTION_TIME_END: this.search.INSPECTION_TIME[1] - // } - // ).then((data) => { - // this.listLoading = false - // this.varList = data.varList - // this.total = data.page.totalResult - // this.hasButton() - // this.pd = data.pd - // }).catch((e) => { - // this.listLoading = false - // }) + requestFN( + '/safetyenvironmental/checkList?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, + { + ...this.search, + ARCHIVE_USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID, + INSPECTION_TIME_START: this.search.INSPECTION_TIME[0], + INSPECTION_TIME_END: this.search.INSPECTION_TIME[1] + } + ).then((data) => { + this.listLoading = false + this.varList = data.varList + this.total = data.page.totalResult + this.hasButton() + this.pd = data.pd + }).catch((e) => { + this.listLoading = false + }) setTimeout(() => { this.listLoading = false diff --git a/src/views/safetyenvironmental/inspected/components/list.vue b/src/views/safetyenvironmental/inspected/components/list.vue index 88c24e7..d98ad9d 100644 --- a/src/views/safetyenvironmental/inspected/components/list.vue +++ b/src/views/safetyenvironmental/inspected/components/list.vue @@ -98,7 +98,7 @@ - + @@ -292,22 +292,22 @@ export default { /** 获取列表 */ getList() { this.listLoading = true - // requestFN( - // '/safetyenvironmentalexplain/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, - // { - // ...this.search, - // INSPECTION_TIME_START: this.search.INSPECTION_TIME[0], - // INSPECTION_TIME_END: this.search.INSPECTION_TIME[1] - // } - // ).then((data) => { - // this.listLoading = false - // this.varList = data.varList - // this.total = data.page.totalResult - // this.hasButton() - // this.pd = data.pd - // }).catch((e) => { - // this.listLoading = false - // }) + requestFN( + '/safetyenvironmental/V2/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, + { + ...this.search, + INSPECTION_TIME_START: this.search.INSPECTION_TIME[0], + INSPECTION_TIME_END: this.search.INSPECTION_TIME[1] + } + ).then((data) => { + this.listLoading = false + this.varList = data.varList + this.total = data.page.totalResult + this.hasButton() + this.pd = data.pd + }).catch((e) => { + this.listLoading = false + }) setTimeout(() => { this.listLoading = false @@ -344,7 +344,7 @@ export default { hiddenCount(INSPECTION_ID) { this.listLoading = true requestFN( - '/safetyenvironmentalexplain/hiddencount', + '/safetyenvironmental/V2/hiddencount', { INSPECTION_ID: INSPECTION_ID } diff --git a/src/views/safetyenvironmental/inspection/components/add.vue b/src/views/safetyenvironmental/inspection/components/add.vue index 171e4eb..3136d79 100644 --- a/src/views/safetyenvironmental/inspection/components/add.vue +++ b/src/views/safetyenvironmental/inspection/components/add.vue @@ -548,8 +548,8 @@ export default { await this.handleAdd() await this.getDict() await this.resetForm() - // await this.getDictTreeData() - // await this.getHiddenReginTreeList() + await this.getDictTreeData() + await this.getHiddenReginTreeList() // await this.getEditMyInfo() await this.closeLoading(loading) }, @@ -1029,7 +1029,7 @@ export default { getDictTreeData() { return new Promise((resolve) => { requestFN( - '/department/listTreeCorpDept', + '/department/listzTree', {} ).then((data) => { this.treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes') diff --git a/src/views/safetyenvironmental/inspection/components/info.vue b/src/views/safetyenvironmental/inspection/components/info.vue index f6b8f20..20562f6 100644 --- a/src/views/safetyenvironmental/inspection/components/info.vue +++ b/src/views/safetyenvironmental/inspection/components/info.vue @@ -287,7 +287,7 @@ export default { this.iframeSrc = this.config.weburl + 'static/mapshow.html?t=' + Math.random() }, async mounted() { - // await this.getData() + await this.getData() }, methods: { formatTime(date, column) { @@ -306,7 +306,7 @@ export default { getData() { return new Promise((resolve) => { requestFN( - '/safetyenvironmental/goShow', + '/safetyenvironmental/V2/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 6aa360d..6b746e3 100644 --- a/src/views/safetyenvironmental/inspection/components/list.vue +++ b/src/views/safetyenvironmental/inspection/components/list.vue @@ -128,7 +128,7 @@ - + @@ -226,7 +226,6 @@ import waves from '@/directive/waves' import WriteSign from '@/components/WriteSign' import SelectTree from '@/components/SelectTree' import safetyFlowChart from '../../../hiddenUtil/safetyFlowChart' -import { inspectionList } from './../Mock' export default { components: { Pagination, WriteSign, safetyFlowChart, SelectTree }, @@ -235,7 +234,7 @@ export default { return { userInfo: JSON.parse(sessionStorage.getItem('user')), listLoading: false, - add: false, + add: true, del: false, edit: false, INSPECT_NAME: '安全环保总数：', @@ -360,29 +359,24 @@ export default { /** 获取列表 */ getList() { this.listLoading = true - // requestFN( - // '/safetyenvironmental/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, - // { - // ...this.search, - // INSPECTION_TIME_START: this.search.INSPECTION_TIME[0], - // INSPECTION_TIME_END: this.search.INSPECTION_TIME[1] - // } - // ).then((data) => { - // this.listLoading = false - // this.varList = data.varList - // this.safetyTotal = data.safetyTotal - // this.hiddenTotal = data.hiddenTotal - // this.total = data.page.totalResult - // this.hasButton() - // this.pd = data.pd - // }).catch((e) => { - // this.listLoading = false - // }) - setTimeout(() => { + requestFN( + '/safetyenvironmental/V2/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, + { + ...this.search, + INSPECTION_TIME_START: this.search.INSPECTION_TIME[0], + INSPECTION_TIME_END: this.search.INSPECTION_TIME[1] + } + ).then((data) => { this.listLoading = false - this.varList = inspectionList - this.total = inspectionList.length - }, 400) + this.varList = data.varList + this.safetyTotal = data.safetyTotal + this.hiddenTotal = data.hiddenTotal + this.total = data.page.totalResult + this.hasButton() + this.pd = data.pd + }).catch((e) => { + this.listLoading = false + }) }, /** 新建检查 */ handleAdd() { @@ -398,6 +392,7 @@ export default { goDetail(row) { this.$parent.activeName = 'Info' this.$parent.INSPECTION_ID = row.INSPECTION_ID + console.log("==================") }, /** 开启流程图 */ checkFlow(row) { @@ -479,7 +474,7 @@ export default { }).then(() => { this.listLoading = true requestFN( - '/safetyenvironmental/hide', + '/safetyenvironmental/V2/hide', { INSPECTION_ID: id, hide: '1' @@ -576,6 +571,7 @@ export default { {} ).then((data) => { this.treeData = JSON.parse(data.zTreeNodes) + console.info(this.treeData) }).catch((e) => { }) }, diff --git a/src/views/safetyenvironmental/inspector/components/list.vue b/src/views/safetyenvironmental/inspector/components/list.vue index 9b268c3..cd4baaa 100644 --- a/src/views/safetyenvironmental/inspector/components/list.vue +++ b/src/views/safetyenvironmental/inspector/components/list.vue @@ -93,7 +93,7 @@ align="center"/> - + @@ -121,7 +121,7 @@