功能完善

src/components/AppCumulative.vue

@@ -0,0 +1,62 @@
+<template>
+  <div class="app-header__contentNews">
+    <div class="app-header__contentNewsItem">
+      <strong>累计 | </strong>工单数：
+      <em>{{allData[0]|formatNum}}</em>
+    </div>
+    <div class="app-header__contentNewsItem">
+      标本送检：
+      <em>{{allData[1]|formatNum}}</em>
+    </div>
+    <div class="app-header__contentNewsItem">
+      患者陪检：
+      <em>{{allData[2]|formatNum}}</em>
+    </div>
+  </div>
+</template>
+
+<script>
+import { post, timer1 } from './../http/http'
+export default {
+  name: 'AppCumulative',
+  inject: ['hospitalId'],
+  data () {
+    return {
+      allData: [], // 数据
+      timer: null// 轮询定时器
+    }
+  },
+  filters: {
+    formatNum (v) {
+      v = v ? v.toString() : ''
+      return v > 100000 ? v.slice(0, v.length - 4) + '万' : v
+    }
+  },
+  methods: {
+    // 获取今日新冠送检，今日标本运输数，今日患者陪检
+    async getTodayData () {
+      const srartTime = this.$moment().format('YYYY-MM-DD') // 今天
+      const endTime = this.$moment().format('YYYY-MM-DD') // 今天
+      const result = await post(`/largeScreen/getData/getOrderTotal/${this.hospitalId}`, { srartTime, endTime })
+      this.allData = result.list[0]
+      this.polling()
+    },
+    // 轮询请求
+    polling () {
+      clearTimeout(this.timer)
+      this.timer = setTimeout(() => {
+        this.getTodayData()
+      }, timer1)
+    }
+  },
+  mounted () {
+    this.getTodayData()
+  },
+  beforeDestroy () {
+    clearTimeout(this.timer)
+  }
+}
+</script>
+
+<style lang="less">
+</style>

src/components/AppHeader.vue

@@ -7,50 +7,80 @@
       <div class="app-header__main--leftBottom"></div>
       <div class="app-header__main--rightBottom"></div>
       <h1 class="app-header__title">
-        <img class="app-header__logo" src="./../assets/img/logo.png">
+        <img class="app-header__logo" src="./../assets/img/logo.png" />
         大势输送保障管理平台
       </h1>
     </div>
     <!-- /头部线条及标题 -->
     <div class="app-header__content">
-      <!-- 今日新冠送检，标本运输数，患者陪检 -->
-      <AppToday></AppToday>
-      <!-- /今日新冠送检，标本运输数，患者陪检 -->
-      <!-- 时间 -->
-      <div class="app-header__contentTime">{{time|weekFormat}}<time>{{time|timeFormat}}</time></div>
-      <!-- /时间 -->
+      <!-- 累计工单数，标本送检，患者陪检 -->
+      <div class="app-header__contentCumulative">
+        <!-- 今日工单数，标本送检，陪检人次 -->
+        <AppToday></AppToday>
+        <!-- /今日工单数，标本送检，陪检人次 -->
+      </div>
+      <!-- /累计工单数，标本送检，患者陪检 -->
+      <div class="app-header__contentWrap">
+        <div class="app-header__contentCumulative">
+          <AppCumulative></AppCumulative>
+        </div>
+        <!-- 时间 -->
+        <div class="app-header__contentTime">
+          {{ time | weekFormat }}<time>{{ time | timeFormat }}</time>
+        </div>
+        <!-- /时间 -->
+      </div>
     </div>
   </header>
 </template>
 
 <script>
 import AppToday from './AppToday'
+import AppCumulative from './AppCumulative'
 export default {
   name: 'AppHeader',
   components: {
-    AppToday
+    AppToday,
+    AppCumulative
   },
   data () {
     return {
       time: new Date().getTime(), // 时间戳
       timer: null, // 时间定时器
-      week: ''// 星期
+      week: '' // 星期
     }
   },
   filters: {
     // 格式化时间
     timeFormat (time) {
       const newDate = new Date(time)
-      const hours = newDate.getHours().toString().padStart(2, '0')
-      const minutes = newDate.getMinutes().toString().padStart(2, '0')
-      const seconds = newDate.getSeconds().toString().padStart(2, '0')
+      const hours = newDate
+        .getHours()
+        .toString()
+        .padStart(2, '0')
+      const minutes = newDate
+        .getMinutes()
+        .toString()
+        .padStart(2, '0')
+      const seconds = newDate
+        .getSeconds()
+        .toString()
+        .padStart(2, '0')
       return `${hours}：${minutes}：${seconds}`
     },
     // 获得当前的星期
     weekFormat (time) {
       const newDate = new Date(time)
       const week = newDate.getDay()
-      const weeks = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六']
+      const weeks = [
+        '星期日',
+        '星期一',
+        '星期二',
+        '星期三',
+        '星期四',
+        '星期五',
+        '星期六'
+      ]
       return `${weeks[week]}`
     }
   },
@@ -89,12 +119,12 @@ export default {
     margin: 0 auto;
     border-bottom: 1px solid #68ffff;
     position: relative;
-    .app-header__title{
+    .app-header__title {
       display: flex;
       justify-content: center;
       align-items: center;
-      .app-header__logo{
-        height: .6125rem;
+      .app-header__logo {
+        height: 0.6125rem;
       }
     }
     .app-header__main--left {
@@ -165,7 +195,7 @@ export default {
     }
   }
   // 头部内容
-  .app-header__content{
+  .app-header__content {
     position: absolute;
     left: 0;
     top: 0.4rem;
@@ -174,28 +204,33 @@ export default {
     align-items: center;
     width: 100%;
     height: 0.475rem;
-    .app-header__contentNews{
+    .app-header__contentNews {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      .app-header__contentNewsItem{
-        font-size: .2rem;
+      .app-header__contentNewsItem {
+        font-size: 0.2rem;
         color: #fff;
-        margin-right: .4rem;
-        em{
+        margin-right: 0.2rem;
+        em {
           color: #70c2ab;
-          margin-left: .2rem;
-          i{
+          // margin-left: 0.1rem;
+          i {
             color: #c27073;
           }
         }
       }
     }
-    .app-header__contentTime{
-      color: #fff;
-      font-size: .3rem;
-      time{
-        margin-left: .2rem;
+    .app-header__contentWrap {
+      width: 8.8rem;
+      display: flex;
+      justify-content: space-between;
+      .app-header__contentTime {
+        color: #fff;
+        font-size: 0.26rem;
+        time {
+          margin-left: 0.1rem;
+        }
       }
     }
   }

src/components/AppToday.vue

@@ -1,20 +1,16 @@
 <template>
   <div class="app-header__contentNews">
     <div class="app-header__contentNewsItem">
-      今日新冠送检
-      <em>
-        <i>{{allData.todayNovelCoronavirus}}</i>/{{allData.todayNovelCoronavirusAll}}
-      </em>
+      <strong>今日</strong>工单数：
+      <em>{{allData[0]}}</em>
     </div>
     <div class="app-header__contentNewsItem">
-      今日标本运输数
-      <em>
-        <i>{{allData.todaySample}}</i>/{{allData.todaySampleAll}}
-      </em>
+      <strong>今日</strong>标本送检：
+      <em>{{allData[1]}}</em>
     </div>
     <div class="app-header__contentNewsItem">
-      今日患者陪检
-      <em>{{allData.todayPaiJian}}/{{allData.todayPaiJianAll}}</em>
+      <strong>今日</strong>陪检人次：
+      <em>{{allData[2]}}</em>
     </div>
   </div>
 </template>
@@ -26,15 +22,17 @@ export default {
   inject: ['hospitalId'],
   data () {
     return {
-      allData: {}, // 数据对象
+      allData: [], // 数据
       timer: null// 轮询定时器
     }
   },
   methods: {
     // 获取今日新冠送检，今日标本运输数，今日患者陪检
     async getTodayData () {
-      const result = await post(`/largeScreen/getData/todayTitle/${this.hospitalId}`, {})
-      this.allData = result
+      const srartTime = this.$moment().format('YYYY-MM-DD') // 今天
+      const endTime = this.$moment().format('YYYY-MM-DD') // 今天
+      const result = await post(`/largeScreen/getData/getTodayTitleNew/${this.hospitalId}`, { srartTime, endTime })
+      this.allData = result.list[0]
       this.polling()
     },
     // 轮询请求

src/components/BusinessTypeRatio.vue

@@ -104,8 +104,8 @@ export default {
             label: {
               normal: {
                 show: true,
-                position: [365, 0],
-                formatter: '{c}',
+                position: [330, 0],
+                formatter: '{c}单',
                 textStyle: {
                   color: '#fff'
                 }

src/components/GroupPerformance.vue

@@ -108,7 +108,7 @@ export default {
               normal: {
                 show: true,
                 position: [300, 0],
-                formatter: '{c}',
+                formatter: '{c}单',
                 textStyle: {
                   color: '#fff'
                 }

src/components/OnTimeArrivalRate.vue

@@ -61,6 +61,9 @@ export default {
           type: 'value',
           show: false,
           position: 'top',
+          max: function (value) {
+            return value.max * 1.1
+          },
           axisTick: {
             show: false
           },