mkm/TaskSystem-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.excellentkk.cn/mkm/TaskSystem-admin

Browse Source
This commit is contained in:
weipengfei 2023-08-14 18:25:34 +08:00
commit 929e3bccac
1 changed files with 148 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

301
src/views/task/taskCalendar.vue
View File

@ -1,28 +1,24 @@
<template> <template>
<div> <div>
<el-card class="!border-none" v-loading="loading" shadow="never"> <el-card class="!border-none" v-loading="loading" shadow="never">
<div style="display: flex; justify-content: space-between"> <div style="display: flex; justify-content: space-between">
<el-button <el-button v-perms="['flow_type/add']" type="primary" @click="handleAdd">
v-perms="['flow_type/add']" <template #icon>
type="primary" <icon name="el-icon-Plus" />
@click="handleAdd" </template>
> 新增
<template #icon> </el-button>
<icon name="el-icon-Plus" /> <!-- <div class="btn">
</template>
新增
</el-button>
<!-- <div class="btn">
<div :class="{ active: nowType == 0 }" @click="nowType = 0">日历</div> <div :class="{ active: nowType == 0 }" @click="nowType = 0">日历</div>
<div :class="{ active: nowType == 1 }" @click="nowType = 1">列表</div> <div :class="{ active: nowType == 1 }" @click="nowType = 1">列表</div>
</div> --> </div> -->
</div> </div>
<calendar <calendar
:list="taskList" :list="taskList"
@clickItem="clickTask" @clickItem="clickTask"
@initShowDate="initShowDate" @initShowDate="initShowDate"
></calendar> ></calendar>
<!-- <div class="mt-4"> <!-- <div class="mt-4">
<el-calendar v-model="dateValue"> <el-calendar v-model="dateValue">
<template #dateCell="{ data }"> <template #dateCell="{ data }">
<div style="width: 100%; height: 100%"> <div style="width: 100%; height: 100%">
@ -44,187 +40,186 @@
</template> </template>
</el-calendar> </el-calendar>
</div>--> </div>-->
</el-card> </el-card>
<EditTowPopup <EditTowPopup
ref="editTowRef" ref="editTowRef"
:task="task" :task="task"
:type="popupType" :type="popupType"
@success="loadTask" @success="loadTask"
@close="showEditTow = false" @close="showEditTow = false"
/> />
</div> </div>
</template> </template>
<script lang="ts" setup name="task"> <script lang="ts" setup name="task">
import { timeFormat } from "@/utils/util"; import { timeFormat } from '@/utils/util'
import feedback from "@/utils/feedback"; import feedback from '@/utils/feedback'
// import { getRoutePath } from "router"; // import { getRoutePath } from "router";
import EditPopup from "./edit.vue"; import EditPopup from './edit.vue'
import EditTowPopup from "./editTow.vue"; import EditTowPopup from './editTow.vue'
import { reactive, watch } from "vue"; import { reactive, watch } from 'vue'
import { apiTaskList, apiTaskDetails } from "@/api/task"; import { apiTaskList, apiTaskDetails } from '@/api/task'
import calendar from "./calendar.vue"; import calendar from './calendar.vue'
const route = useRoute(); const route = useRoute()
const dateValue = ref(new Date()); const dateValue = ref(new Date())
// 当前点击的任务 // 当前点击的任务
const task = ref({ const task = ref({
create_user_id: 0, create_user_id: 0,
end_time: "", end_time: '',
id: 0, id: 0,
scheduling_id: 0, scheduling_id: 0,
start_time: "", start_time: '',
status: 0, status: 0,
template_id: 0, template_id: 0,
template_name: "", template_name: ''
}); })
const popupType = ref("add"); const popupType = ref('add')
const clickTask = (e: any) => { const clickTask = (e: any) => {
popupType.value = "show"; popupType.value = 'show'
// task.value = e; // task.value = e;
task.value = taskList.value.find((item: any) => item.id == e); task.value = taskList.value.find((item: any) => item.id == e)
handleSelect(); handleSelect()
}; }
// 加载 // 加载
const loading = ref(true); const loading = ref(true)
const editRef = shallowRef<InstanceType<typeof EditPopup>>(); const editRef = shallowRef<InstanceType<typeof EditPopup>>()
const editTowRef = shallowRef<InstanceType<typeof EditPopup>>(); const editTowRef = shallowRef<InstanceType<typeof EditPopup>>()
// 是否显示编辑框 // 是否显示编辑框
const showEdit = ref(false); const showEdit = ref(false)
const showEditTow = ref(false); const showEditTow = ref(false)
// 查询条件 // 查询条件
const queryParams = reactive({ const queryParams = reactive({
start_time: "", scheduling_id: '',
end_time: "", start_time: '',
page_no: 1, end_time: '',
pageSize: 150, page_no: 1,
}); pageSize: 150
})
const taskList = ref<any>([]); if (route.query.id) {
queryParams.scheduling_id = route.query.id.toString()
}
const taskList = ref<any>([])
// 查询 // 查询
const loadTask = async () => { const loadTask = async () => {
apiTaskList(queryParams).then((res) => { apiTaskList(queryParams).then((res) => {
taskList.value = res.lists; taskList.value = res.lists
loading.value = false; loading.value = false
}); })
}; }
const start_date = ref(""); const start_date = ref('')
const end_date = ref(""); const end_date = ref('')
// 计算当前显示的第一天和最后一天 // 计算当前显示的第一天和最后一天
const initShowDate = (dateStr = "") => { const initShowDate = (dateStr = '') => {
const currentDate = dateStr ? new Date(dateStr) : new Date(); const currentDate = dateStr ? new Date(dateStr) : new Date()
const currentYear = currentDate.getFullYear(); const currentYear = currentDate.getFullYear()
const currentMonth = currentDate.getMonth(); const currentMonth = currentDate.getMonth()
const lastDay = new Date(currentYear, currentMonth + 1, 0).getDay(); //获取第一天星期 const lastDay = new Date(currentYear, currentMonth + 1, 0).getDay() //获取第一天星期
const startDay = new Date(currentYear, currentMonth, 1).getDay(); //获取最后一天星期 const startDay = new Date(currentYear, currentMonth, 1).getDay() //获取最后一天星期
// console.log(new Date(currentYear, currentMonth, 1-startDay).getDate()); // console.log(new Date(currentYear, currentMonth, 1-startDay).getDate());
// console.log(new Date(currentYear, currentMonth + 1, 6-lastDay).getDate()); // console.log(new Date(currentYear, currentMonth + 1, 6-lastDay).getDate());
start_date.value = timeFormat( start_date.value = timeFormat(new Date(currentYear, currentMonth, 1 - startDay).getTime()) //获取第一天时间
new Date(currentYear, currentMonth, 1 - startDay).getTime() end_date.value = timeFormat(new Date(currentYear, currentMonth + 1, 6 - lastDay).getTime()) //获取最后一天时间
); //获取第一天时间 if (queryParams.start_time != start_date.value) {
end_date.value = timeFormat( queryParams.start_time = start_date.value
new Date(currentYear, currentMonth + 1, 6 - lastDay).getTime() queryParams.end_time = end_date.value
); //获取最后一天时间 loading.value = true
if (queryParams.start_time != start_date.value) { loadTask()
queryParams.start_time = start_date.value; }
queryParams.end_time = end_date.value; }
loading.value = true; initShowDate()
loadTask();
}
};
initShowDate();
// 过滤的任务列表 // 过滤的任务列表
const taskListFilter = (e: any) => { const taskListFilter = (e: any) => {
return taskList.value return taskList.value
.filter((item: any) => { .filter((item: any) => {
let now = new Date(e).getTime() / 1000; const now = new Date(e).getTime() / 1000
let start = new Date(item.start_time).getTime() / 1000; const start = new Date(item.start_time).getTime() / 1000
let end = new Date(item.end_time).getTime() / 1000; const end = new Date(item.end_time).getTime() / 1000
return now - start >= 0 && now - end <= 0; return now - start >= 0 && now - end <= 0
}) })
.slice(0, 5); .slice(0, 5)
}; }
// 添加 // 添加
const handleAdd = async () => { const handleAdd = async () => {
popupType.value = "add"; popupType.value = 'add'
showEditTow.value = true; showEditTow.value = true
await nextTick(); await nextTick()
editTowRef.value?.open("add"); editTowRef.value?.open('add')
editTowRef.value?.updatedForm(); editTowRef.value?.updatedForm()
}; }
// 查询 // 查询
const handleSelect = async () => { const handleSelect = async () => {
popupType.value = "show"; popupType.value = 'show'
showEditTow.value = true; showEditTow.value = true
await nextTick(); await nextTick()
editTowRef.value?.open("show"); editTowRef.value?.open('show')
editTowRef.value?.updatedForm(); editTowRef.value?.updatedForm()
}; }
// 当前选择类型 // 当前选择类型
const nowType = ref(0); const nowType = ref(0)
const handleTypeClick = (e) => { const handleTypeClick = (e) => {
console.log(e); console.log(e)
}; }
</script> </script>
<style lang="scss"> <style lang="scss">
.is-selected { .is-selected {
color: #1989fa; color: #1989fa;
} }
.el-calendar-table .el-calendar-day { .el-calendar-table .el-calendar-day {
min-height: 8.2rem; min-height: 8.2rem;
padding: 0; padding: 0;
} }
.task { .task {
font-size: 0.8rem; font-size: 0.8rem;
/* color: #f7ba2a; */ /* color: #f7ba2a; */
color: #1989fa; color: #1989fa;
padding: 0 8px; padding: 0 8px;
white-space: nowrap; /* 设置文本不换行 */ white-space: nowrap; /* 设置文本不换行 */
overflow: hidden; /* 隐藏溢出的部分 */ overflow: hidden; /* 隐藏溢出的部分 */
text-overflow: ellipsis; /* 在溢出的部分显示省略号 */ text-overflow: ellipsis; /* 在溢出的部分显示省略号 */
&:hover { &:hover {
background-color: rgba($color: #f38200, $alpha: 0.7); background-color: rgba($color: #f38200, $alpha: 0.7);
border-radius: 4px; border-radius: 4px;
color: #fff; color: #fff;
} }
} }
.the { .the {
color: #ff5100; color: #ff5100;
} }
.tow { .tow {
color: #f38200; color: #f38200;
} }
.fou { .fou {
color: red; color: red;
} }
.btn { .btn {
height: 30px; height: 30px;
width: 150px; width: 150px;
border: 1px solid #4a5dff; border: 1px solid #4a5dff;
border-radius: 5px; border-radius: 5px;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
cursor: pointer; cursor: pointer;
div { div {
flex: 1; flex: 1;
text-align: center; text-align: center;
line-height: 30px; line-height: 30px;
} }
.active { .active {
background-color: #4a5dff; background-color: #4a5dff;
color: #fff; color: #fff;
} }
} }
</style> </style>