Browse Source

样式优化

seimin 1 year ago
parent
commit
19dcc147f6

+ 1 - 5
src/app/views/hushijiandan/hushijiandan.component.html

@@ -416,11 +416,7 @@
416
             <div class="wel">欢迎您:</div>
416
             <div class="wel">欢迎您:</div>
417
             <div class="user">
417
             <div class="user">
418
               <img src="../../assets/images/icon_keshi.png" alt="" />
418
               <img src="../../assets/images/icon_keshi.png" alt="" />
419
-              <span *ngIf="deptDisplay">{{
420
-                deptDisplay == 2
421
-                  ? loginUser.dept.deptalias
422
-                  : loginUser.dept.dept
423
-              }}</span>
419
+              <span *ngIf="deptDisplay" [title]="deptDisplay == 2 ? loginUser.dept.deptalias : loginUser.dept.dept">{{deptDisplay == 2 ? loginUser.dept.deptalias : loginUser.dept.dept}}</span>
424
             </div>
420
             </div>
425
             <div class="userInfo-wrap">
421
             <div class="userInfo-wrap">
426
               <div class="logOut" (click)="changeKsNow()">切换科室</div>
422
               <div class="logOut" (click)="changeKsNow()">切换科室</div>

+ 6 - 0
src/app/views/hushijiandan/hushijiandan.component.less

@@ -932,6 +932,12 @@
932
               height: 100%;
932
               height: 100%;
933
               margin-right: 8px;
933
               margin-right: 8px;
934
             }
934
             }
935
+
936
+            span {
937
+              white-space: nowrap;
938
+              overflow: hidden;//文本超出隐藏
939
+              text-overflow: ellipsis;//文本超出省略号替代
940
+            }
935
           }
941
           }
936
 
942
 
937
           .userInfo-wrap {
943
           .userInfo-wrap {

+ 5 - 2
src/app/views/main/main.component.html

@@ -56,8 +56,11 @@
56
             </ng-template>
56
             </ng-template>
57
           </div> -->
57
           </div> -->
58
           <div class="userInfo">
58
           <div class="userInfo">
59
-            <div class="wel">欢迎您,{{currentHospital.hosName}}:</div>
60
-            <div class="user"><img src="../../assets/images/icon_keshi.png" alt="">{{(userInfo&&userInfo.user)?userInfo.user.name:''}}</div>
59
+            <div class="wel" [title]="'欢迎您,' + currentHospital.hosName + ':'">欢迎您,{{currentHospital.hosName}}:</div>
60
+            <div class="user">
61
+              <img src="../../assets/images/icon_keshi.png" alt="">
62
+              <span [title]="(userInfo&&userInfo.user)?userInfo.user.name:''">{{(userInfo&&userInfo.user)?userInfo.user.name:''}}</span>
63
+            </div>
61
             <div class="logOut">
64
             <div class="logOut">
62
               <span (click)="hosFlag1 = true">选择院区</span>
65
               <span (click)="hosFlag1 = true">选择院区</span>
63
               <span (click)="showUpPwd()">修改密码</span>
66
               <span (click)="showUpPwd()">修改密码</span>

+ 10 - 0
src/app/views/main/main.component.less

@@ -215,9 +215,13 @@ nz-header.ant-layout-header {
215
 
215
 
216
         .wel {
216
         .wel {
217
           line-height: 15px;
217
           line-height: 15px;
218
+          white-space: nowrap;
219
+          overflow: hidden;//文本超出隐藏
220
+          text-overflow: ellipsis;//文本超出省略号替代
218
         }
221
         }
219
 
222
 
220
         .user {
223
         .user {
224
+          overflow: hidden;
221
           font-size: 20px;
225
           font-size: 20px;
222
           height: 40px;
226
           height: 40px;
223
           display: flex;
227
           display: flex;
@@ -229,6 +233,12 @@ nz-header.ant-layout-header {
229
             height: 36px;
233
             height: 36px;
230
             margin-right: 8px;
234
             margin-right: 8px;
231
           }
235
           }
236
+
237
+          span {
238
+            white-space: nowrap;
239
+            overflow: hidden;//文本超出隐藏
240
+            text-overflow: ellipsis;//文本超出省略号替代
241
+          }
232
         }
242
         }
233
 
243
 
234
         .logOut {
244
         .logOut {

+ 1 - 5
src/app/views/pharmacy/pharmacy.component.html

@@ -12,11 +12,7 @@
12
       <div class="wel">欢迎您:</div>
12
       <div class="wel">欢迎您:</div>
13
       <div class="user">
13
       <div class="user">
14
         <img src="../../assets/images/icon_keshi.png" alt="" />
14
         <img src="../../assets/images/icon_keshi.png" alt="" />
15
-        <span *ngIf="deptDisplay">{{
16
-          deptDisplay == 2
17
-            ? loginUser.dept.deptalias
18
-            : loginUser.dept.dept
19
-        }}</span>
15
+        <span *ngIf="deptDisplay" [title]="deptDisplay == 2 ? loginUser.dept.deptalias : loginUser.dept.dept">{{deptDisplay == 2 ? loginUser.dept.deptalias : loginUser.dept.dept}}</span>
20
       </div>
16
       </div>
21
       <div class="userInfo-wrap">
17
       <div class="userInfo-wrap">
22
         <div class="logOut" (click)="changeKsNow()">切换科室</div>
18
         <div class="logOut" (click)="changeKsNow()">切换科室</div>

+ 6 - 0
src/app/views/pharmacy/pharmacy.component.less

@@ -138,6 +138,12 @@
138
         height: 100%;
138
         height: 100%;
139
         margin-right: 8px;
139
         margin-right: 8px;
140
       }
140
       }
141
+
142
+      span {
143
+        white-space: nowrap;
144
+        overflow: hidden;//文本超出隐藏
145
+        text-overflow: ellipsis;//文本超出省略号替代
146
+      }
141
     }
147
     }
142
     .userInfo-wrap {
148
     .userInfo-wrap {
143
       display: flex;
149
       display: flex;

+ 1 - 3
src/app/views/pharmacy2/pharmacy2.component.html

@@ -23,9 +23,7 @@
23
       <div class="wel">欢迎您:</div>
23
       <div class="wel">欢迎您:</div>
24
       <div class="user">
24
       <div class="user">
25
         <img src="../../assets/images/icon_keshi.png" alt="" />
25
         <img src="../../assets/images/icon_keshi.png" alt="" />
26
-        <span *ngIf="deptDisplay">{{
27
-          deptDisplay == 2 ? loginUser.dept.deptalias : loginUser.dept.dept
28
-        }}</span>
26
+        <span *ngIf="deptDisplay" [title]="deptDisplay == 2 ? loginUser.dept.deptalias : loginUser.dept.dept">{{deptDisplay == 2 ? loginUser.dept.deptalias : loginUser.dept.dept}}</span>
29
       </div>
27
       </div>
30
       <div class="userInfo-wrap">
28
       <div class="userInfo-wrap">
31
         <div class="logOut" (click)="changeKsNow()">切换科室</div>
29
         <div class="logOut" (click)="changeKsNow()">切换科室</div>

+ 6 - 0
src/app/views/pharmacy2/pharmacy2.component.less

@@ -149,6 +149,12 @@
149
         height: 100%;
149
         height: 100%;
150
         margin-right: 8px;
150
         margin-right: 8px;
151
       }
151
       }
152
+
153
+      span {
154
+        white-space: nowrap;
155
+        overflow: hidden;//文本超出隐藏
156
+        text-overflow: ellipsis;//文本超出省略号替代
157
+      }
152
     }
158
     }
153
     .userInfo-wrap {
159
     .userInfo-wrap {
154
       display: flex;
160
       display: flex;