diff --git a/src/views/bigSreen/component/CenterBottom.vue b/src/views/bigSreen/component/CenterBottom.vue
index 043516f..c1bb5f4 100644
--- a/src/views/bigSreen/component/CenterBottom.vue
+++ b/src/views/bigSreen/component/CenterBottom.vue
@@ -11,9 +11,15 @@
-
i.file),isShowPreview = true">
-
-
{{ yiliaopeihu[0] ? yiliaopeihu[0].label : '' }}
+
@@ -27,9 +33,15 @@
- i.file),isShowPreview = true">
-
-
{{ xiangmu[0] ? xiangmu[0].label : '' }}
+
@@ -43,9 +55,15 @@
- i.file),isShowPreview = true">
-
-
{{ fengongsi[0] ? fengongsi[0].label : '' }}
+
@@ -59,9 +77,15 @@
- i.file),isShowPreview = true">
-
-
{{ huodongjijin[0] ? huodongjijin[0].label : '' }}
+
@@ -145,10 +169,10 @@ export default {
margin-top: 10px;
position: relative;
- & > img,& > .el-img {
+ .el-img {
object-fit: cover;
height: 128px;
- width: 372px;
+ width: 100%;
}
.img-title {
@@ -161,6 +185,10 @@ export default {
color: #ffffff;
text-align: center;
background-color: rgba(1, 16, 57, 0.8);
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ padding: 0 8px;
}
}
}
diff --git a/src/views/bigSreen/component/ImgPreview.vue b/src/views/bigSreen/component/ImgPreview.vue
index a151eff..d84c596 100644
--- a/src/views/bigSreen/component/ImgPreview.vue
+++ b/src/views/bigSreen/component/ImgPreview.vue
@@ -5,7 +5,7 @@
-
{{ label }}
+
{{ imgs[imgIndex] ? imgs[imgIndex].label : label }}
+ :width="800"
+ :height="560"
+ :controlsVisible="true"
+ @before-slide-change="onBeforeSlideChange">
-
+
@@ -37,7 +38,7 @@ export default {
value: {
type: Boolean,
default: false,
- required: true
+ required: true,
},
imgs: {
type: Array,
@@ -47,15 +48,26 @@ export default {
},
data() {
return {
- key: 0
+ key: 0,
+ imgIndex: 0,
+ }
+ },
+ methods: {
+ onBeforeSlideChange(e) {
+ this.imgIndex = e
}
},
- methods: {},
computed: {},
watch: {
imgs(newv) {
//每次都重新渲染 处理样式问题
++this.key
+ },
+ value(newv) {
+ if(newv) {
+ //每次都重新渲染 处理样式问题
+ ++this.key
+ }
}
}
}
@@ -77,8 +89,8 @@ export default {
height: 65px;
color: #fff;
position: absolute;
- right: 120px;
- top: 120px;
+ right: 20px;
+ top: 64px;
border-radius: 100%;
background-color: #5ec9ea;
}
@@ -90,8 +102,8 @@ export default {
transform: scale(2, 2);
}
.img-container {
- width: 1517px;
- height: 839px;
+ width: 1700px;
+ height: 948px;
border-radius: 10px;
box-sizing: border-box;
background: conic-gradient(
@@ -105,7 +117,8 @@ export default {
padding: 5px;
.label {
- font-size: 32px;
+ font-size: 34px;
+ letter-spacing: 6px;
color: #aaddff;
font-weight: 500;
}
@@ -121,8 +134,11 @@ export default {
}
::v-deep .carousel-3d-controls .next {
right: 180px;
+ filter: drop-shadow(0 2px 4px #000011);
}
::v-deep .carousel-3d-controls .prev {
left: 180px;
+ filter: drop-shadow(0 2px 4px #000011);
+
}
diff --git a/src/views/bigSreen/component/dataPreview.vue b/src/views/bigSreen/component/dataPreview.vue
index 088a72a..bbd7542 100644
--- a/src/views/bigSreen/component/dataPreview.vue
+++ b/src/views/bigSreen/component/dataPreview.vue
@@ -5,9 +5,16 @@
-
{{ label }}
+
{{ label }}
-
+
@@ -92,8 +99,8 @@ export default {
height: 65px;
color: #fff;
position: absolute;
- right: 120px;
- top: 120px;
+ right: 20px;
+ top: 64px;
border-radius: 100%;
background-color: #5ec9ea;
}
@@ -105,8 +112,8 @@ export default {
transform: scale(2, 2);
}
.img-container {
- width: 1517px;
- height: 839px;
+ width: 1700px;
+ height: 948px;
border-radius: 10px;
box-sizing: border-box;
background: conic-gradient(
@@ -124,6 +131,10 @@ export default {
color: #aaddff;
font-weight: 500;
}
+ .title {
+ font-size: 34px;
+ letter-spacing: 6px;
+ }
}
}
diff --git a/src/views/customer/component/addOrder.vue b/src/views/customer/component/addOrder.vue
index f1945e7..e7e1c62 100644
--- a/src/views/customer/component/addOrder.vue
+++ b/src/views/customer/component/addOrder.vue
@@ -125,7 +125,6 @@
diff --git a/src/views/system/data.vue b/src/views/system/data.vue
index 9c6a41c..8c6583d 100644
--- a/src/views/system/data.vue
+++ b/src/views/system/data.vue
@@ -22,6 +22,18 @@
+
+ {
+ userSelect.page = page;
+ getUsers(false);
+ }">
+
@@ -125,6 +137,12 @@ export default {
newElTreeTag: 0,
defaultExpanded: [],
defaultChecked: [],
+
+ userSelect: {
+ page: 1,
+ page_size: 15
+ },
+ userTotal: 0,
}
},
methods: {
@@ -209,13 +227,18 @@ export default {
that.height = height;
},
- async getUsers(){
- const res = await listuser()
+ async getUsers(isInit = true){
+ const res = await listuser(this.userSelect)
this.users = res.data
- this.activeUser = String(this.users[0].id)
+ if(isInit) {
+ this.activeUser = String(this.users[0].id)
+ }
+ this.userTotal = res.total
- await this.getAdminTypes()
- await this.getAdminAreas()
+ if(isInit) {
+ await this.getAdminTypes()
+ await this.getAdminAreas()
+ }
},
async getProductTypes(){
const res = await getProductTypes({