Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/store/store.js

@@ -40,16 +40,6 @@ var store2 = {
         flattenNames: [],//存储压平的名称数组
         cockpit_date: null,
         viewer_flag: true,
-        cockpit_hysy: {
-            text: {
-                xzqhdm_number: 0,
-                zhmj: 0,
-            },
-            echart: {
-                x: [],
-                bar: [],
-            }
-        },
         cockpit_tdsc: {
             scjd: {
                 percentage: 0,
@@ -65,8 +55,17 @@ var store2 = {
         },
         cockpit_tdgy: {//土地供应
             gy_jg: {
-                xdata:[],
-                result:[],
+                xdata: [],
+                result: [],
+            },
+        },
+        cockpit_hysy: {//海域使用
+            info: {
+                jh_mj:0,//计划出让海域
+                sj_number:0,//实际出让海域面积
+                jh_number:0,//计划出让项目
+                sj_mj:0,//完成出让海域面积
+
             },
         },
         regional_information: {
@@ -208,12 +207,6 @@ var store2 = {
     setIsEditZ(newValue) {
         this.state.isEditZ = newValue;
     },
-    setCockpitHysyEchart(newValue) {
-        this.state.cockpit_hysy.echart = newValue;
-    },
-    setCockpitHysyText(newValue) {
-        this.state.cockpit_hysy.text = newValue;
-    },
     setCockpitDate(newValue) {
         this.state.cockpit_date = newValue;
     }, setCockpitGkzb(newValue) {

src/views/cockpit/hysy.vue

@@ -10,13 +10,13 @@
                 <div class="lt_box box">
                     <div class="text">
                         <p>计划出让海域</p>
-                        <span>66.23</span>公顷
+                        <span>{{ store.state.cockpit_hysy.info.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_hysy.info.sj_mj }}</span>公顷
                     </div>
                 </div>
 
@@ -25,14 +25,14 @@
 
                 <div class="rt_box box">
                     <div class="text">
-                        <p>计划出让海域</p>
-                        <span>66.23</span>公顷
+                        <p>计划出让项目</p>
+                        <span>{{ store.state.cockpit_hysy.info.jh_number }}</span>个
                     </div>
                 </div>
                 <div class="rb_box box">
                     <div class="text">
-                        <p>计划出让海域</p>
-                        <span>66.23</span>公顷
+                        <p>完成出让项目</p>
+                        <span>{{ store.state.cockpit_hysy.info.sj_number }}</span>个
                     </div>
                 </div>
             </div>
@@ -45,22 +45,11 @@
 
 <script>
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
-import { cockpitInfo } from '@/api/cockpit'
-
+import { QueryOne, QueryList } from "../../api/cockpitNew";
 export default {
     components: {},
     data() {
         return {
-            label_text: {
-                xzqhdm_number: 0,
-                zhmj: 0,
-
-            },
-            label_echart: {
-                x: [],
-                bar: [],
-
-            }
         };
     },
     //监听属性 类似于data概念
@@ -411,6 +400,17 @@ export default {
             };
             myChart.setOption(option);
 
+        },
+        async init_info(params) {
+            const that = this;
+            let obj = {
+                jscType: 'jsc_hysyq_ztsh',
+                beginTime: params ? params.beginTime : store.state.cockpit_date[0],
+                endTime: params ? params.endTime : store.state.cockpit_date[1],
+                id: params ? params.id : '4602'
+            };
+            let data = await QueryList(obj);
+            store.state.cockpit_hysy.info = data.data[0]
         }
     },
     mounted() {
@@ -418,6 +418,8 @@ export default {
         this.$nextTick((res) => {
             that.init_hysyEchart();
             that.init_dial_watch_hysy();
+
+            this.init_info();
         })
     },
     beforeUpdate() { }, //生命周期 - 更新之前

src/views/map3d.vue

@@ -298,7 +298,7 @@ export default {
 }
 
 .header {
-  height: 60px;
+  height: 74px;
   position: fixed;
   top: 0px;
   width: 100%;
@@ -308,8 +308,8 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  background-image: url("/static/images/overview/title_new.png");
-
+  // background-image: url("/static/images/overview/title_new.png");
+  background-image: url("/static/images/overview/title.gif");
   background-size: 100% 100%;
 }
 
@@ -433,7 +433,7 @@ export default {
   height: 25px;
   line-height: 25px;
   /* text-align: center; */
-  text-align: left;
+  text-align: center;
   width: 100%;
   display: inline-block;
   position: relative;
@@ -447,8 +447,9 @@ export default {
 
 .timeline-item-time {
   top: -62px;
-  font-size: 14px;
-  text-align: left;
+    font-size: 17px;
+    text-align: center;
+    font-weight: bold;
 }
 
 .el-menu-demo {

src/views/viewer1.vue

@@ -97,62 +97,16 @@ export default {
             this.$refs.wpjg_ref.setData(this.params);
             this.$refs.tdsc_ref.init_scjd(this.params);
             this.$refs.tdgy_ref.init_tdgy_gy_jd(this.params);
+            this.$refs.hysy_ref.init_info(this.params);
 
             
+            
         },
         dateChange(date) {
             this.params.beginTime = date[0]
             this.params.endTime = date[1]
             this.setDatas()
         },
-        async hysyq(address) {
-            // 选中xzqh查询
-            let obj = {
-                beginTime: store.state.cockpit_date[0],
-                endTime: store.state.cockpit_date[1],
-                jscType: 'jsc_hysyq_ztsh',
-                id: address
-            };
-            let data = await cockpitInfo(obj);
-
-            let obg_text = {
-                xzqhdm_number: data.data[0].xzqhdm_number,
-                zhmj: data.data[0].zhmj == undefined ? 0 : data.data[0].zhmj,
-
-            }
-            obg_text.zhmj == null ? 0 : obg_text.zhmj;
-            store.setCockpitHysyText(obg_text);
-
-            // 图表数据
-            let obj_echart = {
-                beginTime: store.state.cockpit_date[0],
-                endTime: store.state.cockpit_date[1],
-                jscType: 'jsc_hysyq_yelx',
-                id: address
-            };
-            let data_echart = await cockpitInfo(obj_echart);
-
-            let obg_echart = {
-                x: data_echart.data.map(item => item.yhlx_name),
-                bar: data_echart.data.map(item => item.zhmj)
-
-            }
-
-            obg_echart.x.length == 0 ? obg_echart.x = ['渔业基础设施用海', '开放式养殖用海', '旅游基础设施用海', '浴场用海',
-                '游乐场用海'] : obg_echart.x = obg_echart.x;
-
-            obg_echart.bar.length == 0 ? obg_echart.bar = [0, 0, 0, 0, 0,] : obg_echart.bar = obg_echart.bar;
-
-            store.setCockpitHysyEchart(obg_echart);
-
-
-
-            // getRenKou();
-
-        },
-        hysyq_xzqh() {
-            const that = this;
-        },
         async gkzb_xzqh(address) {
             let obj = {
                 // beginTime: store.state.cockpit_date[0],
@@ -232,8 +186,6 @@ export default {
                         let adcode = obj.adcode
                         that.params.id = adcode
                         that.setDatas()
-                        // 驾驶舱海域使用权
-                        that.hysyq(adcode);
                         // 管控指标
                         that.gkzb_xzqh(adcode);
                         viewer.entities.values.forEach((res) => {
@@ -260,10 +212,7 @@ export default {
                         if (res.billboard != undefined)
                             res.billboard.show._value = false
                     })
-                    // 海域使用
-                    that.hysyq_xzqh();
-                    // 土地收储
-                    that.tdsc();
+               
                     // 管控指标
                     that.gkzb();
 
@@ -316,6 +265,7 @@ export default {
         init_xzqh() {
             const that = this;
             xzqh.features.forEach((res) => {
+                console.log('res: ', res);
 
                 let obj = {
                     'type': "cockpit",
@@ -390,6 +340,8 @@ export default {
             })
         },
         init_hyqy() {
+            console.log(1111);
+            
             const that = this;
 
             hyqy.features.forEach((res) => {