今日当班情况修改为今日各人员工作情况

src/components/GroupPerformance.vue

@@ -331,8 +331,6 @@ export default {
           {
             name: '异常工单数（单）',
             type: 'bar',
-            xAxisIndex: 2,
-            yAxisIndex: 2,
             barWidth: 25,
             stack: '2',
             itemStyle: {

src/components/OnDutyToday.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="on-duty-today">
     <div class="on-duty-today__inner" :class="{marquee_top:animate}" :style="{transform:'translateY('+(2.7125*n)+'rem)'}">
-      <div class="on-duty-today__list" v-for="(item1,i) in todayGroutList" :key="i">
+      <div class="on-duty-today__list" v-for="(item1,i) in workList" :key="i">
         <div class="on-duty-today__item" v-for="item2 in item1" :key="item2[2]">
-          <OnDutyTodayPie :todayGroutListItem="item2"></OnDutyTodayPie>
+          <OnDutyTodayPie :workListItem="item2"></OnDutyTodayPie>
         </div>
       </div>
     </div>
@@ -23,7 +23,7 @@ export default {
       animate: false,
       n: 0,
       todayBeOnDuty: [], // 头部总当班人数
-      todayGroutList: [] // 当班人数（工作中，空闲中）
+      workList: [] // 当班人数（工作中，空闲中）
     }
   },
   components: {
@@ -42,33 +42,36 @@ export default {
     showMarquee () {
       this.animate = true
       this.n--
-      if (this.n === -(this.todayGroutList.length)) {
+      if (this.n === -(this.workList.length)) {
         this.animate = false
         this.n = 0
       }
     },
     // 获取数据
     async getData () {
+      const srartTime = this.$moment().format('YYYY-MM-DD')
+      const endTime = this.$moment().format('YYYY-MM-DD')
+      const postData = { srartTime, endTime }
       const result = await post(
-        `/largeScreen/getData/todayBeOnDuty/${this.hospitalId}`
+        `/largeScreen/getData/staffWorkingCondition/${this.hospitalId}`, postData
       )
       this.todayBeOnDuty = []
-      this.todayGroutList = []
+      this.workList = []
       this.todayBeOnDuty = result.todayBeOnDuty[0]
-      const len = Math.ceil(result.todayGroutList.length / 3)
+      const len = Math.ceil(result.workList.length / 3)
       for (let i = 0; i < len; i++) {
         let list = [
-          result.todayGroutList[0 + 3 * i],
-          result.todayGroutList[1 + 3 * i],
-          result.todayGroutList[2 + 3 * i]
+          result.workList[0 + 3 * i],
+          result.workList[1 + 3 * i],
+          result.workList[2 + 3 * i]
         ]
         list = list.filter((item) => item !== undefined)
-        this.todayGroutList.push(list)
+        this.workList.push(list)
       }
       this.$emit('todayBeOnDutyHandle', JSON.stringify(this.todayBeOnDuty))
       this.polling()
-      if (this.todayGroutList.length > 0) {
-        this.todayGroutList = [...this.todayGroutList, this.todayGroutList[0]]
+      if (this.workList.length > 0) {
+        this.workList = [...this.workList, this.workList[0]]
         this.scrollInfinite()
       }
     },

src/components/OnDutyTodayPie.vue

@@ -4,12 +4,12 @@
     <div class="on-duty-today-pie__tips">
       <ul class="on-duty-today-pie__list">
         <li class="on-duty-today-pie__item">
-          <i class="on-duty-today-pie__item--red"></i>空闲中
-          <em>{{ todayGroutListItem[1] }}</em>
+          <i class="on-duty-today-pie__item--green"></i>已完成
+          <em>{{ workListItem[1] }}</em>
         </li>
         <li class="on-duty-today-pie__item">
-          <i class="on-duty-today-pie__item--green"></i>工作中
-          <em>{{ todayGroutListItem[0] }}</em>
+          <i class="on-duty-today-pie__item--red"></i>执行中
+          <em>{{ workListItem[2] }}</em>
         </li>
       </ul>
     </div>
@@ -27,13 +27,13 @@ export default {
     }
   },
   props: {
-    todayGroutListItem: {
+    workListItem: {
       type: Array,
       default: () => []
     }
   },
   watch: {
-    todayGroutListItem () {
+    workListItem () {
       this.draw()
     }
   },
@@ -41,10 +41,10 @@ export default {
     // 画图
     draw () {
       this.myChart = echarts.init(this.$refs.pie)
-      const todayGroutListItem = this.todayGroutListItem
+      const workListItem = this.workListItem
       const option = {
         title: {
-          text: todayGroutListItem[3],
+          text: workListItem[0],
           textStyle: {
             color: '#fff',
             fontSize: 14,
@@ -127,7 +127,7 @@ export default {
             // label: {
             //   show: true,
             //   formatter () {
-            //     const num = [todayGroutListItem[1], todayGroutListItem[0]]
+            //     const num = [workListItem[1], workListItem[0]]
             //     return `当班人数\n${num[0]}/${num[1]}`
             //   },
             //   fontSize: 14,
@@ -244,9 +244,9 @@ export default {
     },
     _pie4 () {
       const dataArr = []
-      const arr = ['空闲中', '工作中']
-      const color = ['#c27073', '#70c282']
-      const num = [this.todayGroutListItem[1], this.todayGroutListItem[0]]
+      const arr = ['已完成', '执行中']
+      const color = ['#70c282', '#c27073']
+      const num = [this.workListItem[1], this.workListItem[2]]
       for (var i = 0; i < arr.length; i++) {
         dataArr.push({
           name: arr[i],
@@ -263,7 +263,7 @@ export default {
           dataArr[0].label = {
             show: true,
             formatter () {
-              return `当班人数\n${num[0]}/${num[1]}`
+              return `工单总数\n${num[0] + num[1]}`
             },
             fontSize: 14,
             lineHeight: 30,

src/components/PointsRanking.vue

@@ -188,22 +188,17 @@ export default {
     },
     // 获取数据
     async getData () {
-      const srartTime = this.$moment()
-        .subtract(29, 'days')
-        .format('YYYY-MM-DD') // 近三十天
+      const srartTime = this.$moment().format('YYYY-MM-DD') // 今天
       const endTime = this.$moment().format('YYYY-MM-DD') // 今天
       const result = await post(
-        `/largeScreen/getData/gradeRankingList/${this.hospitalId}`,
-        { srartTime, endTime }
+        `/largeScreen/getData/gradeRanking/${this.hospitalId}`,
+        { srartTime, endTime, pageSize: 3 }
       )
       this.gradeRankingListNum = []
       this.gradeRankingListName = []
-      if (result.gradeRankingList.length > 5) {
-        result.gradeRankingList = result.gradeRankingList.slice(0, 5)
-      }
       if (result.gradeRankingList.length > 0) {
         result.gradeRankingList.forEach(item => {
-          this.gradeRankingListNum.push(item[2]) // 获取到的数据
+          this.gradeRankingListNum.push(item[0]) // 获取到的数据
           this.gradeRankingListName.push(item[1]) // 获取到的名称
         })
       }

src/router/index.js

@@ -6,11 +6,20 @@ Vue.use(VueRouter)
 const routes = [{
   path: '/:id',
   name: 'index',
+  meta: {
+    title: '大屏端'
+  },
   component: () => import('../views/AppIndex.vue')
 }]
 
 const router = new VueRouter({
   routes
 })
+router.beforeEach((to, from, next) => {
+  if (to.meta.title) {
+    document.title = document.title = to.meta.title + ' - 大势医院输送保障管理平台'
+  }
+  next()
+})
 
 export default router

src/views/AppIndex.vue

@@ -69,9 +69,9 @@
             </div>
           </article>
           <aside class="app-index__right">
-            <!-- 近三十天人员积分排行榜 -->
+            <!-- 今日积分前三人员 -->
             <div class="app-item">
-              <h2 class="app-item__header">近三十天人员积分排行榜</h2>
+              <h2 class="app-item__header">今日积分前三人员</h2>
               <PointsRanking></PointsRanking>
             </div>
             <!-- 近三十天人员按时到达率排行榜 -->
@@ -111,7 +111,7 @@ export default {
     GroupPerformance, // 近三十天各小组完成以及异常工单数
     OnDutyToday, // 今日当班情况
     TodayWorkOrder, // 今日工单情况
-    PointsRanking, // 近三十天人员积分排行榜
+    PointsRanking, // 今日积分前三人员
     BusinessTypeRatio, // 近三十天各业务类型占比
     ErrorWorkOrder, // 今日工单异常情况
     DeliveryRate, // 近三十天各类型工单按时送达率趋势

vue.config.js

@@ -4,13 +4,13 @@ module.exports = {
   productionSourceMap: false,
   devServer: {
     open: false, // 是否自动弹出浏览器页面
-    host: 'localhost',
+    host: '0.0.0.0',
     port: '8080',
     https: false, // 是否使用https协议
     hotOnly: false, // 是否开启热更新
     proxy: {
       '/service': {
-        target: 'http://192.168.3.108', // API服务器的地址
+        target: 'http://192.168.3.87', // API服务器的地址
         ws: true, // 代理websockets
         changeOrigin: true, // 虚拟的站点需要更管origin
         pathRewrite: {