大屏

src/api/schedule/index.js

@@ -76,10 +76,11 @@ export function nurseSchedule(params){
   )
 }
 
-export function scheduleList(params){
+export function scheduleList(params,isLoading=true){
   return request({
     method:'get',
     url:'/api/admin/chart/schedule-list-log',
-    params
+    params,
+    isLoading
   })
 }

src/api/scheduleListChecks/index.js

@@ -1,10 +1,11 @@
 import request from "@/utils/request";
 
-export function getList(params){
+export function getList(params,isLoading=true){
   return request({
     method:'get',
     url:'/api/admin/schedule-list-checks/get-list',
-    params
+    params,
+    isLoading
   })
 }
 

src/views/bigSreen/component/CenterTop.vue

@@ -4,34 +4,34 @@
       <div class="top">
         <div class="bs-card">
           <div class="card-text">
-            <p class="color-word">照护</p>
+            <p class="color-word">照护人数</p>
             <p>
               <span class="color-white fw-b" style="font-size: 42px">{{
                 total.zhaohu
               }}</span>
-              <span class="color-word" style="padding-left: 5px">万人次/年</span>
+              <span class="color-word" style="padding-left: 5px">万/年</span>
             </p>
           </div>
         </div>
         <div class="bs-card">
           <div class="card-text">
-            <p class="color-word">服务覆盖人数</p>
+            <p class="color-word">服务人数</p>
             <p>
               <span class="color-white fw-b" style="font-size: 42px">{{
                 total.fuwufugairenshu
               }}</span>
-              <span class="color-word" style="padding-left: 5px">万人</span>
+              <span class="color-word" style="padding-left: 5px">万/年</span>
             </p>
           </div>
         </div>
         <div class="bs-card">
           <div class="card-text">
-            <p class="color-word">总服务时长</p>
+            <p class="color-word">服务时长</p>
             <p>
               <span class="color-white fw-b" style="font-size: 42px">{{
                 total.zongfuwushichang
               }}</span>
-              <span class="color-word" style="padding-left: 5px">万小时</span>
+              <span class="color-word" style="padding-left: 5px">万小时/年</span>
             </p>
           </div>
         </div>
@@ -67,7 +67,7 @@
               ref="scrollBoard"
               :key="scrollBoardKey"
               :config="areaConfig"
-              style="width: 350px; height: 240px; position: absolute;z-index: 998;bottom: 22px;left: 22px;background-color: #031e6099;border: 2px solid #53c2f4;border-radius: 10px;"
+              style="width: 350px; height: 240px; position: absolute;z-index: 998;bottom: 22px;left: 22px;background-color: #031e6099;border: 2px solid #53c2f488;border-radius: 10px;"
             />
             <div style="width: 100%; height: 100%" class="map-container"></div>
           </div>
@@ -149,7 +149,7 @@
 
         <div class="type-change">
           <div class="type-change-item" @click="type = 'img'">
-            <i class="el-icon-picture type-change-item__icon"></i>
+            <Icon type="md-globe" class="type-change-item__icon"/>
           </div>
           <div class="type-change-item" @click="type = 'video'">
             <i class="el-icon-video-camera-solid type-change-item__icon"></i>
@@ -230,7 +230,7 @@ export default {
         },
         {
           key: "jujiayuanzhu",
-          name: "居家援助",
+          name: "居家养老",
           val: 128,
         },
         {
@@ -551,13 +551,13 @@ export default {
             page_size: 20,
             sort_name: 'created_at',
             //product_type_id: 19
-          }),
+          },false),
           scheduleList({
             page: 1,
             page_size: 20,
             sort_name: 'created_at',
            // product_type_id: 20
-          })
+          },false)
         ])
         this.listData.set("changhuxian",res[0]?.data||[])
         this.listData.set("huifangjicha",res[1]?.data||[])
@@ -645,11 +645,18 @@ export default {
     this.getTotal();
     this.getList();
     this.getAreas();
+    const loading = this.$loading({
+      lock: true,
+      text: '加载中...',
+      spinner: 'el-icon-loading',
+      background: 'rgba(0, 0, 0, 0.9)'
+    });
     Promise.all([
       this.getData(),
       this.getListData()
     ]).then(_ => {
-      this.todayClick(false,this.toDayNums[0],0)
+      this.todayClick(false,this.toDayNums[1],0)
+      loading.close()
     })
   },
   mounted() {

src/views/bigSreen/component/ImgPreview.vue

@@ -8,7 +8,14 @@
           <div class="label">{{ 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="760"
+                       :height="531"
+                       :controlsVisible="true">
             <slide v-for="(img, i) in imgs" :index="i">
               <img style="width: 100%;height: 100%;object-fit: cover;" :src="img" alt="">
             </slide>