From 40890d93b569e45405f5df1939f15f6332048f67 Mon Sep 17 00:00:00 2001 From: gongdi <410827992@qq.com> Date: Mon, 25 Oct 2021 16:53:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E5=8E=86=E5=91=A8=E5=8E=86=20?= =?UTF-8?q?=E5=B0=8F=E5=8F=B7=E8=A7=86=E5=9B=BE=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainPlatform/MainPlatform.vue | 8 +- .../moduleAndLayout/ModuleAndLaySetting.vue | 3 + .../moduleAndLaySettingConfig.js | 4 +- .../oa/schoolCalendar/interConfig.js | 17 ++ .../oa/schoolCalendar/schoolCalendar.vue | 227 ++++++++++++++++++ .../oa/schoolCalendar/schoolCalendarLarge.vue | 17 ++ .../moduleCom/oa/weekCalendar/interConfig.js | 17 ++ .../oa/weekCalendar/weekCalendar.vue | 227 ++++++++++++++++++ .../oa/weekCalendar/weekCalendarLarge.vue | 17 ++ 9 files changed, 531 insertions(+), 6 deletions(-) create mode 100644 src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/schoolCalendar/interConfig.js create mode 100644 src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/schoolCalendar/schoolCalendar.vue create mode 100644 src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/schoolCalendar/schoolCalendarLarge.vue create mode 100644 src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/weekCalendar/interConfig.js create mode 100644 src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/weekCalendar/weekCalendar.vue create mode 100644 src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/weekCalendar/weekCalendarLarge.vue diff --git a/src/views/superFusionPlatform/mainPlatform/MainPlatform.vue b/src/views/superFusionPlatform/mainPlatform/MainPlatform.vue index 0636e14..d1591b7 100644 --- a/src/views/superFusionPlatform/mainPlatform/MainPlatform.vue +++ b/src/views/superFusionPlatform/mainPlatform/MainPlatform.vue @@ -240,7 +240,9 @@ for (let j = moduleType.module_list.length - 1; j >= 0; j--){ let module = moduleType.module_list[j]; let isExist = true; - let node = this.crmData.filter((item)=>{return item.id === module.relative_crm[0]})[0]; + let node = this.crmData.filter((item)=>{ + return item.id === module.relative_crm[0]} + )[0]; if (typeof (node)!== "undefined"){ for (let k = 1; k < module.relative_crm.length; k++){ if (typeof (node)!== "undefined" && node.children){ @@ -314,16 +316,14 @@ isOfficeInterface:false }],(result)=>{ if (result[0].data.success === true){ - console.log('---------------1') let data = result[0].data; + this.layoutData = defaultShowModuleAndLayout; if (data.layout_json && data.layout_json !== '' && data.layout_json !== "{}"){ this.layoutData = JSON.parse(data.layout_json) }else{ this.layoutData = defaultShowModuleAndLayout; } - console.log('---------------2') this.changeTheme(); - console.log('---------------3') this.getCrmInfo(); this.isLoading = false; }else{ diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/ModuleAndLaySetting.vue b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/ModuleAndLaySetting.vue index 3ba8203..4739fad 100644 --- a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/ModuleAndLaySetting.vue +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/ModuleAndLaySetting.vue @@ -103,6 +103,9 @@ AIcon:Icon, AInput:Input }, + mounted(){ + console.log(_.cloneDeep(this.layout.module)) + }, updated(){ if (this.editType !== '' && this.$refs.inputRef){ this.$refs.inputRef[0].focus(); diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleAndLaySettingConfig.js b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleAndLaySettingConfig.js index 2d3b02a..430d2c0 100644 --- a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleAndLaySettingConfig.js +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleAndLaySettingConfig.js @@ -88,11 +88,11 @@ export const moduleData=[ purview_code:"hbg_rcbg",menu_name:["internalMail","Inbox"],show_oneLevel:false}, {module_id:'school_calendar_query', module_name:'校历查询', relative_crm:['daliyOffice','schoolWeekCalendar','schoolCalendarManagement'],icon:"icon-xiaolichaxun1", - module_url_small:'',module_url_large:'', + module_url_small:'oa/schoolCalendar/schoolCalendar.vue',module_url_large:'oa/schoolCalendar/schoolCalendarLarge.vue', purview_code:"hbg_rcbg",menu_name:["schoolWeekCalendar","schoolCalendarManagement"],show_oneLevel:false}, {module_id:'weekly_calendar_query', module_name:'周历查询', relative_crm:['daliyOffice','schoolWeekCalendar','weekCalendarManagement'],icon:"icon-zhoulichaxun1", - module_url_small:'',module_url_large:'', + module_url_small:'oa/weekCalendar/weekCalendar.vue',module_url_large:'oa/weekCalendar/weekCalendarLarge.vue', purview_code:"hbg_rcbg",menu_name:["schoolWeekCalendar","weekCalendarManagement"],show_oneLevel:false}, {module_id:'my_meeting', module_name:'我的会议', relative_crm:['daliyOffice','meetingRoom','myMeetingList'],icon:"icon-wodehuiyi1", diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/schoolCalendar/interConfig.js b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/schoolCalendar/interConfig.js new file mode 100644 index 0000000..261c479 --- /dev/null +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/schoolCalendar/interConfig.js @@ -0,0 +1,17 @@ +export default { + /* + * 【calendar-1】校历显示(学期方式)/周历 ——《分页》 + * org_id 必填 number 机构ID + * calendar_type 必填 number 校历周历类型(1:校历,2:周历) + * calendar_id 非必填 number 校历/周历ID + * page_number 非必填 number 当前页码 + * page_size 非必填 number 每页条数 + * */ + "viewSchoolCalendar": { + url: '/intellioa/schoolCalendar/viewSchoolCalendar', + method: 'get', + isTestLogin: true + }, + + +} diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/schoolCalendar/schoolCalendar.vue b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/schoolCalendar/schoolCalendar.vue new file mode 100644 index 0000000..761fd45 --- /dev/null +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/schoolCalendar/schoolCalendar.vue @@ -0,0 +1,227 @@ + + + + + + \ No newline at end of file diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/schoolCalendar/schoolCalendarLarge.vue b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/schoolCalendar/schoolCalendarLarge.vue new file mode 100644 index 0000000..b4ab9bd --- /dev/null +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/schoolCalendar/schoolCalendarLarge.vue @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/weekCalendar/interConfig.js b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/weekCalendar/interConfig.js new file mode 100644 index 0000000..261c479 --- /dev/null +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/weekCalendar/interConfig.js @@ -0,0 +1,17 @@ +export default { + /* + * 【calendar-1】校历显示(学期方式)/周历 ——《分页》 + * org_id 必填 number 机构ID + * calendar_type 必填 number 校历周历类型(1:校历,2:周历) + * calendar_id 非必填 number 校历/周历ID + * page_number 非必填 number 当前页码 + * page_size 非必填 number 每页条数 + * */ + "viewSchoolCalendar": { + url: '/intellioa/schoolCalendar/viewSchoolCalendar', + method: 'get', + isTestLogin: true + }, + + +} diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/weekCalendar/weekCalendar.vue b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/weekCalendar/weekCalendar.vue new file mode 100644 index 0000000..9c768cc --- /dev/null +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/weekCalendar/weekCalendar.vue @@ -0,0 +1,227 @@ + + + + + + \ No newline at end of file diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/weekCalendar/weekCalendarLarge.vue b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/weekCalendar/weekCalendarLarge.vue new file mode 100644 index 0000000..b4ab9bd --- /dev/null +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/weekCalendar/weekCalendarLarge.vue @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file