diff --git a/src/router/index.js b/src/router/index.js index 6a980af..96d708b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -54,13 +54,6 @@ }, ], }, - // 门户页过度 - // { - // path: '/PortalPage', - // name: 'PortalPage', - // component: () => import('@/views/PortalPage'), - // hidden: true, - // }, // 4k城管委分辨率 { path: '/chengguanweiScreen', diff --git a/src/router/index.js b/src/router/index.js index 6a980af..96d708b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -54,13 +54,6 @@ }, ], }, - // 门户页过度 - // { - // path: '/PortalPage', - // name: 'PortalPage', - // component: () => import('@/views/PortalPage'), - // hidden: true, - // }, // 4k城管委分辨率 { path: '/chengguanweiScreen', diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 7f61c29..a74a0c4 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -31,7 +31,7 @@ const rewriteRoutes = filterAsyncRouter(rdata, false, true); this.setSidebarRouters(constantRoutes.concat(sidebarRoutes)); resolve(rewriteRoutes); - // console.log('2222222222222', rewriteRoutes); + console.log('2222222222222', rewriteRoutes); // 登录成功之后才默认加载菜单设置 if (localStorage.getItem('fromDoorXG') == 'chengguanweiScreen') { localStorage.setItem('routerPartXG', rewriteRoutes[1].name); //默认加载第一个菜单 diff --git a/src/router/index.js b/src/router/index.js index 6a980af..96d708b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -54,13 +54,6 @@ }, ], }, - // 门户页过度 - // { - // path: '/PortalPage', - // name: 'PortalPage', - // component: () => import('@/views/PortalPage'), - // hidden: true, - // }, // 4k城管委分辨率 { path: '/chengguanweiScreen', diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 7f61c29..a74a0c4 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -31,7 +31,7 @@ const rewriteRoutes = filterAsyncRouter(rdata, false, true); this.setSidebarRouters(constantRoutes.concat(sidebarRoutes)); resolve(rewriteRoutes); - // console.log('2222222222222', rewriteRoutes); + console.log('2222222222222', rewriteRoutes); // 登录成功之后才默认加载菜单设置 if (localStorage.getItem('fromDoorXG') == 'chengguanweiScreen') { localStorage.setItem('routerPartXG', rewriteRoutes[1].name); //默认加载第一个菜单 diff --git a/src/views/login.vue b/src/views/login.vue index c709514..7b8d80e 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -4,15 +4,15 @@
-
-
+
- +
+
-
-
+
+
{ // 登录成功之后都加载对应路由 - permissionStore.generateRoutes(); router.push({ path: '/chengguanweiScreen' }); localStorage.setItem('routerPartXG', 'Project'); //默认加载排水首页 loginLoading.value = false; @@ -194,24 +193,30 @@ width: 80%; margin-left: 10%; margin-top: 15%; - // .el-form-item:nth-of-type(1) { - // background: url('@/assets/images/login/inputUser.png') no-repeat !important; - // background-size: 100% 100%; - // } - // .el-form-item:nth-of-type(2) { - // background: url('@/assets/images/login/inputPass.png') no-repeat !important; - // background-size: 100% 100%; - // } .input_box { width: 100%; } + .center { + .img { + width: 45px; + height: 45px; + background: url('@/assets/images/login/inputUser2.png') no-repeat; + background-size: 100% 100%; + margin-right: -5px; + } + .pass { + width: 45px; + height: 45px; + background: url('@/assets/images/login/inputPass1.png') no-repeat; + background-size: 100% 100%; + margin-right: -5px; + } + } .el-form-item { - margin-bottom: 30px; position: relative; display: flex; - flex: 1; - .el-input { + flex: 1; width: 100%; height: 40px; border-color: #8d8d8d !important; @@ -268,26 +273,6 @@ cursor: pointer; } } - .center { - .img { - width: 45px; - height: 45px; - background: url('@/assets/images/login/inputUser2.png') no-repeat; - background-size: 100% 100%; - position: relative; - left: 0px; - top: -2px; - } - .pass { - width: 45px; - height: 45px; - background: url('@/assets/images/login/inputPass1.png') no-repeat; - background-size: 100% 100%; - position: relative; - left: 0px; - top: -2px; - } - } } } } diff --git a/src/router/index.js b/src/router/index.js index 6a980af..96d708b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -54,13 +54,6 @@ }, ], }, - // 门户页过度 - // { - // path: '/PortalPage', - // name: 'PortalPage', - // component: () => import('@/views/PortalPage'), - // hidden: true, - // }, // 4k城管委分辨率 { path: '/chengguanweiScreen', diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 7f61c29..a74a0c4 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -31,7 +31,7 @@ const rewriteRoutes = filterAsyncRouter(rdata, false, true); this.setSidebarRouters(constantRoutes.concat(sidebarRoutes)); resolve(rewriteRoutes); - // console.log('2222222222222', rewriteRoutes); + console.log('2222222222222', rewriteRoutes); // 登录成功之后才默认加载菜单设置 if (localStorage.getItem('fromDoorXG') == 'chengguanweiScreen') { localStorage.setItem('routerPartXG', rewriteRoutes[1].name); //默认加载第一个菜单 diff --git a/src/views/login.vue b/src/views/login.vue index c709514..7b8d80e 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -4,15 +4,15 @@
-
-
+
- +
+
-
-
+
+
{ // 登录成功之后都加载对应路由 - permissionStore.generateRoutes(); router.push({ path: '/chengguanweiScreen' }); localStorage.setItem('routerPartXG', 'Project'); //默认加载排水首页 loginLoading.value = false; @@ -194,24 +193,30 @@ width: 80%; margin-left: 10%; margin-top: 15%; - // .el-form-item:nth-of-type(1) { - // background: url('@/assets/images/login/inputUser.png') no-repeat !important; - // background-size: 100% 100%; - // } - // .el-form-item:nth-of-type(2) { - // background: url('@/assets/images/login/inputPass.png') no-repeat !important; - // background-size: 100% 100%; - // } .input_box { width: 100%; } + .center { + .img { + width: 45px; + height: 45px; + background: url('@/assets/images/login/inputUser2.png') no-repeat; + background-size: 100% 100%; + margin-right: -5px; + } + .pass { + width: 45px; + height: 45px; + background: url('@/assets/images/login/inputPass1.png') no-repeat; + background-size: 100% 100%; + margin-right: -5px; + } + } .el-form-item { - margin-bottom: 30px; position: relative; display: flex; - flex: 1; - .el-input { + flex: 1; width: 100%; height: 40px; border-color: #8d8d8d !important; @@ -268,26 +273,6 @@ cursor: pointer; } } - .center { - .img { - width: 45px; - height: 45px; - background: url('@/assets/images/login/inputUser2.png') no-repeat; - background-size: 100% 100%; - position: relative; - left: 0px; - top: -2px; - } - .pass { - width: 45px; - height: 45px; - background: url('@/assets/images/login/inputPass1.png') no-repeat; - background-size: 100% 100%; - position: relative; - left: 0px; - top: -2px; - } - } } } } diff --git a/src/views/sponeScreen/cityGK/cityplanning.vue b/src/views/sponeScreen/cityGK/cityplanning.vue index 4a1905f..76bd845 100644 --- a/src/views/sponeScreen/cityGK/cityplanning.vue +++ b/src/views/sponeScreen/cityGK/cityplanning.vue @@ -199,6 +199,7 @@ text-align: center; line-height: 32px; font-size: 16px; + align-items: center; // background: blue; .middleextA { width: 65%; @@ -283,6 +284,7 @@ .DetailsAquaticEcologyTwo { width: 55%; display: flex; + align-items: center; // background: yellowgreen; line-height: 30px; text-align: center; diff --git a/src/router/index.js b/src/router/index.js index 6a980af..96d708b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -54,13 +54,6 @@ }, ], }, - // 门户页过度 - // { - // path: '/PortalPage', - // name: 'PortalPage', - // component: () => import('@/views/PortalPage'), - // hidden: true, - // }, // 4k城管委分辨率 { path: '/chengguanweiScreen', diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 7f61c29..a74a0c4 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -31,7 +31,7 @@ const rewriteRoutes = filterAsyncRouter(rdata, false, true); this.setSidebarRouters(constantRoutes.concat(sidebarRoutes)); resolve(rewriteRoutes); - // console.log('2222222222222', rewriteRoutes); + console.log('2222222222222', rewriteRoutes); // 登录成功之后才默认加载菜单设置 if (localStorage.getItem('fromDoorXG') == 'chengguanweiScreen') { localStorage.setItem('routerPartXG', rewriteRoutes[1].name); //默认加载第一个菜单 diff --git a/src/views/login.vue b/src/views/login.vue index c709514..7b8d80e 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -4,15 +4,15 @@
-
-
+
- +
+
-
-
+
+
{ // 登录成功之后都加载对应路由 - permissionStore.generateRoutes(); router.push({ path: '/chengguanweiScreen' }); localStorage.setItem('routerPartXG', 'Project'); //默认加载排水首页 loginLoading.value = false; @@ -194,24 +193,30 @@ width: 80%; margin-left: 10%; margin-top: 15%; - // .el-form-item:nth-of-type(1) { - // background: url('@/assets/images/login/inputUser.png') no-repeat !important; - // background-size: 100% 100%; - // } - // .el-form-item:nth-of-type(2) { - // background: url('@/assets/images/login/inputPass.png') no-repeat !important; - // background-size: 100% 100%; - // } .input_box { width: 100%; } + .center { + .img { + width: 45px; + height: 45px; + background: url('@/assets/images/login/inputUser2.png') no-repeat; + background-size: 100% 100%; + margin-right: -5px; + } + .pass { + width: 45px; + height: 45px; + background: url('@/assets/images/login/inputPass1.png') no-repeat; + background-size: 100% 100%; + margin-right: -5px; + } + } .el-form-item { - margin-bottom: 30px; position: relative; display: flex; - flex: 1; - .el-input { + flex: 1; width: 100%; height: 40px; border-color: #8d8d8d !important; @@ -268,26 +273,6 @@ cursor: pointer; } } - .center { - .img { - width: 45px; - height: 45px; - background: url('@/assets/images/login/inputUser2.png') no-repeat; - background-size: 100% 100%; - position: relative; - left: 0px; - top: -2px; - } - .pass { - width: 45px; - height: 45px; - background: url('@/assets/images/login/inputPass1.png') no-repeat; - background-size: 100% 100%; - position: relative; - left: 0px; - top: -2px; - } - } } } } diff --git a/src/views/sponeScreen/cityGK/cityplanning.vue b/src/views/sponeScreen/cityGK/cityplanning.vue index 4a1905f..76bd845 100644 --- a/src/views/sponeScreen/cityGK/cityplanning.vue +++ b/src/views/sponeScreen/cityGK/cityplanning.vue @@ -199,6 +199,7 @@ text-align: center; line-height: 32px; font-size: 16px; + align-items: center; // background: blue; .middleextA { width: 65%; @@ -283,6 +284,7 @@ .DetailsAquaticEcologyTwo { width: 55%; display: flex; + align-items: center; // background: yellowgreen; line-height: 30px; text-align: center; diff --git a/src/views/sponeScreen/waterFlood/equipMonitor.vue b/src/views/sponeScreen/waterFlood/equipMonitor.vue index c6105e2..9dd6c0c 100644 --- a/src/views/sponeScreen/waterFlood/equipMonitor.vue +++ b/src/views/sponeScreen/waterFlood/equipMonitor.vue @@ -160,7 +160,7 @@ } .contPart { background: rgba(9, 145, 222, 0.3); - padding: 15px; + padding: 5px 15px; margin-bottom: 5px; position: relative; p { diff --git a/src/router/index.js b/src/router/index.js index 6a980af..96d708b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -54,13 +54,6 @@ }, ], }, - // 门户页过度 - // { - // path: '/PortalPage', - // name: 'PortalPage', - // component: () => import('@/views/PortalPage'), - // hidden: true, - // }, // 4k城管委分辨率 { path: '/chengguanweiScreen', diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 7f61c29..a74a0c4 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -31,7 +31,7 @@ const rewriteRoutes = filterAsyncRouter(rdata, false, true); this.setSidebarRouters(constantRoutes.concat(sidebarRoutes)); resolve(rewriteRoutes); - // console.log('2222222222222', rewriteRoutes); + console.log('2222222222222', rewriteRoutes); // 登录成功之后才默认加载菜单设置 if (localStorage.getItem('fromDoorXG') == 'chengguanweiScreen') { localStorage.setItem('routerPartXG', rewriteRoutes[1].name); //默认加载第一个菜单 diff --git a/src/views/login.vue b/src/views/login.vue index c709514..7b8d80e 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -4,15 +4,15 @@
-
-
+
- +
+
-
-
+
+
{ // 登录成功之后都加载对应路由 - permissionStore.generateRoutes(); router.push({ path: '/chengguanweiScreen' }); localStorage.setItem('routerPartXG', 'Project'); //默认加载排水首页 loginLoading.value = false; @@ -194,24 +193,30 @@ width: 80%; margin-left: 10%; margin-top: 15%; - // .el-form-item:nth-of-type(1) { - // background: url('@/assets/images/login/inputUser.png') no-repeat !important; - // background-size: 100% 100%; - // } - // .el-form-item:nth-of-type(2) { - // background: url('@/assets/images/login/inputPass.png') no-repeat !important; - // background-size: 100% 100%; - // } .input_box { width: 100%; } + .center { + .img { + width: 45px; + height: 45px; + background: url('@/assets/images/login/inputUser2.png') no-repeat; + background-size: 100% 100%; + margin-right: -5px; + } + .pass { + width: 45px; + height: 45px; + background: url('@/assets/images/login/inputPass1.png') no-repeat; + background-size: 100% 100%; + margin-right: -5px; + } + } .el-form-item { - margin-bottom: 30px; position: relative; display: flex; - flex: 1; - .el-input { + flex: 1; width: 100%; height: 40px; border-color: #8d8d8d !important; @@ -268,26 +273,6 @@ cursor: pointer; } } - .center { - .img { - width: 45px; - height: 45px; - background: url('@/assets/images/login/inputUser2.png') no-repeat; - background-size: 100% 100%; - position: relative; - left: 0px; - top: -2px; - } - .pass { - width: 45px; - height: 45px; - background: url('@/assets/images/login/inputPass1.png') no-repeat; - background-size: 100% 100%; - position: relative; - left: 0px; - top: -2px; - } - } } } } diff --git a/src/views/sponeScreen/cityGK/cityplanning.vue b/src/views/sponeScreen/cityGK/cityplanning.vue index 4a1905f..76bd845 100644 --- a/src/views/sponeScreen/cityGK/cityplanning.vue +++ b/src/views/sponeScreen/cityGK/cityplanning.vue @@ -199,6 +199,7 @@ text-align: center; line-height: 32px; font-size: 16px; + align-items: center; // background: blue; .middleextA { width: 65%; @@ -283,6 +284,7 @@ .DetailsAquaticEcologyTwo { width: 55%; display: flex; + align-items: center; // background: yellowgreen; line-height: 30px; text-align: center; diff --git a/src/views/sponeScreen/waterFlood/equipMonitor.vue b/src/views/sponeScreen/waterFlood/equipMonitor.vue index c6105e2..9dd6c0c 100644 --- a/src/views/sponeScreen/waterFlood/equipMonitor.vue +++ b/src/views/sponeScreen/waterFlood/equipMonitor.vue @@ -160,7 +160,7 @@ } .contPart { background: rgba(9, 145, 222, 0.3); - padding: 15px; + padding: 5px 15px; margin-bottom: 5px; position: relative; p { diff --git a/src/views/sponeScreen/waterFlood/rainCaldar.vue b/src/views/sponeScreen/waterFlood/rainCaldar.vue index 9540472..2b207a1 100644 --- a/src/views/sponeScreen/waterFlood/rainCaldar.vue +++ b/src/views/sponeScreen/waterFlood/rainCaldar.vue @@ -10,6 +10,7 @@ placeholder="请选择日期" class="dateCal" size="small" + style="float: right; width: 130px; margin: 8px 50px 0px 0px" v-if="dateIndex == 'day'" />
@@ -111,11 +112,6 @@ .rainCaldarPage { width: 100%; .partContHM { - .dateCal { - float: right; - width: 130px; - margin: 10px 60px 0px 0px; - } .partD { width: 82px; height: 30px;