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

src/views/cockpit/bjxm.vue

@@ -11,7 +11,7 @@
       </div>
     </div>
     <div class="content">
-      <div class="item">
+      <div class="item cursor" @click="draw_vector">
         <div class="icon">
           <div class="icon_zxkg"></div>
         </div>
@@ -24,7 +24,7 @@
         <div class="text">
           <p>报建数量</p>
           <span>{{ left_value == 'csbj' ? sdata.sj_number : 0 }}</span>个
-          <!-- <i style="pointer-events:all" :class="{ 'el-icon-view-switch': icon_switch, 'el-icon-view': true }"></i> -->
+          <i style="pointer-events:all" :class="{ 'el-icon-view-switch': icon_switch, 'el-icon-view': true }"></i>
         </div>
       </div>
       <div class="item">
@@ -383,7 +383,15 @@ export default {
       myChart.setOption(option);
     },
     draw_vector() {
-
+      store.setViewerFlagb(false);
+      store.setToolBarShow(false);
+      store.setXzqh_flag(false);
+      store.setCockpit_vector({
+        title: "城市报建完成项目",
+        tableData: this.vector_data,
+        tablejscType: 'jsc_bjxm_csbj_zbmx',
+        columns: ["上月转结", "事项内容", "事项名称", "办件类型", "办件编号", "办结情况", "受理人",'实际办结时间','审批模式','当前环节','当场办结','承诺日期','状态','申请主体','申请数量','行政区','面积（亩）','预警'],
+     })
     },
     draw_vector_tdgy_gy_jd() {
       this.vector_data.forEach((res) => {
@@ -569,6 +577,9 @@ export default {
   display: inline-block;
   margin-top: 0.5rem;
 }
+.cursor{
+  cursor: pointer;
+}
 
 .icon {
   width: 50px;

src/views/cockpit/common/VectorSpace/BoxCommonVector.vue

@@ -257,9 +257,11 @@ export default {
                 this.active_dableData = this.tableData;
             } else {
                 let gy_ju = {
-                    jscType: 'jsc_tdgy_gy_zbmx_cx',
-                    id: '4602',
-                    val0: word,
+                  beginTime: store.state.cockpit_date[0],
+                  endTime: store.state.cockpit_date[1],
+                  jscType: store.state.cockpit_vector.tablejscType + '_cx',
+                  id: '4602',
+                  val0: word,
 
                 }
 

src/views/cockpit/gdbh.vue

@@ -84,11 +84,11 @@
               <li>
                 <div class="icon"></div>
 
-                <span class="zbph_label">新增粮食产能</span>
+                <span class="zbph_label">提升粮食产能</span>
                 <br>
 
                 <span class="zbph_value_unit">
-                  <span class="zbph_value">623.11</span>
+                  <span class="zbph_value">637.17</span>
                   <span class="zbph_unit">吨</span>
                 </span>
               </li>

src/views/cockpit/tdsy.vue

@@ -359,6 +359,20 @@ export default {
       //   id: params ? params.id : '4602'
       // };
       // let data = await QueryList(obj);
+      console.log(item, "itemitem");
+    },
+    async init_info(params) {
+      const that = this;
+      let obj = {
+        jscType: "jsc_hysyq_ztsh",
+        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 = await QueryList(obj);
+
+      that.wccchy = data.data[0].sj_mj;
+      that.wcccxm = data.data[0].sj_number;
       // dial_watch_info: {
       //   lt: {
       //     key: '计划供应',
@@ -1251,6 +1265,7 @@ export default {
       background-size: 100% 100%;
       margin: 0.5rem;
     }
+
     .itemIcon2 {
       width: 1.5rem;
       height: 1.7rem;

src/views/complianceAnalysis/components/lsjl.vue

@@ -63,7 +63,7 @@
             <span
               class="button"
               @click.stop="del(item)"
-              v-if="item.rwzt == 2 || item.rwzt == 3"
+              v-if="item.rwzt == 2 || item.rwzt == 3 || item.rwzt == 99"
               >删除</span
             >
           </div>
@@ -78,7 +78,7 @@ import parse from "wellknown";
 import { GetPage, Delect } from "@/api/ghss/hgxfx.js";
 import { Message, MessageBox } from "element-ui";
 import { rest } from "lodash";
-import { GetXzResList,DelXzRes } from "../../../api/ghss/ghxz.js";
+import { GetXzResList, DelXzRes } from "../../../api/ghss/ghxz.js";
 let dataSources;
 export default {
   props: {