Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
b50c70f3 by xiaomiao
Options

--no commit message

2 parents ee61002c 3d975d11
Inline Side-by-side
Showing 33 changed files with 123 additions and 148 deletions
...@@ -133,6 +133,11 @@ ...@@ -133,6 +133,11 @@
133 /deep/.closeStyle { 133 /deep/.closeStyle {
134 top: 7px !important; 134 top: 7px !important;
135 } 135 }
136 .ls-title {
137 padding: 10px;
138 color: #ffffff;
139 font-size: 16px;
140 }
136 141
137 .ls-title { 142 .ls-title {
138 padding: 10px; 143 padding: 10px;
......
1 <?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="1660118828860" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2768" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); } 1 <?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="1660118828860" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2768" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
2 </style></defs><path d="M889.898667 98.730667c16.170667 0 29.269333 13.098667 29.269333 29.269333v719.232a114.602667 114.602667 0 0 1-114.602667 114.602667H128a71.936 71.936 0 0 1-71.936-71.936V213.333333A114.602667 114.602667 0 0 1 170.666667 98.730667z m-29.269334 58.496H170.666667c-30.976 0-56.064 25.173333-56.064 56.106666v676.565334c0 7.424 5.973333 13.397333 13.397333 13.397333h676.565333c30.976 0 56.064-25.088 56.064-56.064V157.226667zM597.333333 457.173333a146.304 146.304 0 0 1 134.826667 203.093334l68.693333 68.778666a29.269333 29.269333 0 0 1-37.717333 44.458667l-3.626667-3.114667-61.184-61.141333A146.304 146.304 0 1 1 597.333333 457.130667z m-219.434666 244.992a29.269333 29.269333 0 0 1 4.309333 58.197334l-4.266667 0.341333h-146.346666a29.269333 29.269333 0 0 1-4.266667-58.197333l4.266667-0.341334h146.346666zM597.333333 515.669333a87.765333 87.765333 0 1 0 0 175.530667 87.765333 87.765333 0 0 0 0-175.530667z m-219.434666 3.626667a29.269333 29.269333 0 0 1 4.309333 58.197333l-4.266667 0.341334h-146.346666a29.269333 29.269333 0 0 1-4.266667-58.197334l4.266667-0.341333h146.346666zM743.68 299.946667a29.269333 29.269333 0 0 1 4.266667 58.197333l-4.266667 0.298667h-512a29.269333 29.269333 0 0 1-4.352-58.197334l4.352-0.298666h512z" fill="#ffffff" p-id="2769"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
2 </style></defs><path d="M889.898667 98.730667c16.170667 0 29.269333 13.098667 29.269333 29.269333v719.232a114.602667 114.602667 0 0 1-114.602667 114.602667H128a71.936 71.936 0 0 1-71.936-71.936V213.333333A114.602667 114.602667 0 0 1 170.666667 98.730667z m-29.269334 58.496H170.666667c-30.976 0-56.064 25.173333-56.064 56.106666v676.565334c0 7.424 5.973333 13.397333 13.397333 13.397333h676.565333c30.976 0 56.064-25.088 56.064-56.064V157.226667zM597.333333 457.173333a146.304 146.304 0 0 1 134.826667 203.093334l68.693333 68.778666a29.269333 29.269333 0 0 1-37.717333 44.458667l-3.626667-3.114667-61.184-61.141333A146.304 146.304 0 1 1 597.333333 457.130667z m-219.434666 244.992a29.269333 29.269333 0 0 1 4.309333 58.197334l-4.266667 0.341333h-146.346666a29.269333 29.269333 0 0 1-4.266667-58.197333l4.266667-0.341334h146.346666zM597.333333 515.669333a87.765333 87.765333 0 1 0 0 175.530667 87.765333 87.765333 0 0 0 0-175.530667z m-219.434666 3.626667a29.269333 29.269333 0 0 1 4.309333 58.197333l-4.266667 0.341334h-146.346666a29.269333 29.269333 0 0 1-4.266667-58.197334l4.266667-0.341333h146.346666zM743.68 299.946667a29.269333 29.269333 0 0 1 4.266667 58.197333l-4.266667 0.298667h-512a29.269333 29.269333 0 0 1-4.352-58.197334l4.352-0.298666h512z" p-id="2769"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
......
1 <?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="1660118877999" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2952" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); } 1 <?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="1660118877999" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2952" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
2 </style></defs><path d="M779.008 56.064c14.72 0 26.88 10.837333 28.970667 24.96l0.298666 4.309333v692.181334c0 14.72-10.837333 26.88-24.917333 28.970666l-4.352 0.298667H229.632a29.269333 29.269333 0 0 1-4.352-58.197333l4.352-0.298667 520.106667-0.042667V114.56H170.666667c-29.013333 0-52.906667 22.101333-55.808 50.346667L114.602667 170.666667l-0.042667 689.962666H810.666667c29.013333 0 52.906667-22.058667 55.808-50.346666l0.256-5.717334V262.528a29.269333 29.269333 0 0 1 58.197333-4.309333l0.341333 4.309333v542.037333a114.602667 114.602667 0 0 1-107.349333 114.346667l-7.253333 0.256H85.333333a29.269333 29.269333 0 0 1-28.928-24.96l-0.341333-4.266667V170.666667A114.602667 114.602667 0 0 1 163.413333 56.32L170.666667 56.064h608.341333z m-236.544 219.434667c10.112 0 19.456 5.205333 24.832 13.738666l91.434667 146.304a29.269333 29.269333 0 0 1 0 31.018667l-91.434667 146.261333a29.269333 29.269333 0 0 1-24.832 13.781334H359.68a29.269333 29.269333 0 0 1-24.832-13.781334l-91.434667-146.261333a29.269333 29.269333 0 0 1 0-31.018667l91.434667-146.304a29.269333 29.269333 0 0 1 24.832-13.738666z m-16.213333 58.496H375.893333l-73.173333 117.034666 73.173333 117.034667h150.357334l73.173333-117.034667-73.173333-117.034666z" fill="#ffffff" p-id="2953"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
2 </style></defs><path d="M779.008 56.064c14.72 0 26.88 10.837333 28.970667 24.96l0.298666 4.309333v692.181334c0 14.72-10.837333 26.88-24.917333 28.970666l-4.352 0.298667H229.632a29.269333 29.269333 0 0 1-4.352-58.197333l4.352-0.298667 520.106667-0.042667V114.56H170.666667c-29.013333 0-52.906667 22.101333-55.808 50.346667L114.602667 170.666667l-0.042667 689.962666H810.666667c29.013333 0 52.906667-22.058667 55.808-50.346666l0.256-5.717334V262.528a29.269333 29.269333 0 0 1 58.197333-4.309333l0.341333 4.309333v542.037333a114.602667 114.602667 0 0 1-107.349333 114.346667l-7.253333 0.256H85.333333a29.269333 29.269333 0 0 1-28.928-24.96l-0.341333-4.266667V170.666667A114.602667 114.602667 0 0 1 163.413333 56.32L170.666667 56.064h608.341333z m-236.544 219.434667c10.112 0 19.456 5.205333 24.832 13.738666l91.434667 146.304a29.269333 29.269333 0 0 1 0 31.018667l-91.434667 146.261333a29.269333 29.269333 0 0 1-24.832 13.781334H359.68a29.269333 29.269333 0 0 1-24.832-13.781334l-91.434667-146.261333a29.269333 29.269333 0 0 1 0-31.018667l91.434667-146.304a29.269333 29.269333 0 0 1 24.832-13.738666z m-16.213333 58.496H375.893333l-73.173333 117.034666 73.173333 117.034667h150.357334l73.173333-117.034667-73.173333-117.034666z" p-id="2953"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -45,6 +45,7 @@ export default { ...@@ -45,6 +45,7 @@ export default {
45 .then((res) => { 45 .then((res) => {
46 sessionStorage.removeItem("token"); 46 sessionStorage.removeItem("token");
47 this.$store.dispatch("user/resetState"); 47 this.$store.dispatch("user/resetState");
48 this.$store.dispatch("permission/resetRoutes");
48 this.$router.replace({ 49 this.$router.replace({
49 path: "/jg", 50 path: "/jg",
50 query: { 51 query: {
...@@ -60,11 +61,6 @@ export default { ...@@ -60,11 +61,6 @@ export default {
60 }; 61 };
61 </script> 62 </script>
62 <style lang="scss" scoped> 63 <style lang="scss" scoped>
63 /deep/.el-menu--horizontal {
64 display: flex;
65 align-items: center;
66 }
67
68 .menubg { 64 .menubg {
69 height: 34px; 65 height: 34px;
70 width: 130px !important; 66 width: 130px !important;
...@@ -101,6 +97,7 @@ export default { ...@@ -101,6 +97,7 @@ export default {
101 display: flex; 97 display: flex;
102 justify-content: space-between; 98 justify-content: space-between;
103 width: 100%; 99 width: 100%;
100 background: transparent !important;
104 } 101 }
105 102
106 /deep/.el-menu-item { 103 /deep/.el-menu-item {
......
...@@ -36,10 +36,4 @@ export default { ...@@ -36,10 +36,4 @@ export default {
36 } 36 }
37 } 37 }
38 } 38 }
39 </script> 39 </script>
40 <style scoped lang="scss">
41 .el-menu--horizontal {
42 display: flex;
43 background: none !important;
44 }
45 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 <!-- 1 <!--
2 * @Author: xiaomiao 1158771342@qq.com 2 * @Author: xiaomiao 1158771342@qq.com
3 * @Date: 2023-01-10 09:03:06 3 * @Date: 2023-01-10 09:03:06
4 * @LastEditors: xiaomiao 1158771342@qq.com 4 * @LastEditors: Please set LastEditors
5 * @LastEditTime: 2023-03-08 10:45:43 5 * @LastEditTime: 2023-03-22 10:43:26
6 * @FilePath: \监管系统\js-web-jianguan\src\layout\components\Sidebar\sidebarRight.vue 6 * @FilePath: \监管系统\js-web-jianguan\src\layout\components\Sidebar\sidebarRight.vue
7 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE 7 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
8 --> 8 -->
...@@ -17,59 +17,29 @@ ...@@ -17,59 +17,29 @@
17 </template> 17 </template>
18 18
19 <script> 19 <script>
20 import { mapGetters } from 'vuex' 20 import { mapGetters } from 'vuex'
21 import Logo from './Logo' 21 import Logo from './Logo'
22 import SidebarItem from './SidebarItem' 22 import SidebarItem from './SidebarItem'
23 import variables from '@/styles/variables.scss' 23 import variables from '@/styles/variables.scss'
24 import { asyncRoutes } from '@/router' 24 import { asyncRoutes } from '@/router'
25 export default { 25 export default {
26 components: { SidebarItem, Logo }, 26 components: { SidebarItem, Logo },
27 computed: { 27 computed: {
28 ...mapGetters(['permission_routes', 'sidebar']), 28 ...mapGetters(['permission_routes', 'sidebar']),
29 activeMenu () { 29 activeMenu () {
30 const route = this.$route 30 const route = this.$route
31 const { meta, path } = route 31 const { meta, path } = route
32 if (meta.activeMenu) { 32 if (meta.activeMenu) {
33 return meta.activeMenu 33 return meta.activeMenu
34 }
35 return path
36 },
37 variables () {
38 return variables
39 },
40 asyncRoutes () {
41 return asyncRoutes.slice(3, 6)
42 } 34 }
35 return path
36 },
37 variables () {
38 return variables
39 },
40 asyncRoutes () {
41 return asyncRoutes.slice(3, 6)
43 } 42 }
44 } 43 }
44 }
45 </script> 45 </script>
46 <style scoped lang="scss">
47 .el-menu--horizontal {
48 display: flex;
49 background: none !important;
50 }
51
52 /deep/.el-menu-item:hover {
53 background: none;
54 font-weight: 700;
55 color: #fff !important;
56 }
57
58 /deep/.el-submenu__title {
59 color: #fff;
60 font-size: 18px;
61 }
62
63 /deep/.el-submenu__title:hover {
64 background: none;
65 font-weight: 700;
66 font-size: 20px;
67 }
68
69 /deep/.el-menu--horizontal .el-menu-item:not(.is-disabled):focus {
70 background: none;
71 color: #fff;
72 font-size: 20px;
73 font-weight: 700 !important;
74 }
75 </style>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-20 16:35:09 4 * @LastEditTime: 2023-03-22 10:23:46
5 --> 5 -->
6 <template> 6 <template>
7 <section class="app-main"> 7 <section class="app-main">
...@@ -27,7 +27,7 @@ export default { ...@@ -27,7 +27,7 @@ export default {
27 box-sizing: border-box; 27 box-sizing: border-box;
28 flex: 1; 28 flex: 1;
29 width: 100%; 29 width: 100%;
30 background: #EFF0F4; 30 background: #EAEBF0;
31 padding: 15px; 31 padding: 15px;
32 } 32 }
33 </style> 33 </style>
......
...@@ -64,6 +64,7 @@ export default { ...@@ -64,6 +64,7 @@ export default {
64 font-size: 26px; 64 font-size: 26px;
65 font-weight: 700; 65 font-weight: 700;
66 display: flex; 66 display: flex;
67 margin-left: 15px;
67 68
68 img { 69 img {
69 width: 47px; 70 width: 47px;
...@@ -121,7 +122,7 @@ export default { ...@@ -121,7 +122,7 @@ export default {
121 height: $headerHeight; 122 height: $headerHeight;
122 overflow: hidden; 123 overflow: hidden;
123 position: relative; 124 position: relative;
124 @include background_color("navbg"); 125 @include background("navbg");
125 126
126 display: flex; 127 display: flex;
127 align-items: center; 128 align-items: center;
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-22 11:19:04
5 -->
1 <script> 6 <script>
2 export default { 7 export default {
3 name: 'MenuItem', 8 name: 'MenuItem',
...@@ -31,11 +36,3 @@ export default { ...@@ -31,11 +36,3 @@ export default {
31 } 36 }
32 } 37 }
33 </script> 38 </script>
34
35 <style scoped>
36 .sub-el-icon {
37 color: currentColor;
38 width: 1em;
39 height: 1em;
40 }
41 </style>
......
...@@ -16,7 +16,7 @@ let mixin = { ...@@ -16,7 +16,7 @@ let mixin = {
16 computed: { 16 computed: {
17 ...mapGetters(['dicData']) 17 ...mapGetters(['dicData'])
18 }, 18 },
19 created () { 19 mounted () {
20 this.handleSearch() 20 this.handleSearch()
21 }, 21 },
22 methods: { 22 methods: {
......
1 $themes: (blue: ( //背景 1 $themes: (blue: ( //背景
2 navbg: #3D59C4, 2 navbg: linear-gradient(270deg, #EBF1FF 0%, #3D59C4 100%),
3 menuBg: #121F41, 3 menuBg: #F0F3FC,
4 menuActive: linear-gradient(90deg, rgba(61,90,198,0.7) 0%, rgba(61,90,198,0) 100%), 4 menuActive: #DFE7F7,
5 //字体 5 //字体
6 menuText: #A1A7C2, 6 menuText: #6D7278,
7 menuActiveText: #FFFFFF 7 menuActiveText: #4162D8,
8 ), 8 // 没有子集
9 submenuBg: #3D59C4,
10 submenuColor: #FFFFFF
11 ),
9 12
10 green: ( 13 green: (
11 navbg: #0F8B80, 14 navbg: #0F8B80,
12 menuBg:#121A2E, 15 menuBg:#121A2E,
13 menuActive: linear-gradient(90deg, rgba(61,90,198,0.7) 0%, rgba(61,90,198,0) 100%), 16 menuActive: linear-gradient(90deg, rgba(61,90,198,0.7) 0%, rgba(61,90,198,0) 100%),
14 //字体 17 //字体
15 menuText: #A1A7C2, 18 menuText: #A1A7C2,
16 menuActiveText: #FFFFFF 19 menuActiveText: #FFFFFF
17 ) 20 )
18 ) 21 )
...\ No newline at end of file ...\ No newline at end of file
......
1 @import '~@/styles/jgElement-ui.scss'; 1 @import '~@/styles/jgElement-ui.scss';
2 2
3 .el-menu--horizontal {
4 display: flex;
5 background: none !important;
6 }
7
3 .tableClass { 8 .tableClass {
4 .el-table { 9 .el-table {
5 border: none !important; 10 border: none !important;
...@@ -755,3 +760,4 @@ ...@@ -755,3 +760,4 @@
755 right: 10px; 760 right: 10px;
756 } 761 }
757 } 762 }
763
......
...@@ -198,10 +198,3 @@ input[type="number"] { ...@@ -198,10 +198,3 @@ input[type="number"] {
198 .el-form-item__content { 198 .el-form-item__content {
199 flex: 1; 199 flex: 1;
200 } 200 }
201
202 .el-submenu__title {
203 .svg-icon {
204 position: relative;
205 top: 2px;
206 }
207 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 10
11 &-header { 11 &-header {
12 width: 100%; 12 width: 100%;
13 padding: 5px 30px 20px 24px; 13 padding: 15px;
14 box-sizing: border-box; 14 box-sizing: border-box;
15 background-size: 100% 100%; 15 background-size: 100% 100%;
16 background: #FFFFFF; 16 background: #FFFFFF;
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
24 background: #FFFFFF; 24 background: #FFFFFF;
25 border-radius: 4px; 25 border-radius: 4px;
26 background-size: 100% 100%; 26 background-size: 100% 100%;
27 padding: 22px 42px 20px; 27 padding: 15px;
28 } 28 }
29 29
30 .el-dialog__close { 30 .el-dialog__close {
......
...@@ -8,13 +8,12 @@ ...@@ -8,13 +8,12 @@
8 } 8 }
9 9
10 .el-form-item__content { 10 .el-form-item__content {
11 margin-left: 0!important; 11 margin-left: 0 !important;
12 } 12 }
13 13
14 .sidebar-container { 14 .sidebar-container {
15 transition: width 0.28s; 15 transition: width 0.28s;
16 width: $sideBarWidth !important; 16 width: $sideBarWidth !important;
17 overflow-y: scroll;
18 font-size: 0px; 17 font-size: 0px;
19 @include background_color("menuBg"); 18 @include background_color("menuBg");
20 19
...@@ -22,7 +21,9 @@ ...@@ -22,7 +21,9 @@
22 transition: 0s width ease-in-out, 0s padding-left ease-in-out, 21 transition: 0s width ease-in-out, 0s padding-left ease-in-out,
23 0s padding-right ease-in-out; 22 0s padding-right ease-in-out;
24 } 23 }
25 24 .el-scrollbar {
25 height: 100%;
26 }
26 .scrollbar-wrapper { 27 .scrollbar-wrapper {
27 overflow-x: hidden !important; 28 overflow-x: hidden !important;
28 margin-right: 0 !important; 29 margin-right: 0 !important;
...@@ -50,6 +51,7 @@ ...@@ -50,6 +51,7 @@
50 .el-menu { 51 .el-menu {
51 background-color: transparent !important; 52 background-color: transparent !important;
52 border: none; 53 border: none;
54 @include font_color("menuText");
53 height: 100%; 55 height: 100%;
54 width: 100% !important; 56 width: 100% !important;
55 } 57 }
...@@ -64,18 +66,17 @@ ...@@ -64,18 +66,17 @@
64 .el-submenu__title { 66 .el-submenu__title {
65 padding-left: 10px !important; 67 padding-left: 10px !important;
66 @include font_color("menuText"); 68 @include font_color("menuText");
67 height: 42px; 69 background-color: transparent !important;
68 background: linear-gradient(90deg, #013874 0%, #081B56 100%);
69 margin-bottom: 8px;
70 70
71 &:hover { 71 &:hover {
72 color: $subMenuActiveText !important; 72 color: $subMenuActiveText !important;
73 background: linear-gradient(90deg, #1D66DC 0%, #081B56 100%); 73 @include font_color("submenuColor");
74 @include background_color("submenuBg");
74 75
75 .svg-icon, 76 .svg-icon,
76 i, 77 i,
77 span { 78 span {
78 color: $subMenuActiveText !important; 79 @include font_color("submenuColor");
79 } 80 }
80 } 81 }
81 } 82 }
...@@ -84,11 +85,12 @@ ...@@ -84,11 +85,12 @@
84 .submenu-title-noDropdown { 85 .submenu-title-noDropdown {
85 @include font_color("menuText"); 86 @include font_color("menuText");
86 padding-left: 20px; 87 padding-left: 20px;
87 margin-bottom: 8px; 88 height: 56px;
89 background-color: transparent !important;
88 90
89 &:hover { 91 &:hover {
90 @include font_color("menuActiveText"); 92 @include font_color("submenuColor");
91 @include background("menuActive"); 93 @include background_color("submenuBg");
92 94
93 .svg-icon { 95 .svg-icon {
94 color: #1ea6f8 !important; 96 color: #1ea6f8 !important;
...@@ -102,8 +104,8 @@ ...@@ -102,8 +104,8 @@
102 104
103 .submenu-title-noDropdown.is-active, 105 .submenu-title-noDropdown.is-active,
104 .el-submenu__title.is-active { 106 .el-submenu__title.is-active {
105 @include background("menuActive"); 107 @include background_color("submenuBg");
106 @include font_color("menuActiveText"); 108 @include font_color("submenuColor");
107 109
108 .svg-icon { 110 .svg-icon {
109 color: #1ea6f8 !important; 111 color: #1ea6f8 !important;
...@@ -119,7 +121,6 @@ ...@@ -119,7 +121,6 @@
119 font-weight: 600; 121 font-weight: 600;
120 font-size: $sideBarFontSize; 122 font-size: $sideBarFontSize;
121 123
122 // margin: 0 10px;
123 >i { 124 >i {
124 color: $subMenuActiveText !important; 125 color: $subMenuActiveText !important;
125 transform: rotate(90deg); 126 transform: rotate(90deg);
...@@ -132,7 +133,7 @@ ...@@ -132,7 +133,7 @@
132 133
133 .svg-icon { 134 .svg-icon {
134 font-size: 18px; 135 font-size: 18px;
135 margin-top: -5px; 136 color: #6D7278 !important;
136 } 137 }
137 } 138 }
138 139
...@@ -144,28 +145,25 @@ ...@@ -144,28 +145,25 @@
144 -o-transform: rotateZ(0deg) !important; 145 -o-transform: rotateZ(0deg) !important;
145 } 146 }
146 147
147 .is-active>.el-submenu__title {
148 color: #fff !important;
149 }
150
151 & .nest-menu .el-submenu>.el-submenu__title, 148 & .nest-menu .el-submenu>.el-submenu__title,
152 & .el-submenu .el-menu-item { 149 & .el-submenu .el-menu-item {
150
153 &.is-active { 151 &.is-active {
154 background-color: $subMenuHover !important; 152 @include background_color("menuActive");
155 color: $menuActiveText !important; 153 @include font_color("menuActiveText");
156 } 154 }
157 155
158 &:hover { 156 &:hover {
159 background-color: $subMenuHover !important; 157 @include background_color("menuActive");
158 @include font_color("menuActiveText");
160 color: $menuActiveText !important; 159 color: $menuActiveText !important;
161 } 160 }
162 161
163 min-width: 130px !important; 162 min-width: 130px !important;
164 background-color: transparent !important; 163 background-color: transparent !important;
165 font-weight: 600; 164 font-weight: 600;
165 @include font_color("menuText");
166 font-size: $sideBarFontSize; 166 font-size: $sideBarFontSize;
167 margin: 0 10px;
168 // border-radius: 6px;
169 } 167 }
170 } 168 }
171 169
...@@ -279,12 +277,10 @@ ...@@ -279,12 +277,10 @@
279 font-weight: 600 !important; 277 font-weight: 600 !important;
280 font-size: 15px !important; 278 font-size: 15px !important;
281 @include background("menuActive"); 279 @include background("menuActive");
282 // background-color: $menuHover !important; 280 @include font_color("menuText");
283 color: $menuText !important;
284 281
285 &:hover { 282 &:hover {
286 @include background("menuActive"); 283 @include background("menuActive");
287 // background-color: $menuHover !important;
288 opacity: .9; 284 opacity: .9;
289 285
290 .svg-icon, 286 .svg-icon,
...@@ -320,6 +316,19 @@ ...@@ -320,6 +316,19 @@
320 } 316 }
321 } 317 }
322 318
319 .el-submenu.is-active .el-submenu__title {
320 @include background_color("submenuBg");
321 @include font_color("submenuColor");
322 }
323
324 .el-submenu.is-active .el-submenu__title:hover {
325 @include font_color("submenuColor");
326 }
327
328 .el-submenu.is-active .el-submenu__title .svg-icon {
329 @include font_color("submenuColor");
330 }
331
323 .el-submenu__title { 332 .el-submenu__title {
324 display: flex; 333 display: flex;
325 align-items: center; 334 align-items: center;
......
...@@ -24,7 +24,7 @@ $menuHover: #1D66DC; ...@@ -24,7 +24,7 @@ $menuHover: #1D66DC;
24 $subMenuBg:#0D1230; 24 $subMenuBg:#0D1230;
25 $subMenuHover:#1D66DC; 25 $subMenuHover:#1D66DC;
26 26
27 $sideBarWidth: 210px; 27 $sideBarWidth: 250px;
28 $sideBarFontSize:15px; 28 $sideBarFontSize:15px;
29 29
30 // border颜色 30 // border颜色
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <el-row class="mb-5"> 8 <el-row class="mb-5">
9 <el-col :span="5"> 9 <el-col :span="5">
10 <el-form-item label="行政区" label-width="80px"> 10 <el-form-item label="行政区" label-width="80px">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
13 </el-option> 13 </el-option>
14 </el-select> 14 </el-select>
...@@ -149,4 +149,4 @@ export default { ...@@ -149,4 +149,4 @@ export default {
149 } 149 }
150 } 150 }
151 } 151 }
152 </script>
...\ No newline at end of file ...\ No newline at end of file
152 </script>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <el-row class="mb-5"> 8 <el-row class="mb-5">
9 <el-col :span="6"> 9 <el-col :span="6">
10 <el-form-item label="行政区" label-width="80px"> 10 <el-form-item label="行政区" label-width="80px">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
13 </el-option> 13 </el-option>
14 </el-select> 14 </el-select>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <el-row class="mb-5"> 8 <el-row class="mb-5">
9 <el-col :span="5"> 9 <el-col :span="5">
10 <el-form-item label="行政区" label-width="80px"> 10 <el-form-item label="行政区" label-width="80px">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
13 </el-option> 13 </el-option>
14 </el-select> 14 </el-select>
...@@ -158,4 +158,4 @@ ...@@ -158,4 +158,4 @@
158 } 158 }
159 } 159 }
160 } 160 }
161 </script>
...\ No newline at end of file ...\ No newline at end of file
161 </script>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <el-row class="mb-5"> 8 <el-row class="mb-5">
9 <el-col :span="6"> 9 <el-col :span="6">
10 <el-form-item label="行政区"> 10 <el-form-item label="行政区">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
13 </el-option> 13 </el-option>
14 </el-select> 14 </el-select>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <el-row class="mb-5"> 8 <el-row class="mb-5">
9 <el-col :span="6"> 9 <el-col :span="6">
10 <el-form-item label="行政区"> 10 <el-form-item label="行政区">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
13 </el-option> 13 </el-option>
14 </el-select> 14 </el-select>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <el-row class="mb-5"> 8 <el-row class="mb-5">
9 <el-col :span="6"> 9 <el-col :span="6">
10 <el-form-item label="行政区"> 10 <el-form-item label="行政区">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
13 </el-option> 13 </el-option>
14 </el-select> 14 </el-select>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <el-row> 8 <el-row>
9 <el-col :span="6" class="mb-5"> 9 <el-col :span="6" class="mb-5">
10 <el-form-item label="行政区"> 10 <el-form-item label="行政区">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
13 </el-option> 13 </el-option>
14 </el-select> 14 </el-select>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <el-row class="mb-5"> 8 <el-row class="mb-5">
9 <el-col :span="6"> 9 <el-col :span="6">
10 <el-form-item label="行政区"> 10 <el-form-item label="行政区">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
13 </el-option> 13 </el-option>
14 </el-select> 14 </el-select>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <el-row> 8 <el-row>
9 <el-col :span="6" class="mb-5"> 9 <el-col :span="6" class="mb-5">
10 <el-form-item label="行政区"> 10 <el-form-item label="行政区">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
13 </el-option> 13 </el-option>
14 </el-select> 14 </el-select>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <el-row class="mb-5"> 8 <el-row class="mb-5">
9 <el-col :span="6"> 9 <el-col :span="6">
10 <el-form-item label="行政区"> 10 <el-form-item label="行政区">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
13 </el-option> 13 </el-option>
14 </el-select> 14 </el-select>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <el-row class="mb-5"> 8 <el-row class="mb-5">
9 <el-col :span="6"> 9 <el-col :span="6">
10 <el-form-item label="行政区"> 10 <el-form-item label="行政区">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
13 </el-option> 13 </el-option>
14 </el-select> 14 </el-select>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <el-row class="mb-5"> 8 <el-row class="mb-5">
9 <el-col :span="6"> 9 <el-col :span="6">
10 <el-form-item label="行政区" label-width="106px"> 10 <el-form-item label="行政区" label-width="106px">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
13 </el-option> 13 </el-option>
14 </el-select> 14 </el-select>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <el-row> 8 <el-row>
9 <el-col :span="5" class="mb-5"> 9 <el-col :span="5" class="mb-5">
10 <el-form-item label="行政区" label-width="80px"> 10 <el-form-item label="行政区" label-width="80px">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
13 </el-option> 13 </el-option>
14 </el-select> 14 </el-select>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <el-row class="mb-5"> 8 <el-row class="mb-5">
9 <el-col :span="6"> 9 <el-col :span="6">
10 <el-form-item label="行政区"> 10 <el-form-item label="行政区">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
13 </el-option> 13 </el-option>
14 </el-select> 14 </el-select>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 <el-row class="mb-5"> 10 <el-row class="mb-5">
11 <el-col :span="6"> 11 <el-col :span="6">
12 <el-form-item label="行政区" prop="qxdm"> 12 <el-form-item label="行政区" prop="qxdm">
13 <el-select v-model="form.qxdm" class="width100" clearable placeholder="行政区"> 13 <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.qxdm = $store.state.user.userInfo.areaCode : form.qxdm" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
14 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 14 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
15 </el-option> 15 </el-option>
16 </el-select> 16 </el-select>
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
10 <el-row> 10 <el-row>
11 <el-col :span="6"> 11 <el-col :span="6">
12 <el-form-item label="行政区"> 12 <el-form-item label="行政区">
13 <el-select v-model="form.areacode" class="width100" clearable placeholder="行政区"> 13 <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.areacode = $store.state.user.userInfo.areaCode : form.areacode" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
14 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 14 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
15 </el-option> 15 </el-option>
16 </el-select> 16 </el-select>
17 </el-form-item> 17 </el-form-item>
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
10 <el-row class="mb-5"> 10 <el-row class="mb-5">
11 <el-col :span="6"> 11 <el-col :span="6">
12 <el-form-item label="行政区" prop="qxdm"> 12 <el-form-item label="行政区" prop="qxdm">
13 <el-select v-model="form.qxdm" class="width100" clearable placeholder="行政区"> 13 <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.qxdm = $store.state.user.userInfo.areaCode : form.qxdm" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
14 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 14 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
15 </el-option> 15 </el-option>
16 </el-select> 16 </el-select>
17 </el-form-item> 17 </el-form-item>
......