大屏

src/views/bigSreen/component/CenterBottom.vue

@@ -11,9 +11,15 @@
         </div>
       </div>
 
-      <div class="bs-card__body flex-1" @click="imgLabel = '医疗陪护',previewImgs = yiliaopeihu.map(i => i.file),isShowPreview = true">
+      <div class="bs-card__body flex-1" @click="imgLabel = '医疗陪护',previewImgs = yiliaopeihu,isShowPreview = true">
-        <el-image fit="cover" class="el-img" :src="yiliaopeihu[0] ? yiliaopeihu[0].file : ''" alt="" />
+        <el-carousel height="128px" style="width: 100%;" indicator-position="none" arrow="hover">
-        <div class="img-title">{{ yiliaopeihu[0] ? yiliaopeihu[0].label : '' }}</div>
+          <el-carousel-item v-for="i in yiliaopeihu">
+            <div style="position: relative;height: 100%;">
+              <el-image fit="cover" class="el-img" :src="i.file" alt="" />
+              <div class="img-title">{{ i.label }}</div>
+            </div>
+          </el-carousel-item>
+        </el-carousel>
       </div>
     </div>
     <div class="bs-card d-flex flex-column">
@@ -27,9 +33,15 @@
         </div>
       </div>
 
-      <div class="bs-card__body flex-1" @click="imgLabel = '物业项目',previewImgs = xiangmu.map(i => i.file),isShowPreview = true">
+      <div class="bs-card__body flex-1" @click="imgLabel = '物业项目',previewImgs = xiangmu,isShowPreview = true">
-        <el-image fit="cover" class="el-img" :src="xiangmu[0] ? xiangmu[0].file : ''" alt="" />
+        <el-carousel height="128px" style="width: 100%;" indicator-position="none" arrow="hover">
-        <div class="img-title">{{ xiangmu[0] ? xiangmu[0].label : '' }}</div>
+          <el-carousel-item v-for="i in xiangmu">
+            <div style="position: relative;height: 100%;">
+              <el-image fit="cover" class="el-img" :src="i.file" alt="" />
+              <div class="img-title">{{ i.label }}</div>
+            </div>
+          </el-carousel-item>
+        </el-carousel>
       </div>
     </div>
     <div class="bs-card d-flex flex-column">
@@ -43,9 +55,15 @@
         </div>
       </div>
 
-      <div class="bs-card__body flex-1" @click="imgLabel = '分公司/站点',previewImgs = fengongsi.map(i => i.file),isShowPreview = true">
+      <div class="bs-card__body flex-1" @click="imgLabel = '分公司/站点',previewImgs = fengongsi,isShowPreview = true">
-        <el-image fit="cover" class="el-img" :src="fengongsi[0] ? fengongsi[0].file : ''" alt="" />
+        <el-carousel height="128px" style="width: 100%;" indicator-position="none" arrow="hover">
-        <div class="img-title">{{ fengongsi[0] ? fengongsi[0].label : '' }}</div>
+          <el-carousel-item v-for="i in fengongsi">
+            <div style="position: relative;height: 100%;">
+              <el-image fit="cover" class="el-img" :src="i.file" alt="" />
+              <div class="img-title">{{ i.label }}</div>
+            </div>
+          </el-carousel-item>
+        </el-carousel>
       </div>
     </div>
     <div class="bs-card d-flex flex-column">
@@ -59,9 +77,15 @@
         </div>
       </div>
 
-      <div class="bs-card__body flex-1" @click="imgLabel = '活动集锦',previewImgs = huodongjijin.map(i => i.file),isShowPreview = true">
+      <div class="bs-card__body flex-1" @click="imgLabel = '活动集锦',previewImgs = huodongjijin,isShowPreview = true">
-        <el-image fit="cover" class="el-img" :src="huodongjijin[0] ? huodongjijin[0].file : ''" alt="" />
+        <el-carousel height="128px" style="width: 100%;" indicator-position="none" arrow="hover">
-        <div class="img-title">{{ huodongjijin[0] ? huodongjijin[0].label : '' }}</div>
+          <el-carousel-item v-for="i in huodongjijin">
+            <div style="position: relative;height: 100%;" class="d-flex jc-center">
+              <el-image fit="cover" class="el-img" :src="i.file" alt="" />
+              <div class="img-title">{{ i.label }}</div>
+            </div>
+          </el-carousel-item>
+        </el-carousel>
       </div>
     </div>
 
@@ -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;
       }
     }
   }

src/views/bigSreen/component/ImgPreview.vue

@@ -5,7 +5,7 @@
       <div class="mask" @click.prevent.stop="$emit('input',false)"></div>
       <div class="img-container">
         <div style="background: #0d2067;height: 100%;width: 100%;display: flex;justify-content: space-evenly;align-items: center;flex-direction: column;">
-          <div class="label">{{ label }}</div>
+          <div class="label">{{ imgs[imgIndex] ? imgs[imgIndex].label : label }}</div>
 
 
           <carousel-3d :key="key"
@@ -13,11 +13,12 @@
                        :autoplay-timeout="5000"
                        :display="3"
                        :perspective="40"
-                       :width="760"
+                       :width="800"
-                       :height="531"
+                       :height="560"
-                       :controlsVisible="true">
+                       :controlsVisible="true"
+                       @before-slide-change="onBeforeSlideChange">
             <slide v-for="(img, i) in imgs" :index="i">
-              <img style="width: 100%;height: 100%;object-fit: cover;" :src="img" alt="">
+              <img style="width: 100%;height: 100%;object-fit: cover;" :src="img.file" alt="">
             </slide>
           </carousel-3d>
         </div>
@@ -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;
+    right: 20px;
-    top: 120px;
+    top: 64px;
     border-radius: 100%;
     background-color: #5ec9ea;
   }
@@ -90,8 +102,8 @@ export default {
     transform: scale(2, 2);
   }
   .img-container {
-    width: 1517px;
+    width: 1700px;
-    height: 839px;
+    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);
+
 }
 </style>

src/views/bigSreen/component/dataPreview.vue

@@ -5,9 +5,16 @@
       <div class="mask" @click.prevent.stop="$emit('input',false)"></div>
       <div class="img-container">
         <div style="background: #0d2067;height: 100%;width: 100%;display: flex;justify-content: space-evenly;align-items: center;flex-direction: column;">
-          <div class="label">{{ label }}</div>
+          <div class="label title">{{ label }}</div>
 
-          <carousel-3d :key="key" :autoplay="true" :autoplay-timeout="5000" :display="3" :perspective="40" :width="660" :height="460" :controlsVisible="true">
+          <carousel-3d :key="key"
+                       :autoplay="true"
+                       :autoplay-timeout="5000"
+                       :display="3"
+                       :perspective="40"
+                       :width="700"
+                       :height="490"
+                       :controlsVisible="true">
             <slide v-for="(img, i) in data.files ? data.files.map(i => i.url) : myFiles" :index="i">
               <img style="width: 100%;height: 100%;object-fit: cover;" :src="img" alt="">
             </slide>
@@ -92,8 +99,8 @@ export default {
     height: 65px;
     color: #fff;
     position: absolute;
-    right: 120px;
+    right: 20px;
-    top: 120px;
+    top: 64px;
     border-radius: 100%;
     background-color: #5ec9ea;
   }
@@ -105,8 +112,8 @@ export default {
     transform: scale(2, 2);
   }
   .img-container {
-    width: 1517px;
+    width: 1700px;
-    height: 839px;
+    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;
+    }
   }
 }
 

src/views/customer/component/addOrder.vue

@@ -125,7 +125,6 @@
           <div class="xy-table-item-content">
             <el-select
               v-model="form.account_id"
-              v-load-more="productLoad"
               placeholder="请选择结算对象"
               style="width: 300px">
               <el-option v-for="item in accounts" :key="item.id" :label="item.name" :value="item.id"></el-option>

src/views/system/data.vue

@@ -22,6 +22,18 @@
                 <el-tabs tab-position="left" v-model="activeUser" @tab-click="switchTab">
                   <el-tab-pane v-for="item in users" :label="item.name" :name="String(item.id)"></el-tab-pane>
                 </el-tabs>
+
+                <el-pagination
+                  style="display: flex;justify-content: center;"
+                  hide-on-single-page
+                  :page-size="userSelect.page_size"
+                  :total="userTotal"
+                  layout="prev, next"
+                  @current-change="page => {
+                    userSelect.page = page;
+                    getUsers(false);
+                  }">
+                </el-pagination>
               </el-scrollbar>
             </div>
           </Card>
@@ -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(){
+    async getUsers(isInit = true){
-      const res = await listuser()
+      const res = await listuser(this.userSelect)
       this.users = res.data
+      if(isInit) {
         this.activeUser = String(this.users[0].id)
+      }
+      this.userTotal = res.total
 
+      if(isInit) {
         await this.getAdminTypes()
         await this.getAdminAreas()
+      }
     },
     async getProductTypes(){
       const res = await getProductTypes({