Merge branch 'zrj'

UI2/src/views/dashboard/IndexChart.vue

@@ -2,15 +2,15 @@
   <div class="page-header-index-wide">
     <div>
       <div v-has="'sydwsy'" style="display: flex">
-        <a-card   style="margin-bottom: 1rem;width:30%;">
+        <a-card  style="margin-bottom: 1rem;width:30%;">
           <div>
             <a-col :sm="24" :md="30" :xl="20">
-              <div  @click="handleAdd" style="height: 80%;width: 100%;background-color: #1890FF; margin-left: 2rem;margin-top:1rem;margin-bottom: 1rem;font-size:32px;text-align: center ;line-height: 9rem;box-shadow: 10px 10px 15px -10px;border-radius: 1rem;cursor:pointer ">
+              <div  @click="handleAdd" class='syxxtbbtn'>
                 <span  style="color: white;font-weight: bold">单位信息填报</span>
               </div>
             </a-col>
             <a-col :sm="24" :md="30" :xl="20">
-              <div  @click="handleAdd2" style="height: 80%;width: 100%;background-color: #1890FF; margin-left: 2rem;margin-top:1rem;margin-bottom: 1rem;box-shadow: 10px 10px 15px -10px;font-size:32px;text-align: center ;line-height: 9rem;border-radius: 1rem;cursor:pointer ">
+              <div  @click="handleAdd2" class='syxxtbbtn'>
                 <span style="color: white;font-weight: bold">地块信息填报</span>
               </div>
             </a-col>
@@ -113,12 +113,12 @@
         <a-card   style="margin-bottom: 1rem;width:30%;">
           <div>
             <a-col :sm="24" :md="30" :xl="20">
-              <div  @click="handleRouter" style="height: 80%;width: 100%;background-color: #1890FF; margin-left: 2rem;margin-top:1rem;margin-bottom: 1rem;font-size:32px;text-align: center ;line-height: 9rem;box-shadow: 10px 10px 15px -10px;border-radius: 1rem;cursor:pointer ">
+              <div  @click="handleRouter" class='syxxtbbtn'>
                 <span  style="color: white;font-weight: bold">用地单位信息填报</span>
               </div>
             </a-col>
             <a-col :sm="24" :md="30" :xl="20">
-              <div  @click="handleRouter2" style="height: 80%;width: 100%;background-color: #1890FF; margin-left: 2rem;margin-top:1rem;margin-bottom: 1rem;box-shadow: 10px 10px 15px -10px;font-size:32px;text-align: center ;line-height: 9rem;border-radius: 1rem;cursor:pointer ">
+              <div  @click="handleRouter2" class='syxxtbbtn'>
                 <span style="color: white;font-weight: bold">用地地块信息填报</span>
               </div>
             </a-col>
@@ -824,7 +824,21 @@
   }
 </style>
 <style>
-
+  .syxxtbbtn{
+    height: 80%;
+    width: 100%;
+    //background-color: #1890FF;
+    background-image: url('~@/assets/syxxtb_bg.png');
+    background-size: 100% 100%;
+    margin-left: 2rem;
+    margin-top:1rem;
+    margin-bottom: 1rem;
+    font-size:32px;
+    text-align: center ;
+    line-height: 9rem;
+    box-shadow: 10px 10px 15px -10px;
+    border-radius: 1rem;cursor:pointer
+  }
   .xfrw .ant-card{
     /*border: 2px solid rgb(204,204,255);*/
     text-align: center;
@@ -866,5 +880,8 @@
     background-size: 100% 100%;
     box-shadow: 10px 10px 15px -10px;
   }
+  .chart-card-footer{
+    border-top: 0px solid #e8e8e8 !important;
+  }
 
 </style>

UI2/src/views/tj/compoent/BarDobuleData.vue

@@ -89,12 +89,18 @@ export default {
         yAxis: [
           {
             type: 'log',
+            min: 1,
             name: "单位（亩）",
             splitLine: {
               lineStyle: {
                 type: 'dashed',
               },
             },
+            axisLabel: {
+              formatter: function (value) {
+                return value === 1 ? 0 : value;//第2步，将y轴最小值1变成从0开始；
+              }
+            },
           }
         ],
         series: [