国有进度

src/store/store.js

@@ -58,7 +58,10 @@ var store2 = {
                 xdata: [],
                 result: [],
             },
-            gy_jd_info:{},
+            gy_jd_info:{
+                info:{},
+                pieData:{}
+            },
             jt_jg:{
                 "商服用地":{},
                 "工业用地":{},

src/views/cockpit/tdsy.vue

@@ -69,13 +69,13 @@
             <div class="lt_box box">
               <div class="text">
                 <p>计划供应</p>
-                <span>{{store.state.cockpit_tdgy.gy_jd_info.jh_crmj}}</span>公顷
+                <span>{{ store.state.cockpit_tdgy.gy_jd_info.info.jh_crmj }}</span>公顷
               </div>
             </div>
             <div class="lb_box box">
               <div class="text">
                 <p>完成供应</p>
-                <span>{{ store.state.cockpit_tdgy.gy_jd_info.sj_cr_crmj }}</span>公顷
+                <span>{{ store.state.cockpit_tdgy.gy_jd_info.info.sj_cr_crmj }}</span>公顷
               </div>
             </div>
             <div id="dial_watch_gy_jd">
@@ -85,13 +85,13 @@
             <div class="rt_box_gy_jd box">
               <div class="text">
                 <p>计划供应项目</p>
-                <span>{{ store.state.cockpit_tdgy.gy_jd_info.jh_xzqhdm_number }}</span>个
+                <span>{{ store.state.cockpit_tdgy.gy_jd_info.info.jh_xzqhdm_number }}</span>个
               </div>
             </div>
             <div class="rb_box_gy_jd box">
               <div class="text">
                 <p>完成供应项目</p>
-                <span>{{ store.state.cockpit_tdgy.gy_jd_info.sj_xzqhdm_number }}</span>个
+                <span>{{ store.state.cockpit_tdgy.gy_jd_info.info.sj_xzqhdm_number }}</span>个
               </div>
             </div>
           </div>
@@ -180,8 +180,13 @@ export default {
       };
       let data = await QueryList(obj);
       console.log('data: ', data);
-      store.state.cockpit_tdgy.gy_jd_info = data.data[0]
+      store.state.cockpit_tdgy.gy_jd_info.info = data.data[0]
+      store.state.cockpit_tdgy.gy_jd_info.pieData = {
+        wgy: data.data[0].ce_crmj,
+        yhb: data.data[0].sj_hb_crmj,
+        ycr: data.data[0].sj_cr_crmj,
 
+      }
     },
     async init_tdgy_jt_jg(params) {
       const that = this;
@@ -806,9 +811,9 @@ export default {
       that.init_dial_watch_scjg();
       that.getInfo();
       this.$refs.tdgy_echart_gyjd.setOptions([
-        { name: "未供应", value: 12 },
-        { name: "以划拨", value: 21 },
-        { name: "已出让", value: 24 },
+        { name: "未供应", value: store.state.cockpit_tdgy.gy_jd_info.pieData.wgy },
+        { name: "以划拨", value: store.state.cockpit_tdgy.gy_jd_info.pieData.yhb },
+        { name: "已出让", value: store.state.cockpit_tdgy.gy_jd_info.pieData.ycr },
       ]);
       //  store.start.cockpit_tdgy.jt_jg
       // this.$refs.tdgy_echart_sfyd.setOptions([