Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

@@ -52,6 +52,16 @@ class business {
       data
     })
   }
+  // 海域（含无居民海岛）使用权
+  async getQlfQlHysyqByConditon (data) {
+    return request({
+      url: SERVER.SERVERAPI +'/rest/reg/QlfQlHysyq/getDataPage',
+      method: 'post',
+      data
+    })
+  }
+
+
 
 
   // 抵押权登记
@@ -70,14 +80,6 @@ class business {
       data
     })
   }
-  // 海域（含无居民海岛）使用权
-  async getQlfQlHysyqByConditon (data) {
-    return request({
-      url: SERVER.SERVERAPI +'/rest/reg/QlfQlHysyq/getDataPage',
-      method: 'post',
-      data
-    })
-  }
   // 构（建）筑物所有权
   async getQltQlGjzwsyqByCondition (data) {
     return request({

@@ -109,8 +109,8 @@ export default {
           visualMap: {
             min: 0,
             max: _this.max,
-            bottom: '5%',
-            right: 30,
+            bottom: '20%',
+            left: 50,
             splitNumber: 6,
             seriesIndex: [0],
             itemWidth: 20, // 每个图元的宽度

 <template>
-  <el-menu router :default-active="activeMenu" mode="horizontal">
+  <el-menu router :default-active="activeMenu" menu-trigger="click" mode="horizontal">
     <!-- 权限菜单 -->
     <sidebar-item v-for="route in permission_routes.slice(1, 4)" :key="route.path" :item="route"
       :base-path="route.path" />

@@ -245,4 +245,41 @@ table td {
     position: relative;
     top: 2px;
   }
+}
+
+
+// element 下拉框样式
+.el-menu--popup,
+.el-select-dropdown {
+  background-color: #031A46 !important;
+  padding: 10px;
+  border: none;
+}
+
+.el-popper[x-placement^="bottom"] .popper__arrow::after {
+  border-bottom-color: #074487 !important;
+}
+
+.el-popper[x-placement^="bottom"] .popper__arrow {
+  border-bottom-color: #074487 !important;
+}
+
+
+
+.el-menu--horizontal .el-menu .el-menu-item,
+.el-select-dropdown__item,
+.el-menu--horizontal .el-menu .el-submenu__title {
+  background: #074487 !important;
+  margin: 5px 0;
+  border: 1px solid #074487;
+  color: #02D9FD !important;
+}
+
+.el-menu--horizontal .el-menu--popup .el-menu-item:not(.is-disabled):hover,
+.el-select-dropdown__item:hover,
+.el-menu--horizontal .el-menu--popup .el-menu-item:not(.is-disabled):focus {
+  background: #074487;
+  border: 1px solid #02D9FD;
+  color: #FFFFFF !important;
+  font-weight: 700;
 }
\ No newline at end of file

@@ -22,15 +22,15 @@ class data extends filter {
       // },
       {
         label: "建（构）筑物名称",
-        prop: "JGZWMC"
+        prop: "jgzwmc"
       },
       {
         label: "不动产单元号",
-        prop: "BDCDYH"
+        prop: "bdcdyh"
       },
       {
         label: "不动产权证号",
-        prop: "BDCQZH"
+        prop: "bdcqzh"
       },
       {
         label: "登记时间",
@@ -39,7 +39,7 @@ class data extends filter {
       },
       {
         label: "登记机构",
-        prop: "DJJG"
+        prop: "djjg"
       }
     ]
   }

@@ -33,11 +33,11 @@ class data extends filter {
       // },
       {
         label: "不动产单元号",
-        prop: "BDCDYH"
+        prop: "bdcdyh"
       },
       {
         label: "不动产权证号",
-        prop: "BDCQZH"
+        prop: "bdcqzh"
       },
       {
         label: "登记时间",

- <template>
+<template>
   <div class="centercard">
     <div class="card1">
-      <div class="title">陕西省不动产接入信息</div>
+      <div class="title">汉中市不动产接入信息</div>
       <maps class="map" />
     </div>
     <div class="card2 mt-10">
@@ -39,7 +39,7 @@ export default {
     background: url("~@/image/mapcenter.png") no-repeat;
     background-size: 100% 100%;
     position: relative;
-    height: 485px;
+    height: 455px;
 
     .title {
       position: absolute;
@@ -50,7 +50,7 @@ export default {
       position: absolute;
       left: 0;
       right: 0;
-      top: 9px;
+      top: 7px;
       text-align: right;
       padding-right: 15%;
     }
@@ -74,7 +74,7 @@ export default {
       position: absolute;
       left: 0;
       right: 0;
-      top: 3px;
+      top: 7px;
       text-align: center;
       margin-bottom: 10px;
     }

@@ -7,7 +7,7 @@
           <div class="rjjrlList">
             <p v-for="(item, index) in rjjrlList" class="d-center qxjr" :key="index">{{ item }}</p>
           </div>
-          <li>日均接入量</li>
+          <li>总量</li>
         </ul>
         <div class="cardcontent-right d-center">
           <p>
@@ -28,7 +28,7 @@
           <div class="rjjrlList">
             <p v-for="(item, index) in rjjrlList" class="d-center sthj" :key="index">{{ item }}</p>
           </div>
-          <li>日均接入量</li>
+          <li>总量</li>
         </ul>
         <div class="cardcontent-right d-center">
           <p>