Browse Source

土地收储图斑

zpf 1 năm trước cách đây
mục cha
commit
f78e2907fb

+ 4 - 2
src/views/cockpit/common/DialWatch.vue

@@ -19,9 +19,11 @@
 
         </div>
         <div class="rt_box box_dial_watch">
-            <div class="text">
+            <div class="text" @click="draw_vector">
                 <p>{{ dial_watch_info.rt.key }}</p>
                 <span>{{ dial_watch_info.rt.value }}</span>{{ dial_watch_info.rt.unit }}
+                <i v-show="dial_watch_info.rt.viewer" style="pointer-events:all" :class="{ 'el-icon-view': true }"></i>
+
             </div>
         </div>
         <div class="rb_box box_dial_watch">
@@ -360,7 +362,7 @@ export default {
         position: relative;
         top: -7rem;
         left: 16rem;
-        z-index: -1;
+        z-index: 1;
 
         .text {
             margin-left: 4rem;

+ 4 - 1
src/views/cockpit/common/VectorSpace/BoxCommonVector.vue

@@ -357,6 +357,10 @@ export default {
                     obj.endTime = undefined
 
             }
+            if (this.title == '土地收储计划项目') {
+                obj.beginTime = undefined
+                obj.endTime = undefined
+            }
             let data = await QueryList(obj);
             data.data.map((res) => {
                 if (res.geom) {
@@ -364,7 +368,6 @@ export default {
                 }
             });
             this.active_dableData = data.data
-
             this.tableData = data.data
         },
 

+ 0 - 1
src/views/cockpit/gdbh.vue

@@ -681,7 +681,6 @@ export default {
       });
       this.zbpg_hz.jcpg.lrgd = res.data.lrgd == '暂无' ? 0 : res.data.lrgd
       this.zbpg_hz.jcpg.lcgd = res.data.lcgd == '暂无' ? 0 : res.data.lcgd
-      console.log(params, "params");
 
       this.zbpg_hz.jcpg.lc_st = res.data.lc_st == '暂无' ? 0 : res.data.lc_st
       this.zbpg_hz.jcpg.lc_hd = res.data.lc_hd == '暂无' ? 0 : res.data.lc_hd

+ 23 - 6
src/views/cockpit/tdsc.vue

@@ -59,6 +59,7 @@ export default {
           key: "计划收储项目",
           value: 0,
           unit: "个",
+          viewer: true,
 
         }, rb: {
           key: "完成收储项目",
@@ -111,7 +112,7 @@ export default {
           containLabel: true
         },
         legend: {
-          data: ['完成收储', '计划收储'],
+          data: ['收储面积', '收储个数'],
           left: '7%',
           top: '5%',
           textStyle: {
@@ -210,7 +211,7 @@ export default {
           "end": 35
         }],
         series: [{
-          name: '完成收储',
+          name: '收储面积',
           type: 'bar',
           barWidth: '12px',
           itemStyle: {
@@ -227,7 +228,7 @@ export default {
           data: result[0].data
         }
           , {
-          name: "计划收储",
+          name: "收储个数",
           type: "line",
           yAxisIndex: 1, //使用的 y 轴的 index,在单个图表实例中存在多个 y轴的时候有用
           smooth: true, //平滑曲线显示
@@ -286,8 +287,23 @@ export default {
       that.init_tu_gy_echart(xdata, result);
     },
     dra() {
-      console.log(123123);
-
+      store.setViewerFlagb(false);
+      store.setToolBarShow(false);
+      store.setXzqh_flag(false);
+      store.setCockpit_vector({
+        title: "土地收储计划项目",
+        tableData: [],
+        tablejscType: 'jsc_tdsc_zbmx',
+        columns: [
+          "序号",
+          "所属区",
+          "收储方式",
+          "收储项目名称",
+          "收储面积(亩)",
+          "预计收储成本(万元)",
+          "说明",
+        ],
+      });
     },
     change_model(e) {
       this.$forceUpdate();
@@ -316,6 +332,7 @@ export default {
           key: "计划收储项目",
           value: data.data.jh_xzqdm_number,
           unit: "个",
+          viewer: true,
 
         }, rb: {
           key: "完成收储项目",
@@ -343,7 +360,7 @@ export default {
       this.init_scjd();
       // this.init_tdsc_jg();
 
-      this.$refs.tdsc_bar_graph.setOptions(this.legendData, this.xdata, this.result);
+      // this.$refs.tdsc_bar_graph.setOptions(this.legendData, this.xdata, this.result);
 
     })
   },