Skip to content

bdc / bdcjg-web

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

Merge branch 'master' into dev

2 parents 58b19e73 0b1028f9
Inline Side-by-side
Showing 3 changed files with 26 additions and 10 deletions
...@@ -782,6 +782,18 @@ ...@@ -782,6 +782,18 @@
782 } 782 }
783 } 783 }
784 784
785 // 个人信息
786 .information {
787 height: calc(100% - 58px);
788 display: flex;
789 flex-direction: column;
790 .from-clues-content {
791 flex: 1;
792 height: 100%;
793 }
794 }
795
796
785 // 修改基本信息界面样式 797 // 修改基本信息界面样式
786 .informationbase { 798 .informationbase {
787 margin: 0.1875rem 1.0417rem; 799 margin: 0.1875rem 1.0417rem;
......
...@@ -72,7 +72,9 @@ ...@@ -72,7 +72,9 @@
72 &:hover { 72 &:hover {
73 color: $subMenuActiveText !important; 73 color: $subMenuActiveText !important;
74 @include font_color("submenuColor"); 74 @include font_color("submenuColor");
75 border-right: 5px solid #36CEB6;
75 @include background_color("submenuBg"); 76 @include background_color("submenuBg");
77 box-sizing: border-box;
76 78
77 .svg-icon, 79 .svg-icon,
78 i, 80 i,
...@@ -92,6 +94,8 @@ ...@@ -92,6 +94,8 @@
92 &:hover { 94 &:hover {
93 @include font_color("submenuColor"); 95 @include font_color("submenuColor");
94 @include background_color("submenuBg"); 96 @include background_color("submenuBg");
97 border-right: 5px solid #36CEB6;
98 box-sizing: border-box;
95 99
96 .svg-icon { 100 .svg-icon {
97 color: #1ea6f8 !important; 101 color: #1ea6f8 !important;
...@@ -108,7 +112,7 @@ ...@@ -108,7 +112,7 @@
108 @include background_color("submenuBg"); 112 @include background_color("submenuBg");
109 @include font_color("submenuColor"); 113 @include font_color("submenuColor");
110 border-right: 5px solid #36CEB6; 114 border-right: 5px solid #36CEB6;
111 115 box-sizing: border-box;
112 .svg-icon { 116 .svg-icon {
113 color: #1ea6f8 !important; 117 color: #1ea6f8 !important;
114 } 118 }
......
1 <!-- 1 <!--
2 * @Author: xiaomiao 1158771342@qq.com 2 * @Author: xiaomiao 1158771342@qq.com
3 * @Date: 2023-03-09 20:54:28 3 * @Date: 2023-03-09 20:54:28
4 * @LastEditors: xiaomiao 1158771342@qq.com 4 * @LastEditors: Please set LastEditors
5 * @LastEditTime: 2023-03-27 14:26:49 5 * @LastEditTime: 2023-03-30 11:21:49
6 * @FilePath: \上报\bdcjg-web\src\views\system\information\index.vue 6 * @FilePath: \上报\bdcjg-web\src\views\system\information\index.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 -->
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 <div class="information from-clues"> 10 <div class="information from-clues">
11 <div class="from-clues-header"> 11 <div class="from-clues-header">
12 <el-form ref="ruleForm" label-width="100px"> 12 <el-form ref="ruleForm" label-width="100px">
13 <el-form-item v-if="BASE_API.THEME=='jg'"> 13 <el-form-item v-if="BASE_API.THEME == 'jg'">
14 <Breadcrumb /> 14 <Breadcrumb />
15 </el-form-item> 15 </el-form-item>
16 <el-row class="mb-5"> 16 <el-row class="mb-5">
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 </el-row> 25 </el-row>
26 </el-form> 26 </el-form>
27 </div> 27 </div>
28 <div class="from-clues-content boxin"> 28 <div class="from-clues-content">
29 <div class="contentbox"> 29 <div class="contentbox">
30 <base-set v-if="isshow" :userInfo="userData" /> 30 <base-set v-if="isshow" :userInfo="userData" />
31 <password-edit v-if="!isshow" :userInfo="userData" /> 31 <password-edit v-if="!isshow" :userInfo="userData" />
...@@ -34,10 +34,10 @@ ...@@ -34,10 +34,10 @@
34 </div> 34 </div>
35 </template> 35 </template>
36 <script> 36 <script>
37 import "@/utils/flexible.js"; 37 import "@/utils/flexible.js";
38 import BaseSet from "./base-set.vue"; 38 import BaseSet from "./base-set.vue";
39 import PasswordEdit from "./password-edit.vue"; 39 import PasswordEdit from "./password-edit.vue";
40 export default { 40 export default {
41 components: { 41 components: {
42 BaseSet, 42 BaseSet,
43 PasswordEdit, 43 PasswordEdit,
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
63 this.isshow = false; 63 this.isshow = false;
64 }, 64 },
65 }, 65 },
66 }; 66 };
67 </script> 67 </script>
68 68
69 <style scoped lang="scss"> 69 <style scoped lang="scss">
......