From 9c5d503b511b0744e0268e09d3bff37c123ad0ce Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Mon, 1 Jun 2020 14:21:47 +0800
Subject: [PATCH] update

---
 src/assets/js/computeddata.js                 |    4 +-
 src/components/chartsCont/ChartsCont.vue      | 1577 +++++++++------
 src/components/chartsCut/ChartsCut.vue        |   82 +-
 src/components/dimension/Dimension.vue        |   26 +-
 src/components/mapData/MapData.vue            |  571 ++++--
 src/components/nav/Nav.vue                    |  307 +--
 .../pullDownComponents/PullDownComponents.vue |    2 +-
 src/components/screenCom/ScreenCom.vue        |  377 ++--
 src/views/datasweb/Datasweb.vue               | 1720 +++++++++++------
 src/views/personalCenter/PersonalCenter.vue   |    3 +
 src/views/searchList/SearchList.vue           |    2 +-
 static/data/icon_back.jpg                     |  Bin 0 -> 2311 bytes
 static/data/left-disable.jpg                  |  Bin 0 -> 811 bytes
 static/data/left.jpg                          |  Bin 0 -> 802 bytes
 static/data/right-disable.jpg                 |  Bin 0 -> 797 bytes
 static/data/right.jpg                         |  Bin 0 -> 793 bytes
 static/data/up.jpg                            |  Bin 0 -> 731 bytes
 17 files changed, 2956 insertions(+), 1715 deletions(-)
 create mode 100644 static/data/icon_back.jpg
 create mode 100644 static/data/left-disable.jpg
 create mode 100644 static/data/left.jpg
 create mode 100644 static/data/right-disable.jpg
 create mode 100644 static/data/right.jpg
 create mode 100644 static/data/up.jpg

diff --git a/src/assets/js/computeddata.js b/src/assets/js/computeddata.js
index fdea20d..67e62c6 100644
--- a/src/assets/js/computeddata.js
+++ b/src/assets/js/computeddata.js
@@ -2,7 +2,8 @@ let math = require('mathjs')
 // 定义一个计算类来计算数据
 class computedFunc {
   constructor (transBeforeData) {
-    this.transBeforeData = transBeforeData
+	this.transBeforeData = transBeforeData
+	console.log(transBeforeData,"class 6")
     // 处理好的数据需要返回的值 ===========all
     this.restur = {
       // 表头数据
@@ -388,6 +389,7 @@ class computedFunc {
       labelId: 'table_line0',
       label: '时间'
     })
+    console.log(this.transBeforeData)
     this.transBeforeData.areaName.forEach((itemTime, indexTime) => {
       this.restur.tableLine.push({
         labelId: 'table_line' + (indexTime + 1),
diff --git a/src/components/chartsCont/ChartsCont.vue b/src/components/chartsCont/ChartsCont.vue
index 85feb04..a7c97f5 100644
--- a/src/components/chartsCont/ChartsCont.vue
+++ b/src/components/chartsCont/ChartsCont.vue
@@ -1,72 +1,68 @@
 <template>
   <div>
-    <div class="chartsCont" v-show="transBefore&&!loadings">
-      <Echarts
-        v-if="indStatic!==0"
-        :echartsDatarts="echartsDatarts"
-        @rowColInd="rowColInd"
-        :echartsDatartsPie="echartsDatartsPie"
-      ></Echarts>
-      <el-table :data="tableData" style="width: 100%" height="360px" ref="table">
-        <el-table-column
-          :prop="item.labelId"
-          :label="item.label"
-          :fixed="index===0?true:false"
-          :width="computedWidth(index)"
-          sortable
-          show-overflow-tooltip
-          v-for="(item,index) in tableLine"
-          :key="index"
-        >
-          <template slot-scope="scope" slot="header">
-            <img
-              :src="indexToExplain"
-              alt
-              v-if="index!==0&&$store.state.SelecttDimension.row==='zb'"
-              class="slotExplain"
-              :style="{'margin':indStatic===0?'0':''}"
-              @click="indexExplain(scope.column.label)"
-            />
-            <input
-              v-if="index!==0&&indStatic!==0"
-              type="checkbox"
-              style="cursor: pointer;"
-              @click.stop="listInput(index)"
-              :style="{'margin':'0 0.45rem'}"
-              :checked="listInputVal.indexOf(index)!==-1"
-              ref="listInputSelect"
-            />
-            <span :style="{'color':computedLineSty(index)?'red':''}">{{scope.column.label}}</span>
+    <div class="chartsCont"
+         v-show="transBefore&&!loadings">
+      <Echarts v-if="indStatic!==0"
+               :echartsDatarts="echartsDatarts"
+               @rowColInd="rowColInd"
+               :echartsDatartsPie="echartsDatartsPie"></Echarts>
+      <el-table :data="tableData"
+                style="width: 100%"
+                height="360px"
+                ref="table">
+        <el-table-column :prop="item.labelId"
+                         :label="item.label"
+                         :fixed="index===0?true:false"
+                         :width="computedWidth(index)"
+                         sortable
+                         show-overflow-tooltip
+                         v-for="(item,index) in tableLine"
+                         :key="index">
+          <template slot-scope="scope"
+                    slot="header">
+            <img :src="indexToExplain"
+                 alt
+                 v-if="index!==0&&$store.state.SelecttDimension.row==='zb'"
+                 class="slotExplain"
+                 :style="{'margin':indStatic===0?'0':''}"
+                 @click="indexExplain(scope.column.label)" />
+            <input v-if="index!==0&&indStatic!==0"
+                   type="checkbox"
+                   style="cursor: pointer;"
+                   @click.stop="listInput(index)"
+                   :style="{'margin':'0 0.45rem'}"
+                   :checked="listInputVal.indexOf(index)!==-1"
+                   ref="listInputSelect" />
+            <!-- <span :style="{'color':computedLineSty(index)?'red':''}">{{scope.column.label}}</span> -->
+            <span>{{scope.column.label}}</span>
           </template>
           <template slot-scope="scope">
-            <input
-              v-if="index===0&&indStatic!==0"
-              type="checkbox"
-              style="cursor: pointer;"
-              @click.stop="lineInput(scope.$index)"
-              :checked="lineInputVal.indexOf(scope.$index)!==-1"
-              ref="lineInputSelect"
-            />
-            <img
-              :src="indexToExplain"
-              alt
-              v-if="index===0&&$store.state.SelecttDimension.col==='zb'"
-              class="slotExplain"
-              :style="{'margin':indStatic===0?'0':''}"
-              @click="indexExplain(scope.row['table_line0'])"
-            />
-            <span
-              :style="{'color':(computedListSty(scope.$index)||computedLineSty(index))?'red':''}"
-            >{{scope.row['table_line'+index]}}</span>
+            <input v-if="index===0&&indStatic!==0"
+                   type="checkbox"
+                   style="cursor: pointer;"
+                   @click.stop="lineInput(scope.$index)"
+                   :checked="lineInputVal.indexOf(scope.$index)!==-1"
+                   ref="lineInputSelect" />
+            <img :src="indexToExplain"
+                 alt
+                 v-if="index===0&&$store.state.SelecttDimension.col==='zb'"
+                 class="slotExplain"
+                 :style="{'margin':indStatic===0?'0':''}"
+                 @click="indexExplain(scope.row['table_line0'])" />
+            <!-- <span :style="{'color':(computedListSty(scope.$index)||computedLineSty(index))?'red':''}">{{scope.row['table_line'+index]}}</span> -->
+            <span>{{scope.row['table_line'+index]}}</span>
           </template>
         </el-table-column>
       </el-table>
       <!-- 列表 表说明-->
-      <div class="tableExplain" v-html="computedTableExplain"></div>
+      <div class="tableExplain"
+           v-html="computedTableExplain"></div>
       <!-- 指标弹窗 -->
     </div>
-    <div v-if="!transBefore&&!loadings" class="tishi54">暂无数据</div>
-    <div v-loading="loadings" class="tishi54"></div>
+    <div v-if="!transBefore&&!loadings"
+         class="tishi54">暂无数据</div>
+    <div v-loading="loadings"
+         class="tishi54"></div>
   </div>
 </template>
 
@@ -368,11 +364,13 @@ export default {
   watch: {
     // 监听父组件高级查询
     startsyui (val, oldValue) {
-      console.log(val, oldValue, '12333333')
+      // console.log(val, oldValue, '12333333')
       if (val) {
-        console.log(this.$store.state.transBefore, '12')
+        // console.log(this.$store.state.transBefore, '12')
         this.transBefore = this.$store.state.transBefore
-        this.$store.state.noChangeData = JSON.parse(JSON.stringify(this.transBefore))
+        this.$store.state.noChangeData = JSON.parse(
+          JSON.stringify(this.transBefore)
+        )
         // // 告诉父组件渲染完毕
         this.$emit('tellParentsShowClos', false)
         this.startsyui = false
@@ -394,8 +392,10 @@ export default {
     },
     tableData: {
       handler () {
+        // console.log(this.$store.state.tableData, '之前的表数据')
         this.$store.state.tableData = this.tableData
         // console.log('需要保存默认的数据')
+        // console.log(this.tableData, '表数据')
         this.needSaveDefaultData()
       },
       immediate: true,
@@ -403,16 +403,22 @@ export default {
     },
     tableLine: {
       handler () {
-        this.$store.state.tableLine = this.tableLine
+        // 新加的 如果没有数据表格赋空
+        if (this.tableLine.length === 1) {
+          // this.tableLine = []
+          // this.tableData = []
+        }
+        // this.$store.state.tableLine = this.tableLine
+        // console.log(this.tableLine, '指标数据')
       },
       immediate: true,
       deep: true
     },
     transBefore: {
       handler (newval, oldval) {
-        console.log(newval, 1020202)
+        // console.log(newval, 1020202)
         if (newval && this.transBefore) {
-          console.log(this.transBefore, 'kkkkkkkkkkkkkkkkkkkkk')
+          // console.log(this.transBefore, 'kkkkkkkkkkkkkkkkkkkkk')
           this.showTable()
         }
       },
@@ -420,8 +426,8 @@ export default {
       deep: true
     },
     indStatic (newValue, oldValue) {
-      console.log(newValue, 'newValue1212')
-      console.log(this.transBefore, 'this.transBefore111000')
+      // console.log(newValue, 'newValue1212')
+      // console.log(this.transBefore, 'this.transBefore111000')
       if (this.transBefore) {
         this.chartsShow()
       }
@@ -439,12 +445,12 @@ export default {
     'chartsStatusMegger.computedStatic': {
       handler () {
         if (this.transBefore) {
-          console.log(this.chartsStatusMegger, 1255555)
+          // console.log(this.chartsStatusMegger, 1255555)
           this.nowDataTJ = this.chartsStatusMegger.computedStatic
           this.dataTJComput()
           // 重新渲染表
           this.$nextTick(() => {
-            console.log(this.$refs.table, 'this.$refs.table')
+            // console.log(this.$refs.table, 'this.$refs.table')
             if (this.$refs.table !== undefined) {
               this.$refs.table.doLayout()
             }
@@ -463,7 +469,7 @@ export default {
     // 监听左侧菜单的数据变化
     defaultDataRight: {
       handler (val) {
-        console.log(val, '左侧数据变化')
+        // console.log(val, '左侧数据变化')
         this.$store.state.defaultShowDataState = false
         // 还原转置状态和行列状态
         this.transState = true
@@ -483,7 +489,7 @@ export default {
             row: 'sj',
             col: 'dq'
           }
-          console.log(this.$store.state.SelecttDimension, 'this.$store.state.SelecttDimension')
+          // console.log(this.$store.state.SelecttDimension, 'this.$store.state.SelecttDimension')
         }
         if (val) {
           // 初始化公共数据
@@ -512,7 +518,7 @@ export default {
       //     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')
+      //     // console.log(this.transBefore, '000')
       //     // this.$store.state.transdtr = true
       //     // 全局总数据
       //     this.$store.state.transBefore = this.transBefore
@@ -539,7 +545,8 @@ export default {
         this.$emit('tellAreadly', 1)
       }
     },
-    showTableState (val) { // 监听清除空行空列后重新渲染表格
+    showTableState (val) {
+      // 监听清除空行空列后重新渲染表格
       if (val) {
         this.transBefore = {}
         this.transBefore.tableExplain = this.$store.state.transBefore.tableExplain
@@ -550,7 +557,9 @@ 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))
+        this.$store.state.noChangeData = JSON.parse(
+          JSON.stringify(this.transBefore)
+        )
         this.$refs.table.doLayout()
         // 告诉父组件重新渲染表格完毕
         this.$emit('statertyui', false)
@@ -558,7 +567,7 @@ export default {
     },
     // 监听地区数据维度转换状态
     areaDimensionStateS (newVal) {
-      console.log(newVal, '1011111')
+      // console.log(newVal, '1011111')
       // if (newVal) {
       if (this.$store.state.transBefore !== null) {
         this.transBefore = {}
@@ -573,7 +582,9 @@ export default {
       } else {
         this.transBefore = null
       }
-      this.$store.state.noChangeData = JSON.parse(JSON.stringify(this.transBefore))
+      this.$store.state.noChangeData = JSON.parse(
+        JSON.stringify(this.transBefore)
+      )
       this.$refs.table.doLayout()
       this.showTable()
       // 告诉父组件重新渲染表格完毕
@@ -586,18 +597,20 @@ export default {
      * @desc 显示默认的数据
      *
      * */
-    showSaveDefaultData () {
-
-    },
+    showSaveDefaultData () {},
     /**
      * @desc 调接口显示表格数据
      * @param valStrinf string 当前选中的时间
      *
      * */
     downLaSelectArea (valStrinf) {
-      console.log(valStrinf, '555222000选中')
-      console.log(this.$store.state.AreaAllCountData, 'kkkkk数据')
-      if (this.$store.state.defaultShowDataState && this.labelAreaNum && this.$store.state.defaultShowLabelAreaState === 'defaultLocal') {
+      // console.log(valStrinf, '555222000选中')
+      // console.log(this.$store.state.AreaAllCountData, 'kkkkk数据')
+      if (
+        this.$store.state.defaultShowDataState &&
+        this.labelAreaNum &&
+        this.$store.state.defaultShowLabelAreaState === 'defaultLocal'
+      ) {
         this.transBefore = this.$store.state.transBefore
         setTimeout(() => {
           this.loadings = false
@@ -616,7 +629,7 @@ export default {
             }
             this.getDatas()
           } else {
-            console.log(this.leftState, '走这里')
+            // console.log(this.leftState, '走这里')
             if (this.$store.state.newSelectDaaState) {
               this.$store.state.labelIndexName = valStrinf
               this.$store.state.areaIndexName = ''
@@ -651,17 +664,27 @@ export default {
     lieWidthComputed () {
       // 总数据
       // console.log(JSON.parse(JSON.stringify(this.tableData.map((item, index) => { return Object.values(item) }))), '数据表演')
-      let AllCountData = (this.tableData.map((item, index) => { return Object.values(item) }))
-      // console.log(AllCountData, 'AllCountData')
-      AllCountData.unshift(this.tableLine.map((item, index) => { return item.label }))
+      let AllCountData = this.tableData.map((item, index) => {
+        return Object.values(item)
+      })
+    //   // console.log(AllCountData, 'AllCountData')
+      AllCountData.unshift(
+        this.tableLine.map((item, index) => {
+          return item.label
+        })
+      )
+    //   // console.log(AllCountData[0], 'AllCountData[0]')
       // 将数据进行行列转换
       let zhuanChange = AllCountData[0].map((col, index) => {
         return AllCountData.map((row, key) => {
-          // console.log(row[index].length, 'rowrow')
+          // 新加的
+          if (!row[index]) return 0
+          // console.log(row, 'rowrow')
+          // if (!row[index]) return 0
           return row[index].length
         })
       })
-      // console.log(zhuanChange, 'AllCountData')
+    //   // console.log(zhuanChange, 'AllCountData zhuanChange')
       this.lieWidthArr = zhuanChange.map((item, index) => {
         return item.reduce((total, currentValue) => {
           return total > currentValue ? total : currentValue
@@ -678,459 +701,643 @@ export default {
      * */
     /* eslint-disable */
     downLaSelects() {
-      if (this.$route.query.type !== 'area') {
-        console.log('走这里000125')
-        if (this.$route.query.defaultLeftId === 'default' && this.$store.state.defaultShowLabelAreaState === 'defaultOnLine') {// 显示默认数据并且是显示默认线上数据
-          console.log(12550)
+      if (this.$route.query.type !== "area") {
+        // console.log("走这里000125");
+        if (
+          this.$route.query.defaultLeftId === "default" &&
+          this.$store.state.defaultShowLabelAreaState === "defaultOnLine"
+        ) {
+          // 显示默认数据并且是显示默认线上数据
+          // console.log(12550);
           if (!this.$store.state.advancedSearchState) {
-            this.getDatas()
+            this.getDatas();
           } else {
-            this.advancedSearchDataShow()
+            this.advancedSearchDataShow();
           }
-        } else if (this.$route.query.defaultLeftId === 'default' && this.$store.state.defaultShowLabelAreaState === 'normal') {// 显示默认数据并且是正常显示数据
-          console.log(12551)
+        } else if (
+          this.$route.query.defaultLeftId === "default" &&
+          this.$store.state.defaultShowLabelAreaState === "normal"
+        ) {
+          // 显示默认数据并且是正常显示数据
+          // console.log(12551);
           if (!this.$store.state.advancedSearchState) {
-            this.getDatas()
+            this.getDatas();
           } else {
-            this.advancedSearchDataShow()
+            this.advancedSearchDataShow();
           }
-        } else if (this.$route.query.defaultLeftId !== 'default') {// 显示非正常数据
-          console.log(12552)
+        } else if (this.$route.query.defaultLeftId !== "default") {
+          // 显示非正常数据
+          // console.log(12552);
           if (!this.$store.state.advancedSearchState) {
-            this.getDatas()
+            this.getDatas();
           } else {
-            this.advancedSearchDataShow()
+            this.advancedSearchDataShow();
           }
         }
       } else {
-        console.log(this.$store.state.timeNum, 'this.$store.state.timeNum')
-        if (this.$route.query.defaultLeftId === 'default' && !this.$store.state.timeNum) {// 显示非正常数据
+        // console.log(this.$store.state.timeNum, "this.$store.state.timeNum");
+        if (
+          this.$route.query.defaultLeftId === "default" &&
+          !this.$store.state.timeNum
+        ) {
+          // 显示非正常数据
           if (!this.$store.state.advancedSearchState) {
-            this.getDatas()
+            this.getDatas();
           } else {
-            console.log(this.$store.state.timeNum, 'downLaSelects')
-            this.advancedSearchDataShow()
+            // console.log(this.$store.state.timeNum, "downLaSelects");
+            this.advancedSearchDataShow();
           }
         }
       }
       // }
-      this.$store.state.timeNum = false
+      this.$store.state.timeNum = false;
     },
     // 获取所有当前分类下的所有的指标、地区、时间
     getInfor(classifyId) {
       this.$axios({
-        method: 'GET',
-        url: 'data/data/classify-detail',
+        method: "GET",
+        url: "data/data/classify-detail",
         params: {
           id: classifyId
         }
-      }).then(res => {
-        console.log(res, '获取分类下的地区、指标、时间')
-        // 请求接口完成   请求成功
-        if (res.data.code === 200) {
-          this.$store.state.dataArealabelTime = res.data.data
-          // 该分类下有数据
-          this.$store.state.classifyIdDataState = true
-        } else {
-          this.$store.state.dataArealabelTime = res.data.data
-          // 该分类下无数据
-          this.$store.state.classifyIdDataState = false
-          // =======================
-          this.$store.state.transdtr = true
-          this.transBefore = null
-          // 全局总数据
-          this.$store.state.transBefore = null
-          this.$store.state.allNochangeInitData = null
-          this.$store.state.noChangeData = null
-          // 调用父组件的comTime方法告诉父组件重置状态
-          this.$store.state.noDataState = false
-          this.leftState = true
-        }
-        if (!this.$store.state.advancedSearchState) {
-          if (this.$store.state.defaultShowDataState && this.$route.query.type !== 'area') {
-            this.$store.state.transdtr = true
-            // 全局总数据
-            this.transBefore = this.$store.state.transBefore
-            this.leftState = true
-            console.log(this.$store.state.transBefore, 'this.transBefore if')
-            console.log(this.$store.state.SelecttDimension, 'this.$store.state.SelecttDimension')
-            if (this.$store.state.SelecttDimension.col === 'zb' && this.$store.state.SelecttDimension.row === 'sj') {
-              this.transState = true
-            } else if (this.$store.state.SelecttDimension.col === 'sj' && this.$store.state.SelecttDimension.row === 'zb') {
-              this.transState = false
-            }
-            this.chartsStatusMegger.transState = this.transState
-          } else {
-            console.log(this.$store.state.transBefore, 'this.transBefore else')
-            this.$parent.childChartsCutShow()
-            if (this.$store.state.yesNoClickChange && this.$store.state.defaultShowLabelAreaState === 'defaultLocal') {
-              this.$parent.changeCutShow()
-            }
-          }
-          console.log(this.$store.state.SelecttDimension, 'this.$store.state.SelecttDimension')
-        } else {
-          console.log('0000000000000000000011111111111111111111111111111111111111111111111111111111111111111111122222222222222222222222222222')
-          this.$parent.childChartsCutShow()
-        }
-      }).catch((fail) => {
-        console.log(fail)
       })
+        .then(res => {
+        //   // console.log(res, "获取分类下的地区、指标、时间");
+          // 请求接口完成   请求成功
+          if (res.data.code === 200) {
+            // let sortingData = this.areaOrder(res.data.data);
+            this.$store.state.dataArealabelTime = res.data.data;
+            // 该分类下有数据
+            this.$store.state.classifyIdDataState = true;
+          } else {
+            this.$store.state.dataArealabelTime = res.data.data;
+            // 该分类下无数据
+            this.$store.state.classifyIdDataState = false;
+            // =======================
+            this.$store.state.transdtr = true;
+            this.transBefore = null;
+            // 全局总数据
+            this.$store.state.transBefore = null;
+            this.$store.state.allNochangeInitData = null;
+            this.$store.state.noChangeData = null;
+            // 调用父组件的comTime方法告诉父组件重置状态
+            this.$store.state.noDataState = false;
+            this.leftState = true;
+          }
+          if (!this.$store.state.advancedSearchState) {
+            if (
+              this.$store.state.defaultShowDataState &&
+              this.$route.query.type !== "area"
+            ) {
+              this.$store.state.transdtr = true;
+              // 全局总数据
+              this.transBefore = this.$store.state.transBefore;
+              this.leftState = true;
+            //   // console.log(this.$store.state.transBefore, "this.transBefore if");
+            //   // console.log(
+            //     this.$store.state.SelecttDimension,
+            //     "this.$store.state.SelecttDimension"
+            //   );
+              if (
+                this.$store.state.SelecttDimension.col === "zb" &&
+                this.$store.state.SelecttDimension.row === "sj"
+              ) {
+                this.transState = true;
+              } else if (
+                this.$store.state.SelecttDimension.col === "sj" &&
+                this.$store.state.SelecttDimension.row === "zb"
+              ) {
+                this.transState = false;
+              }
+              this.chartsStatusMegger.transState = this.transState;
+            } else {
+            //   // console.log(
+            //     this.$store.state.transBefore,
+            //     "this.transBefore else"
+            //   );
+              this.$parent.childChartsCutShow();
+              if (
+                this.$store.state.yesNoClickChange &&
+                this.$store.state.defaultShowLabelAreaState === "defaultLocal"
+              ) {
+                this.$parent.changeCutShow();
+              }
+            }
+            // console.log(this.$store.state.SelecttDimension, 'this.$store.state.SelecttDimension')
+          } else {
+            this.$parent.childChartsCutShow();
+          }
+        })
+        .catch(fail => {
+        //   // console.log(fail);
+        });
+    },
+    // 地区按方位排序
+    areaOrder(areaData) {
+      let area = [
+        "北京",
+        "天津",
+        "河北",
+        "山西",
+        "内蒙古",
+        "上海",
+        "江苏",
+        "浙江",
+        "山东",
+        "安徽",
+        "辽宁",
+        "吉林",
+        "黑龙江",
+        "湖北",
+        "湖南",
+        "河南",
+        "江西",
+        "广东",
+        "广西",
+        "海南",
+        "福建",
+        "四川",
+        "重庆",
+        "贵州",
+        "云南",
+        "西藏",
+        "陕西",
+        "甘肃",
+        "新疆",
+        "青海",
+        "宁夏"
+      ];
+      let data = JSON.parse(JSON.stringify(areaData.areaArr));
+      let sortingData = area.filter(item => {
+        return data.indexOf(item) > -1;
+      });
+    //   // console.log(sortingData, "排序地区");
+      return sortingData;
     },
     // 非地区数据转置
     wrongAreaTrans() {
-      if (this.transState) { // 当时间在表头上的时候
-        this.objCompBefore = new ComputedData(this.transBefore)
-        var objDatasBefore = this.objCompBefore.comTransBefore()
-        this.tableLine = objDatasBefore.tableLine
-        this.tableData = objDatasBefore.countData
-        console.log(objDatasBefore, 'objDatasBefore')
-      } else { // 当指标名称在表头上
-        this.objCompBefore = new ComputedData(this.transBefore)
-        var objDatasAfter = this.objCompBefore.comTransAfter()
-        this.tableLine = objDatasAfter.tableLine
-        this.tableData = objDatasAfter.countData
-        console.log(objDatasAfter, 'objDatasAfter')
+			// console.log(this.transState, 'this.transState')
+      // if (this.transState) {
+      //   // 当时间在表头上的时候
+      //   this.objCompBefore = new ComputedData(this.transBefore);
+      //   var objDatasBefore = this.objCompBefore.comTransBefore();
+      //   this.tableLine = objDatasBefore.tableLine;
+      //   this.tableData = objDatasBefore.countData;
+      //   // console.log(objDatasBefore, "objDatasBefore");
+      // } else {
+      //   // 当指标名称在表头上
+      //   this.objCompBefore = new ComputedData(this.transBefore);
+      //   var objDatasAfter = this.objCompBefore.comTransAfter();
+      //   this.tableLine = objDatasAfter.tableLine;
+      //   this.tableData = objDatasAfter.countData;
+      //   // console.log(objDatasAfter, 'objDatasAfter')
+			// }
+	if (this.$store.state.SelecttDimension.row === "sj" && this.$store.state.SelecttDimension.col === "zb") {
+        // 当时间在表头上的时候
+        this.objCompBefore = new ComputedData(this.transBefore);
+        var objDatasBefore = this.objCompBefore.comTransBefore();
+        this.tableLine = objDatasBefore.tableLine;
+        this.tableData = objDatasBefore.countData;
+        // console.log(objDatasBefore, "objDatasBefore");
+      } else {
+        // 当指标名称在表头上
+        this.objCompBefore = new ComputedData(this.transBefore);
+        var objDatasAfter = this.objCompBefore.comTransAfter();
+        this.tableLine = objDatasAfter.tableLine;
+        this.tableData = objDatasAfter.countData;
+        // console.log(objDatasAfter, 'objDatasAfter')
       }
       // 计算列宽的数组
-      this.lieWidthComputed()
+      this.lieWidthComputed();
     },
     // 地区数据转置
     areaTrans() {
-      console.log(this.transState, 'this.transState')
-      console.log(this.$store.state.SelecttDimension, '2020')
-      if (this.$route.query.type === 'area' && this.$store.state.transClickState) {
-        let transpositionData = JSON.parse(JSON.stringify(this.transBefore.transBeforeAreaData))
-        this.transBefore.transBeforeAreaData = transpositionData[0].map(function (col, index) {
-          return transpositionData.map((row, key) => {
-            return row[index]
-          })
-        })
-        console.log(this.transBefore, 'transpositionData')
+		// console.log(this.$store.state.SelecttDimension, '水水水')
+		// console.log(this.transState, 'this.transState')
+		// console.log(this.$store.state.SelecttDimension, '2020')
+		// console.log(
+		// 	this.transBefore,
+		// 	"this.transBeforethis.transBeforethis.transBefore354564"
+		// );
+		// 点击转置
+      if (
+        this.$route.query.type === "area" &&
+        this.$store.state.transClickState
+      ) {
+        let transpositionData = JSON.parse(
+          JSON.stringify(this.transBefore.transBeforeAreaData)
+        );
+        this.transBefore.transBeforeAreaData = transpositionData[0].map(
+          function(col, index) {
+            return transpositionData.map((row, key) => {
+              return row[index];
+            });
+          }
+        );
+        // console.log(this.transBefore, 'transpositionData')
         // let transpositionDatas = JSON.parse(JSON.stringify(this.$store.state.allNochangeInitData.transBeforeAreaData))
         // this.$store.state.allNochangeInitData.transBeforeAreaData = transpositionDatas[0].map(function (col, index) {
         //   return transpositionDatas.map((row, key) => {
         //     return row[index]
         //   })
         // })
-        console.log(this.$store.state.allNochangeInitData.transBeforeAreaData, 'this.$store.state.allNochangeInitData.transBeforeAreaData')
-        // 数据转置完成恢复
-        this.$store.state.transClickState = false
-      }
-      if (this.$store.state.SelecttDimension.row === 'sj' && this.$store.state.SelecttDimension.col === 'dq') {
-        this.objCompBefore = new ComputedData(this.transBefore)
-        var objDatasBefore = this.objCompBefore.comTransAreabefore()
-        this.tableLine = objDatasBefore.tableLine
-        this.tableData = objDatasBefore.countData
-        console.log(objDatasBefore, 'objDatasAfter1')
-      } else if (this.$store.state.SelecttDimension.row === 'dq' && this.$store.state.SelecttDimension.col === 'sj') {
-        let objCompAfter = new ComputedData(this.transBefore)
-        var objDatasAfter = objCompAfter.comTransAreaAfter()
-        this.tableLine = objDatasAfter.tableLine
-        this.tableData = objDatasAfter.countData
-        console.log(objDatasAfter, 'objDatasAfter2')
-        this.objCompBefore = objCompAfter
-      } else if (this.$store.state.SelecttDimension.row === 'sj' && this.$store.state.SelecttDimension.col === 'zb') {
-        console.log(this.transBefore, 'this.transBeforethis.transBeforethis.transBefore')
-        let objCompAfter = new ComputedData(this.transBefore)
-        var comTransAreabeforeLabelTime = objCompAfter.comTransAreabeforeLabelTime()
-        this.tableLine = comTransAreabeforeLabelTime.tableLine
-        this.tableData = comTransAreabeforeLabelTime.countData
-        console.log(comTransAreabeforeLabelTime, 'comTransAreabeforeLabelTime')
-        this.objCompBefore = objCompAfter
-      } else if (this.$store.state.SelecttDimension.row === 'zb' && this.$store.state.SelecttDimension.col === 'sj') {
-        let objCompAfter = new ComputedData(this.transBefore)
-        var comTransAreabeforeTimeLabel = objCompAfter.comTransAreabeforeTimeLabel()
-        this.tableLine = comTransAreabeforeTimeLabel.tableLine
-        this.tableData = comTransAreabeforeTimeLabel.countData
-        console.log(comTransAreabeforeTimeLabel, 'comTransAreabeforeTimeLabel')
-        this.objCompBefore = objCompAfter
-      } else if (this.$store.state.SelecttDimension.row === 'zb' && this.$store.state.SelecttDimension.col === 'dq') {
-        let objCompAfter = new ComputedData(this.transBefore)
-        var comTransAreabeforeAreaLabel = objCompAfter.comTransAreabeforeAreaLabel()
-        this.tableLine = comTransAreabeforeAreaLabel.tableLine
-        this.tableData = comTransAreabeforeAreaLabel.countData
-        console.log(comTransAreabeforeAreaLabel, 'comTransAreabeforeAreaLabel')
-        this.objCompBefore = objCompAfter
-      } else if (this.$store.state.SelecttDimension.row === 'dq' && this.$store.state.SelecttDimension.col === 'zb') {
-        let objCompAfter = new ComputedData(this.transBefore)
-        var comTransAreabeforeLabelArea = objCompAfter.comTransAreabeforeLabelArea()
-        this.tableLine = comTransAreabeforeLabelArea.tableLine
-        this.tableData = comTransAreabeforeLabelArea.countData
-        console.log(comTransAreabeforeLabelArea, 'comTransAreabeforeLabelArea')
-        this.objCompBefore = objCompAfter
-      }
-      // 计算列宽的数组
-      this.lieWidthComputed()
+        // console.log(this.$store.state.allNochangeInitData.transBeforeAreaData, 'this.$store.state.allNochangeInitData.transBeforeAreaData')
+		// 数据转置完成恢复
+		
+	  }
+			// 根据条件转置
+      if (
+        this.$store.state.SelecttDimension.row === "sj" &&
+        this.$store.state.SelecttDimension.col === "dq"
+      ) {
+        this.objCompBefore = new ComputedData(this.transBefore);
+		var objDatasBefore = this.objCompBefore.comTransAreabefore();
+        this.tableLine = objDatasBefore.tableLine;
+		this.tableData = objDatasBefore.countData;
+		// console.log(objDatasBefore.countData[0])
+        // console.log(objDatasBefore, "objDatasBefore");
+      } else if (
+        this.$store.state.SelecttDimension.row === "dq" &&
+        this.$store.state.SelecttDimension.col === "sj"
+      ) {
+		console.log(this.transBefore, "this.transBefore");
+        let objCompAfter = new ComputedData(this.transBefore);
+        var objDatasAfter = objCompAfter.comTransAreaAfter();
+        this.tableLine = objDatasAfter.tableLine;
+        this.tableData = objDatasAfter.countData;
+        // console.log(objDatasAfter, "objDatasAfter2");
+        this.objCompBefore = objCompAfter;
+      } else if (
+        this.$store.state.SelecttDimension.row === "sj" &&
+        this.$store.state.SelecttDimension.col === "zb"
+      ) {
+        let objCompAfter = new ComputedData(this.transBefore);
+				var comTransAreabeforeLabelTime = objCompAfter.comTransAreabeforeLabelTime();
+        this.tableLine = comTransAreabeforeLabelTime.tableLine;
+        this.tableData = comTransAreabeforeLabelTime.countData;
+        // console.log(comTransAreabeforeLabelTime, "comTransAreabeforeLabelTime");
+        this.objCompBefore = objCompAfter;
+      } else if (
+        this.$store.state.SelecttDimension.row === "zb" &&
+        this.$store.state.SelecttDimension.col === "sj"
+      ) {
+        let objCompAfter = new ComputedData(this.transBefore);
+        var comTransAreabeforeTimeLabel = objCompAfter.comTransAreabeforeTimeLabel();
+        this.tableLine = comTransAreabeforeTimeLabel.tableLine;
+        this.tableData = comTransAreabeforeTimeLabel.countData;
+        // console.log(comTransAreabeforeTimeLabel, "comTransAreabeforeTimeLabel");
+        this.objCompBefore = objCompAfter;
+      } else if (
+        this.$store.state.SelecttDimension.row === "zb" &&
+        this.$store.state.SelecttDimension.col === "dq"
+      ) {
+        let objCompAfter = new ComputedData(this.transBefore);
+        var comTransAreabeforeAreaLabel = objCompAfter.comTransAreabeforeAreaLabel();
+        this.tableLine = comTransAreabeforeAreaLabel.tableLine;
+        this.tableData = comTransAreabeforeAreaLabel.countData;
+        // console.log(comTransAreabeforeAreaLabel, "comTransAreabeforeAreaLabel");
+        this.objCompBefore = objCompAfter;
+      } else if (
+        this.$store.state.SelecttDimension.row === "dq" &&
+        this.$store.state.SelecttDimension.col === "zb"
+      ) {
+        let objCompAfter = new ComputedData(this.transBefore);
+        var comTransAreabeforeLabelArea = objCompAfter.comTransAreabeforeLabelArea();
+        this.tableLine = comTransAreabeforeLabelArea.tableLine;
+        this.tableData = comTransAreabeforeLabelArea.countData;
+        // console.log(comTransAreabeforeLabelArea, "comTransAreabeforeLabelArea");
+        this.objCompBefore = objCompAfter;
+			}
+			// console.log(this.tableData, 'ceshi table')
+			// 新加的　如果地区数据为空只显示指标
+			this.tableData.forEach((element, index) => {
+				if (JSON.stringify(element) === '{}') {
+					this.tableData[index] = {
+						'table_line0': this.transBefore.areaName[index]
+					}
+				}
+			});
+			// console.log(this.tableData, 'ceshi after')
+	  // 计算列宽的数组
+	  	console.log("这是转换完成")
+    	this.$store.state.transClickState = false;
+      	this.lieWidthComputed();
     },
     // 渲染列表数据
     showTable() {
       // 改变转置状态
-      console.log(121212121)
-      if (this.$route.query.type !== 'area') { // 非地区数据转置
-        this.wrongAreaTrans()
-      } else { // 地区数据转置
-        this.areaTrans()
-        console.log(10000)
+			// console.log(121212121)
+      if (this.$route.query.type !== "area") {
+		// console.log(this.$store.state.transClickState, 'this.$store.state.transClickState')
+		if (localStorage.getItem('dateDimension') && !this.$store.state.transClickState) {
+			this.$store.state.SelecttDimension = JSON.parse(localStorage.getItem('dateDimension'))
+			// console.log(this.$store.state.SelecttDimension, 'this.$store.state.SelecttDimension')
+		}
+        // 非地区数据转置
+        this.wrongAreaTrans();
+      } else {
+			if (localStorage.getItem('areaDimension') && !this.$store.state.transClickState) {
+				this.$store.state.SelecttDimension = JSON.parse(localStorage.getItem('areaDimension'))
+				// console.log(this.$store.state.SelecttDimension, 'this.$store.state.SelecttDimension')
+				console.log("这是获取默认",this.$store.state.transClickState)
+			}
+			console.log(this.$store.state.SelecttDimension)
+        // 地区数据转置
+        this.areaTrans();
+        // console.log(10000)
       }
     },
     // 指标解释
     indexExplain(labIndexName) {
-      console.log(labIndexName, 'labIndexName')
+      // console.log(labIndexName, "labIndexName");
       if (this.transBefore.termsName.indexOf(labIndexName) !== -1) {
-        console.log('指标解释：', this.transBefore.termsExplain[this.transBefore.termsName.indexOf(labIndexName)])
-        this.$store.state.labelExplainData = this.transBefore.termsExplain[this.transBefore.termsName.indexOf(labIndexName)]
+        // console.log(
+        //   "指标解释：",
+        //   this.transBefore.termsExplain[
+        //     this.transBefore.termsName.indexOf(labIndexName)
+        //   ]
+        // );
+        this.$store.state.labelExplainData = this.transBefore.termsExplain[
+          this.transBefore.termsName.indexOf(labIndexName)
+        ];
         // 数据来源
-        this.$store.state.dataFrom = this.transBefore.dataSource[this.transBefore.termsName.indexOf(labIndexName)]
-        this.$store.state.labelExplainState = true
+        this.$store.state.dataFrom = this.transBefore.dataSource[
+          this.transBefore.termsName.indexOf(labIndexName)
+        ];
+        this.$store.state.labelExplainState = true;
       } else {
-        this.$store.state.labelExplainData = labIndexName
-        this.$store.state.labelExplainState = true
+        this.$store.state.labelExplainData = labIndexName;
+        this.$store.state.labelExplainState = true;
       }
     },
     // 统计数据对行，对列处理
     dataTJComput() {
-      if (this.nowDataTJ.stateType === 'line') {
+      if (this.nowDataTJ.stateType === "line") {
         switch (this.nowDataTJ.text) {
-          case '无':
-            break
-          case 'SUM求和':
-            let datartSUM = this.objCompBefore.dataSumLine()
-            this.tableLine = datartSUM.tableLine
-            this.tableData = datartSUM.countData
-            console.log(datartSUM, 'sum')
-            break
-          case 'x平均数':
-            let datartAVG = this.objCompBefore.dataAVGLine()
-            this.tableLine = datartAVG.tableLine
-            this.tableData = datartAVG.countData
-            console.log(datartAVG, 'AVG')
-            break
-          case 'MAX最大值':
-            let datartMAX = this.objCompBefore.dataMAXLine()
-            this.tableLine = datartMAX.tableLine
-            this.tableData = datartMAX.countData
-            console.log(datartMAX, 'MAX')
-            break
-          case 'MIN最小值':
-            let datartMIN = this.objCompBefore.dataMINLine()
-            this.tableLine = datartMIN.tableLine
-            this.tableData = datartMIN.countData
-            console.log(datartMIN, 'MIN')
-            break
-          case 'MD中位数':
-            let datartMD = this.objCompBefore.dataMDLine()
-            this.tableLine = datartMD.tableLine
-            this.tableData = datartMD.countData
-            console.log(datartMD, 'MD')
-            break
-          case 'MO众数':
-            let datartMO = this.objCompBefore.dataMOLine()
-            this.tableLine = datartMO.tableLine
-            this.tableData = datartMO.countData
-            console.log(datartMO, 'MO')
-            break
-          case 'S²方差':
-            let datartSS = this.objCompBefore.dataSSLine()
-            this.tableLine = datartSS.tableLine
-            this.tableData = datartSS.countData
-            console.log(datartSS, 'SS')
-            break
-          case 'S标准差':
-            let datartS = this.objCompBefore.dataSLine()
-            this.tableLine = datartS.tableLine
-            this.tableData = datartS.countData
-            console.log(datartS, 'S')
-            break
+          case "无":
+            break;
+          case "SUM求和":
+            let datartSUM = this.objCompBefore.dataSumLine();
+            this.tableLine = datartSUM.tableLine;
+            this.tableData = datartSUM.countData;
+            // console.log(datartSUM, "sum");
+            break;
+          case "x平均数":
+            let datartAVG = this.objCompBefore.dataAVGLine();
+            this.tableLine = datartAVG.tableLine;
+            this.tableData = datartAVG.countData;
+            // console.log(datartAVG, "AVG");
+            break;
+          case "MAX最大值":
+            let datartMAX = this.objCompBefore.dataMAXLine();
+            this.tableLine = datartMAX.tableLine;
+            this.tableData = datartMAX.countData;
+            // console.log(datartMAX, "MAX");
+            break;
+          case "MIN最小值":
+            let datartMIN = this.objCompBefore.dataMINLine();
+            this.tableLine = datartMIN.tableLine;
+            this.tableData = datartMIN.countData;
+            // console.log(datartMIN, "MIN");
+            break;
+          case "MD中位数":
+            let datartMD = this.objCompBefore.dataMDLine();
+            this.tableLine = datartMD.tableLine;
+            this.tableData = datartMD.countData;
+            // console.log(datartMD, "MD");
+            break;
+          case "MO众数":
+            let datartMO = this.objCompBefore.dataMOLine();
+            this.tableLine = datartMO.tableLine;
+            this.tableData = datartMO.countData;
+            // console.log(datartMO, "MO");
+            break;
+          case "S²方差":
+            let datartSS = this.objCompBefore.dataSSLine();
+            this.tableLine = datartSS.tableLine;
+            this.tableData = datartSS.countData;
+            // console.log(datartSS, "SS");
+            break;
+          case "S标准差":
+            let datartS = this.objCompBefore.dataSLine();
+            this.tableLine = datartS.tableLine;
+            this.tableData = datartS.countData;
+            // console.log(datartS, "S");
+            break;
         }
       } else {
         switch (this.nowDataTJ.text) {
-          case '无':
-            break
-          case 'SUM求和':
-            let datartSUM = this.objCompBefore.dataSumList()
-            this.tableLine = datartSUM.tableLine
-            this.tableData = datartSUM.countData
-            console.log(datartSUM, 'sum')
-            break
-          case 'x平均数':
-            let datartAVG = this.objCompBefore.dataAVGList()
-            this.tableLine = datartAVG.tableLine
-            this.tableData = datartAVG.countData
-            console.log(datartAVG, 'AVG')
-            break
-          case 'MAX最大值':
-            let datartMAX = this.objCompBefore.dataMAXList()
-            this.tableLine = datartMAX.tableLine
-            this.tableData = datartMAX.countData
-            console.log(datartMAX, 'MAX')
-            break
-          case 'MIN最小值':
-            let datartMIN = this.objCompBefore.dataMINList()
-            this.tableLine = datartMIN.tableLine
-            this.tableData = datartMIN.countData
-            console.log(datartMIN, 'MIN')
-            break
-          case 'MD中位数':
-            let datartMD = this.objCompBefore.dataMDList()
-            this.tableLine = datartMD.tableLine
-            this.tableData = datartMD.countData
-            console.log(datartMD, 'MD')
-            break
-          case 'MO众数':
-            let datartMO = this.objCompBefore.dataMOList()
-            this.tableLine = datartMO.tableLine
-            this.tableData = datartMO.countData
-            console.log(datartMO, 'MO')
-            break
-          case 'S²方差':
-            let datartSS = this.objCompBefore.dataSSList()
-            this.tableLine = datartSS.tableLine
-            this.tableData = datartSS.countData
-            console.log(datartSS, 'SS')
-            break
-          case 'S标准差':
-            let datartS = this.objCompBefore.dataSList()
-            this.tableLine = datartS.tableLine
-            this.tableData = datartS.countData
-            console.log(datartS, 'S')
-            break
+          case "无":
+            break;
+          case "SUM求和":
+            let datartSUM = this.objCompBefore.dataSumList();
+            this.tableLine = datartSUM.tableLine;
+            this.tableData = datartSUM.countData;
+            // console.log(datartSUM, "sum");
+            break;
+          case "x平均数":
+            let datartAVG = this.objCompBefore.dataAVGList();
+            this.tableLine = datartAVG.tableLine;
+            this.tableData = datartAVG.countData;
+            // console.log(datartAVG, "AVG");
+            break;
+          case "MAX最大值":
+            let datartMAX = this.objCompBefore.dataMAXList();
+            this.tableLine = datartMAX.tableLine;
+            this.tableData = datartMAX.countData;
+            // console.log(datartMAX, "MAX");
+            break;
+          case "MIN最小值":
+            let datartMIN = this.objCompBefore.dataMINList();
+            this.tableLine = datartMIN.tableLine;
+            this.tableData = datartMIN.countData;
+            // console.log(datartMIN, "MIN");
+            break;
+          case "MD中位数":
+            let datartMD = this.objCompBefore.dataMDList();
+            this.tableLine = datartMD.tableLine;
+            this.tableData = datartMD.countData;
+            // console.log(datartMD, "MD");
+            break;
+          case "MO众数":
+            let datartMO = this.objCompBefore.dataMOList();
+            this.tableLine = datartMO.tableLine;
+            this.tableData = datartMO.countData;
+            // console.log(datartMO, "MO");
+            break;
+          case "S²方差":
+            let datartSS = this.objCompBefore.dataSSList();
+            this.tableLine = datartSS.tableLine;
+            this.tableData = datartSS.countData;
+            // console.log(datartSS, "SS");
+            break;
+          case "S标准差":
+            let datartS = this.objCompBefore.dataSList();
+            this.tableLine = datartS.tableLine;
+            this.tableData = datartS.countData;
+            // console.log(datartS, "S");
+            break;
         }
       }
-      this.chartsShow()
+      this.chartsShow();
       // 计算列宽的数组
-      this.lieWidthComputed()
+      this.lieWidthComputed();
     },
     // 图表渲染
     chartsShow() {
       // 改变值行值
-      console.log(this.$route.query.type, '1010111')
-      console.log(this.indStatic, 'this.indStatic')
-      console.log(this.objCompBefore, 'this.objCompBefore')
+      // console.log(this.$route.query.type, "1010111");
+      // console.log(this.indStatic, "this.indStatic");
+      // console.log(this.objCompBefore, "this.objCompBefore");
       switch (this.indStatic) {
         case 1:
           if (this.pieStatic) {
             // 存input列选中的值
-            this.listInputVal = [1, 2, 3] // 初始化选中3个
+            this.listInputVal = [1, 2, 3]; // 初始化选中3个
             // 存input行选中的值
-            this.lineInputVal = [0, 1, 2, 3]// 初始化选中4个
+            this.lineInputVal = [0, 1, 2, 3]; // 初始化选中4个
           }
-          console.log('k11111111111')
-          this.objCompBefore.inputSelectData(this.listInputVal, this.lineInputVal)
-          this.rowColIndex === 0 ? (this.echartsDatarts = this.objCompBefore.dataVerticalMapRow()) : (this.echartsDatarts = this.objCompBefore.dataVerticalMapCol())
-          this.pieStatic = false
+        //   // console.log("k11111111111");
+          this.objCompBefore.inputSelectData(
+            this.listInputVal,
+            this.lineInputVal
+          );
+          this.rowColIndex === 0
+            ? (this.echartsDatarts = this.objCompBefore.dataVerticalMapRow())
+            : (this.echartsDatarts = this.objCompBefore.dataVerticalMapCol());
+          this.pieStatic = false;
           // this.lineStatic = true
-          break
+          break;
         case 2:
           if (this.pieStatic) {
             // 存input列选中的值
-            this.listInputVal = [1, 2, 3] // 初始化选中3个
+            this.listInputVal = [1, 2, 3]; // 初始化选中3个
             // 存input行选中的值
-            this.lineInputVal = [0, 1, 2, 3]// 初始化选中4个
-            console.log(2121)
+            this.lineInputVal = [0, 1, 2, 3]; // 初始化选中4个
+            // console.log(2121);
           }
-          this.objCompBefore.inputSelectData(this.listInputVal, this.lineInputVal)
-          this.rowColIndex === 0 ? (this.echartsDatarts = this.objCompBefore.dataAcrossMapRow()) : (this.echartsDatarts = this.objCompBefore.dataAcrossMapCol())
-          this.pieStatic = false
+          this.objCompBefore.inputSelectData(
+            this.listInputVal,
+            this.lineInputVal
+          );
+          this.rowColIndex === 0
+            ? (this.echartsDatarts = this.objCompBefore.dataAcrossMapRow())
+            : (this.echartsDatarts = this.objCompBefore.dataAcrossMapCol());
+          this.pieStatic = false;
           // this.lineStatic = true
-          break
+          break;
         case 3:
-          console.log(this.lineStatic, this.rowColIndex, '状态改变')
-          console.log(this.listInputVal, this.lineInputVal, '行列数据前')
-          console.log(this.lineStatic, this.rowColIndex, '状态改变')
+        //   // console.log(this.lineStatic, this.rowColIndex, "状态改变");
+        //   // console.log(this.listInputVal, this.lineInputVal, "行列数据前");
+        //   // console.log(this.lineStatic, this.rowColIndex, "状态改变");
           if (this.lineStatic && this.rowColIndex === 0) {
-            console.log(10086)
-            this.lineInputVal = [0]
-            this.listInputVal = [1, 2, 3]
+            // console.log(10086);
+            this.lineInputVal = [0];
+            this.listInputVal = [1, 2, 3];
             // this.lineStatic = true
           } else if (!this.lineStatic && this.rowColIndex === 1) {
-            this.lineInputVal = [0, 1, 2, 3]
-            this.listInputVal = [1]
+            this.lineInputVal = [0, 1, 2, 3];
+            this.listInputVal = [1];
             // this.lineStatic = true
-            console.log(10087)
+            // console.log(10087);
           }
-          console.log(this.listInputVal, this.lineInputVal, '行列数据后')
-          this.objCompBefore.inputSelectData(this.listInputVal, this.lineInputVal)
-          this.rowColIndex === 0 ? (this.echartsDatarts = this.objCompBefore.dataPieMapRow()) : (this.echartsDatarts = this.objCompBefore.dataPieMapCol())
-          this.pieStatic = true
+        //   // console.log(this.listInputVal, this.lineInputVal, "行列数据后");
+          this.objCompBefore.inputSelectData(
+            this.listInputVal,
+            this.lineInputVal
+          );
+          this.rowColIndex === 0
+            ? (this.echartsDatarts = this.objCompBefore.dataPieMapRow())
+            : (this.echartsDatarts = this.objCompBefore.dataPieMapCol());
+          this.pieStatic = true;
           if (this.rowColIndex === 0) {
-            this.lineStatic = false
+            this.lineStatic = false;
           } else if (this.rowColIndex === 1) {
-            this.lineStatic = true
+            this.lineStatic = true;
           }
-          break
+          break;
         case 4:
           if (this.pieStatic) {
             // 存input列选中的值
-            this.listInputVal = [1, 2, 3] // 初始化选中3个
+            this.listInputVal = [1, 2, 3]; // 初始化选中3个
             // 存input行选中的值
-            this.lineInputVal = [0, 1, 2, 3]// 初始化选中4个
+            this.lineInputVal = [0, 1, 2, 3]; // 初始化选中4个
           }
-          this.objCompBefore.inputSelectData(this.listInputVal, this.lineInputVal)
-          this.rowColIndex === 0 ? (this.echartsDatarts = this.objCompBefore.dataBrokenLineMapRow()) : (this.echartsDatarts = this.objCompBefore.dataBrokenLineMapCol())
-          this.pieStatic = false
+          this.objCompBefore.inputSelectData(
+            this.listInputVal,
+            this.lineInputVal
+          );
+          this.rowColIndex === 0
+            ? (this.echartsDatarts = this.objCompBefore.dataBrokenLineMapRow())
+            : (this.echartsDatarts = this.objCompBefore.dataBrokenLineMapCol());
+          this.pieStatic = false;
           // this.lineStatic = true
-          break
+          break;
       }
     },
     // 图表行列转换
     rowColInd(ind) {
       // 0行1列
-      this.rowColIndex = ind
-      console.log(ind, this.lineStatic)
+      this.rowColIndex = ind;
+    //   // console.log(ind, this.lineStatic);
       // 重置默认
       if (ind === 0) {
-        this.lineStatic = true
+        this.lineStatic = true;
       } else if (ind === 1) {
-        this.lineStatic = false
+        this.lineStatic = false;
       }
     },
     // 每列input选中
     listInput(ind) {
-      console.log(ind, '列')
+    //   // console.log(ind, "列");
       if (this.indStatic === 3 && this.rowColIndex === 1) {
-        console.log(this.listInputVal, this.lineInputVal, '好哥们1')
-        this.listInputVal = [ind]
+        // console.log(this.listInputVal, this.lineInputVal, "好哥们1");
+        this.listInputVal = [ind];
         // this.$refs.lineInputSelect[ind].checked = true
-        console.log(this.listInputVal, this.lineInputVal, '好哥们2')
+        // console.log(this.listInputVal, this.lineInputVal, "好哥们2");
       } else {
-        this.listInputVal.indexOf(ind) === -1 ? (this.listInputVal.push(ind)) : (this.listInputVal.splice(this.listInputVal.indexOf(ind), 1))
+        this.listInputVal.indexOf(ind) === -1
+          ? this.listInputVal.push(ind)
+          : this.listInputVal.splice(this.listInputVal.indexOf(ind), 1);
       }
-      this.chartsShow()
+      this.chartsShow();
     },
     // 每行input选中
     lineInput(ind) {
-      console.log(ind, '行')
-      console.log(this.rowColIndex, '行this.rowColIndex')
-      console.log(this.indStatic, '行this.indStatic')
-      console.log(this.$refs.lineInputSelect, '行this.lineInputSelect')
+    //   // console.log(ind, "行");
+    //   // console.log(this.rowColIndex, "行this.rowColIndex");
+    //   // console.log(this.indStatic, "行this.indStatic");
+    //   // console.log(this.$refs.lineInputSelect, "行this.lineInputSelect");
       if (this.indStatic === 3 && this.rowColIndex === 0) {
-        console.log(this.listInputVal, this.lineInputVal, '好哥们1')
-        this.lineInputVal = [ind]
+        // console.log(this.listInputVal, this.lineInputVal, "好哥们1");
+        this.lineInputVal = [ind];
         // this.$refs.lineInputSelect[ind].checked = true
-        console.log(this.listInputVal, this.lineInputVal, '好哥们2')
+        // console.log(this.listInputVal, this.lineInputVal, "好哥们2");
       } else {
-        this.lineInputVal.indexOf(ind) === -1 ? (this.lineInputVal.push(ind)) : (this.lineInputVal.splice(this.lineInputVal.indexOf(ind), 1))
+        this.lineInputVal.indexOf(ind) === -1
+          ? this.lineInputVal.push(ind)
+          : this.lineInputVal.splice(this.lineInputVal.indexOf(ind), 1);
       }
-      this.chartsShow()
+      this.chartsShow();
     },
     // 获取后台数据表中的数据
     getDatas() {
       // 加载数据
-      this.transBefore = null
-      this.loadings = true
+      this.transBefore = null;
+      this.loadings = true;
       if (!this.$store.state.advancedSearchState) {
         // 初始化计算数据
         if (this.transBefore) {
-          this.objCompBefore.initAllData()
+          this.objCompBefore.initAllData();
         }
-        console.log(this.$store.state.selectData, '执行')
-        console.log(this.$store.state.selectDataLeft, '左侧选中')
+        // console.log(this.$store.state.selectData, '执行')
+        // console.log(this.$store.state.selectDataLeft, '左侧选中')
         if (this.$store.state.selectDataLeft) {
           this.$axios({
-            method: 'GET',
-            url: 'data/data/detail',
+            method: "GET",
+            url: "data/data/detail",
             params: {
-              type: this.$route.query.type === 'area' ? 2 : 1, // 1非地区   2地区
+              type: this.$route.query.type === "area" ? 2 : 1, // 1非地区   2地区
               table_name: this.$store.state.selectDataLeft.table_name, // 表名
               id: this.$store.state.selectDataLeft.id, // 分类id
               area: this.$store.state.areaIndexName, // 选中的地区
@@ -1139,136 +1346,189 @@ export default {
               f: this.$store.state.selectfilter, // year=>年度分类，monthly=>月度分类，quarter=>季度分类
               data: this.$store.state.selectData // 时间
             }
-          }).then(res => {
-            console.log(res, '获取数据展示数据')
-            // 请求接口完成   请求成功
-            if (res.data.code === 200) {
-              if (res.data.data.areaName.length !== 0) {
-                if (this.downLaSelect.area === '' || this.downLaSelect.label === '') {
-                  console.log(this.downLaSelect.area, 'this.downLaSelect.area')
-                  let brrtf = {}
-                  brrtf.tableExplain = res.data.data.tableExplain ? res.data.data.tableExplain : ''
-                  brrtf.timeArr = res.data.data.timeArr.map((item, index) => { return item.toString() })
-                  brrtf.termsName = res.data.data.termsName
-                  brrtf.termsExplain = res.data.data.termsExplain
-                  brrtf.dataSource = res.data.data.dataSource
-                  brrtf.areaName = res.data.data.areaName
-                  if (this.$route.query.type === 'area') {
-                    console.log(this.$store.state.yesNoClickZZ, '走这里')
-                    // 转置后在请求数据 需要将数据转置
-                    if (this.$store.state.yesNoClickZZ && !this.leftState) {
-                      let transBeforeAreaData = JSON.parse(JSON.stringify(res.data.data.transBeforeAreaData[0]))
-                      brrtf.transBeforeAreaData = transBeforeAreaData[0].map((col, index) => {
-                        return transBeforeAreaData.map((row, key) => {
-                          return row[index]
-                        })
-                      })
-                    } else {
-                      brrtf.transBeforeAreaData = res.data.data.transBeforeAreaData[0]
-                    }
-                    brrtf.transBeforeTermsData = res.data.data.transBeforeTermsData
-                  } else {
-                    brrtf.transBeforeAreaData = res.data.data.transBeforeAreaData
-                    brrtf.transBeforeTermsData = res.data.data.transBeforeTermsData[0]
-                  }
-                  console.log(brrtf, 'brrtf')
-                  this.transBefore = brrtf
-                  console.log(this.transBefore, '000')
-                  this.$store.state.transdtr = true
-                  // 全局总数据
-                  this.$store.state.transBefore = this.transBefore
-                  // 全局永久不变数据
-                  this.$store.state.noChangeData = JSON.parse(JSON.stringify(this.transBefore))
-                  if (this.selectState === 1) {
-                    this.$store.state.labelArea = this.transBefore.termsName
-                  } else {
-                    this.$store.state.labelArea = this.transBefore.areaName
-                  }
-                  this.$store.state.AreaAllCountData = res.data.data
-                  // 告诉父组件我完成任务重置状态
-                  this.$emit('prentsState', false)
-                  console.log(this.$store.state.noChangeData, 'this.$store.state.noChangeDatathis.$store.state.noChangeDatathis.$store.state.noChangeData')
-                } else {
-                  this.transBefore = {}
-                  this.transBefore.tableExplain = res.data.data.tableExplain ? res.data.data.tableExplain : ''
-                  this.transBefore.timeArr = res.data.data.timeArr.map((item, index) => { return item.toString() })
-                  this.transBefore.termsName = res.data.data.termsName
-                  this.transBefore.termsExplain = res.data.data.termsExplain
-                  this.transBefore.dataSource = res.data.data.dataSource
-                  this.transBefore.areaName = res.data.data.areaName
-                  this.transBefore.transBeforeTermsData = res.data.data.transBeforeTermsData
-                  this.transBefore.transBeforeAreaData = res.data.data.transBeforeAreaData
-                  console.log(this.transBefore, '000')
-                  this.$store.state.transdtr = true
-                  // 全局总数据
-                  this.$store.state.transBefore = this.transBefore
-                  // 全局永久不变数据
-                  this.$store.state.noChangeData = JSON.parse(JSON.stringify(this.transBefore))
-
-                  // 告诉父组件我完成任务重置状态
-                  this.$emit('prentsState', false)
-                }
-              } else {
-                this.transBefore = {}
-                this.transBefore.tableExplain = res.data.data.tableExplain ? res.data.data.tableExplain : ''
-                this.transBefore.timeArr = res.data.data.timeArr.map((item, index) => { return item.toString() })
-                this.transBefore.termsName = res.data.data.termsName
-                this.transBefore.termsExplain = res.data.data.termsExplain
-                this.transBefore.dataSource = res.data.data.dataSource
-                this.transBefore.areaName = res.data.data.areaName
-                this.transBefore.transBeforeTermsData = res.data.data.transBeforeTermsData
-                this.transBefore.transBeforeAreaData = res.data.data.transBeforeAreaData
-                console.log(this.transBefore, '000')
-                this.$store.state.transdtr = true
-                // 全局总数据
-                this.$store.state.transBefore = this.transBefore
-                // 全局永久不变数据
-                this.$store.state.noChangeData = JSON.parse(JSON.stringify(this.transBefore))
-                // 告诉父组件我完成任务重置状态
-                this.$emit('prentsState', false)
-              }
-              this.hangZhiState = true
-              this.$emit('update:loading', false)
-            } else {
-              this.transBefore = null
-              // this.$store.state.transdtr = null
-              // 全局总数据
-              this.$store.state.transBefore = null
-              this.$store.state.noChangeData = null
-              // 调用父组件的comTime方法告诉父组件重置状态
-              this.$parent.comTime({ name: '', extendData: '', active: true })
-              this.$store.state.noDataState = false
-              this.$emit('update:loading', false)
-            }
-            this.leftState = true
-            console.log(JSON.parse(JSON.stringify(this.transBefore)), 'JSON.parse(JSON.stringify(this.transBefore))')
-            this.$store.state.allNochangeInitData = JSON.parse(JSON.stringify(this.transBefore))
-            // this.transState = this.$store.state.yesNoClickZZ
-            console.log(this.$store.state.SelecttDimension, 'this.$store.state.SelecttDimension')
-            this.loadings = false
-          }).catch((fail) => {
-            console.log(fail, 2369)
           })
+            .then(res => {
+              // console.log(res, '获取数据展示数据')
+              // 请求接口完成   请求成功
+              if (res.data.code === 200) {
+                if (res.data.data.areaName.length !== 0) {
+                  if (
+                    this.downLaSelect.area === "" ||
+                    this.downLaSelect.label === ""
+                  ) {
+                    // console.log(this.downLaSelect.area, 'this.downLaSelect.area')
+                    let brrtf = {};
+                    brrtf.tableExplain = res.data.data.tableExplain
+                      ? res.data.data.tableExplain
+                      : "";
+                    brrtf.timeArr = res.data.data.timeArr.map((item, index) => {
+                      return item.toString();
+                    });
+                    brrtf.termsName = res.data.data.termsName;
+                    brrtf.termsExplain = res.data.data.termsExplain;
+                    brrtf.dataSource = res.data.data.dataSource;
+                    brrtf.areaName = res.data.data.areaName;
+                    if (this.$route.query.type === "area") {
+                      // console.log(this.$store.state.yesNoClickZZ, '走这里')
+                      // 转置后在请求数据 需要将数据转置
+                      if (this.$store.state.yesNoClickZZ && !this.leftState) {
+                        let transBeforeAreaData = JSON.parse(
+                          JSON.stringify(res.data.data.transBeforeAreaData[0])
+                        );
+                        brrtf.transBeforeAreaData = transBeforeAreaData[0].map(
+                          (col, index) => {
+                            return transBeforeAreaData.map((row, key) => {
+                              return row[index];
+                            });
+                          }
+                        );
+                      } else {
+                        brrtf.transBeforeAreaData =
+                          res.data.data.transBeforeAreaData[0];
+                      }
+                      brrtf.transBeforeTermsData =
+                        res.data.data.transBeforeTermsData;
+                    } else {
+                      brrtf.transBeforeAreaData =
+                        res.data.data.transBeforeAreaData;
+                      brrtf.transBeforeTermsData =
+                        res.data.data.transBeforeTermsData[0];
+                    }
+                    // console.log(brrtf, 'brrtf')
+                    this.transBefore = brrtf;
+                    // console.log(this.transBefore, "000");
+                    this.$store.state.transdtr = true;
+                    // 全局总数据
+                    this.$store.state.transBefore = this.transBefore;
+                    // 全局永久不变数据
+                    this.$store.state.noChangeData = JSON.parse(
+                      JSON.stringify(this.transBefore)
+                    );
+                    if (this.selectState === 1) {
+                      this.$store.state.labelArea = this.transBefore.termsName;
+                    } else {
+                      this.$store.state.labelArea = this.transBefore.areaName;
+                    }
+                    this.$store.state.AreaAllCountData = res.data.data;
+                    // 告诉父组件我完成任务重置状态
+                    this.$emit("prentsState", false);
+                    // console.log(this.$store.state.noChangeData, 'this.$store.state.noChangeDatathis.$store.state.noChangeDatathis.$store.state.noChangeData')
+                  } else {
+                    this.transBefore = {};
+                    this.transBefore.tableExplain = res.data.data.tableExplain
+                      ? res.data.data.tableExplain
+                      : "";
+                    this.transBefore.timeArr = res.data.data.timeArr.map(
+                      (item, index) => {
+                        return item.toString();
+                      }
+                    );
+                    this.transBefore.termsName = res.data.data.termsName;
+                    this.transBefore.termsExplain = res.data.data.termsExplain;
+                    this.transBefore.dataSource = res.data.data.dataSource;
+                    this.transBefore.areaName = res.data.data.areaName;
+                    this.transBefore.transBeforeTermsData =
+                      res.data.data.transBeforeTermsData;
+                    this.transBefore.transBeforeAreaData =
+                      res.data.data.transBeforeAreaData;
+                    // console.log(this.transBefore, "000");
+                    this.$store.state.transdtr = true;
+                    // 全局总数据
+                    this.$store.state.transBefore = this.transBefore;
+                    // 全局永久不变数据
+                    this.$store.state.noChangeData = JSON.parse(
+                      JSON.stringify(this.transBefore)
+                    );
+
+                    // 告诉父组件我完成任务重置状态
+                    this.$emit("prentsState", false);
+                  }
+                } else {
+                  this.transBefore = {};
+                  this.transBefore.tableExplain = res.data.data.tableExplain
+                    ? res.data.data.tableExplain
+                    : "";
+                  this.transBefore.timeArr = res.data.data.timeArr.map(
+                    (item, index) => {
+                      return item.toString();
+                    }
+                  );
+                  this.transBefore.termsName = res.data.data.termsName;
+                  this.transBefore.termsExplain = res.data.data.termsExplain;
+                  this.transBefore.dataSource = res.data.data.dataSource;
+                  this.transBefore.areaName = res.data.data.areaName;
+                  this.transBefore.transBeforeTermsData =
+                    res.data.data.transBeforeTermsData;
+                  this.transBefore.transBeforeAreaData =
+                    res.data.data.transBeforeAreaData;
+                //   // console.log(this.transBefore, "000");
+                  this.$store.state.transdtr = true;
+                  // 全局总数据
+                  this.$store.state.transBefore = this.transBefore;
+                  // 全局永久不变数据
+                  this.$store.state.noChangeData = JSON.parse(
+                    JSON.stringify(this.transBefore)
+                  );
+                  // 告诉父组件我完成任务重置状态
+                  this.$emit("prentsState", false);
+                }
+                this.hangZhiState = true;
+                this.$emit("update:loading", false);
+              } else {
+                this.transBefore = null;
+                // this.$store.state.transdtr = null
+                // 全局总数据
+                this.$store.state.transBefore = null;
+                this.$store.state.noChangeData = null;
+                // 调用父组件的comTime方法告诉父组件重置状态
+                this.$parent.comTime({
+                  name: "",
+                  extendData: "",
+                  active: true
+                });
+                this.$store.state.noDataState = false;
+                this.$emit("update:loading", false);
+              }
+              this.leftState = true;
+            //   // console.log(
+            //     JSON.parse(JSON.stringify(this.transBefore)),
+            //     "JSON.parse(JSON.stringify(this.transBefore))"
+            //   );
+              this.$store.state.allNochangeInitData = JSON.parse(
+                JSON.stringify(this.transBefore)
+              );
+              // this.transState = this.$store.state.yesNoClickZZ
+            //   // console.log(
+            //     this.$store.state.SelecttDimension,
+            //     "this.$store.state.SelecttDimension"
+            //   );
+              this.loadings = false;
+            })
+            .catch(fail => {
+            //   // console.log(fail, 2369);
+            });
         }
       } else {
-        this.transBefore = this.$store.state.transBefore
-        this.$store.state.noChangeData = JSON.parse(JSON.stringify(this.transBefore))
-        this.loadings = false
+        this.transBefore = this.$store.state.transBefore;
+        this.$store.state.noChangeData = JSON.parse(
+          JSON.stringify(this.transBefore)
+        );
+        this.loadings = false;
       }
     },
     // 高级查询数据渲染
     advancedSearchDataShow() {
-      console.log('这里是高级查询！')
-      console.log(this.$store.state.advanceData, '这里是高级查询！')
-      console.log(this.$store.state.areaIndexName, '这里是高级查询！')
-      console.log(this.$store.state.labelIndexName, '这里是高级查询！')
-      this.transBefore = null
-      this.loadings = true
+      // console.log('这里是高级查询！')
+      // console.log(this.$store.state.advanceData, '这里是高级查询！')
+      // console.log(this.$store.state.areaIndexName, '这里是高级查询！')
+      // console.log(this.$store.state.labelIndexName, '这里是高级查询！')
+      this.transBefore = null;
+      this.loadings = true;
       this.$axios({
-        method: 'POST',
-        url: 'data/data/query',
+        method: "POST",
+        url: "data/data/query",
         data: {
-          type: this.$route.query.type === 'area' ? 2 : 1,
+          type: this.$route.query.type === "area" ? 2 : 1,
           data: this.$store.state.advanceData,
           area: this.$store.state.areaIndexName,
           quota: this.$store.state.labelIndexName,
@@ -1276,173 +1536,230 @@ export default {
           f: this.$store.state.selectDataLeft.f,
           date: this.$store.state.selectData
         }
-      }).then(res => {
-        console.log(res, '高级查询数据展示555666')
-        // 请求接口完成   请求成功
-        if (res.data.code === 200) {
-          let transBefore = {}
-          transBefore.tableExplain = res.data.data.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.dataSource = res.data.data.dataSource
-          transBefore.areaName = res.data.data.areaName
-          transBefore.transBeforeTermsData = res.data.data.transBeforeTermsData
-          // 转置后在请求数据 需要将数据转置
-          if (this.$store.state.yesNoClickZZ && !this.leftState) {
-            let transBeforeAreaData = JSON.parse(JSON.stringify(res.data.data.transBeforeAreaData[0]))
-            transBefore.transBeforeAreaData = transBeforeAreaData[0].map((col, index) => {
-              return transBeforeAreaData.map((row, key) => {
-                return row[index]
-              })
-            })
-          } else {
-            transBefore.transBeforeAreaData = res.data.data.transBeforeAreaData[0]
-          }
-          console.log(transBefore, '000')
-          this.$store.state.transdtr = true
-          // 全局总数据
-          this.$store.state.transBefore = transBefore
-          this.transBefore = transBefore
-          // 全局永久不变数据
-          this.$store.state.noChangeData = JSON.parse(JSON.stringify(transBefore))
-          this.$emit('update:loading', false)
-        } else {
-          this.transBefore = null
-          this.$store.state.transBefore = null
-          this.$store.state.noDataState = false
-          this.$emit('update:loading', false)
-        }
-        // 改变状态
-        this.leftState = true
-        // 告诉父组件我完成任务重置状态
-        this.$emit('prentsState', false)
-        this.$store.state.allNochangeInitData = JSON.parse(JSON.stringify(this.transBefore))
-        this.loadings = false
-      }).catch((fail) => {
-        console.log(fail)
       })
+        .then(res => {
+        //   // console.log(res, "高级查询数据展示555666");
+          // 请求接口完成   请求成功
+          if (res.data.code === 200) {
+            let transBefore = {};
+            transBefore.tableExplain = res.data.data.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.dataSource = res.data.data.dataSource;
+            transBefore.areaName = res.data.data.areaName;
+            transBefore.transBeforeTermsData =
+              res.data.data.transBeforeTermsData;
+            // 转置后在请求数据 需要将数据转置
+            if (this.$store.state.yesNoClickZZ && !this.leftState) {
+              let transBeforeAreaData = JSON.parse(
+                JSON.stringify(res.data.data.transBeforeAreaData[0])
+              );
+              transBefore.transBeforeAreaData = transBeforeAreaData[0].map(
+                (col, index) => {
+                  return transBeforeAreaData.map((row, key) => {
+                    return row[index];
+                  });
+                }
+              );
+            } else {
+              transBefore.transBeforeAreaData =
+                res.data.data.transBeforeAreaData[0];
+            }
+            // console.log(transBefore, "000");
+            this.$store.state.transdtr = true;
+            // 全局总数据
+            this.$store.state.transBefore = transBefore;
+            this.transBefore = transBefore;
+            // 全局永久不变数据
+            this.$store.state.noChangeData = JSON.parse(
+              JSON.stringify(transBefore)
+            );
+            this.$emit("update:loading", false);
+          } else {
+            this.transBefore = null;
+            this.$store.state.transBefore = null;
+            this.$store.state.noDataState = false;
+            this.$emit("update:loading", false);
+          }
+          // 改变状态
+          this.leftState = true;
+          // 告诉父组件我完成任务重置状态
+          this.$emit("prentsState", false);
+          this.$store.state.allNochangeInitData = JSON.parse(
+            JSON.stringify(this.transBefore)
+          );
+          this.loadings = false;
+        })
+        .catch(fail => {
+        //   // console.log(fail);
+        });
     },
     // 兄弟组件调用此方法实现查询数据重渲染
     brotherFuncShowData() {
       if (this.$store.state.advancedSearchState) {
-        this.advancedSearchDataShow()
+        this.advancedSearchDataShow();
       } else {
-        this.getDatas()
+        this.getDatas();
       }
     },
     // 重新初始化表格数据
     initTableData() {
-      this.objCompBefore.initAllData()
+      this.objCompBefore.initAllData();
     }
   },
   computed: {
     // 计算表说明字符串
     computedTableExplain() {
-      let Str = ''
+      let Str = "";
       if (this.transBefore) {
-        this.transBefore.tableExplain ? this.transBefore.tableExplain = this.transBefore.tableExplain : this.transBefore.tableExplain = ''
-        Str = this.transBefore.tableExplain
+        this.transBefore.tableExplain
+          ? (this.transBefore.tableExplain = this.transBefore.tableExplain)
+          : (this.transBefore.tableExplain = "");
+        Str = this.transBefore.tableExplain;
       }
-      return Str.replace(/\\n/gm, "<br/>")
+      return Str.replace(/\\n/gm, "<br/>");
     },
     // 行计算样式
     computedLineSty() {
-      return (ind) => {
+      return ind => {
         // console.log(this.$store.state.allNochangeInitData, 'this.$store.state.allNochangeInitData')
         // console.log(this.transBefore, 'this.transBefores19')
-        let styStatic = false
+        let styStatic = false;
+        // 新加的
+        if (!this.$store.state.allNochangeInitData) return styStatic;
         if (this.transState) {
-          if (this.$route.query.type !== 'area') {
-            if (ind > (this.$store.state.allNochangeInitData.transBeforeTermsData[0].length)) {
-              styStatic = true
+          if (this.$route.query.type !== "area") {
+            if (
+              ind >
+              this.$store.state.allNochangeInitData.transBeforeTermsData[0]
+                .length
+            ) {
+              styStatic = true;
             }
           } else {
-            if (ind > (this.$store.state.allNochangeInitData.transBeforeAreaData[0].length)) {
-              styStatic = true
+            if (
+              ind >
+              this.$store.state.allNochangeInitData.transBeforeAreaData[0]
+                .length
+            ) {
+              styStatic = true;
             }
           }
         } else {
-          if (this.$route.query.type !== 'area') {
-            if (ind > (this.$store.state.allNochangeInitData.transBeforeTermsData.length)) {
-              styStatic = true
+          if (this.$route.query.type !== "area") {
+            if (
+              ind >
+              this.$store.state.allNochangeInitData.transBeforeTermsData.length
+            ) {
+              styStatic = true;
             }
           } else {
-            if (ind > (this.$store.state.allNochangeInitData.transBeforeAreaData.length)) {
-              styStatic = true
+            if (
+              ind >
+              this.$store.state.allNochangeInitData.transBeforeAreaData.length
+            ) {
+              styStatic = true;
             }
           }
         }
-        return styStatic
-      }
+        return styStatic;
+      };
     },
     // 列计算样式
     computedListSty() {
-      return (ind) => {
-        let styStatic = false
+      return ind => {
+        let styStatic = false;
+        // 新加的
+        if (!this.$store.state.allNochangeInitData) return styStatic;
+				// 结束
         if (this.transState) {
-          if (this.$route.query.type !== 'area') {
-            if (ind > (this.$store.state.allNochangeInitData.transBeforeTermsData.length - 1)) {
-              styStatic = true
+          if (this.$route.query.type !== "area") {
+            if (
+              ind >
+              this.$store.state.allNochangeInitData.transBeforeTermsData
+                .length -
+                1
+            ) {
+              styStatic = true;
             }
           } else {
-            if (ind > (this.$store.state.allNochangeInitData.transBeforeAreaData.length - 1)) {
-              styStatic = true
+            if (
+              ind >
+              this.$store.state.allNochangeInitData.transBeforeAreaData.length -
+                1
+            ) {
+              styStatic = true;
             }
           }
         } else {
-          if (this.$route.query.type !== 'area') {
-            if (ind > (this.$store.state.allNochangeInitData.transBeforeTermsData[0].length - 1)) {
-              styStatic = true
+          if (this.$route.query.type !== "area") {
+            if (
+              ind >
+              this.$store.state.allNochangeInitData.transBeforeTermsData[0]
+                .length -
+                1
+            ) {
+              styStatic = true;
             }
           } else {
-            if (ind > (this.$store.state.allNochangeInitData.transBeforeAreaData[0].length - 1)) {
-              styStatic = true
+            if (
+              ind >
+              this.$store.state.allNochangeInitData.transBeforeAreaData[0]
+                .length -
+                1
+            ) {
+              styStatic = true;
             }
           }
         }
-        return styStatic
-      }
+        return styStatic;
+      };
     },
     // 监听全局表数据的的变化从而改变渲染数据
     transBefores() {
-      return this.$store.state.allState
+      return this.$store.state.allState;
     },
     // 计算列宽
     computedWidth() {
-      return (strings) => {
-        return this.lieWidthArr[strings] * 20
-      }
+      return strings => {
+        return this.lieWidthArr[strings] * 20;
+      };
     }
   },
   created() {
     // 还原高级查询状态
     // this.$store.state.advancedSearchState = false
-    this.startsyui = this.advancedStates
-    this.leftState = false
+    this.startsyui = this.advancedStates;
+		this.leftState = false;
+		this.showTable();
   },
   updated() {
     // 重新渲染表格
     if (this.transBefore) {
-      this.$refs.table.doLayout()
+      this.$refs.table.doLayout();
     }
   },
   mounted() {
     // console.log(new ComputedData())
     // this.showTable()
     // 转置状态
-    this.transState = this.chartsStatusMegger.transState
-    this.leftState = false
-    if (this.$route.query.defaultLeftId !== 'default') {
-      this.$store.state.defaultShowDataState = false
+    this.transState = this.chartsStatusMegger.transState;
+    this.leftState = false;
+    if (this.$route.query.defaultLeftId !== "default") {
+      this.$store.state.defaultShowDataState = false;
     }
-    if (this.$route.query.type !== 'area') {
+    if (this.$route.query.type !== "area") {
       setTimeout(() => {
-        this.loadings = false
-      }, 1500)
+        this.loadings = false;
+      }, 1500);
     }
   }
-}
+};
 </script>
 <style lang="scss" scoped>
 .tishi54 {
diff --git a/src/components/chartsCut/ChartsCut.vue b/src/components/chartsCut/ChartsCut.vue
index 00000c7..8e54f5e 100644
--- a/src/components/chartsCut/ChartsCut.vue
+++ b/src/components/chartsCut/ChartsCut.vue
@@ -217,7 +217,7 @@ export default {
     // 监听左侧菜单的数据变化
     defaultDataRight: {
       handler (val) {
-        console.log(val, '左侧数据变化chartsCut')
+        // console.log(val, '左侧数据变化chartsCut')
         if (val) {
           // 初始化公共数据
           if (!this.$store.state.advancedSearchState) {
@@ -234,15 +234,15 @@ export default {
     },
     // 监听数据渲染变化
     stateDataGetVal (newVal, oldVal) {
-      console.log(this.$store.state.transBefore, '啦啦啦')
+      // console.log(this.$store.state.transBefore, '啦啦啦')
       if (!newVal) {
         // this.showLabelArea()
       }
     },
     labelAreaState (newVal, oldVal) {
-      console.log(newVal, 'kkkkkkkkkkkkkkkkkkkkkkk120')
+      // console.log(newVal, 'kkkkkkkkkkkkkkkkkkkkkkk120')
       if (newVal && !this.$store.state.advancedSearchState) {
-        console.log('kkkkkkkkkkkkkkkkkkkkkkk120')
+        // console.log('kkkkkkkkkkkkkkkkkkkkkkk120')
         // this.showLabelArea()
       }
     },
@@ -255,7 +255,7 @@ export default {
         } else if (this.$store.state.SelecttDimension.row === 'sj' && this.$store.state.SelecttDimension.col === 'zb') {
           this.$store.state.SelecttDimension.col = 'dq'
         }
-        console.log(this.$store.state.transBefore, 'bbbbbbbbbbbbbbbbbbb')
+        // console.log(this.$store.state.transBefore, 'bbbbbbbbbbbbbbbbbbb')
         this.$nextTick(() => {
           this.$parent.tellChangeFan(false)
         })
@@ -275,7 +275,7 @@ export default {
      *
      */
     areaDimensionDo (newVal) {
-      console.log('你你你你你你？')
+      // console.log('你你你你你你？')
       if (newVal) {
         if (this.$store.state.noSelecttDimension === 'sj') {
           this.optionsDimension = this.$store.state.dataArealabelTime.timeArr.map((item, index) => {
@@ -300,14 +300,14 @@ export default {
           })
         }
         this.valueDimension = this.$store.state.newSelectChangeData
-        console.log(this.valueDimension, 'this.valueDimension0')
+        // console.log(this.valueDimension, 'this.valueDimension0')
         // 告诉父组件数据渲染完
         this.$emit('emmitStateAd', false)
       }
     },
     // 地区维度转换筛选
     handleChangeDimension () {
-      console.log(this.valueDimension, 'this.valueDimension')
+      // console.log(this.valueDimension, 'this.valueDimension')
       if (this.valueDimension) {
         this.$parent.changeDimensionTrueChangeArea(this.valueDimension[0])
       }
@@ -319,17 +319,17 @@ export default {
     },
     // 被选中时触发
     choiceCallerArea (resu) {
-      console.log(resu[2], '5+656565')
+      // console.log(resu[2], '5+656565')
       // this.$emit('statertfResu', resu[2])
     },
     // 被选中时触发
     choiceCallerTime (resu) {
-      console.log(resu, '66666')
+      // console.log(resu, '66666')
       // console.log(this.cityDefaultName)
       // 改变选中值索引
       if (this.$store.state.selectData !== undefined) {
-        console.log(this.$store.state.selectData, '被选中的值')
-        console.log(resu[2], '被选中的值2000')
+        // console.log(this.$store.state.selectData, '被选中的值')
+        // console.log(resu[2], '被选中的值2000')
 
         this.$store.state.selectData = resu[2].indexID
         this.showInputStu = false
@@ -340,12 +340,12 @@ export default {
       // this.showInputStu = !this.showInputStu
     },
     changesInputStu () {
-      console.log(12569)
+      // console.log(12569)
       this.showInputStu = !this.showInputStu
     },
     // 点击非下拉框内容时改变下拉状态（下拉怡然显示）
     showKuangCat () {
-      console.log(1250)
+      // console.log(1250)
       this.isHideProp = false
       this.stateRTY = false
     },
@@ -358,7 +358,7 @@ export default {
           type: type
         }
       }).then(res => {
-        console.log(res, '下拉筛选条件')
+        // console.log(res, '下拉筛选条件')
         // 请求接口完成   请求成功
         if (res.data.code === 200) {
           this.cityDataTime = Object.keys(res.data.data.list).map((item, index) => {
@@ -375,7 +375,7 @@ export default {
           // 调用父组件的chuFachildChartCont方法渲染
         }
       }).catch((fail) => {
-        console.log(fail)
+        // console.log(fail)
       })
     },
     stateInfor (val) {
@@ -387,7 +387,7 @@ export default {
     },
     // 指标地区数据渲染
     showLabelArea () {
-      console.log(this.stateChangeSDF, this.$store.state.dataArealabelTime, '走走走')
+      // console.log(this.stateChangeSDF, this.$store.state.dataArealabelTime, '走走走')
 
       if (this.$store.state.classifyIdDataState) {
         if (!this.$store.state.advancedSearchState) { // 非高级查询
@@ -407,7 +407,7 @@ export default {
             } else {
               this.value = [this.options[1].value]
             }
-            console.log(this.value, 'this.options')
+            // console.log(this.value, 'this.options')
             // 告诉父组件已经完成任务
             this.$emit('stateDFGHJ', true)
             this.$emit('statertfResu', this.value[0])
@@ -427,18 +427,18 @@ export default {
             } else {
               this.value = [this.options[1].value]
             }
-            console.log(this.value, 'this.options')
+            // console.log(this.value, 'this.options')
             // 告诉父组件已经完成任务
             this.$emit('stateDFGHJ', true)
             this.$emit('statertfResu', this.value[0])
           }
         } else { // 高级查询
           if (this.$route.query.type !== 'area') {
-            console.log('直接走1')
+            // console.log('直接走1')
             this.$emit('stateDFGHJ', true)
           } else {
             if (this.stateChangeSDF) { // 指标
-              console.log(this.$store.state.yesNoClickZZ, 'this.$store.state.yesNoClickZZ')
+              // console.log(this.$store.state.yesNoClickZZ, 'this.$store.state.yesNoClickZZ')
               if (this.$store.state.advancedSearchState && !this.yesNoClickXX) {
                 this.options = this.$store.state.advanceData.map((item, index) => {
                   return item.name
@@ -460,14 +460,14 @@ export default {
                 value: '序列',
                 label: '序列'
               })
-              console.log(this.$store.state.defaultShowDataState, 'this.$store.state.defaultShowDataState10')
+              // console.log(this.$store.state.defaultShowDataState, 'this.$store.state.defaultShowDataState10')
               if (this.$route.query.defaultLeftId === 'default' && this.$store.state.defaultShowDataState && this.$store.state.defaultShowLabelAreaState !== 'normal') {
                 this.value = [this.$store.state.newSelectLabelArea.sequenceCont]
               } else {
-                console.log(this.options, 'this.optionsk102569')
+                // console.log(this.options, 'this.optionsk102569')
                 this.value = [this.options[1].value]
               }
-              console.log(this.value, 'this.options')
+              // console.log(this.value, 'this.options')
               // 告诉父组件已经完成任务
               this.$emit('stateDFGHJ', true)
               this.$emit('statertfResu', this.value[0])
@@ -493,13 +493,13 @@ export default {
                 value: '序列',
                 label: '序列'
               })
-              console.log(this.$store.state.defaultShowDataState, 'this.$store.state.defaultShowDataState2')
+              // console.log(this.$store.state.defaultShowDataState, 'this.$store.state.defaultShowDataState2')
               if (this.$route.query.defaultLeftId === 'default' && this.$store.state.defaultShowDataState && this.$store.state.defaultShowLabelAreaState !== 'normal') {
                 this.value = [this.$store.state.newSelectLabelArea.sequenceCont]
               } else {
                 this.value = [this.options[1].value]
               }
-              console.log(this.value, 'this.options')
+              // console.log(this.value, 'this.options')
               // 告诉父组件已经完成任务
               this.$emit('stateDFGHJ', true)
               this.$emit('statertfResu', this.value[0])
@@ -511,7 +511,7 @@ export default {
         sequenceCont: this.value[0],
         sequenceState: this.stateChangeSDF ? 1 : 2// 1筛选指标 2筛选地区
       }
-      console.log(this.options, 'this.option012')
+      // console.log(this.options, 'this.option012')
     },
     // 聚焦显示提示的搜索框
     focusShow () {
@@ -523,7 +523,7 @@ export default {
         switch (this.$route.query.type) {
           case 'monthly':
             if (!(this.timeUsrr.length === 6 || this.timeUsrr.length === 13)) {
-              console.log(this.timeUsrr.length, true)
+              // console.log(this.timeUsrr.length, true)
               this.$alert('您查询的时间格式有误，请重新输入！', '温馨提示', {
                 confirmButtonText: '确定'
               })
@@ -537,7 +537,7 @@ export default {
                 })
                 return
               } else if (this.timeUsrr[this.timeUsrr.length - 2] === 1 && this.timeUsrr[this.timeUsrr.length - 1] > 2) {
-                console.log(9996)
+                // console.log(9996)
                 this.$alert('您查询的时间格式有误，请重新输入！', '温馨提示', {
                   confirmButtonText: '确定'
                 })
@@ -559,7 +559,7 @@ export default {
               }
             }
             this.$store.state.selectData = this.timeUsrr
-            console.log(this.$store.state.selectData, '时间')
+            // console.log(this.$store.state.selectData, '时间')
             // 调用父组件（Dataweb）中的changeBrother方法来调用ChartCont组件中的brotherFuncShowData方法
             this.$parent.changeBrother()
             this.timeUsrr = ''
@@ -629,7 +629,7 @@ export default {
           case 'area':
             let arrs = ['A', 'B', 'C', 'D']
             if (!(this.timeUsrr.length === 4 || this.timeUsrr.length === 5 || this.timeUsrr.length === 6 || this.timeUsrr.length === 9 || this.timeUsrr.length === 11 || this.timeUsrr.length === 13)) {
-              console.log(this.timeUsrr.length, true)
+              // console.log(this.timeUsrr.length, true)
               this.$alert('您查询的时间格式有误，请重新输入！', '温馨提示', {
                 confirmButtonText: '确定'
               })
@@ -643,7 +643,7 @@ export default {
                 })
                 return
               } else if (this.timeUsrr[this.timeUsrr.length - 2] === 1 && this.timeUsrr[this.timeUsrr.length - 1] > 2) {
-                console.log(9996)
+                // console.log(9996)
                 this.$alert('您查询的时间格式有误，请重新输入！', '温馨提示', {
                   confirmButtonText: '确定'
                 })
@@ -715,8 +715,8 @@ export default {
     },
     // 选中
     handleChange (value) {
-      console.log(value)
-      console.log(this.value, 'this.value')
+      // console.log(value)
+      // console.log(this.value, 'this.value')
       if (value[0] === '序列') {
         this.yesNoClickXX = !this.yesNoClickXX
         this.stateChangeSDF = !this.stateChangeSDF
@@ -745,20 +745,20 @@ export default {
       let dataNer = JSON.parse(JSON.stringify(this.cityDataTime))
       dataNer[3] = { name: this.$store.state.selectData, extendData: this.$store.state.selectData }
       this.cityDataTime = dataNer
-      console.log(this.cityDataTime, 'this.cityDataTime')
+      // console.log(this.cityDataTime, 'this.cityDataTime')
       // 默认选中最后一个
       this.cityDefaultNameTime = { name: this.cityDataTime[3].name, activeIndex: 3 }
       this.$store.state.selectData = this.cityDataTime[3].extendData
     },
     // 当前选中的时间列表
     callBackVal (res) {
-      console.log(res.extendData, '开始')
+      // console.log(res.extendData, '开始')
       // 调用父组件的chuFachildChartCont方法渲染
       this.$store.state.selectData = res.extendData
       this.$parent.chuFachildChartCont()
       if (this.$store.state.selectData !== undefined) {
-        console.log(this.$store.state.selectData, '被选中的值')
-        console.log(res, '被选中的值2')
+        // console.log(this.$store.state.selectData, '被选中的值')
+        // console.log(res, '被选中的值2')
         this.$store.state.selectData = res.extendData
         this.$store.state.newSelectTime = {
           name: res.name,
@@ -769,12 +769,12 @@ export default {
     },
     callBackValOpen (res) { // 展开回调
       this.$store.state.defaultShowLabelAreaState = 'normal'
-      console.log(res, '展开')
-      console.log(this.$store.state.SelecttDimension, 'this.$store.state.advancedSearchState0000000000000000000000')
+      // console.log(res, '展开')
+      // console.log(this.$store.state.SelecttDimension, 'this.$store.state.advancedSearchState0000000000000000000000')
       this.changesInputStu()
     },
     callBackValClose (res) { // 关闭回调
-      console.log(res, '关闭')
+      // console.log(res, '关闭')
       this.changesInputStu()
     },
     // 高级查询指标地区序列化
diff --git a/src/components/dimension/Dimension.vue b/src/components/dimension/Dimension.vue
index 496fc3c..0e9a7b2 100644
--- a/src/components/dimension/Dimension.vue
+++ b/src/components/dimension/Dimension.vue
@@ -77,7 +77,7 @@ export default {
   },
   methods: {
     changeTabel (stateSD, strd) {
-      console.log(stateSD, strd, 'stateSD, strd')
+      // console.log(stateSD, strd, 'stateSD, strd')
       if (strd === 'row') {
         this.rowVal = stateSD
       } else if (strd === 'col') {
@@ -86,7 +86,7 @@ export default {
     },
     // 维度转换默认
     change3D () {
-      console.log(this.$store.state.SelecttDimension, '3d56')
+      // console.log(this.$store.state.SelecttDimension, '3d56')
       this.rowVal = this.arrValueZd[this.$store.state.SelecttDimension.col]
       this.colVal = this.arrValueZd[this.$store.state.SelecttDimension.row]
     },
@@ -103,12 +103,12 @@ export default {
     },
     trueChangeArea (dataState) {
       this.$store.newSelectChangeData = null
-      console.log(dataState, 'dataState')
-      console.log(this.$store.state.noChangeData.areaName, 'this.$store.state.noChangeData.areaName')
+      // console.log(dataState, 'dataState')
+      // console.log(this.$store.state.noChangeData.areaName, 'this.$store.state.noChangeData.areaName')
       /* 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)
+      // 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)
       let paramsd = {}
       if ((this.arrValue[this.colVal] === 'sj' && this.arrValue[this.rowVal] === 'zb') || (this.arrValue[this.colVal] === 'zb' && this.arrValue[this.rowVal] === 'sj')) {
         this.$store.state.noSelecttDimension = 'dq'
@@ -158,14 +158,14 @@ export default {
       }
       this.$store.state.SelecttDimension.row = this.arrValue[this.colVal]
       this.$store.state.SelecttDimension.col = this.arrValue[this.rowVal]
-      console.log(this.$store.state.SelecttDimension, 'this.$store.state.SelecttDimension0236')
+      // console.log(this.$store.state.SelecttDimension, 'this.$store.state.SelecttDimension0236')
       this.$axios({
         method: 'POST',
         url: 'data/data/wd-trans',
         data: paramsd
       }).then(res => {
-        console.log(this.$store.state.transBefore, '维度转换全局数据')
-        console.log(res, '获取数据展示数据')
+        // console.log(this.$store.state.transBefore, '维度转换全局数据')
+        // console.log(res, '获取数据展示数据')
         // 请求接口完成   请求成功
         if (res.data.code === 200) {
           // if (res.data.data.areaName.length !== 0) {
@@ -206,7 +206,7 @@ export default {
           //   transBefore.transBeforeAreaData = res.data.data.transBeforeAreaData[0]
           // }
           transBefore.transBeforeAreaData = res.data.data.transBeforeAreaData[0]
-          console.log(transBefore, '000')
+          // console.log(transBefore, '000')
           this.$store.state.transdtr = true
           // 全局总数据
           this.$store.state.AreaAllCountData = JSON.parse(JSON.stringify(res.data.data))
@@ -240,13 +240,13 @@ export default {
         }
         this.$store.state.yesNoClickChange = true
       }).catch((fail) => {
-        console.log(fail, 2369)
+        // console.log(fail, 2369)
       })
     }
   },
   mounted() {
     this.change3D()
-    console.log(1003)
+    // console.log(1003)
   }
 }
 </script>
diff --git a/src/components/mapData/MapData.vue b/src/components/mapData/MapData.vue
index 89ce32d..ea0c189 100644
--- a/src/components/mapData/MapData.vue
+++ b/src/components/mapData/MapData.vue
@@ -1,25 +1,51 @@
 <template>
   <div class="mapData">
-    <div class="mapDataLeft" v-if="leftDafrt">
+    <div class="mapDataLeft"
+         v-if="leftDafrt">
       <div v-if="leftDafrt.length!==0">指标名称</div>
       <!-- 指标名称 -->
-      <div
-        v-for="(item,index) in leftDafrt"
-        :key="index"
-        :class="{bgcolor:item.state}"
-        @click="trickChange(index)"
-      >{{item.name}}</div>
-      <div style="margin:0 auto;color:#8fa3ae;font-size:1.375rem;" v-if="leftDafrt.length===0">暂无指标名</div>
+      <div v-for="(item,index) in leftDafrt"
+           :key="index"
+           :class="{bgcolor:item.state}"
+           @click="trickChange(index)">{{item.name}}</div>
+      <div style="margin:0 auto;color:#8fa3ae;font-size:1.375rem;"
+           v-if="leftDafrt.length===0">暂无指标名</div>
     </div>
     <div class="mapDataRight">
       <div class="maptopSty">
         <!-- 年 -->
-        <div class="yearD">
-          <el-cascader v-model="value" :options="options" @change="handleChange"></el-cascader>
-        </div>
+        <!-- <div class="yearD">
+          <el-cascader v-model="value"
+                       :options="options"
+                       @change="handleChange"></el-cascader>
+        </div> -->
         <!-- 月 -->
         <!-- 季 -->
         <!-- <div style="margin:0 auto;color:#8fa3ae;font-size:1.375rem;">该指标下暂无数据</div> -->
+        <ul class="year">
+          <li class="prev">
+            <span :class="{'disable': !isReduceYear}"
+                  @click="reduceYear"></span>
+          </li>
+          <li v-for="(year, index) in mapYearList.slice(yearStart,yearEnd)"
+              :key="index"
+              :class="{'selected': selectYear == year}"
+              @click="selectYear=year">
+            {{ year }}<span v-if="selectYear == year"></span>
+          </li>
+          <li class="next">
+            <span :class="{'disable': !isAddYear}"
+                  @click="addYear"></span>
+          </li>
+        </ul>
+        <ul class="quarter">
+          <li v-for="(item, index) in quarterList"
+              :key="index"
+              :class="{'selected': selectQuarter == index}"
+              @click="selectQuarter=index">
+            {{ item }}<span v-if="selectQuarter == index"></span>
+          </li>
+        </ul>
       </div>
       <div ref="mapRefs"></div>
     </div>
@@ -37,6 +63,14 @@ export default {
   name: 'mapData',
   data () {
     return {
+      yearStart: '',
+      yearEnd: '',
+      isReduceYear: true,
+      isAddYear: false,
+      selectYear: '',
+      selectQuarter: 0,
+      mapYearList: [],
+      quarterList: ['第一季度', '第二季度', '第三季度', '第四季度'],
       // 控制下拉框显示隐藏
       isHideProp: true,
       // 左侧当前默认
@@ -55,16 +89,26 @@ export default {
         },
         legend: {
           orient: 'vertical',
-          x: 'left',
-          data: ['iphone3']
+          x: 'left'
+          // data: ['iphone3']
         },
         dataRange: {
-          min: 0,
-          max: 2500,
+          // min: 0,
+          // max: 2500,
+          show: true,
           x: 'left',
           y: 'bottom',
-          text: ['高', '低'], // 文本，默认为数值文本
-          calculable: true
+          // text: ['高', '低'], // 文本，默认为数值文本
+          // calculable: true,
+          splitList: [],
+          color: [
+            '#298ADC',
+            '#479AE1',
+            '#78B5E9',
+            '#9FCAEF',
+            '#C3DEF5',
+            '#E2EFFA'
+          ]
         },
         // toolbox: {
         //   show: true,
@@ -87,7 +131,7 @@ export default {
         // },
         series: [
           {
-            name: 'iphone3',
+            // name: 'iphone3',
             type: 'map',
             mapType: 'china',
             roam: false,
@@ -148,10 +192,34 @@ export default {
       ],
       // 栏目数据   结构不可变
       cityDataTime: [
-        { 'id': '110000', 'name': '1985年', 'parentId': '100000', 'shortName': '北京', 'cityCode': '' },
-        { 'id': '110000', 'name': '1986年', 'parentId': '100000', 'shortName': '北京', 'cityCode': '' },
-        { 'id': '110000', 'name': '1987年', 'parentId': '100000', 'shortName': '北京', 'cityCode': '' },
-        { 'id': '110000', 'name': '2019年', 'parentId': '100000', 'shortName': '北京', 'cityCode': '' }
+        {
+          id: '110000',
+          name: '1985年',
+          parentId: '100000',
+          shortName: '北京',
+          cityCode: ''
+        },
+        {
+          id: '110000',
+          name: '1986年',
+          parentId: '100000',
+          shortName: '北京',
+          cityCode: ''
+        },
+        {
+          id: '110000',
+          name: '1987年',
+          parentId: '100000',
+          shortName: '北京',
+          cityCode: ''
+        },
+        {
+          id: '110000',
+          name: '2019年',
+          parentId: '100000',
+          shortName: '北京',
+          cityCode: ''
+        }
       ],
       // 默认选中月
       monthData: '1月',
@@ -164,10 +232,34 @@ export default {
       ],
       // 月 结构不可变
       monthDatas: [
-        { 'id': '110000', 'name': '1月', 'parentId': '100000', 'shortName': '北京', 'cityCode': '' },
-        { 'id': '110000', 'name': '2月', 'parentId': '100000', 'shortName': '北京', 'cityCode': '' },
-        { 'id': '110000', 'name': '3月', 'parentId': '100000', 'shortName': '北京', 'cityCode': '' },
-        { 'id': '110000', 'name': '4月', 'parentId': '100000', 'shortName': '北京', 'cityCode': '' }
+        {
+          id: '110000',
+          name: '1月',
+          parentId: '100000',
+          shortName: '北京',
+          cityCode: ''
+        },
+        {
+          id: '110000',
+          name: '2月',
+          parentId: '100000',
+          shortName: '北京',
+          cityCode: ''
+        },
+        {
+          id: '110000',
+          name: '3月',
+          parentId: '100000',
+          shortName: '北京',
+          cityCode: ''
+        },
+        {
+          id: '110000',
+          name: '4月',
+          parentId: '100000',
+          shortName: '北京',
+          cityCode: ''
+        }
       ],
       // 左侧数据
       leftDafrt: null,
@@ -192,16 +284,18 @@ export default {
           type: this.$route.query.type === 'area' ? 2 : 1,
           f: this.$store.state.selectDataLeft.f
         }
-      }).then(res => {
-        console.log(res, '左侧菜单')
-        // 请求接口完成   请求成功
-        if (res.data.code === 200) {
-          this.leftCateData = res.data.data.list
-          this.defaultSelectLie()
-        }
-      }).catch((fail) => {
-        console.log(fail)
       })
+        .then(res => {
+          // console.log(res, '左侧菜单')
+          // 请求接口完成   请求成功
+          if (res.data.code === 200) {
+            this.leftCateData = res.data.data.list
+            this.defaultSelectLie()
+          }
+        })
+        .catch(fail => {
+          // console.log(fail)
+        })
     },
     // 默认选中的列
     defaultSelectLie () {
@@ -216,15 +310,37 @@ export default {
                 if (item2.children) {
                   item2.children.forEach((item3, index3) => {
                     if (index3 === 0) {
-                      stateStatic.push('' + index1 + '-' + index2 + '-' + index3)
+                      stateStatic.push(
+                        '' + index1 + '-' + index2 + '-' + index3
+                      )
                       if (item3.children) {
                         item3.children.forEach((item4, index4) => {
                           if (index4 === 0) {
-                            stateStatic.push('' + index1 + '-' + index2 + '-' + index3 + '-' + index4)
+                            stateStatic.push(
+                              '' +
+                                index1 +
+                                '-' +
+                                index2 +
+                                '-' +
+                                index3 +
+                                '-' +
+                                index4
+                            )
                             if (item4.children) {
                               item4.children.forEach((item5, index5) => {
                                 if (index5 === 0) {
-                                  stateStatic.push('' + index1 + '-' + index2 + '-' + index3 + '-' + index4 + '-' + index5)
+                                  stateStatic.push(
+                                    '' +
+                                      index1 +
+                                      '-' +
+                                      index2 +
+                                      '-' +
+                                      index3 +
+                                      '-' +
+                                      index4 +
+                                      '-' +
+                                      index5
+                                  )
                                 }
                               })
                             }
@@ -246,7 +362,9 @@ export default {
       console.log(this.leftCateData[0].children[0], '数据0')
       JSON.parse(JSON.stringify(stateStatic)).forEach((item, index) => {
         console.log(index)
-        index === 0 ? (dataDome = this.leftCateData[index]) : (dataDome = dataDome.children[0])
+        index === 0
+          ? (dataDome = this.leftCateData[index])
+          : (dataDome = dataDome.children[0])
       })
       this.defaultDataRight = dataDome
       console.log(this.defaultDataRight, '1250')
@@ -263,6 +381,7 @@ export default {
     },
     // 渲染数据地图
     showMapData () {
+      console.log(this.option)
       this.myEchartsObj = echarts.init(this.$refs.mapRefs, 'shine')
       // 绘制图表
       this.myEchartsObj.setOption(this.option, true)
@@ -275,111 +394,224 @@ export default {
       // this.showMapData()
     },
     changesInputStu () {
-      console.log(12569)
+      // console.log(12569)
     },
     monthDataState (resu) {
-      console.log(resu)
-      console.log(this.cityDefaultName)
+      // console.log(resu)
+      // console.log(this.cityDefaultName)
     },
     monthDataChange () {
-      console.log(12569)
+      // console.log(12569)
     },
     // 地图左侧指标名称显示
     searchDataMap () {
-      console.log(this.$store.state.selectDataLeft, '10111110')
+      // console.log(this.$store.state.selectDataLeft, '10111110')
       this.$axios({
         method: 'GET',
         url: 'data/data/quota',
         params: {
           id: this.$store.state.selectDataLeft.id
         }
-      }).then(res => {
-        console.log(res, '地图左侧指标名称显示')
-        // 请求接口完成   请求成功
-        if (res.data.code === 200) {
-          this.leftDafrt = res.data.data.list.map((item, index) => {
-            let brrO = {}
-            if (index === 0) {
-              brrO = {
-                id: item.id,
-                name: item.name,
-                state: true
-              }
-            } else {
-              brrO = {
-                id: item.id,
-                name: item.name,
-                state: false
-              }
-            }
-            return brrO
-          })
-          console.log(this.leftDafrt, 'this.leftDafrt')
-          this.getLabelDatart()
-        }
-      }).catch((fail) => {
-        console.log(fail)
       })
+        .then(res => {
+          // console.log(res, '地图左侧指标名称显示')
+          // 请求接口完成   请求成功
+          if (res.data.code === 200) {
+            this.leftDafrt = res.data.data.list.map((item, index) => {
+              let brrO = {}
+              if (index === 0) {
+                brrO = {
+                  id: item.id,
+                  name: item.name,
+                  state: true
+                }
+              } else {
+                brrO = {
+                  id: item.id,
+                  name: item.name,
+                  state: false
+                }
+              }
+              return brrO
+            })
+            console.log(this.leftDafrt, 'this.leftDafrt')
+            this.getLabelDatart()
+          }
+        })
+        .catch(fail => {
+          console.log(fail)
+        })
     },
     // 获取每个指标的数据
     getLabelDatart () {
-      console.log(this.leftDafrt, 1010110)
+      // console.log(this.leftDafrt, 1010110)
       this.$axios({
         method: 'GET',
         url: 'data/data/map-data',
         params: {
           id: this.$store.state.selectDataLeft.id,
-          quota_id: this.leftDafrt.find((item, index) => { return item.state === true }).id
+          quota_id: this.leftDafrt.find((item, index) => {
+            return item.state === true
+          }).id
         }
-      }).then(res => {
-        console.log(res, '数据地图数据')
-        // 请求接口完成   请求成功
-        if (res.data.code === 200) {
-          console.log(res.data.data.list, 'Object.values(res.data.data.list)')
-          this.option.legend.data = [this.leftDafrt.find((item, index) => { return item.state === true }).name]
-          this.option.series[0].name = [this.leftDafrt.find((item, index) => { return item.state === true }).name]
-          this.AllMapCount = res.data.data.list
-          this.cityDataTime = this.monthDatas
-          // 筛选的数据
-          this.cityDataTime = Object.keys(res.data.data.list).map((item, index) => {
-            return { 'id': '110000', 'name': item, 'parentId': '100000', 'shortName': '北京', 'cityCode': '' }
-          })
-          this.cityDefaultNameTime = this.cityDataTime[0].name
-          this.selectpatternTime[0].placeholder = this.cityDataTime[0].name
-          console.log(this.cityDataTime)
-          this.options = Object.keys(res.data.data.list).map((item, index) => {
-            return {
-              value: item,
-              label: item
-            }
-          })
-          this.value = [this.options[0].value]
-          this.option.series[0].data = this.AllMapCount[this.options[0].value]
-          this.showMapData()
-          // this.option.series[0].data = Object.values(res.data.data.list)
-          // this.showMapData()
-        }
-      }).catch((fail) => {
-        console.log(fail)
       })
+        .then(res => {
+          console.log(res, '数据地图数据')
+          // 请求接口完成   请求成功
+          if (res.data.code === 200) {
+            console.log(
+              res.data.data.list,
+              'Object.values(res.data.data.list)'
+            )
+            // 设置地图数值区间
+            this.option.dataRange.splitList = this.setMapLabel(
+              res.data.data.list
+            )
+            this.option.legend.data = [
+              this.leftDafrt.find((item, index) => {
+                return item.state === true
+              }).name
+            ]
+            this.option.series[0].name = [
+              this.leftDafrt.find((item, index) => {
+                return item.state === true
+              }).name
+            ]
+            this.AllMapCount = res.data.data.list
+            this.cityDataTime = this.monthDatas
+            // 筛选的数据
+            this.cityDataTime = Object.keys(res.data.data.list).map(
+              (item, index) => {
+                return {
+                  id: '110000',
+                  name: item,
+                  parentId: '100000',
+                  shortName: '北京',
+                  cityCode: ''
+                }
+              }
+            )
+            this.cityDefaultNameTime = this.cityDataTime[0].name
+            this.selectpatternTime[0].placeholder = this.cityDataTime[0].name
+            console.log(this.cityDataTime)
+            this.options = Object.keys(res.data.data.list).map(
+              (item, index) => {
+                return {
+                  value: item,
+                  label: item
+                }
+              }
+            )
+            this.value = [this.options[0].value]
+            this.option.series[0].data = this.AllMapCount[this.options[0].value]
+            this.showMapData()
+            // this.option.series[0].data = Object.values(res.data.data.list)
+            // this.showMapData()
+          }
+        })
+        .catch(fail => {
+          // console.log(fail)
+        })
+    },
+    // 根据地图数值设置数值区间
+    setMapLabel (data) {
+      // 数据地图显示的是当年的数据，他把每年的数据分为6个阶段，每个阶段都增加一个固定的值，这个值的计算方式为：当年各地区的最大数据减去最小数据 然后除以6  这个是每个阶段的增加的固定值，第一个区间是：最小值---最小值+固定值   第二区间为： 最小值+固定值----最小值+固定值+固定值，以此类推，最后一个为：最小值+固定值*5----最大值
+      let max = 0
+      let min = 0
+      for (let key in data) {
+        min = Number(data[key][0].value)
+      }
+      for (let key in data) {
+        data[key].forEach((item, index) => {
+          // console.log(item.value)
+          if (item.value) {
+            max = item.value > max ? parseFloat(item.value) : max
+            min = item.value < min ? parseFloat(item.value) : min
+          }
+        })
+      }
+      console.log('最大值：' + max, '最小值：' + min)
+      let list = [{ start: 0, end: 1 }]
+      let temp = parseFloat(((max - min) / 6).toFixed(4))
+      console.log(temp, '固定值')
+      for (let i = 0; i < 6; i++) {
+        i === 0
+          ? (list[i] = {
+            start: parseFloat((min + temp * (5 - i)).toFixed(2)),
+            end: parseFloat(Math.ceil(max).toFixed(2))
+          })
+          : (list[i] = {
+            start: parseFloat((min + temp * (5 - i)).toFixed(2)),
+            end: parseFloat((min + temp * (6 - i)).toFixed(2))
+          })
+      }
+      console.log(list, '区间列表')
+      return list
     },
     // 点击改变指标名称
     trickChange (ind) {
       this.leftDafrt.forEach((item, index) => {
-        index === ind ? item.state = true : item.state = false
+        index === ind ? (item.state = true) : (item.state = false)
       })
       this.getLabelDatart()
       // this.showMapData()
     },
     // 选中
     handleChange (value) {
-      console.log(value)
-      console.log(this.value, 'this.value')
+      console.log(value, 'map')
+      // console.log(this.value, 'this.value')
       this.option.series[0].data = this.AllMapCount[value[0]]
       this.showMapData()
+    },
+    initYearList () {
+      const year = 2000
+      let arrYear = []
+      let thisYear = new Date().getFullYear()
+      var section = thisYear - year
+      for (let i = 0; i <= section; i++) {
+        arrYear.push(thisYear--)
+      }
+      this.yearEnd = arrYear.length
+      this.yearStart = arrYear.length - 10
+      this.selectYear = arrYear[0]
+      this.mapYearList = arrYear.reverse()
+      console.log(this.selectYear)
+      console.log(this.mapYearList)
+    },
+    reduceYear () {
+      // console.log(this.yearStart + '-' + this.yearEnd)
+      if (this.yearEnd - 10 > 0) {
+        this.yearEnd -= 1
+        this.yearStart = this.yearEnd - 10
+        if (this.yearEnd - 10 < 1) {
+          this.isReduceYear = false
+        }
+        if (this.yearEnd < this.mapYearList.length) {
+          this.isAddYear = true
+        }
+      } else {
+        this.isReduceYear = false
+      }
+    },
+    addYear () {
+      // console.log(this.yearStart + '-' + this.yearEnd)
+      if (this.yearEnd < this.mapYearList.length) {
+        this.yearEnd += 1
+        this.yearStart = this.yearEnd - 10
+        if (this.yearEnd === this.mapYearList.length) {
+          this.isAddYear = false
+        }
+        if (this.yearEnd - 10 > 0) {
+          this.isReduceYear = true
+        }
+      } else {
+        this.isAddYear = false
+      }
     }
   },
   mounted () {
+    // 初始化年份列表
+    this.initYearList()
     // 查询左侧数据
     this.searchDataMap()
     // 获取菜单信息
@@ -393,12 +625,12 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-/deep/ .el-col-24{
+/deep/ .el-col-24 {
   min-width: 100%;
-  width:auto;
+  width: auto;
 }
-/deep/ .el-menu{
-  border:none;
+/deep/ .el-menu {
+  border: none;
 }
 /deep/ .el-submenu__title {
   display: flex;
@@ -431,7 +663,7 @@ export default {
   & > .mapDataLeft {
     width: 26rem;
     // margin-right: 2rem;
-    min-height: 54.875rem;
+    min-height: 56.875rem;
     overflow: auto;
     background-color: #ffffff;
     box-shadow: 0rem 0.1875rem 1rem 0rem rgba(172, 172, 172, 1);
@@ -469,16 +701,117 @@ export default {
     }
     & > .maptopSty {
       width: 100%;
-      height: 4rem;
-      display: flex;
-      flex-direction: row;
-      justify-content: flex-start;
-      align-items: center;
-      & > .yearD {
-        margin: 0 2rem;
+      height: 6rem;
+      // display: flex;
+      // flex-direction: row;
+      // justify-content: flex-start;
+      // align-items: center;
+      // & > .yearD {
+      //   margin: 0 2rem;
+      // }
+      // & > .monthD {
+      //   margin: 0 2rem;
+      // }
+      > ul {
+        list-style: none;
+        overflow: hidden;
+        background: #f8f8f8;
+        display: flex;
+        align-items: center;
       }
-      & > .monthD {
-        margin: 0 2rem;
+      .year {
+        > li {
+          text-align: center;
+          background-color: gray;
+          // width: 59px;
+          flex: 1;
+          height: 3rem;
+          line-height: 3rem;
+          position: relative;
+          cursor: pointer;
+          background: url(../../../static/data/icon_back.jpg) no-repeat center
+            bottom;
+        }
+        .selected {
+          > span {
+            background: url(../../../static/data/up.jpg) no-repeat center bottom;
+            position: absolute;
+            width: 15px;
+            height: 11px;
+            bottom: -3px;
+            left: 50%;
+            transform: translate(-50%, 0);
+            // right: 77px;
+          }
+        }
+        .prev {
+          > span {
+            background: url(../../../static/data/left.jpg) no-repeat left center;
+            position: absolute;
+            width: 13px;
+            height: 11px;
+            bottom: 9px;
+            right: 23px;
+            cursor: pointer;
+          }
+          .disable {
+            background: url(../../../static/data/left-disable.jpg) no-repeat
+              right center;
+            position: absolute;
+            width: 13px;
+            height: 11px;
+            bottom: 9px;
+            right: 23px;
+            cursor: pointer;
+          }
+        }
+        .next {
+          > span {
+            background: url(../../../static/data/right.jpg) no-repeat right
+              center;
+            position: absolute;
+            width: 13px;
+            height: 11px;
+            bottom: 9px;
+            right: 23px;
+            cursor: pointer;
+          }
+          .disable {
+            background: url(../../../static/data/right-disable.jpg) no-repeat
+              right center;
+            position: absolute;
+            width: 13px;
+            height: 11px;
+            bottom: 9px;
+            right: 23px;
+            cursor: pointer;
+          }
+        }
+      }
+      .quarter {
+        > li {
+          flex: 1;
+          text-align: center;
+          background-color: gray;
+          height: 3rem;
+          line-height: 3rem;
+          position: relative;
+          background: url(../../../static/data/icon_back.jpg) no-repeat center
+            bottom;
+          cursor: pointer;
+        }
+        .selected {
+          > span {
+            background: url(../../../static/data/up.jpg) no-repeat center bottom;
+            position: absolute;
+            width: 15px;
+            height: 11px;
+            bottom: -3px;
+            left: 50%;
+            transform: translate(-50%, 0);
+            // right: 77px;
+          }
+        }
       }
     }
   }
diff --git a/src/components/nav/Nav.vue b/src/components/nav/Nav.vue
index 3c695c2..19a94e5 100644
--- a/src/components/nav/Nav.vue
+++ b/src/components/nav/Nav.vue
@@ -1,19 +1,20 @@
 <template>
   <div class="nav">
     <div class="navCont">
-      <img :src="imageUrl.logo" alt srcset />
-      <div
-        v-for="(item,index) in navCont"
-        :key="index"
-        @click="navClick(index,item.url)"
-        @mouseenter="navMouseClick(index,item.url,true)"
-        @mouseleave="navMouseClick(index,item.url,false)"
-        :class="{fontSty:index==1&&colorD}"
-      >
+      <img :src="imageUrl.logo"
+           alt
+           srcset />
+      <div v-for="(item,index) in navCont"
+           :key="index"
+           @click="navClick(index,item.url)"
+           @mouseenter="navMouseClick(index,item.url,true)"
+           @mouseleave="navMouseClick(index,item.url,false)"
+           :class="{fontSty:index==1&&colorD}">
         <div style="position:relative;">
           {{item.text}}
           <!-- 数据二级导航 -->
-          <div class="dataTwo" v-if="twonav&&index===1">
+          <div class="dataTwo"
+               v-if="twonav&&index===1">
             <div @click="jumpData('monthly')">月度数据</div>
             <div @click="jumpData('quarter')">季度数据</div>
             <div @click="jumpData('year')">年度数据</div>
@@ -24,22 +25,21 @@
       <div class="dsearch">
         <!-- <img :src="imageUrl.search" alt srcset /> -->
         <!-- 未登录 -->
-        <div
-          class="div1"
-          v-if="!$store.state.ipLogin&&!$store.state.normalLogin"
-          @click="loginWindow()"
-        >登录</div>
+        <div class="div1"
+             v-if="!$store.state.ipLogin&&!$store.state.normalLogin"
+             @click="loginWindow()">登录</div>
         <!-- 登陆成功后显示 -->
-        <div
-          :class="{loginAfter:true,loginAfters:fontsF}"
-          v-if="$store.state.ipLogin||$store.state.normalLogin"
-          @mouseenter="userLoginC()"
-          @mouseleave="userLoginC()"
-        >
-          <img :src="userPic" alt srcset />
+        <div :class="{loginAfter:true,loginAfters:fontsF}"
+             v-if="$store.state.ipLogin||$store.state.normalLogin"
+             @mouseenter="userLoginC()"
+             @mouseleave="userLoginC()">
+          <img :src="userPic"
+               alt
+               srcset />
           {{userName}}
           <!-- 个人信息二级导航 -->
-          <div class="dataTwos" v-if="personalInfo">
+          <div class="dataTwos"
+               v-if="personalInfo">
             <div @click="perspnalCenter">个人中心</div>
             <div @click="quit">退出</div>
           </div>
@@ -47,24 +47,36 @@
       </div>
     </div>
     <!-- 登陆窗口 -->
-    <section class="loginSty" v-if="showWinStatic">
+    <section class="loginSty"
+             v-if="showWinStatic">
       <div class="loginSty_wcont">
         <div class="wcont_header">
           <div>登录</div>
-          <img :src="imageUrl.deleteimg" alt @click="closeLoginWind(false)" />
+          <img :src="imageUrl.deleteimg"
+               alt
+               @click="closeLoginWind(false)" />
         </div>
         <div class="wcont_content">
           <div>
-            <img :src="imageUrl.usernames" alt />
-            <input type="text" placeholder="请输入用户名" v-model="username" />
+            <img :src="imageUrl.usernames"
+                 alt />
+            <input type="text"
+                   placeholder="请输入用户名"
+                   v-model="username" />
           </div>
           <div>
-            <img :src="imageUrl.userpwds" alt />
-            <input type="password" placeholder="请输入密码" v-model="userpwd" />
+            <img :src="imageUrl.userpwds"
+                 alt />
+            <input type="password"
+                   placeholder="请输入密码"
+                   v-model="userpwd" />
           </div>
           <div>
-            <input type="text" placeholder="请输入验证码" v-model="useryzm" />
-            <canvas ref="identifyDom" @click="get_identity()"></canvas>
+            <input type="text"
+                   placeholder="请输入验证码"
+                   v-model="useryzm" />
+            <canvas ref="identifyDom"
+                    @click="get_identity()"></canvas>
           </div>
           <div @click="closeLoginWind(true)">确认</div>
           <div>
@@ -112,7 +124,8 @@ export default {
       // 验证码
       useryzm: '',
       // 图片中的验证码
-      imgIdentify: null
+      imgIdentify: null,
+      isEnter: true
     }
   },
   watch: {
@@ -163,27 +176,37 @@ export default {
     // 关闭登录窗口
     closeLoginWind (status) {
       if (status) {
+        // 防止多次回车
+        this.isEnter = false
         // 调接口上传，成功后关闭窗口
         if (this.username === '') {
-          // alert('用户名不能为空！')
-          this.$alert('用户名不能为空！', '温馨提示', {
-            confirmButtonText: '确定'
-          })
+          alert('用户名不能为空！')
+          // this.$alert('用户名不能为空！', '温馨提示', {
+          //   confirmButtonText: '确定'
+          // })
+          this.isEnter = true
+          return false
         } else if (this.userpwd === '') {
-          // alert('密码不能为空！')
-          this.$alert('密码不能为空！', '温馨提示', {
-            confirmButtonText: '确定'
-          })
+          alert('密码不能为空！')
+          // this.$alert('密码不能为空！', '温馨提示', {
+          //   confirmButtonText: '确定'
+          // })
+          this.isEnter = true
+          return false
         } else if (this.useryzm === '') {
-          // alert('验证码不能为空！')
-          this.$alert('验证码不能为空！', '温馨提示', {
-            confirmButtonText: '确定'
-          })
+          alert('验证码不能为空！')
+          // this.$alert('验证码不能为空！', '温馨提示', {
+          //   confirmButtonText: '确定'
+          // })
+          this.isEnter = true
+          return false
         } else if (this.useryzm.toLocaleLowerCase() !== this.imgIdentify) {
-          this.$alert('验证码输入不正确请重新输入！', '温馨提示', {
-            confirmButtonText: '确定'
-          })
-          // alert('验证码输入不正确请重新输入！')
+          // this.$alert('验证码输入不正确请重新输入！', '温馨提示', {
+          //   confirmButtonText: '确定'
+          // })
+          this.isEnter = true
+          alert('验证码输入不正确请重新输入！')
+          return false
         } else {
           let that = this
           // 调接口判断密码是否输入正确,改变登录状态
@@ -194,46 +217,54 @@ export default {
               username: this.username,
               password_hash: this.userpwd
             }
-          }).then(res => {
-            console.log(res)
-            // 请求接口完成注册   请求成功
-            if (res.data.code === 200) {
-              this.showWinStatic = !this.showWinStatic
-              this.$auth.auth = this.showWinStatic
-              // 用户信息存本地
-              sessionStorage.setItem('username', res.data.data.username)
-              sessionStorage.setItem('pic', res.data.data.pic)
-              sessionStorage.setItem('userPwd', this.userpwd)
-              sessionStorage.setItem('token', 'Bearer ' + res.data.data.token)
-              sessionStorage.setItem('tokenB', res.data.data.token)
-              this.$alert(res.data.message, '温馨提示', {
-                confirmButtonText: '确定',
-                callback: res => {
-                  console.log(10000)
-                  that.userLogin = sessionStorage.getItem('userLogin')
-                  that.userName = sessionStorage.getItem('username')
-                  that.userPic = sessionStorage.getItem('pic')
-                  // 登录状态
-                  sessionStorage.setItem('userLogin', true)
-                  // 普通登陆状态
-                  this.$store.state.normalLogin = true
-                  if (this.$route.path !== '/') {
-                    this.$router.push({ path: '/' })
-                  }
-                  window.setTimeout(() => {
-                    sessionStorage.clear()
-                    this.$router.go(0)
-                  }, 7200000)
-                }
-              })
-            } else {
-              this.$alert(res.data.message, '温馨提示', {
-                confirmButtonText: '确定'
-              })
-            }
-          }).catch((fail) => {
-            console.log(fail)
           })
+            .then(res => {
+              // console.log(res)
+              // 请求接口完成注册   请求成功
+              if (res.data.code === 200) {
+                this.showWinStatic = !this.showWinStatic
+                this.$auth.auth = this.showWinStatic
+                // 用户信息存本地
+                sessionStorage.setItem('username', res.data.data.username)
+                sessionStorage.setItem('pic', res.data.data.pic)
+                sessionStorage.setItem('userPwd', this.userpwd)
+                sessionStorage.setItem(
+                  'token',
+                  'Bearer ' + res.data.data.token
+                )
+                sessionStorage.setItem('tokenB', res.data.data.token)
+                this.$alert(res.data.message, '温馨提示', {
+                  confirmButtonText: '确定',
+                  callback: res => {
+                    console.log(10000)
+                    that.userLogin = sessionStorage.getItem('userLogin')
+                    that.userName = sessionStorage.getItem('username')
+                    that.userPic = sessionStorage.getItem('pic')
+                    // 登录状态
+                    sessionStorage.setItem('userLogin', true)
+                    // 普通登陆状态
+                    this.$store.state.normalLogin = true
+                    if (this.$route.path !== '/') {
+                      this.$router.push({ path: '/' })
+                    }
+                    window.setTimeout(() => {
+                      sessionStorage.clear()
+                      this.$router.go(0)
+                    }, 7200000)
+                  }
+                })
+              } else {
+                alert(res.data.message)
+                // this.$alert(res.data.message, '温馨提示', {
+                //   confirmButtonText: '确定'
+                // })
+              }
+              this.isEnter = true
+            })
+            .catch(fail => {
+              // console.log(fail)
+              this.isEnter = true
+            })
         }
       } else {
         console.log(!this.showWinStatic, 'this.showWinStatic')
@@ -260,29 +291,25 @@ export default {
     // 跳到数据页面
     jumpData (staData) {
       if (this.$route.path !== '/datasweb') {
-        this.$router.push(
-          {
-            path: '/datasweb',
-            query: {
-              type: staData,
-              defaultLeftId: 'default'
-            }
+        this.$router.push({
+          path: '/datasweb',
+          query: {
+            type: staData,
+            defaultLeftId: 'default'
           }
-        )
+        })
       } else {
         this.twonav = false
         this.$router.push({
           path: '/'
         })
-        this.$router.push(
-          {
-            path: '/datasweb',
-            query: {
-              type: staData,
-              defaultLeftId: 'default'
-            }
+        this.$router.push({
+          path: '/datasweb',
+          query: {
+            type: staData,
+            defaultLeftId: 'default'
           }
-        )
+        })
         this.$router.go(0)
       }
     },
@@ -295,26 +322,28 @@ export default {
         params: {
           'access-token': sessionStorage.getItem('tokenB')
         }
-      }).then(res => {
-        console.log(res)
-        this.$alert(res.data.message, '温馨提示', {
-          confirmButtonText: '确定'
-        })
-        // alert(res.data.message)
-        // 请求接口完成注册   请求成功
-        if (res.data.code === 200) {
-          console.log(this.$route.path, 'this.$router.path')
-          if (this.$route.path !== '/') {
-            this.$router.push({
-              path: '/'
-            })
-          }
-          sessionStorage.clear()
-          this.$router.go(0)
-        }
-      }).catch((fail) => {
-        console.log(fail)
       })
+        .then(res => {
+          console.log(res)
+          this.$alert(res.data.message, '温馨提示', {
+            confirmButtonText: '确定'
+          })
+          // alert(res.data.message)
+          // 请求接口完成注册   请求成功
+          if (res.data.code === 200) {
+            console.log(this.$route.path, 'this.$router.path')
+            if (this.$route.path !== '/') {
+              this.$router.push({
+                path: '/'
+              })
+            }
+            sessionStorage.clear()
+            this.$router.go(0)
+          }
+        })
+        .catch(fail => {
+          console.log(fail)
+        })
     },
     perspnalCenter () {
       if (this.$route.path !== '/personalCenter') {
@@ -322,11 +351,22 @@ export default {
       } else {
         this.$router.go(0)
       }
+    },
+    keyDown (e) {
+      // 如果是回车则执行登录方法
+      if (
+        this.showWinStatic === true && this.isEnter &&
+        (e.code === 'Enter' || e.code === 'enter')
+      ) {
+        // 验证在登录界面和按得键是回车键enter
+        // console.log('执行登录监听是否按下回车键')
+        this.closeLoginWind(true) // 登录函数
+      }
     }
   },
-  computed: {
-  },
+  computed: {},
   mounted () {
+    window.addEventListener('keydown', this.keyDown)
     // IP端
     this.$axios({
       method: 'GET',
@@ -367,14 +407,14 @@ export default {
     let that = this
     // 监听对象的变化
     /* eslint-disable */
-    Object.defineProperty(this.$auth, 'auth', {
-      set: function (newVal) {
-        console.log(newVal, 'newValnewValnewVal')
-        that.showWinStatic = newVal
-        that.get_identity()
-      }
-    })
-  }
+      Object.defineProperty(this.$auth, 'auth', {
+        set: function (newVal) {
+          console.log(newVal, 'newValnewValnewVal')
+          that.showWinStatic = newVal
+          that.get_identity()
+        }
+      })
+  },
 }
 </script>
 <style lang="scss" scoped>
@@ -484,6 +524,9 @@ export default {
       -moz-box-align: center;
       -ms-flex-align: center;
       align-items: center;
+      input {
+        outline: none;
+      }
       & > div:nth-last-child(n + 2) {
         width: 100%;
         height: 3.25rem;
diff --git a/src/components/pullDownComponents/PullDownComponents.vue b/src/components/pullDownComponents/PullDownComponents.vue
index de18376..bfb8bad 100644
--- a/src/components/pullDownComponents/PullDownComponents.vue
+++ b/src/components/pullDownComponents/PullDownComponents.vue
@@ -119,7 +119,7 @@ export default {
     // 点击其他地方关闭窗口
     document.addEventListener('click', function (e) {
       /* eslint-disable */
-      console.log(that, '12569')
+      // console.log(that, '12569')
       if (e.target.className !== 'city-picker') {
         if (!that.pullDownlistShowState) {
           that.pullDownlistShowState = true
diff --git a/src/components/screenCom/ScreenCom.vue b/src/components/screenCom/ScreenCom.vue
index 3bf6b6f..4f30b6b 100644
--- a/src/components/screenCom/ScreenCom.vue
+++ b/src/components/screenCom/ScreenCom.vue
@@ -259,8 +259,11 @@ export default {
     },
     // 添加筛选条件
     insertData () {
-      console.log(this.dataList.find(item => item.state === true))
-      if (this.dataList.find(item => item.state === true) !== undefined && this.nums !== '' && /^[0-9]+$/.test(this.nums)) {
+      // console.log(this.dataList.find(item => item.state === true))
+      // let reg1 = /^[0-9]+\.?[0-9]+?$/
+      // let reg2 = /^[0-9]+$/
+      let reg = /^\d+(\.\d+)?$/
+      if (this.dataList.find(item => item.state === true) !== undefined && this.nums !== '' && (reg.test(this.nums))) {
         let fuh = ''
         switch (this.selectChange) {
           case '大于(>)':
@@ -291,7 +294,7 @@ export default {
     deleteData () {
       if (this.selectDatas.find(item => item.state === true) !== undefined) {
         this.selectDatas = this.selectDatas.filter((item, index) => {
-          console.log(item.state)
+          // console.log(item.state)
           return item.state === false
         })
       } else {
@@ -315,7 +318,7 @@ export default {
               let brre = this.selectDatas.map((list, key) => {
                 return this.$store.state.noChangeData.termsName.indexOf(list.text.split('#')[1])
               })
-              console.log(brre, 'brre')
+              // console.log(brre, 'brre')
               // 返回表达式
               let brreWay = this.selectDatas.map((list, key) => {
                 return {
@@ -342,7 +345,7 @@ export default {
                 DataTwo.push(
                   item.filter((list, key) => {
                     /* eslint-disable */
-                    console.log((eval((list.value === '' ? '0' : list.value) + brreWay[index].way)))
+                    // console.log((eval((list.value === '' ? '0' : list.value) + brreWay[index].way)))
                     return eval((list.value === '' ? '0' : list.value) + brreWay[index].way) === true
                   })
                 )
@@ -358,7 +361,7 @@ export default {
                 // console.log(itemDAta)
                 AllLabelIndex = this.concat(AllLabelIndex, itemDAta)
               })
-              console.log(AllLabelIndex, '连接数组')
+              // console.log(AllLabelIndex, '连接数组')
               // 第三次过滤并且复制
               let waiBrr = firstData.map((item, index) => {
                 return item.map((list, key) => {
@@ -370,7 +373,7 @@ export default {
                   return AllLabelIndex.indexOf(key) !== -1
                 })
               })
-              console.log(waiBrr, '处理后的数据')
+              // console.log(waiBrr, '处理后的数据')
               this.$store.state.transBefore.transBeforeTermsData = waiBrr
               this.$store.state.transBefore.timeArr = this.$store.state.noChangeData.timeArr.filter((item, index) => {
                 return AllLabelIndex.indexOf(index) !== -1
@@ -384,10 +387,10 @@ export default {
               this.$store.state.transBefore.termsName = this.$store.state.noChangeData.termsName.filter((item, index) => {
                 return brre.indexOf(index) !== -1
               })
-              console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
+              // console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
               // 关闭窗口
               this.$store.state.selcettWindowState = false
-              this.$emit('emitState', true)
+              this.$emit('emitState', true, '1')
             } else if (this.$store.state.SelecttDimension.col === 'sj' && this.$store.state.SelecttDimension.row === 'zb') {
               // 筛选条件
               let newDataBefore = JSON.parse(JSON.stringify(this.$store.state.noChangeData.transBeforeTermsData))
@@ -397,12 +400,12 @@ export default {
                   return row[index]
                 })
               })
-              console.log(newDataBefore, '转置')
+              // console.log(newDataBefore, '转置')
               // 返回下标
               let brre = this.selectDatas.map((list, key) => {
                 return this.$store.state.noChangeData.timeArr.indexOf(list.text.split('#')[1])
               })
-              console.log(brre, 'brre')
+              // console.log(brre, 'brre')
               // 返回表达式
               let brreWay = this.selectDatas.map((list, key) => {
                 return {
@@ -421,7 +424,7 @@ export default {
                   }
                 })
               })
-              console.log(firstData, 'newDataBefore')
+              // console.log(firstData, 'newDataBefore')
               // console.log(brreWay, 'brreWay')
               // 第二次过滤
               let DataTwo = []
@@ -445,7 +448,7 @@ export default {
                 // console.log(itemDAta)
                 AllLabelIndex = this.concat(AllLabelIndex, itemDAta)
               })
-              console.log(AllLabelIndex, '连接数组')
+              // console.log(AllLabelIndex, '连接数组')
               // 第三次过滤并且复制
               let waiBrr = firstData.map((item, index) => {
                 return item.map((list, key) => {
@@ -463,7 +466,7 @@ export default {
                   return row[index]
                 })
               })
-              console.log(waiBrr, '处理后的数据')
+              // console.log(waiBrr, '处理后的数据')
               this.$store.state.transBefore.transBeforeTermsData = waiBrr
               // console.log(AllLabelIndex,'AllLabelIndex')
               this.$store.state.transBefore.timeArr = this.$store.state.noChangeData.timeArr.filter((item, index) => {
@@ -478,10 +481,10 @@ export default {
               this.$store.state.transBefore.termsName = this.$store.state.transBefore.termsName.filter((item, index) => {
                 return AllLabelIndex.indexOf(index) !== -1
               })
-              console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
+              // console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
               // 关闭窗口
               this.$store.state.selcettWindowState = false
-              this.$emit('emitState', true)
+              this.$emit('emitState', true, '1')
             }
           } else {
             // 筛选条件
@@ -491,7 +494,7 @@ export default {
               let brre = this.selectDatas.map((list, key) => {
                 return this.$store.state.noChangeData.termsName.indexOf(list.text.split('#')[1])
               })
-              console.log(brre, 'brre')
+              // console.log(brre, 'brre')
               // 返回表达式
               let brreWay = this.selectDatas.map((list, key) => {
                 return {
@@ -518,7 +521,7 @@ export default {
                 DataTwo.push(
                   item.filter((list, key) => {
                     /* eslint-disable */
-                    console.log((eval((list.value === '' ? '0' : list.value) + brreWay[index].way)))
+                    // console.log((eval((list.value === '' ? '0' : list.value) + brreWay[index].way)))
                     return eval((list.value === '' ? '0' : list.value) + brreWay[index].way) === true
                   })
                 )
@@ -534,7 +537,7 @@ export default {
                 // console.log(itemDAta)
                 AllLabelIndex = this.concat(AllLabelIndex, itemDAta)
               })
-              console.log(AllLabelIndex, '连接数组')
+              // console.log(AllLabelIndex, '连接数组')
               // 第三次过滤并且复制
               let waiBrr = firstData.map((item, index) => {
                 return item.map((list, key) => {
@@ -546,7 +549,7 @@ export default {
                   return AllLabelIndex.indexOf(key) !== -1
                 })
               })
-              console.log(waiBrr, '处理后的数据')
+              // console.log(waiBrr, '处理后的数据')
               this.$store.state.transBefore.transBeforeAreaData = waiBrr
               this.$store.state.transBefore.timeArr = this.$store.state.noChangeData.timeArr.filter((item, index) => {
                 return AllLabelIndex.indexOf(index) !== -1
@@ -560,17 +563,17 @@ export default {
               this.$store.state.transBefore.termsName = this.$store.state.noChangeData.termsName.filter((item, index) => {
                 return brre.indexOf(index) !== -1
               })
-              console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
+              // console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
               // 关闭窗口
               this.$store.state.selcettWindowState = false
-              this.$emit('emitState', true)
+              this.$emit('emitState', true, '2')
             } else if (this.$store.state.SelecttDimension.col === 'sj' && this.$store.state.SelecttDimension.row === 'zb') {
               let newDataBefore = JSON.parse(JSON.stringify(this.$store.state.noChangeData.transBeforeAreaData))
               // 返回下标
               let brre = this.selectDatas.map((list, key) => {
                 return this.$store.state.noChangeData.timeArr.indexOf(list.text.split('#')[1])
               })
-              console.log(brre, 'brre')
+              // console.log(brre, 'brre')
               // 返回表达式
               let brreWay = this.selectDatas.map((list, key) => {
                 return {
@@ -597,7 +600,7 @@ export default {
                 DataTwo.push(
                   item.filter((list, key) => {
                     /* eslint-disable */
-                    console.log((eval((list.value === '' ? '0' : list.value) + brreWay[index].way)))
+                    // console.log((eval((list.value === '' ? '0' : list.value) + brreWay[index].way)))
                     return eval((list.value === '' ? '0' : list.value) + brreWay[index].way) === true
                   })
                 )
@@ -613,7 +616,7 @@ export default {
                 // console.log(itemDAta)
                 AllLabelIndex = this.concat(AllLabelIndex, itemDAta)
               })
-              console.log(AllLabelIndex, '连接数组')
+              // console.log(AllLabelIndex, '连接数组')
               // 第三次过滤并且复制
               let waiBrr = firstData.map((item, index) => {
                 return item.map((list, key) => {
@@ -625,7 +628,7 @@ export default {
                   return AllLabelIndex.indexOf(key) !== -1
                 })
               })
-              console.log(waiBrr, '处理后的数据')
+              // console.log(waiBrr, '处理后的数据')
               this.$store.state.transBefore.transBeforeAreaData = waiBrr
               this.$store.state.transBefore.timeArr = this.$store.state.noChangeData.timeArr.filter((item, index) => {
                 return brre.indexOf(index) !== -1
@@ -639,10 +642,10 @@ export default {
               this.$store.state.transBefore.termsName = this.$store.state.noChangeData.termsName.filter((item, index) => {
                 return AllLabelIndex.indexOf(index) !== -1
               })
-              console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
+              // console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
               // 关闭窗口
               this.$store.state.selcettWindowState = false
-              this.$emit('emitState', true)
+              this.$emit('emitState', true, '2')
             } else if (this.$store.state.SelecttDimension.col === 'dq' && this.$store.state.SelecttDimension.row === 'sj') {
               // 筛选条件
               let newDataBefore = JSON.parse(JSON.stringify(this.$store.state.noChangeData.transBeforeAreaData))
@@ -650,7 +653,7 @@ export default {
               let brre = this.selectDatas.map((list, key) => {
                 return this.$store.state.noChangeData.areaName.indexOf(list.text.split('#')[1])
               })
-              console.log(brre, 'brre')
+              // console.log(brre, 'brre')
               // 返回表达式
               let brreWay = this.selectDatas.map((list, key) => {
                 return {
@@ -677,7 +680,7 @@ export default {
                 DataTwo.push(
                   item.filter((list, key) => {
                     /* eslint-disable */
-                    console.log((eval((list.value === '' ? '0' : list.value) + brreWay[index].way)))
+                    // console.log((eval((list.value === '' ? '0' : list.value) + brreWay[index].way)))
                     return eval((list.value === '' ? '0' : list.value) + brreWay[index].way) === true
                   })
                 )
@@ -693,7 +696,7 @@ export default {
                 // console.log(itemDAta)
                 AllLabelIndex = this.concat(AllLabelIndex, itemDAta)
               })
-              console.log(AllLabelIndex, '连接数组')
+              // console.log(AllLabelIndex, '连接数组')
               // 第三次过滤并且复制
               let waiBrr = firstData.map((item, index) => {
                 return item.map((list, key) => {
@@ -705,7 +708,7 @@ export default {
                   return AllLabelIndex.indexOf(key) !== -1
                 })
               })
-              console.log(waiBrr, '处理后的数据')
+              // console.log(waiBrr, '处理后的数据')
               this.$store.state.transBefore.transBeforeAreaData = waiBrr
               this.$store.state.transBefore.timeArr = this.$store.state.noChangeData.timeArr.filter((item, index) => {
                 return AllLabelIndex.indexOf(index) !== -1
@@ -713,10 +716,10 @@ export default {
               this.$store.state.transBefore.areaName = this.$store.state.noChangeData.areaName.filter((item, index) => {
                 return brre.indexOf(index) !== -1
               })
-              console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
+              // console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
               // 关闭窗口
               this.$store.state.selcettWindowState = false
-              this.$emit('emitState', true)
+              this.$emit('emitState', true, '2')
             } else if (this.$store.state.SelecttDimension.col === 'sj' && this.$store.state.SelecttDimension.row === 'dq') {
               // 筛选条件
               let newDataBefore = JSON.parse(JSON.stringify(this.$store.state.noChangeData.transBeforeAreaData))
@@ -724,7 +727,7 @@ export default {
               let brre = this.selectDatas.map((list, key) => {
                 return this.$store.state.noChangeData.timeArr.indexOf(list.text.split('#')[1])
               })
-              console.log(brre, 'brre')
+              // console.log(brre, 'brre')
               // 返回表达式
               let brreWay = this.selectDatas.map((list, key) => {
                 return {
@@ -751,7 +754,7 @@ export default {
                 DataTwo.push(
                   item.filter((list, key) => {
                     /* eslint-disable */
-                    console.log((eval((list.value === '' ? '0' : list.value) + brreWay[index].way)))
+                    // console.log((eval((list.value === '' ? '0' : list.value) + brreWay[index].way)))
                     return eval((list.value === '' ? '0' : list.value) + brreWay[index].way) === true
                   })
                 )
@@ -767,7 +770,7 @@ export default {
                 // console.log(itemDAta)
                 AllLabelIndex = this.concat(AllLabelIndex, itemDAta)
               })
-              console.log(AllLabelIndex, '连接数组')
+              // console.log(AllLabelIndex, '连接数组')
               // 第三次过滤并且复制
               let waiBrr = firstData.map((item, index) => {
                 return item.map((list, key) => {
@@ -779,7 +782,7 @@ export default {
                   return AllLabelIndex.indexOf(key) !== -1
                 })
               })
-              console.log(waiBrr, '处理后的数据')
+              // console.log(waiBrr, '处理后的数据')
               this.$store.state.transBefore.transBeforeAreaData = waiBrr
               this.$store.state.transBefore.timeArr = this.$store.state.noChangeData.timeArr.filter((item, index) => {
                 return brre.indexOf(index) !== -1
@@ -787,10 +790,10 @@ export default {
               this.$store.state.transBefore.areaName = this.$store.state.noChangeData.areaName.filter((item, index) => {
                 return AllLabelIndex.indexOf(index) !== -1
               })
-              console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
+              // console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
               // 关闭窗口
               this.$store.state.selcettWindowState = false
-              this.$emit('emitState', true)
+              this.$emit('emitState', true, '2')
             } else if (this.$store.state.SelecttDimension.col === 'zb' && this.$store.state.SelecttDimension.row === 'dq') {
               // 筛选条件
               let newDataBefore = JSON.parse(JSON.stringify(this.$store.state.noChangeData.transBeforeAreaData))
@@ -798,7 +801,7 @@ export default {
               let brre = this.selectDatas.map((list, key) => {
                 return this.$store.state.noChangeData.termsName.indexOf(list.text.split('#')[1])
               })
-              console.log(brre, 'brre')
+              // console.log(brre, 'brre')
               // 返回表达式
               let brreWay = this.selectDatas.map((list, key) => {
                 return {
@@ -825,7 +828,7 @@ export default {
                 DataTwo.push(
                   item.filter((list, key) => {
                     /* eslint-disable */
-                    console.log((eval((list.value === '' ? '0' : list.value) + brreWay[index].way)))
+                    // console.log((eval((list.value === '' ? '0' : list.value) + brreWay[index].way)))
                     return eval((list.value === '' ? '0' : list.value) + brreWay[index].way) === true
                   })
                 )
@@ -841,7 +844,7 @@ export default {
                 // console.log(itemDAta)
                 AllLabelIndex = this.concat(AllLabelIndex, itemDAta)
               })
-              console.log(AllLabelIndex, '连接数组')
+              // console.log(AllLabelIndex, '连接数组')
               // 第三次过滤并且复制
               let waiBrr = firstData.map((item, index) => {
                 return item.map((list, key) => {
@@ -853,7 +856,7 @@ export default {
                   return AllLabelIndex.indexOf(key) !== -1
                 })
               })
-              console.log(waiBrr, '处理后的数据')
+              // console.log(waiBrr, '处理后的数据')
               this.$store.state.transBefore.transBeforeAreaData = waiBrr
               this.$store.state.transBefore.areaName = this.$store.state.noChangeData.areaName.filter((item, index) => {
                 return AllLabelIndex.indexOf(index) !== -1
@@ -867,10 +870,10 @@ export default {
               this.$store.state.transBefore.dataSource = this.$store.state.noChangeData.dataSource.filter((item, index) => {
                 return brre.indexOf(index) !== -1
               })
-              console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
+              // console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
               // 关闭窗口
               this.$store.state.selcettWindowState = false
-              this.$emit('emitState', true)
+              this.$emit('emitState', true, '2')
             } else if (this.$store.state.SelecttDimension.col === 'dq' && this.$store.state.SelecttDimension.row === 'zb') {
               // 筛选条件
               let newDataBefore = JSON.parse(JSON.stringify(this.$store.state.noChangeData.transBeforeAreaData))
@@ -878,7 +881,7 @@ export default {
               let brre = this.selectDatas.map((list, key) => {
                 return this.$store.state.noChangeData.areaName.indexOf(list.text.split('#')[1])
               })
-              console.log(brre, 'brre')
+              // console.log(brre, 'brre')
               // 返回表达式
               let brreWay = this.selectDatas.map((list, key) => {
                 return {
@@ -905,7 +908,7 @@ export default {
                 DataTwo.push(
                   item.filter((list, key) => {
                     /* eslint-disable */
-                    console.log((eval((list.value === '' ? '0' : list.value) + brreWay[index].way)))
+                    // console.log((eval((list.value === '' ? '0' : list.value) + brreWay[index].way)))
                     return eval((list.value === '' ? '0' : list.value) + brreWay[index].way) === true
                   })
                 )
@@ -921,7 +924,7 @@ export default {
                 // console.log(itemDAta)
                 AllLabelIndex = this.concat(AllLabelIndex, itemDAta)
               })
-              console.log(AllLabelIndex, '连接数组')
+              // console.log(AllLabelIndex, '连接数组')
               // 第三次过滤并且复制
               let waiBrr = firstData.map((item, index) => {
                 return item.map((list, key) => {
@@ -933,7 +936,7 @@ export default {
                   return AllLabelIndex.indexOf(key) !== -1
                 })
               })
-              console.log(waiBrr, '处理后的数据')
+              // console.log(waiBrr, '处理后的数据')
               this.$store.state.transBefore.transBeforeAreaData = waiBrr
               this.$store.state.transBefore.areaName = this.$store.state.noChangeData.areaName.filter((item, index) => {
                 return brre.indexOf(index) !== -1
@@ -947,10 +950,10 @@ export default {
               this.$store.state.transBefore.dataSource = this.$store.state.noChangeData.dataSource.filter((item, index) => {
                 return AllLabelIndex.indexOf(index) !== -1
               })
-              console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
+              // console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
               // 关闭窗口
               this.$store.state.selcettWindowState = false
-              this.$emit('emitState', true)
+              this.$emit('emitState', true, '2')
             }
           }
         } else if (this.selectAudio === 'lie') {
@@ -964,98 +967,12 @@ export default {
                   return row[index]
                 })
               })
-              console.log(newDataBefore, '转置')
+              // console.log(newDataBefore, '转置')
               // 返回下标
               let brre = this.selectDatas.map((list, key) => {
                 return this.$store.state.noChangeData.timeArr.indexOf(list.text.split('#')[1])
               })
-              console.log(brre, 'brre')
-              // 返回表达式
-              let brreWay = this.selectDatas.map((list, key) => {
-                return {
-                  text: list.text.split('#')[1],
-                  way: list.text.split('#')[2]
-                }
-              })
-              // 第一次过滤出来的数据
-              let firstData = newDataBefore.filter((item, index) => {
-                return brre.indexOf(index) !== -1
-              }).map((item, index) => {
-                return item.map((list, key) => {
-                  return {
-                    index: key,
-                    value: list
-                  }
-                })
-              })
-              console.log(firstData, 'newDataBefore')
-              // console.log(brreWay, 'brreWay')
-              // 第二次过滤
-              let DataTwo = []
-              firstData.forEach((item, index) => {
-                DataTwo.push(
-                  item.filter((list, key) => {
-                    /* eslint-disable */
-                    // console.log(eval(list.value + brreWay[index].way))
-                    return eval((list.value === '' ? '0' : list.value) + brreWay[index].way) === true
-                  })
-                )
-              })
-              // console.log(DataTwo, '第二次过滤')
-              // 第三次过滤
-              // 定义一个数组用来存储全集的下标
-              let AllLabelIndex = []
-              let threeData = DataTwo.forEach((item, index) => {
-                let itemDAta = item.map((list, key) => {
-                  return Object.values(list)[0]
-                })
-                // console.log(itemDAta)
-                AllLabelIndex = this.concat(AllLabelIndex, itemDAta)
-              })
-              console.log(AllLabelIndex, '连接数组')
-              // 第三次过滤并且复制
-              let waiBrr = firstData.map((item, index) => {
-                return item.map((list, key) => {
-                  // console.log(list)
-                  return list.value
-                })
-              }).map((item, index) => {
-                return item.filter((list, key) => {
-                  return AllLabelIndex.indexOf(key) !== -1
-                })
-              })
-              // 转置回来
-              waiBrr = waiBrr[0].map(function (col, index) {
-                return waiBrr.map((row, key) => {
-                  return row[index]
-                })
-              })
-              console.log(waiBrr, '处理后的数据')
-              this.$store.state.transBefore.transBeforeTermsData = waiBrr
-              // console.log(AllLabelIndex,'AllLabelIndex')
-              this.$store.state.transBefore.timeArr = this.$store.state.noChangeData.timeArr.filter((item, index) => {
-                return brre.indexOf(index) !== -1
-              })
-              this.$store.state.transBefore.termsExplain = this.$store.state.transBefore.termsExplain.filter((item, index) => {
-                return AllLabelIndex.indexOf(index) !== -1
-              })
-              this.$store.state.transBefore.dataSource = this.$store.state.transBefore.dataSource.filter((item, index) => {
-                return AllLabelIndex.indexOf(index) !== -1
-              })
-              this.$store.state.transBefore.termsName = this.$store.state.transBefore.termsName.filter((item, index) => {
-                return AllLabelIndex.indexOf(index) !== -1
-              })
-              console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
-              // 关闭窗口
-              this.$store.state.selcettWindowState = false
-              this.$emit('emitState', true)
-            } else if (this.$store.state.SelecttDimension.col === 'sj' && this.$store.state.SelecttDimension.row === 'zb') {
-              let newDataBefore = JSON.parse(JSON.stringify(this.$store.state.noChangeData.transBeforeTermsData))
-              // 返回下标
-              let brre = this.selectDatas.map((list, key) => {
-                return this.$store.state.noChangeData.termsName.indexOf(list.text.split('#')[1])
-              })
-              console.log(brre, 'brre')
+              // console.log(brre, 'brre')
               // 返回表达式
               let brreWay = this.selectDatas.map((list, key) => {
                 return {
@@ -1082,7 +999,7 @@ export default {
                 DataTwo.push(
                   item.filter((list, key) => {
                     /* eslint-disable */
-                    console.log((eval((list.value === '' ? '0' : list.value) + brreWay[index].way)))
+                    // console.log(eval(list.value + brreWay[index].way))
                     return eval((list.value === '' ? '0' : list.value) + brreWay[index].way) === true
                   })
                 )
@@ -1098,7 +1015,7 @@ export default {
                 // console.log(itemDAta)
                 AllLabelIndex = this.concat(AllLabelIndex, itemDAta)
               })
-              console.log(AllLabelIndex, '连接数组')
+              // console.log(AllLabelIndex, '连接数组')
               // 第三次过滤并且复制
               let waiBrr = firstData.map((item, index) => {
                 return item.map((list, key) => {
@@ -1110,7 +1027,93 @@ export default {
                   return AllLabelIndex.indexOf(key) !== -1
                 })
               })
-              console.log(waiBrr, '处理后的数据')
+              // 转置回来
+              waiBrr = waiBrr[0].map(function (col, index) {
+                return waiBrr.map((row, key) => {
+                  return row[index]
+                })
+              })
+              // console.log(waiBrr, '处理后的数据')
+              this.$store.state.transBefore.transBeforeTermsData = waiBrr
+              // console.log(AllLabelIndex,'AllLabelIndex')
+              this.$store.state.transBefore.timeArr = this.$store.state.noChangeData.timeArr.filter((item, index) => {
+                return brre.indexOf(index) !== -1
+              })
+              this.$store.state.transBefore.termsExplain = this.$store.state.transBefore.termsExplain.filter((item, index) => {
+                return AllLabelIndex.indexOf(index) !== -1
+              })
+              this.$store.state.transBefore.dataSource = this.$store.state.transBefore.dataSource.filter((item, index) => {
+                return AllLabelIndex.indexOf(index) !== -1
+              })
+              this.$store.state.transBefore.termsName = this.$store.state.transBefore.termsName.filter((item, index) => {
+                return AllLabelIndex.indexOf(index) !== -1
+              })
+              // console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
+              // 关闭窗口
+              this.$store.state.selcettWindowState = false
+              this.$emit('emitState', true, '2')
+            } else if (this.$store.state.SelecttDimension.col === 'sj' && this.$store.state.SelecttDimension.row === 'zb') {
+              let newDataBefore = JSON.parse(JSON.stringify(this.$store.state.noChangeData.transBeforeTermsData))
+              // 返回下标
+              let brre = this.selectDatas.map((list, key) => {
+                return this.$store.state.noChangeData.termsName.indexOf(list.text.split('#')[1])
+              })
+              // console.log(brre, 'brre')
+              // 返回表达式
+              let brreWay = this.selectDatas.map((list, key) => {
+                return {
+                  text: list.text.split('#')[1],
+                  way: list.text.split('#')[2]
+                }
+              })
+              // 第一次过滤出来的数据
+              let firstData = newDataBefore.filter((item, index) => {
+                return brre.indexOf(index) !== -1
+              }).map((item, index) => {
+                return item.map((list, key) => {
+                  return {
+                    index: key,
+                    value: list
+                  }
+                })
+              })
+              // console.log(firstData, 'newDataBefore')
+              // console.log(brreWay, 'brreWay')
+              // 第二次过滤
+              let DataTwo = []
+              firstData.forEach((item, index) => {
+                DataTwo.push(
+                  item.filter((list, key) => {
+                    /* eslint-disable */
+                    // console.log((eval((list.value === '' ? '0' : list.value) + brreWay[index].way)))
+                    return eval((list.value === '' ? '0' : list.value) + brreWay[index].way) === true
+                  })
+                )
+              })
+              // console.log(DataTwo, '第二次过滤')
+              // 第三次过滤
+              // 定义一个数组用来存储全集的下标
+              let AllLabelIndex = []
+              let threeData = DataTwo.forEach((item, index) => {
+                let itemDAta = item.map((list, key) => {
+                  return Object.values(list)[0]
+                })
+                // console.log(itemDAta)
+                AllLabelIndex = this.concat(AllLabelIndex, itemDAta)
+              })
+              // console.log(AllLabelIndex, '连接数组')
+              // 第三次过滤并且复制
+              let waiBrr = firstData.map((item, index) => {
+                return item.map((list, key) => {
+                  // console.log(list)
+                  return list.value
+                })
+              }).map((item, index) => {
+                return item.filter((list, key) => {
+                  return AllLabelIndex.indexOf(key) !== -1
+                })
+              })
+              // console.log(waiBrr, '处理后的数据')
               this.$store.state.transBefore.transBeforeTermsData = waiBrr
               this.$store.state.transBefore.timeArr = this.$store.state.noChangeData.timeArr.filter((item, index) => {
                 return AllLabelIndex.indexOf(index) !== -1
@@ -1124,10 +1127,10 @@ export default {
               this.$store.state.transBefore.termsName = this.$store.state.noChangeData.termsName.filter((item, index) => {
                 return brre.indexOf(index) !== -1
               })
-              console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
+              // console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
               // 关闭窗口
               this.$store.state.selcettWindowState = false
-              this.$emit('emitState', true)
+              this.$emit('emitState', true, '2')
             }
           } else {//地区列数据
             if (this.$store.state.SelecttDimension.col === 'zb' && this.$store.state.SelecttDimension.row === 'sj') {
@@ -1139,12 +1142,12 @@ export default {
                   return row[index]
                 })
               })
-              console.log(newDataBefore, '转置')
+              // console.log(newDataBefore, '转置')
               // 返回下标
               let brre = this.selectDatas.map((list, key) => {
                 return this.$store.state.noChangeData.timeArr.indexOf(list.text.split('#')[1])
               })
-              console.log(brre, 'brre')
+              // console.log(brre, 'brre')
               // 返回表达式
               let brreWay = this.selectDatas.map((list, key) => {
                 return {
@@ -1163,7 +1166,7 @@ export default {
                   }
                 })
               })
-              console.log(firstData, 'newDataBefore')
+              // console.log(firstData, 'newDataBefore')
               // console.log(brreWay, 'brreWay')
               // 第二次过滤
               let DataTwo = []
@@ -1187,7 +1190,7 @@ export default {
                 // console.log(itemDAta)
                 AllLabelIndex = this.concat(AllLabelIndex, itemDAta)
               })
-              console.log(AllLabelIndex, '连接数组')
+              // console.log(AllLabelIndex, '连接数组')
               // 第三次过滤并且复制
               let waiBrr = firstData.map((item, index) => {
                 return item.map((list, key) => {
@@ -1205,7 +1208,7 @@ export default {
                   return row[index]
                 })
               })
-              console.log(waiBrr, '处理后的数据')
+              // console.log(waiBrr, '处理后的数据')
               this.$store.state.transBefore.transBeforeTermsData = waiBrr
               // console.log(AllLabelIndex,'AllLabelIndex')
               this.$store.state.transBefore.timeArr = this.$store.state.noChangeData.timeArr.filter((item, index) => {
@@ -1220,10 +1223,10 @@ export default {
               this.$store.state.transBefore.termsName = this.$store.state.transBefore.termsName.filter((item, index) => {
                 return AllLabelIndex.indexOf(index) !== -1
               })
-              console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
+              // console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
               // 关闭窗口
               this.$store.state.selcettWindowState = false
-              this.$emit('emitState', true)
+              this.$emit('emitState', true, '2')
             } else if (this.$store.state.SelecttDimension.col === 'sj' && this.$store.state.SelecttDimension.row === 'zb') {
               // 筛选条件
               let newDataBefore = JSON.parse(JSON.stringify(this.$store.state.noChangeData.transBeforeAreaData))
@@ -1233,12 +1236,12 @@ export default {
                   return row[index]
                 })
               })
-              console.log(newDataBefore, '转置')
+              // console.log(newDataBefore, '转置')
               // 返回下标
               let brre = this.selectDatas.map((list, key) => {
                 return this.$store.state.noChangeData.termsName.indexOf(list.text.split('#')[1])
               })
-              console.log(brre, 'brre')
+              // console.log(brre, 'brre')
               // 返回表达式
               let brreWay = this.selectDatas.map((list, key) => {
                 return {
@@ -1257,7 +1260,7 @@ export default {
                   }
                 })
               })
-              console.log(firstData, 'newDataBefore')
+              // console.log(firstData, 'newDataBefore')
               // console.log(brreWay, 'brreWay')
               // 第二次过滤
               let DataTwo = []
@@ -1281,7 +1284,7 @@ export default {
                 // console.log(itemDAta)
                 AllLabelIndex = this.concat(AllLabelIndex, itemDAta)
               })
-              console.log(AllLabelIndex, '连接数组')
+              // console.log(AllLabelIndex, '连接数组')
               // 第三次过滤并且复制
               let waiBrr = firstData.map((item, index) => {
                 return item.map((list, key) => {
@@ -1299,7 +1302,7 @@ export default {
                   return row[index]
                 })
               })
-              console.log(waiBrr, '处理后的数据')
+              // console.log(waiBrr, '处理后的数据')
               this.$store.state.transBefore.transBeforeTermsData = waiBrr
               // console.log(AllLabelIndex,'AllLabelIndex')
               this.$store.state.transBefore.timeArr = this.$store.state.noChangeData.timeArr.filter((item, index) => {
@@ -1314,10 +1317,10 @@ export default {
               this.$store.state.transBefore.termsName = this.$store.state.transBefore.termsName.filter((item, index) => {
                 return brre.indexOf(index) !== -1
               })
-              console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
+              // console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
               // 关闭窗口
               this.$store.state.selcettWindowState = false
-              this.$emit('emitState', true)
+              this.$emit('emitState', true, '2')
             } else if (this.$store.state.SelecttDimension.col === 'dq' && this.$store.state.SelecttDimension.row === 'sj') {
               // 筛选条件
               let newDataBefore = JSON.parse(JSON.stringify(this.$store.state.noChangeData.transBeforeAreaData))
@@ -1327,12 +1330,12 @@ export default {
                   return row[index]
                 })
               })
-              console.log(newDataBefore, '转置')
+              // console.log(newDataBefore, '转置')
               // 返回下标
               let brre = this.selectDatas.map((list, key) => {
                 return this.$store.state.noChangeData.timeArr.indexOf(list.text.split('#')[1])
               })
-              console.log(brre, 'brre')
+              // console.log(brre, 'brre')
               // 返回表达式
               let brreWay = this.selectDatas.map((list, key) => {
                 return {
@@ -1351,7 +1354,7 @@ export default {
                   }
                 })
               })
-              console.log(firstData, 'newDataBefore')
+              // console.log(firstData, 'newDataBefore')
               // console.log(brreWay, 'brreWay')
               // 第二次过滤
               let DataTwo = []
@@ -1375,7 +1378,7 @@ export default {
                 // console.log(itemDAta)
                 AllLabelIndex = this.concat(AllLabelIndex, itemDAta)
               })
-              console.log(AllLabelIndex, '连接数组')
+              // console.log(AllLabelIndex, '连接数组')
               // 第三次过滤并且复制
               let waiBrr = firstData.map((item, index) => {
                 return item.map((list, key) => {
@@ -1393,7 +1396,7 @@ export default {
                   return row[index]
                 })
               })
-              console.log(waiBrr, '处理后的数据')
+              // console.log(waiBrr, '处理后的数据')
               this.$store.state.transBefore.transBeforeTermsData = waiBrr
               // console.log(AllLabelIndex,'AllLabelIndex')
               this.$store.state.transBefore.timeArr = this.$store.state.noChangeData.timeArr.filter((item, index) => {
@@ -1402,10 +1405,10 @@ export default {
               this.$store.state.transBefore.areaName = this.$store.state.transBefore.areaName.filter((item, index) => {
                 return brre.indexOf(index) !== -1
               })
-              console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
+              // console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
               // 关闭窗口
               this.$store.state.selcettWindowState = false
-              this.$emit('emitState', true)
+              this.$emit('emitState', true, '2')
             } else if (this.$store.state.SelecttDimension.col === 'sj' && this.$store.state.SelecttDimension.row === 'dq') {
               // 筛选条件
               let newDataBefore = JSON.parse(JSON.stringify(this.$store.state.noChangeData.transBeforeAreaData))
@@ -1415,12 +1418,12 @@ export default {
                   return row[index]
                 })
               })
-              console.log(newDataBefore, '转置')
+              // console.log(newDataBefore, '转置')
               // 返回下标
               let brre = this.selectDatas.map((list, key) => {
                 return this.$store.state.noChangeData.areaName.indexOf(list.text.split('#')[1])
               })
-              console.log(brre, 'brre')
+              // console.log(brre, 'brre')
               // 返回表达式
               let brreWay = this.selectDatas.map((list, key) => {
                 return {
@@ -1439,7 +1442,7 @@ export default {
                   }
                 })
               })
-              console.log(firstData, 'newDataBefore')
+              // console.log(firstData, 'newDataBefore')
               // console.log(brreWay, 'brreWay')
               // 第二次过滤
               let DataTwo = []
@@ -1463,7 +1466,7 @@ export default {
                 // console.log(itemDAta)
                 AllLabelIndex = this.concat(AllLabelIndex, itemDAta)
               })
-              console.log(AllLabelIndex, '连接数组')
+              // console.log(AllLabelIndex, '连接数组')
               // 第三次过滤并且复制
               let waiBrr = firstData.map((item, index) => {
                 return item.map((list, key) => {
@@ -1481,7 +1484,7 @@ export default {
                   return row[index]
                 })
               })
-              console.log(waiBrr, '处理后的数据')
+              // console.log(waiBrr, '处理后的数据')
               this.$store.state.transBefore.transBeforeTermsData = waiBrr
               // console.log(AllLabelIndex,'AllLabelIndex')
               this.$store.state.transBefore.timeArr = this.$store.state.noChangeData.timeArr.filter((item, index) => {
@@ -1490,10 +1493,10 @@ export default {
               this.$store.state.transBefore.areaName = this.$store.state.transBefore.areaName.filter((item, index) => {
                 return AllLabelIndex.indexOf(index) !== -1
               })
-              console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
+              // console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
               // 关闭窗口
               this.$store.state.selcettWindowState = false
-              this.$emit('emitState', true)
+              this.$emit('emitState', true, '2')
             } else if (this.$store.state.SelecttDimension.col === 'zb' && this.$store.state.SelecttDimension.row === 'dq') {
               // 筛选条件
               let newDataBefore = JSON.parse(JSON.stringify(this.$store.state.noChangeData.transBeforeAreaData))
@@ -1503,12 +1506,12 @@ export default {
                   return row[index]
                 })
               })
-              console.log(newDataBefore, '转置')
+              // console.log(newDataBefore, '转置')
               // 返回下标
               let brre = this.selectDatas.map((list, key) => {
                 return this.$store.state.noChangeData.termsName.indexOf(list.text.split('#')[1])
               })
-              console.log(brre, 'brre')
+              // console.log(brre, 'brre')
               // 返回表达式
               let brreWay = this.selectDatas.map((list, key) => {
                 return {
@@ -1527,7 +1530,7 @@ export default {
                   }
                 })
               })
-              console.log(firstData, 'newDataBefore')
+              // console.log(firstData, 'newDataBefore')
               // console.log(brreWay, 'brreWay')
               // 第二次过滤
               let DataTwo = []
@@ -1551,7 +1554,7 @@ export default {
                 // console.log(itemDAta)
                 AllLabelIndex = this.concat(AllLabelIndex, itemDAta)
               })
-              console.log(AllLabelIndex, '连接数组')
+              // console.log(AllLabelIndex, '连接数组')
               // 第三次过滤并且复制
               let waiBrr = firstData.map((item, index) => {
                 return item.map((list, key) => {
@@ -1569,7 +1572,7 @@ export default {
                   return row[index]
                 })
               })
-              console.log(waiBrr, '处理后的数据')
+              // console.log(waiBrr, '处理后的数据')
               this.$store.state.transBefore.transBeforeTermsData = waiBrr
               // console.log(AllLabelIndex,'AllLabelIndex')
               this.$store.state.transBefore.termsName = this.$store.state.noChangeData.termsName.filter((item, index) => {
@@ -1584,10 +1587,10 @@ export default {
               this.$store.state.transBefore.areaName = this.$store.state.transBefore.areaName.filter((item, index) => {
                 return AllLabelIndex.indexOf(index) !== -1
               })
-              console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
+              // console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
               // 关闭窗口
               this.$store.state.selcettWindowState = false
-              this.$emit('emitState', true)
+              this.$emit('emitState', true, '2')
             } else if (this.$store.state.SelecttDimension.col === 'dq' && this.$store.state.SelecttDimension.row === 'zb') {
               // 筛选条件
               let newDataBefore = JSON.parse(JSON.stringify(this.$store.state.noChangeData.transBeforeAreaData))
@@ -1597,12 +1600,12 @@ export default {
                   return row[index]
                 })
               })
-              console.log(newDataBefore, '转置')
+              // console.log(newDataBefore, '转置')
               // 返回下标
               let brre = this.selectDatas.map((list, key) => {
                 return this.$store.state.noChangeData.areaName.indexOf(list.text.split('#')[1])
               })
-              console.log(brre, 'brre')
+              // console.log(brre, 'brre')
               // 返回表达式
               let brreWay = this.selectDatas.map((list, key) => {
                 return {
@@ -1621,7 +1624,7 @@ export default {
                   }
                 })
               })
-              console.log(firstData, 'newDataBefore')
+              // console.log(firstData, 'newDataBefore')
               // console.log(brreWay, 'brreWay')
               // 第二次过滤
               let DataTwo = []
@@ -1645,7 +1648,7 @@ export default {
                 // console.log(itemDAta)
                 AllLabelIndex = this.concat(AllLabelIndex, itemDAta)
               })
-              console.log(AllLabelIndex, '连接数组')
+              // console.log(AllLabelIndex, '连接数组')
               // 第三次过滤并且复制
               let waiBrr = firstData.map((item, index) => {
                 return item.map((list, key) => {
@@ -1663,7 +1666,7 @@ export default {
                   return row[index]
                 })
               })
-              console.log(waiBrr, '处理后的数据')
+              // console.log(waiBrr, '处理后的数据')
               this.$store.state.transBefore.transBeforeTermsData = waiBrr
               // console.log(AllLabelIndex,'AllLabelIndex')
               this.$store.state.transBefore.termsName = this.$store.state.noChangeData.termsName.filter((item, index) => {
@@ -1678,10 +1681,10 @@ export default {
               this.$store.state.transBefore.areaName = this.$store.state.transBefore.areaName.filter((item, index) => {
                 return brre.indexOf(index) !== -1
               })
-              console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
+              // console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
               // 关闭窗口
               this.$store.state.selcettWindowState = false
-              this.$emit('emitState', true)
+              this.$emit('emitState', true, '2')
             }
           }
         }
diff --git a/src/views/datasweb/Datasweb.vue b/src/views/datasweb/Datasweb.vue
index 1996148..833ed70 100644
--- a/src/views/datasweb/Datasweb.vue
+++ b/src/views/datasweb/Datasweb.vue
@@ -1,3 +1,6 @@
+/* eslint-disable no-tabs */
+/* eslint-disable no-tabs */
+/* eslint-disable no-tabs */
 <template>
   <div>
     <!-- 首页导航 -->
@@ -12,7 +15,8 @@
           <div class="header">
             <div class="left">{{posaite[dataPos]}}</div>
             <div class="right">
-              <img :src="imgurl.pos" alt />
+              <img :src="imgurl.pos"
+                   alt />
               <span>当前位置：</span>
               <span @click="$router.push('/')">首页</span>
               >
@@ -20,50 +24,45 @@
             </div>
           </div>
           <!-- 中间部分 -->
-          <div class="data_title" v-if="cutStateSeach==='simpleness'">
-            <div
-              v-for="(item,index) in titleDatas"
-              :key="index"
-              @mouseover="mouseoverAllCate('hierarchy1',index)"
-              @mouseleave="mouseleaveAllCate('hierarchy1',index)"
-              @click="clickAllCate('hierarchy1',index)"
-            >
-              <img :src="item.iconUrl" alt />
+          <div class="data_title"
+               v-if="cutStateSeach==='simpleness'">
+            <div v-for="(item,index) in titleDatas"
+                 :key="index"
+                 @mouseover="mouseoverAllCate('hierarchy1',index)"
+                 @mouseleave="mouseleaveAllCate('hierarchy1',index)"
+                 @click="clickAllCate('hierarchy1',index)">
+              <img :src="item.iconUrl"
+                   alt />
               <span v-if="computStatic(index,titleDatas)">{{item.text}}</span>
-              <div
-                v-if="index===(titleDatas.length-1)||index===(titleDatas.length-2)"
-                class="title_relative"
-              >
+              <div v-if="index===(titleDatas.length-1)||index===(titleDatas.length-2)"
+                   class="title_relative">
                 <div>{{item.text}}</div>
-                <div class="title_div" v-if="item.static">
-                  <div
-                    v-for="(list,key) in item.secondText"
-                    :key="key"
-                    @mouseover="mouseoverCate('hierarchy2',key)"
-                    @mouseleave="mouseleaveCate('hierarchy2',key)"
-                    @click.stop="clickCate('hierarchy2',key,list.text)"
-                  >
+                <div class="title_div"
+                     v-if="item.static">
+                  <div v-for="(list,key) in item.secondText"
+                       :key="key"
+                       @mouseover="mouseoverCate('hierarchy2',key)"
+                       @mouseleave="mouseleaveCate('hierarchy2',key)"
+                       @click.stop="clickCate('hierarchy2',key,list.text)">
                     {{list.text}}
-                    <div class="secondWindow" v-if="list.text==='统计' && list.static">
-                      <div v-for="(item2,index2) in item.threeText" :key="index2">
-                        <div
-                          @mouseover="mouseoverThree('hierarchy3',index2)"
-                          @mouseleave="mouseleaveThree('hierarchy3',index2)"
-                        >
+                    <div class="secondWindow"
+                         v-if="list.text==='统计' && list.static">
+                      <div v-for="(item2,index2) in item.threeText"
+                           :key="index2">
+                        <div @mouseover="mouseoverThree('hierarchy3',index2)"
+                             @mouseleave="mouseleaveThree('hierarchy3',index2)">
                           {{item2.text}}
-                          <div class="threeWindow" v-if="item2.text==='对行运算' && item2.static">
-                            <div
-                              v-for="(item3,index3) in item.fourText"
-                              :key="index3"
-                              @click="computedLine(item3.text)"
-                            >{{item3.text}}</div>
+                          <div class="threeWindow"
+                               v-if="item2.text==='对行运算' && item2.static">
+                            <div v-for="(item3,index3) in item.fourText"
+                                 :key="index3"
+                                 @click="computedLine(item3.text)">{{item3.text}}</div>
                           </div>
-                          <div class="threeWindow" v-if="item2.text==='对列运算' && item2.static">
-                            <div
-                              v-for="(item3,index3) in item.fourText"
-                              :key="index3"
-                              @click="computedList(item3.text)"
-                            >{{item3.text}}</div>
+                          <div class="threeWindow"
+                               v-if="item2.text==='对列运算' && item2.static">
+                            <div v-for="(item3,index3) in item.fourText"
+                                 :key="index3"
+                                 @click="computedList(item3.text)">{{item3.text}}</div>
                           </div>
                         </div>
                       </div>
@@ -73,87 +72,81 @@
               </div>
             </div>
           </div>
-          <div class="data_title" v-if="cutStateSeach==='advanced'">
-            <div
-              v-for="(item,index) in titleDatas"
-              :key="index"
-              @mouseover="mouseoverAllCate('hierarchy1',index)"
-              @mouseleave="mouseleaveAllCate('hierarchy1',index)"
-              @click="clickAllCate('hierarchy1',index)"
-            >
-              <img :src="item.iconUrl" alt v-if="index<3" />
-              <div v-if="index<3" class="title_relative">
+          <div class="data_title"
+               v-if="cutStateSeach==='advanced'">
+            <div v-for="(item,index) in titleDatas"
+                 :key="index"
+                 @mouseover="mouseoverAllCate('hierarchy1',index)"
+                 @mouseleave="mouseleaveAllCate('hierarchy1',index)"
+                 @click="clickAllCate('hierarchy1',index)">
+              <img :src="item.iconUrl"
+                   alt
+                   v-if="index<3" />
+              <div v-if="index<3"
+                   class="title_relative">
                 <div>{{item.text}}</div>
               </div>
             </div>
-            <div class="searchData" @click="clickAllCate('hierarchy1','search')">查询数据</div>
+            <div class="searchData"
+                 @click="clickAllCate('hierarchy1','search')">查询数据</div>
           </div>
-          <div class="data_title" v-if="cutStateSeach==='map'">
-            <div
-              v-for="(item,index) in titleDatas"
-              :key="index"
-              @mouseover="mouseoverAllCate('hierarchy1',index)"
-              @mouseleave="mouseleaveAllCate('hierarchy1',index)"
-              @click="clickAllCate('hierarchy1',index)"
-              :style="{position:index>=4?'absolute':'','margin-left':index===3?'33rem':''}"
-            >
-              <img :src="item.iconUrl" alt v-if="index<4" />
+          <div class="data_title"
+               v-if="cutStateSeach==='map'">
+            <div v-for="(item,index) in titleDatas"
+                 :key="index"
+                 @mouseover="mouseoverAllCate('hierarchy1',index)"
+                 @mouseleave="mouseleaveAllCate('hierarchy1',index)"
+                 @click="clickAllCate('hierarchy1',index)"
+                 :style="{position:index>=4?'absolute':'','margin-left':index===3?'33rem':''}">
+              <img :src="item.iconUrl"
+                   alt
+                   v-if="index<4" />
               <span v-if="index<4">{{item.text}}</span>
             </div>
           </div>
-          <div
-            class="data_content"
-            :style="{'height':indStatic===0?'59.0125rem':'91.125rem'}"
-            v-if="cutStateSeach==='simpleness'"
-          >
-            <div
-              class="data_left"
-              :style="{'width':(left!=initValue?left>initValue?(25.375+computedNumberRem(left-initValue)):(25.375-computedNumberRem(initValue-left)):25.375)+'rem','height':'100%'}"
-            >
+          <div class="data_content"
+               :style="{'height':indStatic===0?'59.0125rem':'91.125rem'}"
+               v-if="cutStateSeach==='simpleness'">
+            <div class="data_left"
+                 :style="{'width':(left!=initValue?left>initValue?(25.375+computedNumberRem(left-initValue)):(25.375-computedNumberRem(initValue-left)):25.375)+'rem','height':'100%'}">
               <!-- 左侧导航 -->
-              <el-row class="tac" v-if="leftCateData">
+              <el-row class="tac"
+                      v-if="leftCateData">
                 <el-col :span="24">
-                  <el-menu
-                    :default-openeds="defaultSelectLies"
-                    @open="handleOpen"
-                    @close="handleClose"
-                    @select="selectActive"
-                    :unique-opened="true"
-                  >
-                    <el-submenu
-                      :index="''+index1"
-                      v-for="(item1,index1) in leftCateData"
-                      :key="index1"
-                      :style="{'background-color':$store.state.selectDataLeft?$store.state.selectDataLeft.id===item1.id?'#95CEE4':'':''}"
-                    >
+                  <el-menu :default-openeds="defaultSelectLies"
+                           @open="handleOpen"
+                           @close="handleClose"
+                           @select="selectActive"
+                           :unique-opened="true">
+                    <el-submenu :index="''+index1"
+                                v-for="(item1,index1) in leftCateData"
+                                :key="index1"
+                                :style="{'background-color':$store.state.selectDataLeft?$store.state.selectDataLeft.id===item1.id?'#95CEE4':'':''}"
+                                :class="!item1.children ? 'is-show-icon' : ''">
                       <template slot="title">{{item1.name}}</template>
-                      <el-submenu
-                        :index="index1+'-'+index2"
-                        v-for="(item2,index2) in item1.children"
-                        :key="index2"
-                        :style="{'background-color':$store.state.selectDataLeft?$store.state.selectDataLeft.id===item2.id?'#95CEE4':'':''}"
-                      >
+                      <el-submenu :index="index1+'-'+index2"
+                                  v-for="(item2,index2) in item1.children"
+                                  :key="index2"
+                                  :style="{'background-color':$store.state.selectDataLeft?$store.state.selectDataLeft.id===item2.id?'#95CEE4':'':''}"
+                                  :class="!item2.children ? 'is-show-icon' : ''">
                         <template slot="title">{{item2.name}}</template>
-                        <el-submenu
-                          :index="index1+'-'+index2+'-'+index3"
-                          v-for="(item3,index3) in item2.children"
-                          :key="index3"
-                          :style="{'background-color':$store.state.selectDataLeft?$store.state.selectDataLeft.id===item3.id?'#95CEE4':'':''}"
-                        >
+                        <el-submenu :index="index1+'-'+index2+'-'+index3"
+                                    v-for="(item3,index3) in item2.children"
+                                    :key="index3"
+                                    :style="{'background-color':$store.state.selectDataLeft?$store.state.selectDataLeft.id===item3.id?'#95CEE4':'':''}"
+                                    :class="!item3.children ? 'is-show-icon' : ''">
                           <template slot="title">{{item3.name}}</template>
-                          <el-submenu
-                            :index="index1+'-'+index2+'-'+index3+'-'+index4"
-                            v-for="(item4,index4) in item3.children"
-                            :key="index4"
-                            :style="{'background-color':$store.state.selectDataLeft?$store.state.selectDataLeft.id===item4.id?'#95CEE4':'':''}"
-                          >
+                          <el-submenu :index="index1+'-'+index2+'-'+index3+'-'+index4"
+                                      v-for="(item4,index4) in item3.children"
+                                      :key="index4"
+                                      :style="{'background-color':$store.state.selectDataLeft?$store.state.selectDataLeft.id===item4.id?'#95CEE4':'':''}"
+                                      :class="!item4.children ? 'is-show-icon' : ''">
                             <template slot="title">{{item4.name}}</template>
-                            <el-submenu
-                              :index="index1+'-'+index2+'-'+index3+'-'+index4+'-'+index5"
-                              v-for="(item5,index5) in item4.children"
-                              :key="index5"
-                              :style="{'background-color':$store.state.selectDataLeft?$store.state.selectDataLeft.id===item5.id?'#95CEE4':'':''}"
-                            >
+                            <el-submenu :index="index1+'-'+index2+'-'+index3+'-'+index4+'-'+index5"
+                                        v-for="(item5,index5) in item4.children"
+                                        :key="index5"
+                                        :style="{'background-color':$store.state.selectDataLeft?$store.state.selectDataLeft.id===item5.id?'#95CEE4':'':''}"
+                                        :class="!item5.children ? 'is-show-icon' : ''">
                               <template slot="title">{{item5.name}}</template>
                             </el-submenu>
                           </el-submenu>
@@ -173,61 +166,53 @@
               <div>..</div>
               <div>..</div>
             </div>
-            <div
-              class="data_right"
-              :style="{'width':(left!=initValue?left>initValue?(58.125-computedNumberRem(left-initValue)):(58.125+computedNumberRem(initValue-left)):58.125)+'rem','height':'100%'}"
-            >
+            <div class="data_right"
+                 :style="{'width':(left!=initValue?left>initValue?(58.125-computedNumberRem(left-initValue)):(58.125+computedNumberRem(initValue-left)):58.125)+'rem','height':'100%'}">
               <!-- 列表 -->
               <!-- 图标切换 -->
-              <ChartsCut
-                v-show="$store.state.classifyIdDataState"
-                @cutStatic="cutStatic"
-                :defaultDataRight="defaultDataRight"
-                @stateTell="stateTell"
-                @comTime="comTime"
-                :stateDataGetVal="stateDataGetVal"
-                @stateDFGHJ="stateDFGHJ"
-                @statertfResu="statertfResu"
-                :labelAreaState="labelAreaState"
-                :areaDimensionStateS="areaDimensionStateS"
-                @emmitStateAd="emmitStateAd"
-                :labelAreaStateks="labelAreaStateks"
-                :loading.sync="loading"
-                ref="childChartsCut"
-              ></ChartsCut>
+              <ChartsCut v-show="$store.state.classifyIdDataState"
+                         @cutStatic="cutStatic"
+                         :defaultDataRight="defaultDataRight"
+                         @stateTell="stateTell"
+                         @comTime="comTime"
+                         :stateDataGetVal="stateDataGetVal"
+                         @stateDFGHJ="stateDFGHJ"
+                         @statertfResu="statertfResu"
+                         :labelAreaState="labelAreaState"
+                         :areaDimensionStateS="areaDimensionStateS"
+                         @emmitStateAd="emmitStateAd"
+                         :labelAreaStateks="labelAreaStateks"
+                         :loading.sync="loading"
+                         ref="childChartsCut"></ChartsCut>
               <!-- 列表内容 -->
-              <ChartsCont
-                ref="childChartCont"
-                :indStatic="indStatic"
-                :chartsStatusMegger="chartsStatusMegger"
-                :defaultDataRight="defaultDataRight"
-                :stateTells="stateTells"
-                :statesDf="statesDf"
-                @tellAreadly="tellAreadly"
-                @prentsState="prentsState"
-                @stateDataGet="stateDataGet"
-                :showTableState="showTableState"
-                @statertyui="statertyui"
-                :areaDimensionStateS="areaDimensionStateS"
-                :advancedStates="advancedStates"
-                @tellParentsShowClos="tellParentsShowClos"
-                @tellChangeFan="tellChangeFan"
-              ></ChartsCont>
+              <ChartsCont ref="childChartCont"
+                          :indStatic="indStatic"
+                          :chartsStatusMegger="chartsStatusMegger"
+                          :defaultDataRight="defaultDataRight"
+                          :stateTells="stateTells"
+                          :statesDf="statesDf"
+                          @tellAreadly="tellAreadly"
+                          @prentsState="prentsState"
+                          @stateDataGet="stateDataGet"
+                          :showTableState="showTableState"
+                          @statertyui="statertyui"
+                          :areaDimensionStateS="areaDimensionStateS"
+                          :advancedStates="advancedStates"
+                          @tellParentsShowClos="tellParentsShowClos"
+                          @tellChangeFan="tellChangeFan"></ChartsCont>
             </div>
             <div class="container">
-              <VueDragResize
-                :isActive="true"
-                :isResizable="false"
-                :w="10"
-                :h="120"
-                :z="0"
-                :x="computedNumberPx(200)"
-                :parentLimitation="true"
-                @resizing="resizeEvents"
-                @dragging="resizeEvents"
-                axis="x"
-                style="position:relative;border:none;display: flex;flex-direction:column;justify-content: center;align-items: center;pointer-events:auto;"
-              >
+              <VueDragResize :isActive="true"
+                             :isResizable="false"
+                             :w="10"
+                             :h="120"
+                             :z="0"
+                             :x="computedNumberPx(200)"
+                             :parentLimitation="true"
+                             @resizing="resizeEvents"
+                             @dragging="resizeEvents"
+                             axis="x"
+                             style="position:relative;border:none;display: flex;flex-direction:column;justify-content: center;align-items: center;pointer-events:auto;">
                 <!-- <h3>Hello World!</h3>
                 <p>{{ top }} х {{ left }}</p>
                 <p>{{ width }} х {{ height }}</p>-->
@@ -236,11 +221,9 @@
           </div>
           <AdvancedQuery v-if="cutStateSeach==='advanced'"></AdvancedQuery>
           <MapData v-if="cutStateSeach==='map'"></MapData>
-          <div
-            class="advancedStyle"
-            v-if="cutStateSeach==='advanced'"
-            @click="clickAllCate('hierarchy1','search')"
-          >
+          <div class="advancedStyle"
+               v-if="cutStateSeach==='advanced'"
+               @click="clickAllCate('hierarchy1','search')">
             <div>查询数据</div>
           </div>
         </div>
@@ -251,24 +234,26 @@
     <!-- 指标解释 -->
     <LabelExplain v-if="$store.state.labelExplainState"></LabelExplain>
     <!-- 新增指标 -->
-    <InsertLabel v-if="$store.state.insertWindowState" @emitState="emitStatesd"></InsertLabel>
+    <InsertLabel v-if="$store.state.insertWindowState"
+                 @emitState="emitStatesd"></InsertLabel>
     <!-- 筛选 -->
-    <ScreenCom v-if="$store.state.selcettWindowState" @emitState="emitStatesd"></ScreenCom>
+    <ScreenCom v-if="$store.state.selcettWindowState"
+               @emitState="emitStatesd"></ScreenCom>
     <!-- 编辑 -->
-    <EditCom v-if="$store.state.editWindowState" @emitState="emitStatesd">></EditCom>
+    <EditCom v-if="$store.state.editWindowState"
+             @emitState="emitStatesd">></EditCom>
     <!-- 添加收藏 -->
     <AddCollect v-if="$store.state.addCollectState"></AddCollect>
     <!-- 维度转换 -->
     <!--地区-->
-    <Dimension
-      ref="childDimension"
-      v-show="$store.state.dimensionState"
-      @changeValue="changeValue"
-      @areaDimensionState="areaDimensionState"
-    ></Dimension>
+    <Dimension ref="childDimension"
+               v-show="$store.state.dimensionState"
+               @changeValue="changeValue"
+               @areaDimensionState="areaDimensionState"></Dimension>
     <!-- 维度转换 -->
     <!--非地区-->
-    <NoAreaDimension v-if="$store.state.noAreadimensionState" @changeSetZZ="changeValue"></NoAreaDimension>
+    <NoAreaDimension v-if="$store.state.noAreadimensionState"
+                     @changeSetZZ="changeValue"></NoAreaDimension>
   </div>
 </template>
 
@@ -356,7 +341,10 @@ export default {
         { text: '高级查询', iconUrl: require('../../../static/data/gjcx.png') },
         { text: '数据地图', iconUrl: require('../../../static/data/sjdt.png') },
         { text: '添加收藏', iconUrl: require('../../../static/data/tjsc.png') },
-        { text: '导出至Excel', iconUrl: require('../../../static/data/dcexcel.png') },
+        {
+          text: '导出至Excel',
+          iconUrl: require('../../../static/data/dcexcel.png')
+        },
         {
           text: '数据管理',
           iconUrl: require('../../../static/data/sjgl.png'),
@@ -413,7 +401,16 @@ export default {
       // 统计数据
       dataManageTJ: ['对行运算', '对列运算'],
       // 运算
-      dataManageTJComputed: ['SUM求和', 'x平均数', 'MAX最大值', 'MIN最小值', 'MD中位数', 'MO众数', 'S²方差', 'S标准差'],
+      dataManageTJComputed: [
+        'SUM求和',
+        'x平均数',
+        'MAX最大值',
+        'MIN最小值',
+        'MD中位数',
+        'MO众数',
+        'S²方差',
+        'S标准差'
+      ],
       // 报表管理  ================>
       reportManage: ['编辑', '转置', '维度转换', '保存默认', '恢复默认'],
       // 数据管理状态
@@ -463,7 +460,8 @@ export default {
   watch: {
     changeState (val) {
       if (val) {
-        this.chartsStatusMegger.transState = !this.chartsStatusMegger.transState
+        this.chartsStatusMegger.transState = !this.chartsStatusMegger
+          .transState
         this.$store.state.transState = this.chartsStatusMegger.transState
         this.changeState = false
       }
@@ -471,17 +469,17 @@ export default {
   },
   methods: {
     /*
-    * @desc 触发子组件 childChartCont 的downLaSelects方法
-    */
+     * @desc 触发子组件 childChartCont 的downLaSelects方法
+     */
     chuFachildChartCont () {
-      console.log(this.$refs, 'this.$refs789')
+      // console.log(this.$refs, 'this.$refs789')
       this.$nextTick(() => {
         this.$refs.childChartCont.downLaSelects()
       })
     },
     // 地区数据维度转换状态
     areaDimensionState (val) {
-      console.log(val, 'bbbval')
+      // console.log(val, 'bbbval')
       this.areaDimensionStateS = !this.areaDimensionStateS
     },
     // 维度转换非地区转置
@@ -497,16 +495,18 @@ export default {
           type: this.$route.query.type === 'area' ? 2 : 1,
           f: this.$route.query.type === 'area' ? '' : this.$route.query.type
         }
-      }).then(res => {
-        console.log(res, '左侧菜单')
-        // 请求接口完成   请求成功
-        if (res.data.code === 200) {
-          this.leftCateData = res.data.data.list
-          this.defaultSelectLie()
-        }
-      }).catch((fail) => {
-        console.log(fail)
       })
+        .then(res => {
+          // console.log(res, '左侧菜单')
+          // 请求接口完成   请求成功
+          if (res.data.code === 200) {
+            this.leftCateData = res.data.data.list
+            this.defaultSelectLie()
+          }
+        })
+        .catch(fail => {
+          // console.log(fail)
+        })
     },
     // 菜单选中配置
     handleSelect (key, keyPath) {
@@ -517,16 +517,16 @@ export default {
     },
     // 拖拽事件
     resizeEvents (newRect) {
-      console.log(newRect)
+      // console.log(newRect)
       this.width = newRect.width
       this.height = newRect.height
       this.top = newRect.top
       this.left = newRect.left
     },
     handleOpen (key, keyPath) {
-      console.log(key, keyPath, '开')
+      // console.log(key, keyPath, '开')
       this.$store.state.openOpenLeft = keyPath
-      console.log(key.split('-'))
+      // console.log(key.split('-'))
       let datart = []
       key.split('-').forEach((item, index) => {
         if (index === 0) {
@@ -535,7 +535,7 @@ export default {
           datart = datart.children[item]
         }
       })
-      console.log(datart)
+      // console.log(datart)
       this.defaultDataRight = datart
       this.$store.state.selectDataLeft = this.defaultDataRight
       this.$store.state.selectfilter = this.defaultDataRight.f
@@ -545,7 +545,7 @@ export default {
       this.$store.state.defaultShowLabelAreaState = 'normal'
     },
     handleClose (key, keyPath) {
-      console.log(key, keyPath, '关闭打印')
+      // console.log(key, keyPath, '关闭打印')
     },
     selectActive (key, keyPath) {
       // console.log(key, keyPath)
@@ -595,7 +595,17 @@ export default {
           break
         case 2:
           if (this.$route.query.type === 'area') {
-            this.cutStateSeach = 'map'
+            // eslint-disable-next-line no-constant-condition
+            let isShowMap = 0
+            if (isShowMap) {
+              this.$store.state.advancedSearchState = false
+              // alert('地图功能对国外数据无效！')
+              this.$alert('地图功能对国外数据无效！', '温馨提示', {
+                confirmButtonText: '确定'
+              })
+            } else {
+              this.cutStateSeach = 'map'
+            }
           } else {
             this.$store.state.advancedSearchState = false
             // alert('地图功能对非地区数据无效！')
@@ -604,7 +614,7 @@ export default {
             })
           }
           break
-        case 3:// 添加收藏
+        case 3: // 添加收藏
           if (this.$store.state.transBefore) {
             this.$store.state.addCollectState = true
           } else {
@@ -613,14 +623,22 @@ export default {
             })
           }
           break
-        case 4:// 导出至excel！！
+        case 4: // 导出至excel！！
           if (this.$store.state.transBefore) {
             let brt = new ComputedData()
             let objData = null
             if (this.indStatic === 0) {
-              objData = brt.exportDataAll(JSON.parse(JSON.stringify(this.$store.state.tableData)), JSON.parse(JSON.stringify(this.$store.state.tableLine)))
+              objData = brt.exportDataAll(
+                JSON.parse(JSON.stringify(this.$store.state.tableData)),
+                JSON.parse(JSON.stringify(this.$store.state.tableLine))
+              )
             } else {
-              objData = brt.insertCollectS(JSON.parse(JSON.stringify(this.$store.state.tableData)), JSON.parse(JSON.stringify(this.$store.state.tableLine)), JSON.parse(JSON.stringify(this.$store.state.listInputVal)), JSON.parse(JSON.stringify(this.$store.state.lineInputVal)))
+              objData = brt.insertCollectS(
+                JSON.parse(JSON.stringify(this.$store.state.tableData)),
+                JSON.parse(JSON.stringify(this.$store.state.tableLine)),
+                JSON.parse(JSON.stringify(this.$store.state.listInputVal)),
+                JSON.parse(JSON.stringify(this.$store.state.lineInputVal))
+              )
             }
             // 调用接口导出至excel
             this.$axios({
@@ -631,22 +649,26 @@ export default {
                 tableData: objData.tableData,
                 header: objData.header
               },
-              responseType: 'blob'// 防止接收文件流乱码  格式blob
-            }).then(res => {
-              console.log(res, '导出至excel！！')
-              // 请求接口完成   请求成功
-              if (res.status === 200) {
-                const a = document.createElement('a')
-                a.download = res.headers['content-disposition'].split('"')[1]
-                a.style.display = 'none'
-                a.href = window.URL.createObjectURL(res.data)
-                a.click()
-                a.remove()
-                window.URL.revokeObjectURL(window.URL.createObjectURL(res.data))
-              }
-            }).catch((fail) => {
-              console.log(fail)
+              responseType: 'blob' // 防止接收文件流乱码  格式blob
             })
+              .then(res => {
+                // console.log(res, '导出至excel！！')
+                // 请求接口完成   请求成功
+                if (res.status === 200) {
+                  const a = document.createElement('a')
+                  a.download = res.headers['content-disposition'].split('"')[1]
+                  a.style.display = 'none'
+                  a.href = window.URL.createObjectURL(res.data)
+                  a.click()
+                  a.remove()
+                  window.URL.revokeObjectURL(
+                    window.URL.createObjectURL(res.data)
+                  )
+                }
+              })
+              .catch(fail => {
+                // console.log(fail)
+              })
           } else {
             this.$alert('暂无数据，无法进行导出操作！', '温馨提示', {
               confirmButtonText: '确定'
@@ -657,9 +679,9 @@ export default {
           break
         case 6:
           break
-        case 'search':// 调接进行高级查询
+        case 'search': // 调接进行高级查询
           // 调用接口查询高级查询的数据
-          console.log(this.$store.state.advanceData)
+          // console.log(this.$store.state.advanceData)
           if (this.$store.state.advanceData.length < 1) {
             // alert('筛选数据数据不能少于4条！')
             this.$alert('筛选数据数据不能少于1条！', '温馨提示', {
@@ -676,16 +698,30 @@ export default {
           that.advancedStates = true
           // 调用子组件 的方法渲染高级查询数据
           that.$store.state.advancedSearchState = true
-          console.log(this.$store.state.dataArealabelTime, 'this.$store.state.dataArealabelTime')
-          console.log(this.$store.state.advanceData, 'this.$store.state.advanceData')
-          this.$store.state.advancedSelectClassfiid = this.$store.state.advanceData.map((item, index) => {
-            return item.classify_id
-          })
+          // console.log(
+          //   this.$store.state.dataArealabelTime,
+          //   'this.$store.state.dataArealabelTime'
+          // )
+          // console.log(
+          //   this.$store.state.advanceData,
+          //   'this.$store.state.advanceData'
+          // )
+          this.$store.state.advancedSelectClassfiid = this.$store.state.advanceData.map(
+            (item, index) => {
+              return item.classify_id
+            }
+          )
           this.$nextTick(() => {
             this.$store.state.defaultShowLabelAreaState = 'normal'
-            console.log(this.$store.state.advancedSelectClassfiid, 'this.$store.state.advancedSelectClassfiid')
+            // console.log(
+            //   this.$store.state.advancedSelectClassfiid,
+            //   'this.$store.state.advancedSelectClassfiid'
+            // )
             // 左侧菜单数据
-            this.$refs.childChartsCut.searchSelect(this.$store.state.selectDataLeft.f, null)
+            this.$refs.childChartsCut.searchSelect(
+              this.$store.state.selectDataLeft.f,
+              null
+            )
             this.getCateData()
             this.childChartContShow(this.$store.state.advancedSelectClassfiid)
             this.$store.state.labelIndexName = this.$store.state.advanceData[0].nameText
@@ -716,7 +752,10 @@ export default {
       switch (textType) {
         case '新增指标':
           this.cutStatic(0)
-          console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
+          // console.log(
+          //   this.$store.state.transBefore,
+          //   'this.$store.state.transBefore'
+          // )
           if (this.$store.state.transBefore) {
             this.$store.state.insertWindowState = true
           } else {
@@ -735,7 +774,7 @@ export default {
             })
           }
           break
-        case '恢复':// 恢复
+        case '恢复': // 恢复
           this.cutStatic(0)
           if (this.$store.state.transBefore) {
             this.$router.go(0)
@@ -745,106 +784,165 @@ export default {
             })
           }
           break
-        case '清除空行空列':// 清除空行空列
+        case '清除空行空列': // 清除空行空列
           this.cutStatic(0)
           // this.$router.go(0)
           // console.log(this.$store.state.transBefore, 'this.$store.state.transBefore')
           if (this.$store.state.transBefore) {
             if (this.$route.query.type === 'area') {
               // 先过滤每一行
-              let firstHang = []// 过滤掉的下标=====》地区
-              this.$store.state.transBefore.transBeforeAreaData = this.$store.state.transBefore.transBeforeAreaData.filter((item, index) => {
-                if (item.every((item, index) => { return item === '' })) {
-                  firstHang.push(index)
+              let firstHang = [] // 过滤掉的下标=====》地区
+              this.$store.state.transBefore.transBeforeAreaData = this.$store.state.transBefore.transBeforeAreaData.filter(
+                (item, index) => {
+                  if (
+                    item.every((item, index) => {
+                      return item === ''
+                    })
+                  ) {
+                    firstHang.push(index)
+                  }
+                  return (
+                    !item.every((item, index) => {
+                      return item === ''
+                    }) === true
+                  )
                 }
-                return !item.every((item, index) => {
-                  return item === ''
-                }) === true
-              })
+              )
               // 在过滤每一列
               // 行列转置
               let brrCe = this.$store.state.transBefore.transBeforeAreaData
-              this.$store.state.transBefore.transBeforeAreaData = brrCe[0].map(function (col, index) {
-                return brrCe.map((row, key) => {
-                  return row[index]
-                })
-              })
-              // 在过滤每一行
-              let secendHang = []// 过滤掉的下标=====》时间
-              this.$store.state.transBefore.transBeforeAreaData = this.$store.state.transBefore.transBeforeAreaData.filter((item, index) => {
-                if (item.every((item, index) => { return item === '' })) {
-                  secendHang.push(index)
+              this.$store.state.transBefore.transBeforeAreaData = brrCe[0].map(
+                function (col, index) {
+                  return brrCe.map((row, key) => {
+                    return row[index]
+                  })
                 }
-                return !item.every((item, index) => {
-                  return item === ''
-                }) === true
-              })
+              )
+              // 在过滤每一行
+              let secendHang = [] // 过滤掉的下标=====》时间
+              this.$store.state.transBefore.transBeforeAreaData = this.$store.state.transBefore.transBeforeAreaData.filter(
+                (item, index) => {
+                  if (
+                    item.every((item, index) => {
+                      return item === ''
+                    })
+                  ) {
+                    secendHang.push(index)
+                  }
+                  return (
+                    !item.every((item, index) => {
+                      return item === ''
+                    }) === true
+                  )
+                }
+              )
               // 行列转置
               let arrCe = this.$store.state.transBefore.transBeforeAreaData
-              this.$store.state.transBefore.transBeforeAreaData = arrCe[0].map(function (col, index) {
-                return arrCe.map((row, key) => {
-                  return row[index]
-                })
-              })
-              // 将时间和地区名过滤掉
-              this.$store.state.transBefore.areaName = this.$store.state.transBefore.areaName.filter((item, index) => {
-                return firstHang.indexOf(index) === -1
-              })
-              this.$store.state.transBefore.timeArr = this.$store.state.transBefore.timeArr.filter((item, index) => {
-                return secendHang.indexOf(index) === -1
-              })
-              console.log(this.$store.state.transBefore, 'this.$store.state.transBefore.transBeforeAreaData')
-              this.showTableState = true
-            } else { // 非地区数据
-              // 先过滤每一行
-              let firstHang = []// 过滤掉的下标=====》地区
-              this.$store.state.transBefore.transBeforeTermsData = this.$store.state.transBefore.transBeforeTermsData.filter((item, index) => {
-                if (item.every((item, index) => { return item === '' })) {
-                  firstHang.push(index)
+              this.$store.state.transBefore.transBeforeAreaData = arrCe[0].map(
+                function (col, index) {
+                  return arrCe.map((row, key) => {
+                    return row[index]
+                  })
                 }
-                return !item.every((item, index) => {
-                  return item === ''
-                }) === true
-              })
+              )
+              // 将时间和地区名过滤掉
+              this.$store.state.transBefore.areaName = this.$store.state.transBefore.areaName.filter(
+                (item, index) => {
+                  return firstHang.indexOf(index) === -1
+                }
+              )
+              this.$store.state.transBefore.timeArr = this.$store.state.transBefore.timeArr.filter(
+                (item, index) => {
+                  return secendHang.indexOf(index) === -1
+                }
+              )
+              // console.log(
+              //   this.$store.state.transBefore,
+              //   'this.$store.state.transBefore.transBeforeAreaData'
+              // )
+              this.showTableState = true
+            } else {
+              // 非地区数据
+              // 先过滤每一行
+              let firstHang = [] // 过滤掉的下标=====》地区
+              this.$store.state.transBefore.transBeforeTermsData = this.$store.state.transBefore.transBeforeTermsData.filter(
+                (item, index) => {
+                  if (
+                    item.every((item, index) => {
+                      return item === ''
+                    })
+                  ) {
+                    firstHang.push(index)
+                  }
+                  return (
+                    !item.every((item, index) => {
+                      return item === ''
+                    }) === true
+                  )
+                }
+              )
               // 在过滤每一列
               // 行列转置
               let brrCe = this.$store.state.transBefore.transBeforeTermsData
-              this.$store.state.transBefore.transBeforeTermsData = brrCe[0].map(function (col, index) {
-                return brrCe.map((row, key) => {
-                  return row[index]
-                })
-              })
-              // 在过滤每一行
-              let secendHang = []// 过滤掉的下标=====》时间
-              this.$store.state.transBefore.transBeforeTermsData = this.$store.state.transBefore.transBeforeTermsData.filter((item, index) => {
-                if (item.every((item, index) => { return item === '' })) {
-                  secendHang.push(index)
+              this.$store.state.transBefore.transBeforeTermsData = brrCe[0].map(
+                function (col, index) {
+                  return brrCe.map((row, key) => {
+                    return row[index]
+                  })
                 }
-                return !item.every((item, index) => {
-                  return item === ''
-                }) === true
-              })
+              )
+              // 在过滤每一行
+              let secendHang = [] // 过滤掉的下标=====》时间
+              this.$store.state.transBefore.transBeforeTermsData = this.$store.state.transBefore.transBeforeTermsData.filter(
+                (item, index) => {
+                  if (
+                    item.every((item, index) => {
+                      return item === ''
+                    })
+                  ) {
+                    secendHang.push(index)
+                  }
+                  return (
+                    !item.every((item, index) => {
+                      return item === ''
+                    }) === true
+                  )
+                }
+              )
               // 行列转置
               let arrCe = this.$store.state.transBefore.transBeforeTermsData
-              this.$store.state.transBefore.transBeforeTermsData = arrCe[0].map(function (col, index) {
-                return arrCe.map((row, key) => {
-                  return row[index]
-                })
-              })
+              this.$store.state.transBefore.transBeforeTermsData = arrCe[0].map(
+                function (col, index) {
+                  return arrCe.map((row, key) => {
+                    return row[index]
+                  })
+                }
+              )
               // 将时间和地区名过滤掉
-              this.$store.state.transBefore.termsName = this.$store.state.transBefore.termsName.filter((item, index) => {
-                return firstHang.indexOf(index) === -1
-              })
-              this.$store.state.transBefore.termsExplain = this.$store.state.transBefore.termsExplain.filter((item, index) => {
-                return firstHang.indexOf(index) === -1
-              })
-              this.$store.state.transBefore.dataSource = this.$store.state.transBefore.dataSource.filter((item, index) => {
-                return firstHang.indexOf(index) === -1
-              })
-              this.$store.state.transBefore.timeArr = this.$store.state.transBefore.timeArr.filter((item, index) => {
-                return secendHang.indexOf(index) === -1
-              })
-              console.log(this.$store.state.transBefore, 'this.$store.state.transBefore.transBeforeAreaData')
+              this.$store.state.transBefore.termsName = this.$store.state.transBefore.termsName.filter(
+                (item, index) => {
+                  return firstHang.indexOf(index) === -1
+                }
+              )
+              this.$store.state.transBefore.termsExplain = this.$store.state.transBefore.termsExplain.filter(
+                (item, index) => {
+                  return firstHang.indexOf(index) === -1
+                }
+              )
+              this.$store.state.transBefore.dataSource = this.$store.state.transBefore.dataSource.filter(
+                (item, index) => {
+                  return firstHang.indexOf(index) === -1
+                }
+              )
+              this.$store.state.transBefore.timeArr = this.$store.state.transBefore.timeArr.filter(
+                (item, index) => {
+                  return secendHang.indexOf(index) === -1
+                }
+              )
+              // console.log(
+              //   this.$store.state.transBefore,
+              //   'this.$store.state.transBefore.transBeforeAreaData'
+              // )
               this.showTableState = true
             }
           } else {
@@ -865,6 +963,8 @@ export default {
           break
         case '转置':
           // 是否点击转置
+		  this.$store.state.transClickState = true
+		  console.log(this.$store.state.transClickState, "这是点击的时候")
           this.$store.state.yesNoClickZZ = !this.$store.state.yesNoClickZZ
           if (this.$store.state.befaultAfter === 'zz') {
             this.$store.state.befaultAfter = 'no'
@@ -883,22 +983,30 @@ export default {
               // })
               this.$store.state.transClickState = true
             }
-            console.log(this.$store.state.transBefore, 'this.$store.state.transBefore0022555')
+            // console.log(
+            //   this.$store.state.transBefore,
+            //   'this.$store.state.transBefore0022555'
+            // )
             // 改变转置状态
             let zhuanChange = {
               row: this.$store.state.SelecttDimension.col,
               col: this.$store.state.SelecttDimension.row
             }
+            // console.log(zhuanChange, '转之的状态')
             this.$store.state.SelecttDimension = zhuanChange
-            console.log(this.$store.state.SelecttDimension, '非地区数据维度转换=》转置')
             this.change3Ds()
-            this.chartsStatusMegger.transState = !this.chartsStatusMegger.transState
+            this.chartsStatusMegger.transState = !this.chartsStatusMegger
+              .transState
             this.$store.state.transState = this.chartsStatusMegger.transState
           } else {
             this.$alert('暂无数据，转置功能无法使用！', '温馨提示', {
               confirmButtonText: '确定'
             })
           }
+          // console.log(
+          //   this.$store.state.SelecttDimension,
+          //   '非地区数据维度转换=》转置'
+          // )
           // this.$refs.childChartCont.lieWidthComputed()
           break
         case '维度转换':
@@ -915,18 +1023,30 @@ export default {
             })
           }
           break
-        case '保存默认':// 将分类id 和 分类数据存入本地
+        case '保存默认': // 将分类id 和 分类数据存入本地
           this.cutStatic(0)
+          // 点击保存后清除点击状态
+          this.$store.state.transClickState = false
+          // console.log(this.$store.state.SelecttDimension, '保存默认转置')
           // 获取本地保存数据
           if (this.$store.state.transBefore) {
-            if (this.$route.query.type !== 'area') { // 非地区数据
-              if (!this.$store.state.advancedSearchState) { // 非高级查询数据存默认数据
-                if (JSON.parse(localStorage.getItem('classFiyData'))) { // 本地存在
-                  let arrtsBGY = JSON.parse(localStorage.getItem('classFiyData'))
-                  if (!arrtsBGY.find(item => item.type === this.$route.query.type)) {
+            if (this.$route.query.type !== 'area') {
+              // 非地区数据
+              localStorage.setItem('dateDimension', JSON.stringify(this.$store.state.SelecttDimension))
+              if (!this.$store.state.advancedSearchState) {
+                // 非高级查询数据存默认数据
+                if (JSON.parse(localStorage.getItem('classFiyData'))) {
+                  // 本地存在
+                  let arrtsBGY = JSON.parse(
+                    localStorage.getItem('classFiyData')
+                  )
+                  if (
+                    !arrtsBGY.find(item => item.type === this.$route.query.type)
+                  ) {
                     arrtsBGY.push({
                       type: this.$route.query.type,
-                      allNochangeInitData: this.$store.state.allNochangeInitData,
+                      allNochangeInitData: this.$store.state
+                        .allNochangeInitData,
                       transBefore: this.$store.state.transBefore,
                       selectDate: {
                         time: this.$store.state.newSelectTime
@@ -935,98 +1055,177 @@ export default {
                       SelecttDimension: this.$store.state.SelecttDimension, // 左侧选中
                       advancedSearchState: this.$store.state.advancedSearchState
                     })
-                    localStorage.setItem('classFiyData', JSON.stringify(arrtsBGY))
+                    localStorage.setItem(
+                      'classFiyData',
+                      JSON.stringify(arrtsBGY)
+                    )
                   } else {
-                    console.log('走这里')
-                    arrtsBGY.find(item => item.type === this.$route.query.type).transBefore = this.$store.state.transBefore
-                    arrtsBGY.find(item => item.type === this.$route.query.type).allNochangeInitData = this.$store.state.allNochangeInitData
-                    arrtsBGY.find(item => item.type === this.$route.query.type).selectDate = {
+                    // console.log('走这里')
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).transBefore = this.$store.state.transBefore
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).allNochangeInitData = this.$store.state.allNochangeInitData
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).selectDate = {
                       time: this.$store.state.newSelectTime
                     }
-                    arrtsBGY.find(item => item.type === this.$route.query.type).selectDataLeft = this.$store.state.selectDataLeft
-                    arrtsBGY.find(item => item.type === this.$route.query.type).SelecttDimension = this.$store.state.SelecttDimension
-                    arrtsBGY.find(item => item.type === this.$route.query.type).advancedSearchState = this.$store.state.advancedSearchState
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).selectDataLeft = this.$store.state.selectDataLeft
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).SelecttDimension = this.$store.state.SelecttDimension
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).advancedSearchState = this.$store.state.advancedSearchState
 
-                    localStorage.setItem('classFiyData', JSON.stringify(arrtsBGY))
+                    localStorage.setItem(
+                      'classFiyData',
+                      JSON.stringify(arrtsBGY)
+                    )
                   }
-                } else { // 本地不存在
-                  localStorage.setItem('classFiyData', JSON.stringify([{
-                    type: this.$store.state.selectDataLeft.f,
-                    allNochangeInitData: this.$store.state.allNochangeInitData,
-                    transBefore: this.$store.state.transBefore,
-                    selectDate: {
-                      time: this.$store.state.newSelectTime
-                    },
-                    selectDataLeft: this.$store.state.selectDataLeft, // 左侧选中
-                    SelecttDimension: this.$store.state.SelecttDimension,
-                    advancedSearchState: this.$store.state.advancedSearchState
-                  }]))
+                } else {
+                  // 本地不存在
+                  localStorage.setItem(
+                    'classFiyData',
+                    JSON.stringify([
+                      {
+                        type: this.$store.state.selectDataLeft.f,
+                        allNochangeInitData: this.$store.state
+                          .allNochangeInitData,
+                        transBefore: this.$store.state.transBefore,
+                        selectDate: {
+                          time: this.$store.state.newSelectTime
+                        },
+                        selectDataLeft: this.$store.state.selectDataLeft, // 左侧选中
+                        SelecttDimension: this.$store.state.SelecttDimension,
+                        advancedSearchState: this.$store.state
+                          .advancedSearchState
+                      }
+                    ])
+                  )
                 }
-              } else { // 高级查询保存默认数据
-                if (JSON.parse(localStorage.getItem('classFiyData'))) { // 本地存在
-                  let arrtsBGY = JSON.parse(localStorage.getItem('classFiyData'))
-                  if (!arrtsBGY.find(item => item.type === this.$route.query.type)) {
+              } else {
+                // 高级查询保存默认数据
+                if (JSON.parse(localStorage.getItem('classFiyData'))) {
+                  // 本地存在
+                  let arrtsBGY = JSON.parse(
+                    localStorage.getItem('classFiyData')
+                  )
+                  if (
+                    !arrtsBGY.find(item => item.type === this.$route.query.type)
+                  ) {
                     arrtsBGY.push({
                       type: this.$route.query.type,
-                      allNochangeInitData: this.$store.state.allNochangeInitData,
+                      allNochangeInitData: this.$store.state
+                        .allNochangeInitData,
                       transBefore: this.$store.state.transBefore,
                       selectDate: {
                         time: this.$store.state.newSelectTime
                       },
                       selectDataLeft: this.$store.state.selectDataLeft, // 左侧选中
                       SelecttDimension: this.$store.state.SelecttDimension, // 左侧选中
-                      advancedSearchState: this.$store.state.advancedSearchState, // 高级查询状态
+                      advancedSearchState: this.$store.state
+                        .advancedSearchState, // 高级查询状态
                       advanceData: this.$store.state.advanceData, // 高级查询数据
                       areaIndexName: this.$store.state.areaIndexName, // 地区名称
                       labelIndexName: this.$store.state.labelIndexName // 指标名称
                     })
-                    localStorage.setItem('classFiyData', JSON.stringify(arrtsBGY))
+                    localStorage.setItem(
+                      'classFiyData',
+                      JSON.stringify(arrtsBGY)
+                    )
                   } else {
-                    console.log('走这里')
-                    arrtsBGY.find(item => item.type === this.$route.query.type).transBefore = this.$store.state.transBefore
-                    arrtsBGY.find(item => item.type === this.$route.query.type).allNochangeInitData = this.$store.state.allNochangeInitData
-                    arrtsBGY.find(item => item.type === this.$route.query.type).selectDate = {
+                    // console.log('走这里')
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).transBefore = this.$store.state.transBefore
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).allNochangeInitData = this.$store.state.allNochangeInitData
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).selectDate = {
                       time: this.$store.state.newSelectTime
                     }
-                    arrtsBGY.find(item => item.type === this.$route.query.type).selectDataLeft = this.$store.state.selectDataLeft
-                    arrtsBGY.find(item => item.type === this.$route.query.type).SelecttDimension = this.$store.state.SelecttDimension
-                    arrtsBGY.find(item => item.type === this.$route.query.type).advancedSearchState = this.$store.state.advancedSearchState
-                    arrtsBGY.find(item => item.type === this.$route.query.type).advanceData = this.$store.state.advanceData
-                    arrtsBGY.find(item => item.type === this.$route.query.type).areaIndexName = this.$store.state.areaIndexName
-                    arrtsBGY.find(item => item.type === this.$route.query.type).labelIndexName = this.$store.state.labelIndexName
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).selectDataLeft = this.$store.state.selectDataLeft
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).SelecttDimension = this.$store.state.SelecttDimension
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).advancedSearchState = this.$store.state.advancedSearchState
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).advanceData = this.$store.state.advanceData
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).areaIndexName = this.$store.state.areaIndexName
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).labelIndexName = this.$store.state.labelIndexName
 
-                    localStorage.setItem('classFiyData', JSON.stringify(arrtsBGY))
+                    localStorage.setItem(
+                      'classFiyData',
+                      JSON.stringify(arrtsBGY)
+                    )
                   }
-                } else { // 本地不存在
-                  localStorage.setItem('classFiyData', JSON.stringify([{
-                    type: this.$store.state.selectDataLeft.f,
-                    allNochangeInitData: this.$store.state.allNochangeInitData,
-                    transBefore: this.$store.state.transBefore,
-                    selectDate: {
-                      time: this.$store.state.newSelectTime
-                    },
-                    selectDataLeft: this.$store.state.selectDataLeft, // 左侧选中
-                    SelecttDimension: this.$store.state.SelecttDimension,
-                    advancedSearchState: this.$store.state.advancedSearchState, // 高级查询状态
-                    advanceData: this.$store.state.advanceData, // 高级查询数据
-                    areaIndexName: this.$store.state.areaIndexName, // 地区名称
-                    labelIndexName: this.$store.state.labelIndexName // 指标名称
-                  }]))
+                } else {
+                  // 本地不存在
+                  localStorage.setItem(
+                    'classFiyData',
+                    JSON.stringify([
+                      {
+                        type: this.$store.state.selectDataLeft.f,
+                        allNochangeInitData: this.$store.state
+                          .allNochangeInitData,
+                        transBefore: this.$store.state.transBefore,
+                        selectDate: {
+                          time: this.$store.state.newSelectTime
+                        },
+                        selectDataLeft: this.$store.state.selectDataLeft, // 左侧选中
+                        SelecttDimension: this.$store.state.SelecttDimension,
+                        advancedSearchState: this.$store.state
+                          .advancedSearchState, // 高级查询状态
+                        advanceData: this.$store.state.advanceData, // 高级查询数据
+                        areaIndexName: this.$store.state.areaIndexName, // 地区名称
+                        labelIndexName: this.$store.state.labelIndexName // 指标名称
+                      }
+                    ])
+                  )
                 }
               }
-            } else { // 地区数据
-              if (!this.$store.state.advancedSearchState) { // 非高级查询数据存默认数据
-                if (JSON.parse(localStorage.getItem('classFiyData'))) { // 本地存在
-                  let arrtsBGY = JSON.parse(localStorage.getItem('classFiyData'))
-                  if (!arrtsBGY.find(item => item.type === this.$route.query.type)) {
-                    let btyData = JSON.parse(JSON.stringify(this.$store.state.allNochangeInitData))
+            } else {
+              // 地区数据
+              // console.log(this.$store.state.SelecttDimension, '保存地区数据')
+              localStorage.setItem('areaDimension', JSON.stringify(this.$store.state.SelecttDimension))
+              if (!this.$store.state.advancedSearchState) {
+                // 非高级查询数据存默认数据
+                if (JSON.parse(localStorage.getItem('classFiyData'))) {
+                  // 本地存在
+                  let arrtsBGY = JSON.parse(
+                    localStorage.getItem('classFiyData')
+                  )
+                  if (
+                    !arrtsBGY.find(item => item.type === this.$route.query.type)
+                  ) {
+                    let btyData = JSON.parse(
+                      JSON.stringify(this.$store.state.allNochangeInitData)
+                    )
                     if (this.$store.state.yesNoClickZZ) {
                       let btyAreaData = btyData.transBeforeAreaData
-                      btyData.transBeforeAreaData = btyAreaData[0].map((col, index) => {
-                        return btyAreaData.map((row, key) => {
-                          return row[index]
-                        })
-                      })
+                      btyData.transBeforeAreaData = btyAreaData[0].map(
+                        (col, index) => {
+                          return btyAreaData.map((row, key) => {
+                            return row[index]
+                          })
+                        }
+                      )
                     }
                     arrtsBGY.push({
                       type: this.$route.query.type,
@@ -1034,7 +1233,13 @@ export default {
                       transBefore: btyData,
                       selectDate: {
                         time: this.$store.state.newSelectTime,
-                        sequence: this.$store.state.yesNoClickChange ? { sequenceCont: this.$store.state.newSelectChangeData, sequenceState: 3 } : this.$store.state.newSelectLabelArea
+                        sequence: this.$store.state.yesNoClickChange
+                          ? {
+                            sequenceCont: this.$store.state
+                              .newSelectChangeData,
+                            sequenceState: 3
+                          }
+                          : this.$store.state.newSelectLabelArea
                       },
                       selectDataLeft: this.$store.state.selectDataLeft, // 左侧选中
                       SelecttDimension: this.$store.state.SelecttDimension,
@@ -1042,70 +1247,128 @@ export default {
                       yesNoClickZZ: this.$store.state.yesNoClickZZ, // 转置是否被点击
                       advancedSearchState: this.$store.state.advancedSearchState
                     })
-                    localStorage.setItem('classFiyData', JSON.stringify(arrtsBGY))
+                    localStorage.setItem(
+                      'classFiyData',
+                      JSON.stringify(arrtsBGY)
+                    )
                   } else {
-                    console.log('走这里')
-                    let btyData = JSON.parse(JSON.stringify(this.$store.state.allNochangeInitData))
+                    // console.log('走这里')
+                    let btyData = JSON.parse(
+                      JSON.stringify(this.$store.state.allNochangeInitData)
+                    )
                     if (this.$store.state.yesNoClickZZ) {
                       let btyAreaData = btyData.transBeforeAreaData
-                      btyData.transBeforeAreaData = btyAreaData[0].map((col, index) => {
-                        return btyAreaData.map((row, key) => {
-                          return row[index]
-                        })
-                      })
+                      btyData.transBeforeAreaData = btyAreaData[0].map(
+                        (col, index) => {
+                          return btyAreaData.map((row, key) => {
+                            return row[index]
+                          })
+                        }
+                      )
                     }
-                    arrtsBGY.find(item => item.type === this.$route.query.type).transBefore = btyData
-                    arrtsBGY.find(item => item.type === this.$route.query.type).allNochangeInitData = btyData
-                    arrtsBGY.find(item => item.type === this.$route.query.type).selectDate = {
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).transBefore = btyData
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).allNochangeInitData = btyData
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).selectDate = {
                       time: this.$store.state.newSelectTime,
-                      sequence: this.$store.state.yesNoClickChange ? { sequenceCont: this.$store.state.newSelectChangeData, sequenceState: 3 } : this.$store.state.newSelectLabelArea
+                      sequence: this.$store.state.yesNoClickChange
+                        ? {
+                          sequenceCont: this.$store.state.newSelectChangeData,
+                          sequenceState: 3
+                        }
+                        : this.$store.state.newSelectLabelArea
                     }
-                    arrtsBGY.find(item => item.type === this.$route.query.type).selectDataLeft = this.$store.state.selectDataLeft
-                    arrtsBGY.find(item => item.type === this.$route.query.type).SelecttDimension = this.$store.state.SelecttDimension
-                    arrtsBGY.find(item => item.type === this.$route.query.type).yesNoClickChange = this.$store.state.yesNoClickChange
-                    arrtsBGY.find(item => item.type === this.$route.query.type).yesNoClickZZ = this.$store.state.yesNoClickZZ
-                    arrtsBGY.find(item => item.type === this.$route.query.type).advancedSearchState = this.$store.state.advancedSearchState
-                    localStorage.setItem('classFiyData', JSON.stringify(arrtsBGY))
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).selectDataLeft = this.$store.state.selectDataLeft
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).SelecttDimension = this.$store.state.SelecttDimension
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).yesNoClickChange = this.$store.state.yesNoClickChange
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).yesNoClickZZ = this.$store.state.yesNoClickZZ
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).advancedSearchState = this.$store.state.advancedSearchState
+                    localStorage.setItem(
+                      'classFiyData',
+                      JSON.stringify(arrtsBGY)
+                    )
                   }
-                } else { // 本地不存在
-                  let btyData = JSON.parse(JSON.stringify(this.$store.state.allNochangeInitData))
+                } else {
+                  // 本地不存在
+                  let btyData = JSON.parse(
+                    JSON.stringify(this.$store.state.allNochangeInitData)
+                  )
                   if (this.$store.state.yesNoClickZZ) {
                     let btyAreaData = btyData.transBeforeAreaData
-                    btyData.transBeforeAreaData = btyAreaData[0].map((col, index) => {
-                      return btyAreaData.map((row, key) => {
-                        return row[index]
-                      })
-                    })
-                  }
-                  localStorage.setItem('classFiyData', JSON.stringify([{
-                    type: this.$route.query.type,
-                    allNochangeInitData: btyData,
-                    transBefore: btyData,
-                    selectDate: {
-                      time: this.$store.state.newSelectTime,
-                      sequence: this.$store.state.yesNoClickChange ? { sequenceCont: this.$store.state.newSelectChangeData, sequenceState: 3 } : this.$store.state.newSelectLabelArea
-                      // sequenceCont:,//序列选中内容
-                      // sequenceState://序列状态 筛选指标   筛选地区
-                    },
-                    selectDataLeft: this.$store.state.selectDataLeft, // 左侧选中
-                    SelecttDimension: this.$store.state.SelecttDimension, // 行列代表的是指标、地区、时间
-                    yesNoClickChange: this.$store.state.yesNoClickChange, // 维度转换是否被点击
-                    yesNoClickZZ: this.$store.state.yesNoClickZZ, // 维度转换是否被点击
-                    advancedSearchState: this.$store.state.advancedSearchState
-                  }]))
-                }
-              } else { // 高级查询数据存默认数据
-                if (JSON.parse(localStorage.getItem('classFiyData'))) { // 本地存在
-                  let arrtsBGY = JSON.parse(localStorage.getItem('classFiyData'))
-                  if (!arrtsBGY.find(item => item.type === this.$route.query.type)) {
-                    let btyData = JSON.parse(JSON.stringify(this.$store.state.allNochangeInitData))
-                    if (this.$store.state.yesNoClickZZ) {
-                      let btyAreaData = btyData.transBeforeAreaData
-                      btyData.transBeforeAreaData = btyAreaData[0].map((col, index) => {
+                    btyData.transBeforeAreaData = btyAreaData[0].map(
+                      (col, index) => {
                         return btyAreaData.map((row, key) => {
                           return row[index]
                         })
-                      })
+                      }
+                    )
+                  }
+                  localStorage.setItem(
+                    'classFiyData',
+                    JSON.stringify([
+                      {
+                        type: this.$route.query.type,
+                        allNochangeInitData: btyData,
+                        transBefore: btyData,
+                        selectDate: {
+                          time: this.$store.state.newSelectTime,
+                          sequence: this.$store.state.yesNoClickChange
+                            ? {
+                              sequenceCont: this.$store.state
+                                .newSelectChangeData,
+                              sequenceState: 3
+                            }
+                            : this.$store.state.newSelectLabelArea
+                          // sequenceCont:,//序列选中内容
+                          // sequenceState://序列状态 筛选指标   筛选地区
+                        },
+                        selectDataLeft: this.$store.state.selectDataLeft, // 左侧选中
+                        SelecttDimension: this.$store.state.SelecttDimension, // 行列代表的是指标、地区、时间
+                        yesNoClickChange: this.$store.state.yesNoClickChange, // 维度转换是否被点击
+                        yesNoClickZZ: this.$store.state.yesNoClickZZ, // 维度转换是否被点击
+                        advancedSearchState: this.$store.state
+                          .advancedSearchState
+                      }
+                    ])
+                  )
+                }
+              } else {
+                // 高级查询数据存默认数据
+                if (JSON.parse(localStorage.getItem('classFiyData'))) {
+                  // 本地存在
+                  let arrtsBGY = JSON.parse(
+                    localStorage.getItem('classFiyData')
+                  )
+                  if (
+                    !arrtsBGY.find(item => item.type === this.$route.query.type)
+                  ) {
+                    let btyData = JSON.parse(
+                      JSON.stringify(this.$store.state.allNochangeInitData)
+                    )
+                    if (this.$store.state.yesNoClickZZ) {
+                      let btyAreaData = btyData.transBeforeAreaData
+                      btyData.transBeforeAreaData = btyAreaData[0].map(
+                        (col, index) => {
+                          return btyAreaData.map((row, key) => {
+                            return row[index]
+                          })
+                        }
+                      )
                     }
                     arrtsBGY.push({
                       type: this.$route.query.type,
@@ -1113,74 +1376,135 @@ export default {
                       transBefore: btyData,
                       selectDate: {
                         time: this.$store.state.newSelectTime,
-                        sequence: this.$store.state.yesNoClickChange ? { sequenceCont: this.$store.state.newSelectChangeData, sequenceState: 3 } : this.$store.state.newSelectLabelArea
+                        sequence: this.$store.state.yesNoClickChange
+                          ? {
+                            sequenceCont: this.$store.state
+                              .newSelectChangeData,
+                            sequenceState: 3
+                          }
+                          : this.$store.state.newSelectLabelArea
                       },
                       selectDataLeft: this.$store.state.selectDataLeft, // 左侧选中
                       SelecttDimension: this.$store.state.SelecttDimension,
                       yesNoClickChange: this.$store.state.yesNoClickChange, // 维度转换是否被点击
                       yesNoClickZZ: this.$store.state.yesNoClickZZ, // 转置是否被点击
-                      advancedSearchState: this.$store.state.advancedSearchState, // 高级查询状态
+                      advancedSearchState: this.$store.state
+                        .advancedSearchState, // 高级查询状态
                       advanceData: this.$store.state.advanceData, // 高级查询数据
                       areaIndexName: this.$store.state.areaIndexName, // 地区名称
                       labelIndexName: this.$store.state.labelIndexName // 指标名称
                     })
-                    localStorage.setItem('classFiyData', JSON.stringify(arrtsBGY))
+                    localStorage.setItem(
+                      'classFiyData',
+                      JSON.stringify(arrtsBGY)
+                    )
                   } else {
-                    console.log('走这里')
-                    let btyData = JSON.parse(JSON.stringify(this.$store.state.allNochangeInitData))
+                    // console.log('走这里')
+                    let btyData = JSON.parse(
+                      JSON.stringify(this.$store.state.allNochangeInitData)
+                    )
                     if (this.$store.state.yesNoClickZZ) {
                       let btyAreaData = btyData.transBeforeAreaData
-                      btyData.transBeforeAreaData = btyAreaData[0].map((col, index) => {
+                      btyData.transBeforeAreaData = btyAreaData[0].map(
+                        (col, index) => {
+                          return btyAreaData.map((row, key) => {
+                            return row[index]
+                          })
+                        }
+                      )
+                    }
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).transBefore = btyData
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).allNochangeInitData = btyData
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).selectDate = {
+                      time: this.$store.state.newSelectTime,
+                      sequence: this.$store.state.yesNoClickChange
+                        ? {
+                          sequenceCont: this.$store.state.newSelectChangeData,
+                          sequenceState: 3
+                        }
+                        : this.$store.state.newSelectLabelArea
+                    }
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).selectDataLeft = this.$store.state.selectDataLeft
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).SelecttDimension = this.$store.state.SelecttDimension
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).yesNoClickChange = this.$store.state.yesNoClickChange
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).yesNoClickZZ = this.$store.state.yesNoClickZZ
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).advancedSearchState = this.$store.state.advancedSearchState
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).advanceData = this.$store.state.advanceData
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).areaIndexName = this.$store.state.areaIndexName
+                    arrtsBGY.find(
+                      item => item.type === this.$route.query.type
+                    ).labelIndexName = this.$store.state.labelIndexName
+                    localStorage.setItem(
+                      'classFiyData',
+                      JSON.stringify(arrtsBGY)
+                    )
+                  }
+                } else {
+                  // 本地不存在
+                  let btyData = JSON.parse(
+                    JSON.stringify(this.$store.state.allNochangeInitData)
+                  )
+                  if (this.$store.state.yesNoClickZZ) {
+                    let btyAreaData = btyData.transBeforeAreaData
+                    btyData.transBeforeAreaData = btyAreaData[0].map(
+                      (col, index) => {
                         return btyAreaData.map((row, key) => {
                           return row[index]
                         })
-                      })
-                    }
-                    arrtsBGY.find(item => item.type === this.$route.query.type).transBefore = btyData
-                    arrtsBGY.find(item => item.type === this.$route.query.type).allNochangeInitData = btyData
-                    arrtsBGY.find(item => item.type === this.$route.query.type).selectDate = {
-                      time: this.$store.state.newSelectTime,
-                      sequence: this.$store.state.yesNoClickChange ? { sequenceCont: this.$store.state.newSelectChangeData, sequenceState: 3 } : this.$store.state.newSelectLabelArea
-                    }
-                    arrtsBGY.find(item => item.type === this.$route.query.type).selectDataLeft = this.$store.state.selectDataLeft
-                    arrtsBGY.find(item => item.type === this.$route.query.type).SelecttDimension = this.$store.state.SelecttDimension
-                    arrtsBGY.find(item => item.type === this.$route.query.type).yesNoClickChange = this.$store.state.yesNoClickChange
-                    arrtsBGY.find(item => item.type === this.$route.query.type).yesNoClickZZ = this.$store.state.yesNoClickZZ
-                    arrtsBGY.find(item => item.type === this.$route.query.type).advancedSearchState = this.$store.state.advancedSearchState
-                    arrtsBGY.find(item => item.type === this.$route.query.type).advanceData = this.$store.state.advanceData
-                    arrtsBGY.find(item => item.type === this.$route.query.type).areaIndexName = this.$store.state.areaIndexName
-                    arrtsBGY.find(item => item.type === this.$route.query.type).labelIndexName = this.$store.state.labelIndexName
-                    localStorage.setItem('classFiyData', JSON.stringify(arrtsBGY))
+                      }
+                    )
                   }
-                } else { // 本地不存在
-                  let btyData = JSON.parse(JSON.stringify(this.$store.state.allNochangeInitData))
-                  if (this.$store.state.yesNoClickZZ) {
-                    let btyAreaData = btyData.transBeforeAreaData
-                    btyData.transBeforeAreaData = btyAreaData[0].map((col, index) => {
-                      return btyAreaData.map((row, key) => {
-                        return row[index]
-                      })
-                    })
-                  }
-                  localStorage.setItem('classFiyData', JSON.stringify([{
-                    type: this.$route.query.type,
-                    allNochangeInitData: btyData,
-                    transBefore: btyData,
-                    selectDate: {
-                      time: this.$store.state.newSelectTime,
-                      sequence: this.$store.state.yesNoClickChange ? { sequenceCont: this.$store.state.newSelectChangeData, sequenceState: 3 } : this.$store.state.newSelectLabelArea
-                      // sequenceCont:,//序列选中内容
-                      // sequenceState://序列状态 筛选指标   筛选地区
-                    },
-                    selectDataLeft: this.$store.state.selectDataLeft, // 左侧选中
-                    SelecttDimension: this.$store.state.SelecttDimension, // 行列代表的是指标、地区、时间
-                    yesNoClickChange: this.$store.state.yesNoClickChange, // 维度转换是否被点击
-                    yesNoClickZZ: this.$store.state.yesNoClickZZ, // 维度转换是否被点击
-                    advancedSearchState: this.$store.state.advancedSearchState, // 高级查询状态
-                    advanceData: this.$store.state.advanceData, // 高级查询数据
-                    areaIndexName: this.$store.state.areaIndexName, // 地区名称
-                    labelIndexName: this.$store.state.labelIndexName // 指标名称
-                  }]))
+                  localStorage.setItem(
+                    'classFiyData',
+                    JSON.stringify([
+                      {
+                        type: this.$route.query.type,
+                        allNochangeInitData: btyData,
+                        transBefore: btyData,
+                        selectDate: {
+                          time: this.$store.state.newSelectTime,
+                          sequence: this.$store.state.yesNoClickChange
+                            ? {
+                              sequenceCont: this.$store.state
+                                .newSelectChangeData,
+                              sequenceState: 3
+                            }
+                            : this.$store.state.newSelectLabelArea
+                          // sequenceCont:,//序列选中内容
+                          // sequenceState://序列状态 筛选指标   筛选地区
+                        },
+                        selectDataLeft: this.$store.state.selectDataLeft, // 左侧选中
+                        SelecttDimension: this.$store.state.SelecttDimension, // 行列代表的是指标、地区、时间
+                        yesNoClickChange: this.$store.state.yesNoClickChange, // 维度转换是否被点击
+                        yesNoClickZZ: this.$store.state.yesNoClickZZ, // 维度转换是否被点击
+                        advancedSearchState: this.$store.state
+                          .advancedSearchState, // 高级查询状态
+                        advanceData: this.$store.state.advanceData, // 高级查询数据
+                        areaIndexName: this.$store.state.areaIndexName, // 地区名称
+                        labelIndexName: this.$store.state.labelIndexName // 指标名称
+                      }
+                    ])
+                  )
                 }
               }
             }
@@ -1193,13 +1517,21 @@ export default {
             })
           }
           break
-        case '恢复默认':// 将分类id 和 分类数据从本地删除
+        case '恢复默认': // 将分类id 和 分类数据从本地删除
           this.cutStatic(0)
+          if (localStorage.getItem('dateDimension')) {
+            localStorage.removeItem('dateDimension')
+          }
+          if (localStorage.getItem('areaDimension')) {
+            localStorage.removeItem('areaDimension')
+          }
           if (this.$store.state.transBefore) {
             if (JSON.parse(localStorage.getItem('classFiyData'))) {
               let arrtsBGY = JSON.parse(localStorage.getItem('classFiyData'))
-              console.log(arrtsBGY)
-              if (!arrtsBGY.find(item => item.type === this.$route.query.type)) {
+              // console.log(arrtsBGY)
+              if (
+                !arrtsBGY.find(item => item.type === this.$route.query.type)
+              ) {
                 this.$alert('默认数据已恢复！', '温馨提示', {
                   confirmButtonText: '确定',
                   callback: actioon => {
@@ -1208,11 +1540,14 @@ export default {
                 })
               } else {
                 arrtsBGY = arrtsBGY.filter((item, index) => {
-                  console.log(item, 'item0')
+                  // console.log(item, 'item0')
                   return item.type !== this.$route.query.type
                 })
                 if (arrtsBGY.length > 0) {
-                  localStorage.setItem('classFiyData', JSON.stringify(arrtsBGY))
+                  localStorage.setItem(
+                    'classFiyData',
+                    JSON.stringify(arrtsBGY)
+                  )
                 } else {
                   localStorage.removeItem('classFiyData')
                 }
@@ -1267,51 +1602,59 @@ export default {
     computedLine (typeText) {
       switch (typeText) {
         case 'SUM求和':
-          console.log(typeText)
+          // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
-            text: typeText, stateType: 'line'
+            text: typeText,
+            stateType: 'line'
           }
           break
-        case 'x平均数':// 注意x小写
-          console.log(typeText)
+        case 'x平均数': // 注意x小写
+          // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
-            text: typeText, stateType: 'line'
+            text: typeText,
+            stateType: 'line'
           }
           break
         case 'MAX最大值':
-          console.log(typeText)
+          // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
-            text: typeText, stateType: 'line'
+            text: typeText,
+            stateType: 'line'
           }
           break
         case 'MIN最小值':
-          console.log(typeText)
+          // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
-            text: typeText, stateType: 'line'
+            text: typeText,
+            stateType: 'line'
           }
           break
         case 'MD中位数':
-          console.log(typeText)
+          // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
-            text: typeText, stateType: 'line'
+            text: typeText,
+            stateType: 'line'
           }
           break
         case 'MO众数':
-          console.log(typeText)
+          // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
-            text: typeText, stateType: 'line'
+            text: typeText,
+            stateType: 'line'
           }
           break
         case 'S²方差':
-          console.log(typeText)
+          // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
-            text: typeText, stateType: 'line'
+            text: typeText,
+            stateType: 'line'
           }
           break
         case 'S标准差':
-          console.log(typeText)
+          // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
-            text: typeText, stateType: 'line'
+            text: typeText,
+            stateType: 'line'
           }
           break
       }
@@ -1320,57 +1663,66 @@ export default {
     computedList (typeText) {
       switch (typeText) {
         case 'SUM求和':
-          console.log(typeText)
+          // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
-            text: typeText, stateType: 'list'
+            text: typeText,
+            stateType: 'list'
           }
           break
-        case 'x平均数':// 注意x小写
-          console.log(typeText)
+        case 'x平均数': // 注意x小写
+          // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
-            text: typeText, stateType: 'list'
+            text: typeText,
+            stateType: 'list'
           }
           break
         case 'MAX最大值':
-          console.log(typeText)
+          // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
-            text: typeText, stateType: 'list'
+            text: typeText,
+            stateType: 'list'
           }
           break
         case 'MIN最小值':
-          console.log(typeText)
+          // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
-            text: typeText, stateType: 'list'
+            text: typeText,
+            stateType: 'list'
           }
           break
         case 'MD中位数':
-          console.log(typeText)
+          // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
-            text: typeText, stateType: 'list'
+            text: typeText,
+            stateType: 'list'
           }
           break
         case 'MO众数':
-          console.log(typeText)
+          // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
-            text: typeText, stateType: 'list'
+            text: typeText,
+            stateType: 'list'
           }
           break
         case 'S²方差':
-          console.log(typeText)
+          // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
-            text: typeText, stateType: 'list'
+            text: typeText,
+            stateType: 'list'
           }
           break
         case 'S标准差':
-          console.log(typeText)
+          // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
-            text: typeText, stateType: 'list'
+            text: typeText,
+            stateType: 'list'
           }
           break
       }
     },
     // 当数据不是从导航进来时找到其选中其选中的数据作为默认的左侧选中数据
-    defaultDataSelectDG () { // 此方法返回一个默认选中的代码数组
+    defaultDataSelectDG () {
+      // 此方法返回一个默认选中的代码数组
       let defaultCodeIndex = null
       let objectData = null
       // 最终默认选中
@@ -1378,35 +1730,49 @@ export default {
         if (this.$route.query.defaultLeftId.toString() === item1.id) {
           defaultCodeIndex = [index1]
           objectData = item1
-          console.log(111)
+          // console.log(111)
         } else {
           if (item1.children !== undefined) {
             item1.children.forEach((item2, index2) => {
               if (this.$route.query.defaultLeftId.toString() === item2.id) {
                 defaultCodeIndex = [index1, index2]
                 objectData = item2
-                console.log(222)
+                // console.log(222)
               } else {
                 if (item2.children !== undefined) {
                   item2.children.forEach((item3, index3) => {
-                    if (this.$route.query.defaultLeftId.toString() === item3.id) {
+                    if (
+                      this.$route.query.defaultLeftId.toString() === item3.id
+                    ) {
                       defaultCodeIndex = [index1, index2, index3]
                       objectData = item3
-                      console.log(defaultCodeIndex, objectData, 333)
+                      // console.log(defaultCodeIndex, objectData, 333)
                     } else {
                       if (item3.children !== undefined) {
                         item3.children.forEach((item4, index4) => {
-                          if (this.$route.query.defaultLeftId.toString() === item4.id) {
+                          if (
+                            this.$route.query.defaultLeftId.toString() ===
+                            item4.id
+                          ) {
                             defaultCodeIndex = [index1, index2, index3, index4]
                             objectData = item4
-                            console.log(444)
+                            // console.log(444)
                           } else {
                             if (item4.children !== undefined) {
                               item4.children.forEach((item5, index5) => {
-                                if (this.$route.query.defaultLeftId.toString() === item5.id) {
-                                  defaultCodeIndex = [index1, index2, index3, index4, index5]
+                                if (
+                                  this.$route.query.defaultLeftId.toString() ===
+                                  item5.id
+                                ) {
+                                  defaultCodeIndex = [
+                                    index1,
+                                    index2,
+                                    index3,
+                                    index4,
+                                    index5
+                                  ]
                                   objectData = item5
-                                  console.log(555)
+                                  // console.log(555)
                                 }
                               })
                             }
@@ -1423,21 +1789,32 @@ export default {
       })
       this.filterDataArr = {
         defaultCode: defaultCodeIndex.map((item, index) => {
-          return defaultCodeIndex.filter((list, key) => { return key <= index }).join('-')
+          return defaultCodeIndex
+            .filter((list, key) => {
+              return key <= index
+            })
+            .join('-')
         }),
         objectData: objectData
       }
     },
     // 默认选中的列
     defaultSelectLie () {
-      console.log(this.leftCateData, 'this.leftCateDatathis.leftCateDatathis.leftCateData')
-      console.log(this.$route.query.defaultLeftId, 'this.$router.query.defaultLeftId')
+      // console.log(
+      //   this.leftCateData,
+      //   'this.leftCateDatathis.leftCateDatathis.leftCateData'
+      // )
+      // console.log(
+      //   this.$route.query.defaultLeftId,
+      //   'this.$router.query.defaultLeftId'
+      // )
       // 非高级查询
       if (!this.$store.state.advancedSearchState) {
-        if (this.$route.query.defaultLeftId !== 'default') { // 从数据更新，快速
+        if (this.$route.query.defaultLeftId !== 'default') {
+          // 从数据更新，快速
           this.defaultDataSelectDG()
-          console.log(this.filterDataArr, '非导航左侧选中')
-          console.log(this.filterDataArr.defaultCode, '代码')
+          // console.log(this.filterDataArr, '非导航左侧选中')
+          // console.log(this.filterDataArr.defaultCode, '代码')
           this.defaultSelectLies = this.filterDataArr.defaultCode
           this.$store.state.openOpenLeft = this.filterDataArr.defaultCode
           this.$store.state.selectDataLeft = this.filterDataArr.objectData
@@ -1464,61 +1841,144 @@ export default {
             type: this.$route.query.type
           }
         }).then(res => {
-          console.log(res, '默认展示id10')
+          // console.log(res, '默认展示id10')
           this.$store.state.defaultDataId = res.data.data
           this.$store.state.selectDataLeft = res.data.data
           this.$store.state.selectfilter = this.$store.state.defaultDataId.f
-          this.$refs.childChartsCut.searchSelect(this.$store.state.defaultDataId.f, 'default3')
-          this.$refs.childChartCont.getInfor(this.$store.state.defaultDataId.id)
+          this.$refs.childChartsCut.searchSelect(
+            this.$store.state.defaultDataId.f,
+            'default3'
+          )
+          this.$refs.childChartCont.getInfor(
+            this.$store.state.defaultDataId.id
+          )
         })
         return
       }
-      if (JSON.parse(arrData).find(item => item.type === this.$route.query.type)) {
+      if (
+        JSON.parse(arrData).find(item => item.type === this.$route.query.type)
+      ) {
         this.$store.state.defaultShowLabelAreaState = 'defaultLocal'
-        console.log(JSON.parse(arrData).find(item => item.type === this.$route.query.type))
+        // console.log(JSON.parse(arrData).find(item => item.type === this.$route.query.type))
         // 调用子组件 searchSelect 方法渲染下拉
         // 赋值数据
-        this.$store.state.selectDataLeft = JSON.parse(arrData).find(item => item.type === this.$route.query.type).selectDataLeft
-        console.log(JSON.parse(arrData).find(item => item.type === this.$route.query.type).selectDate.time.value, '全职0')
-        this.$store.state.selectData = JSON.parse(arrData).find(item => item.type === this.$route.query.type).selectDate.time.value
-        console.log(this.$store.state.selectDataLeft, '赋值数据')
+        this.$store.state.selectDataLeft = JSON.parse(arrData).find(
+          item => item.type === this.$route.query.type
+        ).selectDataLeft
+        // console.log(
+        //   JSON.parse(arrData).find(item => item.type === this.$route.query.type)
+        //     .selectDate.time.value,
+        //   '全职0'
+        // )
+        this.$store.state.selectData = JSON.parse(arrData).find(
+          item => item.type === this.$route.query.type
+        ).selectDate.time.value
+        // console.log(this.$store.state.selectDataLeft, '赋值数据')
         this.$store.state.selectfilter = this.$store.state.selectDataLeft.f
-        this.$store.state.SelecttDimension = JSON.parse(arrData).find(item => item.type === this.$route.query.type).SelecttDimension
-        this.$store.state.yesNoClickZZ = JSON.parse(arrData).find(item => item.type === this.$route.query.type).yesNoClickZZ
-        this.$store.state.yesNoClickChange = JSON.parse(arrData).find(item => item.type === this.$route.query.type).yesNoClickChange
-        this.$store.state.advancedSearchState = JSON.parse(arrData).find(item => item.type === this.$route.query.type).advancedSearchState
+        this.$store.state.SelecttDimension = JSON.parse(arrData).find(
+          item => item.type === this.$route.query.type
+        ).SelecttDimension
+        this.$store.state.yesNoClickZZ = JSON.parse(arrData).find(
+          item => item.type === this.$route.query.type
+        ).yesNoClickZZ
+        this.$store.state.yesNoClickChange = JSON.parse(arrData).find(
+          item => item.type === this.$route.query.type
+        ).yesNoClickChange
+        this.$store.state.advancedSearchState = JSON.parse(arrData).find(
+          item => item.type === this.$route.query.type
+        ).advancedSearchState
         // 高级查询
         if (this.$store.state.advancedSearchState) {
-          this.$store.state.advanceData = JSON.parse(arrData).find(item => item.type === this.$route.query.type).advanceData
-          this.$store.state.areaIndexName = JSON.parse(arrData).find(item => item.type === this.$route.query.type).areaIndexName
-          this.$store.state.labelIndexName = JSON.parse(arrData).find(item => item.type === this.$route.query.type).labelIndexName
+          this.$store.state.advanceData = JSON.parse(arrData).find(
+            item => item.type === this.$route.query.type
+          ).advanceData
+          this.$store.state.areaIndexName = JSON.parse(arrData).find(
+            item => item.type === this.$route.query.type
+          ).areaIndexName
+          this.$store.state.labelIndexName = JSON.parse(arrData).find(
+            item => item.type === this.$route.query.type
+          ).labelIndexName
         }
         if (this.$route.query.type === 'area') {
-          let changeDarat = JSON.parse(JSON.stringify(JSON.parse(arrData).find(item => item.type === this.$route.query.type).allNochangeInitData))
-          this.$store.state.transBefore = JSON.parse(JSON.stringify(changeDarat))
-          this.$store.state.noChangeData = JSON.parse(JSON.stringify(changeDarat))
-          this.$store.state.allNochangeInitData = JSON.parse(JSON.stringify(changeDarat))
-          this.$store.state.newSelectLabelArea = JSON.parse(arrData).find(item => item.type === this.$route.query.type).selectDate.sequence
-          this.$store.state.areaDimensionState = JSON.parse(arrData).find(item => item.type === this.$route.query.type).yesNoClickChange
-          this.$store.state.yesNoClickChange = JSON.parse(arrData).find(item => item.type === this.$route.query.type).yesNoClickChange
+          let changeDarat = JSON.parse(
+            JSON.stringify(
+              JSON.parse(arrData).find(
+                item => item.type === this.$route.query.type
+              ).allNochangeInitData
+            )
+          )
+          this.$store.state.transBefore = JSON.parse(
+            JSON.stringify(changeDarat)
+          )
+          this.$store.state.noChangeData = JSON.parse(
+            JSON.stringify(changeDarat)
+          )
+          this.$store.state.allNochangeInitData = JSON.parse(
+            JSON.stringify(changeDarat)
+          )
+          this.$store.state.newSelectLabelArea = JSON.parse(arrData).find(
+            item => item.type === this.$route.query.type
+          ).selectDate.sequence
+          this.$store.state.areaDimensionState = JSON.parse(arrData).find(
+            item => item.type === this.$route.query.type
+          ).yesNoClickChange
+          this.$store.state.yesNoClickChange = JSON.parse(arrData).find(
+            item => item.type === this.$route.query.type
+          ).yesNoClickChange
         } else {
-          this.$store.state.transBefore = JSON.parse(arrData).find(item => item.type === this.$route.query.type).allNochangeInitData
-          this.$store.state.noChangeData = JSON.parse(JSON.stringify(this.$store.state.transBefore))
-          this.$store.state.allNochangeInitData = JSON.parse(arrData).find(item => item.type === this.$route.query.type).allNochangeInitData
+          this.$store.state.transBefore = JSON.parse(arrData).find(
+            item => item.type === this.$route.query.type
+          ).allNochangeInitData
+          this.$store.state.noChangeData = JSON.parse(
+            JSON.stringify(this.$store.state.transBefore)
+          )
+          this.$store.state.allNochangeInitData = JSON.parse(arrData).find(
+            item => item.type === this.$route.query.type
+          ).allNochangeInitData
         }
-        console.log(this.$store.state.SelecttDimension, 'this.$store.state.advancedSearchState0000000000000000000000')
-        if (this.$store.state.yesNoClickChange && this.$route.query.type === 'area') {
-          if ((this.$store.state.SelecttDimension.col === 'zb' && this.$store.state.SelecttDimension.row === 'sj') || (this.$store.state.SelecttDimension.col === 'sj' && this.$store.state.SelecttDimension.row === 'zb')) {
+        // console.log(this.$store.state.SelecttDimension, 'this.$store.state.advancedSearchState0000000000000000000000')
+        if (
+          this.$store.state.yesNoClickChange &&
+          this.$route.query.type === 'area'
+        ) {
+          if (
+            (this.$store.state.SelecttDimension.col === 'zb' &&
+              this.$store.state.SelecttDimension.row === 'sj') ||
+            (this.$store.state.SelecttDimension.col === 'sj' &&
+              this.$store.state.SelecttDimension.row === 'zb')
+          ) {
             this.$store.state.noSelecttDimension = 'dq'
-          } else if ((this.$store.state.SelecttDimension.col === 'dq' && this.$store.state.SelecttDimension.row === 'sj') || (this.$store.state.SelecttDimension.col === 'sj' && this.$store.state.SelecttDimension.row === 'dq')) {
+          } else if (
+            (this.$store.state.SelecttDimension.col === 'dq' &&
+              this.$store.state.SelecttDimension.row === 'sj') ||
+            (this.$store.state.SelecttDimension.col === 'sj' &&
+              this.$store.state.SelecttDimension.row === 'dq')
+          ) {
             this.$store.state.noSelecttDimension = 'zb'
-          } else if ((this.$store.state.SelecttDimension.col === 'dq' && this.$store.state.SelecttDimension.row === 'zb') || (this.$store.state.SelecttDimension.col === 'zb' && this.$store.state.SelecttDimension.row === 'dq')) {
+          } else if (
+            (this.$store.state.SelecttDimension.col === 'dq' &&
+              this.$store.state.SelecttDimension.row === 'zb') ||
+            (this.$store.state.SelecttDimension.col === 'zb' &&
+              this.$store.state.SelecttDimension.row === 'dq')
+          ) {
             this.$store.state.noSelecttDimension = 'sj'
           }
-          this.$store.state.newSelectChangeData = [JSON.parse(arrData).find(item => item.type === this.$route.query.type).selectDate.sequence.sequenceCont]
+          this.$store.state.newSelectChangeData = [
+            JSON.parse(arrData).find(
+              item => item.type === this.$route.query.type
+            ).selectDate.sequence.sequenceCont
+          ]
         }
-        this.$refs.childChartsCut.searchSelect(JSON.parse(arrData).find(item => item.type === this.$route.query.type).selectDataLeft.f, JSON.parse(arrData).find(item => item.type === this.$route.query.type).selectDate)
-        this.$refs.childChartCont.getInfor(JSON.parse(arrData).find(item => item.type === this.$route.query.type).selectDataLeft.id)
+        this.$refs.childChartsCut.searchSelect(
+          JSON.parse(arrData).find(item => item.type === this.$route.query.type)
+            .selectDataLeft.f,
+          JSON.parse(arrData).find(item => item.type === this.$route.query.type)
+            .selectDate
+        )
+        this.$refs.childChartCont.getInfor(
+          JSON.parse(arrData).find(item => item.type === this.$route.query.type)
+            .selectDataLeft.id
+        )
         if (this.$store.state.advancedSearchState) {
           this.$refs.childChartCont.advancedSearchDataShow()
         }
@@ -1530,29 +1990,79 @@ export default {
             type: this.$route.query.type
           }
         }).then(res => {
-          console.log(res, '默认展示id')
+          // console.log(res, '默认展示id')
           this.$store.state.defaultDataId = res.data.data
           this.$store.state.selectDataLeft = res.data.data
           this.$store.state.selectfilter = this.$store.state.defaultDataId.f
-          this.$refs.childChartsCut.searchSelect(this.$store.state.defaultDataId.f, 'default3')
-          this.$refs.childChartCont.getInfor(this.$store.state.defaultDataId.id)
+          this.$refs.childChartsCut.searchSelect(
+            this.$store.state.defaultDataId.f,
+            'default3'
+          )
+          this.$refs.childChartCont.getInfor(
+            this.$store.state.defaultDataId.id
+          )
         })
       }
     },
     comTime (res) {
-      console.log(res, '被选中的111')
+      // console.log(res, '被选中的111')
       this.downLaSelect = res.extendData
     },
     // 接收子组件传值新增指标
-    emitStatesd (val) {
-      console.log(val, 'val')
-      if (val) {
-        console.log(val)
+    emitStatesd (...val) {
+      // console.log(val, 'val')
+      if (val[0]) {
+        // console.log(val)
+        if (val[1]) this.getNewTransData()
         this.statesDf = 2
       } else {
         this.statesDf = 1
       }
     },
+    getNewTransData () {
+      // console.log(this.$store.state.transBefore, '子数据')
+      this.$store.state.transBefore.termsName = JSON.parse(
+        JSON.stringify(this.$store.state.noChangeData.termsName)
+      )
+      this.$store.state.transBefore.areaName = JSON.parse(
+        JSON.stringify(this.$store.state.noChangeData.areaName)
+      )
+      // console.log(this.$store.state.noChangeData, '总数据')
+      // 获取timeArr下标
+      let labelIndexs = []
+      this.$store.state.noChangeData.timeArr.forEach((item, index) => {
+        if (this.$store.state.transBefore.timeArr.indexOf(item) > -1) { labelIndexs.push(index) }
+      })
+      // console.log(labelIndexs, '下标')
+      let data = [] // JSON.parse(JSON.stringify())
+      // this.$store.state.transBefore.termsName.forEach((item, index) => {
+      //   data[index] = []
+      //   // data[index].push(item)
+      // })
+      // 根据下标取值
+      labelIndexs.forEach(labelIndex => {
+        this.$store.state.noChangeData.transBeforeTermsData.forEach(
+          (array, arrayIndex) => {
+            array.forEach((item, itemIndex) => {
+              if (!(data[arrayIndex] instanceof Array)) data[arrayIndex] = []
+              if (itemIndex === labelIndex) data[arrayIndex].push(item)
+            })
+          }
+        )
+      })
+      // 如果数据为空,手动加指标,不为空的话会在computeddata.js加指标
+      if (!data.length) {
+        this.$store.state.transBefore.termsName.forEach((item, index) => {
+          data[index] = []
+          data[index].push(item)
+        })
+      }
+      // console.log(data, '重构之后的数据')
+      this.$store.state.transBefore.transBeforeTermsData = JSON.parse(
+        JSON.stringify(data)
+      )
+      // console.log(this.$store.state.noChangeData, '子全体数据')
+    },
     // 重置参数
     tellAreadly (val) {
       this.statesDf = val
@@ -1577,7 +2087,7 @@ export default {
     },
     // 地区数据下拉发生变化
     statertfResu (val) {
-      console.log(val, '1010110')
+      // console.log(val, '1010110')
       this.downLaSelectArea = val
       this.indStatic = 0
       // 调用childChartCont组件方法获取数据
@@ -1613,7 +2123,7 @@ export default {
     },
     // 调用子组件的方法重置筛选数据
     childChartsCutShow () {
-      console.log('kfa555')
+      // console.log('kfa555')
       this.$refs.childChartsCut.showLabelArea()
     },
     // 调用子组件的方法重置筛选数据
@@ -1630,12 +2140,27 @@ export default {
     change3Ds () {
       // 重置三维转换默认选中
       this.$refs.childDimension.change3D()
+    },
+    judgeDimension () {
+      // 判断本地换不换默认转置标识
+      let localDimension = JSON.parse(localStorage.getItem('dimension'))
+      let temp = localDimension.row + localDimension.col
+      let nowDimension = this.$store.state.SelecttDimension
+      let string = nowDimension.row + nowDimension.col
+      // console.log(temp)
+      temp = temp.split('').sort().toString()
+      string = string.split('').sort().toString()
+      if (string !== temp) {
+        localStorage.setItem('dimension', JSON.stringify(this.$store.state.SelecttDimension))
+        // console.log(this.$store.state.SelecttDimension, '初始化转之')
+      }
+      // console.log(temp)
     }
   },
   computed: {
     // 计算字符串
     computedStr () {
-      return (str) => {
+      return str => {
         let Strs = ''
         str.length <= 32 ? (Strs = str) : (Strs = str.slice(0, 31) + '...')
         return Strs
@@ -1643,15 +2168,19 @@ export default {
     },
     // 根据传入的数值计算出实际px值
     computedNumberPx () {
-      return (pszhi) => {
-        let sizes = 160 / ((1920 - 17) / document.body.clientWidth) / 10 / 16 * pszhi
+      return pszhi => {
+        let sizes =
+          (160 / ((1920 - 17) / document.body.clientWidth) / 10 / 16) * pszhi
         return sizes
       }
     },
     // 根据传入的值计算出实际的rem值
     computedNumberRem () {
-      return (pszhi) => {
-        let sizes = pszhi / (160 / ((1920 - 17) / document.body.clientWidth) / 10 / 16) / 16
+      return pszhi => {
+        let sizes =
+          pszhi /
+          (160 / ((1920 - 17) / document.body.clientWidth) / 10 / 16) /
+          16
         return sizes
       }
     },
@@ -1659,7 +2188,7 @@ export default {
     computStatic () {
       return (index, arr) => {
         let staticd = false
-        if (((arr.length - 1) === index) || (arr.length - 2) === index) {
+        if (arr.length - 1 === index || arr.length - 2 === index) {
           staticd = false
         } else {
           staticd = true
@@ -1726,6 +2255,8 @@ export default {
   flex-flow: row-reverse;
   // border: 1px solid red;
   padding: 0;
+  // 新加的
+  height: 50px;
 }
 /deep/ .el-submenu__icon-arrow {
   position: static;
@@ -1793,7 +2324,7 @@ export default {
       }
       & > .data_title {
         width: 100%;
-        height: 5.875rem;
+        height: 4.875rem;
         background-color: #ffffff;
         box-shadow: 0rem 0.1875rem 1rem 0rem rgba(172, 172, 172, 0.38);
         display: flex;
@@ -1919,6 +2450,15 @@ export default {
           // height: 50.25rem;
           background-color: #ffffff;
           box-shadow: 0rem 0.1875rem 1rem 0rem rgba(172, 172, 172, 1);
+          /deep/ .tac {
+            .is-show-icon {
+              > .el-submenu__title {
+                > i {
+                  display: none;
+                }
+              }
+            }
+          }
         }
         .data_center {
           width: 0.75rem;
diff --git a/src/views/personalCenter/PersonalCenter.vue b/src/views/personalCenter/PersonalCenter.vue
index 01a9496..0d3b314 100644
--- a/src/views/personalCenter/PersonalCenter.vue
+++ b/src/views/personalCenter/PersonalCenter.vue
@@ -541,6 +541,9 @@ export default {
       flex-direction: column;
       justify-content: space-evenly;
       align-items: center;
+      input {
+        outline: none;
+      }
       & > div:nth-last-child(n + 2) {
         width: 100%;
         height: 3.25rem;
diff --git a/src/views/searchList/SearchList.vue b/src/views/searchList/SearchList.vue
index 121542f..660b0cc 100644
--- a/src/views/searchList/SearchList.vue
+++ b/src/views/searchList/SearchList.vue
@@ -185,7 +185,7 @@ export default {
     // 被选中时触发
     choiceCaller (resu) {
       console.log(resu, '触发')
-      console.log(resu[1], 'resu[1]')
+      // console.log(resu[1], 'resu[1]')
       /* eslint-disable */
       resu[0] === '-全部-' ? (this.selectLMType = '', this.selectLMId = '') : (this.selectLMType = resu[2].type, this.selectLMId = resu[2].id)
       console.log(this.selectLMType, this.selectLMId)
diff --git a/static/data/icon_back.jpg b/static/data/icon_back.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5adfa5e18b7db3c71b40ca9e3763782b27ca787b
GIT binary patch
literal 2311
zcmbW0d010P62SZAAP_JTML7flf*V9P4&o?5NC3IQCr5&;qJk*OH6|E>Tyo<zh(thS
zy(4mnJ06Sz6CkJ~5K$y@$Q9(4fRf<|hn$%got^o<{cCsYb$?ymUDZ{;dfoDNc`s0R
zailo{2!eng`~i6%*zXV(8~}i;D=-BBC<8PS0%%x+;O>G%ejOD$psRn=6%#rhpx^;k
zan<xyf9VQ40G;IlP|TH!!7hM+AVvE_kZ7brlu#%n8l!~4D7vzWs*18QRvClAuE1hd
z)nLJ>;8w0s!zpydAqsbe7u?j8G0F;y|4ro20bUvCLWxLdJwV_gBp#Ai0|J~W8m@$*
z7=H+aK%&q}a7tKJ*q}rmP9KRxz{#RfFfJ4a?*kMby~@zcR%tc;FlIelV{1~z9c3fC
z;umWejpN4VN5Ya-uxmB7v~@Q8jcBsbbldmacUX`uciB5QIyuu^JokA0WA8ri{r*Rf
z1q22Khj7AAMnpzM$E2J-bN1Z%A5$~4E@xlK`RCPZxp(vO3kvTQ-T(Q?(~{D%U-;#}
zzO1gP6~3x_-PGLjzO}8rqqDDnVDRIRWO(G$#H4I$dS>>^+`NJd0?2Pzf0F$N7arz9
z!2bY+QE)+sNVp^MD72xO(kfdz<}iEp`mIUI8g?0XieIQ0nKQ=M90_a0t~K7)w_!qo
z_Lc0v155tD$o>TTi>ni;!50&ON8$k$EcLPk?sJPKi*g|9vmtAb2Jz6ILQh+YM3$GE
zxI);qyp1n<B%wI~llj{XIq-5pqYYNr)fAr~8P81xUX-EaIFVw19k+<em4p2`<mtr`
z6CRr2IoBlVS`P0tf%Z+be6_#Z)|m=4A9*e(U>Q-L5-eRzz=z)wsLLg!{y4=9a`G*d
z<%{@>BTvJ5XkvOnmP`()XY?j|9%ulZBF~Mqfg;7}$Vfh%@q9}K_n9L0mi`3GgA2DC
zt~-E@Rwt=9i4r)3d2>(xzuh=v^G$Rcr7;e??j!6`uxU<EuYQZ=fqe2?f@SDepZObf
z8;nAWfT>*J3Uo^rmo-=vIk>6efmkNW?pmE(3WgIX8fih!2PDb-btTvG*It@%Vm)J)
zA7;*OHIk%pCS}f@J1bY$hCZCwIYz_}>RZO%z?mSvFg`%!{w&mtwfPq>&q8O`;#lcH
zR>zZd{?D~VvoS3jc^Z#Tu}?)8H_)n2J(=#1+UTJ0or&gif#cKn3x4&C2v}e?Ojb}v
zqiQ)zovGIN++?j9X}3Y#C$>H(nLKAbjF5xrq11fRrO5}cc9iXsdiNv|2&8U`n?)XX
zmwn5}O4-pLiVP314fk}N|LJYg<m}%??_xaAz2;3xA~#MA-AB8%%V9?RbF#a6hCZhv
zayBO5RybdWCYF|Y-$Z;@9d$6Uu<pfBBFRtoV&GB9I^3wAWMt3T%Y8iRaXvMW@vjVm
zl|S+0V6%VYenZL@mZ)>(+YEwUOl;*zo@)DmwIB#&0&QZUz|+UnA!wzT^@LTSd4Apx
z7k?-uxY7Gg#tLcohOBzHWO^@tnTuiDXqG39HFqbfSgF0I7rrL#?qTw~U#Tw^4<M<d
z(?hvF5IexPzu&33E=W81nATm#17`+DBXkF2g=xKss)N1scNtx}1phs5X+xV%FEG2s
zDOdU_7D#SZdbUCHpym%d#H6r$9;Eh}0RuURe53(|2G?nkHJD^w{gCA0`qFVBT#Uz6
z<Idd8(Vr)$hHmO-PIS{O1m!*JrAGK(oMmiP3lteVWyQd;(<O*|1!*HFvkPLuW6E^D
zmBd&!DQnH1ip-K~3o59=J{PNF)%>|xsi0yBM<uwNqqiJx^7Cft)^gX|;hMr4KI^1g
zdtZ)GlhrsZT{pZ!Twt~yVWfQIUShX>oVh={tgVxsDSi_j(fHuCPdImH6Wvq}Fs`qu
zSkPjWo|0)MYGKbY0;jYWO?l162Yx)NS#}`bBW=4dO>Jt<dZZ}NDj~2&`flw@tQp~L
zEqN}Qrz&=1r`&paTAi$PuPSZQc5}eY*m2R2S#>nVpf^@vQMmoGG&YBDoR7Qk6c~wn
zN_%2J`JQB36uzx9i${5HKU~io<Vwp<9ZUFbLZ2gCu(l{tx@k};TNZ~MVAZeTYBj_#
zd8+nIq80PA)TQ`}A1}-e?Qy{|>OpUs?}zMC^6v9>!%kG9bucNMMq;x1buKPCj;bF$
zpGzaW)-<tO%=0&xe}|smIUw+gqj+zzADWRwF`h+O=?;{NLbwas)hb$o3dmR%hKeSV
zm&aT{C1mk@;e+)^#EtOpU8neZ58+F8u2W-^pVQ<-I>mQmX3zs8oA{1!ifHzPk)-fY
zPG{m4snv<-K}LdG$n{{i+TNwo&r8PWc%y-2i@B)JwoQ3k?RuEy_2A4pf1v>`-aQ2H
zlUMfLe%YG-vb#u6uYM&#%$ljJ3U&Unvy44CB?@(kYR+3-d7H`a8eR=QZIC5=({>G%
zI9i?>H%*JN%BTq{^r*`CsnN^VE`5^e!w=iL*_{#Rx++Mt+5C>6f)GSLf{NCKgl~i{
zKp?g*iomzehu?qZmm`gj6q6#4cU&wUc*waZ2*JElyF!Bm6&>0iZa8JN6^X}ebPQ?8
z6p_nrPWtrT1&Vvg)v69oWr3(d-|U7QMBLTcq#ET9zk~LDTPO5sl1Fu8HkygAw3bP?
zrhxOSK`&yHzHQhFX)EchE<_-h_)>f=J)7N6@>4w{PjoY~vG#}e=>}RH3YFLp<Q=~Q
DqE7*I

literal 0
HcmV?d00001

diff --git a/static/data/left-disable.jpg b/static/data/left-disable.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5434425a025cf40787a0f0808cd70e42502753a2
GIT binary patch
literal 811
zcmex=<NpH&0WUXCHwH#VMur3+WcYuZ!I^=Hkr9NTfSHvU1lU+um|5A`*x5mtgOi(+
zgM*8Mot=x9i;J5F2-rFK_<4EwKx~j9AnhPsK*Ynr&H++E8u)*JL6Cz%j)9ArQHg;`
zkdaxC@&6G9c?JeXR-kJ^4u%3oCT12^HlUNZxPc0`3ILtY%*+IIEGr8OP<1U(o`FS>
zRY=j$kxe)-kzJ`!#HexNLJno8jR!@8E`CrkPAY2R<PsB?kd#tYQ`gYcGBGtXx3IKw
zc5!uc_we)z4hanlkBE#)PDxEm&&bRwE-5W5uc)kQZfR|6@96BBG<nL@Y13!SoV952
zlBLU*uUNTi)8;K(w{73CbJwB6M~)sle&Xb*OP8-)y>|V^&07y2J$~}^+4C1KUw!=a
z`ODXD-+%o41@ado12e>1aG#<1OAzQUCSV+}u!H=?$W#u*%z`YeiiT`Lj)Clng~Cck
zjT|CQ6Blkg$f;}`^g%SK=pvVxipfLOk07sseMX$en#l4Q++zrT-D2QjW&}navmk>#
z!{3|#&c*+HU;Uq<vFJa;$B_AnP~IdUFZA>Dw}QV*k3Lv`%lP1b2A)4=O1rL>>ed}Q
z9XrqCcIp&iUkO9EB4fjFmhD;#7@ItgU)pLoB|d2Ng{RxMWEvl?&v<|1+382;kFIC_
z@!eA(;>YAeyRJ@sdRvrZ*4#DWg1ePBu*?im)VTLFqDZp#@;|0*)5*cYm0jNygNr1-
r?YmU@eEr5huNGe1x{~kxTMf5&g-^H3uMKLtb6zkr`qt|C|8D{SuGb{9

literal 0
HcmV?d00001

diff --git a/static/data/left.jpg b/static/data/left.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0b88a9f982ba99f83fe297a680487274c0142acd
GIT binary patch
literal 802
zcmex=<NpH&0WUXCHwH#VMur3+WcYuZ!I^=Xi3x;&fCY$HIapa)SXjB(+1WUFxOjND
zxwyG``Gf>``2_j6xdp@o1cgOJMMZh|#U;c<B!omnML>oyG6VInuyV4pa*FVB^NNrR
z{vTiv<Y16v;9_P}Vqg+vWEN!ne}qAvfq{_~=vt72p@5MI=teen4o)s^pn|Oe3`~s7
z%uFoIAXfub*8=4kSOi&x6b&8OgaZ@Vl?p|S8YeE~P<GmQP&DY`2NmO_q9#r*F>wh=
zDOELf4NWZ*Q!{f5ODks=S2uSLPp{yR(6I1`$f)F$)U@=B%&g*)(z5c3%Btp;*0%PJ
z&aO$5r%atTea6gLixw|gx@`H1m8&*w-m-Pu_8mKS9XfpE=&|D`PM*4S`O4L6*Kgds
z_3+W-Cr_U}fAR9w$4{TXeEs(Q$Io9Ne=#yJL%ap|8JfQYf&OA*VPR%r2l<PUsT_!z
z1zA`X4cUYo1KAS`g_VpNIYgW$F5GyKQ`tD^gJ@FGMJ_QFlZUDwL0$v<j5v=qk>xYE
z#}NLy#lXYN2#h>tK?Zw<zc#-u{xi(m{GZ|e_x}u1{tETyBmXnJ|NWn#w<7+?{afXJ
zAD$n(&-O>}Vqx{VtXWe6vo;AhMLHbV5Kw*MhTMVhJ<k>y_pDFfcs-gsnqR_eP42mM
zd#=8%Kk(^&$9+Z<d6^o=5A}UPccLn0AKrfP4)+d+;9`ywhMs@l?POoEKIo6u!sz=3
z1{n+ty)$y;>-Il4jkxj3$5Z^2@j0e>_EA}yvFnzVYF}9`acIf9MQip<eV@PQ|4jfK
CL>?Xh

literal 0
HcmV?d00001

diff --git a/static/data/right-disable.jpg b/static/data/right-disable.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a8397fdb8a17e8f747a3b90ad3bbb17b884e800f
GIT binary patch
literal 797
zcmex=<NpH&0WUXCHwH#VMur3+WcYuZ!I^=Hkr9NTfSHvU1lU+um|5A`*x5mtgOi(+
zgM*8Mot=x9i;J5F2-rFK_<4EwKx~j9AnhPsK*Ynr&H++E8u)*JL6Cz%ih+xnQHg;`
zkdaxC@&6G9c?JeXR-kJ^4u%3oCT12^HlUNZxPc0`3ILtY%*+IIEGr8OP<1U(o`FS>
zRY=j$kxe)-kzJ`!#HexNLJno8jR!@8E`CrkPAY2R<PsB?kd#tYQ`gYcGBGtXx3IKw
zc5!uc_we)z4hanlkBE#)PDxEm&&bRwE-5W5uc)kQZfR|6@96BBG<nL@Y13!SoV952
zlBLU*uUNTi)8;K(w{73CbJwB6M~)sle&Xb*OP8-)y>|V^&07y2J$~}^+4C1KUw!=a
z`ODXD-+%o41@ado12e>1aG#<1OAzQUCSV+}u!H=?$W#u*%z`YeiiT`Lj)Clng~Cck
zjT|CQ6Blkg$f;}`^g%SK=pvVxipfLOk07sseMX$en#l4Q++zrT-D2QjW&}navmk>#
z!{2NF4sZI;FyA`<_m?g8iIMf^=dS<zE9$4x>u;y8*$Mt<IOtyE{lL~SzcilfN7JiA
z+8Ii0kz00m>g1mL(eUKh8^5n_cbqVAX8$d6xH<66RbP3Bm28uye);RK`Jw;K#zime
zw=D0n)3{d|)wX}_PlFrNx_gy0-X=G0W2(RA`E<_y*tJ_dSWo|&X1o96t+nib+D#d6
jIE&ft`y2P+xA20SMfH#G+5cq;-Lb@b#hcmg|8D{Sxpf~c

literal 0
HcmV?d00001

diff --git a/static/data/right.jpg b/static/data/right.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e7fa73f05b8576c3719ce540c5791958872add3f
GIT binary patch
literal 793
zcmex=<NpH&0WUXCHwH#VMur3+WcYuZ!I^=Xi3x;&fCY$HIapa)SXjB(+1WUFxOjND
zxwyG``Gf>``2_j6xdp@o1cgOJMMZh|#U;c<B!omnML>oyG6VInuyV4pa*FVB^NNrR
z{vTiv<Y16u;9_P}Vqg+vWEN!ne}qAvfq{_~=vt72p@5MI=teen4o)s^pn|Oe3`~s7
z%uFoIAXfub*8=4kSOi&x6b&8OgaZ@Vl?p|S8YeE~P<GmQP&DY`2NmO_q9#r*F>wh=
zDOELf4NWZ*Q!{f5ODks=S2uSLPp{yR(6I1`$f)F$)U@=B%&g*)(z5c3%Btp;*0%PJ
z&aO$5r%atTea6gLixw|gx@`H1m8&*w-m-Pu_8mKS9XfpE=&|D`PM*4S`O4L6*Kgds
z_3+W-Cr_U}fAR9w$4{TXeEs(Q$Io9Ne=#yJL%ap|8JfQYf&OA*VPR%r2l<PUsT_!z
z1zA`X4cUYo1KAS`g_VpNIYgW$F5GyKQ`tD^gJ@FGMJ_QFlZUDwL0$v<j5v=qk>xYE
z#}NLy#lXYN2#h>tK?Zw<zm~swxBvNl^glxlm)*hK{|t5?>+dt|%ez{i*?per-}UYF
zyj!h3-+$4KyLEO=)Fs_dw_<EkHYyaIxbfsa1Ao-7lpY~%3qRw%yE4ii6_jr1nzL%H
zx~S^2na48YxxUz1KT6yB_}G@de8DWU4>!A)OV8p+j$!rrd-v|g>(_Sc&E4<S$p6PD
s-#t-Cz}D_-)MbZUt1A;Y4HZ@XvPOC46#FfCb@S}Kllqfx%KyI!0F>4jhX4Qo

literal 0
HcmV?d00001

diff --git a/static/data/up.jpg b/static/data/up.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c4620b273f07801de8d68cf470101d585e217817
GIT binary patch
literal 731
zcmex=<NpH&0WUXCHwH#VMur3+WcYuZ!I^=Xi3x;&fCY$HIapa)SXjB(+1WUFxOjND
zxwyG``Gf>``2_j6xdp@o1cgOJMMZh|#U;c<B!omnML>oyG6VInuyV4pa*FVB^NNrR
z{vTiv<Y3@p;A3V~Vqg+vWEN!ne}qAvfq{_~=vt72p@5MI=teen4o)s^pn|Oe3`~s7
z%uFoIAXfub*8=4kSOi&x6b&8OgaZ@Vl?p|S8YeE~P<GmQP&DY`2NmO_q9#r*F>wh=
zDOELf4NWZ*Q!{f5ODks=S2uSLPp{yR(6I1`$f)F$)U@=B%&g*)(z5c3%Btp;*0%PJ
z&aO$5r%atTea6gLixw|gx@`H1m8&*w-m-Pu_8mKS9XfpE=&|D`PM*4S`O4L6*Kgds
z_3+W-Cr_U}fAR9w$4{TXeEs(Q$Io9Ne=#yJL%ap|8JfQYf&OA*VPR%r2l<PUsT_!z
z1zA`X4cUYo1KAS`g_VpNIYgW$F5GyKQ`tD^gJ@FGMJ_QFlZUDwL0$v<j5v=qk>xYE
z#}NLy#lXYN2#h>tK?Zw<U+cfk{IU6CweQZ&7xxMO5D(uw$x^I(Z^140)+zE|4Vl~=
zkDs~M&a}7qVfqnS|6}_Ew(kEZ-}+UaJv&+OZszun6U-Y=ySWv$Z?F1tN?YUL%AJ-q
f{a(wo=K7czd|WK@_}kQ<^Q&LyANHH;|NkZcac22r

literal 0
HcmV?d00001