seimin 1 年之前
父节点
当前提交
b43cfe6c7f

+ 2 - 2
src/app/app.component.ts

@@ -10,8 +10,8 @@ export class AppComponent {
10
   constructor(private titleService:Title, private tool:ToolService){
10
   constructor(private titleService:Title, private tool:ToolService){
11
     this.tool.getSysNameAndLogoAsync().subscribe(result => {
11
     this.tool.getSysNameAndLogoAsync().subscribe(result => {
12
       let logoTitle = result.sysName || '';
12
       let logoTitle = result.sysName || '';
13
-      let logoUrl = result.logo || '';
14
-      let faviconUrl = result.favicon || '';
13
+      let logoUrl = location.origin + '/file' + result.logo || '';
14
+      let faviconUrl = location.origin + '/file' + result.favicon || '';
15
       this.tool.setSysName(logoTitle);
15
       this.tool.setSysName(logoTitle);
16
       this.tool.setLogo(logoUrl);
16
       this.tool.setLogo(logoUrl);
17
       this.tool.setFavicon(faviconUrl);
17
       this.tool.setFavicon(faviconUrl);

+ 3 - 3
src/app/views/hushijiandan/hushijiandan.component.less

@@ -668,7 +668,7 @@
668
         height: 88px;
668
         height: 88px;
669
         overflow: hidden;
669
         overflow: hidden;
670
         line-height: 88px;
670
         line-height: 88px;
671
-        background: #001529;
671
+        background: #fff;
672
         transition: all 0.3s;
672
         transition: all 0.3s;
673
         border-bottom: 1px solid #fff;
673
         border-bottom: 1px solid #fff;
674
         z-index: 10;
674
         z-index: 10;
@@ -676,13 +676,13 @@
676
 
676
 
677
         img {
677
         img {
678
           max-width: 100%;
678
           max-width: 100%;
679
-          max-height: 100%;
679
+          max-height: 50%;
680
           vertical-align: middle;
680
           vertical-align: middle;
681
         }
681
         }
682
 
682
 
683
         span {
683
         span {
684
           margin-top: 8px;
684
           margin-top: 8px;
685
-          color: #fff;
685
+          color: @primary-color;
686
           font-weight: 600;
686
           font-weight: 600;
687
           font-size: 14px;
687
           font-size: 14px;
688
         }
688
         }

+ 3 - 3
src/app/views/main/main.component.less

@@ -125,12 +125,12 @@ nz-sider {
125
   height: 88px;
125
   height: 88px;
126
   overflow: hidden;
126
   overflow: hidden;
127
   line-height: 64px;
127
   line-height: 64px;
128
-  background: #001529;
128
+  background: #fff;
129
   transition: all 0.3s;
129
   transition: all 0.3s;
130
 
130
 
131
   span {
131
   span {
132
     margin-top: 8px;
132
     margin-top: 8px;
133
-    color: #fff;
133
+    color: @primary-color;
134
     font-weight: 600;
134
     font-weight: 600;
135
     font-size: 13px;
135
     font-size: 13px;
136
   }
136
   }
@@ -139,7 +139,7 @@ nz-sider {
139
 .sidebar-logo img {
139
 .sidebar-logo img {
140
   display: inline-block;
140
   display: inline-block;
141
   max-width: 100%;
141
   max-width: 100%;
142
-  max-height: 100%;
142
+  max-height: 50%;
143
   vertical-align: middle;
143
   vertical-align: middle;
144
 }
144
 }
145
 
145
 

+ 2 - 2
src/app/views/pharmacy/pharmacy.component.html

@@ -1,8 +1,8 @@
1
 <div class="pharmacy">
1
 <div class="pharmacy">
2
   <!-- 头部 start -->
2
   <!-- 头部 start -->
3
   <div class="pharmacy-header">
3
   <div class="pharmacy-header">
4
-    <div class="pharmacy-logo">
5
-      <img [src]="tool.logoUrl" class="pharmacy-logo__img" [alt]="tool.logoTitle">
4
+    <div class="pharmacy-logo display_flex align-items_center justify-content_flex-center flex-direction_column" style="line-height: normal;height:100%;">
5
+      <img [src]="tool.logoUrl" class="pharmacy-logo__img">
6
       <h1 class="pharmacy-logo__name">{{tool.logoTitle}}</h1>
6
       <h1 class="pharmacy-logo__name">{{tool.logoTitle}}</h1>
7
     </div>
7
     </div>
8
     <div class="pharmacy-name">
8
     <div class="pharmacy-name">

+ 5 - 3
src/app/views/pharmacy/pharmacy.component.less

@@ -40,18 +40,20 @@
40
 
40
 
41
 		.pharmacy-logo {
41
 		.pharmacy-logo {
42
 			width: 221px;
42
 			width: 221px;
43
-			background-color: #0f2e3b;
43
+			background-color: #fff;
44
 			display: flex;
44
 			display: flex;
45
 			justify-content: center;
45
 			justify-content: center;
46
 			align-items: center;
46
 			align-items: center;
47
 
47
 
48
 			.pharmacy-logo__img {
48
 			.pharmacy-logo__img {
49
-				width: 32px;
49
+				max-width: 100%;
50
+        max-height: 50%;
50
 			}
51
 			}
51
 
52
 
52
 			.pharmacy-logo__name {
53
 			.pharmacy-logo__name {
54
+        margin-top: 8px;
53
 				font-size: 14px;
55
 				font-size: 14px;
54
-				color: #fff;
56
+				color: @primary-color;
55
 			}
57
 			}
56
 		}
58
 		}
57
 
59
 

+ 2 - 6
src/app/views/pharmacy2/pharmacy2.component.html

@@ -1,12 +1,8 @@
1
 <div class="pharmacy">
1
 <div class="pharmacy">
2
   <!-- 头部 start -->
2
   <!-- 头部 start -->
3
   <div class="pharmacy-header">
3
   <div class="pharmacy-header">
4
-    <div class="pharmacy-logo">
5
-      <img
6
-        [src]="tool.logoUrl"
7
-        class="pharmacy-logo__img"
8
-        [alt]="tool.logoTitle"
9
-      />
4
+    <div class="pharmacy-logo display_flex align-items_center justify-content_flex-center flex-direction_column" style="line-height: normal;height:100%;">
5
+      <img [src]="tool.logoUrl" class="pharmacy-logo__img">
10
       <h1 class="pharmacy-logo__name">{{tool.logoTitle}}</h1>
6
       <h1 class="pharmacy-logo__name">{{tool.logoTitle}}</h1>
11
     </div>
7
     </div>
12
     <div class="pharmacy-name">
8
     <div class="pharmacy-name">

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

@@ -40,18 +40,20 @@
40
 
40
 
41
     .pharmacy-logo {
41
     .pharmacy-logo {
42
       width: 221px;
42
       width: 221px;
43
-      background-color: #0f2e3b;
43
+      background-color: #fff;
44
       display: flex;
44
       display: flex;
45
       justify-content: center;
45
       justify-content: center;
46
       align-items: center;
46
       align-items: center;
47
 
47
 
48
       .pharmacy-logo__img {
48
       .pharmacy-logo__img {
49
-        width: 32px;
49
+        max-width: 100%;
50
+        max-height: 50%;
50
       }
51
       }
51
 
52
 
52
       .pharmacy-logo__name {
53
       .pharmacy-logo__name {
53
-        font-size: 14px;
54
-        color: #fff;
54
+        margin-top: 8px;
55
+				font-size: 14px;
56
+				color: @primary-color;
55
       }
57
       }
56
     }
58
     }
57
 
59
 

+ 3 - 3
src/app/views/specimen-view2/specimen-view2.component.less

@@ -40,7 +40,7 @@
40
 
40
 
41
     .pharmacy-logo {
41
     .pharmacy-logo {
42
       width: 221px;
42
       width: 221px;
43
-      background-color: #0f2e3b;
43
+      background-color: #fff;
44
       display: flex;
44
       display: flex;
45
       flex-direction: column;
45
       flex-direction: column;
46
       justify-content: center;
46
       justify-content: center;
@@ -48,12 +48,12 @@
48
 
48
 
49
       .pharmacy-logo__img {
49
       .pharmacy-logo__img {
50
         max-width: 100%;
50
         max-width: 100%;
51
-        max-height: 100%;
51
+        max-height: 50%;
52
       }
52
       }
53
 
53
 
54
       .pharmacy-logo__name {
54
       .pharmacy-logo__name {
55
         font-size: 14px;
55
         font-size: 14px;
56
-        color: #fff;
56
+        color: @primary-color;
57
         margin-top: 8px;
57
         margin-top: 8px;
58
       }
58
       }
59
     }
59
     }

+ 2 - 2
src/app/views/sys-config/sys-config.component.ts

@@ -73,8 +73,8 @@ export class SysConfigComponent implements OnInit {
73
 
73
 
74
   getLogoOrFavicon(){
74
   getLogoOrFavicon(){
75
     this.tool.getSysNameAndLogoAsync().subscribe(result => {
75
     this.tool.getSysNameAndLogoAsync().subscribe(result => {
76
-      this.avatarUrl = result.logo || '';
77
-      this.avatarUrl1 = result.favicon || '';
76
+      this.avatarUrl = location.origin + '/file' + result.logo || '';
77
+      this.avatarUrl1 = location.origin + '/file' + result.favicon || '';
78
     })
78
     })
79
   }
79
   }
80
 
80