From 998b75f0d4aaed03001ec4246cd4f3b4b0743b7e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 23 Nov 2022 10:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/taskinfo/taskinfo.vue | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/src/views/taskinfo/taskinfo.vue b/src/views/taskinfo/taskinfo.vue
index b2b2869..b1bc710 100644
--- a/src/views/taskinfo/taskinfo.vue
+++ b/src/views/taskinfo/taskinfo.vue
@@ -29,13 +29,29 @@
@click="handleDelete">删 除
</el-button>
</template>
- <template slot-scope="{ type, size, row }" slot="menu">
+ <template slot-scope="{ type, size, row, index }" slot="menu">
<el-button
icon="el-icon-view"
type="text"
size="mini"
@click="goTaskinfoDetail(row)"
- >查看</el-button>
+ v-if="permission.taskinfo_view"
+ >查 看</el-button>
+ <el-button
+ icon="el-icon-edit"
+ type="text"
+ size="mini"
+ @click="$refs.crud.rowEdit(row,index)"
+ v-if="permission.taskinfo_edit"
+ >编 辑</el-button>
+ <el-button
+ icon="el-icon-delete"
+ type="text"
+ size="mini"
+ @click="$refs.crud.rowDel(row,index)"
+ v-if="permission.taskinfo_delete"
+ >删 除</el-button>
+
</template>
<template slot="routeRangeForm">
<open-layers-map ref="OpenLayersMap" @toData="toData" :routeRange="form.routeRange"></open-layers-map>
@@ -75,12 +91,13 @@
};
},
created() {
- const date = new Date()
- const year = date.getFullYear()
- const month = date.getMonth() + 1
- const strDate = date.getDate()
- this.query.startTime = `${year}-${month}-${strDate} 00:00:00`
- this.query.endTime = `${year}-${month}-${strDate} 23:59:59`
+ // 默认时间查询
+ // const date = new Date()
+ // const year = date.getFullYear()
+ // const month = date.getMonth() + 1
+ // const strDate = date.getDate()
+ // this.query.startTime = `${year}-${month}-${strDate} 00:00:00`
+ // this.query.endTime = `${year}-${month}-${strDate} 23:59:59`
},
computed: {
...mapGetters(["permission"]),
--
Gitblit v1.9.3