Эх сурвалжийг харах

fix:调整日历预览展示

liujiayin 2 жил өмнө
parent
commit
83ee885947

+ 1 - 1
src/views/platform/desktop/column/preview.vue

@@ -25,7 +25,7 @@
                 :ref="desktopColumn.alias"
                 :alias="desktopColumn.alias"
                 :visible="componentVisible"
-                :full-calendar="true"
+                :full-screen="fullscreen"
                 @action-event="actionEvent"
             />
 

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

@@ -33,10 +33,11 @@ export function buildComponent (name, column, preview) {
                     type: Boolean,
                     default: false
                 },
-                fullCalendar: {
+                fullScreen: {
                     type: Boolean,
                     default: false
                 }
+                
             },
             filters: {
                 filterStatus (val, type) {
@@ -143,7 +144,7 @@ export function buildComponent (name, column, preview) {
                         animation: 200,
                         axis: 'y'
                     },
-                    calendarToolbar:this.fullCalendar ? [{key: 'refresh'}]: [{key: 'refresh'}, {key: 'fullscreen'}, {key: 'collapse'}],
+                    calendarToolbar:this.fullScreen ? [{key: 'refresh'}]: [{key: 'refresh'}, {key: 'fullscreen'}, {key: 'collapse'}],
                     calendarDialogVisible: false,
                     calendarDialogForm: {},
                 }

+ 1 - 1
src/views/system/homepage/index.vue

@@ -597,7 +597,7 @@ export default {
                     for (const i of events) {
                         // 根据指定日期A获取A在时间区间内的数据
                         if (!((this.compareDates(i.start, dateArr[1]) > 0) || (this.compareDates(i.jieShuShiJian, dateArr[0]) < 0))) {
-                            i.label = i.zhuangTai?`(${status[Number(i.zhuangTai) - 1] ? status[Number(i.zhuangTai) - 1] : ''})` + i.title:i.title
+                            i.label = i.zhuangTai?`【${status[Number(i.zhuangTai) - 1] ? status[Number(i.zhuangTai) - 1] : ''}】` + i.title:i.title
                             eventTrees.push(i)
                         }
                     }