Commit 7dae1c80 by xiexiaoqin

conflit

parents e352d834 d5dc1853
......@@ -49,7 +49,7 @@ Component({
}
let itemData = item.meetingLogDataList[i].meetingLogResource;
if (itemData) {
if (itemData.taskInfos || itemData.taskInfos) {
if (itemData.taskInfos || itemData.fileInfos) {
if (itemData.creatorInfo) {
itemData.creatorInfo = JSON.parse(itemData.creatorInfo);
}
......@@ -92,7 +92,6 @@ Component({
noData: dynamicList.length === that.data.size ? true : false
});
}
console.log(this.data.dynamicList);
}
});
},
......
......@@ -36,6 +36,26 @@
z-index: 99;
}
.headerIcon {
position: relative;
}
.headerIcon>view {
position: absolute;
left: 28rpx;
top: 52rpx;
width: 12rpx;
height: 12rpx;
border: 2rpx solid #FFFFFF;
border-radius: 50%;
background: #EA0C28;
}
.headerIcon .iconicon_app1 {
font-size: 44rpx;
color: rgba(27, 38, 61, 0.4);
}
.siderbarShow {
transform: translateX(750rpx);
transition: all 400ms linear 0s;
......@@ -65,8 +85,15 @@
margin-right: 34rpx;
width: 64rpx;
height: 64rpx;
background: yellow;
border-radius: 50%;
background: #3070F2;
color: white;
overflow: hidden;
}
.sidebarLogo view:nth-of-type(1) image {
width: 64rpx;
height: 64rpx;
}
.hasAssociated, .unAssociated {
......@@ -122,6 +149,11 @@
height: 32rpx;
}
.operateIcon .iconright {
font-size: 22rpx;
color: rgba(27, 38, 61, .5)
}
.scheduleList {
margin-bottom: 48rpx;
}
......
<view class="scheduleHeader">
<view>2020年3月</view>
<view onTap="changesidebar">icon</view>
<view onTap="changesidebar" class="headerIcon">
<text class="iconfont iconicon_app1">
</text>
<view>
</view>
</view>
</view>
<scroll-view class="indexScrollView" scroll-y="{{true}}" style="background: #FFFFFF" lower-threshold="1000" onScrollToLower="lower" scroll-into-view="{{todayStr}}">
<block a:for="{{scheduleList}}" a:for-item="scheduleYearList">
......@@ -93,10 +98,11 @@
<view class="sidebarContent" catchTap="preventSort">
<view class="sidebarLogo">
<view>
logo
<image a:if="{{userMsg.headUrl}}" mode="scaleToFill" src="{{userMsg.headUrl}}" />
<text a:else>{{ userMsg.username.slice(-1) }}</text>
</view>
<view>
出的鹏
{{ userMsg.username }}
</view>
</view>
<view class="hasAssociated">
......@@ -116,7 +122,7 @@
</view>
</view>
<view class="operateIcon">
ic
<text class="iconfont iconright"></text>
</view>
</view>
</view>
......@@ -138,7 +144,7 @@
</view>
</view>
<view class="operateIcon">
ic
<text class="iconfont iconright"></text>
</view>
</view>
</view>
......@@ -155,7 +161,7 @@
</view>
</view>
<view class="operateIcon">
ic
<text class="iconfont iconright"></text>
</view>
</view>
</view>
......@@ -172,27 +178,10 @@
</view>
</view>
<view class="operateIcon">
ic
<text class="iconfont iconright"></text>
</view>
</view>
</view>
</view>
</view>
</popup>
<!--<view class="sidebar {{isShowSidebar === '' ? '' : isShowSidebar === false ? 'siderbarHidden' : 'siderbarShow'}}" catchTap="changesidebar"><view class="sidebarContent" catchTap="preventSort"><view class="sidebarLogo"><view>
logo</view><view>
出的鹏</view></view><view class="hasAssociated"><view class="associated">
已关联应用</view><view class="applicationList"><view class="applicationLogo"></view><view class="applicationMsg"><view><view>
Outlook日历</view><view>
支持会议日程双向同步,实时同步日程信息等</view></view><view class="operateIcon">
ic</view></view></view></view><view class="unAssociated"><view class="associated">
可关联应用</view><view class="applicationList"><view class="applicationLogo"></view><view class="applicationMsg"><view><view>
Outlook日历</view><view>
支持会议日程双向同步,实时同步日程信息等</view></view><view class="operateIcon">
ic</view></view></view><view class="applicationList"><view class="applicationLogo"></view><view class="applicationMsg"><view><view>
Outlook日历</view><view>
支持会议日程双向同步,实时同步日程信息等</view></view><view class="operateIcon">
ic</view></view></view><view class="applicationList"><view class="applicationLogo"></view><view class="applicationMsg"><view><view>
Outlook日历</view><view>
支持会议日程双向同步,实时同步日程信息等</view></view><view class="operateIcon">
ic</view></view></view></view></view></view> -->
\ No newline at end of file
</popup>
\ No newline at end of file
......@@ -10,6 +10,7 @@ import create from "dd-store";
create.Component({
mixins: [],
data: {
userMsg: "",
$data: null,
response: "",
scheduleList: [],
......@@ -17,19 +18,22 @@ create.Component({
thisYear: "",
maxYear: "",
minYear: "",
startPageOnLoad: false,
startPageOnShow: false,
isFirstLoad: true,
isShowSidebar: "",
pageStartTime: "",
pageEndTime: "",
show: false,
scrollHeight: "",
timeStamp: ""
timeStamp: "",
userMsg: {}
},
props: {},
didMount() {
this.getDate();
this.setData({
userMsg: {
headUrl: getApp().globalData.avatar || "",
userName: getApp().globalData.name
}
});
},
didUpdate() {
if (this.props.update) {
......@@ -59,25 +63,13 @@ create.Component({
scheduleList.push(that.returnScheduleList(2019 + i));
}
// 第一次加载
// finalDate 是用来定位到今天的
const finalDate = new Date();
// finalDate.setDate(today.getDate() - today.getDay())
that.setData(
{
scheduleList: scheduleList,
todayStr: finalDate.toLocaleDateString(),
thisYear: year,
maxYear: year,
startPageOnShow: true,
isFirstLoad: false
}
// ,
// () => {
// that.setData({
// });
// }
);
that.setData({
scheduleList: scheduleList,
todayStr: finalDate.toLocaleDateString(),
thisYear: year,
maxYear: year
});
}
);
});
......@@ -134,13 +126,19 @@ create.Component({
// TO DO 判断所获取的时间区间
// 将会议的年,月,日拆分,时分拆分,生成rrules规则
let initialTime = item.initialTime.split("-"); //
// <<<<<<< HEAD
// let initialTimeDate = new Date(parseInt(initialTime[0]), parseInt(initialTime[1]) - 1, parseInt(initialTime[2]));
// initialTimeDate.setDate(initialTimeDate.getDate() - 1)
// console.log(initialTimeDate.toLocaleDateString())
// let initialTimeDateyear = initialTimeDate.getFullYear()
// let initialTimeDatemonth = initialTimeDate.getMonth() + 1 < 10 ? '0' + (initialTimeDate.getMonth() + 1) : initialTimeDate.getMonth() + 1
// let initialTimeDateday = initialTimeDate.getDate() < 10 ? '0' + initialTimeDate.getDate() : initialTimeDate.getDate()
// =======
let initialTimeDate = new Date(
parseInt(initialTime[0]),
parseInt(initialTime[1]) - 1,
parseInt(initialTime[2])
);
initialTimeDate.setDate(initialTimeDate.getDate() - 1);
console.log(initialTimeDate.toLocaleDateString());
let initialTimeDateyear = initialTimeDate.getFullYear();
let initialTimeDatemonth =
initialTimeDate.getMonth() + 1 < 10
......@@ -150,20 +148,13 @@ create.Component({
initialTimeDate.getDate() < 10
? "0" + initialTimeDate.getDate()
: initialTimeDate.getDate();
// >>>>>>> 8548e2b26ad549008cdd8c9e5e2bf83d67124e7d
let startTimeList = item.startTime.split(":");
let DTSTART = `${initialTimeDateyear}${initialTimeDatemonth}${initialTimeDateday}T${startTimeList[0]}${startTimeList[1]}00Z`;
console.log(DTSTART);
let rule = RRule.fromString(
`${item.recurrenceModel.recurrenceRule};DTSTART=${DTSTART}`
);
// console.log(rule, 'rule')
rule.options.tzid = "Asia/Hong_Kong";
// 改变时区
let rullAll = rule.all()
rule.all().map(item => {
console.log(item.toLocaleDateString())
})
// 判断是否需要剔除某一天
if (item.excludePlanDates) {
// 拿到剔除日期的list
......
......@@ -8,13 +8,6 @@ export function getMeetingRoom(data) {
url: '/meet/meeting-room/page',
})
}
export function getMeetingGlobalSetting(data) {
return $http({
method: 'get',
data: data,
url: '/meet/meeting-global-setting/get',
})
}
// 获取会议室分类
// 办公区域
......
......@@ -16,7 +16,6 @@
"pages/scheduleDetail/scheduleDetail",
"pages/participantsDetail/participantsDetail",
"pages/applicationDetails/applicationDetails",
"pages/attendeeList/attendeeList",
"pages/aaaa/aaaa"
"pages/attendeeList/attendeeList"
]
}
}
\ No newline at end of file
......@@ -6,8 +6,7 @@ Component({
props: {
isCanEdit: true
},
didMount() {
},
didMount() { },
didUpdate() {
},
didUnmount() { },
......
<view>
New Page
</view>
\ No newline at end of file
// import { RRule, RRuleSet, rrulestr } from 'rrule'
// Page({
// data: {},
// onLoad() {
// const rule = new RRule({
// freq: RRule.WEEKLY,
// interval: 5,
// byweekday: [RRule.MO, RRule.FR],
// dtstart: new Date(Date.UTC(2012, 1, 1, 10, 30)),
// until: new Date(Date.UTC(2012, 12, 31))
// })
// rule.all()
// ['2012-02-03T10:30:00.000Z',
// '2012-03-05T10:30:00.000Z',
// '2012-03-09T10:30:00.000Z',
// '2012-04-09T10:30:00.000Z',
// '2012-04-13T10:30:00.000Z',
// '2012-05-14T10:30:00.000Z',
// '2012-05-18T10:30:00.000Z',
// ]
// rule.between(new Date(Date.UTC(2012, 7, 1)), new Date(Date.UTC(2012, 8, 1)))
// ['2012-08-27T10:30:00.000Z',
// '2012-08-31T10:30:00.000Z']
// // rule.toString()
// // "DTSTART:20120201T093000Z\nRRULE:FREQ=WEEKLY;INTERVAL=5;UNTIL=20130130T230000Z;BYDAY=MO,FR"
// // rule.toText()
// // "every 5 weeks on Monday, Friday until January 31, 2013"
// },
// });
{}
\ No newline at end of file
......@@ -2,12 +2,12 @@
<!-- title remark 标题 描述 -->
<view class="createTitle">
<view class="title">
<input placeholder-class="placeholder" placeholder="请输入主题" class="text" focus="{{true}}" onInput="onInput" data-type="title" value="{{title}}" />
<input placeholder-class="placeholder" placeholder="{{placeholder}}" class="text" onInput="onInput" data-type="title" value="{{title}}" focus="{{true}}"/>
<view class="icon iconfont iconicon_description1 {{remark ? '' : 'noValueIcon'}}" onTap="addRemark">
</view>
</view>
<view class="remark" a:if="{{isShowRemark}}">
<input placeholder-class="placeholder" placeholder="请添加描述" class="text" onInput="onInput" data-type="remark" value="{{remark}}" />
<input placeholder-class="placeholder" placeholder="请添加描述" class="text" onInput="onInput" data-type="remark" value="{{remark}}" focus="{{false}}" />
</view>
</view>
<!-- $data.$data.roomId locationName 地点 -->
......@@ -35,10 +35,10 @@
<view>
<view class="timeText" catchTap="showPopup" data-type='time'>
<text a:if="{{isAcrossDay}}">
{{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${$data.startTime.substring(11, 16)}`}} - {{`${$data.endTime.substring(5, 7)}月${$data.endTime.substring(8, 10)}日 ${$data.endTime.substring(11, 16)}`}}
{{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${$data.startTime.substring(11, 16)}-${$data.endTime.substring(5, 7)}月${$data.endTime.substring(8, 10)}日 ${$data.endTime.substring(11, 16)}`}}
</text>
<text a:else>
{{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${week} ${$data.startTime.substring(11, 16)}- ${$data.endTime.substring(11, 16)}`}}
{{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${week} ${$data.startTime.substring(11, 16)}-${$data.endTime.substring(11, 16)}`}}
</text>
<!-- 3月1日 周日 14:00-16:00 -->
</view>
......@@ -70,7 +70,7 @@
</view>
<view class="iconicon_open iconfont icon" style=" vertical-align: middle" catchTap="nextPage" data-nextPage="participantsDetail"></view>
</view>
<view class="participatorListBottom">
<view class="participatorListBottom" catchTap="nextPage" data-nextPage="participantsDetail">
<view class="people" a:for="{{$data.participatorList.length > 10 ? [...$data.participatorList].splice(0, 11) : $data.participatorList}}">
<view class="headUrl">
<image a:if="{{item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}" />
......@@ -82,7 +82,7 @@
</view>
<view class="name">{{item.name}}</view>
</view>
<view class="addPeople" catchTap="showPopup" data-type='participator'></view>
<view class="addPeople iconfont iconicon_add1" catchTap="showPopup" data-type='participator'></view>
</view>
</view>
</view>
......
......@@ -44,6 +44,7 @@ create.Page({
week: '',
isAcrossDay: false,
conflictPeople: [],
placeholder: ''
},
showPop(event) {
......@@ -65,7 +66,7 @@ create.Page({
title: `创建会议`
})
this.setData({
title: `${getApp().globalData.name}创建的会议`
placeholder: `${getApp().globalData.name}创建的会议`
})
this.reset()
},
......@@ -246,7 +247,7 @@ create.Page({
return year + '-' + month + '-' + day
},
// 添加参会人
addParticipator() {
addParticipator: throttle(function () {
const _that = this
let require = []
let select = []
......@@ -284,7 +285,8 @@ create.Page({
fail: function (err) {
}
})
},
}),
// 已选用户去中去掉必选用户
selectedelRequired(req, pic) {
for (let i = 0; i < req.length; i++) {
......@@ -314,12 +316,14 @@ create.Page({
this.$store.data.endTime = `${event.endTime}:00`
this.update()
this.acrossDay(this.$store.data.startTime, this.$store.data.endTime)
this.setData({
popupShow: false
popupShow: false,
week: this.data.weekList[new Date(this.$store.data.startTime).getDay()],
})
this.conflictPeople()
},
addSchedule() {
addSchedule: throttle(function () {
let data = {
title: this.data.title || `${getApp().globalData.name}创建的会议`,
location: {
......@@ -347,7 +351,8 @@ create.Page({
})
}
})
},
}),
// 获取时间参数
getTimes(time = new Date()) {
let date = getInterTime(new Date(time))
......
......@@ -56,23 +56,38 @@
height: 116rpx;
}
.tabBarView text {
.tabBarView>view {
display: block;
color: rgba(10, 10, 10, .4)
}
.tabBarView text:nth-of-type(1) {
.tabBarView>view:nth-of-type(1) {
width: 42rpx;
height: 42rpx;
font-size: 42rpx;
margin-bottom: 11rpx;
}
.tabBarView text:nth-of-type(2) {
.tabBarView>view:nth-of-type(2) {
height: 10rpx;
font-size: 20rpx;
}
.ischooseTabBar text {
.ischooseTabBar>view {
color: rgba(10, 10, 10, 1) !important;
}
.iconicon_Calendarbox1 {
position: relative;
}
.iconicon_days {
position: absolute;
left: 5rpx;
top: 5rpx;
font-size: 30rpx;
}
.tabBarView .iconicon_days {
color: #FFFFFF !important;
}
\ No newline at end of file
版本175
{{tabBarIndex}}
<view a:if="{{tabBarIndex === '0'}}">
<my-dynamic>
</my-dynamic>
......
......@@ -7,7 +7,7 @@
</view>
<view class="hideTime">
<text a:if="{{isAcrossDay}}">
{{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${$data.startTime.substring(11, 16)}`}}-{{`${$data.endTime.substring(5, 7)}月${$data.endTime.substring(8, 10)}日 ${$data.endTime.substring(11, 16)}`}}
{{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${$data.startTime.substring(11, 16)}-${$data.endTime.substring(5, 7)}月${$data.endTime.substring(8, 10)}日 ${$data.endTime.substring(11, 16)}`}}
</text>
<text a:else>
{{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${week} ${$data.startTime.substring(11, 16)}-${$data.endTime.substring(11, 16)}`}}
......@@ -21,7 +21,7 @@
<view class="permissionContant">
<view class="createTitle">
<view class="title">
<input placeholder-class="placeholder" placeholder="请输入主题" class="text" onInput="onInput" data-type="title" data-selectType="common" value="{{title}}" onConfirm="onConfirm"/>
<input placeholder-class="placeholder" placeholder="{{placeholder}}" class="text" onInput="onInput" data-type="title" data-selectType="common" value="{{title}}" onConfirm="onConfirm" focus="{{true}}"/>
<view class="icon iconfont iconicon_description1 {{remark ? '' : 'noValueIcon'}}" onTap="addRemark">
</view>
</view>
......@@ -92,7 +92,7 @@
<view class="participatorListTop">
<view class="participatorText">
<view>
{{$data.participatorList.length}}位参会人
{{$data.participatorList.length}}位参会人
</view>
<view class="conflictStatus" a:if="{{conflictPeople.length}}">
{{conflictPeople.length}}人会议安排冲突
......@@ -100,12 +100,11 @@
</view>
<view class="iconicon_open iconfont icon" style=" vertical-align: middle" catchTap="nextPage" data-nextPage="participantsDetail"></view>
</view>
<view class="participatorListBottom">
<view class="participatorListBottom" catchTap="nextPage" data-nextPage="participantsDetail">
<view class="people" a:for="{{$data.participatorList.length > 10 ? [...$data.participatorList].splice(0, 11) : $data.participatorList}}">
<view class="headUrl">
<image a:if="{{item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}" />
<text
a:else>{{item.platform==="outlook" ? item.username.substring(0, 2) : item.username.substring(item.username.length-2, item.username.length)}}
<text a:else>{{item.platform==="outlook" ? item.username.substring(0, 2) : item.username.substring(item.username.length-2, item.username.length)}}
</text>
<view class="conflict iconicon_conflict iconfont" a:if="{{conflictPeople.includes(item.userId)}}">
</view>
......@@ -142,7 +141,7 @@
</view>
<!-- 底部导航栏 -->
<view class="footNav">
<view class="footNavTop">
<view class="footNavTop" a:if="{{!isExpand}}">
<view class="originStaus" a:if="{{confirmAttendance === null}}">
<view catchTap="participate">
<text class="iconfont iconicon_Agreed1"></text>
......
......@@ -105,11 +105,10 @@ create.Page({
editType: '',
confirmAttendance: null,
isExpand: false,
forbiddenScroll: false
forbiddenScroll: false,
placeholder: ''
},
onShow() {
console.log(this)
this.conflictPeople()
setTimeout(() => {
this.update()
......@@ -124,6 +123,7 @@ create.Page({
title: `会议详情`
})
this.setData({
placeholder: `${getApp().globalData.name}创建的会议`,
scheduleItem: JSON.parse(event.scheduleItem),
currentPeople: getApp().globalData.userid
})
......@@ -182,7 +182,7 @@ create.Page({
remark: res.data.data.remark,
isExpand: res.data.data.confirmAttendance === 1 ? true : false,
isShowRemark: res.data.data.remark ? true : false,
week: this.data.weekList[new Date(res.data.data.startTime.replace(/'-'/g, "\/")).getDay()],
week: this.data.weekList[new Date(res.data.data.startTime.replace(/-/g, "/")).getDay()],
getData: true
})
if (res.data.data.repeatable) {
......@@ -308,10 +308,7 @@ create.Page({
meetingWayModel: { model: null }
})
if (this.data.repeatable) {
this.setData({
'conSelectPopupData.showSelectPopup': true,
editType: 'meeting_way'
})
this.isChange('meeting_way', 'future')
} else {
this.isChange('meeting_way', 'only')
}
......@@ -541,6 +538,7 @@ create.Page({
this.acrossDay(this.$store.data.startTime, this.$store.data.endTime)
this.setData({
popupShow: false,
week: this.data.weekList[new Date(this.$store.data.startTime).getDay()],
editType: '',
forbiddenScroll: false
})
......
<view class="outLookContact">
<!-- 输入邮箱联系人 -->
<view class="addContact">
<input placeholder="请输入邮箱" focus="{{true}}" onInput="onInput" value="{{value}}" />
<input placeholder="请输入邮箱" onInput="onInput" value="{{value}}" />
<view class="icon iconfont iconicon_add " onTap="addEmail">
</view>
</view>
......@@ -16,7 +16,7 @@
<view class="contactText">
{{item.username}}
</view>
<view a:if="{{!!scheduleItem ? !(item.userId == $data.originalData || $data.originUsersId.includes(item.userId)) : !(item.userId == $data.originalData)}}" class="contactClose icon iconfont iconicon_close" onTap="close" data-item="{{item}}">
<view a:if="{{(!scheduleItem || currentPeople === $data.originalData.organizer) ? !(item.userId == currentPeople) : !($data.originUsersId.includes(item.userId))}}" class="contactClose icon iconfont iconicon_close" onTap="close" data-item="{{item}}">
</view>
</view>
</view>
......
......@@ -41,6 +41,7 @@ create.Page({
showToast: false,
title: '保存成功'
},
currentPeople: ''
},
onLoad(event) {
const _that = this
......@@ -57,7 +58,8 @@ create.Page({
}
}
this.setData({
outlookContact: outlookContact
outlookContact: outlookContact,
currentPeople: getApp().globalData.userid
})
observer.register({
notice(scheduleItem) {
......@@ -185,7 +187,7 @@ create.Page({
})
if (event.currentTarget.dataset.item.id > -1) {
let addUserList = this.arrayPoor(this.$store.data.originUsers, this.data.userList).addUserList
let deleteUserList = this.arrayPoor(this.$store.data.originUsers, this.data.userListId).deleteUserList
let deleteUserList = this.arrayPoor(this.$store.data.originUsers, this.data.userList).deleteUserList
let dataUser = {
addUserList: addUserList,
deleteUserList: deleteUserList,
......
......@@ -8,7 +8,7 @@
</view>
<view class="info">
<text class="name">{{item.username}}</text>
<text a:if="{{!!scheduleItem ? !(item.userId == $data.originalData || $data.originUsersId.includes(item.userId)) : !(item.userId == currentPeople)}}" class="close iconicon_close iconfont" data-userId="{{item.userId}}" onTap="delParticipants"></text>
<text a:if="{{(!scheduleItem || currentPeople === $data.originalData.organizer) ? !(item.userId == currentPeople) : false}}" class="close iconicon_close iconfont" data-userId="{{item.userId}}" onTap="delParticipants"></text>
</view>
</view>
</view>
......
......@@ -8,7 +8,7 @@ class Store {
originUsers: [],
originUsersId: [],
originalData: null,
indexNeedUpdate: false,
indexNeedUpdate: false
}
}
export default new Store()
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment