diff --git a/src/api/busAdmin/areaPersonliable.js b/src/api/busAdmin/areaPersonliable.js new file mode 100644 index 0000000..58737bb --- /dev/null +++ b/src/api/busAdmin/areaPersonliable.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +export function getAreaPersonliableList(params) { + return request({ + url: '/areaPersonliable/listPage', + method: 'get', + params + }) +} + +export function addAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/add', + method: 'post', + params + }) +} + +export function updateAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/update', + method: 'post', + params + }) +} + +export function deleteAreaPersonliable(id) { + return request({ + url: '/areaPersonliable/delete', + method: 'post', + params: { + id: id + } + }) +} + +export function getSupervisorList() { + return request({ + url: '/mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} diff --git a/src/api/busAdmin/areaPersonliable.js b/src/api/busAdmin/areaPersonliable.js new file mode 100644 index 0000000..58737bb --- /dev/null +++ b/src/api/busAdmin/areaPersonliable.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +export function getAreaPersonliableList(params) { + return request({ + url: '/areaPersonliable/listPage', + method: 'get', + params + }) +} + +export function addAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/add', + method: 'post', + params + }) +} + +export function updateAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/update', + method: 'post', + params + }) +} + +export function deleteAreaPersonliable(id) { + return request({ + url: '/areaPersonliable/delete', + method: 'post', + params: { + id: id + } + }) +} + +export function getSupervisorList() { + return request({ + url: '/mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} diff --git a/src/api/callCase/callCase.js b/src/api/callCase/callCase.js new file mode 100644 index 0000000..7500fc7 --- /dev/null +++ b/src/api/callCase/callCase.js @@ -0,0 +1,87 @@ +/** + * 新建案卷的接口 + */ +import request from '@/utils/request' + +// 获取案卷信息来源 +export function getCaseSource(params) { + return request({ + url: 'dict/code/caseSource', + method: 'get', + params + }) +} + +// 获取案卷等级 +export function getCaseLevel(params) { + return request({ + url: 'dict/code/caseLevel', + method: 'get', + params + }) +} + +// 获取案卷类别 +export function getCaseEorC(params) { + return request({ + url: 'dict/code/eorc', + method: 'get', + params + }) +} + +// 根据案卷类别获取案卷大类 +export function getCaseType(eorc) { + return request({ + url: 'case/type/list', + method: 'get', + params: { + eorc: eorc + } + }) +} + +// 根据案卷大类获取案卷小类 +export function getCaseDetailType(caseTypeId) { + return request({ + url: 'case/typeDetail/list', + method: 'get', + params: { + typeId: caseTypeId + } + }) +} + +// 根据案卷小类获取结案标准 +export function getCaseTypesTime(caseTypeDetailId) { + return request({ + url: 'case/typesTime/list', + method: 'get', + params: { + detailId: caseTypeDetailId + } + }) +} + +// 获取监督员列表 +export function getVerifyPerson(params) { + return request({ + url: 'mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} + +// 新增案卷 +export function addCase(params) { + return request({ + url: 'case/add', + method: 'post', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' + }, + params + }) +} diff --git a/src/api/busAdmin/areaPersonliable.js b/src/api/busAdmin/areaPersonliable.js new file mode 100644 index 0000000..58737bb --- /dev/null +++ b/src/api/busAdmin/areaPersonliable.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +export function getAreaPersonliableList(params) { + return request({ + url: '/areaPersonliable/listPage', + method: 'get', + params + }) +} + +export function addAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/add', + method: 'post', + params + }) +} + +export function updateAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/update', + method: 'post', + params + }) +} + +export function deleteAreaPersonliable(id) { + return request({ + url: '/areaPersonliable/delete', + method: 'post', + params: { + id: id + } + }) +} + +export function getSupervisorList() { + return request({ + url: '/mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} diff --git a/src/api/callCase/callCase.js b/src/api/callCase/callCase.js new file mode 100644 index 0000000..7500fc7 --- /dev/null +++ b/src/api/callCase/callCase.js @@ -0,0 +1,87 @@ +/** + * 新建案卷的接口 + */ +import request from '@/utils/request' + +// 获取案卷信息来源 +export function getCaseSource(params) { + return request({ + url: 'dict/code/caseSource', + method: 'get', + params + }) +} + +// 获取案卷等级 +export function getCaseLevel(params) { + return request({ + url: 'dict/code/caseLevel', + method: 'get', + params + }) +} + +// 获取案卷类别 +export function getCaseEorC(params) { + return request({ + url: 'dict/code/eorc', + method: 'get', + params + }) +} + +// 根据案卷类别获取案卷大类 +export function getCaseType(eorc) { + return request({ + url: 'case/type/list', + method: 'get', + params: { + eorc: eorc + } + }) +} + +// 根据案卷大类获取案卷小类 +export function getCaseDetailType(caseTypeId) { + return request({ + url: 'case/typeDetail/list', + method: 'get', + params: { + typeId: caseTypeId + } + }) +} + +// 根据案卷小类获取结案标准 +export function getCaseTypesTime(caseTypeDetailId) { + return request({ + url: 'case/typesTime/list', + method: 'get', + params: { + detailId: caseTypeDetailId + } + }) +} + +// 获取监督员列表 +export function getVerifyPerson(params) { + return request({ + url: 'mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} + +// 新增案卷 +export function addCase(params) { + return request({ + url: 'case/add', + method: 'post', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' + }, + params + }) +} diff --git a/src/api/coorBusiness/case.js b/src/api/coorBusiness/case.js index ec5a88a..08c3a13 100644 --- a/src/api/coorBusiness/case.js +++ b/src/api/coorBusiness/case.js @@ -110,9 +110,10 @@ }) } +// 待处理 export function toHandleListPage(params) { return request({ - url: 'case/toHandleListPage/', + url: 'case/toProcessListPage/', method: 'get', params }) @@ -158,9 +159,10 @@ }) } +// 待核查 export function toCheckListPage(params) { return request({ - url: 'case/toCheckListPage/', + url: 'case/toDisCheckListPage/', method: 'get', params }) diff --git a/src/api/busAdmin/areaPersonliable.js b/src/api/busAdmin/areaPersonliable.js new file mode 100644 index 0000000..58737bb --- /dev/null +++ b/src/api/busAdmin/areaPersonliable.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +export function getAreaPersonliableList(params) { + return request({ + url: '/areaPersonliable/listPage', + method: 'get', + params + }) +} + +export function addAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/add', + method: 'post', + params + }) +} + +export function updateAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/update', + method: 'post', + params + }) +} + +export function deleteAreaPersonliable(id) { + return request({ + url: '/areaPersonliable/delete', + method: 'post', + params: { + id: id + } + }) +} + +export function getSupervisorList() { + return request({ + url: '/mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} diff --git a/src/api/callCase/callCase.js b/src/api/callCase/callCase.js new file mode 100644 index 0000000..7500fc7 --- /dev/null +++ b/src/api/callCase/callCase.js @@ -0,0 +1,87 @@ +/** + * 新建案卷的接口 + */ +import request from '@/utils/request' + +// 获取案卷信息来源 +export function getCaseSource(params) { + return request({ + url: 'dict/code/caseSource', + method: 'get', + params + }) +} + +// 获取案卷等级 +export function getCaseLevel(params) { + return request({ + url: 'dict/code/caseLevel', + method: 'get', + params + }) +} + +// 获取案卷类别 +export function getCaseEorC(params) { + return request({ + url: 'dict/code/eorc', + method: 'get', + params + }) +} + +// 根据案卷类别获取案卷大类 +export function getCaseType(eorc) { + return request({ + url: 'case/type/list', + method: 'get', + params: { + eorc: eorc + } + }) +} + +// 根据案卷大类获取案卷小类 +export function getCaseDetailType(caseTypeId) { + return request({ + url: 'case/typeDetail/list', + method: 'get', + params: { + typeId: caseTypeId + } + }) +} + +// 根据案卷小类获取结案标准 +export function getCaseTypesTime(caseTypeDetailId) { + return request({ + url: 'case/typesTime/list', + method: 'get', + params: { + detailId: caseTypeDetailId + } + }) +} + +// 获取监督员列表 +export function getVerifyPerson(params) { + return request({ + url: 'mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} + +// 新增案卷 +export function addCase(params) { + return request({ + url: 'case/add', + method: 'post', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' + }, + params + }) +} diff --git a/src/api/coorBusiness/case.js b/src/api/coorBusiness/case.js index ec5a88a..08c3a13 100644 --- a/src/api/coorBusiness/case.js +++ b/src/api/coorBusiness/case.js @@ -110,9 +110,10 @@ }) } +// 待处理 export function toHandleListPage(params) { return request({ - url: 'case/toHandleListPage/', + url: 'case/toProcessListPage/', method: 'get', params }) @@ -158,9 +159,10 @@ }) } +// 待核查 export function toCheckListPage(params) { return request({ - url: 'case/toCheckListPage/', + url: 'case/toDisCheckListPage/', method: 'get', params }) diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index f6c23ab..fdadcba 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -276,7 +276,7 @@
数据流转:
- + @@ -293,7 +293,7 @@ :append-to-body="true" title="位置详情" > - + @@ -303,12 +303,12 @@ import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case' import { getCommonLanguage, getFilingTypeList, getCaseLevelList } from '@/api/coorBusiness/dict' import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process' -import ArcGisMap from '@/components/Map/arcgisMap' +import ArcGisMapRead from '@/components/Map/arcgisMapRead' import { radioMap } from './radioMap' export default { name: 'CaseDetail', - components: { ArcGisMap }, + components: { ArcGisMapRead }, // props: { // id: { // type: String, @@ -334,7 +334,6 @@ showNeedVisit: false, caseDetail: {}, operationKey: '', // 案件处理按钮key - imgurl: 'http:\\\\192.168.8.201:8083\\static\\', fileIdVerify: [], // 核实照片id fileIdProcess: [], // 处理照片id fileIdCheck: [], // 核查照片id @@ -358,10 +357,12 @@ computed: { isNeedVisit: function() { return this.caseDetail.isNeedRevisit === 1 ? '需要回访' : '不需要回访' + }, + imgurl() { + return process.env.BASE_API + '/static/' } }, - mounted() { - console.log('case dtial') + created() { this.id = this.$route.query.id this.showProcess = (this.$route.query.showProcess || this.$route.query.showProcess === false) ? this.$route.query.showProcess : true this.showNeedVisit = this.$route.query.showNeedVisit ? this.$route.query.showNeedVisit : false @@ -371,7 +372,6 @@ async initData() { // 查询案件详情接口 const resDetail = await getCaseDetail(this.id) - console.log('detail', resDetail) this.caseDetail = resDetail.data[0] // 解析图片id @@ -391,9 +391,11 @@ // 查询流转记录接口 this.processForm.processId = this.caseDetail.processId - const resRecord = await historicalRecords(this.processForm.processId) - this.recordList = resRecord.data - console.log(this.recordList) + // const resRecord = historicalRecords(this.processForm.processId) + // this.recordList = resRecord.data + historicalRecords(this.processForm.processId).then(res => { + this.recordList = res.data + }) if (this.showProcess) { this.initProcess() @@ -701,6 +703,7 @@ .table{ margin: 20px; width: 98%; + // max-height: 250px; } .title{ margin-left: 38px; diff --git a/src/api/busAdmin/areaPersonliable.js b/src/api/busAdmin/areaPersonliable.js new file mode 100644 index 0000000..58737bb --- /dev/null +++ b/src/api/busAdmin/areaPersonliable.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +export function getAreaPersonliableList(params) { + return request({ + url: '/areaPersonliable/listPage', + method: 'get', + params + }) +} + +export function addAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/add', + method: 'post', + params + }) +} + +export function updateAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/update', + method: 'post', + params + }) +} + +export function deleteAreaPersonliable(id) { + return request({ + url: '/areaPersonliable/delete', + method: 'post', + params: { + id: id + } + }) +} + +export function getSupervisorList() { + return request({ + url: '/mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} diff --git a/src/api/callCase/callCase.js b/src/api/callCase/callCase.js new file mode 100644 index 0000000..7500fc7 --- /dev/null +++ b/src/api/callCase/callCase.js @@ -0,0 +1,87 @@ +/** + * 新建案卷的接口 + */ +import request from '@/utils/request' + +// 获取案卷信息来源 +export function getCaseSource(params) { + return request({ + url: 'dict/code/caseSource', + method: 'get', + params + }) +} + +// 获取案卷等级 +export function getCaseLevel(params) { + return request({ + url: 'dict/code/caseLevel', + method: 'get', + params + }) +} + +// 获取案卷类别 +export function getCaseEorC(params) { + return request({ + url: 'dict/code/eorc', + method: 'get', + params + }) +} + +// 根据案卷类别获取案卷大类 +export function getCaseType(eorc) { + return request({ + url: 'case/type/list', + method: 'get', + params: { + eorc: eorc + } + }) +} + +// 根据案卷大类获取案卷小类 +export function getCaseDetailType(caseTypeId) { + return request({ + url: 'case/typeDetail/list', + method: 'get', + params: { + typeId: caseTypeId + } + }) +} + +// 根据案卷小类获取结案标准 +export function getCaseTypesTime(caseTypeDetailId) { + return request({ + url: 'case/typesTime/list', + method: 'get', + params: { + detailId: caseTypeDetailId + } + }) +} + +// 获取监督员列表 +export function getVerifyPerson(params) { + return request({ + url: 'mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} + +// 新增案卷 +export function addCase(params) { + return request({ + url: 'case/add', + method: 'post', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' + }, + params + }) +} diff --git a/src/api/coorBusiness/case.js b/src/api/coorBusiness/case.js index ec5a88a..08c3a13 100644 --- a/src/api/coorBusiness/case.js +++ b/src/api/coorBusiness/case.js @@ -110,9 +110,10 @@ }) } +// 待处理 export function toHandleListPage(params) { return request({ - url: 'case/toHandleListPage/', + url: 'case/toProcessListPage/', method: 'get', params }) @@ -158,9 +159,10 @@ }) } +// 待核查 export function toCheckListPage(params) { return request({ - url: 'case/toCheckListPage/', + url: 'case/toDisCheckListPage/', method: 'get', params }) diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index f6c23ab..fdadcba 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -276,7 +276,7 @@
数据流转:
- + @@ -293,7 +293,7 @@ :append-to-body="true" title="位置详情" > - + @@ -303,12 +303,12 @@ import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case' import { getCommonLanguage, getFilingTypeList, getCaseLevelList } from '@/api/coorBusiness/dict' import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process' -import ArcGisMap from '@/components/Map/arcgisMap' +import ArcGisMapRead from '@/components/Map/arcgisMapRead' import { radioMap } from './radioMap' export default { name: 'CaseDetail', - components: { ArcGisMap }, + components: { ArcGisMapRead }, // props: { // id: { // type: String, @@ -334,7 +334,6 @@ showNeedVisit: false, caseDetail: {}, operationKey: '', // 案件处理按钮key - imgurl: 'http:\\\\192.168.8.201:8083\\static\\', fileIdVerify: [], // 核实照片id fileIdProcess: [], // 处理照片id fileIdCheck: [], // 核查照片id @@ -358,10 +357,12 @@ computed: { isNeedVisit: function() { return this.caseDetail.isNeedRevisit === 1 ? '需要回访' : '不需要回访' + }, + imgurl() { + return process.env.BASE_API + '/static/' } }, - mounted() { - console.log('case dtial') + created() { this.id = this.$route.query.id this.showProcess = (this.$route.query.showProcess || this.$route.query.showProcess === false) ? this.$route.query.showProcess : true this.showNeedVisit = this.$route.query.showNeedVisit ? this.$route.query.showNeedVisit : false @@ -371,7 +372,6 @@ async initData() { // 查询案件详情接口 const resDetail = await getCaseDetail(this.id) - console.log('detail', resDetail) this.caseDetail = resDetail.data[0] // 解析图片id @@ -391,9 +391,11 @@ // 查询流转记录接口 this.processForm.processId = this.caseDetail.processId - const resRecord = await historicalRecords(this.processForm.processId) - this.recordList = resRecord.data - console.log(this.recordList) + // const resRecord = historicalRecords(this.processForm.processId) + // this.recordList = resRecord.data + historicalRecords(this.processForm.processId).then(res => { + this.recordList = res.data + }) if (this.showProcess) { this.initProcess() @@ -701,6 +703,7 @@ .table{ margin: 20px; width: 98%; + // max-height: 250px; } .title{ margin-left: 38px; diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue index 4b536ad..7221e10 100644 --- a/src/components/CaseCommon/caseDetailRead.vue +++ b/src/components/CaseCommon/caseDetailRead.vue @@ -158,11 +158,11 @@ diff --git a/src/api/busAdmin/areaPersonliable.js b/src/api/busAdmin/areaPersonliable.js new file mode 100644 index 0000000..58737bb --- /dev/null +++ b/src/api/busAdmin/areaPersonliable.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +export function getAreaPersonliableList(params) { + return request({ + url: '/areaPersonliable/listPage', + method: 'get', + params + }) +} + +export function addAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/add', + method: 'post', + params + }) +} + +export function updateAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/update', + method: 'post', + params + }) +} + +export function deleteAreaPersonliable(id) { + return request({ + url: '/areaPersonliable/delete', + method: 'post', + params: { + id: id + } + }) +} + +export function getSupervisorList() { + return request({ + url: '/mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} diff --git a/src/api/callCase/callCase.js b/src/api/callCase/callCase.js new file mode 100644 index 0000000..7500fc7 --- /dev/null +++ b/src/api/callCase/callCase.js @@ -0,0 +1,87 @@ +/** + * 新建案卷的接口 + */ +import request from '@/utils/request' + +// 获取案卷信息来源 +export function getCaseSource(params) { + return request({ + url: 'dict/code/caseSource', + method: 'get', + params + }) +} + +// 获取案卷等级 +export function getCaseLevel(params) { + return request({ + url: 'dict/code/caseLevel', + method: 'get', + params + }) +} + +// 获取案卷类别 +export function getCaseEorC(params) { + return request({ + url: 'dict/code/eorc', + method: 'get', + params + }) +} + +// 根据案卷类别获取案卷大类 +export function getCaseType(eorc) { + return request({ + url: 'case/type/list', + method: 'get', + params: { + eorc: eorc + } + }) +} + +// 根据案卷大类获取案卷小类 +export function getCaseDetailType(caseTypeId) { + return request({ + url: 'case/typeDetail/list', + method: 'get', + params: { + typeId: caseTypeId + } + }) +} + +// 根据案卷小类获取结案标准 +export function getCaseTypesTime(caseTypeDetailId) { + return request({ + url: 'case/typesTime/list', + method: 'get', + params: { + detailId: caseTypeDetailId + } + }) +} + +// 获取监督员列表 +export function getVerifyPerson(params) { + return request({ + url: 'mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} + +// 新增案卷 +export function addCase(params) { + return request({ + url: 'case/add', + method: 'post', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' + }, + params + }) +} diff --git a/src/api/coorBusiness/case.js b/src/api/coorBusiness/case.js index ec5a88a..08c3a13 100644 --- a/src/api/coorBusiness/case.js +++ b/src/api/coorBusiness/case.js @@ -110,9 +110,10 @@ }) } +// 待处理 export function toHandleListPage(params) { return request({ - url: 'case/toHandleListPage/', + url: 'case/toProcessListPage/', method: 'get', params }) @@ -158,9 +159,10 @@ }) } +// 待核查 export function toCheckListPage(params) { return request({ - url: 'case/toCheckListPage/', + url: 'case/toDisCheckListPage/', method: 'get', params }) diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index f6c23ab..fdadcba 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -276,7 +276,7 @@
数据流转:
- + @@ -293,7 +293,7 @@ :append-to-body="true" title="位置详情" > - + @@ -303,12 +303,12 @@ import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case' import { getCommonLanguage, getFilingTypeList, getCaseLevelList } from '@/api/coorBusiness/dict' import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process' -import ArcGisMap from '@/components/Map/arcgisMap' +import ArcGisMapRead from '@/components/Map/arcgisMapRead' import { radioMap } from './radioMap' export default { name: 'CaseDetail', - components: { ArcGisMap }, + components: { ArcGisMapRead }, // props: { // id: { // type: String, @@ -334,7 +334,6 @@ showNeedVisit: false, caseDetail: {}, operationKey: '', // 案件处理按钮key - imgurl: 'http:\\\\192.168.8.201:8083\\static\\', fileIdVerify: [], // 核实照片id fileIdProcess: [], // 处理照片id fileIdCheck: [], // 核查照片id @@ -358,10 +357,12 @@ computed: { isNeedVisit: function() { return this.caseDetail.isNeedRevisit === 1 ? '需要回访' : '不需要回访' + }, + imgurl() { + return process.env.BASE_API + '/static/' } }, - mounted() { - console.log('case dtial') + created() { this.id = this.$route.query.id this.showProcess = (this.$route.query.showProcess || this.$route.query.showProcess === false) ? this.$route.query.showProcess : true this.showNeedVisit = this.$route.query.showNeedVisit ? this.$route.query.showNeedVisit : false @@ -371,7 +372,6 @@ async initData() { // 查询案件详情接口 const resDetail = await getCaseDetail(this.id) - console.log('detail', resDetail) this.caseDetail = resDetail.data[0] // 解析图片id @@ -391,9 +391,11 @@ // 查询流转记录接口 this.processForm.processId = this.caseDetail.processId - const resRecord = await historicalRecords(this.processForm.processId) - this.recordList = resRecord.data - console.log(this.recordList) + // const resRecord = historicalRecords(this.processForm.processId) + // this.recordList = resRecord.data + historicalRecords(this.processForm.processId).then(res => { + this.recordList = res.data + }) if (this.showProcess) { this.initProcess() @@ -701,6 +703,7 @@ .table{ margin: 20px; width: 98%; + // max-height: 250px; } .title{ margin-left: 38px; diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue index 4b536ad..7221e10 100644 --- a/src/components/CaseCommon/caseDetailRead.vue +++ b/src/components/CaseCommon/caseDetailRead.vue @@ -158,11 +158,11 @@ diff --git a/src/router/index.js b/src/router/index.js index b265a48..1c80473 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -11,6 +11,7 @@ import { systemRouters } from './modules/system' import { cooRouters } from './modules/coo' import { commenetRouters } from './modules/comment' +import { suphandleRouters } from './modules/suphandle' import { commonRouters } from './modules/common' /** @@ -90,6 +91,7 @@ export const asyncRouterMap = [ ...commonRouters, ...cooRouters, + ...suphandleRouters, ...systemRouters, ...commenetRouters, { path: '*', redirect: '/404', hidden: true, meta: {}} diff --git a/src/api/busAdmin/areaPersonliable.js b/src/api/busAdmin/areaPersonliable.js new file mode 100644 index 0000000..58737bb --- /dev/null +++ b/src/api/busAdmin/areaPersonliable.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +export function getAreaPersonliableList(params) { + return request({ + url: '/areaPersonliable/listPage', + method: 'get', + params + }) +} + +export function addAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/add', + method: 'post', + params + }) +} + +export function updateAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/update', + method: 'post', + params + }) +} + +export function deleteAreaPersonliable(id) { + return request({ + url: '/areaPersonliable/delete', + method: 'post', + params: { + id: id + } + }) +} + +export function getSupervisorList() { + return request({ + url: '/mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} diff --git a/src/api/callCase/callCase.js b/src/api/callCase/callCase.js new file mode 100644 index 0000000..7500fc7 --- /dev/null +++ b/src/api/callCase/callCase.js @@ -0,0 +1,87 @@ +/** + * 新建案卷的接口 + */ +import request from '@/utils/request' + +// 获取案卷信息来源 +export function getCaseSource(params) { + return request({ + url: 'dict/code/caseSource', + method: 'get', + params + }) +} + +// 获取案卷等级 +export function getCaseLevel(params) { + return request({ + url: 'dict/code/caseLevel', + method: 'get', + params + }) +} + +// 获取案卷类别 +export function getCaseEorC(params) { + return request({ + url: 'dict/code/eorc', + method: 'get', + params + }) +} + +// 根据案卷类别获取案卷大类 +export function getCaseType(eorc) { + return request({ + url: 'case/type/list', + method: 'get', + params: { + eorc: eorc + } + }) +} + +// 根据案卷大类获取案卷小类 +export function getCaseDetailType(caseTypeId) { + return request({ + url: 'case/typeDetail/list', + method: 'get', + params: { + typeId: caseTypeId + } + }) +} + +// 根据案卷小类获取结案标准 +export function getCaseTypesTime(caseTypeDetailId) { + return request({ + url: 'case/typesTime/list', + method: 'get', + params: { + detailId: caseTypeDetailId + } + }) +} + +// 获取监督员列表 +export function getVerifyPerson(params) { + return request({ + url: 'mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} + +// 新增案卷 +export function addCase(params) { + return request({ + url: 'case/add', + method: 'post', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' + }, + params + }) +} diff --git a/src/api/coorBusiness/case.js b/src/api/coorBusiness/case.js index ec5a88a..08c3a13 100644 --- a/src/api/coorBusiness/case.js +++ b/src/api/coorBusiness/case.js @@ -110,9 +110,10 @@ }) } +// 待处理 export function toHandleListPage(params) { return request({ - url: 'case/toHandleListPage/', + url: 'case/toProcessListPage/', method: 'get', params }) @@ -158,9 +159,10 @@ }) } +// 待核查 export function toCheckListPage(params) { return request({ - url: 'case/toCheckListPage/', + url: 'case/toDisCheckListPage/', method: 'get', params }) diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index f6c23ab..fdadcba 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -276,7 +276,7 @@
数据流转:
- + @@ -293,7 +293,7 @@ :append-to-body="true" title="位置详情" > - + @@ -303,12 +303,12 @@ import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case' import { getCommonLanguage, getFilingTypeList, getCaseLevelList } from '@/api/coorBusiness/dict' import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process' -import ArcGisMap from '@/components/Map/arcgisMap' +import ArcGisMapRead from '@/components/Map/arcgisMapRead' import { radioMap } from './radioMap' export default { name: 'CaseDetail', - components: { ArcGisMap }, + components: { ArcGisMapRead }, // props: { // id: { // type: String, @@ -334,7 +334,6 @@ showNeedVisit: false, caseDetail: {}, operationKey: '', // 案件处理按钮key - imgurl: 'http:\\\\192.168.8.201:8083\\static\\', fileIdVerify: [], // 核实照片id fileIdProcess: [], // 处理照片id fileIdCheck: [], // 核查照片id @@ -358,10 +357,12 @@ computed: { isNeedVisit: function() { return this.caseDetail.isNeedRevisit === 1 ? '需要回访' : '不需要回访' + }, + imgurl() { + return process.env.BASE_API + '/static/' } }, - mounted() { - console.log('case dtial') + created() { this.id = this.$route.query.id this.showProcess = (this.$route.query.showProcess || this.$route.query.showProcess === false) ? this.$route.query.showProcess : true this.showNeedVisit = this.$route.query.showNeedVisit ? this.$route.query.showNeedVisit : false @@ -371,7 +372,6 @@ async initData() { // 查询案件详情接口 const resDetail = await getCaseDetail(this.id) - console.log('detail', resDetail) this.caseDetail = resDetail.data[0] // 解析图片id @@ -391,9 +391,11 @@ // 查询流转记录接口 this.processForm.processId = this.caseDetail.processId - const resRecord = await historicalRecords(this.processForm.processId) - this.recordList = resRecord.data - console.log(this.recordList) + // const resRecord = historicalRecords(this.processForm.processId) + // this.recordList = resRecord.data + historicalRecords(this.processForm.processId).then(res => { + this.recordList = res.data + }) if (this.showProcess) { this.initProcess() @@ -701,6 +703,7 @@ .table{ margin: 20px; width: 98%; + // max-height: 250px; } .title{ margin-left: 38px; diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue index 4b536ad..7221e10 100644 --- a/src/components/CaseCommon/caseDetailRead.vue +++ b/src/components/CaseCommon/caseDetailRead.vue @@ -158,11 +158,11 @@ diff --git a/src/router/index.js b/src/router/index.js index b265a48..1c80473 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -11,6 +11,7 @@ import { systemRouters } from './modules/system' import { cooRouters } from './modules/coo' import { commenetRouters } from './modules/comment' +import { suphandleRouters } from './modules/suphandle' import { commonRouters } from './modules/common' /** @@ -90,6 +91,7 @@ export const asyncRouterMap = [ ...commonRouters, ...cooRouters, + ...suphandleRouters, ...systemRouters, ...commenetRouters, { path: '*', redirect: '/404', hidden: true, meta: {}} diff --git a/src/router/modules/suphandle.js b/src/router/modules/suphandle.js new file mode 100644 index 0000000..7026a7b --- /dev/null +++ b/src/router/modules/suphandle.js @@ -0,0 +1,35 @@ +/* Layout */ +import Layout from '../../views/layout/Layout' +export const suphandleRouters = [ + { + path: '/suphandle', + name: 'suphandle', + redirect: '/accessDept', + hidden: true, + meta: { + title: '监督受理子系统', + permission: ['/suphandle'], + isSys: true + } + }, + { + path: '/callBus', + component: Layout, + redirect: '/callBus', + name: 'CallBus', + alwaysShow: true, + meta: { + title: '呼叫业务', + permission: ['/callBus'], + sys: '/suphandle' + }, + children: [ + { + path: '/callCase', + component: () => import('@/views/callCase/callCase'), + name: 'CallCase', + meta: { title: '建立案卷', icon: '', belongSys: '', permission: '/callCase' } + } + ] + } +] diff --git a/src/api/busAdmin/areaPersonliable.js b/src/api/busAdmin/areaPersonliable.js new file mode 100644 index 0000000..58737bb --- /dev/null +++ b/src/api/busAdmin/areaPersonliable.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +export function getAreaPersonliableList(params) { + return request({ + url: '/areaPersonliable/listPage', + method: 'get', + params + }) +} + +export function addAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/add', + method: 'post', + params + }) +} + +export function updateAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/update', + method: 'post', + params + }) +} + +export function deleteAreaPersonliable(id) { + return request({ + url: '/areaPersonliable/delete', + method: 'post', + params: { + id: id + } + }) +} + +export function getSupervisorList() { + return request({ + url: '/mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} diff --git a/src/api/callCase/callCase.js b/src/api/callCase/callCase.js new file mode 100644 index 0000000..7500fc7 --- /dev/null +++ b/src/api/callCase/callCase.js @@ -0,0 +1,87 @@ +/** + * 新建案卷的接口 + */ +import request from '@/utils/request' + +// 获取案卷信息来源 +export function getCaseSource(params) { + return request({ + url: 'dict/code/caseSource', + method: 'get', + params + }) +} + +// 获取案卷等级 +export function getCaseLevel(params) { + return request({ + url: 'dict/code/caseLevel', + method: 'get', + params + }) +} + +// 获取案卷类别 +export function getCaseEorC(params) { + return request({ + url: 'dict/code/eorc', + method: 'get', + params + }) +} + +// 根据案卷类别获取案卷大类 +export function getCaseType(eorc) { + return request({ + url: 'case/type/list', + method: 'get', + params: { + eorc: eorc + } + }) +} + +// 根据案卷大类获取案卷小类 +export function getCaseDetailType(caseTypeId) { + return request({ + url: 'case/typeDetail/list', + method: 'get', + params: { + typeId: caseTypeId + } + }) +} + +// 根据案卷小类获取结案标准 +export function getCaseTypesTime(caseTypeDetailId) { + return request({ + url: 'case/typesTime/list', + method: 'get', + params: { + detailId: caseTypeDetailId + } + }) +} + +// 获取监督员列表 +export function getVerifyPerson(params) { + return request({ + url: 'mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} + +// 新增案卷 +export function addCase(params) { + return request({ + url: 'case/add', + method: 'post', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' + }, + params + }) +} diff --git a/src/api/coorBusiness/case.js b/src/api/coorBusiness/case.js index ec5a88a..08c3a13 100644 --- a/src/api/coorBusiness/case.js +++ b/src/api/coorBusiness/case.js @@ -110,9 +110,10 @@ }) } +// 待处理 export function toHandleListPage(params) { return request({ - url: 'case/toHandleListPage/', + url: 'case/toProcessListPage/', method: 'get', params }) @@ -158,9 +159,10 @@ }) } +// 待核查 export function toCheckListPage(params) { return request({ - url: 'case/toCheckListPage/', + url: 'case/toDisCheckListPage/', method: 'get', params }) diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index f6c23ab..fdadcba 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -276,7 +276,7 @@
数据流转:
- + @@ -293,7 +293,7 @@ :append-to-body="true" title="位置详情" > - + @@ -303,12 +303,12 @@ import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case' import { getCommonLanguage, getFilingTypeList, getCaseLevelList } from '@/api/coorBusiness/dict' import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process' -import ArcGisMap from '@/components/Map/arcgisMap' +import ArcGisMapRead from '@/components/Map/arcgisMapRead' import { radioMap } from './radioMap' export default { name: 'CaseDetail', - components: { ArcGisMap }, + components: { ArcGisMapRead }, // props: { // id: { // type: String, @@ -334,7 +334,6 @@ showNeedVisit: false, caseDetail: {}, operationKey: '', // 案件处理按钮key - imgurl: 'http:\\\\192.168.8.201:8083\\static\\', fileIdVerify: [], // 核实照片id fileIdProcess: [], // 处理照片id fileIdCheck: [], // 核查照片id @@ -358,10 +357,12 @@ computed: { isNeedVisit: function() { return this.caseDetail.isNeedRevisit === 1 ? '需要回访' : '不需要回访' + }, + imgurl() { + return process.env.BASE_API + '/static/' } }, - mounted() { - console.log('case dtial') + created() { this.id = this.$route.query.id this.showProcess = (this.$route.query.showProcess || this.$route.query.showProcess === false) ? this.$route.query.showProcess : true this.showNeedVisit = this.$route.query.showNeedVisit ? this.$route.query.showNeedVisit : false @@ -371,7 +372,6 @@ async initData() { // 查询案件详情接口 const resDetail = await getCaseDetail(this.id) - console.log('detail', resDetail) this.caseDetail = resDetail.data[0] // 解析图片id @@ -391,9 +391,11 @@ // 查询流转记录接口 this.processForm.processId = this.caseDetail.processId - const resRecord = await historicalRecords(this.processForm.processId) - this.recordList = resRecord.data - console.log(this.recordList) + // const resRecord = historicalRecords(this.processForm.processId) + // this.recordList = resRecord.data + historicalRecords(this.processForm.processId).then(res => { + this.recordList = res.data + }) if (this.showProcess) { this.initProcess() @@ -701,6 +703,7 @@ .table{ margin: 20px; width: 98%; + // max-height: 250px; } .title{ margin-left: 38px; diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue index 4b536ad..7221e10 100644 --- a/src/components/CaseCommon/caseDetailRead.vue +++ b/src/components/CaseCommon/caseDetailRead.vue @@ -158,11 +158,11 @@ diff --git a/src/router/index.js b/src/router/index.js index b265a48..1c80473 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -11,6 +11,7 @@ import { systemRouters } from './modules/system' import { cooRouters } from './modules/coo' import { commenetRouters } from './modules/comment' +import { suphandleRouters } from './modules/suphandle' import { commonRouters } from './modules/common' /** @@ -90,6 +91,7 @@ export const asyncRouterMap = [ ...commonRouters, ...cooRouters, + ...suphandleRouters, ...systemRouters, ...commenetRouters, { path: '*', redirect: '/404', hidden: true, meta: {}} diff --git a/src/router/modules/suphandle.js b/src/router/modules/suphandle.js new file mode 100644 index 0000000..7026a7b --- /dev/null +++ b/src/router/modules/suphandle.js @@ -0,0 +1,35 @@ +/* Layout */ +import Layout from '../../views/layout/Layout' +export const suphandleRouters = [ + { + path: '/suphandle', + name: 'suphandle', + redirect: '/accessDept', + hidden: true, + meta: { + title: '监督受理子系统', + permission: ['/suphandle'], + isSys: true + } + }, + { + path: '/callBus', + component: Layout, + redirect: '/callBus', + name: 'CallBus', + alwaysShow: true, + meta: { + title: '呼叫业务', + permission: ['/callBus'], + sys: '/suphandle' + }, + children: [ + { + path: '/callCase', + component: () => import('@/views/callCase/callCase'), + name: 'CallCase', + meta: { title: '建立案卷', icon: '', belongSys: '', permission: '/callCase' } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 10bff2e..c80b732 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -48,6 +48,12 @@ component: () => import('@/views/busAdmin/userDevice/userDevice'), name: 'UserDevice', meta: { title: '终端设备管理', icon: '', permission: ['/userDevice'] } + }, + { + path: '/areaPersonliable', + component: () => import('@/views/busAdmin/areaPersonliable/areaPersonliable'), + name: 'AreaPersonliable', + meta: { title: '网格责任人管理', icon: '', permission: ['/areaPersonliable'] } } ] }, diff --git a/src/api/busAdmin/areaPersonliable.js b/src/api/busAdmin/areaPersonliable.js new file mode 100644 index 0000000..58737bb --- /dev/null +++ b/src/api/busAdmin/areaPersonliable.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +export function getAreaPersonliableList(params) { + return request({ + url: '/areaPersonliable/listPage', + method: 'get', + params + }) +} + +export function addAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/add', + method: 'post', + params + }) +} + +export function updateAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/update', + method: 'post', + params + }) +} + +export function deleteAreaPersonliable(id) { + return request({ + url: '/areaPersonliable/delete', + method: 'post', + params: { + id: id + } + }) +} + +export function getSupervisorList() { + return request({ + url: '/mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} diff --git a/src/api/callCase/callCase.js b/src/api/callCase/callCase.js new file mode 100644 index 0000000..7500fc7 --- /dev/null +++ b/src/api/callCase/callCase.js @@ -0,0 +1,87 @@ +/** + * 新建案卷的接口 + */ +import request from '@/utils/request' + +// 获取案卷信息来源 +export function getCaseSource(params) { + return request({ + url: 'dict/code/caseSource', + method: 'get', + params + }) +} + +// 获取案卷等级 +export function getCaseLevel(params) { + return request({ + url: 'dict/code/caseLevel', + method: 'get', + params + }) +} + +// 获取案卷类别 +export function getCaseEorC(params) { + return request({ + url: 'dict/code/eorc', + method: 'get', + params + }) +} + +// 根据案卷类别获取案卷大类 +export function getCaseType(eorc) { + return request({ + url: 'case/type/list', + method: 'get', + params: { + eorc: eorc + } + }) +} + +// 根据案卷大类获取案卷小类 +export function getCaseDetailType(caseTypeId) { + return request({ + url: 'case/typeDetail/list', + method: 'get', + params: { + typeId: caseTypeId + } + }) +} + +// 根据案卷小类获取结案标准 +export function getCaseTypesTime(caseTypeDetailId) { + return request({ + url: 'case/typesTime/list', + method: 'get', + params: { + detailId: caseTypeDetailId + } + }) +} + +// 获取监督员列表 +export function getVerifyPerson(params) { + return request({ + url: 'mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} + +// 新增案卷 +export function addCase(params) { + return request({ + url: 'case/add', + method: 'post', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' + }, + params + }) +} diff --git a/src/api/coorBusiness/case.js b/src/api/coorBusiness/case.js index ec5a88a..08c3a13 100644 --- a/src/api/coorBusiness/case.js +++ b/src/api/coorBusiness/case.js @@ -110,9 +110,10 @@ }) } +// 待处理 export function toHandleListPage(params) { return request({ - url: 'case/toHandleListPage/', + url: 'case/toProcessListPage/', method: 'get', params }) @@ -158,9 +159,10 @@ }) } +// 待核查 export function toCheckListPage(params) { return request({ - url: 'case/toCheckListPage/', + url: 'case/toDisCheckListPage/', method: 'get', params }) diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index f6c23ab..fdadcba 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -276,7 +276,7 @@
数据流转:
- + @@ -293,7 +293,7 @@ :append-to-body="true" title="位置详情" > - + @@ -303,12 +303,12 @@ import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case' import { getCommonLanguage, getFilingTypeList, getCaseLevelList } from '@/api/coorBusiness/dict' import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process' -import ArcGisMap from '@/components/Map/arcgisMap' +import ArcGisMapRead from '@/components/Map/arcgisMapRead' import { radioMap } from './radioMap' export default { name: 'CaseDetail', - components: { ArcGisMap }, + components: { ArcGisMapRead }, // props: { // id: { // type: String, @@ -334,7 +334,6 @@ showNeedVisit: false, caseDetail: {}, operationKey: '', // 案件处理按钮key - imgurl: 'http:\\\\192.168.8.201:8083\\static\\', fileIdVerify: [], // 核实照片id fileIdProcess: [], // 处理照片id fileIdCheck: [], // 核查照片id @@ -358,10 +357,12 @@ computed: { isNeedVisit: function() { return this.caseDetail.isNeedRevisit === 1 ? '需要回访' : '不需要回访' + }, + imgurl() { + return process.env.BASE_API + '/static/' } }, - mounted() { - console.log('case dtial') + created() { this.id = this.$route.query.id this.showProcess = (this.$route.query.showProcess || this.$route.query.showProcess === false) ? this.$route.query.showProcess : true this.showNeedVisit = this.$route.query.showNeedVisit ? this.$route.query.showNeedVisit : false @@ -371,7 +372,6 @@ async initData() { // 查询案件详情接口 const resDetail = await getCaseDetail(this.id) - console.log('detail', resDetail) this.caseDetail = resDetail.data[0] // 解析图片id @@ -391,9 +391,11 @@ // 查询流转记录接口 this.processForm.processId = this.caseDetail.processId - const resRecord = await historicalRecords(this.processForm.processId) - this.recordList = resRecord.data - console.log(this.recordList) + // const resRecord = historicalRecords(this.processForm.processId) + // this.recordList = resRecord.data + historicalRecords(this.processForm.processId).then(res => { + this.recordList = res.data + }) if (this.showProcess) { this.initProcess() @@ -701,6 +703,7 @@ .table{ margin: 20px; width: 98%; + // max-height: 250px; } .title{ margin-left: 38px; diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue index 4b536ad..7221e10 100644 --- a/src/components/CaseCommon/caseDetailRead.vue +++ b/src/components/CaseCommon/caseDetailRead.vue @@ -158,11 +158,11 @@ diff --git a/src/router/index.js b/src/router/index.js index b265a48..1c80473 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -11,6 +11,7 @@ import { systemRouters } from './modules/system' import { cooRouters } from './modules/coo' import { commenetRouters } from './modules/comment' +import { suphandleRouters } from './modules/suphandle' import { commonRouters } from './modules/common' /** @@ -90,6 +91,7 @@ export const asyncRouterMap = [ ...commonRouters, ...cooRouters, + ...suphandleRouters, ...systemRouters, ...commenetRouters, { path: '*', redirect: '/404', hidden: true, meta: {}} diff --git a/src/router/modules/suphandle.js b/src/router/modules/suphandle.js new file mode 100644 index 0000000..7026a7b --- /dev/null +++ b/src/router/modules/suphandle.js @@ -0,0 +1,35 @@ +/* Layout */ +import Layout from '../../views/layout/Layout' +export const suphandleRouters = [ + { + path: '/suphandle', + name: 'suphandle', + redirect: '/accessDept', + hidden: true, + meta: { + title: '监督受理子系统', + permission: ['/suphandle'], + isSys: true + } + }, + { + path: '/callBus', + component: Layout, + redirect: '/callBus', + name: 'CallBus', + alwaysShow: true, + meta: { + title: '呼叫业务', + permission: ['/callBus'], + sys: '/suphandle' + }, + children: [ + { + path: '/callCase', + component: () => import('@/views/callCase/callCase'), + name: 'CallCase', + meta: { title: '建立案卷', icon: '', belongSys: '', permission: '/callCase' } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 10bff2e..c80b732 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -48,6 +48,12 @@ component: () => import('@/views/busAdmin/userDevice/userDevice'), name: 'UserDevice', meta: { title: '终端设备管理', icon: '', permission: ['/userDevice'] } + }, + { + path: '/areaPersonliable', + component: () => import('@/views/busAdmin/areaPersonliable/areaPersonliable'), + name: 'AreaPersonliable', + meta: { title: '网格责任人管理', icon: '', permission: ['/areaPersonliable'] } } ] }, diff --git a/src/views/busAdmin/areaPersonliable/areaPersonliable.vue b/src/views/busAdmin/areaPersonliable/areaPersonliable.vue new file mode 100644 index 0000000..23a26de --- /dev/null +++ b/src/views/busAdmin/areaPersonliable/areaPersonliable.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/api/busAdmin/areaPersonliable.js b/src/api/busAdmin/areaPersonliable.js new file mode 100644 index 0000000..58737bb --- /dev/null +++ b/src/api/busAdmin/areaPersonliable.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +export function getAreaPersonliableList(params) { + return request({ + url: '/areaPersonliable/listPage', + method: 'get', + params + }) +} + +export function addAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/add', + method: 'post', + params + }) +} + +export function updateAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/update', + method: 'post', + params + }) +} + +export function deleteAreaPersonliable(id) { + return request({ + url: '/areaPersonliable/delete', + method: 'post', + params: { + id: id + } + }) +} + +export function getSupervisorList() { + return request({ + url: '/mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} diff --git a/src/api/callCase/callCase.js b/src/api/callCase/callCase.js new file mode 100644 index 0000000..7500fc7 --- /dev/null +++ b/src/api/callCase/callCase.js @@ -0,0 +1,87 @@ +/** + * 新建案卷的接口 + */ +import request from '@/utils/request' + +// 获取案卷信息来源 +export function getCaseSource(params) { + return request({ + url: 'dict/code/caseSource', + method: 'get', + params + }) +} + +// 获取案卷等级 +export function getCaseLevel(params) { + return request({ + url: 'dict/code/caseLevel', + method: 'get', + params + }) +} + +// 获取案卷类别 +export function getCaseEorC(params) { + return request({ + url: 'dict/code/eorc', + method: 'get', + params + }) +} + +// 根据案卷类别获取案卷大类 +export function getCaseType(eorc) { + return request({ + url: 'case/type/list', + method: 'get', + params: { + eorc: eorc + } + }) +} + +// 根据案卷大类获取案卷小类 +export function getCaseDetailType(caseTypeId) { + return request({ + url: 'case/typeDetail/list', + method: 'get', + params: { + typeId: caseTypeId + } + }) +} + +// 根据案卷小类获取结案标准 +export function getCaseTypesTime(caseTypeDetailId) { + return request({ + url: 'case/typesTime/list', + method: 'get', + params: { + detailId: caseTypeDetailId + } + }) +} + +// 获取监督员列表 +export function getVerifyPerson(params) { + return request({ + url: 'mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} + +// 新增案卷 +export function addCase(params) { + return request({ + url: 'case/add', + method: 'post', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' + }, + params + }) +} diff --git a/src/api/coorBusiness/case.js b/src/api/coorBusiness/case.js index ec5a88a..08c3a13 100644 --- a/src/api/coorBusiness/case.js +++ b/src/api/coorBusiness/case.js @@ -110,9 +110,10 @@ }) } +// 待处理 export function toHandleListPage(params) { return request({ - url: 'case/toHandleListPage/', + url: 'case/toProcessListPage/', method: 'get', params }) @@ -158,9 +159,10 @@ }) } +// 待核查 export function toCheckListPage(params) { return request({ - url: 'case/toCheckListPage/', + url: 'case/toDisCheckListPage/', method: 'get', params }) diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index f6c23ab..fdadcba 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -276,7 +276,7 @@
数据流转:
- + @@ -293,7 +293,7 @@ :append-to-body="true" title="位置详情" > - + @@ -303,12 +303,12 @@ import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case' import { getCommonLanguage, getFilingTypeList, getCaseLevelList } from '@/api/coorBusiness/dict' import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process' -import ArcGisMap from '@/components/Map/arcgisMap' +import ArcGisMapRead from '@/components/Map/arcgisMapRead' import { radioMap } from './radioMap' export default { name: 'CaseDetail', - components: { ArcGisMap }, + components: { ArcGisMapRead }, // props: { // id: { // type: String, @@ -334,7 +334,6 @@ showNeedVisit: false, caseDetail: {}, operationKey: '', // 案件处理按钮key - imgurl: 'http:\\\\192.168.8.201:8083\\static\\', fileIdVerify: [], // 核实照片id fileIdProcess: [], // 处理照片id fileIdCheck: [], // 核查照片id @@ -358,10 +357,12 @@ computed: { isNeedVisit: function() { return this.caseDetail.isNeedRevisit === 1 ? '需要回访' : '不需要回访' + }, + imgurl() { + return process.env.BASE_API + '/static/' } }, - mounted() { - console.log('case dtial') + created() { this.id = this.$route.query.id this.showProcess = (this.$route.query.showProcess || this.$route.query.showProcess === false) ? this.$route.query.showProcess : true this.showNeedVisit = this.$route.query.showNeedVisit ? this.$route.query.showNeedVisit : false @@ -371,7 +372,6 @@ async initData() { // 查询案件详情接口 const resDetail = await getCaseDetail(this.id) - console.log('detail', resDetail) this.caseDetail = resDetail.data[0] // 解析图片id @@ -391,9 +391,11 @@ // 查询流转记录接口 this.processForm.processId = this.caseDetail.processId - const resRecord = await historicalRecords(this.processForm.processId) - this.recordList = resRecord.data - console.log(this.recordList) + // const resRecord = historicalRecords(this.processForm.processId) + // this.recordList = resRecord.data + historicalRecords(this.processForm.processId).then(res => { + this.recordList = res.data + }) if (this.showProcess) { this.initProcess() @@ -701,6 +703,7 @@ .table{ margin: 20px; width: 98%; + // max-height: 250px; } .title{ margin-left: 38px; diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue index 4b536ad..7221e10 100644 --- a/src/components/CaseCommon/caseDetailRead.vue +++ b/src/components/CaseCommon/caseDetailRead.vue @@ -158,11 +158,11 @@ diff --git a/src/router/index.js b/src/router/index.js index b265a48..1c80473 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -11,6 +11,7 @@ import { systemRouters } from './modules/system' import { cooRouters } from './modules/coo' import { commenetRouters } from './modules/comment' +import { suphandleRouters } from './modules/suphandle' import { commonRouters } from './modules/common' /** @@ -90,6 +91,7 @@ export const asyncRouterMap = [ ...commonRouters, ...cooRouters, + ...suphandleRouters, ...systemRouters, ...commenetRouters, { path: '*', redirect: '/404', hidden: true, meta: {}} diff --git a/src/router/modules/suphandle.js b/src/router/modules/suphandle.js new file mode 100644 index 0000000..7026a7b --- /dev/null +++ b/src/router/modules/suphandle.js @@ -0,0 +1,35 @@ +/* Layout */ +import Layout from '../../views/layout/Layout' +export const suphandleRouters = [ + { + path: '/suphandle', + name: 'suphandle', + redirect: '/accessDept', + hidden: true, + meta: { + title: '监督受理子系统', + permission: ['/suphandle'], + isSys: true + } + }, + { + path: '/callBus', + component: Layout, + redirect: '/callBus', + name: 'CallBus', + alwaysShow: true, + meta: { + title: '呼叫业务', + permission: ['/callBus'], + sys: '/suphandle' + }, + children: [ + { + path: '/callCase', + component: () => import('@/views/callCase/callCase'), + name: 'CallCase', + meta: { title: '建立案卷', icon: '', belongSys: '', permission: '/callCase' } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 10bff2e..c80b732 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -48,6 +48,12 @@ component: () => import('@/views/busAdmin/userDevice/userDevice'), name: 'UserDevice', meta: { title: '终端设备管理', icon: '', permission: ['/userDevice'] } + }, + { + path: '/areaPersonliable', + component: () => import('@/views/busAdmin/areaPersonliable/areaPersonliable'), + name: 'AreaPersonliable', + meta: { title: '网格责任人管理', icon: '', permission: ['/areaPersonliable'] } } ] }, diff --git a/src/views/busAdmin/areaPersonliable/areaPersonliable.vue b/src/views/busAdmin/areaPersonliable/areaPersonliable.vue new file mode 100644 index 0000000..23a26de --- /dev/null +++ b/src/views/busAdmin/areaPersonliable/areaPersonliable.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/views/busAdmin/areaPersonliable/areaSelectTree.vue b/src/views/busAdmin/areaPersonliable/areaSelectTree.vue new file mode 100644 index 0000000..d0ba37f --- /dev/null +++ b/src/views/busAdmin/areaPersonliable/areaSelectTree.vue @@ -0,0 +1,80 @@ + + + + + + + diff --git a/src/api/busAdmin/areaPersonliable.js b/src/api/busAdmin/areaPersonliable.js new file mode 100644 index 0000000..58737bb --- /dev/null +++ b/src/api/busAdmin/areaPersonliable.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +export function getAreaPersonliableList(params) { + return request({ + url: '/areaPersonliable/listPage', + method: 'get', + params + }) +} + +export function addAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/add', + method: 'post', + params + }) +} + +export function updateAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/update', + method: 'post', + params + }) +} + +export function deleteAreaPersonliable(id) { + return request({ + url: '/areaPersonliable/delete', + method: 'post', + params: { + id: id + } + }) +} + +export function getSupervisorList() { + return request({ + url: '/mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} diff --git a/src/api/callCase/callCase.js b/src/api/callCase/callCase.js new file mode 100644 index 0000000..7500fc7 --- /dev/null +++ b/src/api/callCase/callCase.js @@ -0,0 +1,87 @@ +/** + * 新建案卷的接口 + */ +import request from '@/utils/request' + +// 获取案卷信息来源 +export function getCaseSource(params) { + return request({ + url: 'dict/code/caseSource', + method: 'get', + params + }) +} + +// 获取案卷等级 +export function getCaseLevel(params) { + return request({ + url: 'dict/code/caseLevel', + method: 'get', + params + }) +} + +// 获取案卷类别 +export function getCaseEorC(params) { + return request({ + url: 'dict/code/eorc', + method: 'get', + params + }) +} + +// 根据案卷类别获取案卷大类 +export function getCaseType(eorc) { + return request({ + url: 'case/type/list', + method: 'get', + params: { + eorc: eorc + } + }) +} + +// 根据案卷大类获取案卷小类 +export function getCaseDetailType(caseTypeId) { + return request({ + url: 'case/typeDetail/list', + method: 'get', + params: { + typeId: caseTypeId + } + }) +} + +// 根据案卷小类获取结案标准 +export function getCaseTypesTime(caseTypeDetailId) { + return request({ + url: 'case/typesTime/list', + method: 'get', + params: { + detailId: caseTypeDetailId + } + }) +} + +// 获取监督员列表 +export function getVerifyPerson(params) { + return request({ + url: 'mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} + +// 新增案卷 +export function addCase(params) { + return request({ + url: 'case/add', + method: 'post', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' + }, + params + }) +} diff --git a/src/api/coorBusiness/case.js b/src/api/coorBusiness/case.js index ec5a88a..08c3a13 100644 --- a/src/api/coorBusiness/case.js +++ b/src/api/coorBusiness/case.js @@ -110,9 +110,10 @@ }) } +// 待处理 export function toHandleListPage(params) { return request({ - url: 'case/toHandleListPage/', + url: 'case/toProcessListPage/', method: 'get', params }) @@ -158,9 +159,10 @@ }) } +// 待核查 export function toCheckListPage(params) { return request({ - url: 'case/toCheckListPage/', + url: 'case/toDisCheckListPage/', method: 'get', params }) diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index f6c23ab..fdadcba 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -276,7 +276,7 @@
数据流转:
- + @@ -293,7 +293,7 @@ :append-to-body="true" title="位置详情" > - + @@ -303,12 +303,12 @@ import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case' import { getCommonLanguage, getFilingTypeList, getCaseLevelList } from '@/api/coorBusiness/dict' import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process' -import ArcGisMap from '@/components/Map/arcgisMap' +import ArcGisMapRead from '@/components/Map/arcgisMapRead' import { radioMap } from './radioMap' export default { name: 'CaseDetail', - components: { ArcGisMap }, + components: { ArcGisMapRead }, // props: { // id: { // type: String, @@ -334,7 +334,6 @@ showNeedVisit: false, caseDetail: {}, operationKey: '', // 案件处理按钮key - imgurl: 'http:\\\\192.168.8.201:8083\\static\\', fileIdVerify: [], // 核实照片id fileIdProcess: [], // 处理照片id fileIdCheck: [], // 核查照片id @@ -358,10 +357,12 @@ computed: { isNeedVisit: function() { return this.caseDetail.isNeedRevisit === 1 ? '需要回访' : '不需要回访' + }, + imgurl() { + return process.env.BASE_API + '/static/' } }, - mounted() { - console.log('case dtial') + created() { this.id = this.$route.query.id this.showProcess = (this.$route.query.showProcess || this.$route.query.showProcess === false) ? this.$route.query.showProcess : true this.showNeedVisit = this.$route.query.showNeedVisit ? this.$route.query.showNeedVisit : false @@ -371,7 +372,6 @@ async initData() { // 查询案件详情接口 const resDetail = await getCaseDetail(this.id) - console.log('detail', resDetail) this.caseDetail = resDetail.data[0] // 解析图片id @@ -391,9 +391,11 @@ // 查询流转记录接口 this.processForm.processId = this.caseDetail.processId - const resRecord = await historicalRecords(this.processForm.processId) - this.recordList = resRecord.data - console.log(this.recordList) + // const resRecord = historicalRecords(this.processForm.processId) + // this.recordList = resRecord.data + historicalRecords(this.processForm.processId).then(res => { + this.recordList = res.data + }) if (this.showProcess) { this.initProcess() @@ -701,6 +703,7 @@ .table{ margin: 20px; width: 98%; + // max-height: 250px; } .title{ margin-left: 38px; diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue index 4b536ad..7221e10 100644 --- a/src/components/CaseCommon/caseDetailRead.vue +++ b/src/components/CaseCommon/caseDetailRead.vue @@ -158,11 +158,11 @@ diff --git a/src/router/index.js b/src/router/index.js index b265a48..1c80473 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -11,6 +11,7 @@ import { systemRouters } from './modules/system' import { cooRouters } from './modules/coo' import { commenetRouters } from './modules/comment' +import { suphandleRouters } from './modules/suphandle' import { commonRouters } from './modules/common' /** @@ -90,6 +91,7 @@ export const asyncRouterMap = [ ...commonRouters, ...cooRouters, + ...suphandleRouters, ...systemRouters, ...commenetRouters, { path: '*', redirect: '/404', hidden: true, meta: {}} diff --git a/src/router/modules/suphandle.js b/src/router/modules/suphandle.js new file mode 100644 index 0000000..7026a7b --- /dev/null +++ b/src/router/modules/suphandle.js @@ -0,0 +1,35 @@ +/* Layout */ +import Layout from '../../views/layout/Layout' +export const suphandleRouters = [ + { + path: '/suphandle', + name: 'suphandle', + redirect: '/accessDept', + hidden: true, + meta: { + title: '监督受理子系统', + permission: ['/suphandle'], + isSys: true + } + }, + { + path: '/callBus', + component: Layout, + redirect: '/callBus', + name: 'CallBus', + alwaysShow: true, + meta: { + title: '呼叫业务', + permission: ['/callBus'], + sys: '/suphandle' + }, + children: [ + { + path: '/callCase', + component: () => import('@/views/callCase/callCase'), + name: 'CallCase', + meta: { title: '建立案卷', icon: '', belongSys: '', permission: '/callCase' } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 10bff2e..c80b732 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -48,6 +48,12 @@ component: () => import('@/views/busAdmin/userDevice/userDevice'), name: 'UserDevice', meta: { title: '终端设备管理', icon: '', permission: ['/userDevice'] } + }, + { + path: '/areaPersonliable', + component: () => import('@/views/busAdmin/areaPersonliable/areaPersonliable'), + name: 'AreaPersonliable', + meta: { title: '网格责任人管理', icon: '', permission: ['/areaPersonliable'] } } ] }, diff --git a/src/views/busAdmin/areaPersonliable/areaPersonliable.vue b/src/views/busAdmin/areaPersonliable/areaPersonliable.vue new file mode 100644 index 0000000..23a26de --- /dev/null +++ b/src/views/busAdmin/areaPersonliable/areaPersonliable.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/views/busAdmin/areaPersonliable/areaSelectTree.vue b/src/views/busAdmin/areaPersonliable/areaSelectTree.vue new file mode 100644 index 0000000..d0ba37f --- /dev/null +++ b/src/views/busAdmin/areaPersonliable/areaSelectTree.vue @@ -0,0 +1,80 @@ + + + + + + + diff --git a/src/views/busAdmin/areaPersonliable/editAreaPersonliable.vue b/src/views/busAdmin/areaPersonliable/editAreaPersonliable.vue new file mode 100644 index 0000000..60e99e7 --- /dev/null +++ b/src/views/busAdmin/areaPersonliable/editAreaPersonliable.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/api/busAdmin/areaPersonliable.js b/src/api/busAdmin/areaPersonliable.js new file mode 100644 index 0000000..58737bb --- /dev/null +++ b/src/api/busAdmin/areaPersonliable.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +export function getAreaPersonliableList(params) { + return request({ + url: '/areaPersonliable/listPage', + method: 'get', + params + }) +} + +export function addAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/add', + method: 'post', + params + }) +} + +export function updateAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/update', + method: 'post', + params + }) +} + +export function deleteAreaPersonliable(id) { + return request({ + url: '/areaPersonliable/delete', + method: 'post', + params: { + id: id + } + }) +} + +export function getSupervisorList() { + return request({ + url: '/mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} diff --git a/src/api/callCase/callCase.js b/src/api/callCase/callCase.js new file mode 100644 index 0000000..7500fc7 --- /dev/null +++ b/src/api/callCase/callCase.js @@ -0,0 +1,87 @@ +/** + * 新建案卷的接口 + */ +import request from '@/utils/request' + +// 获取案卷信息来源 +export function getCaseSource(params) { + return request({ + url: 'dict/code/caseSource', + method: 'get', + params + }) +} + +// 获取案卷等级 +export function getCaseLevel(params) { + return request({ + url: 'dict/code/caseLevel', + method: 'get', + params + }) +} + +// 获取案卷类别 +export function getCaseEorC(params) { + return request({ + url: 'dict/code/eorc', + method: 'get', + params + }) +} + +// 根据案卷类别获取案卷大类 +export function getCaseType(eorc) { + return request({ + url: 'case/type/list', + method: 'get', + params: { + eorc: eorc + } + }) +} + +// 根据案卷大类获取案卷小类 +export function getCaseDetailType(caseTypeId) { + return request({ + url: 'case/typeDetail/list', + method: 'get', + params: { + typeId: caseTypeId + } + }) +} + +// 根据案卷小类获取结案标准 +export function getCaseTypesTime(caseTypeDetailId) { + return request({ + url: 'case/typesTime/list', + method: 'get', + params: { + detailId: caseTypeDetailId + } + }) +} + +// 获取监督员列表 +export function getVerifyPerson(params) { + return request({ + url: 'mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} + +// 新增案卷 +export function addCase(params) { + return request({ + url: 'case/add', + method: 'post', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' + }, + params + }) +} diff --git a/src/api/coorBusiness/case.js b/src/api/coorBusiness/case.js index ec5a88a..08c3a13 100644 --- a/src/api/coorBusiness/case.js +++ b/src/api/coorBusiness/case.js @@ -110,9 +110,10 @@ }) } +// 待处理 export function toHandleListPage(params) { return request({ - url: 'case/toHandleListPage/', + url: 'case/toProcessListPage/', method: 'get', params }) @@ -158,9 +159,10 @@ }) } +// 待核查 export function toCheckListPage(params) { return request({ - url: 'case/toCheckListPage/', + url: 'case/toDisCheckListPage/', method: 'get', params }) diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index f6c23ab..fdadcba 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -276,7 +276,7 @@
数据流转:
- + @@ -293,7 +293,7 @@ :append-to-body="true" title="位置详情" > - + @@ -303,12 +303,12 @@ import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case' import { getCommonLanguage, getFilingTypeList, getCaseLevelList } from '@/api/coorBusiness/dict' import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process' -import ArcGisMap from '@/components/Map/arcgisMap' +import ArcGisMapRead from '@/components/Map/arcgisMapRead' import { radioMap } from './radioMap' export default { name: 'CaseDetail', - components: { ArcGisMap }, + components: { ArcGisMapRead }, // props: { // id: { // type: String, @@ -334,7 +334,6 @@ showNeedVisit: false, caseDetail: {}, operationKey: '', // 案件处理按钮key - imgurl: 'http:\\\\192.168.8.201:8083\\static\\', fileIdVerify: [], // 核实照片id fileIdProcess: [], // 处理照片id fileIdCheck: [], // 核查照片id @@ -358,10 +357,12 @@ computed: { isNeedVisit: function() { return this.caseDetail.isNeedRevisit === 1 ? '需要回访' : '不需要回访' + }, + imgurl() { + return process.env.BASE_API + '/static/' } }, - mounted() { - console.log('case dtial') + created() { this.id = this.$route.query.id this.showProcess = (this.$route.query.showProcess || this.$route.query.showProcess === false) ? this.$route.query.showProcess : true this.showNeedVisit = this.$route.query.showNeedVisit ? this.$route.query.showNeedVisit : false @@ -371,7 +372,6 @@ async initData() { // 查询案件详情接口 const resDetail = await getCaseDetail(this.id) - console.log('detail', resDetail) this.caseDetail = resDetail.data[0] // 解析图片id @@ -391,9 +391,11 @@ // 查询流转记录接口 this.processForm.processId = this.caseDetail.processId - const resRecord = await historicalRecords(this.processForm.processId) - this.recordList = resRecord.data - console.log(this.recordList) + // const resRecord = historicalRecords(this.processForm.processId) + // this.recordList = resRecord.data + historicalRecords(this.processForm.processId).then(res => { + this.recordList = res.data + }) if (this.showProcess) { this.initProcess() @@ -701,6 +703,7 @@ .table{ margin: 20px; width: 98%; + // max-height: 250px; } .title{ margin-left: 38px; diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue index 4b536ad..7221e10 100644 --- a/src/components/CaseCommon/caseDetailRead.vue +++ b/src/components/CaseCommon/caseDetailRead.vue @@ -158,11 +158,11 @@ diff --git a/src/router/index.js b/src/router/index.js index b265a48..1c80473 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -11,6 +11,7 @@ import { systemRouters } from './modules/system' import { cooRouters } from './modules/coo' import { commenetRouters } from './modules/comment' +import { suphandleRouters } from './modules/suphandle' import { commonRouters } from './modules/common' /** @@ -90,6 +91,7 @@ export const asyncRouterMap = [ ...commonRouters, ...cooRouters, + ...suphandleRouters, ...systemRouters, ...commenetRouters, { path: '*', redirect: '/404', hidden: true, meta: {}} diff --git a/src/router/modules/suphandle.js b/src/router/modules/suphandle.js new file mode 100644 index 0000000..7026a7b --- /dev/null +++ b/src/router/modules/suphandle.js @@ -0,0 +1,35 @@ +/* Layout */ +import Layout from '../../views/layout/Layout' +export const suphandleRouters = [ + { + path: '/suphandle', + name: 'suphandle', + redirect: '/accessDept', + hidden: true, + meta: { + title: '监督受理子系统', + permission: ['/suphandle'], + isSys: true + } + }, + { + path: '/callBus', + component: Layout, + redirect: '/callBus', + name: 'CallBus', + alwaysShow: true, + meta: { + title: '呼叫业务', + permission: ['/callBus'], + sys: '/suphandle' + }, + children: [ + { + path: '/callCase', + component: () => import('@/views/callCase/callCase'), + name: 'CallCase', + meta: { title: '建立案卷', icon: '', belongSys: '', permission: '/callCase' } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 10bff2e..c80b732 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -48,6 +48,12 @@ component: () => import('@/views/busAdmin/userDevice/userDevice'), name: 'UserDevice', meta: { title: '终端设备管理', icon: '', permission: ['/userDevice'] } + }, + { + path: '/areaPersonliable', + component: () => import('@/views/busAdmin/areaPersonliable/areaPersonliable'), + name: 'AreaPersonliable', + meta: { title: '网格责任人管理', icon: '', permission: ['/areaPersonliable'] } } ] }, diff --git a/src/views/busAdmin/areaPersonliable/areaPersonliable.vue b/src/views/busAdmin/areaPersonliable/areaPersonliable.vue new file mode 100644 index 0000000..23a26de --- /dev/null +++ b/src/views/busAdmin/areaPersonliable/areaPersonliable.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/views/busAdmin/areaPersonliable/areaSelectTree.vue b/src/views/busAdmin/areaPersonliable/areaSelectTree.vue new file mode 100644 index 0000000..d0ba37f --- /dev/null +++ b/src/views/busAdmin/areaPersonliable/areaSelectTree.vue @@ -0,0 +1,80 @@ + + + + + + + diff --git a/src/views/busAdmin/areaPersonliable/editAreaPersonliable.vue b/src/views/busAdmin/areaPersonliable/editAreaPersonliable.vue new file mode 100644 index 0000000..60e99e7 --- /dev/null +++ b/src/views/busAdmin/areaPersonliable/editAreaPersonliable.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue new file mode 100644 index 0000000..513b6b3 --- /dev/null +++ b/src/views/callCase/callCase.vue @@ -0,0 +1,651 @@ + + + + + diff --git a/src/api/busAdmin/areaPersonliable.js b/src/api/busAdmin/areaPersonliable.js new file mode 100644 index 0000000..58737bb --- /dev/null +++ b/src/api/busAdmin/areaPersonliable.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +export function getAreaPersonliableList(params) { + return request({ + url: '/areaPersonliable/listPage', + method: 'get', + params + }) +} + +export function addAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/add', + method: 'post', + params + }) +} + +export function updateAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/update', + method: 'post', + params + }) +} + +export function deleteAreaPersonliable(id) { + return request({ + url: '/areaPersonliable/delete', + method: 'post', + params: { + id: id + } + }) +} + +export function getSupervisorList() { + return request({ + url: '/mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} diff --git a/src/api/callCase/callCase.js b/src/api/callCase/callCase.js new file mode 100644 index 0000000..7500fc7 --- /dev/null +++ b/src/api/callCase/callCase.js @@ -0,0 +1,87 @@ +/** + * 新建案卷的接口 + */ +import request from '@/utils/request' + +// 获取案卷信息来源 +export function getCaseSource(params) { + return request({ + url: 'dict/code/caseSource', + method: 'get', + params + }) +} + +// 获取案卷等级 +export function getCaseLevel(params) { + return request({ + url: 'dict/code/caseLevel', + method: 'get', + params + }) +} + +// 获取案卷类别 +export function getCaseEorC(params) { + return request({ + url: 'dict/code/eorc', + method: 'get', + params + }) +} + +// 根据案卷类别获取案卷大类 +export function getCaseType(eorc) { + return request({ + url: 'case/type/list', + method: 'get', + params: { + eorc: eorc + } + }) +} + +// 根据案卷大类获取案卷小类 +export function getCaseDetailType(caseTypeId) { + return request({ + url: 'case/typeDetail/list', + method: 'get', + params: { + typeId: caseTypeId + } + }) +} + +// 根据案卷小类获取结案标准 +export function getCaseTypesTime(caseTypeDetailId) { + return request({ + url: 'case/typesTime/list', + method: 'get', + params: { + detailId: caseTypeDetailId + } + }) +} + +// 获取监督员列表 +export function getVerifyPerson(params) { + return request({ + url: 'mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} + +// 新增案卷 +export function addCase(params) { + return request({ + url: 'case/add', + method: 'post', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' + }, + params + }) +} diff --git a/src/api/coorBusiness/case.js b/src/api/coorBusiness/case.js index ec5a88a..08c3a13 100644 --- a/src/api/coorBusiness/case.js +++ b/src/api/coorBusiness/case.js @@ -110,9 +110,10 @@ }) } +// 待处理 export function toHandleListPage(params) { return request({ - url: 'case/toHandleListPage/', + url: 'case/toProcessListPage/', method: 'get', params }) @@ -158,9 +159,10 @@ }) } +// 待核查 export function toCheckListPage(params) { return request({ - url: 'case/toCheckListPage/', + url: 'case/toDisCheckListPage/', method: 'get', params }) diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index f6c23ab..fdadcba 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -276,7 +276,7 @@
数据流转:
- + @@ -293,7 +293,7 @@ :append-to-body="true" title="位置详情" > - + @@ -303,12 +303,12 @@ import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case' import { getCommonLanguage, getFilingTypeList, getCaseLevelList } from '@/api/coorBusiness/dict' import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process' -import ArcGisMap from '@/components/Map/arcgisMap' +import ArcGisMapRead from '@/components/Map/arcgisMapRead' import { radioMap } from './radioMap' export default { name: 'CaseDetail', - components: { ArcGisMap }, + components: { ArcGisMapRead }, // props: { // id: { // type: String, @@ -334,7 +334,6 @@ showNeedVisit: false, caseDetail: {}, operationKey: '', // 案件处理按钮key - imgurl: 'http:\\\\192.168.8.201:8083\\static\\', fileIdVerify: [], // 核实照片id fileIdProcess: [], // 处理照片id fileIdCheck: [], // 核查照片id @@ -358,10 +357,12 @@ computed: { isNeedVisit: function() { return this.caseDetail.isNeedRevisit === 1 ? '需要回访' : '不需要回访' + }, + imgurl() { + return process.env.BASE_API + '/static/' } }, - mounted() { - console.log('case dtial') + created() { this.id = this.$route.query.id this.showProcess = (this.$route.query.showProcess || this.$route.query.showProcess === false) ? this.$route.query.showProcess : true this.showNeedVisit = this.$route.query.showNeedVisit ? this.$route.query.showNeedVisit : false @@ -371,7 +372,6 @@ async initData() { // 查询案件详情接口 const resDetail = await getCaseDetail(this.id) - console.log('detail', resDetail) this.caseDetail = resDetail.data[0] // 解析图片id @@ -391,9 +391,11 @@ // 查询流转记录接口 this.processForm.processId = this.caseDetail.processId - const resRecord = await historicalRecords(this.processForm.processId) - this.recordList = resRecord.data - console.log(this.recordList) + // const resRecord = historicalRecords(this.processForm.processId) + // this.recordList = resRecord.data + historicalRecords(this.processForm.processId).then(res => { + this.recordList = res.data + }) if (this.showProcess) { this.initProcess() @@ -701,6 +703,7 @@ .table{ margin: 20px; width: 98%; + // max-height: 250px; } .title{ margin-left: 38px; diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue index 4b536ad..7221e10 100644 --- a/src/components/CaseCommon/caseDetailRead.vue +++ b/src/components/CaseCommon/caseDetailRead.vue @@ -158,11 +158,11 @@ diff --git a/src/router/index.js b/src/router/index.js index b265a48..1c80473 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -11,6 +11,7 @@ import { systemRouters } from './modules/system' import { cooRouters } from './modules/coo' import { commenetRouters } from './modules/comment' +import { suphandleRouters } from './modules/suphandle' import { commonRouters } from './modules/common' /** @@ -90,6 +91,7 @@ export const asyncRouterMap = [ ...commonRouters, ...cooRouters, + ...suphandleRouters, ...systemRouters, ...commenetRouters, { path: '*', redirect: '/404', hidden: true, meta: {}} diff --git a/src/router/modules/suphandle.js b/src/router/modules/suphandle.js new file mode 100644 index 0000000..7026a7b --- /dev/null +++ b/src/router/modules/suphandle.js @@ -0,0 +1,35 @@ +/* Layout */ +import Layout from '../../views/layout/Layout' +export const suphandleRouters = [ + { + path: '/suphandle', + name: 'suphandle', + redirect: '/accessDept', + hidden: true, + meta: { + title: '监督受理子系统', + permission: ['/suphandle'], + isSys: true + } + }, + { + path: '/callBus', + component: Layout, + redirect: '/callBus', + name: 'CallBus', + alwaysShow: true, + meta: { + title: '呼叫业务', + permission: ['/callBus'], + sys: '/suphandle' + }, + children: [ + { + path: '/callCase', + component: () => import('@/views/callCase/callCase'), + name: 'CallCase', + meta: { title: '建立案卷', icon: '', belongSys: '', permission: '/callCase' } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 10bff2e..c80b732 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -48,6 +48,12 @@ component: () => import('@/views/busAdmin/userDevice/userDevice'), name: 'UserDevice', meta: { title: '终端设备管理', icon: '', permission: ['/userDevice'] } + }, + { + path: '/areaPersonliable', + component: () => import('@/views/busAdmin/areaPersonliable/areaPersonliable'), + name: 'AreaPersonliable', + meta: { title: '网格责任人管理', icon: '', permission: ['/areaPersonliable'] } } ] }, diff --git a/src/views/busAdmin/areaPersonliable/areaPersonliable.vue b/src/views/busAdmin/areaPersonliable/areaPersonliable.vue new file mode 100644 index 0000000..23a26de --- /dev/null +++ b/src/views/busAdmin/areaPersonliable/areaPersonliable.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/views/busAdmin/areaPersonliable/areaSelectTree.vue b/src/views/busAdmin/areaPersonliable/areaSelectTree.vue new file mode 100644 index 0000000..d0ba37f --- /dev/null +++ b/src/views/busAdmin/areaPersonliable/areaSelectTree.vue @@ -0,0 +1,80 @@ + + + + + + + diff --git a/src/views/busAdmin/areaPersonliable/editAreaPersonliable.vue b/src/views/busAdmin/areaPersonliable/editAreaPersonliable.vue new file mode 100644 index 0000000..60e99e7 --- /dev/null +++ b/src/views/busAdmin/areaPersonliable/editAreaPersonliable.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue new file mode 100644 index 0000000..513b6b3 --- /dev/null +++ b/src/views/callCase/callCase.vue @@ -0,0 +1,651 @@ + + + + + diff --git a/src/views/caseCommon/caseDetailSupervise.vue b/src/views/caseCommon/caseDetailSupervise.vue index 817987b..b3e10f9 100644 --- a/src/views/caseCommon/caseDetailSupervise.vue +++ b/src/views/caseCommon/caseDetailSupervise.vue @@ -195,11 +195,11 @@ import { getCommonLanguage } from '@/api/coorBusiness/dict' import { historicalRecords } from '@/api/coorBusiness/process' import { superviseCaseTask } from '@/api/supervise/supervise' -import ArcGisMap from '@/components/Map/arcgisMap' +import ArcGisMapRead from '@/components/Map/arcgisMapRead' export default { name: 'CaseDetail', - components: { ArcGisMap }, + components: { ArcGisMapRead }, data() { return { id: '', diff --git a/src/api/busAdmin/areaPersonliable.js b/src/api/busAdmin/areaPersonliable.js new file mode 100644 index 0000000..58737bb --- /dev/null +++ b/src/api/busAdmin/areaPersonliable.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +export function getAreaPersonliableList(params) { + return request({ + url: '/areaPersonliable/listPage', + method: 'get', + params + }) +} + +export function addAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/add', + method: 'post', + params + }) +} + +export function updateAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/update', + method: 'post', + params + }) +} + +export function deleteAreaPersonliable(id) { + return request({ + url: '/areaPersonliable/delete', + method: 'post', + params: { + id: id + } + }) +} + +export function getSupervisorList() { + return request({ + url: '/mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} diff --git a/src/api/callCase/callCase.js b/src/api/callCase/callCase.js new file mode 100644 index 0000000..7500fc7 --- /dev/null +++ b/src/api/callCase/callCase.js @@ -0,0 +1,87 @@ +/** + * 新建案卷的接口 + */ +import request from '@/utils/request' + +// 获取案卷信息来源 +export function getCaseSource(params) { + return request({ + url: 'dict/code/caseSource', + method: 'get', + params + }) +} + +// 获取案卷等级 +export function getCaseLevel(params) { + return request({ + url: 'dict/code/caseLevel', + method: 'get', + params + }) +} + +// 获取案卷类别 +export function getCaseEorC(params) { + return request({ + url: 'dict/code/eorc', + method: 'get', + params + }) +} + +// 根据案卷类别获取案卷大类 +export function getCaseType(eorc) { + return request({ + url: 'case/type/list', + method: 'get', + params: { + eorc: eorc + } + }) +} + +// 根据案卷大类获取案卷小类 +export function getCaseDetailType(caseTypeId) { + return request({ + url: 'case/typeDetail/list', + method: 'get', + params: { + typeId: caseTypeId + } + }) +} + +// 根据案卷小类获取结案标准 +export function getCaseTypesTime(caseTypeDetailId) { + return request({ + url: 'case/typesTime/list', + method: 'get', + params: { + detailId: caseTypeDetailId + } + }) +} + +// 获取监督员列表 +export function getVerifyPerson(params) { + return request({ + url: 'mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} + +// 新增案卷 +export function addCase(params) { + return request({ + url: 'case/add', + method: 'post', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' + }, + params + }) +} diff --git a/src/api/coorBusiness/case.js b/src/api/coorBusiness/case.js index ec5a88a..08c3a13 100644 --- a/src/api/coorBusiness/case.js +++ b/src/api/coorBusiness/case.js @@ -110,9 +110,10 @@ }) } +// 待处理 export function toHandleListPage(params) { return request({ - url: 'case/toHandleListPage/', + url: 'case/toProcessListPage/', method: 'get', params }) @@ -158,9 +159,10 @@ }) } +// 待核查 export function toCheckListPage(params) { return request({ - url: 'case/toCheckListPage/', + url: 'case/toDisCheckListPage/', method: 'get', params }) diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index f6c23ab..fdadcba 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -276,7 +276,7 @@
数据流转:
- + @@ -293,7 +293,7 @@ :append-to-body="true" title="位置详情" > - + @@ -303,12 +303,12 @@ import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case' import { getCommonLanguage, getFilingTypeList, getCaseLevelList } from '@/api/coorBusiness/dict' import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process' -import ArcGisMap from '@/components/Map/arcgisMap' +import ArcGisMapRead from '@/components/Map/arcgisMapRead' import { radioMap } from './radioMap' export default { name: 'CaseDetail', - components: { ArcGisMap }, + components: { ArcGisMapRead }, // props: { // id: { // type: String, @@ -334,7 +334,6 @@ showNeedVisit: false, caseDetail: {}, operationKey: '', // 案件处理按钮key - imgurl: 'http:\\\\192.168.8.201:8083\\static\\', fileIdVerify: [], // 核实照片id fileIdProcess: [], // 处理照片id fileIdCheck: [], // 核查照片id @@ -358,10 +357,12 @@ computed: { isNeedVisit: function() { return this.caseDetail.isNeedRevisit === 1 ? '需要回访' : '不需要回访' + }, + imgurl() { + return process.env.BASE_API + '/static/' } }, - mounted() { - console.log('case dtial') + created() { this.id = this.$route.query.id this.showProcess = (this.$route.query.showProcess || this.$route.query.showProcess === false) ? this.$route.query.showProcess : true this.showNeedVisit = this.$route.query.showNeedVisit ? this.$route.query.showNeedVisit : false @@ -371,7 +372,6 @@ async initData() { // 查询案件详情接口 const resDetail = await getCaseDetail(this.id) - console.log('detail', resDetail) this.caseDetail = resDetail.data[0] // 解析图片id @@ -391,9 +391,11 @@ // 查询流转记录接口 this.processForm.processId = this.caseDetail.processId - const resRecord = await historicalRecords(this.processForm.processId) - this.recordList = resRecord.data - console.log(this.recordList) + // const resRecord = historicalRecords(this.processForm.processId) + // this.recordList = resRecord.data + historicalRecords(this.processForm.processId).then(res => { + this.recordList = res.data + }) if (this.showProcess) { this.initProcess() @@ -701,6 +703,7 @@ .table{ margin: 20px; width: 98%; + // max-height: 250px; } .title{ margin-left: 38px; diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue index 4b536ad..7221e10 100644 --- a/src/components/CaseCommon/caseDetailRead.vue +++ b/src/components/CaseCommon/caseDetailRead.vue @@ -158,11 +158,11 @@ diff --git a/src/router/index.js b/src/router/index.js index b265a48..1c80473 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -11,6 +11,7 @@ import { systemRouters } from './modules/system' import { cooRouters } from './modules/coo' import { commenetRouters } from './modules/comment' +import { suphandleRouters } from './modules/suphandle' import { commonRouters } from './modules/common' /** @@ -90,6 +91,7 @@ export const asyncRouterMap = [ ...commonRouters, ...cooRouters, + ...suphandleRouters, ...systemRouters, ...commenetRouters, { path: '*', redirect: '/404', hidden: true, meta: {}} diff --git a/src/router/modules/suphandle.js b/src/router/modules/suphandle.js new file mode 100644 index 0000000..7026a7b --- /dev/null +++ b/src/router/modules/suphandle.js @@ -0,0 +1,35 @@ +/* Layout */ +import Layout from '../../views/layout/Layout' +export const suphandleRouters = [ + { + path: '/suphandle', + name: 'suphandle', + redirect: '/accessDept', + hidden: true, + meta: { + title: '监督受理子系统', + permission: ['/suphandle'], + isSys: true + } + }, + { + path: '/callBus', + component: Layout, + redirect: '/callBus', + name: 'CallBus', + alwaysShow: true, + meta: { + title: '呼叫业务', + permission: ['/callBus'], + sys: '/suphandle' + }, + children: [ + { + path: '/callCase', + component: () => import('@/views/callCase/callCase'), + name: 'CallCase', + meta: { title: '建立案卷', icon: '', belongSys: '', permission: '/callCase' } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 10bff2e..c80b732 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -48,6 +48,12 @@ component: () => import('@/views/busAdmin/userDevice/userDevice'), name: 'UserDevice', meta: { title: '终端设备管理', icon: '', permission: ['/userDevice'] } + }, + { + path: '/areaPersonliable', + component: () => import('@/views/busAdmin/areaPersonliable/areaPersonliable'), + name: 'AreaPersonliable', + meta: { title: '网格责任人管理', icon: '', permission: ['/areaPersonliable'] } } ] }, diff --git a/src/views/busAdmin/areaPersonliable/areaPersonliable.vue b/src/views/busAdmin/areaPersonliable/areaPersonliable.vue new file mode 100644 index 0000000..23a26de --- /dev/null +++ b/src/views/busAdmin/areaPersonliable/areaPersonliable.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/views/busAdmin/areaPersonliable/areaSelectTree.vue b/src/views/busAdmin/areaPersonliable/areaSelectTree.vue new file mode 100644 index 0000000..d0ba37f --- /dev/null +++ b/src/views/busAdmin/areaPersonliable/areaSelectTree.vue @@ -0,0 +1,80 @@ + + + + + + + diff --git a/src/views/busAdmin/areaPersonliable/editAreaPersonliable.vue b/src/views/busAdmin/areaPersonliable/editAreaPersonliable.vue new file mode 100644 index 0000000..60e99e7 --- /dev/null +++ b/src/views/busAdmin/areaPersonliable/editAreaPersonliable.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue new file mode 100644 index 0000000..513b6b3 --- /dev/null +++ b/src/views/callCase/callCase.vue @@ -0,0 +1,651 @@ + + + + + diff --git a/src/views/caseCommon/caseDetailSupervise.vue b/src/views/caseCommon/caseDetailSupervise.vue index 817987b..b3e10f9 100644 --- a/src/views/caseCommon/caseDetailSupervise.vue +++ b/src/views/caseCommon/caseDetailSupervise.vue @@ -195,11 +195,11 @@ import { getCommonLanguage } from '@/api/coorBusiness/dict' import { historicalRecords } from '@/api/coorBusiness/process' import { superviseCaseTask } from '@/api/supervise/supervise' -import ArcGisMap from '@/components/Map/arcgisMap' +import ArcGisMapRead from '@/components/Map/arcgisMapRead' export default { name: 'CaseDetail', - components: { ArcGisMap }, + components: { ArcGisMapRead }, data() { return { id: '', diff --git a/src/views/otherComment/highFreq/highFreqChart.vue b/src/views/otherComment/highFreq/highFreqChart.vue index 6d81057..1ec175d 100644 --- a/src/views/otherComment/highFreq/highFreqChart.vue +++ b/src/views/otherComment/highFreq/highFreqChart.vue @@ -38,6 +38,7 @@ tooltip: { show: true }, + // color: ['red', 'green', 'yellow', 'blueviolet'], series: [{ name: '高发问题', type: 'pie', diff --git a/src/api/busAdmin/areaPersonliable.js b/src/api/busAdmin/areaPersonliable.js new file mode 100644 index 0000000..58737bb --- /dev/null +++ b/src/api/busAdmin/areaPersonliable.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +export function getAreaPersonliableList(params) { + return request({ + url: '/areaPersonliable/listPage', + method: 'get', + params + }) +} + +export function addAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/add', + method: 'post', + params + }) +} + +export function updateAreaPersonliable(params) { + return request({ + url: '/areaPersonliable/update', + method: 'post', + params + }) +} + +export function deleteAreaPersonliable(id) { + return request({ + url: '/areaPersonliable/delete', + method: 'post', + params: { + id: id + } + }) +} + +export function getSupervisorList() { + return request({ + url: '/mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} diff --git a/src/api/callCase/callCase.js b/src/api/callCase/callCase.js new file mode 100644 index 0000000..7500fc7 --- /dev/null +++ b/src/api/callCase/callCase.js @@ -0,0 +1,87 @@ +/** + * 新建案卷的接口 + */ +import request from '@/utils/request' + +// 获取案卷信息来源 +export function getCaseSource(params) { + return request({ + url: 'dict/code/caseSource', + method: 'get', + params + }) +} + +// 获取案卷等级 +export function getCaseLevel(params) { + return request({ + url: 'dict/code/caseLevel', + method: 'get', + params + }) +} + +// 获取案卷类别 +export function getCaseEorC(params) { + return request({ + url: 'dict/code/eorc', + method: 'get', + params + }) +} + +// 根据案卷类别获取案卷大类 +export function getCaseType(eorc) { + return request({ + url: 'case/type/list', + method: 'get', + params: { + eorc: eorc + } + }) +} + +// 根据案卷大类获取案卷小类 +export function getCaseDetailType(caseTypeId) { + return request({ + url: 'case/typeDetail/list', + method: 'get', + params: { + typeId: caseTypeId + } + }) +} + +// 根据案卷小类获取结案标准 +export function getCaseTypesTime(caseTypeDetailId) { + return request({ + url: 'case/typesTime/list', + method: 'get', + params: { + detailId: caseTypeDetailId + } + }) +} + +// 获取监督员列表 +export function getVerifyPerson(params) { + return request({ + url: 'mgr/simplelist', + method: 'post', + params: { + roleTips: 'supervisor' + } + }) +} + +// 新增案卷 +export function addCase(params) { + return request({ + url: 'case/add', + method: 'post', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' + }, + params + }) +} diff --git a/src/api/coorBusiness/case.js b/src/api/coorBusiness/case.js index ec5a88a..08c3a13 100644 --- a/src/api/coorBusiness/case.js +++ b/src/api/coorBusiness/case.js @@ -110,9 +110,10 @@ }) } +// 待处理 export function toHandleListPage(params) { return request({ - url: 'case/toHandleListPage/', + url: 'case/toProcessListPage/', method: 'get', params }) @@ -158,9 +159,10 @@ }) } +// 待核查 export function toCheckListPage(params) { return request({ - url: 'case/toCheckListPage/', + url: 'case/toDisCheckListPage/', method: 'get', params }) diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index f6c23ab..fdadcba 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -276,7 +276,7 @@
数据流转:
- + @@ -293,7 +293,7 @@ :append-to-body="true" title="位置详情" > - + @@ -303,12 +303,12 @@ import { getCaseDetail, getUserList, getDeptList, getCaseTypeList, getCaseTypeDetailList, getCaseTypeTimes } from '@/api/coorBusiness/case' import { getCommonLanguage, getFilingTypeList, getCaseLevelList } from '@/api/coorBusiness/dict' import { historicalRecords, nextNodes, completeCaseTask } from '@/api/coorBusiness/process' -import ArcGisMap from '@/components/Map/arcgisMap' +import ArcGisMapRead from '@/components/Map/arcgisMapRead' import { radioMap } from './radioMap' export default { name: 'CaseDetail', - components: { ArcGisMap }, + components: { ArcGisMapRead }, // props: { // id: { // type: String, @@ -334,7 +334,6 @@ showNeedVisit: false, caseDetail: {}, operationKey: '', // 案件处理按钮key - imgurl: 'http:\\\\192.168.8.201:8083\\static\\', fileIdVerify: [], // 核实照片id fileIdProcess: [], // 处理照片id fileIdCheck: [], // 核查照片id @@ -358,10 +357,12 @@ computed: { isNeedVisit: function() { return this.caseDetail.isNeedRevisit === 1 ? '需要回访' : '不需要回访' + }, + imgurl() { + return process.env.BASE_API + '/static/' } }, - mounted() { - console.log('case dtial') + created() { this.id = this.$route.query.id this.showProcess = (this.$route.query.showProcess || this.$route.query.showProcess === false) ? this.$route.query.showProcess : true this.showNeedVisit = this.$route.query.showNeedVisit ? this.$route.query.showNeedVisit : false @@ -371,7 +372,6 @@ async initData() { // 查询案件详情接口 const resDetail = await getCaseDetail(this.id) - console.log('detail', resDetail) this.caseDetail = resDetail.data[0] // 解析图片id @@ -391,9 +391,11 @@ // 查询流转记录接口 this.processForm.processId = this.caseDetail.processId - const resRecord = await historicalRecords(this.processForm.processId) - this.recordList = resRecord.data - console.log(this.recordList) + // const resRecord = historicalRecords(this.processForm.processId) + // this.recordList = resRecord.data + historicalRecords(this.processForm.processId).then(res => { + this.recordList = res.data + }) if (this.showProcess) { this.initProcess() @@ -701,6 +703,7 @@ .table{ margin: 20px; width: 98%; + // max-height: 250px; } .title{ margin-left: 38px; diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue index 4b536ad..7221e10 100644 --- a/src/components/CaseCommon/caseDetailRead.vue +++ b/src/components/CaseCommon/caseDetailRead.vue @@ -158,11 +158,11 @@ diff --git a/src/router/index.js b/src/router/index.js index b265a48..1c80473 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -11,6 +11,7 @@ import { systemRouters } from './modules/system' import { cooRouters } from './modules/coo' import { commenetRouters } from './modules/comment' +import { suphandleRouters } from './modules/suphandle' import { commonRouters } from './modules/common' /** @@ -90,6 +91,7 @@ export const asyncRouterMap = [ ...commonRouters, ...cooRouters, + ...suphandleRouters, ...systemRouters, ...commenetRouters, { path: '*', redirect: '/404', hidden: true, meta: {}} diff --git a/src/router/modules/suphandle.js b/src/router/modules/suphandle.js new file mode 100644 index 0000000..7026a7b --- /dev/null +++ b/src/router/modules/suphandle.js @@ -0,0 +1,35 @@ +/* Layout */ +import Layout from '../../views/layout/Layout' +export const suphandleRouters = [ + { + path: '/suphandle', + name: 'suphandle', + redirect: '/accessDept', + hidden: true, + meta: { + title: '监督受理子系统', + permission: ['/suphandle'], + isSys: true + } + }, + { + path: '/callBus', + component: Layout, + redirect: '/callBus', + name: 'CallBus', + alwaysShow: true, + meta: { + title: '呼叫业务', + permission: ['/callBus'], + sys: '/suphandle' + }, + children: [ + { + path: '/callCase', + component: () => import('@/views/callCase/callCase'), + name: 'CallCase', + meta: { title: '建立案卷', icon: '', belongSys: '', permission: '/callCase' } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 10bff2e..c80b732 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -48,6 +48,12 @@ component: () => import('@/views/busAdmin/userDevice/userDevice'), name: 'UserDevice', meta: { title: '终端设备管理', icon: '', permission: ['/userDevice'] } + }, + { + path: '/areaPersonliable', + component: () => import('@/views/busAdmin/areaPersonliable/areaPersonliable'), + name: 'AreaPersonliable', + meta: { title: '网格责任人管理', icon: '', permission: ['/areaPersonliable'] } } ] }, diff --git a/src/views/busAdmin/areaPersonliable/areaPersonliable.vue b/src/views/busAdmin/areaPersonliable/areaPersonliable.vue new file mode 100644 index 0000000..23a26de --- /dev/null +++ b/src/views/busAdmin/areaPersonliable/areaPersonliable.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/views/busAdmin/areaPersonliable/areaSelectTree.vue b/src/views/busAdmin/areaPersonliable/areaSelectTree.vue new file mode 100644 index 0000000..d0ba37f --- /dev/null +++ b/src/views/busAdmin/areaPersonliable/areaSelectTree.vue @@ -0,0 +1,80 @@ + + + + + + + diff --git a/src/views/busAdmin/areaPersonliable/editAreaPersonliable.vue b/src/views/busAdmin/areaPersonliable/editAreaPersonliable.vue new file mode 100644 index 0000000..60e99e7 --- /dev/null +++ b/src/views/busAdmin/areaPersonliable/editAreaPersonliable.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue new file mode 100644 index 0000000..513b6b3 --- /dev/null +++ b/src/views/callCase/callCase.vue @@ -0,0 +1,651 @@ + + + + + diff --git a/src/views/caseCommon/caseDetailSupervise.vue b/src/views/caseCommon/caseDetailSupervise.vue index 817987b..b3e10f9 100644 --- a/src/views/caseCommon/caseDetailSupervise.vue +++ b/src/views/caseCommon/caseDetailSupervise.vue @@ -195,11 +195,11 @@ import { getCommonLanguage } from '@/api/coorBusiness/dict' import { historicalRecords } from '@/api/coorBusiness/process' import { superviseCaseTask } from '@/api/supervise/supervise' -import ArcGisMap from '@/components/Map/arcgisMap' +import ArcGisMapRead from '@/components/Map/arcgisMapRead' export default { name: 'CaseDetail', - components: { ArcGisMap }, + components: { ArcGisMapRead }, data() { return { id: '', diff --git a/src/views/otherComment/highFreq/highFreqChart.vue b/src/views/otherComment/highFreq/highFreqChart.vue index 6d81057..1ec175d 100644 --- a/src/views/otherComment/highFreq/highFreqChart.vue +++ b/src/views/otherComment/highFreq/highFreqChart.vue @@ -38,6 +38,7 @@ tooltip: { show: true }, + // color: ['red', 'green', 'yellow', 'blueviolet'], series: [{ name: '高发问题', type: 'pie', diff --git a/src/views/supervise/components/caseDetailSupervise.vue b/src/views/supervise/components/caseDetailSupervise.vue index a4f805f..b3f14a5 100644 --- a/src/views/supervise/components/caseDetailSupervise.vue +++ b/src/views/supervise/components/caseDetailSupervise.vue @@ -195,11 +195,11 @@ import { getCommonLanguage } from '@/api/coorBusiness/dict' import { historicalRecords } from '@/api/coorBusiness/process' import { superviseCaseTask } from '@/api/supervise/supervise' -import ArcGisMap from '@/components/Map/arcgisMap' +import ArcGisMapRead from '@/components/Map/arcgisMapRead' export default { name: 'CaseDetail', - components: { ArcGisMap }, + components: { ArcGisMapRead }, props: { id: { type: String,