From 03588acf6faaf21bf8ed183e302ede3c63d1ce4f Mon Sep 17 00:00:00 2001
From: kkerwin <kkerwin@yeah.net>
Date: Tue, 21 Nov 2023 08:13:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dish-form/dish-form.component.html           |  8 ++++----
 .../components/dish-form/dish-form.component.ts  | 11 ++++++++++-
 .../admin/src/app/pages/dish/dish.component.html |  2 +-
 .../organization-form.component.html             |  4 ++--
 .../organization-form.component.ts               | 15 ++++++++++++---
 projects/cdk/src/dtos/enum.dto.ts                |  2 +-
 projects/cdk/src/services/api.service.ts         |  4 ++++
 .../dish-form/dish-form.component.html           |  8 ++++----
 .../components/dish-form/dish-form.component.ts  | 13 ++++++++++++-
 .../components/org-form/org-form.component.html  |  4 ++--
 .../components/org-form/org-form.component.ts    | 16 ++++++++++++----
 .../app/pages/data-vis/data-vis.component.html   |  4 ++--
 .../src/app/pages/data-vis/data-vis.component.ts |  7 ++++++-
 .../src/app/pages/dish/dish.component.html       |  2 +-
 .../system/org-info/org-info.component.html      |  2 +-
 proxy.conf.json                                  |  4 ++++
 16 files changed, 78 insertions(+), 28 deletions(-)

diff --git a/projects/admin/src/app/components/dish-form/dish-form.component.html b/projects/admin/src/app/components/dish-form/dish-form.component.html
index 3562ed0..06cd1ac 100644
--- a/projects/admin/src/app/components/dish-form/dish-form.component.html
+++ b/projects/admin/src/app/components/dish-form/dish-form.component.html
@@ -50,8 +50,8 @@
         </nz-form-label>
         <nz-form-control [nzErrorTip]="formControlErrorTpl">
             <nz-select nzPlaceHolder="请选择烹饪方式" formControlName="poly" nzAllowClear>
-                <nz-option *ngFor="let item of globalEnum.poly" [nzLabel]="item.key"
-                           [nzValue]="item.value">
+                <nz-option *ngFor="let item of globalEnum.poly" [nzLabel]="item.name"
+                           [nzValue]="item.key">
                 </nz-option>
             </nz-select>
         </nz-form-control>
@@ -74,8 +74,8 @@
         </nz-form-label>
         <nz-form-control [nzErrorTip]="formControlErrorTpl">
             <input type="hidden" formControlName="icon" />
-            <div class="mb-2" *ngIf="icon">
-                <img [src]="icon" class="h-20 w-20" />
+            <div class="mb-2" *ngIf="iconPreview">
+                <img [src]="iconPreview" class="h-20 w-20" />
             </div>
             <button class="upload-btn " nz-button [nzLoading]="uploadLoading">
                 <i nz-icon nzType="upload"></i>
diff --git a/projects/admin/src/app/components/dish-form/dish-form.component.ts b/projects/admin/src/app/components/dish-form/dish-form.component.ts
index 27e0d22..7979f5a 100644
--- a/projects/admin/src/app/components/dish-form/dish-form.component.ts
+++ b/projects/admin/src/app/components/dish-form/dish-form.component.ts
@@ -46,6 +46,8 @@ export class DishFormComponent {
 
 	addFoodVisible = false;
 
+	iconPreview = "";
+
 	get food(): FormArray {
 		return this.formGroup.get("ingredient") as FormArray;
 	}
@@ -119,6 +121,7 @@ export class DishFormComponent {
 					this.foodSelected.push(f.key);
 				}
 			});
+			this.iconPreview = "/icon/" + this.data["icon"];
 			this.formGroup.patchValue({
 				...this.data,
 				vendors: [this.data.vender],
@@ -226,8 +229,14 @@ export class DishFormComponent {
 		const fileReader = new FileReader();
 		fileReader.onload = () => {
 			const base64 = fileReader.result as string;
-			this.formGroup.get("icon")?.setValue(base64);
+			this.iconPreview = base64;
+			// this.formGroup.get("icon")?.setValue(base64);
 		};
 		fileReader.readAsDataURL(file);
+		const formdata = new FormData();
+		formdata.append("file", file);
+		this.api.upload(formdata).subscribe((res) => {
+			this.formGroup.get("icon")?.setValue(res.body);
+		});
 	}
 }
diff --git a/projects/admin/src/app/pages/dish/dish.component.html b/projects/admin/src/app/pages/dish/dish.component.html
index 767deb7..303407a 100644
--- a/projects/admin/src/app/pages/dish/dish.component.html
+++ b/projects/admin/src/app/pages/dish/dish.component.html
@@ -54,7 +54,7 @@
                         <ng-container *ngSwitchCase="'icon'">
                             <div class="dish-img overflow-auto"
                                  *ngIf="data"
-                                 [ngStyle]="{'background-image':'url(' + data +  ')'}">
+                                 [ngStyle]="{'background-image':'url(/icon/' +  data +  ')'}">
                             </div>
                         </ng-container>
                         <ng-container *ngSwitchCase="'vender'">
diff --git a/projects/admin/src/app/pages/organization/organization-form/organization-form.component.html b/projects/admin/src/app/pages/organization/organization-form/organization-form.component.html
index 5a85adc..73e60eb 100644
--- a/projects/admin/src/app/pages/organization/organization-form/organization-form.component.html
+++ b/projects/admin/src/app/pages/organization/organization-form/organization-form.component.html
@@ -27,8 +27,8 @@
                     单位Logo
                 </nz-form-label>
                 <nz-form-control [nzErrorTip]="formControlErrorTpl" nzSpan="12">
-                    <div class="mb-2" *ngIf="icon">
-                        <img [src]="icon" class="h-20 w-20" />
+                    <div class="mb-2" *ngIf="iconPreview">
+                        <img [src]="iconPreview" class="h-20 w-20" />
                     </div>
                     <button class="vlock upload-btn " nz-button [nzLoading]="uploadLoading">
                         <i nz-icon nzType="upload"></i>
diff --git a/projects/admin/src/app/pages/organization/organization-form/organization-form.component.ts b/projects/admin/src/app/pages/organization/organization-form/organization-form.component.ts
index 3058fca..f49c090 100644
--- a/projects/admin/src/app/pages/organization/organization-form/organization-form.component.ts
+++ b/projects/admin/src/app/pages/organization/organization-form/organization-form.component.ts
@@ -41,6 +41,8 @@ export class OrganizationFormComponent {
 
 	globalEnum = this.api.globalEnum;
 
+	iconPreview = "";
+
 	get icon() {
 		return this.formGroup.get("icon")?.value;
 	}
@@ -60,6 +62,9 @@ export class OrganizationFormComponent {
 			email: this.fb.control("", []),
 		});
 		this.formGroup.patchValue(this.state);
+		if (this.state["icon"]) {
+			this.iconPreview = "/icon/" + this.state["icon"];
+		}
 	}
 
 	async onSubmit() {
@@ -93,10 +98,14 @@ export class OrganizationFormComponent {
 		const fileReader = new FileReader();
 		fileReader.onload = () => {
 			const base64 = fileReader.result as string;
-			this.formGroup.patchValue({
-				icon: base64,
-			});
+			this.iconPreview = base64;
+			// this.formGroup.get("icon")?.setValue(base64);
 		};
 		fileReader.readAsDataURL(file);
+		const formdata = new FormData();
+		formdata.append("file", file);
+		this.api.upload(formdata).subscribe((res) => {
+			this.formGroup.get("icon")?.setValue(res.body);
+		});
 	}
 }
diff --git a/projects/cdk/src/dtos/enum.dto.ts b/projects/cdk/src/dtos/enum.dto.ts
index cec86f9..45f423f 100644
--- a/projects/cdk/src/dtos/enum.dto.ts
+++ b/projects/cdk/src/dtos/enum.dto.ts
@@ -7,7 +7,7 @@ export type GlobalEnum = {
 	venderType: CategoryDTO[];
 	mealType: OptionItemInterface[];
 	menuStatus: OptionItemInterface[];
-	poly: MarkDTO[];
+	poly: { key: string; name: string }[];
 };
 
 export type CategoryDTO = {
diff --git a/projects/cdk/src/services/api.service.ts b/projects/cdk/src/services/api.service.ts
index 2a0c1d1..393360f 100644
--- a/projects/cdk/src/services/api.service.ts
+++ b/projects/cdk/src/services/api.service.ts
@@ -49,6 +49,10 @@ export class ApiService {
 		}
 	}
 
+	upload(data: FormData) {
+		return this.http.put<ResponseType>("/api/icon", data);
+	}
+
 	private _formatEnum(v: CategoryDTO[]): OptionItemInterface[] {
 		return v.map((i) => ({ label: i.key, value: i.value }));
 	}
diff --git a/projects/client/src/app/components/dish-form/dish-form.component.html b/projects/client/src/app/components/dish-form/dish-form.component.html
index c2a3618..ce1d18d 100644
--- a/projects/client/src/app/components/dish-form/dish-form.component.html
+++ b/projects/client/src/app/components/dish-form/dish-form.component.html
@@ -26,8 +26,8 @@
         </nz-form-label>
         <nz-form-control [nzErrorTip]="formControlErrorTpl">
             <nz-select nzPlaceHolder="请选择烹饪方式" formControlName="poly" nzAllowClear>
-                <nz-option *ngFor="let item of globalEnum.poly" [nzLabel]="item.key"
-                           [nzValue]="item.value">
+                <nz-option *ngFor="let item of globalEnum.poly" [nzLabel]="item.name"
+                           [nzValue]="item.key">
                 </nz-option>
             </nz-select>
         </nz-form-control>
@@ -47,8 +47,8 @@
         </nz-form-label>
         <nz-form-control [nzErrorTip]="formControlErrorTpl">
             <input type="hidden" formControlName="icon" />
-            <div class="mb-2" *ngIf="icon">
-                <img [src]="icon" class="h-20 w-20" />
+            <div class="mb-2" *ngIf="iconPreview">
+                <img [src]="iconPreview" class="h-20 w-20" />
             </div>
             <button class="upload-btn " nz-button [nzLoading]="uploadLoading">
                 <i nz-icon nzType="upload"></i>
diff --git a/projects/client/src/app/components/dish-form/dish-form.component.ts b/projects/client/src/app/components/dish-form/dish-form.component.ts
index 8bc5399..bb73154 100644
--- a/projects/client/src/app/components/dish-form/dish-form.component.ts
+++ b/projects/client/src/app/components/dish-form/dish-form.component.ts
@@ -46,6 +46,8 @@ export class DishFormComponent {
 
 	addFoodVisible = false;
 
+	iconPreview = "";
+
 	get food(): FormArray {
 		return this.formGroup.get("ingredient") as FormArray;
 	}
@@ -122,6 +124,9 @@ export class DishFormComponent {
 				...this.data,
 				mark: this.data.marks,
 			});
+			if (this.data["icon"]) {
+				this.iconPreview = "/icon/" + this.data["icon"];
+			}
 		}
 	}
 
@@ -224,8 +229,14 @@ export class DishFormComponent {
 		const fileReader = new FileReader();
 		fileReader.onload = () => {
 			const base64 = fileReader.result as string;
-			this.formGroup.get("icon")?.setValue(base64);
+			this.iconPreview = base64;
+			// this.formGroup.get("icon")?.setValue(base64);
 		};
 		fileReader.readAsDataURL(file);
+		const formdata = new FormData();
+		formdata.append("file", file);
+		this.api.upload(formdata).subscribe((res) => {
+			this.formGroup.get("icon")?.setValue(res.body);
+		});
 	}
 }
diff --git a/projects/client/src/app/components/org-form/org-form.component.html b/projects/client/src/app/components/org-form/org-form.component.html
index 7dda7fb..f77098b 100644
--- a/projects/client/src/app/components/org-form/org-form.component.html
+++ b/projects/client/src/app/components/org-form/org-form.component.html
@@ -14,8 +14,8 @@
                 单位Logo
             </nz-form-label>
             <nz-form-control [nzErrorTip]="formControlErrorTpl">
-                <div class="mb-2" *ngIf="icon">
-                    <img [src]="icon" class="h-20 w-20" />
+                <div class="mb-2" *ngIf="iconPreview">
+                    <img [src]="iconPreview" class="h-20 w-20" />
                 </div>
                 <button class="vlock upload-btn " nz-button [nzLoading]="uploadLoading">
                     <i nz-icon nzType="upload"></i>
diff --git a/projects/client/src/app/components/org-form/org-form.component.ts b/projects/client/src/app/components/org-form/org-form.component.ts
index ddc9b07..318408d 100644
--- a/projects/client/src/app/components/org-form/org-form.component.ts
+++ b/projects/client/src/app/components/org-form/org-form.component.ts
@@ -30,12 +30,13 @@ export class OrgFormComponent {
 
 	uploadLoading = false;
 
+	iconPreview = "";
+
 	get icon() {
 		return this.formGroup.get("icon")?.value;
 	}
 
 	ngOnInit(): void {
-		console.log("this.state", this.state);
 		this.formGroup = this.fb.group({
 			id: this.fb.control(""),
 			name: this.fb.control("", [FormValidators.required("单位名称不能为空")]),
@@ -46,6 +47,9 @@ export class OrgFormComponent {
 			email: this.fb.control("", []),
 		});
 		this.formGroup.patchValue(this.state);
+		if (this.state["icon"]) {
+			this.iconPreview = "/icon/" + this.state["icon"];
+		}
 	}
 
 	async onSubmit() {
@@ -79,10 +83,14 @@ export class OrgFormComponent {
 		const fileReader = new FileReader();
 		fileReader.onload = () => {
 			const base64 = fileReader.result as string;
-			this.formGroup.patchValue({
-				icon: base64,
-			});
+			this.iconPreview = base64;
+			// this.formGroup.get("icon")?.setValue(base64);
 		};
 		fileReader.readAsDataURL(file);
+		const formdata = new FormData();
+		formdata.append("file", file);
+		this.api.upload(formdata).subscribe((res) => {
+			this.formGroup.get("icon")?.setValue(res.body);
+		});
 	}
 }
diff --git a/projects/client/src/app/pages/data-vis/data-vis.component.html b/projects/client/src/app/pages/data-vis/data-vis.component.html
index df38170..db727a4 100644
--- a/projects/client/src/app/pages/data-vis/data-vis.component.html
+++ b/projects/client/src/app/pages/data-vis/data-vis.component.html
@@ -1,7 +1,7 @@
 <div class="body flex flex-col">
     <div class="head clearfix">
         <div class="logo">
-            <img src="/assets/images/jl-logo.png" />
+            <img *ngIf="logo" [attr.src]="'/icon/' + logo" />
         </div>
         <h1 class="title">{{orgName}}食谱营养报告</h1>
         <div class="time">{{showTime}}</div>
@@ -65,7 +65,7 @@
                     <div class="boxnav">
                         <div class="p-4">
                             <div nz-row [nzGutter]="[12,12]">
-                                <div nz-col nzSpan="6" *ngFor="let type of analysis.types | keyvalue">
+                                <div nz-col nzSpan="6" *ngFor="let type of analysis?.types | keyvalue">
                                     {{type.key}} : <b>{{type.value}}</b> 种
                                 </div>
                             </div>
diff --git a/projects/client/src/app/pages/data-vis/data-vis.component.ts b/projects/client/src/app/pages/data-vis/data-vis.component.ts
index 7266766..597120c 100644
--- a/projects/client/src/app/pages/data-vis/data-vis.component.ts
+++ b/projects/client/src/app/pages/data-vis/data-vis.component.ts
@@ -39,8 +39,13 @@ export class DataVisComponent implements AfterViewInit {
 
 	menuId!: number;
 
+	logo = "";
+
 	ngOnInit(): void {
-		this.orgName = this.api.account?.vender?.name ?? "";
+		const account = this.api.account;
+		this.orgName = account?.vender?.name ?? "";
+		this.logo = account?.vender?.icon ?? "";
+
 		interval(1000)
 			.pipe(takeUntil(this.destroy$))
 			.subscribe(() => {
diff --git a/projects/client/src/app/pages/dish/dish.component.html b/projects/client/src/app/pages/dish/dish.component.html
index b9e3b42..0c48227 100644
--- a/projects/client/src/app/pages/dish/dish.component.html
+++ b/projects/client/src/app/pages/dish/dish.component.html
@@ -60,7 +60,7 @@
                                 <ng-container *ngSwitchCase="'icon'">
                                     <div class="dish-img overflow-auto"
                                          *ngIf="data"
-                                         [ngStyle]="{'background-image':'url(' + data +  ')'}">
+                                         [ngStyle]="{'background-image':'url(/icon/' + data +  ')'}">
                                     </div>
                                 </ng-container>
                                 <ng-container *ngSwitchCase="'vender'">
diff --git a/projects/client/src/app/pages/system/org-info/org-info.component.html b/projects/client/src/app/pages/system/org-info/org-info.component.html
index f24fa53..bd941e5 100644
--- a/projects/client/src/app/pages/system/org-info/org-info.component.html
+++ b/projects/client/src/app/pages/system/org-info/org-info.component.html
@@ -25,7 +25,7 @@
                 </nz-form-label>
                 <nz-form-control>
                     <div class="w-20 h-20" *ngIf="org.icon">
-                        <img [src]="org.icon" class=" w-full h-full" />
+                        <img [src]="'/icon/' + org.icon" class=" w-full h-full" />
                     </div>
                 </nz-form-control>
             </nz-form-item>
diff --git a/proxy.conf.json b/proxy.conf.json
index 58f8922..816c993 100644
--- a/proxy.conf.json
+++ b/proxy.conf.json
@@ -2,5 +2,9 @@
 	"/api": {
 		"target": "http://47.109.27.8:9527",
 		"secure": false
+	},
+	"/icon": {
+		"target": "http://47.109.27.8:9527",
+		"secure": false
 	}
 }