报建项目

src/store/store.js

@@ -115,6 +115,9 @@ var store2 = {
         cockpit_bjxm: {
             csbj: {
                 csbj_echart: {}
+            },
+            szbj: {
+                szbj_echart: {}
             }
         },
         cockpit_gkzb: {

src/views/cockpit/bjxm.vue

@@ -23,7 +23,7 @@
 
         <div class="text">
           <p>报建数量</p>
-          <span>{{ left_value == 'csbj' ? sdata.sj_number : 0 }}</span>个
+          <span>{{ left_value == 'csbj' ? sdata.sj_number : sdata_szbj.sj_number }}</span>个
           <i style="pointer-events:all" :class="{ 'el-icon-view-switch': icon_switch, 'el-icon-view': true }"></i>
         </div>
       </div>
@@ -33,7 +33,7 @@
         </div>
         <div class="text">
           <p>用地面积</p>
-          <span>0</span>平方千米
+          <span>{{ left_value == 'csbj' ? sdata.sj_mj : sdata_szbj.sj_mj }}</span>平方千米
         </div>
       </div>
 
@@ -47,13 +47,14 @@
 import { QueryOne, QueryList } from "../../api/cockpitNew";
 import Title from './common/Title.vue';
 import * as wellknown from "wellknown";
-let csbjcolumns=["上月转结", "事项内容", "事项名称", "办件类型", "办件编号", "办结情况", "受理人",'实际办结时间','审批模式','当前环节','当场办结','承诺日期','状态','申请主体','申请数量','行政区','面积（亩）','预警']
-let szbjcolumns=['报建项目名称','审批单位','所在行政区','报批时间','用地面积','规划情况']
+let csbjcolumns = ["上月转结", "事项内容", "事项名称", "办件类型", "办件编号", "办结情况", "受理人", '实际办结时间', '审批模式', '当前环节', '当场办结', '承诺日期', '状态', '申请主体', '申请数量', '行政区', '面积（亩）', '预警']
+let szbjcolumns = ['报建项目名称', '审批单位', '所在行政区', '报批时间', '用地面积', '规划情况']
 export default {
   components: { Title },
   data() {
     return {
       sdata: {},
+      sdata_szbj: {},
       icon_switch: false,
 
       left_value: 'csbj',
@@ -82,6 +83,16 @@ export default {
       };
       let res = await QueryOne(obj);
       this.sdata = res.data;
+
+      // 私宅报建汇总
+      let obj_szbj = {
+        jscType: 'jsc_bjxm_szbj_hz',
+        beginTime: params ? params.beginTime : store.state.cockpit_date[0],
+        endTime: params ? params.endTime : store.state.cockpit_date[1],
+        id: params ? params.id : '46020'
+      };
+      let res_szbj = await QueryOne(obj_szbj);
+      this.sdata_szbj = res_szbj.data;
     },
     async init_bjxm_echart_info(params) {
       const that = this;
@@ -110,6 +121,37 @@ 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',
+        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_szbj = await QueryList(obj_szbj);
+      let xAxis_szbj = [];
+      let bat_data_szbj = [];
+      let line_data_szbj = [];
+
+      data_szbj.data.forEach(element => {
+
+        xAxis_szbj.push(element.yf);
+        bat_data_szbj.push(element.sj_mj);
+        line_data_szbj.push(element.sj_number);
+
+
+      });
+
+      store.state.cockpit_bjxm.szbj.szbj_echart = {
+        xAxis: xAxis_szbj,
+        bat_data: bat_data_szbj,
+        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();
 
     },
@@ -168,9 +210,12 @@ export default {
       echarts.graphic.registerShape('CubeRight', CubeRight)
       echarts.graphic.registerShape('CubeTop', CubeTop)
       // 数据
-      const xAxis = store.state.cockpit_bjxm.csbj.csbj_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 : [0, 0, 0, 0, 0, 0]
+      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;
 
       let option = {
         //你的代码
@@ -249,8 +294,8 @@ export default {
           // },
           {
             min: 0,
-            max: 15,
-            interval: 5,
+            // max: 15,
+            // interval: 5,
             name: '项目数(个)',
             type: 'value',
             axisLine: {
@@ -392,7 +437,7 @@ export default {
         tableData: [],
         tablejscType: `jsc_bjxm_${this.left_value}_zbmx`,
         columns: this.left_value == 'csbj' ? csbjcolumns : szbjcolumns,
-     })
+      })
     },
     draw_vector_tdgy_gy_jd() {
       this.vector_data.forEach((res) => {
@@ -400,35 +445,35 @@ export default {
         if (res.geom) {
           res.geom.coordinates.forEach((res_coordinates) => {
             // console.log('res_coordinates: ', res_coordinates);
-        //     let arrayt = [];
-        //     if (res_coordinates.length == 1) {
-        //       arrayt = res_coordinates[0]
-        //     } else {
-        //       arrayt = res_coordinates
-        //     }
-
-        //     const twoDArray = arrayt;
-        //     const oneDArray = twoDArray.reduce((accumulator, currentValue) => accumulator.concat(currentValue), []);
-
-        //     this.bjxu_entity.entities.add({
-        //       // position: Cesium.Cartesian3.fromDegrees(res_coordinates[0], res_coordinates[1], 0),
-        //       properties: res,
-        //       name: "国有建设用地完成项目",
-        //       polygon: {
-        //         zIndex: 1,
-        //         hierarchy: {
-        //           positions: Cesium.Cartesian3.fromDegreesArrayHeights(oneDArray),
-        //         },
-        //         // outline: false,
-        //         // material: Cesium.Color.fromCssColorString(xzqh_color),
-
-        //         height: 5,
-        //         extrudedHeight: 0,
-        //         outline: true,
-        //         // outlineColor : Cesium.Color.BLACK
-        //         outlineColor: Cesium.Color.fromCssColorString('#55A1E3'),
-        //       }
-        //     })
+            //     let arrayt = [];
+            //     if (res_coordinates.length == 1) {
+            //       arrayt = res_coordinates[0]
+            //     } else {
+            //       arrayt = res_coordinates
+            //     }
+
+            //     const twoDArray = arrayt;
+            //     const oneDArray = twoDArray.reduce((accumulator, currentValue) => accumulator.concat(currentValue), []);
+
+            //     this.bjxu_entity.entities.add({
+            //       // position: Cesium.Cartesian3.fromDegrees(res_coordinates[0], res_coordinates[1], 0),
+            //       properties: res,
+            //       name: "国有建设用地完成项目",
+            //       polygon: {
+            //         zIndex: 1,
+            //         hierarchy: {
+            //           positions: Cesium.Cartesian3.fromDegreesArrayHeights(oneDArray),
+            //         },
+            //         // outline: false,
+            //         // material: Cesium.Color.fromCssColorString(xzqh_color),
+
+            //         height: 5,
+            //         extrudedHeight: 0,
+            //         outline: true,
+            //         // outlineColor : Cesium.Color.BLACK
+            //         outlineColor: Cesium.Color.fromCssColorString('#55A1E3'),
+            //       }
+            //     })
           })
         }
       })
@@ -441,8 +486,8 @@ export default {
   beforeMount() { }, //生命周期 - 挂载之前
   mounted() {
     this.$nextTick((res) => {
-      this.init_info()
-      this.init_bjxm_echart_info();
+      // this.init_info()
+      // this.init_bjxm_echart_info();
 
       // this.init_vector();
 
@@ -559,13 +604,13 @@ export default {
   display: inline-block;
   margin-top: 0.5rem;
 }
-.cursor{
+
+.cursor {
   cursor: pointer;
 }
 
 .icon {
-  width: 50px;
-  padding: 1.5%;
+  width: 40px;
   border-radius: 8px;
   display: inline-block;
   height: 50px;
@@ -582,8 +627,7 @@ export default {
 
 .text {
   display: inline-block;
-  // border: #00FFFF 1px solid;
-  width: 100px;
+  width: 115px;
 
   p {
     font-kerning: normal;