diff --git a/base-manager-ui/admin/src/pages/basicset/surface/appraiseskin/AppraiseSkin.vue b/base-manager-ui/admin/src/pages/basicset/surface/appraiseskin/AppraiseSkin.vue
index edb58f58b8d081d13786bebe47fbc3395417056a..dd99db1d207e181c58c3bd4791a68b778a39aca7 100644
--- a/base-manager-ui/admin/src/pages/basicset/surface/appraiseskin/AppraiseSkin.vue
+++ b/base-manager-ui/admin/src/pages/basicset/surface/appraiseskin/AppraiseSkin.vue
@@ -4,7 +4,7 @@
<div
:id="componentsId"
class="call-out-skin-across"
- v-if="imageResolution === '1'"
+ v-if="resolution === '1920x1080'"
:style="{
background: filterItem('1', 0),
}"
@@ -60,41 +60,6 @@
background: filterItem('4', i),
}"
></div>
- <!-- <div
- class="footer-btn flex flexc jcc"
- :class="{ border: !filterItem('4', 1) }"
- :style="{
- background: filterItem('4', 1),
- }"
- ></div>
- <div
- class="footer-btn flex flexc jcc"
- :class="{ border: !filterItem('4', 2) }"
- :style="{
- background: filterItem('4', 2),
- }"
- ></div>
- <div
- class="footer-btn flex flexc jcc"
- :class="{ border: !filterItem('4', 3) }"
- :style="{
- background: filterItem('4', 3),
- }"
- ></div>
- <div
- class="footer-btn flex flexc jcc"
- :class="{ border: !filterItem('4', 4) }"
- :style="{
- background: filterItem('4', 4),
- }"
- ></div>
- <div
- class="footer-btn flex flexc jcc"
- :class="{ border: !filterItem('4', 5) }"
- :style="{
- background: filterItem('4', 5),
- }"
- ></div> -->
</div>
</div>
<!-- 绌烘暟鎹樉绀� -->
@@ -112,6 +77,9 @@
</template>
<script>
+import { unifyResolution } from "@/utils";
+import { filterItems } from "@/utils";
+import { mapGetters } from "vuex";
export default {
props: {
skinFieldList: {
@@ -123,48 +91,26 @@ export default {
},
imageResolution: {
required: true,
- default: "1",
+ default: "",
},
componentsId: {
required: true,
type: String,
},
},
+ computed: {
+ ...mapGetters("site", ["imageResolutions"]),
+ resolution() {
+ let data = filterItems(this.imageResolution, this.imageResolutions);
+ return unifyResolution(data);
+ },
+ },
data() {
return {
api: process.env.VUE_APP_API_IMG_URL,
};
},
methods: {
- // 杩囨护鍥剧墖
- // filterImg(val) {
- // let url = "";
- // this.skinFieldList
- // .filter((v) => {
- // return v.fieldType === "2";
- // })
- // .forEach((v) => {
- // if (v.fieldName !== "" && v.fieldName === val) {
- // url = v.fieldValue;
- // }
- // });
- // return url;
- // },
- // // 杩囨护棰滆壊
- // filterColor(val) {
- // let str = "";
- // this.skinFieldList
- // .filter((v) => {
- // return v.fieldType === "1";
- // })
- // .forEach((v) => {
- // if (v.fieldName !== "" && v.fieldName === val) {
- // str = v.fieldValue;
- // }
- // });
- // return str;
- // },
-
// 杩囨护灞炴€х被鍨�
filterItem(type, index) {
let arr = this.skinFieldList.filter((v) => {
diff --git a/base-manager-ui/admin/src/pages/basicset/surface/calloutskin/CallOutSkin.vue b/base-manager-ui/admin/src/pages/basicset/surface/calloutskin/CallOutSkin.vue
index b492e9f3c13cc021f129954f910523177fbc68c3..55f50db734fc27a5a2b9d254748412ffe2c0a8c2 100644
--- a/base-manager-ui/admin/src/pages/basicset/surface/calloutskin/CallOutSkin.vue
+++ b/base-manager-ui/admin/src/pages/basicset/surface/calloutskin/CallOutSkin.vue
@@ -4,7 +4,7 @@
<div
:id="componentsId"
class="call-out-skin-across"
- v-if="imageResolution === '1'"
+ v-if="resolution === '1920x1080'"
:style="{
background: filterItem('1', 0),
}"
@@ -138,6 +138,9 @@
</template>
<script>
+import { unifyResolution } from "@/utils";
+import { filterItems } from "@/utils";
+import { mapGetters } from "vuex";
export default {
props: {
skinFieldList: {
@@ -149,48 +152,26 @@ export default {
},
imageResolution: {
required: true,
- default: "1",
+ default: "",
},
componentsId: {
required: true,
type: String,
},
},
+ computed: {
+ ...mapGetters("site", ["imageResolutions"]),
+ resolution() {
+ let data = filterItems(this.imageResolution, this.imageResolutions);
+ return unifyResolution(data);
+ },
+ },
data() {
return {
api: process.env.VUE_APP_API_IMG_URL,
};
},
methods: {
- // 杩囨护鍥剧墖
- // filterImg(val) {
- // let url = "";
- // this.skinFieldList
- // .filter((v) => {
- // return v.fieldType === "2";
- // })
- // .forEach((v) => {
- // if (v.fieldName !== "" && v.fieldName === val) {
- // url = v.fieldValue;
- // }
- // });
- // return url;
- // },
- // // 杩囨护棰滆壊
- // filterColor(val) {
- // let str = "";
- // this.skinFieldList
- // .filter((v) => {
- // return v.fieldType === "1";
- // })
- // .forEach((v) => {
- // if (v.fieldName !== "" && v.fieldName === val) {
- // str = v.fieldValue;
- // }
- // });
- // return str;
- // },
-
// 杩囨护灞炴€х被鍨�
filterItem(type, index) {
let arr = this.skinFieldList.filter((v) => {
diff --git a/base-manager-ui/admin/src/pages/basicset/surface/centralizeskin/CentralizeSkin.vue b/base-manager-ui/admin/src/pages/basicset/surface/centralizeskin/CentralizeSkin.vue
index 3403a74df42894e915dea2bc47d1193e1aff9d9b..4add818aa649af7060c4f3e1500201900dee09ea 100644
--- a/base-manager-ui/admin/src/pages/basicset/surface/centralizeskin/CentralizeSkin.vue
+++ b/base-manager-ui/admin/src/pages/basicset/surface/centralizeskin/CentralizeSkin.vue
@@ -4,7 +4,7 @@
<div
class="centralize-across"
:id="componentsId"
- v-if="imageResolution === '1'"
+ v-if="resolution === '1920x1080'"
:style="{
background: filterItem('1', 0),
}"
@@ -161,7 +161,7 @@
<div
class="vertical-skin"
:id="componentsId"
- v-else-if="imageResolution === '2'"
+ v-else-if="resolution === '1080x1920'"
:style="{
background: filterItem('1', 0),
}"
@@ -288,6 +288,9 @@
</template>
<script>
+import { unifyResolution } from "@/utils";
+import { filterItems } from "@/utils";
+import { mapGetters } from "vuex";
export default {
props: {
skinFieldList: {
@@ -299,48 +302,26 @@ export default {
},
imageResolution: {
required: true,
- default: "1",
+ default: "",
},
componentsId: {
required: true,
type: String,
},
},
+ computed: {
+ ...mapGetters("site", ["imageResolutions"]),
+ resolution() {
+ let data = filterItems(this.imageResolution, this.imageResolutions);
+ return unifyResolution(data);
+ },
+ },
data() {
return {
api: process.env.VUE_APP_API_IMG_URL,
};
},
methods: {
- // 杩囨护鍥剧墖
- // filterImg(val) {
- // let url = "";
- // this.skinFieldList
- // .filter((v) => {
- // return v.fieldType === "2";
- // })
- // .forEach((v) => {
- // if (v.fieldName !== "" && v.fieldName === val) {
- // url = v.fieldValue;
- // }
- // });
- // return url;
- // },
- // // 杩囨护棰滆壊
- // filterColor(val) {
- // let str = "";
- // this.skinFieldList
- // .filter((v) => {
- // return v.fieldType === "1";
- // })
- // .forEach((v) => {
- // if (v.fieldName !== "" && v.fieldName === val) {
- // str = v.fieldValue;
- // }
- // });
- // return str;
- // },
-
// 杩囨护灞炴€х被鍨�
filterItem(type, index) {
let arr = this.skinFieldList.filter((v) => {
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 a52baff1290d93e4b22fdf8b080a7904a723b64c..66e83de6319dbdf3bfb83b6510dbf402a3dc013e 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
@@ -24,7 +24,7 @@
>
<img :src="v.previewImagePath" />
<div class="name">
- {{ v.name }}
+ {{ v.name }}-{{ filterItems(v.imageResolution, imageResolution) }}
</div>
</div>
</div>
@@ -44,6 +44,7 @@
import { getSkinList } from "@/services/surface";
import { Empty } from "ant-design-vue";
import { mapMutations, mapState } from "vuex";
+import { filterItems } from "@/utils";
export default {
props: {
classifyList: {
@@ -56,6 +57,7 @@ export default {
},
data() {
return {
+ filterItems,
simpleImage: Empty.PRESENTED_IMAGE_SIMPLE,
categoryId: "", // 鍒嗙被ID
previewList: [], // 鐨偆鍒楄〃
@@ -63,7 +65,7 @@ export default {
};
},
computed: {
- ...mapState("site", ["curSkinIndex", "curProduct"]),
+ ...mapState("site", ["curSkinIndex", "curProduct", "imageResolution"]),
},
watch: {
curProduct(newVal) {
@@ -198,9 +200,10 @@ export default {
left: 0px;
bottom: 0px;
text-align: center;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
}
}
.active {
diff --git a/base-manager-ui/admin/src/pages/basicset/surface/defaultshow/DefaultShow.vue b/base-manager-ui/admin/src/pages/basicset/surface/defaultshow/DefaultShow.vue
index 85390c28f3770073a045886e4acf2e899cae7f3a..4d7bb66186a5316efb31513ddb2afb82f1cb39d3 100644
--- a/base-manager-ui/admin/src/pages/basicset/surface/defaultshow/DefaultShow.vue
+++ b/base-manager-ui/admin/src/pages/basicset/surface/defaultshow/DefaultShow.vue
@@ -4,22 +4,21 @@
<div
:id="componentsId"
class="across-skin"
- v-if="imageResolution === '1'"
:style="{
background: filterItem('1', 0),
}"
></div>
<!-- 绔栫増 1080*1920 -->
- <div
+ <!-- <div
class="vertical-skin"
:id="componentsId"
- v-else-if="imageResolution === '2'"
+ v-else-if="resolution === '1080x1920'"
:style="{
background: filterItem('1', 0),
}"
- ></div>
+ ></div> -->
<!-- 绌烘暟鎹樉绀� -->
- <div class="empty flex aic jcc" v-else>
+ <!-- <div class="empty flex aic jcc" v-else>
<a-empty
:image="require('../../../../assets/img/original.png')"
:image-style="{
@@ -28,11 +27,14 @@
>
<span slot="description"> <a href="#API">鏆傛棤鐨偆妯℃澘</a> </span>
</a-empty>
- </div>
+ </div> -->
</div>
</template>
<script>
+import { unifyResolution } from "@/utils";
+import { filterItems } from "@/utils";
+import { mapGetters } from "vuex";
export default {
props: {
// imgItem: {
@@ -51,13 +53,20 @@ export default {
},
imageResolution: {
required: true,
- default: "1",
+ default: "",
},
componentsId: {
required: true,
type: String,
},
},
+ computed: {
+ ...mapGetters("site", ["imageResolutions"]),
+ resolution() {
+ let data = filterItems(this.imageResolution, this.imageResolutions);
+ return unifyResolution(data);
+ },
+ },
data() {
return {
api: process.env.VUE_APP_API_IMG_URL,
diff --git a/base-manager-ui/admin/src/pages/basicset/surface/desSelfservice/DesSelfService.vue b/base-manager-ui/admin/src/pages/basicset/surface/desSelfservice/DesSelfService.vue
index 390b4435aa5113ac9272ccc349768c78bacd7b21..dc3746922e73d4144e4807ec249f2de29cf6a85e 100644
--- a/base-manager-ui/admin/src/pages/basicset/surface/desSelfservice/DesSelfService.vue
+++ b/base-manager-ui/admin/src/pages/basicset/surface/desSelfservice/DesSelfService.vue
@@ -3,7 +3,7 @@
<!-- 妗岄潰鑷姪鏈嶅姟缁堢 妯澘 -->
<div
:id="componentsId"
- v-if="imageResolution === '1'"
+ v-if="resolution === '1920x1080'"
class="across-skin flex flexc aic"
:style="{
background: filterItem('1', 0),
@@ -95,6 +95,9 @@
</template>
<script>
+import { unifyResolution } from "@/utils";
+import { filterItems } from "@/utils";
+import { mapGetters } from "vuex";
export default {
props: {
skinFieldList: {
@@ -106,13 +109,20 @@ export default {
},
imageResolution: {
required: true,
- default: "1",
+ default: "",
},
componentsId: {
required: true,
type: String,
},
},
+ computed: {
+ ...mapGetters("site", ["imageResolutions"]),
+ resolution() {
+ let data = filterItems(this.imageResolution, this.imageResolutions);
+ return unifyResolution(data);
+ },
+ },
data() {
return {
api: process.env.VUE_APP_API_IMG_URL,
diff --git a/base-manager-ui/admin/src/pages/basicset/surface/infoDisSkin/InfoDisSkin.vue b/base-manager-ui/admin/src/pages/basicset/surface/infoDisSkin/InfoDisSkin.vue
index 5130ba60e07562a5b1e41a29cae41c361f8b43db..af53a441e66de94464f6f2d4043ac6001f37f60d 100644
--- a/base-manager-ui/admin/src/pages/basicset/surface/infoDisSkin/InfoDisSkin.vue
+++ b/base-manager-ui/admin/src/pages/basicset/surface/infoDisSkin/InfoDisSkin.vue
@@ -4,7 +4,7 @@
<div
class="vertical-skin flex flexc aic"
:id="componentsId"
- v-if="imageResolution === '2'"
+ v-if="resolution === '1080x1920'"
:style="{
background: filterItem('1', 0),
}"
@@ -51,15 +51,11 @@
</template>
<script>
+import { unifyResolution } from "@/utils";
+import { filterItems } from "@/utils";
+import { mapGetters } from "vuex";
export default {
props: {
- // imgItem: {
- // type: Array,
- // required: true,
- // default: () => {
- // return [];
- // },
- // },
skinFieldList: {
type: Array,
required: true,
@@ -69,18 +65,26 @@ export default {
},
imageResolution: {
required: true,
- default: "1",
+ default: "",
},
componentsId: {
required: true,
type: String,
},
},
+
data() {
return {
api: process.env.VUE_APP_API_IMG_URL,
};
},
+ computed: {
+ ...mapGetters("site", ["imageResolutions"]),
+ resolution() {
+ let data = filterItems(this.imageResolution, this.imageResolutions);
+ return unifyResolution(data);
+ },
+ },
methods: {
// 杩囨护灞炴€х被鍨�
filterItem(type, index) {
diff --git a/base-manager-ui/admin/src/pages/basicset/surface/informationskin/InformationSkin.vue b/base-manager-ui/admin/src/pages/basicset/surface/informationskin/InformationSkin.vue
index a1799d7e45ffcdfc40040b4ca23984e741d75310..742728cea7d4372a18263b823cfbedc929331a6a 100644
--- a/base-manager-ui/admin/src/pages/basicset/surface/informationskin/InformationSkin.vue
+++ b/base-manager-ui/admin/src/pages/basicset/surface/informationskin/InformationSkin.vue
@@ -4,7 +4,7 @@
<div
:id="componentsId"
class="across-skin flex flexc"
- v-if="imageResolution === '1'"
+ v-if="resolution === '1920x1080'"
>
<div
class="header"
@@ -47,7 +47,7 @@
<div
:id="componentsId"
class="vertical-skin flex flexc"
- v-else-if="imageResolution === '2'"
+ v-else-if="resolution === '1080x1920'"
>
<div
class="header"
@@ -101,6 +101,9 @@
</template>
<script>
+import { unifyResolution } from "@/utils";
+import { filterItems } from "@/utils";
+import { mapGetters } from "vuex";
export default {
props: {
skinFieldList: {
@@ -112,7 +115,7 @@ export default {
},
imageResolution: {
required: true,
- default: "1",
+ default: "",
},
componentsId: {
required: true,
@@ -124,6 +127,13 @@ export default {
api: process.env.VUE_APP_API_IMG_URL,
};
},
+ computed: {
+ ...mapGetters("site", ["imageResolutions"]),
+ resolution() {
+ let data = filterItems(this.imageResolution, this.imageResolutions);
+ return unifyResolution(data);
+ },
+ },
methods: {
// 杩囨护灞炴€х被鍨�
filterItem(type, index) {
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 bb234b4acc25d2843697ed680aae7b0e2ae49064..012dfb3c8c4cc33a9bb38a925dcd8061fca70443 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
@@ -244,7 +244,7 @@ export default {
formData: {
categoryId: undefined, // 鎵€灞炵绫�
name: "", // 鐨偆鍚嶇О
- imageResolution: "1", // 鍒嗚鲸鐜�
+ imageResolution: undefined, // 鍒嗚鲸鐜�
skinFieldList: [], // 瀛楁灞炴€у垪琛�
previewImagePath: "", // 棰勮鍥惧湴鍧€
},
@@ -469,6 +469,7 @@ export default {
onAdd() {
Object.assign(this.formData, this.$options.data().formData);
this.formData.id && this.$delete(this.formData, "id");
+ this.formData.imageResolution = Object.keys(this.imageResolution)[0];
},
// 缂栬緫
onEdit(row) {
diff --git a/base-manager-ui/admin/src/pages/basicset/surface/queuingSkin/LandscapeMode.vue b/base-manager-ui/admin/src/pages/basicset/surface/queuingSkin/LandscapeMode.vue
index 7678f5f405c19cba2b5516689f89682ec0597f02..3488e7b304946a5b7bdb1e191c076bc2b1652707 100644
--- a/base-manager-ui/admin/src/pages/basicset/surface/queuingSkin/LandscapeMode.vue
+++ b/base-manager-ui/admin/src/pages/basicset/surface/queuingSkin/LandscapeMode.vue
@@ -4,7 +4,7 @@
<div
:id="componentsId"
class="across-skin"
- v-if="imageResolution === '1'"
+ v-if="resolution === '1920x1080'"
:style="{
background: filterItem('1', 0),
}"
@@ -76,7 +76,7 @@
<div
class="vertical-skin"
:id="componentsId"
- v-else-if="imageResolution === '2'"
+ v-else-if="resolution === '1080x1920'"
:style="{
background: filterItem('1', 0),
}"
@@ -153,15 +153,11 @@
</template>
<script>
+import { unifyResolution } from "@/utils";
+import { filterItems } from "@/utils";
+import { mapGetters } from "vuex";
export default {
props: {
- // imgItem: {
- // type: Array,
- // required: true,
- // default: () => {
- // return [];
- // },
- // },
skinFieldList: {
type: Array,
required: true,
@@ -171,7 +167,7 @@ export default {
},
imageResolution: {
required: true,
- default: "1",
+ default: "",
},
componentsId: {
required: true,
@@ -183,6 +179,13 @@ export default {
api: process.env.VUE_APP_API_IMG_URL,
};
},
+ computed: {
+ ...mapGetters("site", ["imageResolutions"]),
+ resolution() {
+ let data = filterItems(this.imageResolution, this.imageResolutions);
+ return unifyResolution(data);
+ },
+ },
methods: {
// 杩囨护灞炴€х被鍨�
filterItem(type, index) {
diff --git a/base-manager-ui/admin/src/pages/basicset/surface/sampleFormSkin/SampleFormSkin.vue b/base-manager-ui/admin/src/pages/basicset/surface/sampleFormSkin/SampleFormSkin.vue
index efe4a95d4a44dc7e38f44e737b367a7e31cec4e0..3b19847299411f3506258b97e382b5e7acbdf493 100644
--- a/base-manager-ui/admin/src/pages/basicset/surface/sampleFormSkin/SampleFormSkin.vue
+++ b/base-manager-ui/admin/src/pages/basicset/surface/sampleFormSkin/SampleFormSkin.vue
@@ -3,7 +3,7 @@
<!-- 鏍疯〃鏈� 妯澘 -->
<div
:id="componentsId"
- v-if="imageResolution === '1'"
+ v-if="resolution === '1920x1080'"
class="sample_form_skin flex flexc aic"
:style="{
background: filterItem('1', 0),
@@ -127,6 +127,9 @@
</template>
<script>
+import { unifyResolution } from "@/utils";
+import { filterItems } from "@/utils";
+import { mapGetters } from "vuex";
export default {
props: {
skinFieldList: {
@@ -138,7 +141,7 @@ export default {
},
imageResolution: {
required: true,
- default: "1",
+ default: "",
},
componentsId: {
required: true,
@@ -150,6 +153,13 @@ export default {
api: process.env.VUE_APP_API_IMG_URL,
};
},
+ computed: {
+ ...mapGetters("site", ["imageResolutions"]),
+ resolution() {
+ let data = filterItems(this.imageResolution, this.imageResolutions);
+ return unifyResolution(data);
+ },
+ },
methods: {
// 杩囨护灞炴€х被鍨�
filterItem(type, index) {
diff --git a/base-manager-ui/admin/src/pages/basicset/surface/selfservice/SelfService.vue b/base-manager-ui/admin/src/pages/basicset/surface/selfservice/SelfService.vue
index 5027a5f966136c547ee931e692921c660395c880..588b7a0457d86fcc0870fcc4962a321f3ca70d21 100644
--- a/base-manager-ui/admin/src/pages/basicset/surface/selfservice/SelfService.vue
+++ b/base-manager-ui/admin/src/pages/basicset/surface/selfservice/SelfService.vue
@@ -3,7 +3,7 @@
<!-- 鑷姪鏈嶅姟缁堢 妯澘 -->
<div
:id="componentsId"
- v-if="imageResolution === '1'"
+ v-if="resolution === '1920x1080'"
class="across-skin flex flexc aic"
:style="{
background: filterItem('1', 0),
@@ -95,6 +95,9 @@
</template>
<script>
+import { unifyResolution } from "@/utils";
+import { filterItems } from "@/utils";
+import { mapGetters } from "vuex";
export default {
props: {
skinFieldList: {
@@ -106,7 +109,7 @@ export default {
},
imageResolution: {
required: true,
- default: "1",
+ default: "",
},
componentsId: {
required: true,
@@ -118,6 +121,13 @@ export default {
api: process.env.VUE_APP_API_IMG_URL,
};
},
+ computed: {
+ ...mapGetters("site", ["imageResolutions"]),
+ resolution() {
+ let data = filterItems(this.imageResolution, this.imageResolutions);
+ return unifyResolution(data);
+ },
+ },
methods: {
// 杩囨护灞炴€х被鍨�
filterItem(type, index) {
diff --git a/base-manager-ui/admin/src/pages/basicset/surface/signdeviceskin/SignDeviceSkin.vue b/base-manager-ui/admin/src/pages/basicset/surface/signdeviceskin/SignDeviceSkin.vue
index 93783fcd5799e1349f04a6239db932c65f1d9687..779031df346a11f76e8fc06ae758c172417e90d0 100644
--- a/base-manager-ui/admin/src/pages/basicset/surface/signdeviceskin/SignDeviceSkin.vue
+++ b/base-manager-ui/admin/src/pages/basicset/surface/signdeviceskin/SignDeviceSkin.vue
@@ -3,7 +3,7 @@
<!-- 瀵艰鏈� 妯澘 -->
<div
:id="componentsId"
- v-if="imageResolution === '1'"
+ v-if="resolution === '1920x1080'"
class="across-skin flex flexc aic"
>
<!-- 澶撮儴 -->
@@ -74,6 +74,9 @@
</template>
<script>
+import { unifyResolution } from "@/utils";
+import { filterItems } from "@/utils";
+import { mapGetters } from "vuex";
export default {
props: {
skinFieldList: {
@@ -85,7 +88,7 @@ export default {
},
imageResolution: {
required: true,
- default: "1",
+ default: "",
},
componentsId: {
required: true,
@@ -97,6 +100,13 @@ export default {
api: process.env.VUE_APP_API_IMG_URL,
};
},
+ computed: {
+ ...mapGetters("site", ["imageResolutions"]),
+ resolution() {
+ let data = filterItems(this.imageResolution, this.imageResolutions);
+ return unifyResolution(data);
+ },
+ },
methods: {
// 杩囨护灞炴€х被鍨�
filterItem(type, index) {
diff --git a/base-manager-ui/admin/src/pages/basicset/surface/windowskin/WindowSkin.vue b/base-manager-ui/admin/src/pages/basicset/surface/windowskin/WindowSkin.vue
index 4cbb27a11e6d5a3f510ebc57e1b946be5373f87b..dfaec7d306131e3ead264eda976e06b4f209125c 100644
--- a/base-manager-ui/admin/src/pages/basicset/surface/windowskin/WindowSkin.vue
+++ b/base-manager-ui/admin/src/pages/basicset/surface/windowskin/WindowSkin.vue
@@ -4,7 +4,7 @@
<div
:id="componentsId"
class="window-skin-across flex jcb aic"
- v-if="imageResolution === '1'"
+ v-if="resolution === '1920x1080'"
:style="{
background: filterItem('1', 0),
}"
@@ -71,6 +71,9 @@
</template>
<script>
+import { unifyResolution } from "@/utils";
+import { filterItems } from "@/utils";
+import { mapGetters } from "vuex";
export default {
props: {
skinFieldList: {
@@ -82,7 +85,7 @@ export default {
},
imageResolution: {
required: true,
- default: "1",
+ default: "",
},
componentsId: {
required: true,
@@ -94,6 +97,13 @@ export default {
api: process.env.VUE_APP_API_IMG_URL,
};
},
+ computed: {
+ ...mapGetters("site", ["imageResolutions"]),
+ resolution() {
+ let data = filterItems(this.imageResolution, this.imageResolutions);
+ return unifyResolution(data);
+ },
+ },
methods: {
// 杩囨护灞炴€х被鍨�
filterItem(type, index) {
diff --git a/base-manager-ui/admin/src/pages/basicset/surface/writeFormSkin/WriteFormSkin.vue b/base-manager-ui/admin/src/pages/basicset/surface/writeFormSkin/WriteFormSkin.vue
index 8e41f8fc6f489dad56f9410a6f857c9eaffc8d08..409d18e932ae7416a77476820d2c898881ed389f 100644
--- a/base-manager-ui/admin/src/pages/basicset/surface/writeFormSkin/WriteFormSkin.vue
+++ b/base-manager-ui/admin/src/pages/basicset/surface/writeFormSkin/WriteFormSkin.vue
@@ -1,9 +1,9 @@
<template>
<div class="skin-box">
- <!-- 鏍疯〃鏈� 妯澘 -->
+ <!-- 濉崟鏈� 妯澘 -->
<div
:id="componentsId"
- v-if="imageResolution === '1'"
+ v-if="resolution === '1920x1080'"
class="sample_form_skin flex flexc aic"
:style="{
background: filterItem('1', 0),
@@ -166,6 +166,9 @@
</template>
<script>
+import { unifyResolution } from "@/utils";
+import { filterItems } from "@/utils";
+import { mapGetters } from "vuex";
export default {
props: {
skinFieldList: {
@@ -177,7 +180,7 @@ export default {
},
imageResolution: {
required: true,
- default: "1",
+ default: "",
},
componentsId: {
required: true,
@@ -189,6 +192,13 @@ export default {
api: process.env.VUE_APP_API_IMG_URL,
};
},
+ computed: {
+ ...mapGetters("site", ["imageResolutions"]),
+ resolution() {
+ let data = filterItems(this.imageResolution, this.imageResolutions);
+ return unifyResolution(data);
+ },
+ },
methods: {
// 杩囨护灞炴€х被鍨�
filterItem(type, index) {
diff --git a/base-manager-ui/admin/src/store/modules/site.js b/base-manager-ui/admin/src/store/modules/site.js
index 17e1729885f1755c85a8f04a6f1a64e5672f0036..283f54a13848e21caa2404bc7414f6d1e9961645 100644
--- a/base-manager-ui/admin/src/store/modules/site.js
+++ b/base-manager-ui/admin/src/store/modules/site.js
@@ -39,6 +39,9 @@ export default {
siteId(state) {
return state.siteId;
},
+ imageResolutions(state) {
+ return state.imageResolution;
+ },
},
mutations: {
SET_path(state, path) {
diff --git a/base-manager-ui/admin/src/utils/index.js b/base-manager-ui/admin/src/utils/index.js
index d7154e9a1b2b2e17ea09b0b00e24c1ba384ccea9..7ec4787b83ccef506cc3d73a94ddaaaad2166f97 100644
--- a/base-manager-ui/admin/src/utils/index.js
+++ b/base-manager-ui/admin/src/utils/index.js
@@ -17,3 +17,7 @@ export const transverter = (obj) => {
};
});
};
+// 缁熶竴鍒嗚鲸鐜囨牸寮�
+export const unifyResolution = (resolution) => {
+ return resolution.replace(/[xX*]/, "x");
+};