mirror of
https://github.com/kuaifan/dootask.git
synced 2026-01-01 16:58:18 +00:00
整理代码
This commit is contained in:
kuaifan
parent
99d8559c56
commit
9289591ba0
@ -298,14 +298,14 @@ export default {
|
||||
}
|
||||
}
|
||||
// 会议事件
|
||||
window.__onMeetingEvent = ({act,uuid}) => {
|
||||
window.__onMeetingEvent = ({act, uuid}) => {
|
||||
switch (act) {
|
||||
// 获取用户信息
|
||||
case "getInfo":
|
||||
case "getInfo":
|
||||
this.$store.dispatch("call", {
|
||||
url: 'users/basic',
|
||||
data: {
|
||||
userid: [ (uuid+"").substring(6) ]
|
||||
userid: [(uuid + "").substring(6)]
|
||||
}
|
||||
}).then(({data}) => {
|
||||
$A.eeuiAppSendMessage({
|
||||
@ -321,22 +321,22 @@ export default {
|
||||
});
|
||||
break;
|
||||
//加入成功
|
||||
case "success":
|
||||
case "success":
|
||||
// 关闭添加会议窗口
|
||||
this.$store.dispatch("closeMeetingWindow","add")
|
||||
this.$store.dispatch("closeMeetingWindow", "add")
|
||||
break;
|
||||
// 邀请
|
||||
case "invent":
|
||||
case "invent":
|
||||
// 关闭邀请会议窗口
|
||||
this.$store.dispatch("closeMeetingWindow","invitation")
|
||||
this.$store.dispatch("closeMeetingWindow", "invitation")
|
||||
break;
|
||||
//结束会议
|
||||
case "endMeeting":
|
||||
|
||||
case "endMeeting":
|
||||
|
||||
break;
|
||||
//加入失败
|
||||
case "error":
|
||||
this.$store.dispatch("closeMeetingWindow","error")
|
||||
case "error":
|
||||
this.$store.dispatch("closeMeetingWindow", "error")
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
||||
@ -134,11 +134,11 @@
|
||||
</FormItem>
|
||||
<FormItem prop="startTime" :label="$L('开始时间')">
|
||||
<div style="display: flex;gap: 3px;">
|
||||
<DatePicker type="date" format="yyyy-MM-dd"
|
||||
v-model="addData.startTime"
|
||||
<DatePicker type="date" format="yyyy-MM-dd"
|
||||
v-model="addData.startTime"
|
||||
:editable="false"
|
||||
@on-change="(e)=>{ addData.startTime = e }"
|
||||
:placeholder="$L('请选择开始时间')"
|
||||
@on-change="(e)=>{ addData.startTime = e }"
|
||||
:placeholder="$L('请选择开始时间')"
|
||||
style="flex: 1;min-width: 122px;"
|
||||
></DatePicker>
|
||||
<Select v-model="addData.startTimeHour" style="max-width: 100px;">
|
||||
@ -152,11 +152,11 @@
|
||||
</FormItem>
|
||||
<FormItem prop="endTime" :label="$L('结束时间')">
|
||||
<div style="display: flex;gap: 3px;">
|
||||
<DatePicker type="date" format="yyyy-MM-dd"
|
||||
v-model="addData.endTime"
|
||||
<DatePicker type="date" format="yyyy-MM-dd"
|
||||
v-model="addData.endTime"
|
||||
:editable="false"
|
||||
@on-change="(e)=>{ addData.endTime = e }"
|
||||
:placeholder="$L('请选择结束时间')"
|
||||
@on-change="(e)=>{ addData.endTime = e }"
|
||||
:placeholder="$L('请选择结束时间')"
|
||||
style="flex: 1;min-width: 122px;"
|
||||
></DatePicker>
|
||||
<Select v-model="addData.endTimeHour" style="max-width: 100px;">
|
||||
@ -180,7 +180,7 @@
|
||||
<Button type="primary" :loading="loadIng > 0" @click="onInitiate">{{$L('确认')}}</Button>
|
||||
</div>
|
||||
</Modal>
|
||||
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -189,7 +189,7 @@ import list from "./list.vue";
|
||||
import listDetails from "./details.vue";
|
||||
import DrawerOverlay from "../../../components/DrawerOverlay";
|
||||
import ImgUpload from "../../../components/ImgUpload";
|
||||
import { mapState } from 'vuex'
|
||||
import {mapState} from 'vuex'
|
||||
|
||||
export default {
|
||||
components:{list,listDetails,DrawerOverlay,ImgUpload},
|
||||
@ -208,7 +208,7 @@ export default {
|
||||
loadIng:false,
|
||||
|
||||
tabsValue:"",
|
||||
//
|
||||
//
|
||||
approvalType:"all",
|
||||
approvalList:[
|
||||
{value:"all",label:this.$L("全部审批")},
|
||||
@ -223,16 +223,16 @@ export default {
|
||||
{value:3,label:this.$L("已拒绝")},
|
||||
{value:4,label:this.$L("已撤回")}
|
||||
],
|
||||
//
|
||||
//
|
||||
unreadTotal:0,
|
||||
unreadList: [],
|
||||
doneList:[],
|
||||
notifyList:[],
|
||||
initiatedList: [],
|
||||
//
|
||||
//
|
||||
details:{},
|
||||
detailsShow:false,
|
||||
//
|
||||
//
|
||||
addTitle:'',
|
||||
addShow:false,
|
||||
startTimeOpen:false,
|
||||
@ -259,7 +259,7 @@ export default {
|
||||
},
|
||||
selectTypes:["年假","事假","病假","调休","产假","陪产假","婚假","丧假","哺乳假"],
|
||||
|
||||
//
|
||||
//
|
||||
showDateTime:false
|
||||
}
|
||||
},
|
||||
@ -347,7 +347,7 @@ export default {
|
||||
this.notifyList.map(h=>{ h._active = false; })
|
||||
this.initiatedList.map(h=>{ h._active = false; })
|
||||
item._active = true;
|
||||
//
|
||||
//
|
||||
if( window.innerWidth < 426 ){
|
||||
this.goForward({name: 'manage-approve-details', query: { id: item.id } });
|
||||
return;
|
||||
@ -378,7 +378,7 @@ export default {
|
||||
this.unreadList?.map((res)=>{ if(res._active) activeId = res.id })
|
||||
}
|
||||
this.unreadList = data.rows.map((h,index)=>{
|
||||
h._active = activeId > 0 ? h.id == activeId : index == 0;
|
||||
h._active = activeId > 0 ? h.id == activeId : index == 0;
|
||||
if(h._active) activeIndex = index
|
||||
return h;
|
||||
})
|
||||
@ -414,7 +414,7 @@ export default {
|
||||
this.doneList?.map((res)=>{ if(res._active) activeId = res.id })
|
||||
}
|
||||
this.doneList = data.rows.map((h,index)=>{
|
||||
h._active = activeId > 0 ? h.id == activeId : index == 0;
|
||||
h._active = activeId > 0 ? h.id == activeId : index == 0;
|
||||
if(h._active) activeIndex = index
|
||||
return h;
|
||||
})
|
||||
@ -447,7 +447,7 @@ export default {
|
||||
this.notifyList?.map((res)=>{ if(res._active) activeId = res.id })
|
||||
}
|
||||
this.notifyList = data.rows.map((h,index)=>{
|
||||
h._active = activeId > 0 ? h.id == activeId : index == 0;
|
||||
h._active = activeId > 0 ? h.id == activeId : index == 0;
|
||||
if(h._active) activeIndex = index
|
||||
return h;
|
||||
})
|
||||
@ -481,7 +481,7 @@ export default {
|
||||
this.initiatedList?.map((res)=>{ if(res._active) activeId = res.id })
|
||||
}
|
||||
this.initiatedList = data.rows.map((h,index)=>{
|
||||
h._active = activeId > 0 ? h.id == activeId : index == 0;
|
||||
h._active = activeId > 0 ? h.id == activeId : index == 0;
|
||||
if(h._active) activeIndex = index
|
||||
return h;
|
||||
})
|
||||
@ -536,7 +536,7 @@ export default {
|
||||
if (valid) {
|
||||
this.loadIng = 1;
|
||||
var obj = JSON.parse(JSON.stringify(this.addData))
|
||||
|
||||
|
||||
obj.startTime = obj.startTime +" "+ obj.startTimeHour + ":" + obj.startTimeMinute;
|
||||
obj.endTime = obj.endTime +" "+ obj.endTimeHour + ":" + obj.endTimeMinute;
|
||||
|
||||
@ -568,7 +568,7 @@ export default {
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
@ -117,7 +117,7 @@
|
||||
|
||||
<script>
|
||||
import {Store} from "le5le-store";
|
||||
import { mapState } from 'vuex'
|
||||
import {mapState} from 'vuex'
|
||||
import MeetingPlayer from "./MeetingPlayer";
|
||||
import DragBallComponent from "../../../components/DragBallComponent";
|
||||
import UserSelect from "../../../components/UserSelect.vue";
|
||||
@ -185,7 +185,7 @@ export default {
|
||||
this.$refs.meetingModal.modalIndex = this.$refs.meetingModal.handleGetModalIndex()
|
||||
}
|
||||
},
|
||||
meetingWindow : {
|
||||
meetingWindow: {
|
||||
handler(val) {
|
||||
switch (val.type) {
|
||||
case 'add':
|
||||
@ -277,7 +277,7 @@ export default {
|
||||
}
|
||||
});
|
||||
this.loadIng--;
|
||||
}else{
|
||||
} else {
|
||||
$A.loadScript('js/AgoraRTC_N-4.17.0.js').then(_ => {
|
||||
this.join(data)
|
||||
}).catch(_ => {
|
||||
|
||||
11
resources/assets/js/store/actions.js
vendored
11
resources/assets/js/store/actions.js
vendored
@ -3403,14 +3403,15 @@ export default {
|
||||
|
||||
|
||||
/** *****************************************************************************************/
|
||||
/** *************************************** pgp *********************************************/
|
||||
/** ************************************* meeting *******************************************/
|
||||
/** *****************************************************************************************/
|
||||
|
||||
/**
|
||||
* 关闭会议窗口
|
||||
* @param state
|
||||
* @param data
|
||||
*/
|
||||
* 关闭会议窗口
|
||||
* @param state
|
||||
* @param type
|
||||
* @param data
|
||||
*/
|
||||
closeMeetingWindow({state}, type) {
|
||||
state.meetingWindow = {
|
||||
show: false,
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit c5f09e948cbc45e8801c13a06a58288ae74d88f9
|
||||
Subproject commit fd41d5c68dcd004bb14160e4d5f08392087ce013
|
||||
Loading…
x
Reference in New Issue
Block a user