Browse Source

基础本底、空间规划指标、生态修复-山水工程行政区划不跳转

maxiaoxiao 1 year ago
parent
commit
249170ff2a

+ 1 - 1
src/views/cockpit/borderTemplate.vue

@@ -4,7 +4,7 @@
       <div>
         <div class="icon"></div>
         <span
-          >{{ isregion ? "三亚市" : store.state.cockpit_region.name
+          >{{ !isregion ? "三亚市" : store.state.cockpit_region.name
           }}{{ titleName }}</span
         >
       </div>

+ 1 - 1
src/views/cockpit/common/Title.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="title">
         <div class="icon"></div>
-        <span>{{ isregion ? "三亚市" : store.state.cockpit_region.name }}{{ title }}</span>
+        <span>{{ !isregion ? "三亚市" : store.state.cockpit_region.name }}{{ title }}</span>
     </div>
 </template>
 

+ 1 - 1
src/views/cockpit/jcbd.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="jcbd">
 
-        <Title :title="'基础本底'" ></Title>
+        <Title :title="'基础本底'" :isregion="false"></Title>
         <div class="content">
             <div class="item" v-for="(item, index) in obj">
                 <div class="icon">

+ 6 - 6
src/views/cockpit/kjgh.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="jsyd">
-    <Title :title="'空间规划指标'"></Title>
+    <Title :title="'空间规划指标'" :isregion="false"></Title>
 
     <div class="content">
       <!-- <div class="item">
@@ -15,14 +15,14 @@
 
         </div>
       </div> -->
-      <div class="item item100">
+      <div class="item">
         <div class="icon">
           <div class="icon_yrkkg">
 
           </div>
         </div>
         <div class="text">
-          <p>永久基本农田保护</p>
+          <p>永久基本农田</p>
           <span>{{ store.state.cockpit_gkzb.yjjbntmj }}</span>k㎡
 
         </div>
@@ -178,7 +178,7 @@ export default {
 }
 
 .item {
-  width: 49%;
+  width: 32%;
   height: 30%;
   display: inline-block;
   // border: #00FFFF 1px solid;
@@ -190,7 +190,7 @@ export default {
 
 .icon {
   width: 50px;
-  padding: 1.5%;
+  padding: 1.5% 15px;
   border-radius: 8px;
   display: inline-block;
   height: 50px
@@ -203,7 +203,6 @@ export default {
   background: no-repeat;
   background-image: url("/static/images/overview/gkzb_back.png");
 
-
 }
 
 .icon_zxkg {
@@ -223,6 +222,7 @@ export default {
 .box_text {
   width: 23.4375vw;
   margin-left: 4.5rem;
+  margin-top: 10px;
 
   p {
     font-size: 12px;

+ 1 - 1
src/views/cockpit/stxf.vue

@@ -1,5 +1,5 @@
 <template>
-  <borderTemplate titleName="生态修复" class="stxf">
+  <borderTemplate titleName="生态修复" class="stxf" :isregion="tab=='tdzz'">
     <template v-slot:title>
       <!-- #content="row" -->
       <div class="selectTab">