收储进度

src/store/store.js

@@ -51,10 +51,12 @@ var store2 = {
             }
         },
         cockpit_tdsc: {
-            flag: true,
-            text: {
-                xzqhdm_number: 0,
-                zhmj: 0,
+            scjd: {
+                percentage:0,
+                sj_mj: 0, //完成收储
+                jh_xzqdm_number: 0,//计划收储项目个数
+                jh_mj: 0,//计划收储面积
+                sj_xzqdm_number: 1//完成收储项目个数
             },
             echart: {
                 x: [],

src/views/cockpit/jcbd.vue

@@ -4,71 +4,6 @@
             <div class="icon"></div>
             <span>基础本底</span>
         </div>
-
-
-        <!-- <div class="content">
-            <div class="item">
-                <div class="icon">
-                    <div class="icon_zxkg">
-
-                    </div>
-                </div>
-                <div class="text">
-                    <span>{{ store.state.cockpit_gkzb.tbmj_ys }}</span>k㎡
-                </div>
-            </div>
-            <div class="item">
-                <div class="icon">
-                    <div class="icon_zxkg">
-
-                    </div>
-                </div>
-                <div class="text">
-                    <span>{{ store.state.cockpit_gkzb.tbmj_ys }}</span>k㎡
-                </div>
-            </div>
-            <div class="item">
-                <div class="icon">
-                    <div class="icon_zxkg">
-
-                    </div>
-                </div>
-                <div class="text">
-                    <span>{{ store.state.cockpit_gkzb.tbmj_ys }}</span>k㎡
-                </div>
-            </div>
-            <div class="item">
-                <div class="icon">
-                    <div class="icon_zxkg">
-
-                    </div>
-                </div>
-                <div class="text">
-                    <span>{{ store.state.cockpit_gkzb.tbmj_ys }}</span>k㎡
-                </div>
-            </div>
-            <div class="item">
-                <div class="icon">
-                    <div class="icon_zxkg">
-
-                    </div>
-                </div>
-                <div class="text">
-                    <span>{{ store.state.cockpit_gkzb.tbmj_ys }}</span>k㎡
-                </div>
-            </div>
-            <div class="item">
-                <div class="icon">
-                    <div class="icon_zxkg">
-
-                    </div>
-                </div>
-                <div class="text">
-                    <span>{{ store.state.cockpit_gkzb.tbmj_ys }}</span>k㎡
-                </div>
-            </div>
-        </div> -->
-
         <div class="content">
             <div class="item" v-for="(item, index) in obj">
                 <div class="icon">

src/views/cockpit/tdsc.vue

@@ -11,22 +11,22 @@
       </el-select>
     </div>
 
-    <div v-show="tab == options[0].value">
+    <div v-show="tab == options[1].value">
       <div id="scje_echart"></div>
     </div>
-    <div v-show="tab == options[1].value">
+    <div v-show="tab == options[0].value">
       <div class="content_scjd">
         <div class="space">
           <div class="lt_box box">
             <div class="text">
-              <p>计划出让海域</p>
-              <span>66.23</span>公顷
+              <p>计划收储</p>
+              <span>{{ store.state.cockpit_tdsc.scjd.jh_mj }}</span>公顷
             </div>
           </div>
           <div class="lb_box box">
             <div class="text">
-              <p>计划出让海域</p>
-              <span>66.23</span>公顷
+              <p>计划收储项目</p>
+              <span>{{ store.state.cockpit_tdsc.scjd.jh_xzqdm_number }}</span>个
             </div>
           </div>
           <div id="dial_watch_scjg">
@@ -35,14 +35,14 @@
           </div>
           <div class="rt_box box">
             <div class="text">
-              <p>计划出让海域</p>
-              <span>66.23</span>公顷
+              <p>完成收储</p>
+              <span>{{ store.state.cockpit_tdsc.scjd.sj_mj }}</span>公顷
             </div>
           </div>
           <div class="rb_box box">
             <div class="text">
-              <p>计划出让海域</p>
-              <span>66.23</span>公顷
+              <p>完成收储</p>
+              <span>{{ store.state.cockpit_tdsc.scjd.jh_xzqdm_number }}</span>个
             </div>
           </div>
         </div>
@@ -53,6 +53,7 @@
 
 <script>
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
+import { QueryOne, QueryList } from '@/api/cockpitNew'
 
 export default {
   components: {},
@@ -414,6 +415,18 @@ export default {
     },
     change_model(e) {
       this.$forceUpdate();
+    },
+    async init_scjd(params) {
+      const that = this;
+      let obj = {
+        beginTime: params ? params.beginTime : store.state.cockpit_date[0],
+        endTime: params ? params.endTime : store.state.cockpit_date[1],
+        jscType: 'jsc_tdsc_ztgh_scjd',
+        id: params ? params.id : '4602'
+      };
+      let data = await QueryOne(obj);
+      console.log('data: ', data);
+      store.state.cockpit_tdsc.scjd = data.data
     }
   },
   mounted() {
@@ -421,7 +434,7 @@ export default {
     this.$nextTick((res) => {
       that.init_scje_echart();
       that.init_dial_watch_scjg();
-
+      this.init_scjd();
     })
   },
   beforeUpdate() { }, //生命周期 - 更新之前

src/views/viewer1.vue

@@ -14,7 +14,7 @@
             <JSYD ref="gkzb_ref" />
             <JCBD />
             <BJXM />
-            <TDSC />
+            <TDSC ref="tdsc_ref" />
             <HYSY ref="hysy_ref" />
             <TDSY />
             <GDBH ref="gdbh_ref" />
@@ -95,6 +95,8 @@ export default {
             this.$refs.gdbh_ref.setData({ id: this.params.id });
             // this.$refs.stxf_ref.setData({ id: this.params.id });
             this.$refs.wpjg_ref.setData(this.params);
+            this.$refs.tdsc_ref.init_scjd (this.params);
+
         },
         dateChange(date) {
             this.params.beginTime = date[0]
@@ -110,7 +112,6 @@ export default {
                 id: address
             };
             let data = await cockpitInfo(obj);
-            console.log('data: ', data);
 
             let obg_text = {
                 xzqhdm_number: data.data[0].xzqhdm_number,