diff --git a/.env.production b/.env.production
index f813048..9ffb4ac 100644
--- a/.env.production
+++ b/.env.production
@@ -2,4 +2,6 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = 'http://data.it-blog.wang/api/v1/'
\ No newline at end of file
+#VUE_APP_BASE_API = 'http://data.it-blog.wang/api/v1/'
+#VUE_APP_BASE_API = 'http://abc.zhangjiwei.top/api/v1/'
+VUE_APP_BASE_API = 'http://www.zhishidata.com/api/v1/'
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index 60d3c8f..879927c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,6 +5,58 @@
   </div>
 </template>
 
+<script>
+export default {
+  data () {
+    return {
+      // _beforeUnload_time:0,
+      // _gap_time:0,
+    }
+  }, 
+  mounted(){
+    // var that = this;
+    // window.addEventListener('beforeunload', e => that.beforeunloadHandler());
+    // window.addEventListener('unload', e => that.unloadHandler());
+    // window.onbeforeunload=function (){ 
+    //   console.log(event)
+    // if(event.clientX>document.body.clientWidth && event.clientY < 0 || event.altKey){ 
+    // alert("你关闭了浏览器"); 
+    // }else{ 
+    // alert("你正在刷新页面"); 
+    // } 
+    // }
+  },
+  methods:{
+    //   beforeunloadHandler(){
+    //     // return "故Aug阿U噶阿U噶"
+    //     this._beforeUnload_time=new Date().getTime();
+    //     console.log("777777");
+    //   },
+    //   unloadHandler(){
+    //     // return "发挥的撒的女孩三等奖撒娇"
+    //     // console.log("888888"); 
+    //     this._gap_time=new Date().getTime()-this._beforeUnload_time;
+    //     // console.log(this._gap_time,"1111111111111")
+    //     //debugger
+    //     //判断是窗口关闭还是刷新
+    //     // if(this._gap_time<=5){
+    //     //   console.log("3333333333")
+    //     //   var xhr = new XMLHttpRequest();
+    //     //   xhr.open("GET",'http://localhost:8080/v1/member/index/logout?access-token='+sessionStorage.getItem('tokenB'), false);
+    //     //   xhr.setRequestHeader('Authorization','Bearer'+sessionStorage.getItem('token'))
+    //     //   xhr.send();
+    //     // }else{
+    //     //   console.log("2222222222222")
+    //     // }
+    // }
+  },
+  // destroyed() {
+  //   let that = this;
+  //     window.removeEventListener('beforeunload', e => that.beforeunloadHandler(e))
+  //     window.removeEventListener('unload', e => that.unloadHandler(e))
+  //   }
+}
+</script>
 <style lang="scss">
 // 引入去掉浏览器默认样式css
 @import './assets/css/selfSetCss.css';
@@ -23,3 +75,4 @@ background-color: rgba(0,0,0,0.5);
 font-size: .75rem;
 }
 </style>
+
diff --git a/src/assets/js/computeddata.js b/src/assets/js/computeddata.js
index 67e62c6..b8b0f63 100644
--- a/src/assets/js/computeddata.js
+++ b/src/assets/js/computeddata.js
@@ -246,10 +246,12 @@ class computedFunc {
   }
   // 处理input选中数据
   inputSelectData (listArr, lineArr) { // listArr 列选中的数组    //line行选中的数组
+
     // 重定向数组
     let listArrs = JSON.parse(JSON.stringify(listArr))
     let lineArrs = JSON.parse(JSON.stringify(lineArr))
     listArrs.unshift(0) // 必选第一项
+
     if (this.restur.tableLine.length < listArrs.length) {
       listArrs = this.restur.tableLine.map((item, index) => {
         return index
@@ -272,6 +274,7 @@ class computedFunc {
     })
     // this.selectData.tableLine = this.restur.tableLine
     let datart = JSON.parse(JSON.stringify(this.restur.countData))
+   
     let csd1 = datart.map((itemCol, indexCol) => {
       let newArr = {}
       Object.keys(itemCol).forEach((itemRow, indexRow) => {
@@ -281,6 +284,7 @@ class computedFunc {
       })
       return newArr
     })
+
     this.selectData.countData = lineArrs.map((lineItem, lineIndex) => {
       return csd1[lineItem]
     })
@@ -519,7 +523,8 @@ class computedFunc {
   dataSumLine () {
     let dataRs = JSON.parse(JSON.stringify(this.restur))
     dataRs.tableLine.push({
-      label: 'SUM求和' + this.restur.computedNum,
+      // label: 'SUM求和' + this.restur.computedNum,
+      label: 'SUM求和',
       labelId: 'table_line' + dataRs.tableLine.length
     })
     let bth = dataRs.countData.map((item, index) => {
@@ -556,7 +561,8 @@ class computedFunc {
     let returObj = {}
     transSum.forEach((item, index) => {
       if (index === 0) {
-        returObj['table_line' + index] = 'SUM求和' + this.restur.computedNum
+        //  returObj['table_line' + index] = 'SUM求和' + this.restur.computedNum
+        returObj['table_line' + index] = 'SUM求和'
       }
       returObj['table_line' + (index + 1)] = item
     })
@@ -1294,6 +1300,7 @@ class computedFunc {
     shHangData = tableData.map((item, index) => {
       return Object.values(item)
     })
+    console.log(5555)
     let hangAllDatas = null
     hangAllDatas = tableLine.map((item, index) => {
       return tableLine[index].label
diff --git a/src/components/chartsCont/ChartsCont.vue b/src/components/chartsCont/ChartsCont.vue
index a7c97f5..64572f5 100644
--- a/src/components/chartsCont/ChartsCont.vue
+++ b/src/components/chartsCont/ChartsCont.vue
@@ -10,10 +10,11 @@
                 style="width: 100%"
                 height="360px"
                 ref="table">
+                <!-- :width="computedWidth(index)" -->
         <el-table-column :prop="item.labelId"
                          :label="item.label"
                          :fixed="index===0?true:false"
-                         :width="computedWidth(index)"
+                         width="190"
                          sortable
                          show-overflow-tooltip
                          v-for="(item,index) in tableLine"
@@ -50,13 +51,21 @@
                  :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>
+            <!-- <span>{{scope.row['table_line'+index]}}</span> -->
+            <!-- //颜色转变 -->
+            <!-- :style="{'color':(computedListSty(scope.$index)||computedLineSty(index))?'red':''}" -->
+             <span
+              
+            >
+            <!-- {{isNaN(scope.row['table_line'+index])?:}} -->
+           {{isNaN(scope.row['table_line'+index])?scope.row['table_line'+index]:isNaN(parseFloat(scope.row['table_line'+index]))?'暂无数据':parseFloat(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" v-if="computedTableExplain"></div>
+      <div class="tableExplain descnull" v-else >暂无数据</div>
       <!-- 指标弹窗 -->
     </div>
     <div v-if="!transBefore&&!loadings"
@@ -283,7 +292,7 @@ export default {
       // 转置前总数据
       // transBefore: {
       //   tableExplain: '',
-      //   timeArr: [],
+        timeArr: [],
       //   termsName: [],
       //   termsExplain: [],
       //   areaName: [],
@@ -408,7 +417,7 @@ export default {
           // this.tableLine = []
           // this.tableData = []
         }
-        // this.$store.state.tableLine = this.tableLine
+        this.$store.state.tableLine = this.tableLine
         // console.log(this.tableLine, '指标数据')
       },
       immediate: true,
@@ -1762,6 +1771,14 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.descnull{
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  font-size: 2rem;
+    text-align: center;
+    color: #ccc!important;
+}
 .tishi54 {
   margin-top: 12rem;
   font-size: 2rem;
@@ -1809,6 +1826,10 @@ export default {
 /deep/ .cell > span {
   // white-space: nowrap;
   flex-shrink: 0;
+    width: 145px;
+    // height: 100px;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 /deep/ .cell > span:hover {
   cursor: pointer;
diff --git a/src/components/chartsCut/ChartsCut.vue b/src/components/chartsCut/ChartsCut.vue
index 8e54f5e..85c1f7a 100644
--- a/src/components/chartsCut/ChartsCut.vue
+++ b/src/components/chartsCut/ChartsCut.vue
@@ -566,12 +566,13 @@ export default {
             this.childFuncChangeDown()
             break
           case 'quarter':
-            if (!(this.timeUsrr.length === 5 || this.timeUsrr.length === 11)) {
-              this.$alert('您查询的时间格式有误，请重新输入！', '温馨提示', {
-                confirmButtonText: '确定'
-              })
-              return
-            }
+            console.log(this.timeUsrr,"111111111111111")
+            // if (!(this.timeUsrr.length === 5 || this.timeUsrr.length === 11)) {
+            //   this.$alert('您查询的时间格式有误，请重新输入！', '温馨提示', {
+            //     confirmButtonText: '确定'
+            //   })
+            //   return
+            // }
             let arr = ['A', 'B', 'C', 'D']
             // 对于一个季度的验证
             if (this.timeUsrr.length === 5) {
diff --git a/src/components/footerInfor/FooterInfor.vue b/src/components/footerInfor/FooterInfor.vue
index cfd2acd..7a8874f 100644
--- a/src/components/footerInfor/FooterInfor.vue
+++ b/src/components/footerInfor/FooterInfor.vue
@@ -3,8 +3,8 @@
     <div class="footer_header">
       <div class="footer_model">
         <div v-for="(item,index) in model_list" :key="index">
-          <div @click="skipTitle()" class="titleS">{{item.title}}</div>
-          <div v-for="(list,key) in item.cont" :key="key" @click="skipCont()">{{list.text}}</div>
+          <div @click="skipTitle(item.titleUrl)" class="titleS">{{item.title}}</div>
+          <div v-for="(list,key) in item.cont" :key="key" @click="skipCont(list.textUrl)">{{list.text}}</div>
         </div>
       </div>
     </div>
@@ -12,10 +12,10 @@
       <div class="bottom_model">
         <img :src="bottom_infor.leftImg" alt />
         <div>{{bottom_infor.introCopyright}}</div>
-        <div>{{bottom_infor.introSite}}</div>
+        <!-- <div>{{bottom_infor.introSite}}</div>
         <div>{{bottom_infor.introIdentificationCode}}</div>
         <div>{{bottom_infor.introAQ}}</div>
-        <img :src="bottom_infor.rightImg" alt />
+        <img :src="bottom_infor.rightImg" alt /> -->
       </div>
     </div>
   </div>
@@ -63,20 +63,22 @@ export default {
       // model_bottom 信息
       bottom_infor: {
         leftImg: require('../../../static/footerInfor/tbomleft.png'),
-        introCopyright: '版权所有：中华人民共和国国家统计局 党政机关',
-        introSite: '地址：北京市西城区月坛南街57号（100826）',
-        introIdentificationCode: '网站标识码 bm36000005',
-        introAQ: '京ICP备05034670号',
-        rightImg: require('../../../static/footerInfor/tbomRight.png')
+        introCopyright: 'Copyright 2020 河北知时数据科技有限公司 冀ICP备19011882',
+        // introSite: '地址：北京市西城区月坛南街57号（100826）',
+        // introIdentificationCode: '网站标识码 bm36000005',
+        // introAQ: '京ICP备05034670号',
+        // rightImg: require('../../../static/footerInfor/tbomRight.png')
       }
     }
   },
   methods: {
-    skipTitle () {
-
+    skipTitle (e) {
+      console.log(e)
+       window.open("http://"+e,"_blank")
     },
-    skipCont () {
-
+    skipCont (e) {
+      console.log(e)
+      window.open("http://"+e,"_blank")
     },
     // 获取底部导航数据
     getNavBottomInfor () {
@@ -104,6 +106,7 @@ export default {
             arrts.push(objuu)
           })
           this.model_list = arrts
+          console.log(this.model_list)
         }
       }).catch((fail) => {
         console.log(fail)
@@ -261,10 +264,10 @@ export default {
       -moz-box-direction: normal;
       -ms-flex-direction: row;
       flex-direction: row;
-      -webkit-justify-content: space-evenly;
-      -moz-box-pack: space-evenly;
-      -ms-flex-pack: space-evenly;
-      justify-content: space-evenly;
+      -webkit-justify-content: center;
+      -moz-box-pack: center;
+      -ms-flex-pack: center;
+      justify-content: center;
       -webkit-align-items: center;
       -moz-box-align: center;
       -ms-flex-align: center;
diff --git a/src/components/mapData/MapData.vue b/src/components/mapData/MapData.vue
index ea0c189..18739cd 100644
--- a/src/components/mapData/MapData.vue
+++ b/src/components/mapData/MapData.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="mapData">
+    <!-- 左侧指标栏列表 -->
     <div class="mapDataLeft"
          v-if="leftDafrt">
       <div v-if="leftDafrt.length!==0">指标名称</div>
@@ -7,7 +8,10 @@
       <div v-for="(item,index) in leftDafrt"
            :key="index"
            :class="{bgcolor:item.state}"
-           @click="trickChange(index)">{{item.name}}</div>
+           @click="trickChange(index)">
+           <div class="sanjiao"></div>
+           {{item.name}}
+           </div>
       <div style="margin:0 auto;color:#8fa3ae;font-size:1.375rem;"
            v-if="leftDafrt.length===0">暂无指标名</div>
     </div>
@@ -27,10 +31,10 @@
             <span :class="{'disable': !isReduceYear}"
                   @click="reduceYear"></span>
           </li>
-          <li v-for="(year, index) in mapYearList.slice(yearStart,yearEnd)"
+          <li v-for="(year, index) in mapYearList"
               :key="index"
               :class="{'selected': selectYear == year}"
-              @click="selectYear=year">
+              @click="changeyear(year)">
             {{ year }}<span v-if="selectYear == year"></span>
           </li>
           <li class="next">
@@ -39,10 +43,11 @@
           </li>
         </ul>
         <ul class="quarter">
+          <!--      @click="selectQuarter=index" -->
           <li v-for="(item, index) in quarterList"
               :key="index"
-              :class="{'selected': selectQuarter == index}"
-              @click="selectQuarter=index">
+              :class="{'selected': false}"
+         >
             {{ item }}<span v-if="selectQuarter == index"></span>
           </li>
         </ul>
@@ -63,7 +68,9 @@ export default {
   name: 'mapData',
   data () {
     return {
+      datalist:{},
       yearStart: '',
+      arr:[],
       yearEnd: '',
       isReduceYear: true,
       isAddYear: false,
@@ -140,7 +147,7 @@ export default {
               emphasis: { label: { show: true } }
             },
             data: [
-              { name: '北京', value: Math.round(Math.random() * 1000) },
+              { name: '北京', value:100 },
               { name: '天津', value: Math.round(Math.random() * 1000) },
               { name: '上海', value: Math.round(Math.random() * 1000) },
               { name: '重庆', value: Math.round(Math.random() * 1000) },
@@ -190,6 +197,7 @@ export default {
           placeholder: '2019'
         }
       ],
+      
       // 栏目数据   结构不可变
       cityDataTime: [
         {
@@ -271,10 +279,40 @@ export default {
           value: 'zhinan',
           label: '指南'
         }
-      ]
+      ],
+      //  visualMap: {
+      //       min: 800,
+      //       max: 50000,
+      //       text: ['High', 'Low'],
+      //       realtime: false,
+      //       calculable: true,
+      //       inRange: {
+      //           color: ['lightskyblue', 'yellow', 'orangered']
+      //       }
+      //   },
     }
   },
   methods: {
+    changeyear(e){
+      console.log(e,79464333333)
+      this.selectYear=e
+      for(let i=0;i<Object.keys(this.datalist).length;i++){
+        if(e == Object.keys(this.datalist)[i]){
+             console.log(i)
+           this.arr =  this.datalist[Object.keys(this.datalist)[i]]
+        }
+      }
+      console.log(this.arr,'0000')
+      this.option.series[0].data = this.arr
+      // this.setMapLabel(
+      //         this.arr
+      // )
+       this.option.dataRange.splitList = this.setMapLabel(
+               this.arr
+      )
+      this.showMapData()
+      
+    },
     // 获取左侧菜单数据
     getCateData () {
       this.$axios({
@@ -394,14 +432,14 @@ export default {
       // this.showMapData()
     },
     changesInputStu () {
-      // console.log(12569)
+      console.log(12569)
     },
     monthDataState (resu) {
-      // console.log(resu)
+      console.log(resu)
       // console.log(this.cityDefaultName)
     },
     monthDataChange () {
-      // console.log(12569)
+      console.log(12569)
     },
     // 地图左侧指标名称显示
     searchDataMap () {
@@ -456,17 +494,29 @@ export default {
         }
       })
         .then(res => {
-          console.log(res, '数据地图数据')
+          //console.log(res, '数据地图数据')
           // 请求接口完成   请求成功
           if (res.data.code === 200) {
+            this.datalist=res.data.data.list
+            this.initYearList()
             console.log(
               res.data.data.list,
               'Object.values(res.data.data.list)'
             )
             // 设置地图数值区间
-            this.option.dataRange.splitList = this.setMapLabel(
-              res.data.data.list
-            )
+            // this.option.dataRange.splitList = this.setMapLabel(
+            //   res.data.data.list
+            // )
+            let year = ''
+            // for(let i=0;i<Object.keys(this.datalist).length;i++){
+            //  // if(e == Object.keys(this.datalist)[i]){
+            //     year=  Object.keys(this.datalist)[i]
+            //   //  console.log(year)
+            //   //}
+            // }
+              year=  Object.keys(this.datalist)[0]
+          //  console.log(year,"啊撒撒的撒打")
+            this.changeyear(year);
             this.option.legend.data = [
               this.leftDafrt.find((item, index) => {
                 return item.state === true
@@ -515,9 +565,12 @@ export default {
     },
     // 根据地图数值设置数值区间
     setMapLabel (data) {
-      // 数据地图显示的是当年的数据，他把每年的数据分为6个阶段，每个阶段都增加一个固定的值，这个值的计算方式为：当年各地区的最大数据减去最小数据 然后除以6  这个是每个阶段的增加的固定值，第一个区间是：最小值---最小值+固定值   第二区间为： 最小值+固定值----最小值+固定值+固定值，以此类推，最后一个为：最小值+固定值*5----最大值
-      let max = 0
+      console.log(data.length,'sssssssssss')
+       let max = 0
       let min = 0
+      // 数据地图显示的是当年的数据，他把每年的数据分为6个阶段，每个阶段都增加一个固定的值，这个值的计算方式为：当年各地区的最大数据减去最小数据 然后除以6  这个是每个阶段的增加的固定值，第一个区间是：最小值---最小值+固定值   第二区间为： 最小值+固定值----最小值+固定值+固定值，以此类推，最后一个为：最小值+固定值*5----最大值
+      if(data.length == undefined){
+     
       for (let key in data) {
         min = Number(data[key][0].value)
       }
@@ -531,6 +584,21 @@ export default {
         })
       }
       console.log('最大值：' + max, '最小值：' + min)
+        //   for(let a=0;a<data.length;a++){
+        //   if(data[a].name == "总计"){
+        //         data = data.splice(a,1)
+        //         console.log(data,'123456789')
+        //         break
+        //   }else if(data[a].name == "合计"){
+        //       data = data.splice(a,1)
+        //         console.log(data,'123456789')
+        //         break
+        //   }else{
+        //      max = data[a].value > max ? parseFloat(data[a].value) : max
+        //     min = data[a].value < min ? parseFloat(data[a].value) : min
+        //   }
+         
+        // }
       let list = [{ start: 0, end: 1 }]
       let temp = parseFloat(((max - min) / 6).toFixed(4))
       console.log(temp, '固定值')
@@ -538,7 +606,8 @@ export default {
         i === 0
           ? (list[i] = {
             start: parseFloat((min + temp * (5 - i)).toFixed(2)),
-            end: parseFloat(Math.ceil(max).toFixed(2))
+            // end: parseFloat(Math.ceil(max).toFixed(2))
+            end: parseFloat(max.toFixed(2))
           })
           : (list[i] = {
             start: parseFloat((min + temp * (5 - i)).toFixed(2)),
@@ -547,6 +616,44 @@ export default {
       }
       console.log(list, '区间列表')
       return list
+      }else{
+        
+        for(let a=0;a<data.length;a++){
+          if(data[a].name == "总计"){
+                data = data.splice(a,1)
+                console.log(data,'123456789')
+                break
+          }else if(data[a].name == "合计"){
+              data = data.splice(a,1)
+                console.log(data,'123456789')
+                break
+          }else{
+            max = data[a].value > max ? parseFloat(data[a].value) : max
+            min = data[a].value < min ? parseFloat(data[a].value) : min
+          }
+         
+        }
+        console.log(max,min,'000000')
+        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))
+             end: parseFloat(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) {
@@ -564,22 +671,25 @@ export default {
       this.showMapData()
     },
     initYearList () {
-      const year = 2000
+     // console.log(this.datalist,'wsnbb')
+     // console.log(Object.keys(this.datalist)[0],"thisyaear")
+      const year = Object.keys(this.datalist)[0]
       let arrYear = []
-      let thisYear = new Date().getFullYear()
+      let thisYear = Object.keys(this.datalist)[ Object.keys(this.datalist).length-1]
       var section = thisYear - year
       for (let i = 0; i <= section; i++) {
         arrYear.push(thisYear--)
       }
-      this.yearEnd = arrYear.length
-      this.yearStart = arrYear.length - 10
+      this.yearEnd = arrYear[0]
+      this.yearStart = arrYear.length-1
       this.selectYear = arrYear[0]
       this.mapYearList = arrYear.reverse()
-      console.log(this.selectYear)
-      console.log(this.mapYearList)
+      //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
@@ -611,7 +721,6 @@ export default {
   },
   mounted () {
     // 初始化年份列表
-    this.initYearList()
     // 查询左侧数据
     this.searchDataMap()
     // 获取菜单信息
@@ -625,6 +734,15 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.sanjiao{
+ width: 0;
+  height: 0;  
+  border-top: 7px solid transparent;
+  border-bottom: 7px solid transparent;
+  border-left: 7px solid #007AFF;
+  margin-top:-2px!important;
+  margin-right:3px
+}
 /deep/ .el-col-24 {
   min-width: 100%;
   width: auto;
@@ -670,12 +788,14 @@ export default {
     & > div {
       padding-left: 10%;
       width: 90%;
-      height: 3.2rem;
+      height: 2.5rem;
       display: flex;
       flex-direction: row;
       justify-content: flex-start;
       align-items: center;
-      font-size: 1.375rem;
+      font-size: 14px;
+      // font-size: 1.375rem;
+      // background: red;
     }
     & > div:hover {
       cursor: pointer;
@@ -753,6 +873,7 @@ export default {
             bottom: 9px;
             right: 23px;
             cursor: pointer;
+            left: 10px;
           }
           .disable {
             background: url(../../../static/data/left-disable.jpg) no-repeat
@@ -762,6 +883,7 @@ export default {
             height: 11px;
             bottom: 9px;
             right: 23px;
+            left: 10px;
             cursor: pointer;
           }
         }
@@ -773,7 +895,7 @@ export default {
             width: 13px;
             height: 11px;
             bottom: 9px;
-            right: 23px;
+            right: 10px;
             cursor: pointer;
           }
           .disable {
@@ -783,7 +905,7 @@ export default {
             width: 13px;
             height: 11px;
             bottom: 9px;
-            right: 23px;
+            right: 10px;
             cursor: pointer;
           }
         }
diff --git a/src/components/nav/Nav.vue b/src/components/nav/Nav.vue
index 19a94e5..32c7543 100644
--- a/src/components/nav/Nav.vue
+++ b/src/components/nav/Nav.vue
@@ -13,13 +13,13 @@
         <div style="position:relative;">
           {{item.text}}
           <!-- 数据二级导航 -->
-          <div class="dataTwo"
+          <!-- <div class="dataTwo"
                v-if="twonav&&index===1">
             <div @click="jumpData('monthly')">月度数据</div>
             <div @click="jumpData('quarter')">季度数据</div>
             <div @click="jumpData('year')">年度数据</div>
             <div @click="jumpData('area')">地区数据</div>
-          </div>
+          </div> -->
         </div>
       </div>
       <div class="dsearch">
@@ -60,21 +60,25 @@
           <div>
             <img :src="imageUrl.usernames"
                  alt />
-            <input type="text"
+            <!-- <input type="text"
                    placeholder="请输入用户名"
-                   v-model="username" />
+                   v-model="username" /> -->
+
+            <el-input v-model="username" placeholder="请输入用户名"></el-input>
           </div>
           <div>
             <img :src="imageUrl.userpwds"
                  alt />
-            <input type="password"
+            <!-- <input type="password"
                    placeholder="请输入密码"
-                   v-model="userpwd" />
+                   v-model="userpwd" /> -->
+                   <el-input v-model="userpwd" type="password" placeholder="请输入密码"></el-input>
           </div>
           <div>
-            <input type="text"
+            <!-- <input type="text"
                    placeholder="请输入验证码"
-                   v-model="useryzm" />
+                   v-model="useryzm" /> -->
+            <el-input v-model="useryzm" border="none" placeholder="请输入验证码"></el-input>
             <canvas ref="identifyDom"
                     @click="get_identity()"></canvas>
           </div>
@@ -135,6 +139,7 @@ export default {
   },
   methods: {
     navClick (indexs, url) {
+      console.log(url);
       if (indexs !== 1) {
         this.twonav = false
         this.colorD = false
@@ -147,6 +152,9 @@ export default {
             path: url
           })
         }
+      }else{
+        this.jumpData('monthly')
+        localStorage.setItem("active",0)
       }
     },
     navMouseClick (indexs, url, statics) {
@@ -219,7 +227,8 @@ export default {
             }
           })
             .then(res => {
-              // console.log(res)
+              console.log(res.data.data.user_type)
+              localStorage.setItem('user_type', '1')
               // 请求接口完成注册   请求成功
               if (res.data.code === 200) {
                 this.showWinStatic = !this.showWinStatic
@@ -227,7 +236,9 @@ export default {
                 // 用户信息存本地
                 sessionStorage.setItem('username', res.data.data.username)
                 sessionStorage.setItem('pic', res.data.data.pic)
+                sessionStorage.setItem('is_status', res.data.data.is_status)
                 sessionStorage.setItem('userPwd', this.userpwd)
+                // localStorage.setItem('user_type', res.data.data.user_type)
                 sessionStorage.setItem(
                   'token',
                   'Bearer ' + res.data.data.token
@@ -331,6 +342,7 @@ export default {
           // alert(res.data.message)
           // 请求接口完成注册   请求成功
           if (res.data.code === 200) {
+            localStorage.setItem('user_type', '3')
             console.log(this.$route.path, 'this.$router.path')
             if (this.$route.path !== '/') {
               this.$router.push({
@@ -368,42 +380,60 @@ export default {
   mounted () {
     window.addEventListener('keydown', this.keyDown)
     // IP端
+    let type =localStorage.getItem('user_type');
     this.$axios({
-      method: 'GET',
-      url: 'site/check',
-      params: {}
-    }).then(res => {
-      // console.log(res, 'IP段')
-      if (res.data.code === 200) {
-        this.$store.state.normalLogin = false
-        // 用户信息存本地
-        sessionStorage.setItem('username', res.data.data.username)
-        sessionStorage.setItem('pic', res.data.data.pic)
-        sessionStorage.setItem('userPwd', '123456')
-        sessionStorage.setItem('token', 'Bearer ' + res.data.data.token)
-        sessionStorage.setItem('tokenB', res.data.data.token)
-        window.setTimeout(() => {
-          sessionStorage.clear()
-          location.reload()
-        }, 7200000)
-        // 登录状态
-        sessionStorage.setItem('userLogin', false)
-        this.$auth = true
-        this.$store.state.ipLogin = true
-      } else {
-        if (this.$store.state.ipLogin) {
-          sessionStorage.clear()
-          this.$store.state.ipLogin = false
+      method: 'POST',
+      url: 'member/index/contrast',
+      data: {
+        is_status: sessionStorage.getItem('is_status'),
+        username: sessionStorage.getItem('username'),
         }
-      }
-      this.userLogin = sessionStorage.getItem('userLogin')
-      this.userName = sessionStorage.getItem('username')
-      this.userPic = sessionStorage.getItem('pic')
-      this.$store.state.normalLogin = this.userLogin
-      // 请求接口完成   请求成功
-    }).catch((fail) => {
-      console.log(fail)
+      })
+      .then(res => {
+           console.log(res) 
     })
+    console.log(type)
+    if(type != 3){
+      console.log(123)
+      this.$axios({
+        method: 'GET',
+        url: 'site/check',
+        params: {}
+      }).then(res => {
+        // console.log(res, 'IP段')
+        if (res.data.code === 200) {
+          this.$store.state.normalLogin = false
+          // 用户信息存本地
+          sessionStorage.setItem('username', res.data.data.username)
+          sessionStorage.setItem('pic', res.data.data.pic)
+          sessionStorage.setItem('userPwd', '123456')
+          sessionStorage.setItem('token', 'Bearer ' + res.data.data.token)
+          sessionStorage.setItem('tokenB', res.data.data.token)
+          window.setTimeout(() => {
+            sessionStorage.clear()
+            location.reload()
+          }, 7200000)
+          // 登录状态
+          sessionStorage.setItem('userLogin', false)
+          this.$auth = true
+          this.$store.state.ipLogin = true
+        } else {
+          if (this.$store.state.ipLogin) {
+            sessionStorage.clear()
+            this.$store.state.ipLogin = false
+          }
+        }
+        this.userLogin = sessionStorage.getItem('userLogin')
+        this.userName = sessionStorage.getItem('username')
+        this.userPic = sessionStorage.getItem('pic')
+        this.$store.state.normalLogin = this.userLogin
+        // 请求接口完成   请求成功
+      }).catch((fail) => {
+        console.log(fail)
+      })
+    }else{
+      console.log("1")
+    }
     let that = this
     // 监听对象的变化
     /* eslint-disable */
@@ -418,6 +448,12 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+/deep/ .el-input__inner{
+  border: none;
+  height: 3.25rem;
+  line-height: 3.25rem;
+  font-size: 20px;
+}
 // 登陆窗口
 .loginSty {
   position: fixed;
diff --git a/src/components/search/search.vue b/src/components/search/search.vue
index b21579a..d3f5b1a 100644
--- a/src/components/search/search.vue
+++ b/src/components/search/search.vue
@@ -8,7 +8,11 @@
       <div class="tjHold">
         统计热词
         <div>
-          <div v-for="(item,index) in hotFont" :key="index" :title="item" @click="blurUpset(item)">{{comHotCi(item)}}</div>
+          <div v-for="(item,index) in hotFont" :key="index" :title="item">
+            <span @click="blurUpset(item)"> {{comHotCi(item)}}</span>
+           
+            <!-- <span class="el-icon-close delhot" @click="del(index)"></span> -->
+            </div>
         </div>
       </div>
     </div>
@@ -27,6 +31,11 @@ export default {
     }
   },
   methods: {
+     del(e){
+      // console.log(e,1998)
+      this.hotFont.splice(e,1)
+      // console.log(this.hotFont)
+    },
     blurUpset (textCont) {
       /*eslint-disable*/
       console.log(textCont, '3523')
@@ -92,6 +101,14 @@ export default {
 }
 </script>
 <style scoped lang="scss">
+.delhot{
+  font-size: 1rem;
+  position: relative;
+  top: -1rem;
+}
+.delhot:hover{
+  color:red;
+}
 .searchAll {
   width: 100%;
   display: -webkit-flex;
diff --git a/src/main.js b/src/main.js
index 65456b4..59e5169 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,6 +15,9 @@ import VueAwesomeSwiper from 'vue-awesome-swiper'
 // require styles
 import 'swiper/dist/css/swiper.css'
 
+// import Astrict from './util/a.js'
+
+
 // 全局指定配置
 // 自定义指令实现back-top;
 Vue.directive('scroll-show', {
@@ -95,6 +98,7 @@ axios.interceptors.response.use(data => {
 // 将图形验证码写入
 Vue.prototype.$identify = identify.default
 Vue.prototype.$axios = axios
+// Vue.use(Astrict)
 // 引入设置dom元素高度的插件
 Vue.prototype.$detector = require('element-resize-detector')
 // vue人员权限
diff --git a/src/util.zip b/src/util.zip
new file mode 100644
index 0000000..c9bb0fa
Binary files /dev/null and b/src/util.zip differ
diff --git a/src/util/a.js b/src/util/a.js
new file mode 100644
index 0000000..6d74fe8
--- /dev/null
+++ b/src/util/a.js
@@ -0,0 +1,89 @@
+import axios from 'axios'
+var lastTime = new Date().getTime();
+var currentTime = new Date().getTime();
+var timeOut = 30*60*1000; //设置超时时间： 30分
+  
+window.onload = function () {
+  window.document.onmousedown = function () {
+    localStorage.setItem("lastTime",new Date().getTime());
+  }
+};
+function checkTimeout() {
+  currentTime = new Date().getTime(); //更新当前时间
+  lastTime = localStorage.getItem("lastTime");
+  // console.log(currentTime - lastTime);
+  // console.log(timeOut);
+  if (currentTime - lastTime > timeOut) { //判断是否超时
+    console.log("超时");
+    axios({
+      method: 'GET',
+      url: 'member/index/logout',
+      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) {
+          localStorage.setItem('user_type', '3')
+          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)
+      })
+    // var url = window.location.href;
+    // var newUrl=url.match(/(\S*)#/)[1];
+     
+    // window.open(newUrl + '#/login','_self');
+  }
+}
+  
+/* 定时器 间隔30秒检测是否长时间未操作页面 */
+window.setInterval(checkTimeout, 300000);
+
+
+// // 引入路由和storage工具函数
+// // import storage from '../util/s.js'
+// // import router from "@/common/router"
+
+// let lastTime = new Date().getTime()
+// let currentTime = new Date().getTime()
+// let timeOut = 3000  //设置超时时间: 30分钟
+
+// window.onload = function () {
+//   window.document.onmousedown = function () {
+//     stroage.setItem("lastTime", new Date().getTime())
+//   }
+// };
+
+// function checkTimeout() {
+//   currentTime = new Date().getTime()        //更新当前时间
+//   lastTime = stroage.getItem("lastTime");
+
+//   if (currentTime - lastTime > timeOut) { //判断是否超时
+//     console.log('123456789')
+//     // 清除storage的数据(登陆信息和token)
+//    // storage.clear()
+//     // 跳到登陆页
+//     // if(router.currentRouter.name == 'login') return // 当前已经是登陆页时不做跳转
+//     // router.push({ name: 'login' })
+//   }
+// }
+
+// export default function () {
+//   /* 定时器 间隔30秒检测是否长时间未操作页面 */
+//   window.setInterval(checkTimeout, 1000);
+// }
diff --git a/src/util/s.js b/src/util/s.js
new file mode 100644
index 0000000..36bf4ac
--- /dev/null
+++ b/src/util/s.js
@@ -0,0 +1,19 @@
+export default {
+    setItem(key, value) {
+      value = JSON.stringify(value);
+      window.localStorage.setItem(key, value)
+    },
+    getItem(key, defaultValue) {
+      let value = window.localStorage.getItem(key)
+      try {
+        value = JSON.parse(value);
+      } catch {}
+      return value || defaultValue
+    },
+    removeItem(key) {
+      window.localStorage.removeItem(key)
+    },
+    clear() {
+      window.localStorage.clear()
+    },
+  }
\ No newline at end of file
diff --git a/src/views/datasweb/Datasweb.vue b/src/views/datasweb/Datasweb.vue
index 833ed70..d6d6a5d 100644
--- a/src/views/datasweb/Datasweb.vue
+++ b/src/views/datasweb/Datasweb.vue
@@ -13,10 +13,15 @@
         <!-- 主内容 -->
         <div class="mainCont">
           <div class="header">
-            <div class="left">{{posaite[dataPos]}}</div>
+            <div class="left" style="display:flex">
+              <div @click="jumpData('monthly',0)" :class="active == 0?'activeing':''">月度数据</div>
+              <div @click="jumpData('quarter',1)" :class="active == 1?'activeing':''">季度数据</div>
+              <div @click="jumpData('year',2)" :class="active == 2?'activeing':''">年度数据</div>
+              <div @click="jumpData('area',3)" :class="active == 3?'activeing':''">地区数据</div>
+            </div>
+            <!-- <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>
               >
@@ -24,45 +29,50 @@
             </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>
@@ -72,81 +82,94 @@
               </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':'':''}"
-                                :class="!item1.children ? 'is-show-icon' : ''">
+                  
+                  <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':'':''}"
-                                  :class="!item2.children ? 'is-show-icon' : ''">
+                      <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':'':''}"
-                                    :class="!item3.children ? 'is-show-icon' : ''">
+                        <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':'':''}"
-                                      :class="!item4.children ? 'is-show-icon' : ''">
+                          <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':'':''}"
-                                        :class="!item5.children ? 'is-show-icon' : ''">
+                            <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>
@@ -166,53 +189,61 @@
               <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>-->
@@ -221,9 +252,11 @@
           </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>
@@ -234,67 +267,65 @@
     <!-- 指标解释 -->
     <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>
 
 <script>
 // 导航
-import Nav from '@/components/nav/Nav.vue'
+import Nav from "@/components/nav/Nav.vue";
 // 页脚信息
-import FooterInfor from '@/components/footerInfor/FooterInfor.vue'
+import FooterInfor from "@/components/footerInfor/FooterInfor.vue";
 // 全局搜索
-import search from '@/components/search/search.vue'
+import search from "@/components/search/search.vue";
 // 引入拖拽组件
-import VueDragResize from 'vue-drag-resize'
+import VueDragResize from "vue-drag-resize";
 // 引入图表切换组件
-import ChartsCut from '@/components/chartsCut/ChartsCut.vue'
+import ChartsCut from "@/components/chartsCut/ChartsCut.vue";
 // 引入图表组件
-import ChartsCont from '@/components/chartsCont/ChartsCont.vue'
+import ChartsCont from "@/components/chartsCont/ChartsCont.vue";
 // 引入高级查询组件
-import AdvancedQuery from '@/components/advancedQuery/AdvancedQuery.vue'
+import AdvancedQuery from "@/components/advancedQuery/AdvancedQuery.vue";
 // 引入数据地图组件
-import MapData from '@/components/mapData/MapData.vue'
+import MapData from "@/components/mapData/MapData.vue";
 // 新增指标组件
-import InsertLabel from '@/components/insertLabel/InsertLabel.vue'
+import InsertLabel from "@/components/insertLabel/InsertLabel.vue";
 // 筛选
-import ScreenCom from '@/components/screenCom/ScreenCom.vue'
+import ScreenCom from "@/components/screenCom/ScreenCom.vue";
 // 编辑
-import EditCom from '@/components/editCom/EditCom.vue'
+import EditCom from "@/components/editCom/EditCom.vue";
 // 添加收藏
-import AddCollect from '@/components/addCollect/AddCollect.vue'
+import AddCollect from "@/components/addCollect/AddCollect.vue";
 // 指标解释
-import LabelExplain from '@/components/labelExplain/LabelExplain.vue'
+import LabelExplain from "@/components/labelExplain/LabelExplain.vue";
 // 维度转换  地区
-import Dimension from '@/components/dimension/Dimension.vue'
+import Dimension from "@/components/dimension/Dimension.vue";
 // 维度转换  非地区
-import NoAreaDimension from '@/components/noAreaDimension/NoAreaDimension.vue'
+import NoAreaDimension from "@/components/noAreaDimension/NoAreaDimension.vue";
 // 引入数据计算js用于机选渲染的数据
-import ComputedData from '../../assets/js/computeddata'
+import ComputedData from "../../assets/js/computeddata";
 // 引入全局的createObjectUrl用于覆盖window.URL
 // import '../../assets/js/createObjectUrl'
 
 export default {
-  name: 'index',
+  name: "index",
   components: {
     Navs: Nav,
     FooterInfors: FooterInfor,
@@ -312,74 +343,75 @@ export default {
     Dimension: Dimension,
     NoAreaDimension: NoAreaDimension
   },
-  data () {
+  data() {
     return {
+      active:0,
       loading: true,
       // 左侧当前默认
       defaultSelectLies: [],
       // 右侧默认显示数据
       defaultDataRight: null,
       // 菜单配置
-      activeIndex: '1',
-      activeIndex2: '1',
+      activeIndex: "1",
+      activeIndex2: "1",
       imgurl: {
-        pos: require('../../../static/company/posweizhi.png'),
-        tz: require('../../../static/data/tz145.png')
+        pos: require("../../../static/company/posweizhi.png"),
+        tz: require("../../../static/data/tz145.png")
       },
       // 本页所有位置
       posaite: {
-        monthly: '月度数据',
-        quarter: '季度数据',
-        year: '年度数据',
-        area: '地区数据'
+        monthly: "月度数据",
+        quarter: "季度数据",
+        year: "年度数据",
+        area: "地区数据"
       },
       // 当前位置状态
       dataPos: null,
       // data_title数据
       titleDatas: [
-        { text: '简单查询', iconUrl: require('../../../static/data/jdcx.png') },
-        { text: '高级查询', iconUrl: require('../../../static/data/gjcx.png') },
-        { text: '数据地图', iconUrl: require('../../../static/data/sjdt.png') },
-        { text: '添加收藏', iconUrl: require('../../../static/data/tjsc.png') },
+        { text: "简单查询", iconUrl: require("../../../static/data/jdcx.png") },
+        { 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'),
+          text: "数据管理",
+          iconUrl: require("../../../static/data/sjgl.png"),
           secondText: [
-            { text: '新增指标', static: false },
-            { text: '筛选', static: false },
-            { text: '统计', static: false },
-            { text: '恢复', static: false },
-            { text: '清除空行空列', static: false }
+            { text: "新增指标", static: false },
+            { text: "筛选", static: false },
+            { text: "统计", static: false },
+            { text: "恢复", static: false },
+            { text: "清除空行空列", static: false }
           ],
           threeText: [
-            { text: '对行运算', static: false },
-            { text: '对列运算', static: false }
+            { text: "对行运算", static: false },
+            { text: "对列运算", static: false }
           ],
           fourText: [
-            { text: 'SUM求和', static: false },
-            { text: 'x平均数', static: false },
-            { text: 'MAX最大值', static: false },
-            { text: 'MIN最小值', static: false },
-            { text: 'MD中位数', static: false },
-            { text: 'MO众数', static: false },
-            { text: 'S²方差', static: false },
-            { text: 'S标准差', static: false }
+            { text: "SUM求和", static: false },
+            { text: "x平均数", static: false },
+            { text: "MAX最大值", static: false },
+            { text: "MIN最小值", static: false },
+            { text: "MD中位数", static: false },
+            { text: "MO众数", static: false },
+            { text: "S²方差", static: false },
+            { text: "S标准差", static: false }
           ],
           static: false
         },
         {
-          text: '报表管理',
-          iconUrl: require('../../../static/data/bbgl.png'),
+          text: "报表管理",
+          iconUrl: require("../../../static/data/bbgl.png"),
           secondText: [
-            { text: '编辑', static: false },
-            { text: '转置', static: false },
-            { text: '维度转换', static: false },
-            { text: '保存默认', static: false },
-            { text: '恢复默认', static: false }
+            { text: "编辑", static: false },
+            { text: "转置", static: false },
+            { text: "维度转换", static: false },
+            { text: "保存默认", static: false },
+            { text: "恢复默认", static: false }
           ],
           static: false
         }
@@ -397,22 +429,22 @@ export default {
       // 切换状态 默认0
       indStatic: 0,
       // 数据管理  =================>
-      dataManage: ['新增指标', '筛选', '统计', '恢复', '清除空行空列'],
+      dataManage: ["新增指标", "筛选", "统计", "恢复", "清除空行空列"],
       // 统计数据
-      dataManageTJ: ['对行运算', '对列运算'],
+      dataManageTJ: ["对行运算", "对列运算"],
       // 运算
       dataManageTJComputed: [
-        'SUM求和',
-        'x平均数',
-        'MAX最大值',
-        'MIN最小值',
-        'MD中位数',
-        'MO众数',
-        'S²方差',
-        'S标准差'
+        "SUM求和",
+        "x平均数",
+        "MAX最大值",
+        "MIN最小值",
+        "MD中位数",
+        "MO众数",
+        "S²方差",
+        "S标准差"
       ],
       // 报表管理  ================>
-      reportManage: ['编辑', '转置', '维度转换', '保存默认', '恢复默认'],
+      reportManage: ["编辑", "转置", "维度转换", "保存默认", "恢复默认"],
       // 数据管理状态
       dataManageStatic: {
         mainStatic: false,
@@ -426,15 +458,15 @@ export default {
         // 转置
         transState: true,
         // 计算状态
-        computedStatic: { text: '无', stateType: 'line' }
+        computedStatic: { text: "无", stateType: "line" }
       },
       leftCateData: null,
       // 简单查询、高级查询、数据地图切换状态(simpleness（简单）、advanced（高级） 、map（地图）)
-      cutStateSeach: 'simpleness',
+      cutStateSeach: "simpleness",
       // 下拉筛选的数据时间
-      downLaSelect: '',
+      downLaSelect: "",
       // 下拉筛选的数据地区
-      downLaSelectArea: '',
+      downLaSelectArea: "",
       // 新增指标状态
       statesDf: 1,
       // 数据加载状态
@@ -455,249 +487,276 @@ export default {
       labelAreaStateks: false,
       // 存储过滤出来的所有值  左侧菜单
       filterDataArr: null
-    }
+    };
   },
   watch: {
-    changeState (val) {
+    changeState(val) {
       if (val) {
         this.chartsStatusMegger.transState = !this.chartsStatusMegger
-          .transState
-        this.$store.state.transState = this.chartsStatusMegger.transState
-        this.changeState = false
+          .transState;
+        this.$store.state.transState = this.chartsStatusMegger.transState;
+        this.changeState = false;
       }
     }
   },
   methods: {
+    // 跳到数据页面
+    jumpData (staData,id) {
+      localStorage.setItem("active",id)
+      if (this.$route.path !== '/datasweb') {
+        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.go(0)
+      }
+    },
     /*
      * @desc 触发子组件 childChartCont 的downLaSelects方法
      */
-    chuFachildChartCont () {
+    chuFachildChartCont() {
       // console.log(this.$refs, 'this.$refs789')
       this.$nextTick(() => {
-        this.$refs.childChartCont.downLaSelects()
-      })
+        this.$refs.childChartCont.downLaSelects();
+      });
     },
     // 地区数据维度转换状态
-    areaDimensionState (val) {
+    areaDimensionState(val) {
       // console.log(val, 'bbbval')
-      this.areaDimensionStateS = !this.areaDimensionStateS
+      this.areaDimensionStateS = !this.areaDimensionStateS;
     },
     // 维度转换非地区转置
-    changeValue (val) {
-      this.changeState = val
+    changeValue(val) {
+      this.changeState = val;
     },
     // 获取左侧菜单数据
-    getCateData () {
+    getCateData() {
       this.$axios({
-        method: 'GET',
-        url: 'data/data/list',
+        method: "GET",
+        url: "data/data/list",
         params: {
-          type: this.$route.query.type === 'area' ? 2 : 1,
-          f: this.$route.query.type === 'area' ? '' : this.$route.query.type
+          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()
+            this.leftCateData = res.data.data.list;
+            this.defaultSelectLie();
           }
         })
         .catch(fail => {
           // console.log(fail)
-        })
+        });
     },
     // 菜单选中配置
-    handleSelect (key, keyPath) {
+    handleSelect(key, keyPath) {
       // console.log(key, keyPath)
     },
-    handleClick (tab, event) {
+    handleClick(tab, event) {
       // console.log(tab, event, '选中')
     },
     // 拖拽事件
-    resizeEvents (newRect) {
+    resizeEvents(newRect) {
       // console.log(newRect)
-      this.width = newRect.width
-      this.height = newRect.height
-      this.top = newRect.top
-      this.left = newRect.left
+      this.width = newRect.width;
+      this.height = newRect.height;
+      this.top = newRect.top;
+      this.left = newRect.left;
     },
-    handleOpen (key, keyPath) {
+    handleOpen(key, keyPath) {
       // console.log(key, keyPath, '开')
-      this.$store.state.openOpenLeft = keyPath
+      this.$store.state.openOpenLeft = keyPath;
       // console.log(key.split('-'))
-      let datart = []
-      key.split('-').forEach((item, index) => {
+      let datart = [];
+      key.split("-").forEach((item, index) => {
         if (index === 0) {
-          datart = this.leftCateData[item]
+          datart = this.leftCateData[item];
         } else {
-          datart = datart.children[item]
+          datart = datart.children[item];
         }
-      })
+      });
       // console.log(datart)
-      this.defaultDataRight = datart
-      this.$store.state.selectDataLeft = this.defaultDataRight
-      this.$store.state.selectfilter = this.defaultDataRight.f
-      this.$store.state.yesNoClickChange = false
-      this.$store.state.timeNum = true
-      this.$store.state.yesNoClickZZ = false
-      this.$store.state.defaultShowLabelAreaState = 'normal'
+      this.defaultDataRight = datart;
+      this.$store.state.selectDataLeft = this.defaultDataRight;
+      this.$store.state.selectfilter = this.defaultDataRight.f;
+      this.$store.state.yesNoClickChange = false;
+      this.$store.state.timeNum = true;
+      this.$store.state.yesNoClickZZ = false;
+      this.$store.state.defaultShowLabelAreaState = "normal";
     },
-    handleClose (key, keyPath) {
+    handleClose(key, keyPath) {
       // console.log(key, keyPath, '关闭打印')
     },
-    selectActive (key, keyPath) {
+    selectActive(key, keyPath) {
       // console.log(key, keyPath)
-      this.showColoect(key)
+      this.showColoect(key);
     },
     // 点击5按钮切换图表
-    cutStatic (ind) {
+    cutStatic(ind) {
       // ind  0 1 2 3 4
-      this.indStatic = ind
+      this.indStatic = ind;
     },
     // top上的computed
-    mouseoverAllCate (hierarchy, ind) {
+    mouseoverAllCate(hierarchy, ind) {
       // console.log(hierarchy, ind, '鼠标移动到')
       switch (ind) {
         case 5:
-          this.titleDatas[ind].static = true
-          break
+          this.titleDatas[ind].static = true;
+          break;
         case 6:
-          this.titleDatas[ind].static = true
-          break
+          this.titleDatas[ind].static = true;
+          break;
       }
     },
-    mouseleaveAllCate (hierarchy, ind) {
+    mouseleaveAllCate(hierarchy, ind) {
       switch (ind) {
         case 5:
-          this.titleDatas[ind].static = false
-          this.titleDatas[5].threeText[0].static = false
-          this.titleDatas[5].threeText[1].static = false
-          break
+          this.titleDatas[ind].static = false;
+          this.titleDatas[5].threeText[0].static = false;
+          this.titleDatas[5].threeText[1].static = false;
+          break;
         case 6:
-          this.titleDatas[ind].static = false
-          break
+          this.titleDatas[ind].static = false;
+          break;
       }
       // console.log('鼠标离开')
     },
-    clickAllCate (hierarchy, ind) {
-      let that = this
+    clickAllCate(hierarchy, ind) {
+      let that = this;
       switch (ind) {
         case 0:
-          this.$store.state.advancedSearchState = false
-          this.cutStateSeach = 'simpleness'
-          this.$router.go(0)
-          break
+          this.$store.state.advancedSearchState = false;
+          this.cutStateSeach = "simpleness";
+          this.$router.go(0);
+          break;
         case 1:
-          this.$store.state.advancedSearchState = true
-          this.cutStateSeach = 'advanced'
-          break
+          this.$store.state.advancedSearchState = true;
+          this.cutStateSeach = "advanced";
+          break;
         case 2:
-          if (this.$route.query.type === 'area') {
+          if (this.$route.query.type === "area") {
             // eslint-disable-next-line no-constant-condition
-            let isShowMap = 0
+            let isShowMap = 0;
             if (isShowMap) {
-              this.$store.state.advancedSearchState = false
+              this.$store.state.advancedSearchState = false;
               // alert('地图功能对国外数据无效！')
-              this.$alert('地图功能对国外数据无效！', '温馨提示', {
-                confirmButtonText: '确定'
-              })
+              this.$alert("地图功能对国外数据无效！", "温馨提示", {
+                confirmButtonText: "确定"
+              });
             } else {
-              this.cutStateSeach = 'map'
+              this.cutStateSeach = "map";
             }
           } else {
-            this.$store.state.advancedSearchState = false
+            this.$store.state.advancedSearchState = false;
             // alert('地图功能对非地区数据无效！')
-            this.$alert('地图功能对非地区数据无效！', '温馨提示', {
-              confirmButtonText: '确定'
-            })
+            this.$alert("地图功能对非地区数据无效！", "温馨提示", {
+              confirmButtonText: "确定"
+            });
           }
-          break
+          break;
         case 3: // 添加收藏
           if (this.$store.state.transBefore) {
-            this.$store.state.addCollectState = true
+            this.$store.state.addCollectState = true;
           } else {
-            this.$alert('暂无数据，无法进行收藏', '温馨提示', {
-              confirmButtonText: '确定'
-            })
+            this.$alert("暂无数据，无法进行收藏", "温馨提示", {
+              confirmButtonText: "确定"
+            });
           }
-          break
+          break;
         case 4: // 导出至excel！！
+        console.log(this.$store.state.tableLine,963)
           if (this.$store.state.transBefore) {
-            let brt = new ComputedData()
-            let objData = null
+            let brt = new ComputedData(this.$store.state.transBefore);
+            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))
-              )
+              );
             } 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))
-              )
+              );
             }
             // 调用接口导出至excel
             this.$axios({
-              method: 'POST',
-              url: 'data/data/download',
+              method: "POST",
+              url: "data/data/download",
               data: {
                 classify: this.$store.state.selectDataLeft.id,
                 tableData: objData.tableData,
                 header: objData.header
               },
-              responseType: 'blob' // 防止接收文件流乱码  格式blob
+              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()
+                  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: '确定'
-            })
+            this.$alert("暂无数据，无法进行导出操作！", "温馨提示", {
+              confirmButtonText: "确定"
+            });
           }
-          break
+          break;
         case 5:
-          break
+          break;
         case 6:
-          break
-        case 'search': // 调接进行高级查询
+          break;
+        case "search": // 调接进行高级查询
           // 调用接口查询高级查询的数据
           // console.log(this.$store.state.advanceData)
           if (this.$store.state.advanceData.length < 1) {
             // alert('筛选数据数据不能少于4条！')
-            this.$alert('筛选数据数据不能少于1条！', '温馨提示', {
-              confirmButtonText: '确定'
-            })
-            return
+            this.$alert("筛选数据数据不能少于1条！", "温馨提示", {
+              confirmButtonText: "确定"
+            });
+            return;
           } else if (this.$store.state.advanceData.length > 101) {
-            this.$alert('最多选择100条数据进行查询！', '温馨提示', {
-              confirmButtonText: '确定'
-            })
-            return
+            this.$alert("最多选择100条数据进行查询！", "温馨提示", {
+              confirmButtonText: "确定"
+            });
+            return;
           }
-          that.cutStateSeach = 'simpleness'
-          that.advancedStates = true
+          that.cutStateSeach = "simpleness";
+          that.advancedStates = true;
           // 调用子组件 的方法渲染高级查询数据
-          that.$store.state.advancedSearchState = true
+          that.$store.state.advancedSearchState = true;
           // console.log(
           //   this.$store.state.dataArealabelTime,
           //   'this.$store.state.dataArealabelTime'
@@ -708,11 +767,11 @@ export default {
           // )
           this.$store.state.advancedSelectClassfiid = this.$store.state.advanceData.map(
             (item, index) => {
-              return item.classify_id
+              return item.classify_id;
             }
-          )
+          );
           this.$nextTick(() => {
-            this.$store.state.defaultShowLabelAreaState = 'normal'
+            this.$store.state.defaultShowLabelAreaState = "normal";
             // console.log(
             //   this.$store.state.advancedSelectClassfiid,
             //   'this.$store.state.advancedSelectClassfiid'
@@ -721,267 +780,267 @@ export default {
             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
-            this.$store.state.timeNum = true
-          })
-          break
+            );
+            this.getCateData();
+            this.childChartContShow(this.$store.state.advancedSelectClassfiid);
+            this.$store.state.labelIndexName = this.$store.state.advanceData[0].nameText;
+            this.$store.state.timeNum = true;
+          });
+          break;
       }
     },
-    mouseoverCate (hierarchy, ind) {
+    mouseoverCate(hierarchy, ind) {
       // console.log(hierarchy, ind, '鼠标移动到')
       switch (ind) {
         case 2:
-          this.titleDatas[5].secondText[ind].static = true
-          break
+          this.titleDatas[5].secondText[ind].static = true;
+          break;
       }
     },
-    mouseleaveCate (hierarchy, ind) {
+    mouseleaveCate(hierarchy, ind) {
       // console.log(hierarchy, ind, '鼠标离开')
       switch (ind) {
         case 2:
-          this.titleDatas[5].threeText[0].static = false
-          this.titleDatas[5].threeText[1].static = false
-          this.titleDatas[5].secondText[ind].static = false
-          break
+          this.titleDatas[5].threeText[0].static = false;
+          this.titleDatas[5].threeText[1].static = false;
+          this.titleDatas[5].secondText[ind].static = false;
+          break;
       }
     },
-    clickCate (hierarchy, ind, textType) {
+    clickCate(hierarchy, ind, textType) {
       switch (textType) {
-        case '新增指标':
-          this.cutStatic(0)
+        case "新增指标":
+          this.cutStatic(0);
           // console.log(
           //   this.$store.state.transBefore,
           //   'this.$store.state.transBefore'
           // )
           if (this.$store.state.transBefore) {
-            this.$store.state.insertWindowState = true
+            this.$store.state.insertWindowState = true;
           } else {
-            this.$alert('暂无数据，新增指标功能无法使用！', '温馨提示', {
-              confirmButtonText: '确定'
-            })
+            this.$alert("暂无数据，新增指标功能无法使用！", "温馨提示", {
+              confirmButtonText: "确定"
+            });
           }
-          break
-        case '筛选':
-          this.cutStatic(0)
+          break;
+        case "筛选":
+          this.cutStatic(0);
           if (this.$store.state.transBefore) {
-            this.$store.state.selcettWindowState = true
+            this.$store.state.selcettWindowState = true;
           } else {
-            this.$alert('暂无数据，筛选功能无法使用！', '温馨提示', {
-              confirmButtonText: '确定'
-            })
+            this.$alert("暂无数据，筛选功能无法使用！", "温馨提示", {
+              confirmButtonText: "确定"
+            });
           }
-          break
-        case '恢复': // 恢复
-          this.cutStatic(0)
+          break;
+        case "恢复": // 恢复
+          this.cutStatic(0);
           if (this.$store.state.transBefore) {
-            this.$router.go(0)
+            this.$router.go(0);
           } else {
-            this.$alert('暂无数据，恢复功能无法使用！', '温馨提示', {
-              confirmButtonText: '确定'
-            })
+            this.$alert("暂无数据，恢复功能无法使用！", "温馨提示", {
+              confirmButtonText: "确定"
+            });
           }
-          break
-        case '清除空行空列': // 清除空行空列
-          this.cutStatic(0)
+          break;
+        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') {
+            if (this.$route.query.type === "area") {
               // 先过滤每一行
-              let firstHang = [] // 过滤掉的下标=====》地区
+              let firstHang = []; // 过滤掉的下标=====》地区
               this.$store.state.transBefore.transBeforeAreaData = this.$store.state.transBefore.transBeforeAreaData.filter(
                 (item, index) => {
                   if (
                     item.every((item, index) => {
-                      return item === ''
+                      return item === "";
                     })
                   ) {
-                    firstHang.push(index)
+                    firstHang.push(index);
                   }
                   return (
                     !item.every((item, index) => {
-                      return item === ''
+                      return item === "";
                     }) === true
-                  )
+                  );
                 }
-              )
+              );
               // 在过滤每一列
               // 行列转置
-              let brrCe = this.$store.state.transBefore.transBeforeAreaData
+              let brrCe = this.$store.state.transBefore.transBeforeAreaData;
               this.$store.state.transBefore.transBeforeAreaData = brrCe[0].map(
-                function (col, index) {
+                function(col, index) {
                   return brrCe.map((row, key) => {
-                    return row[index]
-                  })
+                    return row[index];
+                  });
                 }
-              )
+              );
               // 在过滤每一行
-              let secendHang = [] // 过滤掉的下标=====》时间
+              let secendHang = []; // 过滤掉的下标=====》时间
               this.$store.state.transBefore.transBeforeAreaData = this.$store.state.transBefore.transBeforeAreaData.filter(
                 (item, index) => {
                   if (
                     item.every((item, index) => {
-                      return item === ''
+                      return item === "";
                     })
                   ) {
-                    secendHang.push(index)
+                    secendHang.push(index);
                   }
                   return (
                     !item.every((item, index) => {
-                      return item === ''
+                      return item === "";
                     }) === true
-                  )
+                  );
                 }
-              )
+              );
               // 行列转置
-              let arrCe = this.$store.state.transBefore.transBeforeAreaData
+              let arrCe = this.$store.state.transBefore.transBeforeAreaData;
               this.$store.state.transBefore.transBeforeAreaData = arrCe[0].map(
-                function (col, index) {
+                function(col, index) {
                   return arrCe.map((row, key) => {
-                    return row[index]
-                  })
+                    return row[index];
+                  });
                 }
-              )
+              );
               // 将时间和地区名过滤掉
               this.$store.state.transBefore.areaName = this.$store.state.transBefore.areaName.filter(
                 (item, index) => {
-                  return firstHang.indexOf(index) === -1
+                  return firstHang.indexOf(index) === -1;
                 }
-              )
+              );
               this.$store.state.transBefore.timeArr = this.$store.state.transBefore.timeArr.filter(
                 (item, index) => {
-                  return secendHang.indexOf(index) === -1
+                  return secendHang.indexOf(index) === -1;
                 }
-              )
+              );
               // console.log(
               //   this.$store.state.transBefore,
               //   'this.$store.state.transBefore.transBeforeAreaData'
               // )
-              this.showTableState = true
+              this.showTableState = true;
             } else {
               // 非地区数据
               // 先过滤每一行
-              let firstHang = [] // 过滤掉的下标=====》地区
+              let firstHang = []; // 过滤掉的下标=====》地区
               this.$store.state.transBefore.transBeforeTermsData = this.$store.state.transBefore.transBeforeTermsData.filter(
                 (item, index) => {
                   if (
                     item.every((item, index) => {
-                      return item === ''
+                      return item === "";
                     })
                   ) {
-                    firstHang.push(index)
+                    firstHang.push(index);
                   }
                   return (
                     !item.every((item, index) => {
-                      return item === ''
+                      return item === "";
                     }) === true
-                  )
+                  );
                 }
-              )
+              );
               // 在过滤每一列
               // 行列转置
-              let brrCe = this.$store.state.transBefore.transBeforeTermsData
+              let brrCe = this.$store.state.transBefore.transBeforeTermsData;
               this.$store.state.transBefore.transBeforeTermsData = brrCe[0].map(
-                function (col, index) {
+                function(col, index) {
                   return brrCe.map((row, key) => {
-                    return row[index]
-                  })
+                    return row[index];
+                  });
                 }
-              )
+              );
               // 在过滤每一行
-              let secendHang = [] // 过滤掉的下标=====》时间
+              let secendHang = []; // 过滤掉的下标=====》时间
               this.$store.state.transBefore.transBeforeTermsData = this.$store.state.transBefore.transBeforeTermsData.filter(
                 (item, index) => {
                   if (
                     item.every((item, index) => {
-                      return item === ''
+                      return item === "";
                     })
                   ) {
-                    secendHang.push(index)
+                    secendHang.push(index);
                   }
                   return (
                     !item.every((item, index) => {
-                      return item === ''
+                      return item === "";
                     }) === true
-                  )
+                  );
                 }
-              )
+              );
               // 行列转置
-              let arrCe = this.$store.state.transBefore.transBeforeTermsData
+              let arrCe = this.$store.state.transBefore.transBeforeTermsData;
               this.$store.state.transBefore.transBeforeTermsData = arrCe[0].map(
-                function (col, index) {
+                function(col, index) {
                   return arrCe.map((row, key) => {
-                    return row[index]
-                  })
+                    return row[index];
+                  });
                 }
-              )
+              );
               // 将时间和地区名过滤掉
               this.$store.state.transBefore.termsName = this.$store.state.transBefore.termsName.filter(
                 (item, index) => {
-                  return firstHang.indexOf(index) === -1
+                  return firstHang.indexOf(index) === -1;
                 }
-              )
+              );
               this.$store.state.transBefore.termsExplain = this.$store.state.transBefore.termsExplain.filter(
                 (item, index) => {
-                  return firstHang.indexOf(index) === -1
+                  return firstHang.indexOf(index) === -1;
                 }
-              )
+              );
               this.$store.state.transBefore.dataSource = this.$store.state.transBefore.dataSource.filter(
                 (item, index) => {
-                  return firstHang.indexOf(index) === -1
+                  return firstHang.indexOf(index) === -1;
                 }
-              )
+              );
               this.$store.state.transBefore.timeArr = this.$store.state.transBefore.timeArr.filter(
                 (item, index) => {
-                  return secendHang.indexOf(index) === -1
+                  return secendHang.indexOf(index) === -1;
                 }
-              )
+              );
               // console.log(
               //   this.$store.state.transBefore,
               //   'this.$store.state.transBefore.transBeforeAreaData'
               // )
-              this.showTableState = true
+              this.showTableState = true;
             }
           } else {
-            this.$alert('暂无数据，清除空行空列功能无法使用！', '温馨提示', {
-              confirmButtonText: '确定'
-            })
+            this.$alert("暂无数据，清除空行空列功能无法使用！", "温馨提示", {
+              confirmButtonText: "确定"
+            });
           }
-          break
-        case '编辑':
-          this.cutStatic(0)
+          break;
+        case "编辑":
+          this.cutStatic(0);
           if (this.$store.state.transBefore) {
-            this.$store.state.editWindowState = true
+            this.$store.state.editWindowState = true;
           } else {
-            this.$alert('暂无数据，编辑功能无法使用！', '温馨提示', {
-              confirmButtonText: '确定'
-            })
+            this.$alert("暂无数据，编辑功能无法使用！", "温馨提示", {
+              confirmButtonText: "确定"
+            });
           }
-          break
-        case '转置':
+          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'
+          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";
           } else {
-            this.$store.state.befaultAfter = 'zz'
+            this.$store.state.befaultAfter = "zz";
           }
-          this.cutStatic(0)
+          this.cutStatic(0);
           if (this.$store.state.transBefore) {
             // 当前数据是地区数据时点击转置需要将数据进行转置
-            if (this.$route.query.type === 'area') {
+            if (this.$route.query.type === "area") {
               // let transpositionData = JSON.parse(JSON.stringify(this.$store.state.allNochangeInitData.transBeforeAreaData))
               // this.$store.state.allNochangeInitData.transBeforeAreaData = transpositionData[0].map(function (col, index) {
               //   return transpositionData.map((row, key) => {
               //     return row[index]
               //   })
               // })
-              this.$store.state.transClickState = true
+              this.$store.state.transClickState = true;
             }
             // console.log(
             //   this.$store.state.transBefore,
@@ -991,55 +1050,58 @@ export default {
             let zhuanChange = {
               row: this.$store.state.SelecttDimension.col,
               col: this.$store.state.SelecttDimension.row
-            }
+            };
             // console.log(zhuanChange, '转之的状态')
-            this.$store.state.SelecttDimension = zhuanChange
-            this.change3Ds()
+            this.$store.state.SelecttDimension = zhuanChange;
+            this.change3Ds();
             this.chartsStatusMegger.transState = !this.chartsStatusMegger
-              .transState
-            this.$store.state.transState = this.chartsStatusMegger.transState
+              .transState;
+            this.$store.state.transState = this.chartsStatusMegger.transState;
           } else {
-            this.$alert('暂无数据，转置功能无法使用！', '温馨提示', {
-              confirmButtonText: '确定'
-            })
+            this.$alert("暂无数据，转置功能无法使用！", "温馨提示", {
+              confirmButtonText: "确定"
+            });
           }
           // console.log(
           //   this.$store.state.SelecttDimension,
           //   '非地区数据维度转换=》转置'
           // )
           // this.$refs.childChartCont.lieWidthComputed()
-          break
-        case '维度转换':
-          this.cutStatic(0)
+          break;
+        case "维度转换":
+          this.cutStatic(0);
           if (this.$store.state.transBefore) {
-            if (this.$route.query.type === 'area') {
-              this.$store.state.dimensionState = true
+            if (this.$route.query.type === "area") {
+              this.$store.state.dimensionState = true;
             } else {
-              this.$store.state.noAreadimensionState = true
+              this.$store.state.noAreadimensionState = true;
             }
           } else {
-            this.$alert('暂无数据，维度转换功能无法使用！', '温馨提示', {
-              confirmButtonText: '确定'
-            })
+            this.$alert("暂无数据，维度转换功能无法使用！", "温馨提示", {
+              confirmButtonText: "确定"
+            });
           }
-          break
-        case '保存默认': // 将分类id 和 分类数据存入本地
-          this.cutStatic(0)
+          break;
+        case "保存默认": // 将分类id 和 分类数据存入本地
+          this.cutStatic(0);
           // 点击保存后清除点击状态
-          this.$store.state.transClickState = false
+          this.$store.state.transClickState = false;
           // console.log(this.$store.state.SelecttDimension, '保存默认转置')
           // 获取本地保存数据
           if (this.$store.state.transBefore) {
-            if (this.$route.query.type !== 'area') {
+            if (this.$route.query.type !== "area") {
               // 非地区数据
-              localStorage.setItem('dateDimension', JSON.stringify(this.$store.state.SelecttDimension))
+              localStorage.setItem(
+                "dateDimension",
+                JSON.stringify(this.$store.state.SelecttDimension)
+              );
               if (!this.$store.state.advancedSearchState) {
                 // 非高级查询数据存默认数据
-                if (JSON.parse(localStorage.getItem('classFiyData'))) {
+                if (JSON.parse(localStorage.getItem("classFiyData"))) {
                   // 本地存在
                   let arrtsBGY = JSON.parse(
-                    localStorage.getItem('classFiyData')
-                  )
+                    localStorage.getItem("classFiyData")
+                  );
                   if (
                     !arrtsBGY.find(item => item.type === this.$route.query.type)
                   ) {
@@ -1054,43 +1116,43 @@ export default {
                       selectDataLeft: this.$store.state.selectDataLeft, // 左侧选中
                       SelecttDimension: this.$store.state.SelecttDimension, // 左侧选中
                       advancedSearchState: this.$store.state.advancedSearchState
-                    })
+                    });
                     localStorage.setItem(
-                      'classFiyData',
+                      "classFiyData",
                       JSON.stringify(arrtsBGY)
-                    )
+                    );
                   } else {
                     // console.log('走这里')
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).transBefore = this.$store.state.transBefore
+                    ).transBefore = this.$store.state.transBefore;
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).allNochangeInitData = this.$store.state.allNochangeInitData
+                    ).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
+                    ).selectDataLeft = this.$store.state.selectDataLeft;
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).SelecttDimension = this.$store.state.SelecttDimension
+                    ).SelecttDimension = this.$store.state.SelecttDimension;
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).advancedSearchState = this.$store.state.advancedSearchState
+                    ).advancedSearchState = this.$store.state.advancedSearchState;
 
                     localStorage.setItem(
-                      'classFiyData',
+                      "classFiyData",
                       JSON.stringify(arrtsBGY)
-                    )
+                    );
                   }
                 } else {
                   // 本地不存在
                   localStorage.setItem(
-                    'classFiyData',
+                    "classFiyData",
                     JSON.stringify([
                       {
                         type: this.$store.state.selectDataLeft.f,
@@ -1106,15 +1168,15 @@ export default {
                           .advancedSearchState
                       }
                     ])
-                  )
+                  );
                 }
               } else {
                 // 高级查询保存默认数据
-                if (JSON.parse(localStorage.getItem('classFiyData'))) {
+                if (JSON.parse(localStorage.getItem("classFiyData"))) {
                   // 本地存在
                   let arrtsBGY = JSON.parse(
-                    localStorage.getItem('classFiyData')
-                  )
+                    localStorage.getItem("classFiyData")
+                  );
                   if (
                     !arrtsBGY.find(item => item.type === this.$route.query.type)
                   ) {
@@ -1133,52 +1195,52 @@ export default {
                       advanceData: this.$store.state.advanceData, // 高级查询数据
                       areaIndexName: this.$store.state.areaIndexName, // 地区名称
                       labelIndexName: this.$store.state.labelIndexName // 指标名称
-                    })
+                    });
                     localStorage.setItem(
-                      'classFiyData',
+                      "classFiyData",
                       JSON.stringify(arrtsBGY)
-                    )
+                    );
                   } else {
                     // console.log('走这里')
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).transBefore = this.$store.state.transBefore
+                    ).transBefore = this.$store.state.transBefore;
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).allNochangeInitData = this.$store.state.allNochangeInitData
+                    ).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
+                    ).selectDataLeft = this.$store.state.selectDataLeft;
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).SelecttDimension = this.$store.state.SelecttDimension
+                    ).SelecttDimension = this.$store.state.SelecttDimension;
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).advancedSearchState = this.$store.state.advancedSearchState
+                    ).advancedSearchState = this.$store.state.advancedSearchState;
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).advanceData = this.$store.state.advanceData
+                    ).advanceData = this.$store.state.advanceData;
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).areaIndexName = this.$store.state.areaIndexName
+                    ).areaIndexName = this.$store.state.areaIndexName;
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).labelIndexName = this.$store.state.labelIndexName
+                    ).labelIndexName = this.$store.state.labelIndexName;
 
                     localStorage.setItem(
-                      'classFiyData',
+                      "classFiyData",
                       JSON.stringify(arrtsBGY)
-                    )
+                    );
                   }
                 } else {
                   // 本地不存在
                   localStorage.setItem(
-                    'classFiyData',
+                    "classFiyData",
                     JSON.stringify([
                       {
                         type: this.$store.state.selectDataLeft.f,
@@ -1197,35 +1259,38 @@ export default {
                         labelIndexName: this.$store.state.labelIndexName // 指标名称
                       }
                     ])
-                  )
+                  );
                 }
               }
             } else {
               // 地区数据
               // console.log(this.$store.state.SelecttDimension, '保存地区数据')
-              localStorage.setItem('areaDimension', JSON.stringify(this.$store.state.SelecttDimension))
+              localStorage.setItem(
+                "areaDimension",
+                JSON.stringify(this.$store.state.SelecttDimension)
+              );
               if (!this.$store.state.advancedSearchState) {
                 // 非高级查询数据存默认数据
-                if (JSON.parse(localStorage.getItem('classFiyData'))) {
+                if (JSON.parse(localStorage.getItem("classFiyData"))) {
                   // 本地存在
                   let arrtsBGY = JSON.parse(
-                    localStorage.getItem('classFiyData')
-                  )
+                    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
+                      let btyAreaData = btyData.transBeforeAreaData;
                       btyData.transBeforeAreaData = btyAreaData[0].map(
                         (col, index) => {
                           return btyAreaData.map((row, key) => {
-                            return row[index]
-                          })
+                            return row[index];
+                          });
                         }
-                      )
+                      );
                     }
                     arrtsBGY.push({
                       type: this.$route.query.type,
@@ -1235,10 +1300,10 @@ export default {
                         time: this.$store.state.newSelectTime,
                         sequence: this.$store.state.yesNoClickChange
                           ? {
-                            sequenceCont: this.$store.state
-                              .newSelectChangeData,
-                            sequenceState: 3
-                          }
+                              sequenceCont: this.$store.state
+                                .newSelectChangeData,
+                              sequenceState: 3
+                            }
                           : this.$store.state.newSelectLabelArea
                       },
                       selectDataLeft: this.$store.state.selectDataLeft, // 左侧选中
@@ -1246,80 +1311,80 @@ export default {
                       yesNoClickChange: this.$store.state.yesNoClickChange, // 维度转换是否被点击
                       yesNoClickZZ: this.$store.state.yesNoClickZZ, // 转置是否被点击
                       advancedSearchState: this.$store.state.advancedSearchState
-                    })
+                    });
                     localStorage.setItem(
-                      'classFiyData',
+                      "classFiyData",
                       JSON.stringify(arrtsBGY)
-                    )
+                    );
                   } else {
                     // console.log('走这里')
                     let btyData = JSON.parse(
                       JSON.stringify(this.$store.state.allNochangeInitData)
-                    )
+                    );
                     if (this.$store.state.yesNoClickZZ) {
-                      let btyAreaData = btyData.transBeforeAreaData
+                      let btyAreaData = btyData.transBeforeAreaData;
                       btyData.transBeforeAreaData = btyAreaData[0].map(
                         (col, index) => {
                           return btyAreaData.map((row, key) => {
-                            return row[index]
-                          })
+                            return row[index];
+                          });
                         }
-                      )
+                      );
                     }
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).transBefore = btyData
+                    ).transBefore = btyData;
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).allNochangeInitData = btyData
+                    ).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
-                        }
+                            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
+                    ).selectDataLeft = this.$store.state.selectDataLeft;
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).SelecttDimension = this.$store.state.SelecttDimension
+                    ).SelecttDimension = this.$store.state.SelecttDimension;
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).yesNoClickChange = this.$store.state.yesNoClickChange
+                    ).yesNoClickChange = this.$store.state.yesNoClickChange;
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).yesNoClickZZ = this.$store.state.yesNoClickZZ
+                    ).yesNoClickZZ = this.$store.state.yesNoClickZZ;
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).advancedSearchState = this.$store.state.advancedSearchState
+                    ).advancedSearchState = this.$store.state.advancedSearchState;
                     localStorage.setItem(
-                      'classFiyData',
+                      "classFiyData",
                       JSON.stringify(arrtsBGY)
-                    )
+                    );
                   }
                 } else {
                   // 本地不存在
                   let btyData = JSON.parse(
                     JSON.stringify(this.$store.state.allNochangeInitData)
-                  )
+                  );
                   if (this.$store.state.yesNoClickZZ) {
-                    let btyAreaData = btyData.transBeforeAreaData
+                    let btyAreaData = btyData.transBeforeAreaData;
                     btyData.transBeforeAreaData = btyAreaData[0].map(
                       (col, index) => {
                         return btyAreaData.map((row, key) => {
-                          return row[index]
-                        })
+                          return row[index];
+                        });
                       }
-                    )
+                    );
                   }
                   localStorage.setItem(
-                    'classFiyData',
+                    "classFiyData",
                     JSON.stringify([
                       {
                         type: this.$route.query.type,
@@ -1329,10 +1394,10 @@ export default {
                           time: this.$store.state.newSelectTime,
                           sequence: this.$store.state.yesNoClickChange
                             ? {
-                              sequenceCont: this.$store.state
-                                .newSelectChangeData,
-                              sequenceState: 3
-                            }
+                                sequenceCont: this.$store.state
+                                  .newSelectChangeData,
+                                sequenceState: 3
+                              }
                             : this.$store.state.newSelectLabelArea
                           // sequenceCont:,//序列选中内容
                           // sequenceState://序列状态 筛选指标   筛选地区
@@ -1345,30 +1410,30 @@ export default {
                           .advancedSearchState
                       }
                     ])
-                  )
+                  );
                 }
               } else {
                 // 高级查询数据存默认数据
-                if (JSON.parse(localStorage.getItem('classFiyData'))) {
+                if (JSON.parse(localStorage.getItem("classFiyData"))) {
                   // 本地存在
                   let arrtsBGY = JSON.parse(
-                    localStorage.getItem('classFiyData')
-                  )
+                    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
+                      let btyAreaData = btyData.transBeforeAreaData;
                       btyData.transBeforeAreaData = btyAreaData[0].map(
                         (col, index) => {
                           return btyAreaData.map((row, key) => {
-                            return row[index]
-                          })
+                            return row[index];
+                          });
                         }
-                      )
+                      );
                     }
                     arrtsBGY.push({
                       type: this.$route.query.type,
@@ -1378,10 +1443,10 @@ export default {
                         time: this.$store.state.newSelectTime,
                         sequence: this.$store.state.yesNoClickChange
                           ? {
-                            sequenceCont: this.$store.state
-                              .newSelectChangeData,
-                            sequenceState: 3
-                          }
+                              sequenceCont: this.$store.state
+                                .newSelectChangeData,
+                              sequenceState: 3
+                            }
                           : this.$store.state.newSelectLabelArea
                       },
                       selectDataLeft: this.$store.state.selectDataLeft, // 左侧选中
@@ -1393,89 +1458,89 @@ export default {
                       advanceData: this.$store.state.advanceData, // 高级查询数据
                       areaIndexName: this.$store.state.areaIndexName, // 地区名称
                       labelIndexName: this.$store.state.labelIndexName // 指标名称
-                    })
+                    });
                     localStorage.setItem(
-                      'classFiyData',
+                      "classFiyData",
                       JSON.stringify(arrtsBGY)
-                    )
+                    );
                   } else {
                     // console.log('走这里')
                     let btyData = JSON.parse(
                       JSON.stringify(this.$store.state.allNochangeInitData)
-                    )
+                    );
                     if (this.$store.state.yesNoClickZZ) {
-                      let btyAreaData = btyData.transBeforeAreaData
+                      let btyAreaData = btyData.transBeforeAreaData;
                       btyData.transBeforeAreaData = btyAreaData[0].map(
                         (col, index) => {
                           return btyAreaData.map((row, key) => {
-                            return row[index]
-                          })
+                            return row[index];
+                          });
                         }
-                      )
+                      );
                     }
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).transBefore = btyData
+                    ).transBefore = btyData;
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).allNochangeInitData = btyData
+                    ).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
-                        }
+                            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
+                    ).selectDataLeft = this.$store.state.selectDataLeft;
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).SelecttDimension = this.$store.state.SelecttDimension
+                    ).SelecttDimension = this.$store.state.SelecttDimension;
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).yesNoClickChange = this.$store.state.yesNoClickChange
+                    ).yesNoClickChange = this.$store.state.yesNoClickChange;
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).yesNoClickZZ = this.$store.state.yesNoClickZZ
+                    ).yesNoClickZZ = this.$store.state.yesNoClickZZ;
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).advancedSearchState = this.$store.state.advancedSearchState
+                    ).advancedSearchState = this.$store.state.advancedSearchState;
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).advanceData = this.$store.state.advanceData
+                    ).advanceData = this.$store.state.advanceData;
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).areaIndexName = this.$store.state.areaIndexName
+                    ).areaIndexName = this.$store.state.areaIndexName;
                     arrtsBGY.find(
                       item => item.type === this.$route.query.type
-                    ).labelIndexName = this.$store.state.labelIndexName
+                    ).labelIndexName = this.$store.state.labelIndexName;
                     localStorage.setItem(
-                      'classFiyData',
+                      "classFiyData",
                       JSON.stringify(arrtsBGY)
-                    )
+                    );
                   }
                 } else {
                   // 本地不存在
                   let btyData = JSON.parse(
                     JSON.stringify(this.$store.state.allNochangeInitData)
-                  )
+                  );
                   if (this.$store.state.yesNoClickZZ) {
-                    let btyAreaData = btyData.transBeforeAreaData
+                    let btyAreaData = btyData.transBeforeAreaData;
                     btyData.transBeforeAreaData = btyAreaData[0].map(
                       (col, index) => {
                         return btyAreaData.map((row, key) => {
-                          return row[index]
-                        })
+                          return row[index];
+                        });
                       }
-                    )
+                    );
                   }
                   localStorage.setItem(
-                    'classFiyData',
+                    "classFiyData",
                     JSON.stringify([
                       {
                         type: this.$route.query.type,
@@ -1485,10 +1550,10 @@ export default {
                           time: this.$store.state.newSelectTime,
                           sequence: this.$store.state.yesNoClickChange
                             ? {
-                              sequenceCont: this.$store.state
-                                .newSelectChangeData,
-                              sequenceState: 3
-                            }
+                                sequenceCont: this.$store.state
+                                  .newSelectChangeData,
+                                sequenceState: 3
+                              }
                             : this.$store.state.newSelectLabelArea
                           // sequenceCont:,//序列选中内容
                           // sequenceState://序列状态 筛选指标   筛选地区
@@ -1504,239 +1569,239 @@ export default {
                         labelIndexName: this.$store.state.labelIndexName // 指标名称
                       }
                     ])
-                  )
+                  );
                 }
               }
             }
-            this.$alert('默认数据已保存！', '温馨提示', {
-              confirmButtonText: '确定'
-            })
+            this.$alert("默认数据已保存！", "温馨提示", {
+              confirmButtonText: "确定"
+            });
           } else {
-            this.$alert('暂无数据，保存默认功能无法使用！', '温馨提示', {
-              confirmButtonText: '确定'
-            })
+            this.$alert("暂无数据，保存默认功能无法使用！", "温馨提示", {
+              confirmButtonText: "确定"
+            });
           }
-          break
-        case '恢复默认': // 将分类id 和 分类数据从本地删除
-          this.cutStatic(0)
-          if (localStorage.getItem('dateDimension')) {
-            localStorage.removeItem('dateDimension')
+          break;
+        case "恢复默认": // 将分类id 和 分类数据从本地删除
+          this.cutStatic(0);
+          if (localStorage.getItem("dateDimension")) {
+            localStorage.removeItem("dateDimension");
           }
-          if (localStorage.getItem('areaDimension')) {
-            localStorage.removeItem('areaDimension')
+          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'))
+            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)
               ) {
-                this.$alert('默认数据已恢复！', '温馨提示', {
-                  confirmButtonText: '确定',
+                this.$alert("默认数据已恢复！", "温馨提示", {
+                  confirmButtonText: "确定",
                   callback: actioon => {
-                    this.$router.go(0)
+                    this.$router.go(0);
                   }
-                })
+                });
               } else {
                 arrtsBGY = arrtsBGY.filter((item, index) => {
                   // console.log(item, 'item0')
-                  return item.type !== this.$route.query.type
-                })
+                  return item.type !== this.$route.query.type;
+                });
                 if (arrtsBGY.length > 0) {
                   localStorage.setItem(
-                    'classFiyData',
+                    "classFiyData",
                     JSON.stringify(arrtsBGY)
-                  )
+                  );
                 } else {
-                  localStorage.removeItem('classFiyData')
+                  localStorage.removeItem("classFiyData");
                 }
-                this.$alert('默认数据已恢复！', '温馨提示', {
-                  confirmButtonText: '确定',
+                this.$alert("默认数据已恢复！", "温馨提示", {
+                  confirmButtonText: "确定",
                   callback: actioon => {
-                    this.$router.go(0)
+                    this.$router.go(0);
                   }
-                })
+                });
               }
             } else {
-              this.$alert('默认数据已恢复！', '温馨提示', {
-                confirmButtonText: '确定',
+              this.$alert("默认数据已恢复！", "温馨提示", {
+                confirmButtonText: "确定",
                 callback: actioon => {
-                  this.$router.go(0)
+                  this.$router.go(0);
                 }
-              })
+              });
             }
           } else {
-            this.$alert('暂无数据，恢复默认功能无法使用！', '温馨提示', {
-              confirmButtonText: '确定'
-            })
+            this.$alert("暂无数据，恢复默认功能无法使用！", "温馨提示", {
+              confirmButtonText: "确定"
+            });
           }
-          break
+          break;
       }
     },
-    mouseoverThree (hierarchy, ind) {
+    mouseoverThree(hierarchy, ind) {
       // console.log(hierarchy, ind, '鼠标离开')
       switch (ind) {
         case 0:
-          this.titleDatas[5].threeText[ind + 1].static = false
-          this.titleDatas[5].threeText[ind].static = true
-          break
+          this.titleDatas[5].threeText[ind + 1].static = false;
+          this.titleDatas[5].threeText[ind].static = true;
+          break;
         case 1:
-          this.titleDatas[5].threeText[ind - 1].static = false
-          this.titleDatas[5].threeText[ind].static = true
-          break
+          this.titleDatas[5].threeText[ind - 1].static = false;
+          this.titleDatas[5].threeText[ind].static = true;
+          break;
       }
     },
-    mouseleaveThree (hierarchy, ind) {
+    mouseleaveThree(hierarchy, ind) {
       // console.log(hierarchy, ind, '鼠标离开')
       switch (ind) {
         case 0:
           // this.titleDatas[5].threeText[ind].static = false
-          break
+          break;
         case 1:
           // this.titleDatas[5].threeText[ind].static = false
-          break
+          break;
       }
     },
     // 对行运算
-    computedLine (typeText) {
+    computedLine(typeText) {
       switch (typeText) {
-        case 'SUM求和':
+        case "SUM求和":
           // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
             text: typeText,
-            stateType: 'line'
-          }
-          break
-        case 'x平均数': // 注意x小写
+            stateType: "line"
+          };
+          break;
+        case "x平均数": // 注意x小写
           // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
             text: typeText,
-            stateType: 'line'
-          }
-          break
-        case 'MAX最大值':
+            stateType: "line"
+          };
+          break;
+        case "MAX最大值":
           // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
             text: typeText,
-            stateType: 'line'
-          }
-          break
-        case 'MIN最小值':
+            stateType: "line"
+          };
+          break;
+        case "MIN最小值":
           // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
             text: typeText,
-            stateType: 'line'
-          }
-          break
-        case 'MD中位数':
+            stateType: "line"
+          };
+          break;
+        case "MD中位数":
           // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
             text: typeText,
-            stateType: 'line'
-          }
-          break
-        case 'MO众数':
+            stateType: "line"
+          };
+          break;
+        case "MO众数":
           // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
             text: typeText,
-            stateType: 'line'
-          }
-          break
-        case 'S²方差':
+            stateType: "line"
+          };
+          break;
+        case "S²方差":
           // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
             text: typeText,
-            stateType: 'line'
-          }
-          break
-        case 'S标准差':
+            stateType: "line"
+          };
+          break;
+        case "S标准差":
           // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
             text: typeText,
-            stateType: 'line'
-          }
-          break
+            stateType: "line"
+          };
+          break;
       }
     },
     // 对列运算
-    computedList (typeText) {
+    computedList(typeText) {
       switch (typeText) {
-        case 'SUM求和':
+        case "SUM求和":
           // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
             text: typeText,
-            stateType: 'list'
-          }
-          break
-        case 'x平均数': // 注意x小写
+            stateType: "list"
+          };
+          break;
+        case "x平均数": // 注意x小写
           // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
             text: typeText,
-            stateType: 'list'
-          }
-          break
-        case 'MAX最大值':
+            stateType: "list"
+          };
+          break;
+        case "MAX最大值":
           // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
             text: typeText,
-            stateType: 'list'
-          }
-          break
-        case 'MIN最小值':
+            stateType: "list"
+          };
+          break;
+        case "MIN最小值":
           // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
             text: typeText,
-            stateType: 'list'
-          }
-          break
-        case 'MD中位数':
+            stateType: "list"
+          };
+          break;
+        case "MD中位数":
           // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
             text: typeText,
-            stateType: 'list'
-          }
-          break
-        case 'MO众数':
+            stateType: "list"
+          };
+          break;
+        case "MO众数":
           // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
             text: typeText,
-            stateType: 'list'
-          }
-          break
-        case 'S²方差':
+            stateType: "list"
+          };
+          break;
+        case "S²方差":
           // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
             text: typeText,
-            stateType: 'list'
-          }
-          break
-        case 'S标准差':
+            stateType: "list"
+          };
+          break;
+        case "S标准差":
           // console.log(typeText)
           this.chartsStatusMegger.computedStatic = {
             text: typeText,
-            stateType: 'list'
-          }
-          break
+            stateType: "list"
+          };
+          break;
       }
     },
     // 当数据不是从导航进来时找到其选中其选中的数据作为默认的左侧选中数据
-    defaultDataSelectDG () {
+    defaultDataSelectDG() {
       // 此方法返回一个默认选中的代码数组
-      let defaultCodeIndex = null
-      let objectData = null
+      let defaultCodeIndex = null;
+      let objectData = null;
       // 最终默认选中
       this.leftCateData.forEach((item1, index1) => {
         if (this.$route.query.defaultLeftId.toString() === item1.id) {
-          defaultCodeIndex = [index1]
-          objectData = item1
+          defaultCodeIndex = [index1];
+          objectData = item1;
           // 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
+                defaultCodeIndex = [index1, index2];
+                objectData = item2;
                 // console.log(222)
               } else {
                 if (item2.children !== undefined) {
@@ -1744,8 +1809,8 @@ export default {
                     if (
                       this.$route.query.defaultLeftId.toString() === item3.id
                     ) {
-                      defaultCodeIndex = [index1, index2, index3]
-                      objectData = item3
+                      defaultCodeIndex = [index1, index2, index3];
+                      objectData = item3;
                       // console.log(defaultCodeIndex, objectData, 333)
                     } else {
                       if (item3.children !== undefined) {
@@ -1754,8 +1819,8 @@ export default {
                             this.$route.query.defaultLeftId.toString() ===
                             item4.id
                           ) {
-                            defaultCodeIndex = [index1, index2, index3, index4]
-                            objectData = item4
+                            defaultCodeIndex = [index1, index2, index3, index4];
+                            objectData = item4;
                             // console.log(444)
                           } else {
                             if (item4.children !== undefined) {
@@ -1770,36 +1835,36 @@ export default {
                                     index3,
                                     index4,
                                     index5
-                                  ]
-                                  objectData = item5
+                                  ];
+                                  objectData = item5;
                                   // console.log(555)
                                 }
-                              })
+                              });
                             }
                           }
-                        })
+                        });
                       }
                     }
-                  })
+                  });
                 }
               }
-            })
+            });
           }
         }
-      })
+      });
       this.filterDataArr = {
         defaultCode: defaultCodeIndex.map((item, index) => {
           return defaultCodeIndex
             .filter((list, key) => {
-              return key <= index
+              return key <= index;
             })
-            .join('-')
+            .join("-");
         }),
         objectData: objectData
-      }
+      };
     },
     // 默认选中的列
-    defaultSelectLie () {
+    defaultSelectLie() {
       // console.log(
       //   this.leftCateData,
       //   'this.leftCateDatathis.leftCateDatathis.leftCateData'
@@ -1810,61 +1875,61 @@ export default {
       // )
       // 非高级查询
       if (!this.$store.state.advancedSearchState) {
-        if (this.$route.query.defaultLeftId !== 'default') {
+        if (this.$route.query.defaultLeftId !== "default") {
           // 从数据更新，快速
-          this.defaultDataSelectDG()
+          this.defaultDataSelectDG();
           // 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
-          this.defaultDataRight = this.filterDataArr.objectData
-          this.$store.state.selectfilter = this.filterDataArr.objectData.f
+          this.defaultSelectLies = this.filterDataArr.defaultCode;
+          this.$store.state.openOpenLeft = this.filterDataArr.defaultCode;
+          this.$store.state.selectDataLeft = this.filterDataArr.objectData;
+          this.defaultDataRight = this.filterDataArr.objectData;
+          this.$store.state.selectfilter = this.filterDataArr.objectData.f;
         } else {
           // 处理默认显示数据
-          this.defaultShowData()
+          this.defaultShowData();
         }
       }
     },
     // 默认选中的数据
-    defaultShowData () {
+    defaultShowData() {
       // 调用子组件showSaveDefaultData方法显示默认数据
       // this.$refs.childChartCont.showSaveDefaultData()
       // 本地存在保存的数据
       // 调用接口请求默认显示数据
-      let arrData = localStorage.getItem('classFiyData')
+      let arrData = localStorage.getItem("classFiyData");
       if (!arrData) {
         this.$axios({
-          method: 'GET',
-          url: 'data/data/default',
+          method: "GET",
+          url: "data/data/default",
           params: {
             type: this.$route.query.type
           }
         }).then(res => {
           // 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.$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'
-          )
+            "default3"
+          );
           this.$refs.childChartCont.getInfor(
             this.$store.state.defaultDataId.id
-          )
-        })
-        return
+          );
+        });
+        return;
       }
       if (
         JSON.parse(arrData).find(item => item.type === this.$route.query.type)
       ) {
-        this.$store.state.defaultShowLabelAreaState = 'defaultLocal'
+        this.$store.state.defaultShowLabelAreaState = "defaultLocal";
         // 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
+        ).selectDataLeft;
         // console.log(
         //   JSON.parse(arrData).find(item => item.type === this.$route.query.type)
         //     .selectDate.time.value,
@@ -1872,169 +1937,171 @@ export default {
         // )
         this.$store.state.selectData = JSON.parse(arrData).find(
           item => item.type === this.$route.query.type
-        ).selectDate.time.value
+        ).selectDate.time.value;
         // console.log(this.$store.state.selectDataLeft, '赋值数据')
-        this.$store.state.selectfilter = this.$store.state.selectDataLeft.f
+        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
+        ).SelecttDimension;
         this.$store.state.yesNoClickZZ = JSON.parse(arrData).find(
           item => item.type === this.$route.query.type
-        ).yesNoClickZZ
+        ).yesNoClickZZ;
         this.$store.state.yesNoClickChange = JSON.parse(arrData).find(
           item => item.type === this.$route.query.type
-        ).yesNoClickChange
+        ).yesNoClickChange;
         this.$store.state.advancedSearchState = JSON.parse(arrData).find(
           item => item.type === this.$route.query.type
-        ).advancedSearchState
+        ).advancedSearchState;
         // 高级查询
         if (this.$store.state.advancedSearchState) {
           this.$store.state.advanceData = JSON.parse(arrData).find(
             item => item.type === this.$route.query.type
-          ).advanceData
+          ).advanceData;
           this.$store.state.areaIndexName = JSON.parse(arrData).find(
             item => item.type === this.$route.query.type
-          ).areaIndexName
+          ).areaIndexName;
           this.$store.state.labelIndexName = JSON.parse(arrData).find(
             item => item.type === this.$route.query.type
-          ).labelIndexName
+          ).labelIndexName;
         }
-        if (this.$route.query.type === 'area') {
+        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
+          ).selectDate.sequence;
           this.$store.state.areaDimensionState = JSON.parse(arrData).find(
             item => item.type === this.$route.query.type
-          ).yesNoClickChange
+          ).yesNoClickChange;
           this.$store.state.yesNoClickChange = JSON.parse(arrData).find(
             item => item.type === this.$route.query.type
-          ).yesNoClickChange
+          ).yesNoClickChange;
         } else {
           this.$store.state.transBefore = JSON.parse(arrData).find(
             item => item.type === this.$route.query.type
-          ).allNochangeInitData
+          ).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
+          ).allNochangeInitData;
         }
         // console.log(this.$store.state.SelecttDimension, 'this.$store.state.advancedSearchState0000000000000000000000')
         if (
           this.$store.state.yesNoClickChange &&
-          this.$route.query.type === 'area'
+          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.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'
+            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')
+            (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'
+            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')
+            (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.noSelecttDimension = "sj";
           }
           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
-        )
+        );
         if (this.$store.state.advancedSearchState) {
-          this.$refs.childChartCont.advancedSearchDataShow()
+          this.$refs.childChartCont.advancedSearchDataShow();
         }
       } else {
         this.$axios({
-          method: 'GET',
-          url: 'data/data/default',
+          method: "GET",
+          url: "data/data/default",
           params: {
             type: this.$route.query.type
           }
         }).then(res => {
           // 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.$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'
-          )
+            "default3"
+          );
           this.$refs.childChartCont.getInfor(
             this.$store.state.defaultDataId.id
-          )
-        })
+          );
+        });
       }
     },
-    comTime (res) {
+    comTime(res) {
       // console.log(res, '被选中的111')
-      this.downLaSelect = res.extendData
+      this.downLaSelect = res.extendData;
     },
     // 接收子组件传值新增指标
-    emitStatesd (...val) {
+    emitStatesd(...val) {
       // console.log(val, 'val')
       if (val[0]) {
         // console.log(val)
-        if (val[1]) this.getNewTransData()
-        this.statesDf = 2
+        if (val[1]) this.getNewTransData();
+        this.statesDf = 2;
       } else {
-        this.statesDf = 1
+        this.statesDf = 1;
       }
     },
-    getNewTransData () {
+    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 = []
+      let labelIndexs = [];
       this.$store.state.noChangeData.timeArr.forEach((item, index) => {
-        if (this.$store.state.transBefore.timeArr.indexOf(item) > -1) { labelIndexs.push(index) }
-      })
+        if (this.$store.state.transBefore.timeArr.indexOf(item) > -1) {
+          labelIndexs.push(index);
+        }
+      });
       // console.log(labelIndexs, '下标')
-      let data = [] // JSON.parse(JSON.stringify())
+      let data = []; // JSON.parse(JSON.stringify())
       // this.$store.state.transBefore.termsName.forEach((item, index) => {
       //   data[index] = []
       //   // data[index].push(item)
@@ -2044,114 +2111,123 @@ export default {
         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)
-            })
+              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)
-        })
+          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
+    tellAreadly(val) {
+      this.statesDf = val;
     },
     // 接收并且改变参数
-    stateTell (val) {
-      this.stateTells = val
+    stateTell(val) {
+      this.stateTells = val;
     },
     // 重置参数
-    prentsState (val) {
-      this.stateTells = val
-      this.labelAreaState = true
+    prentsState(val) {
+      this.stateTells = val;
+      this.labelAreaState = true;
     },
     // 改变状态
-    stateDataGet (val) {
-      this.stateDataGetVal = val
+    stateDataGet(val) {
+      this.stateDataGetVal = val;
     },
-    stateDFGHJ (val) {
-      this.stateDataGetVal = val
-      this.labelAreaState = false
+    stateDFGHJ(val) {
+      this.stateDataGetVal = val;
+      this.labelAreaState = false;
       // 恢复最初的选择
     },
     // 地区数据下拉发生变化
-    statertfResu (val) {
+    statertfResu(val) {
       // console.log(val, '1010110')
-      this.downLaSelectArea = val
-      this.indStatic = 0
+      this.downLaSelectArea = val;
+      this.indStatic = 0;
       // 调用childChartCont组件方法获取数据
-      this.$refs.childChartCont.downLaSelectArea(this.downLaSelectArea)
+      this.$refs.childChartCont.downLaSelectArea(this.downLaSelectArea);
     },
     // 重置清除空行空列状态
-    statertyui (val) {
-      this.showTableState = val
+    statertyui(val) {
+      this.showTableState = val;
     },
     // 重置维度转换状态
-    emmitStateAd (val) {
+    emmitStateAd(val) {
       // this.areaDimensionStateS = val
     },
     // 重置高级查询状态
-    tellParentsShowClos (val) {
-      this.advancedStates = val
+    tellParentsShowClos(val) {
+      this.advancedStates = val;
     },
     // 改变状态
-    tellChangeFan (val) {
-      this.labelAreaStateks = val
+    tellChangeFan(val) {
+      this.labelAreaStateks = val;
     },
     // 调用子组件的方法
-    changeBrother () {
-      this.$refs.childChartCont.brotherFuncShowData()
+    changeBrother() {
+      this.$refs.childChartCont.brotherFuncShowData();
     },
     // 调用子组件的方法
-    changeDimensionTrueChangeArea (res) {
-      this.$refs.childDimension.trueChangeArea(res)
+    changeDimensionTrueChangeArea(res) {
+      this.$refs.childDimension.trueChangeArea(res);
     },
     // 调用子组件的方法重置数据
-    changeScreenCom () {
-      this.$refs.childChartCont.initTableData()
+    changeScreenCom() {
+      this.$refs.childChartCont.initTableData();
     },
     // 调用子组件的方法重置筛选数据
-    childChartsCutShow () {
+    childChartsCutShow() {
       // console.log('kfa555')
-      this.$refs.childChartsCut.showLabelArea()
+      this.$refs.childChartsCut.showLabelArea();
     },
     // 调用子组件的方法重置筛选数据
-    childChartContShow (res) {
-      this.$refs.childChartCont.getInfor(res)
+    childChartContShow(res) {
+      this.$refs.childChartCont.getInfor(res);
     },
     // 调用子组件的方法重置维度转换下拉筛选数据
-    changeCutShow () {
-      this.$refs.childChartsCut.areaDimensionDo(true)
+    changeCutShow() {
+      this.$refs.childChartsCut.areaDimensionDo(true);
       // 重置三维转换默认选中
-      this.$refs.childDimension.change3D()
+      this.$refs.childDimension.change3D();
     },
     // 调用子组件的方法重置维度转换下拉筛选数据
-    change3Ds () {
+    change3Ds() {
       // 重置三维转换默认选中
-      this.$refs.childDimension.change3D()
+      this.$refs.childDimension.change3D();
     },
-    judgeDimension () {
+    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
+      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()
+      temp = temp
+        .split("")
+        .sort()
+        .toString();
+      string = string
+        .split("")
+        .sort()
+        .toString();
       if (string !== temp) {
-        localStorage.setItem('dimension', JSON.stringify(this.$store.state.SelecttDimension))
+        localStorage.setItem(
+          "dimension",
+          JSON.stringify(this.$store.state.SelecttDimension)
+        );
         // console.log(this.$store.state.SelecttDimension, '初始化转之')
       }
       // console.log(temp)
@@ -2159,70 +2235,95 @@ export default {
   },
   computed: {
     // 计算字符串
-    computedStr () {
+    computedStr() {
       return str => {
-        let Strs = ''
-        str.length <= 32 ? (Strs = str) : (Strs = str.slice(0, 31) + '...')
-        return Strs
-      }
+        let Strs = "";
+        str.length <= 32 ? (Strs = str) : (Strs = str.slice(0, 31) + "...");
+        return Strs;
+      };
     },
     // 根据传入的数值计算出实际px值
-    computedNumberPx () {
+    computedNumberPx() {
       return pszhi => {
         let sizes =
-          (160 / ((1920 - 17) / document.body.clientWidth) / 10 / 16) * pszhi
-        return sizes
-      }
+          (160 / ((1920 - 17) / document.body.clientWidth) / 10 / 16) * pszhi;
+        return sizes;
+      };
     },
     // 根据传入的值计算出实际的rem值
-    computedNumberRem () {
+    computedNumberRem() {
       return pszhi => {
         let sizes =
           pszhi /
           (160 / ((1920 - 17) / document.body.clientWidth) / 10 / 16) /
-          16
-        return sizes
-      }
+          16;
+        return sizes;
+      };
     },
     // 计算文字显示状态
-    computStatic () {
+    computStatic() {
       return (index, arr) => {
-        let staticd = false
+        let staticd = false;
         if (arr.length - 1 === index || arr.length - 2 === index) {
-          staticd = false
+          staticd = false;
         } else {
-          staticd = true
+          staticd = true;
         }
-        return staticd
-      }
+        return staticd;
+      };
     }
   },
-  mounted () {
-    this.dataPos = this.$route.query.type
+  mounted() {
+    console.log(localStorage.getItem("active"))
+    if(localStorage.getItem("active")){
+      this.active = localStorage.getItem("active")
+    }else{
+      this.active = 0
+    }
+    this.dataPos = this.$route.query.type;
     // console.log(this.$route.query.type)
-    this.initValue = this.computedNumberPx(200)
+    this.initValue = this.computedNumberPx(200);
     // console.log(this.computedNumberPx(200))
     // 获取菜单信息
-    this.getCateData()
-    if (this.$route.query.type !== 'area') {
+    this.getCateData();
+    if (this.$route.query.type !== "area") {
       this.$store.state.SelecttDimension = {
-        row: 'sj',
-        col: 'zb'
-      }
+        row: "sj",
+        col: "zb"
+      };
     } else {
       this.$store.state.SelecttDimension = {
-        row: 'sj',
-        col: 'dq'
-      }
+        row: "sj",
+        col: "dq"
+      };
     }
   },
-  updated () {
+  updated() {
     // console.log(this.defaultDataRight, 'this.defaultSelectLies')
   }
-}
+};
 </script>
 
 <style scoped lang="scss">
+.activeing{
+  color:#6AB5EE;
+}
+/deep/ .el-submenu.is-opened>.el-submenu__title /deep/ .el-submenu__icon-arrow{
+      transform: rotateZ(90deg);
+      margin-top: 0px!important;
+}
+/deep/ .el-icon-arrow-down:before{
+    content:""!important;
+}
+/deep/.el-submenu__icon-arrow{
+ width: 0;
+  height: 0;  
+  border-top: 7px solid transparent;
+  border-bottom: 7px solid transparent;
+  border-left: 7px solid #007AFF;
+  margin-top:-2px!important;
+  margin-right:3px
+}
 /deep/ .el-col-24 {
   min-width: 100%;
   width: auto;
@@ -2297,12 +2398,15 @@ export default {
         align-items: center;
 
         & > .left {
-          // margin-left: 1.5rem;
+          
           font-size: 1.5rem;
           font-weight: bold;
           font-stretch: normal;
           letter-spacing: 0.125rem;
           color: #000000;
+          & > div{
+            margin-left: 1.5rem;
+          }
         }
         & > .right {
           // margin-right: 1.5rem;
diff --git a/src/views/index/Index.vue b/src/views/index/Index.vue
index a7ca97c..ce23884 100644
--- a/src/views/index/Index.vue
+++ b/src/views/index/Index.vue
@@ -417,7 +417,7 @@ export default {
           limit: 8
         }
       }).then(res => {
-        console.log(res, '快速查询')
+        //console.log(res, '快速查询')
         // 请求接口完成   请求成功
         if (res.data.code === 200) {
           let brrtLeft = []
@@ -507,7 +507,7 @@ export default {
         params: {
         }
       }).then(res => {
-        console.log(res, '数据更新')
+       // console.log(res, '数据更新')
         // 请求接口完成   请求成功
         if (res.data.code === 200) {
           let arrts = []
diff --git a/src/views/personalCenter/PersonalCenter.vue b/src/views/personalCenter/PersonalCenter.vue
index 0d3b314..d56cbab 100644
--- a/src/views/personalCenter/PersonalCenter.vue
+++ b/src/views/personalCenter/PersonalCenter.vue
@@ -62,7 +62,7 @@
                     <div v-for="(item,index) in collect" :key="index">
                       <div :title="item.name">
                         <span v-if="!item.staticInput">{{item.name}}</span>
-                        <input
+                        <!-- <input
                           type="text"
                           :placeholder="item.name"
                           v-model="collectName"
@@ -70,7 +70,15 @@
                           v-focus="true"
                           @blur="blurUpset(item.id,item.name)"
                           @keyup.enter="blurUpset(item.id,item.name)"
-                        />
+                        /> -->
+                        <el-input
+                        :placeholder="item.name"
+                          v-model="collectName"
+                          v-if="item.staticInput"
+                           v-focus="true"
+                          @blur="blurUpset(item.id,item.name)"
+                          @keyup.enter="blurUpset(item.id,item.name)"
+                         ></el-input>
                       </div>
                       <div :title="item.database" @click="jumpSearch(item)">{{item.database}}</div>
                       <div>{{item.birthTime}}</div>
diff --git a/src/views/register/Register.vue b/src/views/register/Register.vue
index fabf5eb..6dd9aa5 100644
--- a/src/views/register/Register.vue
+++ b/src/views/register/Register.vue
@@ -8,34 +8,34 @@
       <div class="register_main">
         <div class="title">个人用户注册</div>
         <div>
-          <div>用户名称</div>
-          <input type="text" placeholder="请输入您的真实姓名" v-model="registerData.username" />
+          <div><span style="color:red">*</span>用户名称</div>
+          <input type="text" placeholder="请输入您的用户名,必须为英文或数字组合" onKeyUp="value=value.replace(/[\W]/g,'')" v-model="registerData.username" />
         </div>
         <div>
-          <div>电话号码</div>
+          <div><span style="color:red">*</span>电话号码</div>
           <input type="text" placeholder="请输入手机号或座机号" v-model="registerData.userIphone" />
         </div>
         <div>
-          <div>邮箱地址</div>
+          <div><span style="color:red">*</span>邮箱地址</div>
           <input type="text" placeholder="请输入邮箱" v-model="registerData.userMail" />
         </div>
         <div>
-          <div>设置密码</div>
+          <div><span style="color:red">*</span>设置密码</div>
           <input type="password" placeholder="请输入密码" v-model="registerData.password" />
         </div>
         <div>
-          <div>确认密码</div>
+          <div><span style="color:red">*</span>确认密码</div>
           <input type="password" placeholder="请重新输入密码" v-model="registerData.passwordQR" />
         </div>
         <div>
-          <div>机构名称</div>
+          <div><span style="color:red">*</span>机构名称</div>
           <input type="text" placeholder="请输入机构名称" v-model="registerData.organizationName" />
         </div>
-        <div>
+        <div style="margin-left:15px">
           <div>机构地址</div>
-          <textarea placeholder="请输入机构地址" v-model="registerData.organizationSite"></textarea>
+          <input placeholder="请输入机构地址" type="text" v-model="registerData.organizationSite" />
         </div>
-        <div>
+        <div style="margin-left:15px">
           <div>所属部门</div>
           <input type="text" placeholder="请输入所属部门" v-model="registerData.department" />
         </div>
@@ -91,12 +91,14 @@ export default {
         this.$alert('电话号码不能为空！', '温馨提示', {
           confirmButtonText: '确定'
         })
-      } else if (this.registerData.userMail === '') {
+      } 
+      else if (this.registerData.userMail === '') {
         // alert('邮箱地址不能为空！')
         this.$alert('邮箱地址不能为空！', '温馨提示', {
           confirmButtonText: '确定'
         })
-      } else if (this.registerData.password === '') {
+      } 
+      else if (this.registerData.password === '') {
         // alert('设置密码不能为空！')
         this.$alert('设置密码不能为空！', '温馨提示', {
           confirmButtonText: '确定'
@@ -111,17 +113,19 @@ export default {
         this.$alert('机构名称不能为空！', '温馨提示', {
           confirmButtonText: '确定'
         })
-      } else if (this.registerData.organizationSite === '') {
-        // alert('机构地址不能为空！')
-        this.$alert('机构地址不能为空！', '温馨提示', {
-          confirmButtonText: '确定'
-        })
-      } else if (this.registerData.department === '') {
-        // alert('所属部门不能为空！')
-        this.$alert('所属部门不能为空！', '温馨提示', {
-          confirmButtonText: '确定'
-        })
-      } else if (!(/^1(?:3\d|4[4-9]|5[0-35-9]|6[67]|7[013-8]|8\d|9\d)\d{8}$/.test(this.registerData.userIphone))) { // 验证手机号
+      }
+      //  else if (this.registerData.organizationSite === '') {
+      //   // alert('机构地址不能为空！')
+      //   this.$alert('机构地址不能为空！', '温馨提示', {
+      //     confirmButtonText: '确定'
+      //   })
+      // } else if (this.registerData.department === '') {
+      //   // alert('所属部门不能为空！')
+      //   this.$alert('所属部门不能为空！', '温馨提示', {
+      //     confirmButtonText: '确定'
+      //   })
+      // } 
+      else if (!(/^1(?:3\d|4[4-9]|5[0-35-9]|6[67]|7[013-8]|8\d|9\d)\d{8}$/.test(this.registerData.userIphone))) { // 验证手机号
         // alert('您输入的手机号码有误！')
         this.$alert('您输入的手机号码有误！', '温馨提示', {
           confirmButtonText: '确定'
@@ -176,7 +180,7 @@ export default {
   justify-content: flex-start;
   align-items: center;
   & > .register_main {
-    margin-bottom: 1.5rem;
+    margin-bottom: 1rem;
     width: 84.25rem;
     background-color: #fff;
     // border: 1px solid red;
@@ -193,7 +197,7 @@ export default {
       color: #000000;
     }
     & > div:nth-child(n + 2) {
-      height: 5.625rem;
+      height: 4.5rem;
       display: flex;
       flex-direction: row;
       justify-content: flex-start;
@@ -217,7 +221,7 @@ export default {
       }
       & > textarea {
         width: 23.375rem;
-        height: 5.5rem;
+        height: 4rem;
         font-size: 1rem;
         font-weight: normal;
         font-stretch: normal;
diff --git a/src/views/relation/Relation.vue b/src/views/relation/Relation.vue
index 4007144..94969d4 100644
--- a/src/views/relation/Relation.vue
+++ b/src/views/relation/Relation.vue
@@ -13,18 +13,7 @@
           <span @click="$router.go(0)">联系我们</span>
         </div>
       </div>
-      <div class="center">
-        <div class="title">留言板</div>
-        <div class="center_input">
-          <input type="text" placeholder="姓名*" v-model="leave.name" />
-          <input type="text" placeholder="邮箱*" v-model="leave.mail" />
-          <input type="text" placeholder="电话*" v-model="leave.iphone" />
-        </div>
-        <input type="text" placeholder="标题*" v-model="leave.title" />
-        <textarea v-model="leave.cont" placeholder="留言内容*"></textarea>
-        <div class="sub" @click="upoloadMessage">提交</div>
-      </div>
-      <div class="bottom">
+       <div class="bottom">
         <div class="contactWay">联系方式</div>
         <div class="contactWay_cont">
           <div v-for="(item,index) in relationData" :key="index">
@@ -47,6 +36,18 @@
           </div>
         </div>
       </div>
+      <div class="center">
+        <div class="title">留言板</div>
+        <div class="center_input">
+          <input type="text" placeholder="姓名*" v-model="leave.name" />
+          <input type="text" placeholder="邮箱*" v-model="leave.mail" />
+          <input type="text" placeholder="请输入手机号或座机号*" v-model="leave.iphone" />
+        </div>
+        <input type="text" placeholder="标题" v-model="leave.title" />
+        <textarea v-model="leave.cont" placeholder="留言内容*"></textarea>
+        <div class="sub" @click="upoloadMessage">提交</div>
+      </div>
+     
     </div>
 
     <!-- 页脚信息 -->
@@ -158,13 +159,15 @@ export default {
         this.$alert('电话号码不能为空！', '温馨提示', {
           confirmButtonText: '确定'
         })
-      } else if (this.leave.title === '') {
-        // alert('标题不能为空！')
-        this.$alert('标题不能为空！', '温馨提示', {
-          confirmButtonText: '确定'
-        })
-      } else if (this.leave.cont === '') {
-        // alert('留言内容不能为空！')
+      } 
+      // else if (this.leave.title === '') {
+      //   // alert('标题不能为空！')
+      //   this.$alert('标题不能为空！', '温馨提示', {
+      //     confirmButtonText: '确定'
+      //   })
+      // } 
+      else if (this.leave.cont === '') {
+        // alert('留言内容不能为空！')  
         this.$alert('留言内容不能为空！', '温馨提示', {
           confirmButtonText: '确定'
         })
@@ -173,13 +176,10 @@ export default {
         this.$alert('您输入的邮箱地址不正确，请重新填写！', '温馨提示', {
           confirmButtonText: '确定'
         })
-      } else if (!(/^1[3456789]\d{9}$/.test(this.leave.iphone))) {
-        // alert('您输入的电话号码不正确，请重新填写！')
-        this.$alert('您输入的电话号码不正确，请重新填写！', '温馨提示', {
-          confirmButtonText: '确定'
-        })
-      } else {
-        this.$axios({
+      } else if ((/^1(3|4|7|5|8)([0-9]{9})/.test(this.leave.iphone))||(/\d{3}-\d{8}|\d{4}-\d{7,8}/.test(this.leave.iphone))){
+       
+
+          this.$axios({
           method: 'POST',
           url: 'aboutus/about-us/message',
           data: {
@@ -206,6 +206,13 @@ export default {
         }).catch((fail) => {
           console.log(fail)
         })
+      } else {
+       // alert('您输入的电话号码不正确，请重新填写！')
+        console.log(!(/^1(3|4|7|5|8)([0-9]{9})/.test(this.leave.iphone)))
+        console.log(!(/^0[0-9]{2,3}-[0-9]{8}/.test(this.leave.iphone)))
+        this.$alert('您输入的电话号码不正确，请重新填写！', '温馨提示', {
+          confirmButtonText: '确定'
+        })
       }
     }
   },
diff --git a/src/views/searchList/SearchList.vue b/src/views/searchList/SearchList.vue
index 660b0cc..6395e28 100644
--- a/src/views/searchList/SearchList.vue
+++ b/src/views/searchList/SearchList.vue
@@ -14,13 +14,21 @@
               <div class="left">相关搜索约为 {{pageConfiguration.countSize}} 条</div>
               <div class="right">
                 <span>筛选栏目：</span>
-                <cityPicker
+                <el-select v-model="lanmu"    @change="change1">
+                  <el-option
+                    v-for="item in shaxuanlist"
+                    :key="item.id"
+                    :label="!isNaN(item.type)?(item.type==1?item.name+'(地区)':item.name+'(非地区)'):item.name"
+                    :value="item.id"
+                  ></el-option>
+                </el-select>
+                <!-- <cityPicker
                   :level="jishu"
                   :selectpattern="selectpattern"
                   :city-data="cityData"
                   :default-city="cityDefaultName"
                   @choice-caller="choiceCaller"
-                ></cityPicker>
+                ></cityPicker> -->
                 <span @click="getSearchData(pageConfiguration.nowPage)">刷新</span>
               </div>
             </div>
@@ -120,7 +128,7 @@ export default {
       // 分页配置
       pageConfiguration: {
         // 每页显示条数
-        oneSize: 2,
+        oneSize: 10,
         // 数据总条数
         countSize: null,
         // 总页数
@@ -131,10 +139,58 @@ export default {
       // 筛选栏目type
       selectLMType: '',
       // 筛选栏目id
-      selectLMId: ''
+      selectLMId: '',
+      shaxuanlist:[{name:"全部",type:'a',id:0}],
+      lanmu:0
     }
   },
   methods: {
+    change1(e){
+      console.log(e)
+       this.$axios({
+        method: "GET",
+        url: "search/search/list",
+        params: {
+          key: this.$route.query.keyVal,
+          limit: 10,
+          page: 1,
+          type: this.selectLMType,
+          id: e
+        }
+      })
+        .then(res => {
+          console.log(res, "全局搜索数据");
+          // 请求接口完成   请求成功
+          if (res.data.code === 200) {
+            let arrts = [];
+            res.data.data.list.forEach((item, index) => {
+              // console.log(item)
+              let srtAs = {
+                id: item.id,
+                name: item.name,
+                className: item.cname,
+                lmss: item.classify,
+                classify_id: item.classify_id,
+                f: item.f,
+                type: item.type
+              };
+              arrts.push(srtAs);
+            });
+            this.searchData = arrts;
+            this.pageConfiguration.countSize = parseInt(res.data.data.total);
+            console.log(this.pageConfiguration);
+            console.log(this.searchData, "searchdata");
+          } else {
+            // alert(res.data.message)
+            this.$alert(res.data.message, "温馨提示", {
+              confirmButtonText: "确定"
+            });
+          }
+        })
+        .catch(fail => {
+          console.log(fail);
+        });
+    },
     // 自动运行
     dfyu () {
       const products = [
@@ -197,7 +253,7 @@ export default {
         url: 'search/search/list',
         params: {
           key: this.$route.query.keyVal,
-          limit: 2,
+          limit: 10,
           page: page,
           type: this.selectLMType,
           id: this.selectLMId
@@ -241,6 +297,9 @@ export default {
         }
       }).then(res => {
         console.log(res, '筛选栏目')
+        for(let i in res.data.data.list){
+            this.shaxuanlist.push(res.data.data.list[i])
+          }
         // 请求接口完成   请求成功
         if (res.data.code === 200) {
           let arrts = []
diff --git a/src/views/userAgreement/UserAgreement.vue b/src/views/userAgreement/UserAgreement.vue
index 6f7c3a9..f1a7254 100644
--- a/src/views/userAgreement/UserAgreement.vue
+++ b/src/views/userAgreement/UserAgreement.vue
@@ -13,6 +13,8 @@
             <span>当前位置：</span>
             <span @click="$router.push('/')">首页</span>
             >
+            <span @click="$router.push('/register')">用户注册</span> 
+            >
             <span @click="$router.push('/userAgreement')">用户协议</span>
           </div>
         </div>
diff --git a/static/data/Component is not found in path_files/all_async_search_99b3fbd.js.下载 b/static/data/Component is not found in path_files/all_async_search_99b3fbd.js.ÏÂÔØ
similarity index 100%
rename from static/data/Component is not found in path_files/all_async_search_99b3fbd.js.下载
rename to static/data/Component is not found in path_files/all_async_search_99b3fbd.js.ÏÂÔØ
diff --git a/static/data/Component is not found in path_files/jquery-1.10.2.min_65682a2.js.下载 b/static/data/Component is not found in path_files/jquery-1.10.2.min_65682a2.js.ÏÂÔØ
similarity index 100%
rename from static/data/Component is not found in path_files/jquery-1.10.2.min_65682a2.js.下载
rename to static/data/Component is not found in path_files/jquery-1.10.2.min_65682a2.js.ÏÂÔØ
diff --git a/static/data/Component is not found in path_files/search-sug_d37baf2.js.下载 b/static/data/Component is not found in path_files/search-sug_d37baf2.js.ÏÂÔØ
similarity index 100%
rename from static/data/Component is not found in path_files/search-sug_d37baf2.js.下载
rename to static/data/Component is not found in path_files/search-sug_d37baf2.js.ÏÂÔØ
diff --git a/static/data/Component is not found in path_files/swfobject_0178953.js.下载 b/static/data/Component is not found in path_files/swfobject_0178953.js.ÏÂÔØ
similarity index 100%
rename from static/data/Component is not found in path_files/swfobject_0178953.js.下载
rename to static/data/Component is not found in path_files/swfobject_0178953.js.ÏÂÔØ
diff --git a/static/data/Component is not found in path_files/tu_77547af.js.下载 b/static/data/Component is not found in path_files/tu_77547af.js.ÏÂÔØ
similarity index 100%
rename from static/data/Component is not found in path_files/tu_77547af.js.下载
rename to static/data/Component is not found in path_files/tu_77547af.js.ÏÂÔØ
diff --git a/vue.config.js b/vue.config.js
index 4ded296..1cf9f40 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -63,7 +63,9 @@ module.exports = {
       },
       // 配置跨域
       '/v1/': {
-        target: 'http://data.it-blog.wang/api/v1/',
+        target: 'http://www.zhishidata.com/api/v1/',
+        // target: 'http://abc.zhangjiwei.top/api/v1/',
+        // target: 'http://data.it-blog.wang/api/v1/',
         ws: false, // 允许重写
         changeOrigin: true, // 允许跨域
         pathRewrite: {
diff --git a/地区数据/地区数据年度分类年度数据.xlsx b/地区数据/µØÇøÊý¾ÝÄê¶È·ÖÀàÄê¶ÈÊý¾Ý.xlsx
similarity index 100%
rename from 地区数据/地区数据年度分类年度数据.xlsx
rename to 地区数据/µØÇøÊý¾ÝÄê¶È·ÖÀàÄê¶ÈÊý¾Ý.xlsx
diff --git a/地区数据/地区月度分类季度数据.xlsx b/地区数据/µØÇøÔ¶ȷÖÀ༾¶ÈÊý¾Ý.xlsx
similarity index 100%
rename from 地区数据/地区月度分类季度数据.xlsx
rename to 地区数据/µØÇøÔ¶ȷÖÀ༾¶ÈÊý¾Ý.xlsx
diff --git a/地区数据/地区月度分类月度数据.xlsx b/地区数据/µØÇøÔ¶ȷÖÀàÔ¶ÈÊý¾Ý.xlsx
similarity index 100%
rename from 地区数据/地区月度分类月度数据.xlsx
rename to 地区数据/µØÇøÔ¶ȷÖÀàÔ¶ÈÊý¾Ý.xlsx