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

src/views/cockpit/jcbd.vue

@@ -45,7 +45,7 @@ export default {
                     name: "海岸线",
                     img: "/static/images/overview/jcbd_hax.png",
                     value: 1233.32,
-                    unit: "k㎡"
+                    unit: "km"
                 }, {
                     name: "耕地",
                     img: "/static/images/overview/jcbd_gd.png",
@@ -111,7 +111,6 @@ export default {
     border-width: 0px;
     position: absolute;
     left: 1rem;
-    top: 14rem;
     width: 416px;
     height: 150px;
     border-width: 0px;

src/views/cockpit/jsyd.vue → src/views/cockpit/kjgh.vue

@@ -189,7 +189,7 @@ export default {
   border-width: 0px;
   position: fixed;
   left: 1rem;
-  top: 4rem;
+  top: 13rem;
   z-index: 1;
   width: 416px;
   height: 310px;
@@ -252,7 +252,7 @@ export default {
   width: 19rem;
   height: 6rem;
   left: 4%;
-  top: 15rem;
+  top: 24rem;
   background: no-repeat;
   background-size: 100%;
 

src/views/cockpit/stxf.vue

@@ -177,7 +177,7 @@ export default {
       this.sdata.tdzz = {
         xzqhdm_number: xmsl_num,
         // zlmj: store.state.cockpit_stxf.ssgc.title.zlmj,
-        tzje:xmjz_num,
+        tzje: xmjz_num,
 
       }
 
@@ -210,7 +210,7 @@ export default {
 }
 
 .item {
-  width: calc(100% / 3); //112px;
+  width: 112px; //112px;
   height: 44px;
   position: relative;
   text-align: center;

src/views/cockpit/tdsy.vue

@@ -190,7 +190,7 @@ export default {
 
       this.$refs.tdgy_echart_gyjd.setOptions([
         { 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.yhb },
         { name: "已出让", value: store.state.cockpit_tdgy.gy_jd_info.pieData.ycr },
       ]);
     },

src/views/viewer.vue

@@ -11,7 +11,7 @@
             </div>
             <datePicker @dateChange="dateChange"></datePicker>
             <!-- <ser-center></ser-center> -->
-            <JSYD ref="gkzb_ref" />
+            <KJZB ref="gkzb_ref" />
             <JCBD />
             <BJXM ref="bjxm_ref" />
             <TDSC ref="tdsc_ref" />
@@ -26,7 +26,7 @@
 
 <script>
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
-import JSYD from './cockpit/jsyd';
+import KJZB from './cockpit/kjgh';
 import TDSC from './cockpit/tdsc';
 import HYSY from './cockpit/hysy';
 import TDSY from './cockpit/tdsy';
@@ -44,7 +44,7 @@ import hyqy from "../../static/data/460200_hyqy.json";
 import { cockpitInfo } from '@/api/cockpit'
 let manager = {};
 export default {
-    components: { JSYD, BJXM, TDSC, HYSY, TDSY, GDBH, STXF, WPJG, datePicker, JCBD },
+    components: { KJZB, BJXM, TDSC, HYSY, TDSY, GDBH, STXF, WPJG, datePicker, JCBD },
     data() {
         return {
             params: {