From d95e7ce2a4ca25333d44de193bb649485fff40b2 Mon Sep 17 00:00:00 2001 From: fanzhen123 <1575502816@qq.com> Date: Tue, 31 Dec 2019 16:32:52 +0800 Subject: [PATCH] fanzhen1231 --- .../advancedQuery/AdvancedQuery.vue | 2 +- src/components/chartsCont/ChartsCont.vue | 133 +- src/components/chartsCut/ChartsCut.vue | 191 +- src/components/insertLabel/InsertLabel.vue | 35 +- src/components/nav/Nav.vue | 54 +- src/components/screenCom/ScreenCom.vue | 1690 +++++++++++++---- src/main.js | 12 +- src/router.js | 6 +- src/store.js | 13 +- .../CompanyIntroduction.vue | 2 +- src/views/dataList/DataList.vue | 124 +- src/views/datasweb/Datasweb.vue | 436 +++-- src/views/help/Help.vue | 2 +- src/views/index/Index.vue | 282 ++- src/views/listDetails/ListDetails.vue | 22 +- src/views/personalCenter/PersonalCenter.vue | 11 +- src/views/relation/Relation.vue | 2 +- .../data/Component is not found in path.html | 8 +- .../all_async_search_99b3fbd.js.下载 | 10 +- .../search-sug_d37baf2.js.下载 | 2 +- 20 files changed, 2136 insertions(+), 901 deletions(-) diff --git a/src/components/advancedQuery/AdvancedQuery.vue b/src/components/advancedQuery/AdvancedQuery.vue index e670148..bc0a49c 100644 --- a/src/components/advancedQuery/AdvancedQuery.vue +++ b/src/components/advancedQuery/AdvancedQuery.vue @@ -278,7 +278,7 @@ export default { // 请求接口完成 请求成功 if (res.data.code === 200) { this.leftCateData = res.data.data.list - this.selectClassId = this.leftCateData[0].id + this.selectClassId = this.$store.state.selectDataLeft.id console.log(this.selectClassId, 'this.selectClassId000') this.searchArealy() } diff --git a/src/components/chartsCont/ChartsCont.vue b/src/components/chartsCont/ChartsCont.vue index aade199..439a843 100644 --- a/src/components/chartsCont/ChartsCont.vue +++ b/src/components/chartsCont/ChartsCont.vue @@ -481,34 +481,56 @@ export default { console.log(this.$store.state.AreaAllCountData, '555222000') console.log(valStrinf, '555222000选中') console.log(this.$store.state.AreaAllCountData, 'kkkkk数据') - if (this.$store.state.AreaAllCountData) { - if (this.selectState === 2) { - if (this.$store.state.AreaAllCountData.areaName.indexOf(valStrinf) !== -1) { - let jsonData = JSON.parse(JSON.stringify(this.transBefore)) - jsonData.transBeforeAreaData = this.$store.state.AreaAllCountData.transBeforeAreaData[this.$store.state.AreaAllCountData.areaName.indexOf(valStrinf)] - this.transBefore = jsonData - this.$store.state.noChangeData = JSON.parse(JSON.stringify(this.transBefore)) + if (!this.$store.state.advancedSearchState) { // 非高级查询 + if (this.$store.state.AreaAllCountData) { + if (this.selectState === 2) { + if (this.$store.state.AreaAllCountData.areaName.indexOf(valStrinf) !== -1) { + // 当前选中下标 + this.$store.state.selectIndexAreaLebal = this.$store.state.AreaAllCountData.areaName.indexOf(valStrinf) + // 当前选中地区名称 + this.$store.state.lebalIndexName = this.$store.state.AreaAllCountData.areaName[this.$store.state.AreaAllCountData.areaName.indexOf(valStrinf)] + let jsonData = JSON.parse(JSON.stringify(this.transBefore)) + jsonData.transBeforeAreaData = this.$store.state.AreaAllCountData.transBeforeAreaData[this.$store.state.AreaAllCountData.areaName.indexOf(valStrinf)] + this.transBefore = jsonData + this.$store.state.noChangeData = JSON.parse(JSON.stringify(this.transBefore)) + } else { + this.selectState = 1 + this.getDatas() + // 告诉父组件改变筛选值 + this.$emit('tellChangeFan', true) + } } else { - this.selectState = 1 - this.getDatas() - // 告诉父组件改变筛选值 - this.$emit('tellChangeFan', true) - } - } else { - console.log(this.$store.state.AreaAllCountData.termsName.indexOf(valStrinf), 'this.$store.state.AreaAllCountData.areaName.indexOf(valStrinf)') - if (this.$store.state.AreaAllCountData.termsName.indexOf(valStrinf) !== -1) { - let jsonData = JSON.parse(JSON.stringify(this.transBefore)) - jsonData.transBeforeAreaData = this.$store.state.AreaAllCountData.transBeforeAreaData[this.$store.state.AreaAllCountData.termsName.indexOf(valStrinf)] - this.transBefore = jsonData - this.$store.state.noChangeData = JSON.parse(JSON.stringify(this.transBefore)) - console.log(this.$store.state.AreaAllCountData.transBeforeAreaData[this.$store.state.AreaAllCountData.termsName.indexOf(valStrinf)], '1010111') - } else { - this.selectState = 2 - this.getDatas() - // 告诉父组件改变筛选值 - this.$emit('tellChangeFan', true) + console.log(this.$store.state.AreaAllCountData.termsName.indexOf(valStrinf), 'this.$store.state.AreaAllCountData.areaName.indexOf(valStrinf)') + if (this.$store.state.AreaAllCountData.termsName.indexOf(valStrinf) !== -1) { + // 当前选中下标 + this.$store.state.selectIndexAreaLebal = this.$store.state.AreaAllCountData.termsName.indexOf(valStrinf) + // 当前选中指标 + this.$store.state.lebalIndexName = this.$store.state.AreaAllCountData.termsName[this.$store.state.AreaAllCountData.termsName.indexOf(valStrinf)] + let jsonData = JSON.parse(JSON.stringify(this.transBefore)) + jsonData.transBeforeAreaData = this.$store.state.AreaAllCountData.transBeforeAreaData[this.$store.state.AreaAllCountData.termsName.indexOf(valStrinf)] + this.transBefore = jsonData + this.$store.state.noChangeData = JSON.parse(JSON.stringify(this.transBefore)) + // console.log(this.$store.state.AreaAllCountData.transBeforeAreaData[this.$store.state.AreaAllCountData.termsName.indexOf(valStrinf)], '1010111') + } else { + this.selectState = 2 + this.getDatas() + // 告诉父组件改变筛选值 + this.$emit('tellChangeFan', true) + } } } + } else { + console.log(valStrinf, '筛选名称') + // 筛选指标 + if (this.selectState === 1) { + this.$store.state.labelIndexName = valStrinf + this.$store.state.areaIndexName = '' + this.advancedSearchDataShow() + } else { // 筛选地区 + this.$store.state.labelIndexName = '' + this.$store.state.areaIndexName = valStrinf + this.advancedSearchDataShow() + } } }, // 监听行列图表转换 @@ -524,15 +546,15 @@ export default { if (val) { // 初始化公共数据 // console.log(this.objCompBefore, 'this.objCompBefore') - if (JSON.parse(localStorage.getItem('classFiyData')) && JSON.parse(localStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id)) { + if (JSON.parse(sessionStorage.getItem('classFiyData')) && JSON.parse(sessionStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id)) { this.transBefore = {} - this.transBefore.tableExplain = JSON.parse(localStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.tableExplain - this.transBefore.timeArr = JSON.parse(localStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.timeArr.map((item, index) => { return item.toString() }) - this.transBefore.termsName = JSON.parse(localStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.termsName - this.transBefore.termsExplain = JSON.parse(localStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.termsExplain - this.transBefore.areaName = JSON.parse(localStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.areaName - this.transBefore.transBeforeTermsData = JSON.parse(localStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.transBeforeTermsData - this.transBefore.transBeforeAreaData = JSON.parse(localStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.transBeforeAreaData + this.transBefore.tableExplain = JSON.parse(sessionStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.tableExplain + this.transBefore.timeArr = JSON.parse(sessionStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.timeArr.map((item, index) => { return item.toString() }) + this.transBefore.termsName = JSON.parse(sessionStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.termsName + this.transBefore.termsExplain = JSON.parse(sessionStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.termsExplain + this.transBefore.areaName = JSON.parse(sessionStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.areaName + this.transBefore.transBeforeTermsData = JSON.parse(sessionStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.transBeforeTermsData + this.transBefore.transBeforeAreaData = JSON.parse(sessionStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.transBeforeAreaData console.log(this.transBefore, '000kkkkkkkkkkkkk') this.$store.state.transdtr = true // 全局总数据 @@ -544,9 +566,9 @@ export default { console.log(this.$store.state.selectData, 'this.$store.state.selectData') console.log(this.$store.state.selectfilter, 'this.$store.state.selectfilter') this.$nextTick(() => { - if (this.hangZhiState) { - this.getDatas() - } + console.log(this.hangZhiState, 'this.hangZhiState') + this.$store.state.advancedSearchState = false + this.getDatas() }) } // 调接口拿到所有当前分类下的所有的指标、地区、时间 @@ -561,15 +583,15 @@ export default { console.log(val, 'jjjjjj') if (val) { console.log(val, 'jjjjjj') - if (JSON.parse(localStorage.getItem('classFiyData')) && JSON.parse(localStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id)) { + if (JSON.parse(sessionStorage.getItem('classFiyData')) && JSON.parse(sessionStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id)) { this.transBefore = {} - this.transBefore.tableExplain = JSON.parse(localStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.tableExplain - this.transBefore.timeArr = JSON.parse(localStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.timeArr.map((item, index) => { return item.toString() }) - this.transBefore.termsName = JSON.parse(localStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.termsName - this.transBefore.termsExplain = JSON.parse(localStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.termsExplain - this.transBefore.areaName = JSON.parse(localStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.areaName - this.transBefore.transBeforeTermsData = JSON.parse(localStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.transBeforeTermsData - this.transBefore.transBeforeAreaData = JSON.parse(localStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.transBeforeAreaData + this.transBefore.tableExplain = JSON.parse(sessionStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.tableExplain + this.transBefore.timeArr = JSON.parse(sessionStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.timeArr.map((item, index) => { return item.toString() }) + this.transBefore.termsName = JSON.parse(sessionStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.termsName + this.transBefore.termsExplain = JSON.parse(sessionStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.termsExplain + this.transBefore.areaName = JSON.parse(sessionStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.areaName + this.transBefore.transBeforeTermsData = JSON.parse(sessionStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.transBeforeTermsData + this.transBefore.transBeforeAreaData = JSON.parse(sessionStorage.getItem('classFiyData')).find(item => item.id === this.defaultDataRight.id).data.transBeforeAreaData console.log(this.transBefore, '000') // this.$store.state.transdtr = true // 全局总数据 @@ -587,6 +609,7 @@ export default { // } } }, + // 筛选 statesDf (val) { if (val === 2) { this.transBefore = {} @@ -597,8 +620,6 @@ export default { this.transBefore.areaName = this.$store.state.transBefore.areaName this.transBefore.transBeforeTermsData = this.$store.state.transBefore.transBeforeTermsData this.transBefore.transBeforeAreaData = this.$store.state.transBefore.transBeforeAreaData - // this.$store.state.noChangeData = JSON.parse(JSON.stringify(this.transBefore)) - // console.log(this.transBefore, '我要改变') // 重新渲染表格 this.$refs.table.doLayout() // 告诉父组件改完了 @@ -1027,6 +1048,7 @@ export default { }, // 获取后台数据表中的数据 getDatas () { + console.log('执行getDatas') if (!this.$store.state.advancedSearchState) { // 初始化计算数据 if (this.transBefore) { @@ -1141,6 +1163,7 @@ export default { console.log(fail, 2369) }) } else { + console.log('zhixingelse') this.transBefore = this.$store.state.transBefore this.$store.state.noChangeData = JSON.parse(JSON.stringify(this.transBefore)) } @@ -1153,10 +1176,10 @@ export default { data: { type: this.$route.query.type === 'area' ? 2 : 1, data: this.$store.state.advanceData, - area: this.downLaSelect.area, - quota: this.downLaSelect.label, + area: this.$store.state.areaIndexName, + quota: this.$store.state.labelIndexName, cate: this.selectState, - f: this.$route.query.type, + f: this.$store.state.selectDataLeft.f, date: this.$store.state.selectData } }).then(res => { @@ -1170,7 +1193,7 @@ export default { transBefore.termsExplain = res.data.data.termsExplain transBefore.areaName = res.data.data.areaName transBefore.transBeforeTermsData = res.data.data.transBeforeTermsData - transBefore.transBeforeAreaData = res.data.data.transBeforeAreaData + transBefore.transBeforeAreaData = res.data.data.transBeforeAreaData[0] console.log(transBefore, '000') this.$store.state.transdtr = true // 全局总数据 @@ -1194,6 +1217,10 @@ export default { } else { this.getDatas() } + }, + // 重新初始化表格数据 + initTableData () { + this.objCompBefore.initAllData() } }, computed: { @@ -1261,13 +1288,13 @@ export default { created () { // 还原高级查询状态 this.$store.state.advancedSearchState = false - console.log(this.advancedStates, 'this.advancedStates111') this.startsyui = this.advancedStates }, updated () { // 重新渲染表格 - this.$refs.table.doLayout() - console.log(this.advancedStates, 'this.advancedStates') + if (this.transBefore) { + this.$refs.table.doLayout() + } }, mounted () { // console.log(new ComputedData()) diff --git a/src/components/chartsCut/ChartsCut.vue b/src/components/chartsCut/ChartsCut.vue index ff2e924..510c3f4 100644 --- a/src/components/chartsCut/ChartsCut.vue +++ b/src/components/chartsCut/ChartsCut.vue @@ -1,28 +1,19 @@