...

2020-11-20 17:15:30 +08:00
parent 9c5d503b51
commit 38aef23cca
29 changed files with 1647 additions and 1087 deletions
--- 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/'
+#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/'
--- 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>
+
--- 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
--- 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;
--- 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) {
--- 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;
--- 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;
          }
        }
--- 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;
--- 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;
--- 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人员权限
--- a/src/util.zip
+++ b/src/util.zip
--- a/src/util/a.js
+++ 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);
+// }
--- a/src/util/s.js
+++ 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()
+    },
+  }
--- a/src/views/datasweb/Datasweb.vue
+++ b/src/views/datasweb/Datasweb.vue
--- 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 = []
--- 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>
--- 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;
--- 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: '确定'
+        })
      }
    }
  },
--- 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 = []
--- 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>
--- a/path_files/all_async_search_99b3fbd.js.ÏÂÔØ
+++ b/path_files/all_async_search_99b3fbd.js.ÏÂÔØ
--- a/path_files/jquery-1.10.2.min_65682a2.js.ÏÂÔØ
+++ b/path_files/jquery-1.10.2.min_65682a2.js.ÏÂÔØ
--- a/path_files/search-sug_d37baf2.js.ÏÂÔØ
+++ b/path_files/search-sug_d37baf2.js.ÏÂÔØ
--- a/path_files/swfobject_0178953.js.ÏÂÔØ
+++ b/path_files/swfobject_0178953.js.ÏÂÔØ
--- a/path_files/tu_77547af.js.ÏÂÔØ
+++ b/path_files/tu_77547af.js.ÏÂÔØ
--- 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: {
--- a/地区数据/µØÇøÊý¾ÝÄê¶È·ÖÀàÄê¶ÈÊý¾Ý.xlsx
+++ b/地区数据/µØÇøÊý¾ÝÄê¶È·ÖÀàÄê¶ÈÊý¾Ý.xlsx
--- a/地区数据/µØÇøÔÂ¶È·ÖÀà¼¾¶ÈÊý¾Ý.xlsx
+++ b/地区数据/µØÇøÔÂ¶È·ÖÀà¼¾¶ÈÊý¾Ý.xlsx
--- a/地区数据/µØÇøÔÂ¶È·ÖÀàÔÂ¶ÈÊý¾Ý.xlsx
+++ b/地区数据/µØÇøÔÂ¶È·ÖÀàÔÂ¶ÈÊý¾Ý.xlsx