|
|
@@ -113,7 +113,7 @@ const loadList = useDebounceFn(async () => {
|
|
|
list.value = (data?.list ?? []).map((item) => ({
|
|
|
...item,
|
|
|
deptDisplayName:
|
|
|
- selectedDeptType.value === '1'
|
|
|
+ String(item.type || selectedDeptType.value || '1') === '2'
|
|
|
? item.projectDeptName || '-'
|
|
|
: item.teamName || item.projectDeptName || '-'
|
|
|
}))
|
|
|
@@ -127,7 +127,8 @@ const loadSummary = useDebounceFn(async () => {
|
|
|
summaryLoading.value = true
|
|
|
try {
|
|
|
const data = await FiveIotProjectDailyReportApi.getIotProjectDailyReportSummary({
|
|
|
- deptId: query.value.deptId
|
|
|
+ deptId: query.value.deptId,
|
|
|
+ createTime: query.value.createTime
|
|
|
})
|
|
|
|
|
|
cardStatistics.value = {
|
|
|
@@ -186,7 +187,10 @@ syncQueryFromRoute()
|
|
|
|
|
|
watch(
|
|
|
() => [query.value.createTime?.[0], query.value.createTime?.[1]],
|
|
|
- () => handleQuery(),
|
|
|
+ () => {
|
|
|
+ loadSummary()
|
|
|
+ handleQuery()
|
|
|
+ },
|
|
|
{ immediate: true }
|
|
|
)
|
|
|
|
|
|
@@ -287,8 +291,7 @@ watch(
|
|
|
:min-width="180"
|
|
|
show-overflow-tooltip
|
|
|
cover-formatter
|
|
|
- :real-value="(row) => formatCellValue(row, 'deptDisplayName')"
|
|
|
- />
|
|
|
+ :real-value="(row) => formatCellValue(row, 'deptDisplayName')" />
|
|
|
<ZmTableColumn
|
|
|
v-for="column in tableColumns.slice(1)"
|
|
|
:key="column.prop"
|
