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

src/components/Query/clickQuery/CockpitVector.vue

@@ -3,13 +3,18 @@
 
     <div class="cockpit_vector">
       <div class="list_vector list_vector_multi" v-for="(item, index ) in store.state.vectorData" :key="index"
-        v-if="item.name != 'geom' && item.id != 'id' && item.type != 'type'">
-        <div class="filed_box">
+        v-if="shouldDisplayItem(item)">
+        <!-- <div class="filed_box">
           {{ item.name }}
         </div>
         :
         <div class="filed_box">
           {{ item.value }}
+        </div> -->
+
+        <div>
+          <div class="left_info filed_box">{{ item.name }}</div>
+          <div class="right_info filed_box">{{ item.value }}</div>
         </div>
       </div>
     </div>
@@ -39,6 +44,9 @@ export default {
   watch: {},
   //方法集合
   methods: {
+    shouldDisplayItem(item) {  
+      return item.name !== 'geom' && item.name !== 'id' && item.name !== 'type'&& item.name !== 'create_time'&& item.name !== 'val1';  
+    },
     build_data(geojson) {
       geojson.coordinates.forEach((res) => {
         const twoDArray = res[0];
@@ -226,4 +234,9 @@ export default {
 .filed_box {
   display: inline-block;
 }
+.left_info{
+  border: #CCC 1px solid;
+}.right_info{
+  border: #CCC 1px solid;
+}
 </style>

src/views/cockpit/bjxm.vue

@@ -121,8 +121,6 @@ export default {
         line_data: line_data,
 
       }
-      console.log('store.state.cockpit_bjxm.csbj.csbj_echart: ', store.state.cockpit_bjxm.csbj.csbj_echart);
-
       // 私宅报建
       let obj_szbj = {
         jscType: 'jsc_bjxm_szbj_yffl',
@@ -150,7 +148,6 @@ export default {
         line_data: line_data_szbj,
 
       }
-      console.log(store.state.cockpit_bjxm.szbj.szbj_echart, "store.state.cockpit_bjxm.szbj.szbj_echart");
 
       this.init_bjxm_echart();
 
@@ -213,7 +210,6 @@ export default {
       const xAxis = this.left_value == 'csbj' ? store.state.cockpit_bjxm.csbj.csbj_echart.xAxis : store.state.cockpit_bjxm.szbj.szbj_echart.xAxis
       // const bat_data = store.state.cockpit_bjxm.csbj.csbj_echart.bat_data
       const line_data = this.left_value == 'csbj' ? store.state.cockpit_bjxm.csbj.csbj_echart.line_data : store.state.cockpit_bjxm.szbj.szbj_echart.line_data
-      console.log(store.state.cockpit_bjxm, " store.state.cockpit_bjxm.csbj.csbj_echart.xAxis");
       // const xAxis = store.state.cockpit_bjxm.csbj.csbj_echart.xAxis;
       // const line_data = store.state.cockpit_bjxm.csbj.csbj_echart.line_data;
 

src/views/cockpit/common/DiscountedAColumnar.vue

@@ -94,7 +94,6 @@ export default {
                     trigger: "axis",
                     textStyle: { fontSize: '100%' },
                     formatter: params => {
-                        console.log('params: ', params);
                         let rander = params.map(item =>
                             `
                         

src/views/cockpit/gdbh.vue

@@ -109,7 +109,7 @@
             </div>
             <div class="text">
               <p>流入耕地</p>
-              <span>{{ store.state.cockpit_gdbh.gdxz.title.st_mj }}</span>km²
+              <span>{{ zbpg_hz.jcpg.lrgd == '暂无' ? 0 : zbpg_hz.jcpg.lrgd }}</span>km²
 
             </div>
           </div>
@@ -121,7 +121,7 @@
             </div>
             <div class="text">
               <p>流出耕地</p>
-              <span>{{ store.state.cockpit_gdbh.gdxz.title.sjd_mj }}</span>km²
+              <span>{{ zbpg_hz.jcpg.lcgd == '暂无' ? 0 : zbpg_hz.jcpg.lcgd }}</span>km²
 
             </div>
           </div>
@@ -197,6 +197,8 @@ import borderTemplate from "./borderTemplate.vue";
 // import highPie from "../../components/echartsTemplate/highPie.vue";
 import pie3d from "../../components/echartsTemplate/3dPie.vue";
 import { QueryOne, QueryList } from "../../api/cockpitNew";
+import parse from "wellknown";
+
 export default {
   components: { borderTemplate, pie3d },
   data() {
@@ -218,18 +220,26 @@ export default {
           qzst: 0,
           tslscn: 0,
           mj: 0,
+        },
+        jcpg: {
+          lrgd: 0,
+          lcgd: 0,
+          lc_st: 0,
+          lc_hd: 0,
+          lc_sjd: 0
         }
 
       },
-      balanceData:{
-        cb_cn:0,
+      vector_data: null,
+      balanceData: {
+        cb_cn: 0,
         cb_gdm: 0,
         cb_st: 0,
         create_time: "20240101",
         id: "4602",
-        zy_cn:0,
+        zy_cn: 0,
         zy_gdmj: 0,
-        zy_st:0
+        zy_st: 0
       },//占补平衡数据存储
     };
   },
@@ -629,6 +639,47 @@ export default {
       })
       this.$refs.jcpg.setOptions(arr);
     },
+    async init_jcph_table(params) {
+      const that = this;
+      let obj = {
+        jscType: "jsc_gdbh_jcph_zbmc",
+        id: params ? params.id : "4602",
+        val1: 1,
+        val2: 50000,
+        beginTime: store.state.cockpit_date[1].slice(0, 4)
+      };
+      let data = await QueryList(obj);
+      data.data.map((res) => {
+        if (res.geom) {
+          res.geom = parse(res.geom.split(";")[1]);
+        }
+      });
+      this.vector_data = data.data;
+      store.setCockpit_vector({
+        title: "进出平衡",
+        tableData: this.vector_data,
+        tablejscType: 'jsc_tdgy_gy_zbmx',
+        columns: [
+          "进出状态",
+          "地类编码",
+          "地类编码名称",
+        ],
+      });
+    },
+    async init_jcpg_hz(params) {
+      let res = await QueryOne({
+        jscType: "jsc_gdbh_jcph_hz",
+        id: params ? params.id : '4602',
+        val0: store.state.cockpit_date[1].slice(0, 4)
+      });
+console.log(store.state.cockpit_date[1],"store.state.cockpit_date[1]");
+      this.zbpg_hz.jcpg.lrgd = res.data.lrgd
+      this.zbpg_hz.jcpg.lcgd = res.data.lcgd
+      this.zbpg_hz.jcpg.lc_st = res.data.lc_st
+      this.zbpg_hz.jcpg.lc_hd = res.data.lc_hd
+      this.zbpg_hz.jcpg.lc_sjd = res.data.lc_sjd
+
+    },
   },
   mounted() {
     // const optionsData = [
@@ -646,7 +697,8 @@ export default {
       this.init_zbph();
       this.init_jcpg();
       this.init_zbph_hz();
-      
+      // this.init_jcph_table();
+      this.init_jcpg_hz();
     })
   },
 };

src/views/cockpit/stxf.vue

@@ -193,8 +193,6 @@ export default {
         tzje: res_hz.data[0].tzje,
 
       }
-      console.log('res_hz.data: ', res_hz.data);
-
     },
     initDiv() {
       const self = this

src/views/cockpit/tdsy.vue

@@ -106,9 +106,10 @@
             <div class="icon">
               <div class="icon_zxkg"></div>
             </div>
-            <div class="text_hy">
+            <div class="text_hy cursor" @click="draw_vector_hysyq">
               <p class="p_hy">完成出让项目</p>
               <span class="span_hy">{{ wcccxm }}</span>个
+              <i style="pointer-events:all" :class="{ 'el-icon-view': true }"></i>
             </div>
           </div>
         </div>
@@ -679,7 +680,6 @@ export default {
           trigger: "axis",
           textStyle: { fontSize: '100%' },
           formatter: params => {
-            console.log('params: ', params);
             let rander = params.map(item =>
               `
                         
@@ -1086,7 +1086,6 @@ export default {
           data: [],
         },
       ];
-      console.log(result, "dasdas");
       data.data.forEach((res) => {
         xdata.push(res.tdyt);
         result[0].data.push(res.jh_crmj);
@@ -1184,6 +1183,9 @@ export default {
       });
       this.vector_data = data.data;
     },
+    draw_vector_hysyq(){
+
+    }
   },
   mounted() {
     const that = this;
@@ -1608,4 +1610,8 @@ export default {
     color: #68f4fb;
   }
 }
+
+.cursor {
+      cursor: pointer;
+  }
 </style>

src/views/viewer.vue

@@ -137,8 +137,9 @@ export default {
             this.$refs.gdbh_ref.init_zbph(this.params);
             this.$refs.gdbh_ref.init_info(this.params);
             this.$refs.gdbh_ref.init_zbph_hz(this.params);
+            this.$refs.gdbh_ref.init_jcpg_hz(this.params);
 
-
+            
             // this.$refs.stxf_ref.setData({ id: this.params.id });
             // this.$refs.wpjg_ref.setData(this.params);
             // 卫片监管