From 6bae45dfd31d647e4abc4e0246f495a29cc6896f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 六月 2024 11:20:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/task/index.vue | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/admin/src/views/task/index.vue b/admin/src/views/task/index.vue
index 5c3049a..8ff5809 100644
--- a/admin/src/views/task/index.vue
+++ b/admin/src/views/task/index.vue
@@ -85,7 +85,7 @@
row-key="id"
default-expand-all
>
- <el-table-column prop="name" label="浠诲姟绫诲瀷" min-width="100">
+<!-- <el-table-column prop="name" label="浠诲姟绫诲瀷" min-width="100">
<template v-slot="scope">
<span
v-if="
@@ -95,12 +95,12 @@
>{{ cateList[scope.row.objType].name }}</span
>
</template>
- </el-table-column>
- <el-table-column label="鎻愪氦浜�" min-width="80">
- <template v-slot="scope">
- <span v-if="scope.row.title">{{
- scope.row.title.split(" - ")[1]
- }}</span>
+ </el-table-column>-->
+ <el-table-column label="澶勭悊浜嬮」" min-width="200">
+ <template slot-scope="{ row }"> {{ row.title}}
+<!-- <span v-if="row.title">{{
+ row.title.split("-")[1]
+ }}</span>-->
</template>
</el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100">
@@ -214,8 +214,9 @@
}
},
created () {
- this.getHeadData()
+ // this.getHeadData()
this.changeRadio('0')
+ this.getList()
},
methods: {
changeRadio (day) {
@@ -260,6 +261,7 @@
}
},
getList (page) {
+ this.getHeadData()
console.log(this.filters)
const { filters, pagination } = this
if (filters.selDate && filters.selDate.length > 0) {
--
Gitblit v1.9.3