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

src/router/index.js

@@ -47,11 +47,6 @@ export const constantRoutes = [{
         component: () =>
             import('@/views/viewer.vue'),
         hidden: true
-    }, {
-        path: '/viewer1',
-        component: () =>
-            import('@/views/viewer1.vue'),
-        hidden: true
     },
     {
         path: '/checkmodel',

src/views/cockpit/bjxm.vue

@@ -350,22 +350,23 @@ export default {
   background: no-repeat;
   background-image: url("/static/images/overview/titlebox.gif");
 
-  .icon {
-    background: no-repeat;
+  // .icon {
+  //   background: no-repeat;
 
-    background-image: url("/static/images/overview/icon_标题框装饰.png");
-    display: inline-block;
-    width: 30px;
-    height: 30px;
-    background-position: 14px 7px;
-  }
+  //   background-image: url("/static/images/overview/icon_标题框装饰.png");
+  //   display: inline-block;
+  //   width: 30px;
+  //   height: 30px;
+  //   background-position: 14px 7px;
+  // }
 
   span {
     color: #fff;
     font-size: 14px;
     font-weight: bold;
     position: relative;
-    bottom: 0.5rem;
+    bottom: 1.8rem;
+    right: 1rem;
   }
 }
 

src/views/cockpit/borderTemplate.vue

@@ -22,7 +22,7 @@ export default {
   data() {
     return {};
   },
-  mounted() {},
+  mounted() { },
   methods: {},
 };
 </script>
@@ -48,22 +48,17 @@ export default {
     display: flex;
     justify-content: space-between;
 
-    .icon {
-      background: no-repeat;
-      background-image: url("/static/images/overview/icon_标题框装饰.png");
-      display: inline-block;
-      width: 30px;
-      height: 30px;
-      background-position: 14px 7px;
-    }
+
 
     span {
       color: #fff;
       font-size: 14px;
       font-weight: bold;
       position: relative;
-      bottom: 0.5rem;
+      bottom: -0.3rem;
+      left: 2.4rem;
     }
+
     .selectTab {
       /deep/ .el-input__inner {
         // padding-right: 30px;
@@ -78,35 +73,36 @@ export default {
         background: url("/static/images/overview/selectBg.png") no-repeat !important;
         background-size: 100% 100%;
       }
+
       /deep/ .el-input__icon {
         line-height: 1;
       }
+
       /deep/ .el-input__suffix {
         right: -2px;
       }
+
       /deep/ .el-select-dropdown__list {
         color: #bcd3e5 !important;
-        background: linear-gradient(
-          180deg,
-          rgba(3, 115, 177, 0) 11%,
-          rgba(3, 115, 177, 0.48) 100%
-        );
-        border-image: linear-gradient(
-            360deg,
+        background: linear-gradient(180deg,
+            rgba(3, 115, 177, 0) 11%,
+            rgba(3, 115, 177, 0.48) 100%);
+        border-image: linear-gradient(360deg,
             rgba(75, 185, 250, 0.2),
-            rgba(75, 185, 250, 0.05)
-          )
-          1 1 !important;
+            rgba(75, 185, 250, 0.05)) 1 1 !important;
         border: none;
       }
+
       /deep/ .el-select-dropdown__item.hover,
       .el-select-dropdown__item:hover {
         background-color: rgba(87, 163, 226, 0.5);
       }
+
       /deep/ .el-select-dropdown__item {
         color: #ecf6ff;
       }
     }
+
     /deep/ {
       .el-select-dropdown__item.selected {
         color: #409eff;
@@ -119,13 +115,16 @@ export default {
   margin-top: 12px;
   background: #163253;
 }
+
 /deep/ .el-select-dropdown {
   border: none;
 }
+
 /deep/ .el-popper[x-placement^="bottom"] .popper__arrow::after {
   border-bottom-color: #163253;
   top: 0;
 }
+
 .borderContent {
   // border: #00FFFF 1px solid;
   position: absolute;
@@ -133,5 +132,4 @@ export default {
   width: 95%;
   height: calc(100% - 40px);
   top: 40px;
-}
-</style>
+}</style>

src/views/cockpit/hysy.vue

@@ -481,28 +481,22 @@ export default {
 
 
 .title {
-    width: 1071rem;
+
+    width: 1074rem;
     height: 40px;
     background: no-repeat;
-    background-size: 116% 100%;
+    background-size: 88% 100%;
     background-image: url("/static/images/overview/titlebox.gif");
 
-    .icon {
-        background: no-repeat;
-
-        background-image: url("/static/images/overview/icon_标题框装饰.png");
-        display: inline-block;
-        width: 30px;
-        height: 30px;
-        background-position: 14px 7px;
-    }
+    margin-left: 2rem;
 
     span {
         color: #fff;
         font-size: 14px;
         font-weight: bold;
         position: relative;
-        bottom: 0.5rem;
+        top: 0.5rem;
+        right: -3rem;
     }
 }
 

src/views/cockpit/jcbd.vue

@@ -124,22 +124,13 @@ export default {
     background: no-repeat;
     background-image: url("/static/images/overview/titlebox.gif");
 
-    .icon {
-        background: no-repeat;
-
-        background-image: url("/static/images/overview/icon_标题框装饰.png");
-        display: inline-block;
-        width: 30px;
-        height: 30px;
-        background-position: 14px 7px;
-    }
-
     span {
         color: #fff;
         font-size: 14px;
         font-weight: bold;
         position: relative;
-        bottom: 0.5rem;
+        bottom: 1.8rem;
+        right: 1rem;
     }
 }
 

src/views/cockpit/jsyd.vue

@@ -162,7 +162,8 @@ export default {
         hy_mj: data.data[0].hy_mj,//近海岸面积
         yjjbntmj: obj_yjjbntmj_data.data[0].yjjbntmj,// 永久基本农田保护面积
         kfbjmj: obj_kfbjmj_data.data[0].kfbjmj,// 城市开发边界
-        bfb: obj_kfbjmj_data.data[0].bfb * 100,// 覆盖城镇开发边界
+        bfb: (obj_kfbjmj_data.data[0].bfb * 100).toFixed(2),// 覆盖城镇开发边界
+
         tbmj_ys: obj_gdbhmb_data.data[0].tbmj_ys,//耕地保护目标
         ghdkmj: obj_kfbjmj_data.data[0].ghdkmj//已入库管控范围
       });
@@ -213,22 +214,13 @@ export default {
   background: no-repeat;
   background-image: url("/static/images/overview/titlebox.gif");
 
-  .icon {
-    background: no-repeat;
-
-    background-image: url("/static/images/overview/icon_标题框装饰.png");
-    display: inline-block;
-    width: 30px;
-    height: 30px;
-    background-position: 14px 7px;
-  }
-
   span {
     color: #fff;
     font-size: 14px;
     font-weight: bold;
     position: relative;
-    bottom: 0.5rem;
+    bottom: 1.8rem;
+    right: 1rem;
   }
 }
 

src/views/cockpit/tdsc.vue

@@ -474,22 +474,14 @@ export default {
   background: no-repeat;
   background-image: url("/static/images/overview/titlebox.gif");
 
-  .icon {
-    background: no-repeat;
-
-    background-image: url("/static/images/overview/icon_标题框装饰.png");
-    display: inline-block;
-    width: 30px;
-    height: 30px;
-    background-position: 14px 7px;
-  }
 
   span {
     color: #fff;
     font-size: 14px;
     font-weight: bold;
     position: relative;
-    bottom: 0.5rem;
+    bottom: -0.2rem;
+    right: -2.4rem;
   }
 }
 

src/views/cockpit/tdsy.vue

@@ -821,29 +821,24 @@ export default {
       display: flex;
       justify-content: space-between;
 
-      .icon {
-        background: no-repeat;
-        background-image: url("/static/images/overview/icon_标题框装饰.png");
-        display: inline-block;
-        width: 30px;
-        height: 30px;
-        background-position: 14px 7px;
-      }
-
       span {
         color: #fff;
-        font-size: 14px;
-        font-weight: bold;
-        position: relative;
-        bottom: 0.5rem;
+    font-size: 14px;
+    font-weight: bold;
+    position: relative;
+    bottom: -0.2rem;
+    right: -2.3rem;
       }
     }
 
     .left_tab {
       position: fixed;
-      left: 13rem;
+      left: 10rem;
+    }
+    .right_tab {
+      position: fixed;
+      left: 19rem;
     }
-
     .selectTab {
       /deep/ .el-input__inner {
         // padding-right: 30px;

src/views/viewer.vue

@@ -10,12 +10,13 @@
                 <div class="bg_bottom"></div>
             </div>
             <datePicker @dateChange="dateChange"></datePicker>
-            <ser-center></ser-center>
-            <GKZB ref="gkzb_ref" />
+            <!-- <ser-center></ser-center> -->
+            <JSYD ref="gkzb_ref" />
+            <JCBD />
             <BJXM />
-            <TDSC />
+            <TDSC ref="tdsc_ref" />
             <HYSY ref="hysy_ref" />
-            <TDSY />
+            <TDSY ref="tdgy_ref" />
             <GDBH ref="gdbh_ref" />
             <STXF ref="stxf_ref" />
             <WPJG ref="wpjg_ref" />
@@ -25,25 +26,25 @@
 
 <script>
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
-import serCenter from './cockpitNew1/serCenter';
-import GKZB from './cockpitNew1/gkzb';
-import TDSC from './cockpitNew1/tdsc';
-import HYSY from './cockpitNew1/hysy';
-import TDSY from './cockpitNew1/tdsy';
-import BJXM from './cockpitNew1/bjxm';
-import GDBH from './cockpitNew1/gdbh';
-import STXF from './cockpitNew1/stxf';
-import WPJG from './cockpitNew1/wpjg';
-import datePicker from './cockpitNew1/datePicker.vue';
+import JSYD from './cockpit/jsyd';
+import TDSC from './cockpit/tdsc';
+import HYSY from './cockpit/hysy';
+import TDSY from './cockpit/tdsy';
+import BJXM from './cockpit/bjxm';
+import GDBH from './cockpit/gdbh';
+import STXF from './cockpit/stxf';
+import WPJG from './cockpit/wpjg';
+import JCBD from './cockpit/jcbd';
+
+import datePicker from './cockpit/datePicker.vue';
 import xzqh from "../../static/data/460200_full.json";
 import hyqy from "../../static/data/460200_hyqy.json";
 
-import SerCenter from './cockpitNew1/serCenter.vue';
 
 import { cockpitInfo } from '@/api/cockpit'
 let manager = {};
 export default {
-    components: { serCenter, GKZB, BJXM, TDSC, HYSY, TDSY, GDBH, STXF, WPJG, datePicker, SerCenter },
+    components: { JSYD, BJXM, TDSC, HYSY, TDSY, GDBH, STXF, WPJG, datePicker, JCBD },
     data() {
         return {
             params: {
@@ -92,66 +93,20 @@ export default {
         },
         setDatas() {
             this.$refs.gdbh_ref.setData({ id: this.params.id });
-            this.$refs.stxf_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);
+            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);
-            console.log('data: ', data);
-
-            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);
-
-
-            this.$refs.hysy_ref["getRenKou"]();
-
-            // getRenKou();
-
-        },
-        hysyq_xzqh() {
-            const that = this;
-            that.$refs.hysy_ref["label_data"]();
-            that.$refs.hysy_ref["echart_data"]();
-        },
         async gkzb_xzqh(address) {
             let obj = {
                 // beginTime: store.state.cockpit_date[0],
@@ -178,14 +133,14 @@ export default {
                 id: address
             };
             let obj_gdbhmb_data = await cockpitInfo(obj_gdbhmb);
-
+            console.log(obj_kfbjmj_data.data[0].bfb, "asdas");
             store.setCockpitGkzb({
                 mj: data.data[0].mj,// 生态保护红线面积
                 ly_mj: data.data[0].ly_mj,// 路域生态保护红线
                 hy_mj: data.data[0].hy_mj,//近海岸面积
                 yjjbntmj: obj_yjjbntmj_data.data[0].yjjbntmj,// 永久基本农田保护面积
                 kfbjmj: obj_kfbjmj_data.data[0].kfbjmj,// 城市开发边界
-                bfb: obj_kfbjmj_data.data[0].bfb * 100,// 覆盖城镇开发边界
+                bfb: (obj_kfbjmj_data.data[0].bfb * 100).toFixed(2),// 覆盖城镇开发边界
                 tbmj_ys: obj_gdbhmb_data.data[0].tbmj_ys,//耕地保护目标
                 ghdkmj: obj_kfbjmj_data.data[0].ghdkmj//已入库管控范围
 
@@ -231,10 +186,6 @@ export default {
                         let adcode = obj.adcode
                         that.params.id = adcode
                         that.setDatas()
-                        // 驾驶舱海域使用权
-                        that.hysyq(adcode);
-                        // 驾驶舱土地收储
-                        that.tdsc_xzqh(adcode);
                         // 管控指标
                         that.gkzb_xzqh(adcode);
                         viewer.entities.values.forEach((res) => {
@@ -261,27 +212,17 @@ export default {
                         if (res.billboard != undefined)
                             res.billboard.show._value = false
                     })
-                    // 海域使用
-                    that.hysyq_xzqh();
-                    // 土地收储
-                    that.tdsc();
+
                     // 管控指标
                     that.gkzb();
 
+                    that.params.id = '4602'
+                    that.setDatas()
 
                 }
 
             }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
         },
-        tdsc() {
-            const that = this;
-            that.store.setCockpitTdsc(true);
-
-        },
-        tdsc_xzqh() {
-            const that = this;
-            that.store.setCockpitTdsc(false);
-        },
         colorFun(color) {
 
 

src/views/viewer1.vue → src/views/viewer旧版驾驶舱.vue

@@ -10,13 +10,12 @@
                 <div class="bg_bottom"></div>
             </div>
             <datePicker @dateChange="dateChange"></datePicker>
-            <!-- <ser-center></ser-center> -->
-            <JSYD ref="gkzb_ref" />
-            <JCBD />
+            <ser-center></ser-center>
+            <GKZB ref="gkzb_ref" />
             <BJXM />
-            <TDSC ref="tdsc_ref" />
+            <TDSC />
             <HYSY ref="hysy_ref" />
-            <TDSY ref="tdgy_ref"/>
+            <TDSY />
             <GDBH ref="gdbh_ref" />
             <STXF ref="stxf_ref" />
             <WPJG ref="wpjg_ref" />
@@ -26,25 +25,25 @@
 
 <script>
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
-import JSYD from './cockpit/jsyd';
-import TDSC from './cockpit/tdsc';
-import HYSY from './cockpit/hysy';
-import TDSY from './cockpit/tdsy';
-import BJXM from './cockpit/bjxm';
-import GDBH from './cockpit/gdbh';
-import STXF from './cockpit/stxf';
-import WPJG from './cockpit/wpjg';
-import JCBD from './cockpit/jcbd';
-
-import datePicker from './cockpit/datePicker.vue';
+import serCenter from './cockpitNew1/serCenter';
+import GKZB from './cockpitNew1/gkzb';
+import TDSC from './cockpitNew1/tdsc';
+import HYSY from './cockpitNew1/hysy';
+import TDSY from './cockpitNew1/tdsy';
+import BJXM from './cockpitNew1/bjxm';
+import GDBH from './cockpitNew1/gdbh';
+import STXF from './cockpitNew1/stxf';
+import WPJG from './cockpitNew1/wpjg';
+import datePicker from './cockpitNew1/datePicker.vue';
 import xzqh from "../../static/data/460200_full.json";
 import hyqy from "../../static/data/460200_hyqy.json";
 
+import SerCenter from './cockpitNew1/serCenter.vue';
 
 import { cockpitInfo } from '@/api/cockpit'
 let manager = {};
 export default {
-    components: { JSYD, BJXM, TDSC, HYSY, TDSY, GDBH, STXF, WPJG, datePicker, JCBD },
+    components: { serCenter, GKZB, BJXM, TDSC, HYSY, TDSY, GDBH, STXF, WPJG, datePicker, SerCenter },
     data() {
         return {
             params: {
@@ -93,20 +92,66 @@ export default {
         },
         setDatas() {
             this.$refs.gdbh_ref.setData({ id: this.params.id });
-            // this.$refs.stxf_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);
-            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);
+            console.log('data: ', data);
+
+            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);
+
+
+            this.$refs.hysy_ref["getRenKou"]();
+
+            // getRenKou();
+
+        },
+        hysyq_xzqh() {
+            const that = this;
+            that.$refs.hysy_ref["label_data"]();
+            that.$refs.hysy_ref["echart_data"]();
+        },
         async gkzb_xzqh(address) {
             let obj = {
                 // beginTime: store.state.cockpit_date[0],
@@ -186,6 +231,10 @@ export default {
                         let adcode = obj.adcode
                         that.params.id = adcode
                         that.setDatas()
+                        // 驾驶舱海域使用权
+                        that.hysyq(adcode);
+                        // 驾驶舱土地收储
+                        that.tdsc_xzqh(adcode);
                         // 管控指标
                         that.gkzb_xzqh(adcode);
                         viewer.entities.values.forEach((res) => {
@@ -212,17 +261,27 @@ export default {
                         if (res.billboard != undefined)
                             res.billboard.show._value = false
                     })
-               
+                    // 海域使用
+                    that.hysyq_xzqh();
+                    // 土地收储
+                    that.tdsc();
                     // 管控指标
                     that.gkzb();
 
-                    that.params.id = '4602'
-                    that.setDatas()
 
                 }
 
             }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
         },
+        tdsc() {
+            const that = this;
+            that.store.setCockpitTdsc(true);
+
+        },
+        tdsc_xzqh() {
+            const that = this;
+            that.store.setCockpitTdsc(false);
+        },
         colorFun(color) {