|
@@ -104,6 +104,17 @@ const popperRef = ref<any>(null)
|
|
const dataList = ref<any[]>([])
|
|
const dataList = ref<any[]>([])
|
|
|
|
|
|
const setInitData = () => {
|
|
const setInitData = () => {
|
|
|
|
+ // 如果不是切换天数,则不重置
|
|
|
|
+ if (defaultTotalTime.value > 0) return
|
|
|
|
+ if (initialData?.value?.length == 0) {
|
|
|
|
+ dataList.value = dataList.value.map((item) => {
|
|
|
|
+ return {
|
|
|
|
+ ...item,
|
|
|
|
+ count: 0
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ return
|
|
|
|
+ }
|
|
if (initialData.value && initialData.value.length > 0) {
|
|
if (initialData.value && initialData.value.length > 0) {
|
|
const initialObj = {}
|
|
const initialObj = {}
|
|
initialData.value.forEach((item) => {
|
|
initialData.value.forEach((item) => {
|
|
@@ -130,11 +141,19 @@ const setInitData = () => {
|
|
}
|
|
}
|
|
|
|
|
|
watch(
|
|
watch(
|
|
- () => [nowDate.value, initialData.value],
|
|
|
|
|
|
+ () => initialData.value,
|
|
() => {
|
|
() => {
|
|
setInitData()
|
|
setInitData()
|
|
}
|
|
}
|
|
)
|
|
)
|
|
|
|
+watch(
|
|
|
|
+ () => nowDate.value,
|
|
|
|
+ () => {
|
|
|
|
+ // 切换日期,重置数据
|
|
|
|
+ defaultTotalTime.value = 0
|
|
|
|
+ setInitData()
|
|
|
|
+ }
|
|
|
|
+)
|
|
|
|
|
|
onMounted(async () => {
|
|
onMounted(async () => {
|
|
await getAllProject()
|
|
await getAllProject()
|
|
@@ -187,21 +206,20 @@ const panelSubmit = (index: number) => {
|
|
dataList.value[index].visible = false
|
|
dataList.value[index].visible = false
|
|
getTotalTime()
|
|
getTotalTime()
|
|
tempCount.value = 0
|
|
tempCount.value = 0
|
|
- // 提交后进行一下数据排序
|
|
|
|
- dataList.value.sort((x, y) => y['count'] - x['count'])
|
|
|
|
-
|
|
|
|
- // 提交工时后将已填数据传出去
|
|
|
|
- const countList = dataList.value
|
|
|
|
- .filter((item) => item.count > 0)
|
|
|
|
- .map((item) => ({
|
|
|
|
- workTime: item.count,
|
|
|
|
- projectId: item.id
|
|
|
|
- }))
|
|
|
|
- onChange(countList)
|
|
|
|
-
|
|
|
|
// 提交工时后清空搜索框
|
|
// 提交工时后清空搜索框
|
|
if (tempSearchList.value.length > 0) {
|
|
if (tempSearchList.value.length > 0) {
|
|
searchInputRef.value?.clear()
|
|
searchInputRef.value?.clear()
|
|
|
|
+ } else {
|
|
|
|
+ // 提交后进行一下数据排序
|
|
|
|
+ dataList.value.sort((x, y) => y['count'] - x['count'])
|
|
|
|
+ // 提交工时后将已填数据传出去
|
|
|
|
+ const countList = dataList.value
|
|
|
|
+ .filter((item) => item.count > 0)
|
|
|
|
+ .map((item) => ({
|
|
|
|
+ workTime: item.count,
|
|
|
|
+ projectId: item.id
|
|
|
|
+ }))
|
|
|
|
+ onChange(countList)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -255,6 +273,15 @@ const clearSearch = () => {
|
|
tempSearchList.value.sort((x, y) => y['count'] - x['count'])
|
|
tempSearchList.value.sort((x, y) => y['count'] - x['count'])
|
|
// 还原全部数据
|
|
// 还原全部数据
|
|
dataList.value = tempSearchList.value
|
|
dataList.value = tempSearchList.value
|
|
|
|
+ // 提交工时后将已填数据传出去
|
|
|
|
+ const countList = dataList.value
|
|
|
|
+ .filter((item) => item.count > 0)
|
|
|
|
+ .map((item) => ({
|
|
|
|
+ workTime: item.count,
|
|
|
|
+ projectId: item.id
|
|
|
|
+ }))
|
|
|
|
+ onChange(countList)
|
|
|
|
+
|
|
tempSearchList.value = []
|
|
tempSearchList.value = []
|
|
getTotalTime()
|
|
getTotalTime()
|
|
}
|
|
}
|