zhonghuizhen 1 год назад
Родитель
Сommit
ba3f11b3b9

+ 4 - 3
src/views/system/dashboard/components/util.js

@@ -654,10 +654,11 @@ export function buildComponent (name, column, preview, vm) {
                             // next: '<i class="icon-chevron-right">前进</i>'
                             // next: '<i class="icon-chevron-right">前进</i>'
                         },
                         },
                         headerToolbar: { // 日历头部按钮位置
                         headerToolbar: { // 日历头部按钮位置
-                            left: 'prev,next today',
+                            // left: 'prev,next today',
                             // start: '',
                             // start: '',
-                            center: 'title',
-                            right: 'dayGridMonth,timeGridWeek,timeGridDay'
+                            right: 'prev,next today',
+                            center: 'title'
+                            // right: 'dayGridMonth,timeGridWeek,timeGridDay'
                             // end: 'prev,next,today,month,agendaWeek,agendaDay,listWeek'
                             // end: 'prev,next,today,month,agendaWeek,agendaDay,listWeek'
                         },
                         },
                         events: this.scheduleData, // 日程数组
                         events: this.scheduleData, // 日程数组

+ 6 - 4
src/views/system/dashboard/templates/userInfoTab.vue

@@ -34,7 +34,7 @@
                                 size="mini"
                                 size="mini"
                             >{{ item.name }}</el-tag>
                             >{{ item.name }}</el-tag>
                         </div>
                         </div>
-                        <div>
+                        <div style="display: flex; align-items: center;">
                             <template v-if="todaySchedule.length">
                             <template v-if="todaySchedule.length">
                                 <span>今日班次:</span>
                                 <span>今日班次:</span>
                                 <el-tag
                                 <el-tag
@@ -46,12 +46,14 @@
                                 >{{ item }}</el-tag>
                                 >{{ item }}</el-tag>
                             </template>
                             </template>
                             <span v-else>今日无排班,祝您休息愉快!</span>
                             <span v-else>今日无排班,祝您休息愉快!</span>
-                            <a style="color: #409eff;" @click="showMySchedule">我的排班</a>
-                            <!-- <el-button
+                            <!--<a style="color: #409eff;" @click="showMySchedule">我的排班</a>-->
+                            <el-button
                                 type="primary"
                                 type="primary"
                                 size="mini"
                                 size="mini"
+                                plain
                                 @click="showMySchedule"
                                 @click="showMySchedule"
-                            >我的排班</el-button> -->
+                                style="display: flex; align-items: center; padding: 4px 5px;"
+                            ><i class="el-icon-date"  style="margin-right: 3px;" ></i>我的排班</el-button>
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>

+ 2 - 1
src/views/system/homepage/components/banciDialog.vue

@@ -6,7 +6,8 @@
             width="30%"
             width="30%"
             :close-on-click-modal="false"
             :close-on-click-modal="false"
             :close-on-press-escape="false"
             :close-on-press-escape="false"
-            :show-close="false"
+            :show-close="true"
+            @close="closeDialog"
         >
         >
             <div class="containerDiv">
             <div class="containerDiv">
                 <div>
                 <div>