Browse Source

Merge branch '20200710_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20200710_pc_vue_new_branch

XMLWAN 4 years ago
parent
commit
17d507b8c5
2 changed files with 3 additions and 3 deletions
  1. 1 1
      src/lang/zh.js
  2. 2 2
      src/views/layout/components/TagsView.vue

+ 1 - 1
src/lang/zh.js View File

99
     deviceManage: '设备管理',
99
     deviceManage: '设备管理',
100
     modemanagement: '型号管理',
100
     modemanagement: '型号管理',
101
     dialysisMachineManage: '设备管理',
101
     dialysisMachineManage: '设备管理',
102
-    workforce: '排班管理',
102
+    workforce: '患者排班',
103
     appointment: '排班管理',
103
     appointment: '排班管理',
104
     sign: '治疗签到',
104
     sign: '治疗签到',
105
     remind: '排班提醒',
105
     remind: '排班提醒',

+ 2 - 2
src/views/layout/components/TagsView.vue View File

28
     </ul>-->
28
     </ul>-->
29
     <div class="tags-view-wrapper">
29
     <div class="tags-view-wrapper">
30
       <div style="height:100%">
30
       <div style="height:100%">
31
-        <div style="height:100%" v-if="newIndex == 9">
31
+        <div style="height:100%" v-if="newIndex == 10">
32
           <div class="tagsBox" v-if="routerList.length > 0 && newNum != 999">
32
           <div class="tagsBox" v-if="routerList.length > 0 && newNum != 999">
33
             <div
33
             <div
34
               class="tagsOne"
34
               class="tagsOne"
62
             </div>
62
             </div>
63
           </div>
63
           </div>
64
         </div>
64
         </div>
65
-        <div class="tagsBox" v-if="newIndex != 9">
65
+        <div class="tagsBox" v-if="newIndex != 10">
66
           <div
66
           <div
67
             class="tagsOne"
67
             class="tagsOne"
68
             v-if="permission_routers[newIndex].meta"
68
             v-if="permission_routers[newIndex].meta"