土地结构梳理

src/views/cockpit/tdsc.vue

@@ -58,12 +58,12 @@ export default {
   components: {},
   data() {
     return {
-      tab: 'scjd2',
+      tab: 'scjd',
+      flag: true,
       options: [
-        { value: "scjg1", label: "收储结构" },
-        { value: "scjd2", label: "收储进度" },
+        { value: "scjd", label: "收储进度" },
+        { value: "scjgg", label: "收储结构" },
       ],
-      active_model: null,
     };
   },
   //监听属性 类似于data概念
@@ -413,6 +413,7 @@ export default {
 
     },
     change_model(e) {
+      this.$forceUpdate();
     }
   },
   mounted() {
@@ -565,6 +566,7 @@ export default {
     height: 8.5rem;
     position: relative;
     bottom: 1rem;
+    z-index: -1;
   }
 
 

src/views/cockpit/tdsy.vue

@@ -15,53 +15,63 @@
         </div>
         <div class="selectTab right_tab">
           <el-select v-model="right_value" placeholder="请选择" :popper-append-to-body="false" @change="changeChartsRight">
-            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+            <el-option v-for="item in right_options" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </div>
       </div>
-      <div class="dial_watch_legend">
-        <div class="item_tdgy">
-          <div class="icon_tdgy">
+      <div v-show="left_value == left_options[1].value && right_value == right_options[0].value">
+        <div class="dial_watch_legend">
+          <div class="item_tdgy">
+            <div class="icon_tdgy">
 
-          </div>
-          <div class="text">
-            计划已入市面积
-            <span>213.44</span>公顷
+            </div>
+            <div class="text">
+              计划已入市面积
+              <span>213.44</span>公顷
 
+            </div>
           </div>
-        </div>
-        <div class="item_tdgy">
-          <div class="icon_tdgy">
+          <div class="item_tdgy">
+            <div class="icon_tdgy">
 
-          </div>
-          <div class="text">
-            已入市面积
-            <span>213.44</span>公顷
+            </div>
+            <div class="text">
+              已入市面积
+              <span>213.44</span>公顷
 
+            </div>
           </div>
         </div>
-      </div>
-      <div id="dial_watch">
-      </div>
-      <div class="content">
-
-        <div class="infoLIst" v-if="jiDataInfo.length">
-          <div class="infoItem" v-for="(item, index) in jiDataInfo" :key="index">
-            <div class="itemIcon"></div>
-            <div class="itemCon">
-              <p>{{ item.xmmc }}</p>
-              <p>
-                <span>{{ item.yelx }}</span>
-                <span>{{ item.tdyt }}</span>
-                <span>{{ item.crnj }}公顷</span>
-              </p>
+        <div id="dial_watch">
+        </div>
+        <div class="content">
+
+          <div class="infoLIst" v-if="jiDataInfo.length">
+            <div class="infoItem" v-for="(item, index) in jiDataInfo" :key="index">
+              <div class="itemIcon"></div>
+              <div class="itemCon">
+                <p>{{ item.xmmc }}</p>
+                <p>
+                  <span>{{ item.yelx }}</span>
+                  <span>{{ item.tdyt }}</span>
+                  <span>{{ item.crnj }}公顷</span>
+                </p>
+              </div>
+              <div :class="item.yelx == '已出让' ? 'itemStatus1' : 'itemStatus2'"></div>
             </div>
-            <div :class="item.yelx == '已出让' ? 'itemStatus1' : 'itemStatus2'"></div>
           </div>
         </div>
       </div>
-
+      <div v-show="left_value == left_options[0].value && right_value == right_options[0].value">
+        国有/进度
+      </div>
+      <div v-show="left_value == left_options[0].value && right_value == right_options[1].value">
+        国有/结构
+      </div>
+      <div v-show="left_value == left_options[1].value && right_value == right_options[1].value">
+        集体/结构
+      </div>
     </div>
 
 
@@ -80,7 +90,7 @@ export default {
   data() {
     return {
       right_value: 'gyjd',
-      options: [
+      right_options: [
         { value: "gyjd", label: "供应进度" },
         { value: "gyjg", label: "供应结构" },
       ],