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

src/components/Query/clickQuery/clickQuery.vue

@@ -33,7 +33,13 @@
             查询结果{{ index + 1
             }}<i title="定位" class="header-icon el-icon-s-promotion flyBtn2" @click.stop="flyTo(index)"></i>
           </template>
-          <el-table :data="item" :show-header="false" border style="width: 100%">
+          <el-table :data="item" :show-header="false" border style="width: 100%" :header-cell-style="{
+            background: 'rgba(10, 25, 38, 0.6)',
+            color: '#66b1ff',
+            fontSize: '14px',
+            fontFamily: 'Microsoft YaHei',
+            fontWeight: '400',
+          }">
             <el-table-column prop="name" label="字段" width="100">
             </el-table-column>
             <el-table-column prop="value" label="值" width="208">
@@ -127,7 +133,7 @@ export default {
       return store.state.toolBar[9];
     },
     vectorShow: function () {
-      return store.state.cockpit_vector.title ||store.state.cockpit_vector. goitem ? !store.state.viewer_flag : true
+      return store.state.cockpit_vector.title || store.state.cockpit_vector.goitem ? !store.state.viewer_flag : true
     },
   },
   created() { },
@@ -731,8 +737,6 @@ export default {
 };
 </script>
 <style>
-
-
 .sm-function-module-content-btn {
   text-align: center;
   padding-top: 5px;
@@ -800,4 +804,40 @@ export default {
 </style>
 <style lang="scss" scoped>
 @import "clickQuery";
+
+
+/deep/ .el-table tr {
+  background: rgba(10, 25, 38, 0.5) !important;
+}
+
+/deep/ .el-table td.el-table__cell,
+.el-table th.el-table__cell.is-leaf {
+  background: rgba(10, 25, 38, 0.5) !important;
+
+  border-bottom: 1px solid #EBEEF5;
+}
+
+
+.el-table {
+  color: #fff;
+  background: rgba(10, 25, 38, 0.5) !important;
+}
+
+/deep/ .el-table__fixed-right::before,
+.el-table__fixed::before {
+
+  background: rgba(10, 25, 38, 0.9) !important;
+
+}
+
+/deep/ .el-table__fixed-right-patch {
+  background: rgba(10, 25, 38, 0.9) !important;
+
+}
+
+/deep/ .el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background: rgba(10, 25, 38, 0) !important;
+}
 </style>

src/views/cockpit/ydjc.vue

@@ -51,7 +51,7 @@
             <div class="stacontent_ydjc">
                 <div class="item">
                     <span class="dlabel">建设项目数:</span>
-                    <span class="dvalue">1000个</span>
+                    <span class="dvalue">62个</span>
                 </div>
                 <!-- <div class="item">
                     <span class="dlabel"> 项目用地面积:</span>
@@ -59,7 +59,7 @@
                 </div> -->
                 <div class="item">
                     <span class="dlabel"> 农转用面积:</span>
-                    <span class="dvalue">543.89公顷</span>
+                    <span class="dvalue">309.14公顷</span>
                 </div>
             </div>
             <ThreeStackedBarAndLine ref="nzyd_echart" v-show="xzqh_flag" class="qxjc_echart"></ThreeStackedBarAndLine>
@@ -106,8 +106,8 @@ export default {
                 let obj = {
                     legend_data: ['农转用面积', '建设项目数'],
                     x_data: ['崖州区', '天涯区', '吉阳区', '海棠区'],
-                    line_data: [110, 90, 120, 70],
-                    result: [[1, 5, 17, 12, ]]
+                    line_data: [22.87, 49.27, 81.5, 155.50],
+                    result: [[6, 17, 22, 17]]
                 }
 
                 this.$refs.nzyd_echart.setOptions(obj)

src/views/siteselection/components/dkDetails.vue

@@ -127,16 +127,13 @@ export default {
       // console.log(wkt,'wktwkt');
       let obj = {
         wkt: resultString,
-        id: "dd699f839bc04969ae2dc2e1964d0ad1",
+        id: "dd699f839bc04969ae2dc2e1964d0ad2",
       };
       GetTableData(obj).then((res) => {
-        let tempArr = res.data.child;
-
-        tempArr.forEach((item) => {
-          if (item.dataname == "权属") {
-            this.collapseList = item.data;
-          }
-        });
+        let tempArr = res.data;
+        if (tempArr.data) {
+          this.collapseList = tempArr.data;
+        }
         this.loading = false
       });
     },