From b7d719a674ec0e7813d08407952151e35dea9f65 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 5 Nov 2021 17:46:49 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectClassifyStatic/classifyList.vue | 433 ++++++++++++++++ .../projectClassifyStatic/projectDetail.vue | 373 ++++++++++++++ .../projectClassifyStatic/projectList.vue | 461 ++++++++++++++++++ 3 files changed, 1267 insertions(+) create mode 100644 epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue create mode 100644 epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectDetail.vue create mode 100644 epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue new file mode 100644 index 0000000..21f3aa3 --- /dev/null +++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue @@ -0,0 +1,433 @@ + + + + + diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectDetail.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectDetail.vue new file mode 100644 index 0000000..c343859 --- /dev/null +++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectDetail.vue @@ -0,0 +1,373 @@ + + + + + diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue new file mode 100644 index 0000000..7276145 --- /dev/null +++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue @@ -0,0 +1,461 @@ + + + + + From 7b00cda53572fe5b40e3535b7babc832bdae15b9 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 8 Nov 2021 13:45:48 +0800 Subject: [PATCH 02/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectClassifyStatic/classifyList.vue | 15 +- .../projectClassifyStatic/projectDetail.vue | 214 +++++++++++------- .../projectClassifyStatic/projectList.vue | 17 +- 3 files changed, 150 insertions(+), 96 deletions(-) diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue index 21f3aa3..ad4978b 100644 --- a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue +++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue @@ -195,11 +195,11 @@ export default { }, async getAgencylist () { - const url = '/gov/org/customeragency/orgtree' + const url = '/gov/org/customeragency/agencygridtree' // const url = 'http://yapi.elinkservice.cn/mock/102/gov/org/agency/agencylist' const params = { - customerId: this.customerId + // customerId: this.customerId } const { data, code, msg } = await requestPost(url, params) if (code === 0) { @@ -217,8 +217,8 @@ export default { }, async loadTable () { if (this.validate()) { - // const url = '/data/report/screenproject/selectprojectcategory' - const url = 'http://yapi.elinkservice.cn/mock/102/data/report/screenproject/selectprojectcategory' + const url = '/data/report/screen/project/selectprojectcategory' + // const url = 'http://yapi.elinkservice.cn/mock/102/data/report/screen/project/selectprojectcategory' if (this.staticType === 'end') { this.tableParams.startTime = '' @@ -309,7 +309,10 @@ export default { validate () { - + if (this.staticType === 'Interval' && (!this.tableParams.endTime || !this.tableParams.startTime)) { + this.$message.info("请选择起止日期") + return false + } if (this.staticType === 'end' && !this.tableParams.endTime) { this.$message.info("请选择结束日期") return false @@ -333,7 +336,7 @@ export default { console.log(title) - const url = "/data/report/screenproject/selectprojectcategory/export" + const url = "/data/report/screen/project/selectprojectcategory/export" console.log(this.tableParams) diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectDetail.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectDetail.vue index c343859..e6f25be 100644 --- a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectDetail.vue +++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectDetail.vue @@ -1,92 +1,104 @@ @@ -103,6 +115,7 @@ export default { return { projectId: "",//项目id formData: {}, + showDetail: true, //查询条件标题宽度 labelWidth: '100px', @@ -121,15 +134,7 @@ export default { reportAddress: "",//上报位置 processList: [],// }, - fileList: [ - // { - // name: 'food.jpeg', - // url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100' - // }, { - // name: 'food2.jpeg', - // url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100' - // } - ], + previewPath: '' } }, @@ -138,6 +143,12 @@ export default { }, methods: { + setShowDetail () { + if (!this.showDetail) { + this.showDetail = true + } + + }, async initData (projectId) { this.startLoading() this.projectId = projectId @@ -162,7 +173,9 @@ export default { this.info = data[0] // info = copyKeyHave(info, data[0]); + this.info.processList.forEach(element => { + //关闭：close; 回应 response，结案closed_case，退回return，部门流转transfer，创建项目created if (element.operation === 'close') { element.operationShow = '关闭' @@ -177,13 +190,39 @@ export default { } else if (element.operation === 'created') { element.operationShow = '创建项目' } + element.attachments.forEach(attachItem => { + attachItem.name = attachItem.fileName + attachItem.url = attachItem.attachmentUrl + attachItem.type = attachItem.attachmentType + attachItem.format = attachItem.attachmentFormat + }); }); } }, + //下载 + handleFileDownload (file) { + + // if (file.format === 'jpg' || file.format === 'png' || file.format === 'gif') { + // this.showDetail = false + // this.previewPath = file.url + // } else { + var a = document.createElement('a'); + var event = new MouseEvent('click'); + a.download = file.name; + a.target = "_blank"//打开新的标签页 + + a.href = file.url; + a.dispatchEvent(event); + // } + + }, + closePic () { + this.showDetail = true + }, // 开启加载动画 startLoading () { loading = Loading.service({ @@ -369,5 +408,10 @@ export default { } } } +.btn_close { + display: flex; + justify-content: flex-end; + margin-bottom: 10px; +} diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue index 7276145..1b4acb1 100644 --- a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue +++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue @@ -10,7 +10,10 @@
返回 + size="mini" + icon="el-icon-back" + type="warning" + plain>返回 Date: Mon, 8 Nov 2021 14:35:29 +0800 Subject: [PATCH 03/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workPc/projectClassifyStatic/projectList.vue | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue index 1b4acb1..273bda7 100644 --- a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue +++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue @@ -183,6 +183,9 @@ export default { } }, staticType: 'end', + + categoryName: '', + parentCategoryName: '', tableParams: { status: '', //项目状态：closed：已结案，all：全部 categoryCode: '', //分类code @@ -221,6 +224,8 @@ export default { this.tableParams.status = type this.tableParams.categoryCode = row.categoryCode + this.categoryName = row.categoryName + this.parentCategoryName = row.parentCategoryName this.agencyIdArray = agencyIdArray this.selAgencyObj = selAgencyObj this.tableParams.orgId = this.selAgencyObj.agencyId @@ -369,12 +374,21 @@ export default { title = title + ' 截止至' + this.endTimeShow + '累计值' } console.log(title) + const params = { + status: this.tableParams.status, + categoryCode: this.tableParams.categoryCode, + categoryName: this.categoryName, + orgId: this.tableParams.orgId, + startTime: this.tableParams.startTime, + endTime: this.tableParams.endTime, + parentCategoryName: this.parentCategoryName, + } const url = "/data/report/screen/project/selectcategoryprojectlist/export" app.ajax.exportFilePost( url, - this.tableParams, + params, (data, rspMsg) => { this.download(data, title + '.xls') From cd98f66f6b441176e8da1c10fbfad30dbd120e1f Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 8 Nov 2021 15:18:11 +0800 Subject: [PATCH 04/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workPc/projectClassifyStatic/projectDetail.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectDetail.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectDetail.vue index e6f25be..95d8d46 100644 --- a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectDetail.vue +++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectDetail.vue @@ -160,12 +160,12 @@ export default { const url = '/data/report/screen/project/projectdetailv2' - // const params = { - // projectId: this.projectId - // } const params = { - projectId: "440dfb6f22d9860fb1c2d1fc044a901f" + projectId: this.projectId } + // const params = { + // projectId: "440dfb6f22d9860fb1c2d1fc044a901f" + // } const { data, code, msg } = await requestPost(url, params) From ebd7fa416c7b6e004a97cb55c405825ff678d634 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 8 Nov 2021 15:50:23 +0800 Subject: [PATCH 05/24] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AE=BD=E5=BA=A6?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/workPc/projectClassifyStatic/projectList.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue index 273bda7..20f8740 100644 --- a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue +++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue @@ -75,15 +75,15 @@ style="width: 100%"> + min-width="280"> + min-width="200"> + min-width="200"> From fbf3676a2d01d7057a63c1404a186a0d84d3b77a Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 9 Nov 2021 09:58:06 +0800 Subject: [PATCH 06/24] =?UTF-8?q?=E5=88=86=E7=B1=BB=E9=A1=B9=E7=9B=AEbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectClassifyStatic/classifyList.vue | 38 +++++++++++++------ .../projectClassifyStatic/projectList.vue | 2 +- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue index ad4978b..b1868e3 100644 --- a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue +++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue @@ -69,7 +69,7 @@ style="width: 100%;margin-bottom: 20px;" row-key="categoryCode" border - default-expand-all + :default-expand-all="false" :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> 0) { this.selAgencyObj = this.$refs["myCascader"].getCheckedNodes()[0].data - this.tableParams.orgId = this.selAgencyObj.agencyId - this.tableParams.orgType = this.selAgencyObj.level - this.agencyName = this.selAgencyObj.agencyName + } else { this.selAgencyObj = {} - this.tableParams.orgId = '' - this.tableParams.orgType = '' - this.agencyName = '' + } }, @@ -326,7 +338,11 @@ export default { if (!this.validate()) { return false } - let title = this.agencyName + let title = '' + if (this.selAgencyObj) { + title = this.selAgencyObj.agencyName + } + if (this.staticType === 'Interval') { title = title + ' ' + this.startTimeShow + '-' + this.endTimeShow + '区间增长值' diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue index 20f8740..dbb91ff 100644 --- a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue +++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue @@ -238,7 +238,7 @@ export default { initAgencyList (casOptions) { ++this.iscascaderShow this.casOptions = [] - this.agencyIdArray.length = [] + this.agencyIdArray = [] this.tableParams.orgId = '' if (casOptions) { this.casOptions = casOptions From e53ad43c7f5dd1b1e3f09333fcad816f9ada445f Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 9 Nov 2021 15:42:03 +0800 Subject: [PATCH 07/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/modules/workPc/projectClassifyStatic/classifyList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue index b1868e3..e691331 100644 --- a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue +++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue @@ -103,7 +103,7 @@ {{scope.row.projectTotal}} + @click="handleToProjectList(scope.row,'closed')">{{scope.row.closedProjectTotal}} Date: Wed, 10 Nov 2021 10:29:57 +0800 Subject: [PATCH 08/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../classifyList copy 2.vue | 182 +++++++ .../projectClassifyStatic/classifyList.vue | 11 +- .../projectList copy 2.vue | 219 +++++++++ .../projectClassifyStatic/projectList.vue | 36 +- .../projectClassifyStatic/searchBar.vue | 454 ++++++++++++++++++ 5 files changed, 886 insertions(+), 16 deletions(-) create mode 100644 epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList copy 2.vue create mode 100644 epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList copy 2.vue create mode 100644 epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/searchBar.vue diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList copy 2.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList copy 2.vue new file mode 100644 index 0000000..352ada3 --- /dev/null +++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList copy 2.vue @@ -0,0 +1,182 @@ + + + + + diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue index e691331..752061a 100644 --- a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue +++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue @@ -18,8 +18,7 @@ :key="iscascaderShow" :options="casOptions" :props="optionProps" - @change="handleChange" - clearable> + @change="handleChange">
@@ -170,11 +169,12 @@ export default { endTime: '', //结束时间【yyyymmdd】, }, timeArray: ['', ''], + endTimeModel: new Date() - 60 * 60 * 24 * 2, //导出表格部分 startTimeShow: '',//导出表格标题处显示的内容 endTimeShow: '', //导出表格标题处显示的内容 - endTimeModel: new Date() - 60 * 60 * 24 * 2, + } }, @@ -253,7 +253,10 @@ export default { handleToProjectList (row, type) { this.flag = "project" this.$nextTick(() => { - this.$refs.ref_projectList.initData(this.agencyIdArray, row, type, this.casOptions, this.selAgencyObj) + + this.$refs.ref_projectList.loadDate(this.tableParams, this.staticType, this.timeArray, this.endTimeModel, this.startTimeShow, this.endTimeShow) + //初始化表格 + this.$refs.ref_projectList.initTable(this.agencyIdArray, row, type, this.casOptions) }) }, diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList copy 2.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList copy 2.vue new file mode 100644 index 0000000..755080e --- /dev/null +++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList copy 2.vue @@ -0,0 +1,219 @@ + + + + + diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue index dbb91ff..680cfcd 100644 --- a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue +++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue @@ -24,8 +24,7 @@ :key="iscascaderShow" :options="casOptions" :props="optionProps" - @change="handleChange" - clearable> + @change="handleChange">
@@ -166,7 +165,7 @@ export default { labelWidth: '70px', casOptions: [], agencyIdArray: [], - selAgencyObj: {}, + iscascaderShow: 0, optionProps: { @@ -214,21 +213,35 @@ export default { }, methods: { - async initData (agencyIdArray, row, type, casOptions, selAgencyObj) { - this.startLoading() + //初始化日期 + loadDate (tableParams, staticType, timeArray, endTimeModel, startTimeShow, endTimeShow) { //初始化日期 this.initDate() + let params = JSON.parse(JSON.stringify(tableParams)) + Object.assign(this.tableParams, params) + this.timeArray = JSON.parse(JSON.stringify(timeArray)) + this.endTimeModel = JSON.parse(JSON.stringify(endTimeModel)) + this.startTimeShow = startTimeShow + this.endTimeShow = endTimeShow + this.staticType = staticType + + + + + }, + async initTable (agencyIdArray, row, type, casOptions) { + this.startLoading() //初始化组织数据 this.initAgencyList(casOptions) this.tableParams.status = type this.tableParams.categoryCode = row.categoryCode + this.categoryName = row.categoryName this.parentCategoryName = row.parentCategoryName this.agencyIdArray = agencyIdArray - this.selAgencyObj = selAgencyObj - this.tableParams.orgId = this.selAgencyObj.agencyId + await this.loadTable()//获取组织级联列表 @@ -239,7 +252,6 @@ export default { ++this.iscascaderShow this.casOptions = [] this.agencyIdArray = [] - this.tableParams.orgId = '' if (casOptions) { this.casOptions = casOptions } @@ -281,11 +293,11 @@ export default { handleChange (value) { if (value && value.length > 0) { - this.selAgencyObj = this.$refs["myCascader"].getCheckedNodes()[0].data - this.tableParams.orgId = this.selAgencyObj.agencyId - this.agencyName = this.selAgencyObj.agencyName + let agencyObj = this.$refs["myCascader"].getCheckedNodes()[0].data + this.tableParams.orgId = agencyObj.agencyId + this.agencyName = agencyObj.agencyName } else { - this.selAgencyObj = {} + this.tableParams.orgId = '' this.agencyName = '' } diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/searchBar.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/searchBar.vue new file mode 100644 index 0000000..537ce72 --- /dev/null +++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/searchBar.vue @@ -0,0 +1,454 @@ + + + + + From 0fae5703a28b87359eaabf470c300f3b31578538 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 10 Nov 2021 10:35:33 +0800 Subject: [PATCH 09/24] =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/workPc/projectClassifyStatic/classifyList.vue | 6 +++--- .../modules/workPc/projectClassifyStatic/projectList.vue | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue index 752061a..60af43d 100644 --- a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue +++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue @@ -256,7 +256,7 @@ export default { this.$refs.ref_projectList.loadDate(this.tableParams, this.staticType, this.timeArray, this.endTimeModel, this.startTimeShow, this.endTimeShow) //初始化表格 - this.$refs.ref_projectList.initTable(this.agencyIdArray, row, type, this.casOptions) + this.$refs.ref_projectList.initTable(this.agencyIdArray, row, type, this.casOptions, this.selAgencyObj.agencyName) }) }, @@ -348,9 +348,9 @@ export default { if (this.staticType === 'Interval') { - title = title + ' ' + this.startTimeShow + '-' + this.endTimeShow + '区间增长值' + title = title + ' 分类 ' + this.startTimeShow + '-' + this.endTimeShow + '区间增长值' } else { - title = title + ' 截止至' + this.endTimeShow + '累计值' + title = title + ' 分类 截止至' + this.endTimeShow + '累计值' } console.log(title) diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue index 680cfcd..0cc718c 100644 --- a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue +++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue @@ -229,7 +229,7 @@ export default { }, - async initTable (agencyIdArray, row, type, casOptions) { + async initTable (agencyIdArray, row, type, casOptions, agencyName) { this.startLoading() //初始化组织数据 @@ -241,6 +241,7 @@ export default { this.categoryName = row.categoryName this.parentCategoryName = row.parentCategoryName this.agencyIdArray = agencyIdArray + this.agencyName = agencyName await this.loadTable()//获取组织级联列表 @@ -381,9 +382,9 @@ export default { let title = this.agencyName if (this.staticType === 'Interval') { - title = title + ' ' + this.startTimeShow + '-' + this.endTimeShow + '区间增长值' + title = title + ' 项目 ' + this.startTimeShow + '-' + this.endTimeShow + '区间增长值' } else { - title = title + ' 截止至' + this.endTimeShow + '累计值' + title = title + ' 项目 截止至' + this.endTimeShow + '累计值' } console.log(title) const params = { From 1a52a33bfebd4ff6c9ccfb3c291e47ef8c54a384 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 10 Nov 2021 10:51:17 +0800 Subject: [PATCH 10/24] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/modules/workPc/projectClassifyStatic/classifyList.vue | 2 +- .../views/modules/workPc/projectClassifyStatic/projectList.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue index 60af43d..6f421b0 100644 --- a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue +++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue @@ -356,7 +356,7 @@ export default { const url = "/data/report/screen/project/selectprojectcategory/export" - + this.tableParams.orgName = this.agencyName console.log(this.tableParams) app.ajax.exportFilePost( diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue index 0cc718c..784abd7 100644 --- a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue +++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/projectList.vue @@ -395,6 +395,7 @@ export default { startTime: this.tableParams.startTime, endTime: this.tableParams.endTime, parentCategoryName: this.parentCategoryName, + orgName: this.agencyName } const url = "/data/report/screen/project/selectcategoryprojectlist/export" From 58516b075fc0f0ee5afd9a98baed3d31a0c2c059 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 12 Nov 2021 17:15:58 +0800 Subject: [PATCH 11/24] =?UTF-8?q?=E5=8A=A0=E4=B8=8Aorgname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/modules/workPc/projectClassifyStatic/classifyList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue index 6f421b0..6a4e16d 100644 --- a/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue +++ b/epmet-oper-web/src/views/modules/workPc/projectClassifyStatic/classifyList.vue @@ -356,7 +356,7 @@ export default { const url = "/data/report/screen/project/selectprojectcategory/export" - this.tableParams.orgName = this.agencyName + this.tableParams.orgName = this.selAgencyObj.agencyName console.log(this.tableParams) app.ajax.exportFilePost( From 41629d343b08795dfb776ecf8e3110facdb3250a Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 23 Nov 2021 10:00:00 +0800 Subject: [PATCH 12/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=90=8E=E5=8F=B0=E5=9C=B0=E5=9D=80=E4=B8=BA?= =?UTF-8?q?:=E7=A9=BF=E9=80=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-oper-web/.env.development | 4 ++-- epmet-oper-web/.env.production.sit | 4 ++-- epmet-oper-web/public/index.html | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/epmet-oper-web/.env.development b/epmet-oper-web/.env.development index 5431a9b..959fe2f 100644 --- a/epmet-oper-web/.env.development +++ b/epmet-oper-web/.env.development @@ -1,6 +1,6 @@ NODE_ENV=development -# VUE_APP_API_SERVER = http://118.190.150.119:41080/api -VUE_APP_API_SERVER = http://192.168.1.140/api +VUE_APP_API_SERVER = http://118.190.150.119:41080/api +# VUE_APP_API_SERVER = http://192.168.1.140/api # VUE_APP_API_SERVER = http://192.168.51.36:8080/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api VUE_APP_NODE_ENV=dev diff --git a/epmet-oper-web/.env.production.sit b/epmet-oper-web/.env.production.sit index 6e5b4e9..556bf45 100644 --- a/epmet-oper-web/.env.production.sit +++ b/epmet-oper-web/.env.production.sit @@ -1,5 +1,5 @@ NODE_ENV=production -# VUE_APP_API_SERVER = http://118.190.150.119:41080/api -VUE_APP_API_SERVER = http://192.168.1.140/api +VUE_APP_API_SERVER = http://118.190.150.119:41080/api +# VUE_APP_API_SERVER = http://192.168.1.140/api VUE_APP_NODE_ENV=prod:sit VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file diff --git a/epmet-oper-web/public/index.html b/epmet-oper-web/public/index.html index 74c8614..baa175b 100644 --- a/epmet-oper-web/public/index.html +++ b/epmet-oper-web/public/index.html @@ -35,8 +35,8 @@ <% if (process.env.VUE_APP_NODE_ENV==='dev' ) { %> <% } %> @@ -46,8 +46,8 @@ // window.SITE_CONFIG['apiURL'] = // 'http://epmet-dev.elinkservice.cn:48080/api' - // window.SITE_CONFIG['apiURL'] = 'http://118.190.150.119:41080/api' - window.SITE_CONFIG['apiURL'] = 'http://192.168.1.140/api' + window.SITE_CONFIG['apiURL'] = 'http://118.190.150.119:41080/api' + // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.140/api' <% } %> From 7a9103ad9b09068d2d9bb73fb16d22c87a530b7e Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 22 Dec 2021 14:44:38 +0800 Subject: [PATCH 13/24] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E9=A1=B9=E6=B7=BB=E5=8A=A0=E6=94=AF=E6=8C=81=20=E7=88=B6?= =?UTF-8?q?=E7=BA=A7Id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-oper-web/src/i18n/zh-CN.js | 1 + epmet-oper-web/src/i18n/zh-TW.js | 1 + .../modules/sys/dict-data-add-or-update.vue | 34 +++++++++++++++++++ .../src/views/modules/sys/dict-data.vue | 16 ++++++--- .../src/views/modules/sys/dict-type.vue | 3 +- 5 files changed, 50 insertions(+), 5 deletions(-) diff --git a/epmet-oper-web/src/i18n/zh-CN.js b/epmet-oper-web/src/i18n/zh-CN.js index 5810501..5d9b1d5 100644 --- a/epmet-oper-web/src/i18n/zh-CN.js +++ b/epmet-oper-web/src/i18n/zh-CN.js @@ -290,6 +290,7 @@ t.dict.dictName = '字典名称' t.dict.dictType = '字典类型' t.dict.dictLabel = '字典标签' t.dict.dictValue = '字典值' +t.dict.dictPValue = '父级字典值' t.dict.sort = '排序' t.dict.remark = '备注' t.dict.createDate = '创建时间' diff --git a/epmet-oper-web/src/i18n/zh-TW.js b/epmet-oper-web/src/i18n/zh-TW.js index 6c706df..068726a 100644 --- a/epmet-oper-web/src/i18n/zh-TW.js +++ b/epmet-oper-web/src/i18n/zh-TW.js @@ -288,6 +288,7 @@ t.dict.dictName = '字典名稱' t.dict.dictType = '字典類型' t.dict.dictLabel = '字典標籤' t.dict.dictValue = '字典值' +t.dict.dictPValue = '父級字典值' t.dict.sort = '排序' t.dict.remark = '備註' t.dict.createDate = '創建時間' diff --git a/epmet-oper-web/src/views/modules/sys/dict-data-add-or-update.vue b/epmet-oper-web/src/views/modules/sys/dict-data-add-or-update.vue index 96a3f34..a0177f2 100644 --- a/epmet-oper-web/src/views/modules/sys/dict-data-add-or-update.vue +++ b/epmet-oper-web/src/views/modules/sys/dict-data-add-or-update.vue @@ -1,6 +1,17 @@ - @@ -204,13 +204,13 @@ export default { if (code === 0) { this.total = data.total this.tableData = data.list - this.tableData.forEach(element => { - if (element.isNormal) { - element.isNormalShow = '有' - } else { - element.isNormalShow = '无' - } - }); + // this.tableData.forEach(element => { + // if (element.isNormal) { + // element.isNormalShow = '有' + // } else { + // element.isNormalShow = '无' + // } + // }); } else { From f342a34e31d267945b3394c0c06e971df6a51454 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 7 Jan 2022 15:14:26 +0800 Subject: [PATCH 22/24] =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/modules/workPc/gridmemberStatic/workDetail.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-oper-web/src/views/modules/workPc/gridmemberStatic/workDetail.vue b/epmet-oper-web/src/views/modules/workPc/gridmemberStatic/workDetail.vue index b8644e7..adc8a0a 100644 --- a/epmet-oper-web/src/views/modules/workPc/gridmemberStatic/workDetail.vue +++ b/epmet-oper-web/src/views/modules/workPc/gridmemberStatic/workDetail.vue @@ -19,7 +19,7 @@
有无异常： - {{info.isNormalShow}} + {{info.isNormal}} --
@@ -91,7 +91,7 @@ export default { info: { title: "",//事项名称 workTypeName: "",//事项类型码 - isNormalShow: "",//有无异常 + isNormal: "",//有无异常 staffName: "",//人员姓名 happenAddress: "",//发生地点 happenTime: "",//发生时间 返回返回格式化字符串,yyyy-MM-dd From 737070af65e441de19db4723fa1cb3af85aef11f Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 17 Feb 2022 09:55:11 +0800 Subject: [PATCH 23/24] =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=94=BE=E5=BC=80=E6=96=B0=E5=A2=9E=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/modules/customer/customize/CategoryList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-oper-web/src/views/modules/customer/customize/CategoryList.vue b/epmet-oper-web/src/views/modules/customer/customize/CategoryList.vue index 6fa7cb1..b25174b 100644 --- a/epmet-oper-web/src/views/modules/customer/customize/CategoryList.vue +++ b/epmet-oper-web/src/views/modules/customer/customize/CategoryList.vue @@ -6,9 +6,9 @@ {{customerName}} 取消返回 - + @click="addShow()">{{"新增" }}
From d4846482f2705f69d06a474ccb091c7a58bbce94 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 17 Feb 2022 10:09:49 +0800 Subject: [PATCH 24/24] =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=94=BE=E5=BC=80=E6=96=B0=E5=A2=9E=E4=BA=8C?= =?UTF-8?q?=E7=BA=A7=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/modules/customer/customize/CategoryList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-oper-web/src/views/modules/customer/customize/CategoryList.vue b/epmet-oper-web/src/views/modules/customer/customize/CategoryList.vue index b25174b..5d4c587 100644 --- a/epmet-oper-web/src/views/modules/customer/customize/CategoryList.vue +++ b/epmet-oper-web/src/views/modules/customer/customize/CategoryList.vue @@ -49,10 +49,10 @@ 删除 - + @click="showAddLevel2(scope.row)">{{ "新增二级分类"}}