From 529c5c05771c8340c8768b3a0c64e7bf5c3115ad Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 17 Jun 2022 16:26:11 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=9B=BE=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequzhili/csgltc/csgl.vue | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/views/modules/shequzhili/csgltc/csgl.vue b/src/views/modules/shequzhili/csgltc/csgl.vue index 59dff19ce..6a8f97d01 100644 --- a/src/views/modules/shequzhili/csgltc/csgl.vue +++ b/src/views/modules/shequzhili/csgltc/csgl.vue @@ -48,7 +48,10 @@ 新增 - + 下载模板 - 下载模板 导入 From 44d3a4126cb0fb570094261c630255c5c804b519 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 17 Jun 2022 16:26:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=9B=BE=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequzhili/ggfwtc/ggfw.vue | 236 +++--- .../modules/shequzhili/ggfwtc/ggfwDetail.vue | 387 +++++----- .../modules/shequzhili/ggfwtc/ggfwForm.vue | 712 ++++++++---------- 3 files changed, 595 insertions(+), 740 deletions(-) diff --git a/src/views/modules/shequzhili/ggfwtc/ggfw.vue b/src/views/modules/shequzhili/ggfwtc/ggfw.vue index fd601a2b4..a8e363b60 100644 --- a/src/views/modules/shequzhili/ggfwtc/ggfw.vue +++ b/src/views/modules/shequzhili/ggfwtc/ggfw.vue @@ -7,9 +7,9 @@ :label-width="'100px'">
- - + - - - - - - - -
-
- - + - - - - - - - - - - - - - 查询
- 新增 - - + @click="handleExport">导出
- - - - - - - - - - - - - - - 修改 - 完成情况 - 积分记录 - { + // this.download(res.data, title + '.xls') + if (res.headers["content-disposition"]) { + let fileName = window.decodeURI( + res.headers["content-disposition"].split(";")[1].split("=")[1] + ); + console.log("filename", fileName); + let blob = new Blob([res.data], { + type: "application/vnd.ms-excel", + }); + var url = window.URL.createObjectURL(blob); + var aLink = document.createElement("a"); + aLink.style.display = "none"; + aLink.href = url; + aLink.setAttribute("download", fileName); + document.body.appendChild(aLink); + aLink.click(); + document.body.removeChild(aLink); //下载完成移除元素 + window.URL.revokeObjectURL(url); //释放掉blob对象 + } else this.$message.error("下载失败"); + }) + .catch((err) => { + console.log("err", err); + return this.$message.error("网络错误"); + }); + }, //获取服务事项下拉框 async loadService () { - const url = "/heart/serviceitem/dict-list" - - + const url = "/gov/org/coverage/dict-select-list/public_service" + // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/coverage/dict-select-list/public_service" let params = { // parentCategoryCode: '1010' } @@ -379,12 +330,11 @@ export default { async loadTable () { this.tableLoading = true - const url = "/heart/icpartyunit/list" - // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/list" + const url = "/gov/org/icPublicService/list" + // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/list" let params = { pageSize: this.pageSize, pageNo: this.pageNo, - agencyId: this.agencyId, ...this.formData } @@ -392,16 +342,7 @@ export default { if (code === 0) { this.total = data.total - data.list.forEach(element => { - if (element.serviceMatterList.length > 0) { - element.serviceMatterListShow = element.serviceMatterList.join(',') - } else { - element.serviceMatterListShow = '' - } - - }); this.tableData = data.list - } else { this.$message.error(msg) } @@ -427,7 +368,7 @@ export default { //完成情况 handleFinish (row) { - this.finishDiaTitle = row.unitName + '完成情况' + this.finishDiaTitle = row.name + '完成情况' this.finishDiaShow = true this.$nextTick(() => { this.$refs.ref_finish.initTable(row) @@ -437,7 +378,7 @@ export default { handleScore (row) { this.scoreDiaShow = true this.$nextTick(() => { - this.$refs.ref_score.initForm(row.id) + this.$refs.ref_score.initForm(row.icPublicServiceId) }) }, @@ -453,7 +394,7 @@ export default { this.formTitle = '修改' this.formShow = true this.$nextTick(() => { - this.$refs.ref_form.initForm('edit', row.id) + this.$refs.ref_form.initForm('edit', row.icPublicServiceId) }) }, @@ -485,11 +426,11 @@ export default { }, async deleteUnit (row) { - const url = "/heart/icpartyunit/delete" - // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/delete" + const url = "/gov/org/icPublicService/del" + // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/del" let params = { - id: row.id + icPublicServiceId: row.icPublicServiceId } const { data, code, msg } = await requestPost(url, params) @@ -509,11 +450,8 @@ export default { //重置搜索条件 resetSearch () { this.formData = { - unitName: '', - serviceMatter: '', - type: '', - contact: '', - contactMobile: '' + name: '', + category: '' } this.pageSize = 10 this.pageNo = 0 @@ -522,9 +460,10 @@ export default { //导出表格 async handleExport () { - let title = '联建单位列表' + let title = '公共服务图层列表' - const url = "/heart/icpartyunit/export" + const url = "/gov/org/icPublicService/export" + // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/export" let params = { agencyId: this.agencyId, ...this.formData @@ -602,7 +541,8 @@ export default { //清空上传列表 this.$refs['upload'].clearFiles() - var url = '/heart/icpartyunit/import' + var url = '/gov/org/icPublicService/import' + // var url = 'http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/import' let fileFormData = new FormData(); fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名 diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue index 306fc3f83..6cf4af898 100644 --- a/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue +++ b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue @@ -7,75 +7,40 @@ :model="formData" class="form"> - - {{formData.unitName}} + {{formData.name}} - - {{formData.type}} + {{formData.categoryName}} - -

{{item}}

+ {{formData.areaCovered}} - - {{formData.contact}} - - - - {{formData.contactMobile}} + {{formData.capacity}} - - {{formData.memberCount}} - - - {{formData.remark?formData.remark:'无'}} - - + label-width="150px"> {{formData.address}} - - -
- -
- -
- -
- -
@@ -89,193 +54,193 @@ diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue index ac3965ea8..30c30a8c6 100644 --- a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue +++ b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue @@ -9,88 +9,64 @@ :disabled="formType === 'detail'" class="form"> - + placeholder="请输入场所名称" + v-model="formData.name"> - - + - - - {{item.label}} - - - - - - - - - - + + 平方公里 - + label="容纳人数"> - + v-model="formData.address"> + + 查询
- -
+
经度
- - - - - - -
@@ -158,370 +122,356 @@ From 8e8940149df3426d150a45ee8eee94bbe8dff9f7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 17 Jun 2022 16:39:18 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequzhili/ggfwtc/ggfw.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/modules/shequzhili/ggfwtc/ggfw.vue b/src/views/modules/shequzhili/ggfwtc/ggfw.vue index a8e363b60..4c5e3b662 100644 --- a/src/views/modules/shequzhili/ggfwtc/ggfw.vue +++ b/src/views/modules/shequzhili/ggfwtc/ggfw.vue @@ -605,6 +605,8 @@ export default { } diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue new file mode 100644 index 000000000..11a22dea6 --- /dev/null +++ b/src/views/modules/cpts/base/index.vue @@ -0,0 +1,451 @@ + + + + + diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue b/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue new file mode 100644 index 000000000..79e71c99d --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue @@ -0,0 +1,104 @@ + + + + +