zpf 11 kuukautta sitten
vanhempi
commit
4b4e3f20ef

+ 6 - 0
src/store/store.js

@@ -45,6 +45,10 @@ var store2 = {
         query_pick_pane: [],
         query_pick_last_pane: null,
         query_vector_input:false,
+        cockpit_vector:{
+            title:"",
+            tableData:"",
+        },
         cockpit_wpjg: {
             title: {},
             echart: {}
@@ -264,6 +268,8 @@ var store2 = {
 
     setXzqh_flag(newValue) {
         this.state.xzqh_flag = newValue;
+    },setCockpit_vector(newValue) {
+        this.state.cockpit_vector = newValue;
     },
 }
 

+ 6 - 9
src/views/cockpit/common/DialWatch.vue

@@ -30,8 +30,9 @@
                 <span>{{ dial_watch_info.rb.value }}</span>{{ dial_watch_info.rb.unit }}
                 <!-- <i style="pointer-events:all" :class="[`${dial_watch_info.rb.viewer}` ,viewer_switch]"></i> -->
 
-                <i v-show="dial_watch_info.rb.viewer" style="pointer-events:all"
-                    :class="{ 'el-icon-view-switch': icon_switch, 'el-icon-view': true }"></i>
+                <i v-show="dial_watch_info.rb.viewer" style="pointer-events:all" :class="{ 'el-icon-view': true }"></i>
+                <!-- <i v-show="dial_watch_info.rb.viewer" style="pointer-events:all"
+                    :class="{ 'el-icon-view-switch': icon_switch, 'el-icon-view': true }"></i> -->
             </div>
         </div>
     </div>
@@ -85,15 +86,11 @@ export default {
     methods: {
         draw_vector() {
             this.icon_switch = !this.icon_switch
-            console.log('this.icon_switch: ', this.icon_switch);
             this.$emit('draw_vector', this.icon_switch)
 
-            if (this.icon_switch) {
-                store.setViewerFlagb(false);
-                store.setToolBarShow(false);
-                store.setXzqh_flag(false);
-            }
-
+            store.setViewerFlagb(false);
+            store.setToolBarShow(false);
+            store.setXzqh_flag(false);
         },
         init_dial_watch(echart_data) {
             var myChart = echarts.init(this.$refs.dial_watch_scjg);

+ 31 - 41
src/views/cockpit/common/VectorSpace/BoxCommonVector.vue

@@ -1,31 +1,18 @@
 <template>
-    <!-- <div class="BoxCommonVector">
-        <div class="innerContainerVector leftPaneVector">
-            <h2 class="PangetitleVector">
-                <span class="pange_textVector">智选址111</span>
-                <i class="el-icon-close" @click="close"></i>
-            </h2>
-
-            <el-autocomplete class="search" @input="change_witch" v-model="state" :fetch-suggestions="querySearchAsync"
-                placeholder="请输入内容" @select="handleSelect" popper-class="select-option"
-                :popper-append-to-body="false"></el-autocomplete>
-        </div>
-    </div> -->
-
     <div class="BoxCommonVector">
         <div class="innerContainerVector leftPaneVector">
 
             <h2 class="PangetitleVector">
-                <span class="pange_textVector">智选址</span>
-                <i class="el-icon-close" @click="close"></i>
+                <span class="pange_textVector">{{ store.state.cockpit_vector.title }}</span>
             </h2>
+            <i class="el-icon-close" @click="close"></i>
 
             <el-autocomplete class="search" @input="change_witch" style="z-index: 1111;" v-model="state"
                 :fetch-suggestions="querySearchAsync" placeholder="请输入内容" @select="handleSelect"
                 :popper-append-to-body="false"></el-autocomplete>
 
 
-            <el-table :data="tableData" style="width: 100%" height="440" :header-cell-style="{
+            <el-table :data="store.state.cockpit_vector.tableData" style="width: 100%" height="440" :header-cell-style="{
                 background: 'rgba(10, 25, 38, 0.6)',
                 color: '#fff',
                 fontSize: '14px',
@@ -33,23 +20,18 @@
                 fontWeight: '400',
             }">
 
-                <el-table-column prop="date" label="日期" width="150">
-                </el-table-column>
-                <el-table-column prop="name" label="姓名" width="120">
-                </el-table-column>
-                <el-table-column prop="province" label="省份" width="120">
-                </el-table-column>
-                <el-table-column prop="city" label="市区" width="120">
+                <el-table-column prop="项目名称" label="项目名称" width="150">
                 </el-table-column>
-                <el-table-column prop="address" label="地址" width="300">
+                <el-table-column prop="土地用途" label="土地用途" width="120">
                 </el-table-column>
-                <el-table-column prop="zip" label="邮编" width="120">
+                <el-table-column prop="出让面积(公顷)" label="出让面积(公顷)" width="120">
                 </el-table-column>
+               
 
                 <el-table-column fixed="right" label="操作" width="100">
                     <template slot-scope="scope">
                         <el-button @click="handleClick(scope.row)" type="text" size="small">查看</el-button>
-                        <el-button type="text" size="small">编辑</el-button>
+                        <el-button @click="handleClick(scope.row)" type="text" size="small">定位</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -116,7 +98,7 @@ export default {
                 city: '普陀区',
                 address: '上海市普陀区金沙江路 1518 弄',
                 zip: 200333
-            },{
+            }, {
                 date: '2016-05-03',
                 name: '王小虎',
                 province: '上海',
@@ -130,7 +112,7 @@ export default {
                 city: '普陀区',
                 address: '上海市普陀区金沙江路 1518 弄',
                 zip: 200333
-            },{
+            }, {
                 date: '2016-05-03',
                 name: '王小虎',
                 province: '上海',
@@ -215,6 +197,10 @@ export default {
         },
         handleSelect(item) {
             console.log(item);
+        },
+        handleClick(e) {
+            console.log(e);
+
         }
     },
     mounted() {
@@ -266,6 +252,19 @@ export default {
 .leftPaneVector {
     left: 20px;
 
+    .el-icon-close {
+        width: 22px;
+        height: 22px;
+        color: #fff !important;
+        background-color: #335f87;
+        line-height: 23px;
+        padding: 0 5px;
+        border-radius: 4px;
+        top: -4.4rem !important;
+        position: relative;
+        right: -19.5rem;
+    }
+
     .PangetitleVector {
         box-sizing: border-box;
         width: 100%;
@@ -279,18 +278,7 @@ export default {
         position: relative;
         overflow: hidden;
 
-        .el-icon-close {
-            width: 22px;
-            height: 22px;
-            color: #fff !important;
-            background-color: #335f87;
-            line-height: 23px;
-            padding: 0 5px;
-            border-radius: 4px;
-            top: 5px !important;
-            position: relative;
-            right: -14.5rem;
-        }
+
     }
 
     .pange_textVector {
@@ -396,7 +384,9 @@ export default {
 
 }
 
-/deep/ .el-table--border::after, .el-table--group::after, .el-table::before {
+/deep/ .el-table--border::after,
+.el-table--group::after,
+.el-table::before {
     background: rgba(10, 25, 38, 0) !important;
 }
 </style>

+ 11 - 1
src/views/cockpit/tdsy.vue

@@ -878,7 +878,17 @@ export default {
       })
     },
     switch_vector_tdgy_gy_jd(flag) {
-      store.state.query_vector_input = !store.state.query_vector_input
+
+      // store.state.query_vector_input = !store.state.query_vector_input
+      if (flag) {
+        store.setCockpit_vector({
+          title: "土地供应完成项目",
+          tableData: this.vector_data,
+        })
+        console.log(this.vector_data, "this.vector_data");
+
+      }
+
     },
     async init_vector(params) {
       const that = this;