From ad973219e4c7d5d49df8b4b82c271aa24ec94236 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 07 八月 2024 17:00:59 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/home/data-table/index.vue | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/views/home/data-table/index.vue b/src/views/home/data-table/index.vue index c96a215..c567654 100644 --- a/src/views/home/data-table/index.vue +++ b/src/views/home/data-table/index.vue @@ -14,6 +14,8 @@ <el-table :data="tableData" height="400"> <el-table-column prop="pointName" label="鐐逛綅淇℃伅" align="center" show-overflow-tooltip> </el-table-column> + <el-table-column prop="remark" label="杩愮淮鍗曚綅" align="center" show-overflow-tooltip> + </el-table-column> <el-table-column prop="startTime" label="杩愮淮寮�濮嬫椂闂�" align="center"> </el-table-column> <el-table-column prop="endTime" label="杩愮淮鎴鏃堕棿" align="center"> @@ -21,11 +23,6 @@ <el-table-column prop="status" label="鐘舵��" align="center"> <template slot-scope="scope"> <el-tag type="warning" disable-transitions v-if="scope.row.status">{{ scope.row.status }}</el-tag> - </template> - </el-table-column> - <el-table-column label="鎿嶄綔" align="center"> - <template slot-scope="scope"> - <el-button size="mini">缂栬緫</el-button> </template> </el-table-column> </el-table> -- Gitblit v1.8.0