From 3b8403a74c6ebd266f40cd554e9d7ddc57e096e3 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 10 Nov 2021 10:29:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB=E7=BB=9F?= =?UTF-8?q?=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 @@ + + + + +