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

@@ -4,7 +4,7 @@ import SERVER from './config'
 // 登簿日志分页
 export function getRecordLogPage (data) {
   return request({
-    url: SERVER.SERVERAPI + '/sjsb/RecordLog/getRecordLogPage',
+    url: SERVER.SERVERAPI + '/rest/sjsb/RecordLog/getRecordLogPage',
     method: 'post',
     data
   })

@@ -74,7 +74,7 @@ export default {
     },
     heightNum: {
       type: Number,
-      default: 260,
+      default: 267,
     },
     maxHeight: {
       type: Number,

-<svg t="1665567795982" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2615" width="200" height="200"><path d="M512 74.666667C270.933333 74.666667 74.666667 270.933333 74.666667 512S270.933333 949.333333 512 949.333333 949.333333 753.066667 949.333333 512 753.066667 74.666667 512 74.666667z m0 810.666666c-204.8 0-373.333333-168.533333-373.333333-373.333333S307.2 138.666667 512 138.666667 885.333333 307.2 885.333333 512 716.8 885.333333 512 885.333333z" p-id="2616"></path><path d="M657.066667 360.533333c-12.8-12.8-32-12.8-44.8 0l-102.4 102.4-102.4-102.4c-12.8-12.8-32-12.8-44.8 0-12.8 12.8-12.8 32 0 44.8l102.4 102.4-102.4 102.4c-12.8 12.8-12.8 32 0 44.8 6.4 6.4 14.933333 8.533333 23.466666 8.533334s17.066667-2.133333 23.466667-8.533334l102.4-102.4 102.4 102.4c6.4 6.4 14.933333 8.533333 23.466667 8.533334s17.066667-2.133333 23.466666-8.533334c12.8-12.8 12.8-32 0-44.8l-106.666666-100.266666 102.4-102.4c12.8-12.8 12.8-34.133333 0-46.933334z" p-id="2617"></path></svg>
\ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1673321301365" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3462" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M910.617673 211.45497c-29.726022-40.739866-65.373916-76.582189-105.953124-106.533338-31.447223-23.211654-65.346287-42.500976-101.132328-57.574277-17.797341-7.496741-38.217417 1.723248-44.400233 20.018939l0 0c-5.586229 16.531512 2.569522 34.533514 18.648732 41.309848 30.91408 13.027711 60.204174 29.700439 87.38421 49.761334 35.128055 25.927509 65.986877 56.9562 91.719958 92.223425 53.42477 73.218582 81.662905 159.989831 81.662905 250.935146 0 57.551764-11.264555 113.364931-33.480532 165.888168-21.464871 50.748824-52.199872 96.333022-91.352591 135.484717-39.152718 39.153742-84.736916 69.888743-135.484717 91.352591-52.523237 22.215978-108.336404 33.480532-165.888168 33.480532-57.552787 0-113.364931-11.264555-165.889191-33.480532-50.748824-21.464871-96.331999-52.199872-135.484717-91.352591-39.152718-39.152718-69.888743-84.736916-91.353614-135.484717-22.214954-52.523237-33.479509-108.336404-33.479509-165.888168 0-90.842984 28.180829-177.536462 81.495082-250.706949 25.681916-35.244712 56.481386-66.265216 91.545996-92.199888 27.118638-20.056801 56.344263-36.737716 87.192851-49.78794 16.072047-6.798846 24.204262-24.812105 18.594497-41.336454l0 0c-6.207375-18.285458-26.638707-27.478841-44.424792-19.958564-35.712363 15.098883-69.537749 34.399461-100.915387 57.607022-40.505529 29.958312-76.084862 65.791425-105.750509 106.506732C52.210106 296.342312 19.618826 396.581294 19.618826 501.596046c0 66.5016 13.031804 131.033335 38.734186 191.800327 24.818245 58.677401 60.340273 111.367437 105.58064 156.606781 45.240367 45.240367 97.930403 80.763418 156.607804 105.581664 60.766992 25.701358 125.297704 38.734186 191.800327 38.734186 66.502623 0 131.033335-13.031804 191.800327-38.734186 58.677401-24.818245 111.366414-60.341297 156.606781-105.581664 45.240367-45.239344 80.762395-97.92938 105.581664-156.606781 25.701358-60.766992 38.734186-125.297704 38.734186-191.800327C1005.062695 396.463614 972.403878 296.133557 910.617673 211.45497z" fill="#ffffff" p-id="3463"></path><path d="M509.270842 388.009058 509.270842 388.009058c20.261463 0 36.839023-16.57756 36.839023-36.839023L546.109866 75.454506c0-20.261463-16.57756-36.839023-36.839023-36.839023l0 0c-20.261463 0-36.839023 16.57756-36.839023 36.839023l0 275.715529C472.431819 371.431497 489.00938 388.009058 509.270842 388.009058z" fill="#ffffff" p-id="3464"></path></svg>
\ No newline at end of file

-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1668560086395" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2762" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M448 282.4v459.2L301.6 594.4 282.4 576H192V448h90.4l18.4-18.4L448 282.4M512 128L256 384H128v256h128l256 256V128z m64 5.6v64.8c145.6 29.6 256 159.2 256 313.6s-110.4 284-256 313.6v64.8c181.6-30.4 320-188 320-378.4S757.6 164 576 133.6z m0 188.8v65.6c55.2 14.4 96 64 96 124s-40.8 109.6-96 124v65.6C666.4 686.4 736 607.2 736 512s-69.6-174.4-160-189.6z" fill="#ffffff" p-id="2763"></path></svg>
\ No newline at end of file

 <template>
   <div class="navbar-con">
     <div class="navbar">
+      <div class="title">{{ title }}</div>
+      <div class="user">欢迎进入系统 {{ name }} <svg-icon icon-class='close' class="closeStyle" @click="onCancel" />退出系统</div>
       <div class="sidebarLeft">
         <sidebarLeft />
       </div>
       <div class="sidebarRight d-center">
         <sidebarRight />
-        <div class="right-menu">
-          <div class="dataView pointer" @click="handleDataView">大屏展示</div>
-          <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover" @command="handleCommand">
-            <div class="avatar-wrapper">
-              <span style="padding-right:10px">{{ name }}</span>
-              <img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar" />
-            </div>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="a">个人中心</el-dropdown-item>
-              <el-dropdown-item command="b">退出</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </div>
       </div>
     </div>
   </div>
@@ -42,16 +31,8 @@ export default {
     }
   },
   methods: {
-    handleDataView () {
-      const { href } = this.$router.resolve('/dataView');
-      window.open(href, '_blank');
-    },
-    themeChange (val) {
-      this.$store.dispatch('app/updateTheme', val)
-    },
-    handleCommand (command) {
-      if (command == 'a') {
-      }
+    onCancel () {
+
     }
   }
 }
@@ -63,10 +44,11 @@ export default {
 }
 
 .menubg {
-  line-height: 30px;
+  height: 34px;
   color: #FFFFFF;
-  margin-right: 5px;
-  background: linear-gradient(180deg, #0A2580 0%, #2542C9 100%);
+  margin-right: 20px;
+  background: url('~@/image/navbar.png') no-repeat;
+  background-size: 100% 100%;
 }
 
 /deep/.el-menu-item {
@@ -78,19 +60,31 @@ export default {
 }
 
 /deep/.el-submenu__title {
-  line-height: 30px !important;
-  height: 42px !important;
+  height: 34px;
+  color: #FFFFFF;
 }
 
 /deep/.el-submenu__title span {
   font-size: 14px;
 }
 
+.sidebarLeft {
+  position: relative;
+  top: 13px;
+  left: 10px;
+}
+
+.sidebarRight {
+  position: relative;
+  left: 10px;
+  top: 13px;
+}
+
 // 导航选中背景色
 .xuanzhong {
-  background: linear-gradient(180deg, #73551D 0%, #C09C43 100%);
-  font-weight: 700;
-  color: #FFFFFF !important;
+  background: url('~@/image/selNavbar.png') no-repeat;
+  background-size: 100% 100%;
+  color: #09C39A !important;
 }
 
 /deep/.el-menu-item:hover {
@@ -114,11 +108,39 @@ export default {
   height: $headerHeight;
   overflow: hidden;
   position: relative;
-  background: linear-gradient(180deg, #0D3DC9 0%, #3476E1 100%);
   display: flex;
   align-items: center;
   padding: 0 20px;
   justify-content: space-between;
+  background: url('~@/image/header.png') no-repeat;
+  background-size: 100% 100%;
+
+  .user {
+    font-size: 12px;
+    color: #FFFFFF;
+    position: absolute;
+    right: 20px;
+    top: -1px;
+    cursor: pointer;
+
+    .closeStyle {
+      margin-right: 5px;
+    }
+  }
+
+  .title {
+    position: absolute;
+    left: 0;
+    top: 10px;
+    bottom: 0;
+    right: 0;
+    margin: 0 auto;
+    font-size: 32px;
+    color: #FFFFFF;
+    font-weight: 700;
+    text-align: center;
+
+  }
 
   .right-menu {
     float: right;

 <template>
   <el-menu router :default-active="activeMenu" mode="horizontal">
     <!-- 权限菜单 -->
-    <sidebar-item v-for="route in permission_routes.slice(5, 7)" :key="route.path" :item="route"
+    <sidebar-item v-for="route in permission_routes.slice(5, 8)" :key="route.path" :item="route"
       :base-path="route.path" />
     <!-- 菜单全部展示 -->
     <!-- <sidebar-item v-for="route in asyncRoutes" :key="route.path" :item="route" :base-path="route.path" /> -->

@@ -36,7 +36,10 @@ export default {
   position: relative;
   height: 100%;
   width: 100%;
-
+  background: url('~@/image/bg.png') no-repeat;
+  background-size: 100% 100%;
+  padding: 12px;
+  box-sizing: border-box;
 
   &.mobile.openSidebar {
     position: fixed;
@@ -44,14 +47,9 @@ export default {
   }
 }
 
-.appMain {
-  height: calc(100vh - 65px);
-  background-color: $containerbg;
-
-  .app-main {
-    height: 100%;
-    padding: 10px;
-    box-sizing: border-box;
-  }
+.app-main {
+  height: calc(100vh -94px);
+  padding: 10px;
+  box-sizing: border-box;
 }
 </style>

@@ -36,7 +36,7 @@ export const constantRoutes = [
         path: 'jgHome',
         component: () => import('@/views/home/index'),
         name: 'jgHome',
-        meta: { title: '首页', icon: 'workbench', affix: true }
+        meta: { title: '工作台', icon: 'workbench', affix: true }
       }
     ]
   }
@@ -74,29 +74,22 @@ export const asyncRoutes = [
       }
     ]
   },
-  // 上报报文查询
+  // 省厅汇交
   {
-    path: '/sbbwcx',
+    path: '/sthj',
     component: Layout,
     children: [
       {
-        path: 'index',
+        path: 'sbbwcx',
         component: () => import('@/views/sbbwcx/index'),
         name: 'sbbwcx',
-        meta: { title: '上报报文查询', icon: 'zsgl' }
-      }
-    ]
-  },
-  // 登簿日志
-  {
-    path: '/dbrzcx',
-    component: Layout,
-    children: [
+        meta: { title: '上报报文', icon: 'zsgl' }
+      },
       {
-        path: 'index',
+        path: 'dbrzcx',
         component: () => import('@/views/dbrzcx/index'),
         name: 'dbrzcx',
-        meta: { title: '登簿日志查询', icon: 'zhcx' }
+        meta: { title: '登簿日志', icon: 'zsgl' }
       }
     ]
   },

 module.exports = {
-  title: '监管平台',
+  title: '汉中市不动产综合监管',
   /**
    * @type {boolean} true | false
    * @description Whether show the settings right-panel

@@ -9,7 +9,7 @@ $yellow:#FEC171;
 $panGreen: #30B08F;
 
 // header
-$headerHeight: 64px;
+$headerHeight: 74px;
 
 // sidebar
 $menuText:#ffffff;

@@ -35,7 +35,8 @@
     </div>
     <!-- 列表区域 -->
     <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" :heightNum="210" :current-page.sync="pageData.current"
+      <!-- table组件 -->
+      <lb-table :page-size="pageData.size" :heightNum="225" :current-page.sync="pageData.current"
         :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
         :column="tableData.columns" :data="tableData.data">
       </lb-table>

 .home {
-  height: 100%;
+  height: calc(100% - 20px);
   width: 100%;
   box-sizing: border-box;
   display: flex;
   justify-content: space-between;
-  padding-top: 15px;
-
+  margin-top: 15px;
   .map {
     margin-left: -20px;
   }

@@ -133,6 +133,6 @@ export default {
 .map-box {
   display: inline-block;
   width: 100%;
-  height: calc(100vh - 133px);
+  height: calc(100vh - 153px);
 }
 </style>

 .jgHome {
   display: flex;
   justify-content: space-between;
-  height: 100%;
+  height: calc(100% - 20px);
 
   .bottom10 {
     margin-bottom: 10px;
@@ -52,7 +52,7 @@
   .barChart {
     flex: 1;
     margin-top: 10px;
-    height: calc(100vh - 310px);
+    height: calc(100vh - 330px);
   }
 
   &-center {