From 750b86a834d990a5087a0448fb05010643b39888 Mon Sep 17 00:00:00 2001
From: fanzhen123 <1575502816@qq.com>
Date: Wed, 25 Dec 2019 11:57:36 +0800
Subject: [PATCH] fanzhen1225

---
 .../advancedQuery/AdvancedQuery.vue           |  4 ++
 src/components/chartsCut/ChartsCut.vue        |  7 ++-
 src/components/dimension/Dimension.vue        | 45 ++++++++++++-------
 src/components/mapData/MapData.vue            |  4 ++
 src/components/nav/Nav.vue                    |  2 +-
 src/main.js                                   |  2 +-
 src/views/datasweb/Datasweb.vue               | 15 +++++--
 7 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/src/components/advancedQuery/AdvancedQuery.vue b/src/components/advancedQuery/AdvancedQuery.vue
index 8791995..e670148 100644
--- a/src/components/advancedQuery/AdvancedQuery.vue
+++ b/src/components/advancedQuery/AdvancedQuery.vue
@@ -371,6 +371,10 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+/deep/ .el-col-24{
+  min-width: 100%;
+  width:auto;
+}
 /deep/ .el-menu {
   border: none;
 }
diff --git a/src/components/chartsCut/ChartsCut.vue b/src/components/chartsCut/ChartsCut.vue
index 6ffc157..448530e 100644
--- a/src/components/chartsCut/ChartsCut.vue
+++ b/src/components/chartsCut/ChartsCut.vue
@@ -8,7 +8,7 @@
     >
       <img :src="item.url" alt />
     </div>
-    <div class="chart_right" v-if="!areaDimensionStateS">
+    <div class="chart_right" v-if="$store.state.SelecttDimension.row === 'sj' && $store.state.SelecttDimension.col === 'dq'">
       <!-- 指标地区cut -->
       <!-- <div class="chart_right_area" v-if="$route.query.type!=='area'">
         {{stateChangeSDF?'指标：':'地区：'}}
@@ -70,7 +70,7 @@
         </div>
       </div>
     </div>
-    <div class="chart_right" v-if="areaDimensionStateS&&this.$store.state.transBefore">
+    <div class="chart_right" v-if="$store.state.SelecttDimension.row !== 'sj' && $store.state.SelecttDimension.col !== 'dq'&&this.$store.state.transBefore">
       {{leftLabel[$store.state.noSelecttDimension]}}：
       <el-cascader
         v-model="valueDimension"
@@ -288,6 +288,9 @@ export default {
     // 地区维度转换筛选
     handleChangeDimension () {
       console.log(this.valueDimension, 'this.valueDimension')
+      if (this.valueDimension) {
+        this.$parent.changeDimensionTrueChangeArea(this.valueDimension[0])
+      }
     },
     // 点击切换图表
     cutChartsTap (ind) {
diff --git a/src/components/dimension/Dimension.vue b/src/components/dimension/Dimension.vue
index afc4d5a..55de2bc 100644
--- a/src/components/dimension/Dimension.vue
+++ b/src/components/dimension/Dimension.vue
@@ -10,16 +10,16 @@
         <div class="row">
           <div></div>
           <div class="row_main">
-            <div :class="{active:rowVal==='指标'}" @click="changeTabel('指标','row')">指标</div>
-            <div :class="{active:rowVal==='地区'}" @click="changeTabel('地区','row')">地区</div>
-            <div :class="{active:rowVal==='时间'}" @click="changeTabel('时间','row')">时间</div>
+            <div :class="{active:colVal==='指标'}" @click="changeTabel('指标','col')">指标</div>
+            <div :class="{active:colVal==='地区'}" @click="changeTabel('地区','col')">地区</div>
+            <div :class="{active:colVal==='时间'}" @click="changeTabel('时间','col')">时间</div>
           </div>
         </div>
         <div class="col">
           <div class="row_main">
-            <div :class="{active:colVal==='指标'}" @click="changeTabel('指标','col')">指标</div>
-            <div :class="{active:colVal==='地区'}" @click="changeTabel('地区','col')">地区</div>
-            <div :class="{active:colVal==='时间'}" @click="changeTabel('时间','col')">时间</div>
+            <div :class="{active:rowVal==='指标'}" @click="changeTabel('指标','row')">指标</div>
+            <div :class="{active:rowVal==='地区'}" @click="changeTabel('地区','row')">地区</div>
+            <div :class="{active:rowVal==='时间'}" @click="changeTabel('时间','row')">时间</div>
           </div>
           <div class="tabel">
             <div>
@@ -93,10 +93,11 @@ export default {
       if (this.rowVal === this.colVal) {
         alert('维度转换格式错误！行列相同')
       } else {
-        this.trueChangeArea()
+        this.trueChangeArea(false)
       }
     },
-    trueChangeArea () {
+    trueChangeArea (dataState) {
+      /* eslint-disable*/
       console.log(this.arrValue[this.colVal], 'this.$store.state.noChangeDatathis.$store.state.noChangeDatathis.$store.state.noChangeData')
       console.log(this.arrValue[this.rowVal], 'this.$store.state.noChangeDatathis.$store.state.noChangeDatathis.$store.state.noChangeData')
       console.log(this.$store.state.noChangeData)
@@ -106,7 +107,7 @@ export default {
         paramsd = {
           type: this.$route.query.type === 'area' ? 2 : 1, // 1非地区   2地区
           data: this.$store.state.selectDataLeft.id,
-          area: this.$store.state.noChangeData.areaName[0], // 选中的地区
+          area: dataState ? dataState : this.$store.state.noChangeData.areaName[0], // 选中的地区
           quota: '', // 选中的指标
           cate: this.selectState, // 1筛选指标  2筛选地区
           f: this.$store.state.selectDataLeft.f, // year=>年度分类，monthly=>月度分类，quarter=>季度分类
@@ -121,7 +122,7 @@ export default {
           type: this.$route.query.type === 'area' ? 2 : 1, // 1非地区   2地区
           data: this.$store.state.selectDataLeft.id,
           area: '', // 选中的地区
-          quota: this.$store.state.noChangeData.termsName[0], // 选中的指标
+          quota: dataState ? dataState : this.$store.state.noChangeData.termsName[0], // 选中的指标
           cate: this.selectState, // 1筛选指标  2筛选地区
           f: this.$store.state.selectDataLeft.f, // year=>年度分类，monthly=>月度分类，quarter=>季度分类
           // filters: this.$store.state.selectfilter, // year=>年度分类，monthly=>月度分类，quarter=>季度分类
@@ -139,7 +140,7 @@ export default {
           cate: this.selectState, // 1筛选指标  2筛选地区
           f: this.$store.state.selectDataLeft.f, // year=>年度分类，monthly=>月度分类，quarter=>季度分类
           // filters: this.$store.state.selectfilter, // year=>年度分类，monthly=>月度分类，quarter=>季度分类
-          date: this.$store.state.noChangeData.timeArr[0], // 时间
+          date: dataState ? dataState : this.$store.state.noChangeData.timeArr[0], // 时间
           row: this.arrValue[this.colVal],
           col: this.arrValue[this.rowVal]
         }
@@ -157,11 +158,23 @@ export default {
         if (res.data.code === 200) {
           // if (res.data.data.areaName.length !== 0) {
           let transBefore = {}
+          if ((this.arrValue[this.colVal] === 'sj' && this.arrValue[this.rowVal] === 'zb') || (this.arrValue[this.colVal] === 'zb' && this.arrValue[this.rowVal] === 'sj')) {
+            transBefore.timeArr = res.data.data.timeArr.map((item, index) => { return item.toString() })
+            transBefore.termsName = res.data.data.termsName
+            transBefore.areaName = this.$store.state.transBefore.areaName
+            transBefore.termsExplain = res.data.data.termsExplain
+          } else if ((this.arrValue[this.colVal] === 'sj' && this.arrValue[this.rowVal] === 'dq') || (this.arrValue[this.colVal] === 'dq' && this.arrValue[this.rowVal] === 'sj')) {
+            transBefore.timeArr = res.data.data.timeArr.map((item, index) => { return item.toString() })
+            transBefore.termsName = this.$store.state.transBefore.termsName
+            transBefore.areaName = res.data.data.areaName
+            transBefore.termsExplain = this.$store.state.transBefore.termsExplain
+          } else if ((this.arrValue[this.colVal] === 'zb' && this.arrValue[this.rowVal] === 'dq') || (this.arrValue[this.colVal] === 'dq' && this.arrValue[this.rowVal] === 'zb')) {
+            transBefore.timeArr = this.$store.state.transBefore.timeArr.map((item, index) => { return item.toString() })
+            transBefore.termsName = res.data.data.termsName
+            transBefore.areaName = res.data.data.areaName
+            transBefore.termsExplain = res.data.data.termsExplain
+          }
           transBefore.tableExplain = res.data.data.tableExplain
-          transBefore.timeArr = res.data.data.timeArr.map((item, index) => { return item.toString() })
-          transBefore.termsName = res.data.data.termsName
-          transBefore.termsExplain = res.data.data.termsExplain
-          transBefore.areaName = res.data.data.areaName
           transBefore.transBeforeTermsData = res.data.data.transBeforeTermsData
           transBefore.transBeforeAreaData = res.data.data.transBeforeAreaData[0]
           console.log(transBefore, '000')
@@ -184,7 +197,7 @@ export default {
       })
     }
   },
-  mounted () {
+  mounted() {
     this.change3D()
   }
 }
diff --git a/src/components/mapData/MapData.vue b/src/components/mapData/MapData.vue
index c38848f..89ce32d 100644
--- a/src/components/mapData/MapData.vue
+++ b/src/components/mapData/MapData.vue
@@ -393,6 +393,10 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+/deep/ .el-col-24{
+  min-width: 100%;
+  width:auto;
+}
 /deep/ .el-menu{
   border:none;
 }
diff --git a/src/components/nav/Nav.vue b/src/components/nav/Nav.vue
index 2daee2c..586e7ea 100644
--- a/src/components/nav/Nav.vue
+++ b/src/components/nav/Nav.vue
@@ -193,7 +193,7 @@ export default {
               setTimeout(() => {
                 localStorage.clear()
                 this.$router.go(0)
-              }, 7200)
+              }, 7200000)
               // 登录状态
               localStorage.setItem('userLogin', true)
               console.log(this.$route, '000111')
diff --git a/src/main.js b/src/main.js
index 085aad2..b5a2c73 100644
--- a/src/main.js
+++ b/src/main.js
@@ -99,7 +99,7 @@ axios({
     setTimeout(() => {
       localStorage.clear()
       this.$router.go(0)
-    }, 7200)
+    }, 7200000)
     // 登录状态
     localStorage.setItem('userLogin', true)
     Vue.prototype.$auth = true
diff --git a/src/views/datasweb/Datasweb.vue b/src/views/datasweb/Datasweb.vue
index 1c0ca14..d979e74 100644
--- a/src/views/datasweb/Datasweb.vue
+++ b/src/views/datasweb/Datasweb.vue
@@ -264,7 +264,8 @@
     <!-- 维度转换 -->
     <!--地区-->
     <Dimension
-      v-if="$store.state.dimensionState"
+      ref="childDimension"
+      v-show="$store.state.dimensionState"
       @changeValue="changeValue"
       @areaDimensionState="areaDimensionState"
     ></Dimension>
@@ -473,6 +474,7 @@ export default {
   methods: {
     // 地区数据维度转换状态
     areaDimensionState (val) {
+      console.log(val, 'bbbval')
       this.areaDimensionStateS = !this.areaDimensionStateS
     },
     // 维度转换非地区转置
@@ -1206,6 +1208,10 @@ export default {
     // 调用子组件的方法
     changeBrother () {
       this.$refs.childChartCont.brotherFuncShowData()
+    },
+    // 调用子组件的方法
+    changeDimensionTrueChangeArea (res) {
+      this.$refs.childDimension.trueChangeArea(res)
     }
   },
   computed: {
@@ -1259,11 +1265,12 @@ export default {
 </script>
 
 <style scoped lang="scss">
-/deep/ .el-col-24{
+/deep/ .el-col-24 {
+  min-width: 100%;
   width: auto;
 }
-/deep/ .el-menu{
-  border:none;
+/deep/ .el-menu {
+  border: none;
 }
 /deep/ .el-menu--horizontal .el-menu .el-menu-item,
 .el-menu--horizontal .el-menu .el-submenu__title {