Răsfoiți Sursa

调整统计页面样式,完善省直和省属按钮切换样式

zhourj 6 zile în urmă
părinte
comite
1c497071d2

+ 12 - 12
src/views/tj/compoent/BarData.vue

@@ -1,5 +1,5 @@
 <template>
-  <div ref="dom" style="width:calc(100% - 0px);height:300px;">
+  <div ref="dom" style="width:calc(100% - 0px);height:20rem;">
   </div>
 
 </template>
@@ -64,16 +64,16 @@ export default {
       /* this.$nextTick(() => {*/
       //定义数据间隔
       const option = {
-        title: {
-          text: this.titleText,
-          x: 'left'              //标题位置
-          // textStyle: { //标题内容的样式
-          //   color: '#000',
-          //   fontStyle: 'normal',
-          //   fontWeight: 100,
-          //   fontSize: 16 //主题文字字体大小,默认为18px
-          // },
-        },
+        // title: {
+        //   text: this.titleText,
+        //   x: 'left'              //标题位置
+        //   // textStyle: { //标题内容的样式
+        //   //   color: '#000',
+        //   //   fontStyle: 'normal',
+        //   //   fontWeight: 100,
+        //   //   fontSize: 16 //主题文字字体大小,默认为18px
+        //   // },
+        // },
         tooltip: {
           trigger: 'axis',
           axisPointer: {
@@ -83,7 +83,7 @@ export default {
         grid: {
           left: '2%',
           right: '1%',
-          bottom: '2%',
+          bottom: '1%',
           containLabel: true
         },
         xAxis: [

+ 10 - 10
src/views/tj/compoent/BarDobuleData.vue

@@ -43,16 +43,16 @@ export default {
       // 绘制图表
       /* this.$nextTick(() => {*/
       var option = {
-        title: {
-          text: this.titleText,
-          x: 'left',              //标题位置
-          // textStyle: { //标题内容的样式
-          //   color: '#000',
-          //   fontStyle: 'normal',
-          //   fontWeight: 100,
-          //   fontSize: 16 //主题文字字体大小,默认为18px
-          // },
-        },
+        // title: {
+        //   text: this.titleText,
+        //   x: 'left',              //标题位置
+        //   // textStyle: { //标题内容的样式
+        //   //   color: '#000',
+        //   //   fontStyle: 'normal',
+        //   //   fontWeight: 100,
+        //   //   fontSize: 16 //主题文字字体大小,默认为18px
+        //   // },
+        // },
         tooltip: {
           trigger: 'axis',
           axisPointer: {

+ 10 - 11
src/views/tj/compoent/BarTdsjyt.vue

@@ -65,16 +65,16 @@ export default {
       // 绘制图表
       /* this.$nextTick(() => {*/
       var option = {
-        title: {
-          text: this.titleText,
-          x: 'left',              //标题位置
-          // textStyle: { //标题内容的样式
-          //   color: '#000',
-          //   fontStyle: 'normal',
-          //   fontWeight: 100,
-          //   fontSize: 16 //主题文字字体大小,默认为18px
-          // },
-        },
+        // title: {
+        //   text: this.titleText,
+        //   x: 'left',              //标题位置
+        //   // textStyle: { //标题内容的样式
+        //   //   color: '#000',
+        //   //   fontStyle: 'normal',
+        //   //   fontWeight: 100,
+        //   //   fontSize: 16 //主题文字字体大小,默认为18px
+        //   // },
+        // },
         tooltip: {
           trigger: 'axis',
           axisPointer: {
@@ -170,7 +170,6 @@ export default {
             }
           },
         ]
-
       }
 
       // 使用刚指定的配置项和数据显示图表。

+ 171 - 114
src/views/tj/sjtjModules.vue

@@ -1,12 +1,15 @@
 <template>
   <div>
     <!--    省属企业与省直单位切换-->
-    <div class="headTJ">
-      <a-button size="large" style="background-color: rgb(24,144,255)"  type="primary"  htmlType="submit"  class="login-button"  :loading="loginBtn"  @click.stop.prevent="handleSubmitSsqy" :disabled="loginBtn">省属企业
-      </a-button>
-      <a-button size="large" style="background-color: rgb(24,144,255)"  type="primary"  htmlType="submit"  class="login-button"  :loading="loginBtn"  @click.stop.prevent="handleSubmitSzdw" :disabled="loginBtn">省直单位
-      </a-button>
+    <div class="cr-btnlist">
+        <button :class="type === 'ssqy' ? ['cr-btn', 'cr-btn-select'] : 'cr-btn'" @click.stop.prevent="handleSubmitSsqy">
+          省属企业
+        </button>
+        <button :class="type === 'szdw' ? ['cr-btn', 'cr-btn-select'] : 'cr-btn'" @click.stop.prevent="handleSubmitSzdw">
+          省直单位
+        </button>
     </div>
+<!--    头部面板信息展示-->
     <div>
       <a-row>
         <a-col v-show="this.type == 'ssqy'" :sm="24" :md="12" :xl="24">
@@ -14,7 +17,7 @@
             <a-col class="flex-center" :sm="24" :md="12" :xl="6" @click="handleQy">
               <div class="tjcxcound1">
                 <div style="color: white;padding-top: 0.1rem">
-                  <div style="width: 100%;margin-left: 0rem;margin-top:5px; text-indent: 1rem;letter-spacing: 2px;font-weight: bold">省属企业数量</div>
+                  <div style="width: 100%;margin-left: 0rem;margin-top:5px; text-indent: 1rem;letter-spacing: 2px; font-family:'DingTalk_JinBuTi_Regular'">省属企业数量</div>
                   <div style="width: 100%">
                   <div style="width: calc(50% - 0px);margin-left: 0rem;margin-top:5px; text-indent: 1rem; display: inline-block">一级企业</div>
                   <div style="width: calc(50% - 0px);margin-left: 0rem;margin-top:5px; text-indent: 1rem;display: inline-block">企业总数</div>
@@ -36,7 +39,7 @@
             <a-col class="flex-center" :sm="24" :md="12" :xl="6">
               <div class="tjcxcound2">
                 <div style="color: white;padding-top: 0.1rem">
-                  <div style="width: 100%;margin-left: 0rem;margin-top:5px; text-indent: 1rem;letter-spacing: 2px;font-weight: bold">上报地块企业</div>
+                  <div style="width: 100%;margin-left: 0rem;margin-top:5px; text-indent: 1rem;letter-spacing: 2px; font-family:'DingTalk_JinBuTi_Regular'">上报地块企业</div>
                   <div style="width: calc(100% - 0px);margin-left: 0rem;margin-top:5px; text-indent: 1rem; display: inline-block">企业数量</div>
                   <div style="width: calc(100% - 0px);font-size: 22px; margin-top:0;font-weight:600;text-indent: 1rem;">
                     {{ SBDKQYSL
@@ -55,7 +58,7 @@
             <a-col class="flex-center" :sm="24" :md="12" :xl="6">
               <div class="tjcxcound3" @click="visibleInfo({ sfsb: 3 })">
                 <div style="color: white;padding-top: 0.1rem">
-                  <div style="width: 100%;margin-left: 0rem;margin-top:5px; text-indent: 1rem;letter-spacing: 2px;font-weight: bold">省属企业上报地块</div>
+                  <div style="width: 100%;margin-left: 0rem;margin-top:5px; text-indent: 1rem;letter-spacing: 2px; font-family:'DingTalk_JinBuTi_Regular'">省属企业上报地块</div>
                   <div style="width: 100%">
                     <div style="width: calc(50% - 0px);margin-left: 0rem;margin-top:5px; text-indent: 1rem; display: inline-block">地块数量</div>
                     <div style="width: calc(50% - 0px);margin-left: 0rem;margin-top:5px; text-indent: 1rem;display: inline-block">地块面积</div>
@@ -80,7 +83,7 @@
             <a-col class="flex-center" :sm="24" :md="12" :xl="6">
               <div class="tjcxcound4" @click="visibleInfo({ sfsb: 3, tdsyxz: '闲置低效土地' })">
                 <div style="color: white;padding-top: 0.1rem">
-                  <div style="width: 100%;margin-left: 0rem;margin-top:5px; text-indent: 1rem;letter-spacing: 2px;font-weight: bold">省属企业闲置低效地块</div>
+                  <div style="width: 100%;margin-left: 0rem;margin-top:5px; text-indent: 1rem;letter-spacing: 2px; font-family:'DingTalk_JinBuTi_Regular'">省属企业闲置低效地块</div>
                   <div style="width: 100%">
                     <div style="width: calc(50% - 0px);margin-left: 0rem;margin-top:5px; text-indent: 1rem; display: inline-block">地块数量</div>
                     <div style="width: calc(50% - 0px);margin-left: 0rem;margin-top:5px; text-indent: 1rem;display: inline-block">地块面积</div>
@@ -112,7 +115,7 @@
             <a-col class="flex-center" :sm="18" :md="12" :xl="6">
               <div class="tjcxcound1" @click="handleDw()">
                 <div style="color: white;padding-top: 0.1rem">
-                  <div style="width: 100%;margin-left: 0rem;margin-top:5px; text-indent: 1rem;letter-spacing: 2px;font-weight: bold">省直单位数量</div>
+                  <div style="width: 100%;margin-left: 0rem;margin-top:5px; text-indent: 1rem;letter-spacing: 2px; font-family:'DingTalk_JinBuTi_Regular'">省直单位数量</div>
                   <div style="width: calc(100% - 0px);margin-left: 0rem;margin-top:5px; text-indent: 1rem; ">单位数量</div>
                   <div style="width: calc(100% - 0px);font-size: 22px; margin-top:0;font-weight:600;text-indent: 1rem;">
                     {{ SZQYSL
@@ -124,7 +127,7 @@
             <a-col class="flex-center" :sm="24" :md="12" :xl="6">
               <div class="tjcxcound2">
                 <div style="color: white;padding-top: 0.1rem">
-                  <div style="width: 100%;margin-left: 0rem;margin-top:5px; text-indent: 1rem;letter-spacing: 2px;font-weight: bold">上报地块省直单位</div>
+                  <div style="width: 100%;margin-left: 0rem;margin-top:5px; text-indent: 1rem;letter-spacing: 2px; font-family:'DingTalk_JinBuTi_Regular'">上报地块省直单位</div>
                   <div style="width: calc(100% - 0px);margin-left: 0rem;margin-top:5px; text-indent: 1rem; ">单位数量</div>
                   <div style="width: calc(100% - 0px);font-size: 22px; margin-top:0;font-weight:600;text-indent: 1rem;">
                     {{ SSDWSL
@@ -136,7 +139,7 @@
             <a-col class="flex-center" :sm="24" :md="12" :xl="6">
               <div class="tjcxcound3" @click="visibleInfoBySz({ sfsb: 3 })">
                 <div style="color: white;padding-top: 0.1rem">
-                  <div style="width: 100%;margin-left: 0rem;margin-top:5px; text-indent: 1rem;letter-spacing: 2px;font-weight: bold">省直单位地块</div>
+                  <div style="width: 100%;margin-left: 0rem;margin-top:5px; text-indent: 1rem;letter-spacing: 2px; font-family:'DingTalk_JinBuTi_Regular'">省直单位地块</div>
                   <div style="width: 100%">
                     <div style="width: calc(50% - 0px);margin-left: 0rem;margin-top:5px; text-indent: 1rem; display: inline-block">地块数量</div>
                     <div style="width: calc(50% - 0px);margin-left: 0rem;margin-top:5px; text-indent: 1rem;display: inline-block">地块面积</div>
@@ -152,16 +155,12 @@
                     </div>
                   </div>
                 </div>
-                <!--                <div>其中省直单位闲置低效面积</div>-->
-                <!--                <div>-->
-                <!--                  <span style="font-size: 24px">{{ SUMSZXZDX }}</span><span style="margin-left: 5px">亩</span>-->
-                <!--                </div>-->
               </div>
             </a-col>
             <a-col class="flex-center" :sm="24" :md="12" :xl="6">
               <div class="tjcxcound4" @click="visibleInfoBySz({ sfsb: 3, tdsyxz: '闲置低效土地' })">
                 <div style="color: white;padding-top: 0.1rem">
-                  <div style="width: 100%;margin-left: 0rem;margin-top:5px; text-indent: 1rem;letter-spacing: 2px;font-weight: bold">省直单位闲置低效地块</div>
+                  <div style="width: 100%;margin-left: 0rem;margin-top:5px; text-indent: 1rem;letter-spacing: 2px; font-family:'DingTalk_JinBuTi_Regular'">省直单位闲置低效地块</div>
                   <div style="width: 100%">
                     <div style="width: calc(50% - 0px);margin-left: 0rem;margin-top:5px; text-indent: 1rem; display: inline-block">地块数量</div>
                     <div style="width: calc(50% - 0px);margin-left: 0rem;margin-top:5px; text-indent: 1rem;display: inline-block">地块面积</div>
@@ -177,12 +176,6 @@
                     </div>
                   </div>
                 </div>
-                <!--              <div style="color: white;padding-top: 1rem">-->
-                <!--                <div>其中省属企业闲置低效面积</div>-->
-                <!--                <div>-->
-                <!--                  <span style="font-size: 24px;">{{ SUMSSXZDX }}</span><span style="margin-left: 5px">亩</span>-->
-                <!--                </div>-->
-                <!--              </div>-->
               </div>
             </a-col>
           </a-card>
@@ -190,83 +183,136 @@
       </a-row>
     </div>
     <div>
-      <a-row v-show="this.type == 'szdw'">
-        <a-col :sm="24" :md="12" :xl="12">
-          <a-card style="margin-bottom: 1rem;width:100%;height: 42rem">
-            <mapData
-              ref="map2ref"
-              :resultMapData="this.resMapSzData"
-              :titles="this.title2"
-              @visible="visibleInfoBySz"
-            ></mapData>
-          </a-card>
-        </a-col>
-        <a-col :sm="24" :md="12" :xl="6">
-          <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-            <PieData
-              :resultData="this.resData1"
-              :titleText="this.tem_xzqhmc ? this.tem_xzqhmc + '省直单位土地获取方式占比' : '省直单位土地获取方式占比'"
-              @visible="visibleInfoBySz"
-            ></PieData>
-          </a-card>
-        </a-col>
-        <a-col :sm="24" :md="12" :xl="6">
-          <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-            <DoughnutData
-              :titleText="
+<!--      省直单位统计图表-->
+      <div v-show="this.type == 'szdw'">
+<!--      第一行-->
+        <div style="display: flex;">
+<!--          左侧第一行第一列-->
+          <div style="width: calc(25% - 0px);">
+            <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px;  font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省直单位土地获取方式【地块数量】</div>
+            <div>
+              <a-card style="margin-bottom: 0.5rem;width:100%;height: 18rem">
+                <PieData
+                  :resultData="this.resData1"
+                  :titleText="this.tem_xzqhmc ? this.tem_xzqhmc + '省直单位土地获取方式占比' : '省直单位土地获取方式占比'"
+                  @visible="visibleInfoBySz"
+                ></PieData>
+              </a-card>
+            </div>
+            <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px; font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省直单位土地获取方式【地块面积】</div>
+            <div>
+              <a-card style="margin-bottom: 0.5rem;width:100%;height: 18rem">
+                <PieData
+                  :resultData="this.resData1"
+                  :titleText="this.tem_xzqhmc ? this.tem_xzqhmc + '省直单位土地获取方式占比' : '省直单位土地获取方式占比'"
+                  @visible="visibleInfoBySz"
+                ></PieData>
+              </a-card>
+            </div>
+          </div>
+          <!--        第一行地图列-->
+          <div style="width: calc(50% - 20px);margin-left: 10px;margin-right: 10px">
+            <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px;  font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省直单位地块统计</div>
+            <div>
+              <a-card style="margin-bottom: 1rem;width:100%;height: 39rem">
+                <mapData
+                  ref="map2ref"
+                  :resultMapData="this.resMapSzData"
+                  :titles="this.title2"
+                  @visible="visibleInfoBySz"
+                ></mapData>
+              </a-card>
+            </div>
+          </div>
+          <!--          右侧列-->
+          <div style="width: calc(25% - 0px);">
+            <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px;  font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省直单位权证登记【地块数量】</div>
+            <div>
+              <a-card style="margin-bottom: 0.5rem;width:100%;height: 18rem">
+                <DoughnutData
+                  :titleText="
                 this.tem_xzqhmc ? this.tem_xzqhmc + '省直单位权证登记比例情况' : '省直单位权证登记比例情况’' + '' + ''
               "
-              :result-data="this.DoughnutData"
-              :pie-color="this.color1"
-              @visibleZs="visibleInfoBySz"
-            ></DoughnutData>
-          </a-card>
-        </a-col>
-        <a-col :sm="24" :md="12" :xl="12">
-          <a-card style="margin-bottom: 1rem;width:100%;height: 20rem">
-            <a-col :sm="24" :md="12" :xl="24">
-              <BarTdsjyt
-                :titleText="this.tem_xzqhmc ? this.tem_xzqhmc + '省直单位土地批准用途情况' : '省直单位土地批准用途情况'"
-                :result-x-data="this.resXData"
-                :dw="this.dw2"
-                style="width:100% ;height:300px;"
-                @visibleSz="visibleInfoBySz"
-              ></BarTdsjyt>
-            </a-col>
-          </a-card>
-        </a-col>
-        <!--        <a-col :sm="24" :md="12" :xl="12">-->
-        <!--          <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">-->
-        <!--            &lt;!&ndash;            <NightingaleCharData style="margin-left: 10rem"></NightingaleCharData>&ndash;&gt;-->
-        <!--            <a-col :xl="5">-->
-        <!--              <WaterWorld :titleText=this.WaterWorldTitle :bottomTitle=this.WaterWorldTitleByqyzy-->
-        <!--                          :resultData="this.resWordDataZy"></WaterWorld>-->
-        <!--            </a-col>-->
-        <!--            <a-col :xl="5" style="margin-left: 5rem">-->
-        <!--              <WaterWorld :bottomTitle=this.WaterWorldTitleBydycz :resultData="this.resWordDataCz"></WaterWorld>-->
-        <!--            </a-col>-->
-        <!--            <a-col :xl="5" style="margin-left: 5rem">-->
-        <!--              <WaterWorld :bottomTitle=this.WaterWorldTitleByxzdx :resultData="this.resWordDataXz"></WaterWorld>-->
-        <!--            </a-col>-->
-        <!--          </a-card>-->
-        <!--        </a-col>-->
-        <a-col :sm="24" :md="12" :xl="24">
-          <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-            <BarDobuleData
-              style="width: 100%"
-              :titleText="this.tem_xzqhmc ? this.tem_xzqhmc + '省直单位实际占用面积' : '省直单位实际占用面积'"
-              :result-x-data="resBarSzData"
-              @visible="visibleInfoSzXzqh"
-            >
-            </BarDobuleData>
-          </a-card>
-        </a-col>
-      </a-row>
+                  :result-data="this.DoughnutData"
+                  :pie-color="this.color1"
+                  @visibleZs="visibleInfoBySz"
+                ></DoughnutData>
+              </a-card>
+            </div>
+            <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px;  font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省直单位权证登记【地块面积】</div>
+            <div>
+              <a-card style="margin-bottom: 0.5rem;width:100%;height: 18rem">
+                <DoughnutData
+                  :titleText="
+                this.tem_xzqhmc ? this.tem_xzqhmc + '省直单位权证登记比例情况' : '省直单位权证登记比例情况’' + '' + ''
+              "
+                  :result-data="this.DoughnutData"
+                  :pie-color="this.color1"
+                  @visibleZs="visibleInfoBySz"
+                ></DoughnutData>
+              </a-card>
+            </div>
+          </div>
+        </div>
+<!--        第二行-->
+        <div style="display: flex;">
+          <div style="width: calc(50% - 10px); margin-right: 10px;">
+            <div style="width: calc(100% - 0px); text-indent: 10px; font-size: 16px;  font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省直单位土地批准用途【地块数量】</div>
+            <div>
+              <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
+                <a-col :sm="24" :md="12" :xl="24">
+                  <BarTdsjyt
+                    :titleText="this.tem_xzqhmc ? this.tem_xzqhmc + '省直单位土地批准用途情况' : '省直单位土地批准用途情况'"
+                    :result-x-data="this.resXData"
+                    :dw="this.dw2"
+                    style="width:100% ;height:300px;"
+                    @visibleSz="visibleInfoBySz"
+                  ></BarTdsjyt>
+                </a-col>
+              </a-card>
+
+            </div>
+          </div>
+          <div style="width: calc(50% - 0px);">
+            <div style="width: calc(100% - 5px);text-indent: 10px; font-size: 16px;  font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省直单位土地批准用途【地块面积】</div>
+            <div>
+              <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
+                <BarTdsjyt
+                  :titleText="this.tem_xzqhmc ? this.tem_xzqhmc + '省直单位土地批准用途情况' : '省直单位土地批准用途情况'"
+                  :result-x-data="this.resXData"
+                  :dw="this.dw2"
+                  style="width:100% ;height:300px;"
+                  @visibleSz="visibleInfoBySz"
+                ></BarTdsjyt>
+              </a-card>
+            </div>
+          </div>
+        </div>
+<!--        第三行-->
+        <div style="display: flex;">
+          <div style="width: calc(100% - 0px);">
+            <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px;  font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省直单位土地面积</div>
+            <div>
+              <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
+                <BarDobuleData
+                  style="width: 100%"
+                  :titleText="this.tem_xzqhmc ? this.tem_xzqhmc + '省直单位实际占用面积' : '省直单位实际占用面积'"
+                  :result-x-data="resBarSzData"
+                  @visible="visibleInfoSzXzqh"
+                >
+                </BarDobuleData>
+              </a-card>
+            </div>
+          </div>
+
+        </div>
+      </div>
+<!--      省属企业统计图表-->
       <div v-show="this.type == 'ssqy'">
         <div style="display: flex;">
 <!--        左侧第一行第一列-->
           <div style="width: calc(25% - 0px);">
-          <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px; height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省属企业土地获取方式地块数量占比</div>
+          <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px;  font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省属企业土地获取方式【地块数量】</div>
           <div>
             <a-card style="margin-bottom: 0.5rem;width:100%;height: 18rem">
               <PieData
@@ -277,7 +323,7 @@
               </PieData>
             </a-card>
           </div>
-          <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px; height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省属企业土地获取方式地块面积占比</div>
+          <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px; font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省属企业土地获取方式【地块面积】</div>
           <div>
             <a-card style="margin-bottom: 0.5rem;width:100%;height: 18rem">
               <PieQdfsMj
@@ -295,7 +341,7 @@
         </div>
 <!--        第一行地图列-->
           <div style="width: calc(50% - 20px);margin-left: 10px;margin-right: 10px">
-            <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px; height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省属企业地块统计</div>
+            <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px;  font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省属企业地块统计</div>
             <div>
               <a-card style="margin-bottom: 1rem;width:100%;height: 39rem">
                 <mapData ref="mapref" :resultMapData="this.resMapSsData" :titles="this.title1" @visible="visibleInfo">
@@ -305,7 +351,7 @@
           </div>
 <!--          右侧列-->
           <div style="width: calc(25% - 0px);">
-            <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px; height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省属企业权证登记比例情况</div>
+            <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px;  font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省属企业权证登记比</div>
             <div>
               <a-card style="margin-bottom: 0.5rem;width:100%;height: 18rem">
                 <DoughnutData
@@ -317,7 +363,7 @@
                 </DoughnutData>
               </a-card>
             </div>
-            <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px; height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省属企业土地使用现状占比</div>
+            <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px;  font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省属企业土地使用现状占比</div>
             <div>
               <a-card style="margin-bottom: 0.5rem;width:100%;height: 18rem">
                 <DoughnutData
@@ -334,7 +380,7 @@
 <!--        第二行布局-->
         <div style="display: flex;">
           <div style="width: calc(50% - 10px); margin-right: 10px;">
-            <div style="width: calc(100% - 0px); text-indent: 10px; font-size: 16px; height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省属企业土地实际用途情况</div>
+            <div style="width: calc(100% - 0px); text-indent: 10px; font-size: 16px;  font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省属企业土地实际用途</div>
             <div>
               <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
                 <a-col :sm="24" :md="12" :xl="24">
@@ -352,7 +398,7 @@
             </div>
           </div>
           <div style="width: calc(50% - 0px);">
-            <div style="width: calc(100% - 5px);text-indent: 10px; font-size: 16px; height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省属企业实际占用面积</div>
+            <div style="width: calc(100% - 5px);text-indent: 10px; font-size: 16px;  font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省属企业占用面积</div>
             <div>
               <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
                 <BarDobuleData
@@ -368,7 +414,7 @@
 <!--        第三行布局-->
         <div style="display: flex;">
           <div style="width: calc(100% - 0px);">
-          <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px; height:40px;line-height: 40px; background-color: #02A7F0; color: white ">一级单位用地面积汇总</div>
+          <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px;  font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">一级单位用地面积汇总</div>
           <div>
             <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
               <BarData
@@ -851,23 +897,34 @@ export default {
 </script>
 
 <style>
-.headTJ
-{
-  width: calc(100% - 0px);
+.cr-btnlist {
+  width: 100%;
   height: 40px;
   line-height: 40px;
+  padding-left: 10px;
   background-color: #02A7F0;
-  margin-bottom: 0px;
-}
-button.login-button {
-  padding: 0 15px;
-  font-size: 14px;
-  height: 30px;
-  width: 200px;
-  margin-left: 20px;
-  margin-bottom: 5px;
-  border-color: #ffffff;
+  .cr-btn {
+    width: 200px;
+    color: rgb(244, 249, 244);
+    //background-color: #12d9fa;
+    background: rgba(52, 140, 208, 1);
+    border: 1px;
+    border-color: rgba(52, 140, 208, 30%);
+    border-radius: 4px;
+    padding: 0px 10px;
+    margin-right: 10px;
+    cursor: pointer;
+    margin-left: auto;
+    height: 30px;
+    line-height: 30px;
+  }
+  .cr-btn-select {
+    border-color: rgba(52, 140, 238, 1);
+    background: rgb(221, 147, 37);
+    color: rgb(255, 255, 255);
+  }
 }
+
 .ant-card-body{
  padding: 10px !important;
 }