diff --git a/src/assets/styles/element-ui copy.scss b/src/assets/styles/element-uitow2.scss similarity index 100% rename from src/assets/styles/element-ui copy.scss rename to src/assets/styles/element-uitow2.scss diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index bab58c1..9db2f26 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -1,3 +1,4 @@ + #app { background-color: #F2F2F2; .main-container { diff --git a/src/layout copy/components/AppMain.vue b/src/layout copy/components/AppMain.vue index a25c562..d23225e 100644 --- a/src/layout copy/components/AppMain.vue +++ b/src/layout copy/components/AppMain.vue @@ -27,6 +27,7 @@ export default { </script> <style lang="scss" scoped> + .app-main { /* 50= navbar 50 */ min-height: calc(100vh - 50px); diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 1dfba58..4082261 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -61,6 +61,9 @@ export default { </script> <style lang="scss" scoped> +@import "~@/assets/styles/element-uitow2.scss"; + + .app-main { border-radius: 5px; height: calc(100vh - 100px); diff --git a/src/views/ZhongdianRen/Xinxiguanli/index.vue b/src/views/ZhongdianRen/Xinxiguanli/index.vue index 583699f..9eb29bb 100644 --- a/src/views/ZhongdianRen/Xinxiguanli/index.vue +++ b/src/views/ZhongdianRen/Xinxiguanli/index.vue @@ -405,7 +405,8 @@ export default { if (type == 0) { // 查看 this.mytitle = "查看人员"; - this.chakanxiangqing(rew); + // this.chakanxiangqing(rew); + this.$router.push("/ZhongdianRen/zhongdianxiangqing") } else if (type == 1) { // 编辑 this.mytitle = "编辑考勤规则"; diff --git a/src/views/index.vue b/src/views/index.vue index d680c17..9c56f80 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -77,6 +77,7 @@ export default { }; </script> <style lang="scss" scoped> + // 门户页面样式 .L-portal { padding: 5px 9px;