Browse Source

接口修改

zpf 1 year ago
parent
commit
bb5283fd99

+ 21 - 5
src/views/cockpit/bjxm.vue

@@ -85,12 +85,19 @@ export default {
       this.sdata = res.data;
 
       // 私宅报建汇总
+      let dateString_beginTime = store.state.cockpit_date[0];
+      let formattedDate = dateString_beginTime.slice(0, 4) + '-' + dateString_beginTime.slice(4, 6) + '-' + dateString_beginTime.slice(6);
+
+      let dateString_endTime = store.state.cockpit_date[1];
+      let formattedDate_endTime = dateString_endTime.slice(0, 4) + '-' + dateString_endTime.slice(4, 6) + '-' + dateString_endTime.slice(6);
+
       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],
+        beginTime: formattedDate,
+        endTime: formattedDate_endTime,
         id: params ? params.id : '46020'
       };
+
       let res_szbj = await QueryOne(obj_szbj);
       this.sdata_szbj = res_szbj.data;
     },
@@ -122,12 +129,21 @@ export default {
 
       }
       // 私宅报建
+
+      let dateString_beginTime = store.state.cockpit_date[0];
+      let formattedDate = dateString_beginTime.slice(0, 4) + '-' + dateString_beginTime.slice(4, 6) + '-' + dateString_beginTime.slice(6);
+
+      let dateString_endTime = store.state.cockpit_date[1];
+      let formattedDate_endTime = dateString_endTime.slice(0, 4) + '-' + dateString_endTime.slice(4, 6) + '-' + dateString_endTime.slice(6);
+
       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],
+        beginTime: formattedDate,
+        endTime: formattedDate_endTime,
         id: params ? params.id : '4602'
       };
+
+
       let data_szbj = await QueryList(obj_szbj);
       let xAxis_szbj = [];
       let bat_data_szbj = [];
@@ -419,7 +435,7 @@ export default {
           //   data: bat_data
           // },
           {
-            name:"项目个数",
+            name: "项目个数",
             type: 'line',
             smooth: true,
             itemStyle: {

+ 15 - 2
src/views/cockpit/common/VectorSpace/BoxCommonVector.vue

@@ -101,7 +101,7 @@ export default {
         draw_vector_tdgy_gy_jd(data) {
             // tdsy.remove();
             data.forEach((res) => {
-                res.type ='图斑上图'
+                res.type = '图斑上图'
                 if (res.geom) {
                     res.geom.coordinates.forEach((res_coordinates) => {
                         let arrayt = [];
@@ -362,7 +362,9 @@ export default {
 
         },
         async init_vector(params) {
+
             const that = this;
+
             let obj = {
                 jscType: store.state.cockpit_vector.tablejscType,
                 beginTime: store.state.cockpit_date[0],
@@ -385,6 +387,17 @@ export default {
                 obj.beginTime = undefined
                 obj.endTime = undefined
             }
+            if (this.title == '私宅报建完成项目') {
+
+                let dateString_beginTime = store.state.cockpit_date[0];
+                let formattedDate = dateString_beginTime.slice(0, 4) + '-' + dateString_beginTime.slice(4, 6) + '-' + dateString_beginTime.slice(6);
+
+                let dateString_endTime = store.state.cockpit_date[1];
+                let formattedDate_endTime = dateString_endTime.slice(0, 4) + '-' + dateString_endTime.slice(4, 6) + '-' + dateString_endTime.slice(6);
+
+                obj.beginTime = formattedDate
+                obj.endTime = formattedDate_endTime
+            }
             let data = await QueryList(obj);
             data.data.map((res) => {
                 if (res.geom) {
@@ -413,7 +426,7 @@ export default {
                 this.tableData = newVal.tableData
                 this.init_vector()
 
-            } else if(this.title){
+            } else if (this.title) {
                 this.init_vector()
             }
             if (newVal.goitem) {