图片逻辑修改

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"
+                <nz-option *ngFor="let item of globalEnum.poly" [nzLabel]="item.name"
-                           [nzValue]="item.value">
+                           [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">
+            <div class="mb-2" *ngIf="iconPreview">
-                <img [src]="icon" class="h-20 w-20" />
+                <img [src]="iconPreview" class="h-20 w-20" />
             </div>
             <button class="upload-btn " nz-button [nzLoading]="uploadLoading">
                 <i nz-icon nzType="upload"></i>

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);
+		});
 	}
 }

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'">

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">
+                    <div class="mb-2" *ngIf="iconPreview">
-                        <img [src]="icon" class="h-20 w-20" />
+                        <img [src]="iconPreview" class="h-20 w-20" />
                     </div>
                     <button class="vlock upload-btn " nz-button [nzLoading]="uploadLoading">
                         <i nz-icon nzType="upload"></i>

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({
+			this.iconPreview = base64;
-				icon: 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);
+		});
 	}
 }

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 = {

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 }));
 	}

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"
+                <nz-option *ngFor="let item of globalEnum.poly" [nzLabel]="item.name"
-                           [nzValue]="item.value">
+                           [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">
+            <div class="mb-2" *ngIf="iconPreview">
-                <img [src]="icon" class="h-20 w-20" />
+                <img [src]="iconPreview" class="h-20 w-20" />
             </div>
             <button class="upload-btn " nz-button [nzLoading]="uploadLoading">
                 <i nz-icon nzType="upload"></i>

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);
+		});
 	}
 }

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">
+                <div class="mb-2" *ngIf="iconPreview">
-                    <img [src]="icon" class="h-20 w-20" />
+                    <img [src]="iconPreview" class="h-20 w-20" />
                 </div>
                 <button class="vlock upload-btn " nz-button [nzLoading]="uploadLoading">
                     <i nz-icon nzType="upload"></i>

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({
+			this.iconPreview = base64;
-				icon: 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);
+		});
 	}
 }

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>

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(() => {

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'">

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>

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
 	}
 }