Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
e6aa69df by renchao@pashanhoo.com
Options

Merge branch 'master' into dev

2 parents cad71d88 a5a1fa20
Inline Side-by-side
Showing 10 changed files with 52 additions and 27 deletions
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-27 09:42:59 4 * @LastEditTime: 2023-03-27 13:25:25
5 --> 5 -->
6 # 安装依赖 6 # 安装依赖
7 npm install 7 npm install
...@@ -19,4 +19,6 @@ npm install --registry=https://registry.npm.taobao.org ...@@ -19,4 +19,6 @@ npm install --registry=https://registry.npm.taobao.org
19 - `docs` 文档/注释 19 - `docs` 文档/注释
20 - `chore` 依赖更新/脚手架配置修改等 20 - `chore` 依赖更新/脚手架配置修改等
21 - `wip` 开发中 21 - `wip` 开发中
22 22
23 ## 项目换肤
24 给html根标签设置一个data-theme属性，然后通过js切换data-theme的属性值，Scss根据此属性来判断使用对应主题变量
...\ No newline at end of file ...\ No newline at end of file
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-24 17:10:32 4 * @LastEditTime: 2023-03-27 14:09:57
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
...@@ -48,9 +48,6 @@ export default { ...@@ -48,9 +48,6 @@ export default {
48 asyncRoutes () { 48 asyncRoutes () {
49 return asyncRoutes 49 return asyncRoutes
50 } 50 }
51 },
52 mounted () {
53 console.log(this.permission_routes.slice(5), 'permission_routes');
54 } 51 }
55 } 52 }
56 </script> 53 </script>
......
...@@ -16,7 +16,6 @@ NProgress.configure({ showSpinner: false }); ...@@ -16,7 +16,6 @@ NProgress.configure({ showSpinner: false });
16 router.beforeEach(async (to, from, next) => { 16 router.beforeEach(async (to, from, next) => {
17 getTheme() 17 getTheme()
18 NProgress.start(); 18 NProgress.start();
19 window.document.documentElement.setAttribute("data-theme", 'blue');
20 document.title = getPageTitle(to.meta.title); 19 document.title = getPageTitle(to.meta.title);
21 let hasAddDict = store.state.dict.addDict; 20 let hasAddDict = store.state.dict.addDict;
22 let hasUser = store.state.user.hasUser; 21 let hasUser = store.state.user.hasUser;
...@@ -55,6 +54,7 @@ router.beforeEach(async (to, from, next) => { ...@@ -55,6 +54,7 @@ router.beforeEach(async (to, from, next) => {
55 } else { 54 } else {
56 next(); 55 next();
57 } 56 }
57 window.document.documentElement.setAttribute("data-theme", 'blue');
58 } 58 }
59 } else { 59 } else {
60 if (code == 'BDCSBPT') { 60 if (code == 'BDCSBPT') {
......
...@@ -15,7 +15,13 @@ $themes: (blue: ( //背景 ...@@ -15,7 +15,13 @@ $themes: (blue: ( //背景
15 tagsActiveText: #4162D8, 15 tagsActiveText: #4162D8,
16 // 操纵btn 16 // 操纵btn
17 btnBg: #4162D8, 17 btnBg: #4162D8,
18 btnColor: #4162D8), 18 btnColor: #4162D8,
19 // table样式相关
20 pagBg:rgba(65, 98, 216, 0.1),
21 pagBorderColor: #D9D9D9,
22 pagText: #4A4A4A,
23 pagActiveText: #4162D8,
24 ),
19 25
20 green: (navbg: #0F8B80, 26 green: (navbg: #0F8B80,
21 menuBg:#121A2E, 27 menuBg:#121A2E,
......
...@@ -9,12 +9,6 @@ ...@@ -9,12 +9,6 @@
9 line-height: 16px; 9 line-height: 16px;
10 } 10 }
11 11
12 //input
13 .el-input__inner {
14 color: #FFFFFF !important;
15 padding: 0 7px !important;
16 }
17
18 // input 样式 12 // input 样式
19 // 全局css 加上以下代码，可以隐藏上下箭头 13 // 全局css 加上以下代码，可以隐藏上下箭头
20 14
...@@ -429,10 +423,6 @@ table td { ...@@ -429,10 +423,6 @@ table td {
429 background: color #074487; 423 background: color #074487;
430 } 424 }
431 425
432 .el-input__inner {
433 background-color: #074487;
434 }
435
436 .el-input.is-disabled .el-input__inner { 426 .el-input.is-disabled .el-input__inner {
437 background-color: #074487; 427 background-color: #074487;
438 } 428 }
......
...@@ -53,6 +53,12 @@ ...@@ -53,6 +53,12 @@
53 background-color: rgba(0, 0, 0, 0); 53 background-color: rgba(0, 0, 0, 0);
54 } 54 }
55 55
56 //input
57 .el-input__inner {
58 color: #FFFFFF !important;
59 padding: 0 7px !important;
60 }
61
56 // 查询表单样式 62 // 查询表单样式
57 .from-clues { 63 .from-clues {
58 height: 100%; 64 height: 100%;
...@@ -77,7 +83,7 @@ ...@@ -77,7 +83,7 @@
77 .el-input__inner { 83 .el-input__inner {
78 background: #07388B; 84 background: #07388B;
79 border-radius: 2px; 85 border-radius: 2px;
80 color: #CEF8FF !important; 86 color: #7A7A7A !important;
81 border: 1px solid #6BC1FC; 87 border: 1px solid #6BC1FC;
82 } 88 }
83 89
...@@ -1023,4 +1029,4 @@ ...@@ -1023,4 +1029,4 @@
1023 .selbig { 1029 .selbig {
1024 width: 500px; 1030 width: 500px;
1025 } 1031 }
1026 } 1032 }
...\ No newline at end of file ...\ No newline at end of file
......
1 @import "~@/styles/_handle.scss";
2
1 // cover some element-ui styles 3 // cover some element-ui styles
2 .el-breadcrumb__inner, 4 .el-breadcrumb__inner,
3 .el-breadcrumb__inner a { 5 .el-breadcrumb__inner a {
...@@ -172,6 +174,25 @@ input[type="number"] { ...@@ -172,6 +174,25 @@ input[type="number"] {
172 color: #4A4A4A; 174 color: #4A4A4A;
173 } 175 }
174 176
177 .el-pagination.is-background .btn-prev,
178 .el-pagination.is-background .btn-next,
179 .el-pagination.is-background .el-pager li {
180 @include borderColor("pagBorderColor");
181 background-color: #FFFFFF;
182 @include font_color("pagText");
183 }
184
185 .el-pagination.is-background .el-pager li:not(.disabled).active {
186 @include background("pagBg");
187 border-radius: 4px;
188 @include font_color("pagActiveText");
189 @include borderColor("pagActiveText");
190 }
191
192 .el-table__header th {
193 background-color: #F1F3F7 !important;
194 }
195
175 .el-table tr td { 196 .el-table tr td {
176 font-size: 14px; 197 font-size: 14px;
177 color: #7A7A7A; 198 color: #7A7A7A;
...@@ -197,4 +218,4 @@ input[type="number"] { ...@@ -197,4 +218,4 @@ input[type="number"] {
197 218
198 .el-form-item__content { 219 .el-form-item__content {
199 flex: 1; 220 flex: 1;
200 } 221 }
...\ No newline at end of file ...\ No newline at end of file
......
1 @import '~@/styles/sbElement-ui.scss'; 1 @import '~@/styles/sbElement-ui.scss';
2 @import "~@/styles/_handle.scss"; 2 @import "~@/styles/_handle.scss";
3 3
4 //input
5 .el-input__inner {
6 color: #7A7A7A !important;
7 padding: 0 7px !important;
8 }
9
4 .from-clues { 10 .from-clues {
5 height: 100%; 11 height: 100%;
6 width: 100%; 12 width: 100%;
...@@ -10,7 +16,7 @@ ...@@ -10,7 +16,7 @@
10 16
11 &-header { 17 &-header {
12 width: 100%; 18 width: 100%;
13 padding: 10px 15px 10px 15px; 19 padding: 7px 15px 10px 15px;
14 box-sizing: border-box; 20 box-sizing: border-box;
15 background-size: 100% 100%; 21 background-size: 100% 100%;
16 background: #FFFFFF; 22 background: #FFFFFF;
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 <el-input type="password" class="password" v-model="user.password" placeholder="请输入密码" 15 <el-input type="password" class="password" v-model="user.password" placeholder="请输入密码"
16 show-password></el-input> 16 show-password></el-input>
17 </el-form-item> 17 </el-form-item>
18 <!-- <el-form-item prop="yz"> 18 <el-form-item prop="yz">
19 <div class="flex-container"> 19 <div class="flex-container">
20 <div class="flex-input"> 20 <div class="flex-input">
21 <el-input class="yz" @keyup.native="login('user')" v-model="user.yz" placeholder="请输入验证码"></el-input> 21 <el-input class="yz" @keyup.native="login('user')" v-model="user.yz" placeholder="请输入验证码"></el-input>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 <font id="renovate" @click="verification">换一批</font> 26 <font id="renovate" @click="verification">换一批</font>
27 </div> 27 </div>
28 </div> 28 </div>
29 </el-form-item> --> 29 </el-form-item>
30 <el-form-item class="login-btn"> 30 <el-form-item class="login-btn">
31 <el-button type="primary" style="width: 100%" @click="login('user')">登录</el-button> 31 <el-button type="primary" style="width: 100%" @click="login('user')">登录</el-button>
32 </el-form-item> 32 </el-form-item>
...@@ -244,9 +244,7 @@ export default { ...@@ -244,9 +244,7 @@ export default {
244 .login-inner-bg { 244 .login-inner-bg {
245 background: white; 245 background: white;
246 width: 24.6%; 246 width: 24.6%;
247 height: 47%;
248 min-width: 360px; 247 min-width: 360px;
249 min-height: 380px;
250 top: 30%; 248 top: 30%;
251 right: 38%; 249 right: 38%;
252 position: absolute; 250 position: absolute;
......
...@@ -6,7 +6,6 @@ function resolve (dir) { ...@@ -6,7 +6,6 @@ function resolve (dir) {
6 } 6 }
7 const name = defaultSettings.title 7 const name = defaultSettings.title
8 const port = process.env.port || process.env.npm_config_port || 8888 // dev port 8 const port = process.env.port || process.env.npm_config_port || 8888 // dev port
9
10 // All configuration item explanations can be find in https://cli.vuejs.org/config/ 9 // All configuration item explanations can be find in https://cli.vuejs.org/config/
11 module.exports = { 10 module.exports = {
12 /** 11 /**
......