From 4253380de1290b34bdc0c5f923f088ee32a2b585 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cyiyousong=E2=80=9D?= <鈥測ousong_yi@foxmail.com鈥�>
Date: Mon, 27 Mar 2023 15:50:14 +0800
Subject: [PATCH] =?UTF-8?q?pref:=E4=BF=AE=E6=94=B9=E7=9A=AE=E8=82=A4?=
=?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=97=B6=E7=9A=84=E4=BA=A7=E5=93=81=E9=80=89?=
=?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../basicset/surface/components/LeftMenu.vue | 7 ++++++-
.../surface/components/RightPreview.vue | 18 ++++++++++++------
.../basicset/surface/modal/AddSurface.vue | 17 +++++------------
.../admin/src/store/modules/site.js | 4 ++++
4 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/base-manager-ui/admin/src/pages/basicset/surface/components/LeftMenu.vue b/base-manager-ui/admin/src/pages/basicset/surface/components/LeftMenu.vue
index 4a4db51e..9beae2f6 100644
--- a/base-manager-ui/admin/src/pages/basicset/surface/components/LeftMenu.vue
+++ b/base-manager-ui/admin/src/pages/basicset/surface/components/LeftMenu.vue
@@ -24,6 +24,7 @@
<script>
import { getProductList } from "@/services/surface";
+import { mapMutations } from "vuex";
export default {
data() {
return {
@@ -35,6 +36,7 @@ export default {
this.getProductList();
},
methods: {
+ ...mapMutations("site", ["SET_curProduct"]),
// 鑾峰彇浜у搧鍒楄〃
async getProductList(search = {}) {
let res = await getProductList({ page: 1, size: -1, ...search });
@@ -54,9 +56,12 @@ export default {
productId: row.id,
productName: row.productName,
};
- this.$emit("clickFacility", obj);
+ this.SET_curProduct(obj);
},
},
+ beforeDestroy() {
+ this.SET_curProduct({});
+ },
};
</script>
diff --git a/base-manager-ui/admin/src/pages/basicset/surface/components/RightPreview.vue b/base-manager-ui/admin/src/pages/basicset/surface/components/RightPreview.vue
index 0aa68469..47cc4eea 100644
--- a/base-manager-ui/admin/src/pages/basicset/surface/components/RightPreview.vue
+++ b/base-manager-ui/admin/src/pages/basicset/surface/components/RightPreview.vue
@@ -53,12 +53,18 @@ export default {
return {
simpleImage: Empty.PRESENTED_IMAGE_SIMPLE,
categoryId: "", // 鍒嗙被ID
- facilityInfo: {}, // 璁惧淇℃伅
previewList: [], // 鐨偆鍒楄〃
};
},
computed: {
- ...mapState("site", ["curSkinIndex"]),
+ ...mapState("site", ["curSkinIndex", "curProduct"]),
+ },
+ watch: {
+ curProduct(newVal) {
+ if (Object.keys(newVal).length) {
+ this.getSkinList({ productId: newVal.productId });
+ }
+ },
},
created() {
// this.getSkinList();
@@ -80,8 +86,8 @@ export default {
"SET_curSkinIndex",
]),
// 鑾峰彇璁惧淇℃伅
- getFacilityInfo(info) {
- this.facilityInfo = info;
+ getcurProduct(info) {
+ this.curProduct = info;
this.getSkinList({ productId: info.id });
},
// 鑾峰彇鐨偆鍒楄〃
@@ -90,7 +96,7 @@ export default {
let res = await getSkinList({
page: 1,
size: -1,
- productName: this.facilityInfo.productName,
+ productName: this.curProduct.productName,
categoryId: this.categoryId,
...search,
});
@@ -114,7 +120,7 @@ export default {
},
// 鏂板
AddSurface() {
- if (this.facilityInfo.productId) {
+ if (this.curProduct.productId) {
this.$emit("addSkin");
} else {
this.$message.warning("璇峰厛閫夋嫨璁惧");
diff --git a/base-manager-ui/admin/src/pages/basicset/surface/modal/AddSurface.vue b/base-manager-ui/admin/src/pages/basicset/surface/modal/AddSurface.vue
index 15823810..f366bc71 100644
--- a/base-manager-ui/admin/src/pages/basicset/surface/modal/AddSurface.vue
+++ b/base-manager-ui/admin/src/pages/basicset/surface/modal/AddSurface.vue
@@ -1,7 +1,7 @@
<template>
<div class="add-surface" v-if="show">
<a-card :bordered="false">
- <span slot="title">{{ facilityInfo.productName + "鐨偆" }}</span>
+ <span slot="title">{{ curProduct.productName + "鐨偆" }}</span>
<a-button slot="extra" @click="backOne">杩斿洖涓婁竴绾�</a-button>
<div class="add-surface-preview">
<div ref="content" class="add-surface-preview-content">
@@ -227,7 +227,6 @@ export default {
formLoading: false,
simpleImage: Empty.PRESENTED_IMAGE_SIMPLE,
accept: "image/jpeg,image/png,image/gif", // 涓婁紶绫诲瀷
- facilityInfo: {}, // 璁惧淇℃伅
skinTemplate: [], // 鐨偆妯℃澘鍒楄〃
curSkinTemplate: undefined, //褰撳墠閫夋嫨鐨偆妯℃澘
isEdit: false, // 鏄惁缂栬緫鐘舵€�
@@ -267,7 +266,7 @@ export default {
},
component() {
let str = "";
- switch (this.facilityInfo.productName) {
+ switch (this.curProduct.productName) {
case "鎺掑彿鏈�":
str = "LandscapeMode";
break;
@@ -304,7 +303,7 @@ export default {
}
return str;
},
- ...mapState("site", ["imageResolution"]),
+ ...mapState("site", ["imageResolution", "curProduct"]),
},
created() {},
watch: {
@@ -325,11 +324,6 @@ export default {
this.loading = false;
this.skinTemplate = [];
this.curSkinTemplate = undefined;
- this.facilityInfo = {};
- },
- // 鑾峰彇璁惧淇℃伅
- getFacilityInfo(info) {
- this.facilityInfo = info;
},
// 鑾峰彇鐨偆妯℃澘
async getTemplateList(search = {}) {
@@ -337,7 +331,7 @@ export default {
let res = await getTemplateList({
page: 1,
size: -1,
- productId: this.facilityInfo.productId,
+ productId: this.curProduct.productId,
...search,
});
let { data } = res.data.data;
@@ -407,7 +401,6 @@ export default {
html2canvas(conponentsId, {
backgroundColor: null,
useCORS: true,
- dpi: window.devicePixelRatio * 4, //璁惧鍍忕礌姣�
width: width,
height: height,
scale: 0.9,
@@ -429,7 +422,7 @@ export default {
if (code === 1) {
this.formData.previewImagePath = res.data.url;
let result = await skinSave({
- ...this.facilityInfo,
+ ...this.curProduct,
...this.formData,
});
let { code, msg } = result.data;
diff --git a/base-manager-ui/admin/src/store/modules/site.js b/base-manager-ui/admin/src/store/modules/site.js
index 27103953..65a90a1a 100644
--- a/base-manager-ui/admin/src/store/modules/site.js
+++ b/base-manager-ui/admin/src/store/modules/site.js
@@ -11,6 +11,7 @@ export default {
appDict: {}, // 搴旂敤瀛楀吀
curSkin: {}, // 褰撳墠閫変腑棰勮鐨偆
curSkinIndex: 0, // 褰撳墠閫変腑鐨偆绱㈠紩
+ curProduct: {}, // 鐨偆璁剧疆褰撳墠閫変腑浜у搧
},
getters: {
SiteTree(state) {
@@ -33,6 +34,9 @@ export default {
},
},
mutations: {
+ SET_curProduct(state, curProduct) {
+ state.curProduct = curProduct;
+ },
SET_curSkinIndex(state, curSkinIndex) {
state.curSkinIndex = curSkinIndex;
},
--
2.24.3