From ddfe0028d66dfb1c9d9501ce403bd91b74100d71 Mon Sep 17 00:00:00 2001
From: fanzhen123 <1575502816@qq.com>
Date: Wed, 25 Dec 2019 19:59:07 +0800
Subject: [PATCH] fanzhen1225

---
 src/components/chartsCut/ChartsCut.vue |  2 +-
 src/components/search/search.vue       | 18 +++++++++---------
 src/views/datasweb/Datasweb.vue        |  1 +
 src/views/searchList/SearchList.vue    |  4 ++++
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/components/chartsCut/ChartsCut.vue b/src/components/chartsCut/ChartsCut.vue
index 448530e..2d2887a 100644
--- a/src/components/chartsCut/ChartsCut.vue
+++ b/src/components/chartsCut/ChartsCut.vue
@@ -70,7 +70,7 @@
         </div>
       </div>
     </div>
-    <div class="chart_right" v-if="$store.state.SelecttDimension.row !== 'sj' && $store.state.SelecttDimension.col !== 'dq'&&this.$store.state.transBefore">
+    <div class="chart_right" v-else>
       {{leftLabel[$store.state.noSelecttDimension]}}：
       <el-cascader
         v-model="valueDimension"
diff --git a/src/components/search/search.vue b/src/components/search/search.vue
index 304a10b..b21579a 100644
--- a/src/components/search/search.vue
+++ b/src/components/search/search.vue
@@ -2,8 +2,8 @@
   <div class="searchAll">
     <div class="search">
       <div class="kuang">
-        <input type="text" v-model="searchContext" placeholder="全站搜索" @keyup.enter="blurUpset" />
-        <img :src="imgUrl.search" alt @click="blurUpset" />
+        <input type="text" v-model="searchContext" placeholder="全站搜索" @keyup.enter="blurUpset(false)" />
+        <img :src="imgUrl.search" alt @click="blurUpset(false)" />
       </div>
       <div class="tjHold">
         统计热词
@@ -28,12 +28,12 @@ export default {
   },
   methods: {
     blurUpset (textCont) {
+      /*eslint-disable*/
       console.log(textCont, '3523')
-      this.searchContext = textCont
-      if (this.searchContext === '') {
-        alert('搜索词不能为空！')
-        return
-      }
+      // if (this.searchContext === '') {
+      //   alert('搜索词不能为空！')
+      //   return
+      // }
       if (this.$route.path === '/searchList') {
         this.$router.push({
           path: '/'
@@ -41,7 +41,7 @@ export default {
         this.$router.push({
           path: './searchList',
           query: {
-            keyVal: !textCont.target ? textCont : this.searchContext
+            keyVal: textCont?textCont:this.searchContext
           }
         })
         this.$router.go(0)
@@ -49,7 +49,7 @@ export default {
         this.$router.push({
           path: './searchList',
           query: {
-            keyVal: !textCont.target ? textCont : this.searchContext
+            keyVal: textCont?textCont:this.searchContext
           }
         })
       }
diff --git a/src/views/datasweb/Datasweb.vue b/src/views/datasweb/Datasweb.vue
index d979e74..fe054b2 100644
--- a/src/views/datasweb/Datasweb.vue
+++ b/src/views/datasweb/Datasweb.vue
@@ -1502,6 +1502,7 @@ export default {
 
         & > .data_center:hover {
           cursor: w-resize;
+          cursor: e-resize;
           user-select: none;
         }
         & > .data_right {
diff --git a/src/views/searchList/SearchList.vue b/src/views/searchList/SearchList.vue
index a0cf8a5..f8acb86 100644
--- a/src/views/searchList/SearchList.vue
+++ b/src/views/searchList/SearchList.vue
@@ -212,6 +212,8 @@ export default {
           this.searchData = arrts
           this.pageConfiguration.countSize = parseInt(res.data.data.total)
           console.log(this.pageConfiguration)
+        }else{
+          alert(res.data.message)
         }
       }).catch((fail) => {
         console.log(fail)
@@ -236,6 +238,8 @@ export default {
           })
           arrts.push({ 'id': '-全部-', 'name': '-全部-', 'parentId': '100000', 'shortName': '北京', 'cityCode': '' })
           this.cityData = arrts
+        }else{
+          alert(res.data.message)
         }
       }).catch((fail) => {
         console.log(fail)