Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
0a1767ba by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents 8b168ca3 b0a35dad
Inline Side-by-side
Showing 11 changed files with 43 additions and 28 deletions

45.6 KB | W: | H:

73.7 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -110,7 +110,7 @@ ol, ul { list-style:none; } ...@@ -110,7 +110,7 @@ ol, ul { list-style:none; }
110 >.is-top{ 110 >.is-top{
111 position: -webkit-fixed; 111 position: -webkit-fixed;
112 position: fixed; 112 position: fixed;
113 top: 66px; 113 top: 70px;
114 z-index: 999; 114 z-index: 999;
115 width: 100%; 115 width: 100%;
116 margin-bottom: 0; 116 margin-bottom: 0;
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
64 <br/> 64 <br/>
65 样例3：11<span>(1层01室)</span>([层号]) 65 样例3：11<span>(1层01室)</span>([层号])
66 <br/> 66 <br/>
67 样例4：1-101<span>(1单元-01层01室)</span>([单元号][分隔符A][层号]，勾选“层号之前增加分隔符”) 67 样例4：1-011<span>(1单元-01层01室)</span>([单元号][分隔符A][层号]，勾选“层号之前增加分隔符”)
68 <br/> 68 <br/>
69 样例5：1-13-1<span>(1单元13层01室)</span>([单元号][分隔符A][层号][分隔符B]) 69 样例5：1-13-1<span>(1单元13层01室)</span>([单元号][分隔符A][层号][分隔符B])
70 <br/> 70 <br/>
......
...@@ -9,21 +9,26 @@ const errorPage = [ ...@@ -9,21 +9,26 @@ const errorPage = [
9 { path: "*", redirect: "/404", hidden: true }, 9 { path: "*", redirect: "/404", hidden: true },
10 ]; 10 ];
11 11
12 const frameOut = [ 12 /*const frameOut = [
13 { 13 {
14 path: "/", 14 path: "/",
15 name: "login", 15 name: "login",
16 component: login, 16 component: login,
17 }, 17 },
18 ]; 18 ];*/
19 const constantRoutes = [ 19 const constantRoutes = [
20 { 20 {
21 path: "/panel", 21 path: "/",
22 code: "panel",
23 component: () => import("@/views/Home"), 22 component: () => import("@/views/Home"),
24 redirect: "/panel", 23 redirect: "/",
25 children: [ 24 children: [
26 { 25 {
26 path: "/",
27 name: "首页",
28 code: "0-1",
29 component: () => import("@/views/panel/index"),
30 },
31 {
27 path: "/panel", 32 path: "/panel",
28 name: "首页", 33 name: "首页",
29 code: "0-1", 34 code: "0-1",
...@@ -105,4 +110,4 @@ const constantRoutes = [ ...@@ -105,4 +110,4 @@ const constantRoutes = [
105 ]; 110 ];
106 // 在这里面动态引入路由文件 达成权限处理得问题 111 // 在这里面动态引入路由文件 达成权限处理得问题
107 // 重新组织后导出 112 // 重新组织后导出
108 export default [...errorPage, ...frameOut, ...constantRoutes]; 113 export default [...errorPage, ...constantRoutes];
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
9 alt="" 9 alt=""
10 @click="toHome" 10 @click="toHome"
11 /> 11 />
12 <span class="logo-text" v-show="!textLogo">不动产权籍调查系统</span> 12 <img class="logo-word" src="@/assets/images/logo-word.png" alt="">
13 <!-- <span class="logo-text" v-show="!textLogo">不动产权籍调查系统</span> -->
13 </div> 14 </div>
14 15
15 <div class="wrap"> 16 <div class="wrap">
...@@ -271,7 +272,7 @@ export default { ...@@ -271,7 +272,7 @@ export default {
271 }) 272 })
272 } 273 }
273 this.$nextTick(()=>{ 274 this.$nextTick(()=>{
274 this.treeHeight = this.$el.clientHeight - 132; 275 this.treeHeight = this.$el.clientHeight - 136;
275 }); 276 });
276 }, 277 },
277 methods: { 278 methods: {
...@@ -470,10 +471,10 @@ export default { ...@@ -470,10 +471,10 @@ export default {
470 .el-header { 471 .el-header {
471 background-color: #fff; 472 background-color: #fff;
472 padding: 0 !important; 473 padding: 0 !important;
473 height: 66px!important; 474 height: 70px!important;
474 position: relative; 475 position: relative;
475 .header-top { 476 .header-top {
476 height: 66px; 477 height: 70px;
477 // border-bottom: 1px solid#EAEAEA; 478 // border-bottom: 1px solid#EAEAEA;
478 box-sizing: border-box; 479 box-sizing: border-box;
479 // background-image: url('../assets/images/banner.png'); 480 // background-image: url('../assets/images/banner.png');
...@@ -485,10 +486,10 @@ export default { ...@@ -485,10 +486,10 @@ export default {
485 // align-items: center; 486 // align-items: center;
486 .top-items { 487 .top-items {
487 cursor: pointer; 488 cursor: pointer;
488 height: 66px; 489 height: 70px;
489 padding: 0 30px; 490 padding: 0 30px;
490 font-size: 18px; 491 font-size: 18px;
491 line-height: 66px; 492 line-height: 70px;
492 float: left; 493 float: left;
493 position: relative; 494 position: relative;
494 color: #ffffff; 495 color: #ffffff;
...@@ -546,25 +547,31 @@ export default { ...@@ -546,25 +547,31 @@ export default {
546 z-index: 1000; 547 z-index: 1000;
547 .logo-box { 548 .logo-box {
548 width: 100%; 549 width: 100%;
549 height: 66px; 550 height: 70px;
550 border-bottom: 1px solid rgba(255, 255, 255, 0.2); 551 border-bottom: 1px solid rgba(255, 255, 255, 0.2);
551 box-sizing: border-box; 552 box-sizing: border-box;
552 padding: 10px 20px; 553 padding: 10px 18px;
553 transition: width 0.3s; 554 transition: width 0.3s;
554 background-color: #006CFF; 555 background-color: #006CFF;
555 .logo-img { 556 .logo-img {
556 width: 44px; 557 width: 30px;
558 padding-top: 10px;
557 float: left; 559 float: left;
558 } 560 }
559 .logo-text { 561 .logo-word{
560 padding-left: 10px; 562 padding-left: 8px;
561 color: #ffffff; 563 padding-top: 15px;
562 line-height: 44px; 564 height: 20px;
563 font-size: 20px;
564 } 565 }
566 // .logo-text {
567 // padding-left: 10px;
568 // color: #ffffff;
569 // line-height: 44px;
570 // font-size: 20px;
571 // }
565 } 572 }
566 .wrap{ 573 .wrap{
567 height: calc(100% - 66px); 574 height: calc(100% - 70px);
568 overflow-x: hidden; 575 overflow-x: hidden;
569 .search-box{ 576 .search-box{
570 height: 65px; 577 height: 65px;
...@@ -589,6 +596,9 @@ export default { ...@@ -589,6 +596,9 @@ export default {
589 } 596 }
590 .logo-box-show { 597 .logo-box-show {
591 width: 64px; 598 width: 64px;
599 .logo-word{
600 width: 0;
601 }
592 } 602 }
593 .el-menu { 603 .el-menu {
594 border-right: 0; 604 border-right: 0;
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
64 ></i> 64 ></i>
65 <span class="remake_txt" @click="selectRemeber">记住账号密码</span> 65 <span class="remake_txt" @click="selectRemeber">记住账号密码</span>
66 </div> 66 </div>
67 <div class="login-btn" @click="goHome">登录</div> 67 <div id="loginBtn" class="login-btn" @click="goHome">登录</div>
68 </div> 68 </div>
69 <div class="reserved-con"> 69 <div class="reserved-con">
70 <div class="reserved-words">版权所有：2020©某某市自然资源和规划</div> 70 <div class="reserved-words">版权所有：2020©某某市自然资源和规划</div>
......
...@@ -912,7 +912,7 @@ ...@@ -912,7 +912,7 @@
912 /deep/ .el-tabs__header { 912 /deep/ .el-tabs__header {
913 position: -webkit-fixed; 913 position: -webkit-fixed;
914 position: fixed; 914 position: fixed;
915 top: 114px; 915 top: 117px;
916 z-index: 999; 916 z-index: 999;
917 width: 100%; 917 width: 100%;
918 margin-bottom: 0; 918 margin-bottom: 0;
......
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
80 /deep/ .el-tabs__header { 80 /deep/ .el-tabs__header {
81 position: -webkit-fixed; 81 position: -webkit-fixed;
82 position: fixed; 82 position: fixed;
83 top: 114px; 83 top: 117px;
84 z-index: 999; 84 z-index: 999;
85 width: 100%; 85 width: 100%;
86 margin-bottom: 0; 86 margin-bottom: 0;
......
...@@ -584,7 +584,7 @@ ...@@ -584,7 +584,7 @@
584 /deep/ .el-tabs__header { 584 /deep/ .el-tabs__header {
585 position: -webkit-fixed; 585 position: -webkit-fixed;
586 position: fixed; 586 position: fixed;
587 top: 114px; 587 top: 117px;
588 z-index: 999; 588 z-index: 999;
589 width: 100%; 589 width: 100%;
590 margin-bottom: 0; 590 margin-bottom: 0;
......
...@@ -251,7 +251,7 @@ export default { ...@@ -251,7 +251,7 @@ export default {
251 .main { 251 .main {
252 display: flex; 252 display: flex;
253 flex-direction: column; 253 flex-direction: column;
254 overflow: scroll; 254 // overflow: scroll;
255 height: 100%; 255 height: 100%;
256 .clearfix { 256 .clearfix {
257 span { 257 span {
......