Merge branch 'master' of http://git.cc-lotus.info/Information/cxyy-web2

src/components/custom/custom-layout.vue

@@ -66,23 +66,23 @@
               <div class="title">邮箱：{{ footInfos.Email || footInfo.Email }}</div>
               <div class="title">地址：{{ footInfos.Address || footInfo.Address }}</div>
             </div>
+            <div class="center">
+              <span>友情连接:</span>
+              <div class="list" v-for="(item, index) in typeList" :key="index">
+                <div class="list_1" v-if="item.list && item.list.length > 0">
+                  <div class="title">{{ item.title }}</div>
+                </div>
+                <div class="list_2">
+                  <div v-for="(tag, indexx) in item.list" :key="indexx" @click="toLink(tag)">{{ tag.name }}</div>
+                </div>
+              </div>
+            </div>
             <div class="right">
               <el-image class="image" v-if="footInfos && footInfos.Code && footInfos.Code.length > 0" :src="getUrl(footInfos.Code)" fit="fill" />
               <el-image class="image" v-else :src="footInfo.Code" fit="fill" />
               <div class="title" @click="toHelp">关于我们</div>
             </div>
           </div>
-          <div class="foot_1">
-            <span>友情连接:</span>
-            <el-col :span="7" class="list" v-for="(item, index) in typeList" :key="index">
-              <div class="list_1">
-                <div class="title">{{ item.title }}</div>
-              </div>
-              <div class="list_2">
-                <span v-for="(tag, indexx) in item.list" :key="indexx" @click="toLink(tag)"> {{ tag.name }}</span>
-              </div>
-            </el-col>
-          </div>
           <div class="footer_right">
             {{ footInfo.Copyright }}
           </div>
@@ -379,32 +379,6 @@ const toOut = () => {
     box-shadow: 0 6px 10px 0 rgba(0, 0, 0, 0.2);
     .foot {
       margin: 0 20px;
-      .foot_1 {
-        color: $global-color-fff;
-        font-size: $global-font-size-16;
-        display: flex;
-        margin: 10px 0;
-        padding: 0 0 10px 0;
-
-        span {
-          width: 80px;
-        }
-        .list {
-          text-align: center;
-          .list_1 {
-            margin: 0 0 10px 0;
-          }
-          .list_2 {
-            span {
-              margin: 0 5px 5px 0;
-              cursor: default;
-            }
-            span:hover {
-              font-size: $global-font-size-18;
-            }
-          }
-        }
-      }
       .foot_2 {
         color: $global-color-fff;
         font-size: $global-font-size-16;
@@ -424,6 +398,33 @@ const toOut = () => {
               margin: 5px 0 0 0;
             }
           }
+          .center {
+            color: $global-color-fff;
+            font-size: $global-font-size-16;
+            display: flex;
+            margin: 10px 0;
+            padding: 0 0 10px 0;
+
+            span {
+              width: 80px;
+            }
+            .list {
+              width: 250px;
+              text-align: center;
+              .list_1 {
+                margin: 0 0 10px 0;
+              }
+              .list_2 {
+                display: flex;
+                flex-wrap: wrap;
+                justify-content: center;
+                div {
+                  margin: 0 5px 5px 0;
+                  cursor: default;
+                }
+              }
+            }
+          }
           .right {
             text-align: center;
             .image {

src/views/elevenHatch/index.vue

@@ -835,8 +835,20 @@ const sizeChange = (limits) => {
     background-color: rgba($color: #ffffff, $alpha: 0.1) !important;
     color: #ffffff !important;
   }
+  :deep(.el-pagination.is-background .btn-prev) {
+    background-color: rgba($color: #ffffff, $alpha: 0.1) !important;
+    color: #ffffff !important;
+  }
+  :deep(.el-pagination.is-background .btn-next) {
+    background-color: rgba($color: #ffffff, $alpha: 0.1) !important;
+    color: #ffffff !important;
+  }
   :deep(.el-pagination.is-background .el-pager li.is-active) {
-    background-color: #49bcf7 !important;
+    background-color: #4d5b87 !important;
+    color: #ffffff !important;
+  }
+  :deep(.el-pagination.is-background .el-pager li) {
+    background-color: rgba($color: #ffffff, $alpha: 0.1) !important;
     color: #ffffff !important;
   }
   /* 定制滚动条整体 */

src/views/four/index.vue

@@ -39,10 +39,11 @@ const searchValue = ref('')
 const list = ref([])
 const tagsList = ref([])
 const menuList = ref([
-  { key: '1', tab: '全部' },
+  { key: '0', tab: '全部' },
   { key: '3', tab: '找项目' },
   { key: '4', tab: '找需求' },
   { key: '6', tab: '找成果' },
+  { key: '1', tab: '找企业' },
   { key: '-1', tab: '更多+' }
 ])
 // 路由
@@ -87,16 +88,16 @@ const remoteMethod = (query) => {
 }
 // 选择
 const handleClick = (tab) => {
-  if (tab == -1) {
-    menuList.value = [
-      { key: '-1', tab: '全部' },
-      { key: '3', tab: '找项目' },
-      { key: '4', tab: '找需求' },
-      { key: '5', tab: '找供给' },
-      { key: '6', tab: '找成果' },
-      { key: '1', tab: '找企业' }
-    ]
-  }
+  // if (tab == -1) {
+  //   menuList.value = [
+  //     { key: '-1', tab: '全部' },
+  //     { key: '3', tab: '找项目' },
+  //     { key: '4', tab: '找需求' },
+  //     { key: '5', tab: '找供给' },
+  //     { key: '6', tab: '找成果' },
+  //     { key: '1', tab: '找企业' }
+  //   ]
+  // }
 }
 </script>
 <style scoped lang="scss">

src/views/one/page.vue

@@ -52,7 +52,7 @@
       <div class="two_1">
         <div class="twoList" v-for="(item, index) in recordList" :key="index" @click="toSelect(item)">
           <div class="two_num">
-            <span>{{ item.num || 0 }}+</span>
+            <span>{{ item.num || 0 }}</span>
             <span>{{ item.unit || '' }}</span>
           </div>
           <div class="two_title">{{ item.name || '暂无名称' }}</div>

src/views/one/parts/echarts1.vue

@@ -73,7 +73,7 @@ function echarts1View() {
         color: ['#62c98d', '#2f89cf', '#4cb9cf', '#53b666', '#62c98d', '#205acf', '#c9c862', '#c98b62', '#c962b9', '#7562c9', '#c96262', '#c25775', '#00b7be'],
         type: 'pie',
         radius: [30, 100],
-        center: ['25%', '70%'],
+        center: ['25%', '50%'],
         roseType: 'radius',
         label: {
           normal: {
@@ -104,45 +104,71 @@ function echarts2View() {
   var myChart2 = echarts.init(echarts2.value)
   var option2 = {
     tooltip: {
-      // 鼠标悬浮提示数据
       trigger: 'axis',
-      borderWidth: 15,
-      textStyle: {
-        // 文字提示样式
-        fontSize: '16'
-      },
       axisPointer: {
-        // 坐标轴虚线
-        type: 'cross',
-        label: {
-          backgroundColor: '#6a7985'
-        }
+        type: 'shadow'
+      },
+
+      formatter: function (param) {
+        return param[0].seriesName + ':' + param[0].data + '%<br />' + param[1].seriesName + ':' + param[1].data + '%'
       }
     },
-
-    // },
     grid: {
-      // 控制图表的位置
-      left: '5%',
-      right: '5%',
-      top: '18%',
-      bottom: '5%',
-      containLabel: true
+      top: 50,
+      left: 44,
+      right: 44,
+      bottom: 30
     },
-    xAxis: {
-      axisLabel: {
+    legend: {
+      right: '0',
+      textStyle: {
+        color: '#FFFFFF'
+      },
+      color: ['#ffcc00', '#28f2e6']
+    },
+    xAxis: [
+      {
+        type: 'category',
+        data: info.value.two.nameList,
         // X轴线 标签修改
         textStyle: {
           fontSize: '14'
-        }
-      },
-      data: info.value.two.nameList
-    },
+        },
+        axisLabel: {
+          show: true,
+          textStyle: {
+            color: '#7FC5F5'
+          },
+          interval: 0
+        },
+        axisLine: {
+          lineStyle: {
+            color: 'rgba(127,197,245,0.1)',
+            width: 1 //这里是为了突出显示加上的
+          }
+        },
+        triggerEvent: true
+      }
+    ],
     yAxis: {
+      // y轴
+      type: 'value',
+      splitNumber: 5, // 横线数
+      // y轴线 标签修改
+      textStyle: {
+        fontSize: '14'
+      },
       axisLabel: {
-        // y轴线 标签修改
-        textStyle: {
-          fontSize: '14'
+        show: true,
+        formatter: '{value}',
+        color: '#7FC5F5'
+      },
+      splitLine: {
+        // 网格线
+        show: true,
+        lineStyle: {
+          color: 'rgba(127,197,245,0.1)',
+          width: 1
         }
       }
     },
@@ -150,21 +176,27 @@ function echarts2View() {
       {
         data: info.value.two.list,
         type: 'bar',
-        barWidth: '48%', //调整柱状图宽度
+        barWidth: '40%',
+        label: {
+          normal: {
+            show: true,
+            position: 'top',
+            fontSize: 18
+          }
+        },
         itemStyle: {
           normal: {
-            /*--------设置柱形图圆角 [左上角，右上角，右下角，左下角]-------------*/
-            borderRadius: [12, 12, 0, 0],
-            /*--------设置柱形图渐变色 -------------*/
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: 'rgba(0,244,255,1)'
-              },
-              {
-                offset: 1,
-                color: 'rgba(0,77,167,1)'
+            label: {
+              show: true,
+              position: 'top',
+              textStyle: {
+                color: '#FFFFFF'
               }
+            },
+            color: echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              { offset: 0, color: '#28f2e6' },
+              { offset: 0.5, color: 'rgba(40,242,230,0.1)' },
+              { offset: 1, color: 'rgba(255,255,255,0)' }
             ])
           }
         }

src/views/one/parts/echarts2.vue

@@ -73,7 +73,7 @@ function echarts1View() {
         color: ['#62c98d', '#2f89cf', '#4cb9cf', '#53b666', '#62c98d', '#205acf', '#c9c862', '#c98b62', '#c962b9', '#7562c9', '#c96262', '#c25775', '#00b7be'],
         type: 'pie',
         radius: [30, 100],
-        center: ['25%', '70%'],
+        center: ['25%', '50%'],
         roseType: 'radius',
         label: {
           normal: {
@@ -104,45 +104,64 @@ function echarts2View() {
   var myChart2 = echarts.init(echarts2.value)
   var option2 = {
     tooltip: {
-      // 鼠标悬浮提示数据
       trigger: 'axis',
-      borderWidth: 15,
-      textStyle: {
-        // 文字提示样式
-        fontSize: '16'
-      },
       axisPointer: {
-        // 坐标轴虚线
-        type: 'cross',
-        label: {
-          backgroundColor: '#6a7985'
-        }
+        type: 'shadow'
+      },
+
+      formatter: function (param) {
+        return param[0].seriesName + ':' + param[0].data + '%<br />' + param[1].seriesName + ':' + param[1].data + '%'
       }
     },
-
-    // },
     grid: {
-      // 控制图表的位置
-      left: '5%',
-      right: '5%',
-      top: '18%',
-      bottom: '5%',
-      containLabel: true
+      top: 50,
+      left: 44,
+      right: 44,
+      bottom: 30
     },
-    xAxis: {
-      axisLabel: {
-        // X轴线 标签修改
-        textStyle: {
-          fontSize: '14'
-        }
+    legend: {
+      right: '0',
+      textStyle: {
+        color: '#FFFFFF'
       },
-      data: info.value.two.nameList
+      color: ['#ffcc00', '#28f2e6']
     },
+    xAxis: [
+      {
+        type: 'category',
+        data: info.value.two.nameList,
+        axisLabel: {
+          show: true,
+          textStyle: {
+            color: '#7FC5F5'
+          },
+          interval: 0
+        },
+        axisLine: {
+          lineStyle: {
+            color: 'rgba(127,197,245,0.1)',
+            width: 1 //这里是为了突出显示加上的
+          }
+        },
+        triggerEvent: true
+      }
+    ],
     yAxis: {
+      // y轴
+      type: 'value',
+      splitNumber: 5, // 横线数
+
       axisLabel: {
-        // y轴线 标签修改
-        textStyle: {
-          fontSize: '14'
+        show: true,
+        formatter: '{value}',
+        color: '#7FC5F5'
+      },
+      splitLine: {
+        // 网格线
+        show: true,
+        lineStyle: {
+          color: 'rgba(127,197,245,0.1)',
+          width: 1
         }
       }
     },
@@ -150,21 +169,27 @@ function echarts2View() {
       {
         data: info.value.two.list,
         type: 'bar',
-        barWidth: '48%', //调整柱状图宽度
+        barWidth: '40%',
+        label: {
+          normal: {
+            show: true,
+            position: 'top',
+            fontSize: 18
+          }
+        },
         itemStyle: {
           normal: {
-            /*--------设置柱形图圆角 [左上角，右上角，右下角，左下角]-------------*/
-            borderRadius: [12, 12, 0, 0],
-            /*--------设置柱形图渐变色 -------------*/
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: 'rgba(0,244,255,1)'
-              },
-              {
-                offset: 1,
-                color: 'rgba(0,77,167,1)'
+            label: {
+              show: true,
+              position: 'top',
+              textStyle: {
+                color: '#FFFFFF'
               }
+            },
+            color: echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              { offset: 0, color: '#28f2e6' },
+              { offset: 0.5, color: 'rgba(40,242,230,0.1)' },
+              { offset: 1, color: 'rgba(255,255,255,0)' }
             ])
           }
         }

src/views/one/parts/echarts3.vue

@@ -73,7 +73,7 @@ function echarts1View() {
         color: ['#62c98d', '#2f89cf', '#4cb9cf', '#53b666', '#62c98d', '#205acf', '#c9c862', '#c98b62', '#c962b9', '#7562c9', '#c96262', '#c25775', '#00b7be'],
         type: 'pie',
         radius: [30, 100],
-        center: ['25%', '70%'],
+        center: ['25%', '50%'],
         roseType: 'radius',
         label: {
           normal: {
@@ -104,45 +104,64 @@ function echarts2View() {
   var myChart2 = echarts.init(echarts2.value)
   var option2 = {
     tooltip: {
-      // 鼠标悬浮提示数据
       trigger: 'axis',
-      borderWidth: 15,
-      textStyle: {
-        // 文字提示样式
-        fontSize: '16'
-      },
       axisPointer: {
-        // 坐标轴虚线
-        type: 'cross',
-        label: {
-          backgroundColor: '#6a7985'
-        }
+        type: 'shadow'
+      },
+
+      formatter: function (param) {
+        return param[0].seriesName + ':' + param[0].data + '%<br />' + param[1].seriesName + ':' + param[1].data + '%'
       }
     },
-
-    // },
     grid: {
-      // 控制图表的位置
-      left: '5%',
-      right: '5%',
-      top: '18%',
-      bottom: '5%',
-      containLabel: true
+      top: 50,
+      left: 44,
+      right: 44,
+      bottom: 30
     },
-    xAxis: {
-      axisLabel: {
-        // X轴线 标签修改
-        textStyle: {
-          fontSize: '14'
-        }
+    legend: {
+      right: '0',
+      textStyle: {
+        color: '#FFFFFF'
       },
-      data: info.value.two.nameList
+      color: ['#ffcc00', '#28f2e6']
     },
+    xAxis: [
+      {
+        type: 'category',
+        data: info.value.two.nameList,
+        axisLabel: {
+          show: true,
+          textStyle: {
+            color: '#7FC5F5'
+          },
+          interval: 0
+        },
+        axisLine: {
+          lineStyle: {
+            color: 'rgba(127,197,245,0.1)',
+            width: 1 //这里是为了突出显示加上的
+          }
+        },
+        triggerEvent: true
+      }
+    ],
     yAxis: {
+      // y轴
+      type: 'value',
+      splitNumber: 5, // 横线数
+
       axisLabel: {
-        // y轴线 标签修改
-        textStyle: {
-          fontSize: '14'
+        show: true,
+        formatter: '{value}',
+        color: '#7FC5F5'
+      },
+      splitLine: {
+        // 网格线
+        show: true,
+        lineStyle: {
+          color: 'rgba(127,197,245,0.1)',
+          width: 1
         }
       }
     },
@@ -150,21 +169,27 @@ function echarts2View() {
       {
         data: info.value.two.list,
         type: 'bar',
-        barWidth: '48%', //调整柱状图宽度
+        barWidth: '40%',
+        label: {
+          normal: {
+            show: true,
+            position: 'top',
+            fontSize: 18
+          }
+        },
         itemStyle: {
           normal: {
-            /*--------设置柱形图圆角 [左上角，右上角，右下角，左下角]-------------*/
-            borderRadius: [12, 12, 0, 0],
-            /*--------设置柱形图渐变色 -------------*/
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: 'rgba(0,244,255,1)'
-              },
-              {
-                offset: 1,
-                color: 'rgba(0,77,167,1)'
+            label: {
+              show: true,
+              position: 'top',
+              textStyle: {
+                color: '#FFFFFF'
               }
+            },
+            color: echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              { offset: 0, color: '#28f2e6' },
+              { offset: 0.5, color: 'rgba(40,242,230,0.1)' },
+              { offset: 1, color: 'rgba(255,255,255,0)' }
             ])
           }
         }

src/views/one/parts/echarts4.vue

@@ -73,7 +73,7 @@ function echarts1View() {
         color: ['#62c98d', '#2f89cf', '#4cb9cf', '#53b666', '#62c98d', '#205acf', '#c9c862', '#c98b62', '#c962b9', '#7562c9', '#c96262', '#c25775', '#00b7be'],
         type: 'pie',
         radius: [30, 100],
-        center: ['25%', '70%'],
+        center: ['25%', '50%'],
         roseType: 'radius',
         label: {
           normal: {
@@ -104,45 +104,64 @@ function echarts2View() {
   var myChart2 = echarts.init(echarts2.value)
   var option2 = {
     tooltip: {
-      // 鼠标悬浮提示数据
       trigger: 'axis',
-      borderWidth: 15,
-      textStyle: {
-        // 文字提示样式
-        fontSize: '16'
-      },
       axisPointer: {
-        // 坐标轴虚线
-        type: 'cross',
-        label: {
-          backgroundColor: '#6a7985'
-        }
+        type: 'shadow'
+      },
+
+      formatter: function (param) {
+        return param[0].seriesName + ':' + param[0].data + '%<br />' + param[1].seriesName + ':' + param[1].data + '%'
       }
     },
-
-    // },
     grid: {
-      // 控制图表的位置
-      left: '5%',
-      right: '5%',
-      top: '18%',
-      bottom: '5%',
-      containLabel: true
+      top: 50,
+      left: 44,
+      right: 44,
+      bottom: 30
     },
-    xAxis: {
-      axisLabel: {
-        // X轴线 标签修改
-        textStyle: {
-          fontSize: '14'
-        }
+    legend: {
+      right: '0',
+      textStyle: {
+        color: '#FFFFFF'
       },
-      data: info.value.two.nameList
+      color: ['#ffcc00', '#28f2e6']
     },
+    xAxis: [
+      {
+        type: 'category',
+        data: info.value.two.nameList,
+        axisLabel: {
+          show: true,
+          textStyle: {
+            color: '#7FC5F5'
+          },
+          interval: 0
+        },
+        axisLine: {
+          lineStyle: {
+            color: 'rgba(127,197,245,0.1)',
+            width: 1 //这里是为了突出显示加上的
+          }
+        },
+        triggerEvent: true
+      }
+    ],
     yAxis: {
+      // y轴
+      type: 'value',
+      splitNumber: 5, // 横线数
+
       axisLabel: {
-        // y轴线 标签修改
-        textStyle: {
-          fontSize: '14'
+        show: true,
+        formatter: '{value}',
+        color: '#7FC5F5'
+      },
+      splitLine: {
+        // 网格线
+        show: true,
+        lineStyle: {
+          color: 'rgba(127,197,245,0.1)',
+          width: 1
         }
       }
     },
@@ -150,21 +169,27 @@ function echarts2View() {
       {
         data: info.value.two.list,
         type: 'bar',
-        barWidth: '48%', //调整柱状图宽度
+        barWidth: '40%',
+        label: {
+          normal: {
+            show: true,
+            position: 'top',
+            fontSize: 18
+          }
+        },
         itemStyle: {
           normal: {
-            /*--------设置柱形图圆角 [左上角，右上角，右下角，左下角]-------------*/
-            borderRadius: [12, 12, 0, 0],
-            /*--------设置柱形图渐变色 -------------*/
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: 'rgba(0,244,255,1)'
-              },
-              {
-                offset: 1,
-                color: 'rgba(0,77,167,1)'
+            label: {
+              show: true,
+              position: 'top',
+              textStyle: {
+                color: '#FFFFFF'
               }
+            },
+            color: echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              { offset: 0, color: '#28f2e6' },
+              { offset: 0.5, color: 'rgba(40,242,230,0.1)' },
+              { offset: 1, color: 'rgba(255,255,255,0)' }
             ])
           }
         }

src/views/one/parts/echarts5.vue

@@ -53,19 +53,19 @@ function echarts1View() {
       trigger: 'item',
       formatter: '{b} : {c} ({d}%)'
     },
-    legend: {
-      right: 0,
-      top: 20,
-      height: 600,
-      itemWidth: 10,
-      itemHeight: 10,
-      itemGap: 10,
-      textStyle: {
-        fontSize: 18
-      },
-      orient: 'vertical',
-      data: info.value.one.nameList
-    },
+    // legend: {
+    //   right: 0,
+    //   top: 20,
+    //   height: 600,
+    //   itemWidth: 10,
+    //   itemHeight: 10,
+    //   itemGap: 10,
+    //   textStyle: {
+    //     fontSize: 18
+    //   },
+    //   orient: 'vertical',
+    //   data: info.value.one.nameList
+    // },
     calculable: true,
     series: [
       {
@@ -73,7 +73,7 @@ function echarts1View() {
         color: ['#62c98d', '#2f89cf', '#4cb9cf', '#53b666', '#62c98d', '#205acf', '#c9c862', '#c98b62', '#c962b9', '#7562c9', '#c96262', '#c25775', '#00b7be'],
         type: 'pie',
         radius: [30, 100],
-        center: ['25%', '70%'],
+        center: ['50%', '50%'],
         roseType: 'radius',
         label: {
           normal: {
@@ -104,45 +104,64 @@ function echarts2View() {
   var myChart2 = echarts.init(echarts2.value)
   var option2 = {
     tooltip: {
-      // 鼠标悬浮提示数据
       trigger: 'axis',
-      borderWidth: 15,
-      textStyle: {
-        // 文字提示样式
-        fontSize: '16'
-      },
       axisPointer: {
-        // 坐标轴虚线
-        type: 'cross',
-        label: {
-          backgroundColor: '#6a7985'
-        }
+        type: 'shadow'
+      },
+
+      formatter: function (param) {
+        return param[0].seriesName + ':' + param[0].data + '%<br />' + param[1].seriesName + ':' + param[1].data + '%'
       }
     },
-
-    // },
     grid: {
-      // 控制图表的位置
-      left: '5%',
-      right: '5%',
-      top: '18%',
-      bottom: '5%',
-      containLabel: true
+      top: 50,
+      left: 44,
+      right: 44,
+      bottom: 30
     },
-    xAxis: {
-      axisLabel: {
-        // X轴线 标签修改
-        textStyle: {
-          fontSize: '14'
-        }
+    legend: {
+      right: '0',
+      textStyle: {
+        color: '#FFFFFF'
       },
-      data: info.value.two.nameList
+      color: ['#ffcc00', '#28f2e6']
     },
+    xAxis: [
+      {
+        type: 'category',
+        data: info.value.two.nameList,
+        axisLabel: {
+          show: true,
+          textStyle: {
+            color: '#7FC5F5'
+          },
+          interval: 0
+        },
+        axisLine: {
+          lineStyle: {
+            color: 'rgba(127,197,245,0.1)',
+            width: 1 //这里是为了突出显示加上的
+          }
+        },
+        triggerEvent: true
+      }
+    ],
     yAxis: {
+      // y轴
+      type: 'value',
+      splitNumber: 5, // 横线数
+
       axisLabel: {
-        // y轴线 标签修改
-        textStyle: {
-          fontSize: '14'
+        show: true,
+        formatter: '{value}',
+        color: '#7FC5F5'
+      },
+      splitLine: {
+        // 网格线
+        show: true,
+        lineStyle: {
+          color: 'rgba(127,197,245,0.1)',
+          width: 1
         }
       }
     },
@@ -150,21 +169,27 @@ function echarts2View() {
       {
         data: info.value.two.list,
         type: 'bar',
-        barWidth: '48%', //调整柱状图宽度
+        barWidth: '40%',
+        label: {
+          normal: {
+            show: true,
+            position: 'top',
+            fontSize: 18
+          }
+        },
         itemStyle: {
           normal: {
-            /*--------设置柱形图圆角 [左上角，右上角，右下角，左下角]-------------*/
-            borderRadius: [12, 12, 0, 0],
-            /*--------设置柱形图渐变色 -------------*/
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              {
-                offset: 0,
-                color: 'rgba(0,244,255,1)'
-              },
-              {
-                offset: 1,
-                color: 'rgba(0,77,167,1)'
+            label: {
+              show: true,
+              position: 'top',
+              textStyle: {
+                color: '#FFFFFF'
               }
+            },
+            color: echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              { offset: 0, color: '#28f2e6' },
+              { offset: 0.5, color: 'rgba(40,242,230,0.1)' },
+              { offset: 1, color: 'rgba(255,255,255,0)' }
             ])
           }
         }

src/views/search/index.vue

@@ -79,8 +79,9 @@ const search = async () => {
   const res = await store.query(info)
   if (res.errcode == '0') list.value = res.data
 }
-const toSelect = (item) => {
+const toSelect = async (item) => {
   searchValue.value = item.title
+  await onSearch()
 }
 const onSearch = () => {
   if (activeKey.value == '1') companyRef.value.search()

src/views/seven/index.vue

@@ -143,11 +143,6 @@ const getUrl = (item) => {
           color: #666;
         }
       }
-
-      .other_1:hover {
-        color: #2374ff;
-        cursor: pointer;
-      }
     }
   }
   .thr {

src/views/six/index.vue

@@ -173,11 +173,6 @@ const getUrl = (item) => {
           color: #666;
         }
       }
-
-      .other_1:hover {
-        color: #2374ff;
-        cursor: pointer;
-      }
     }
   }
   .four {