diff --git a/src/components/TendencyChart.vue b/src/components/TendencyChart.vue index 6e4c401..69f4452 100644 --- a/src/components/TendencyChart.vue +++ b/src/components/TendencyChart.vue @@ -15,8 +15,14 @@ export default { chartData: [] } }, - mounted() { - this.initEcharts(); + props: { + enable: false, + }, + watch: { + enable: function (val) { + if(val) + this.initEcharts(); + }, }, computed: { getTotalNumber() { diff --git a/src/views/OngoingProject.vue b/src/views/OngoingProject.vue index 0a5f01e..1af54d0 100644 --- a/src/views/OngoingProject.vue +++ b/src/views/OngoingProject.vue @@ -74,9 +74,9 @@ const tableHeight = ref(); const {proxy, ctx} = getCurrentInstance() onMounted(() => { // 设置表格初始高度为innerHeight-offsetTop-表格底部与浏览器底部距离110 - tableHeight.value = window.innerHeight /*- tableRef.value.$el.offsetTop*/ - 400; + tableHeight.value = window.innerHeight /*- tableRef.value.$el.offsetTop*/ - 300; window.onresize = () => { - tableHeight.value = window.innerHeight /*- tableRef.value.$el.offsetTop*/ - 400; + tableHeight.value = window.innerHeight /*- tableRef.value.$el.offsetTop*/ - 300; }; }); const router = useRouter() @@ -185,17 +185,19 @@ export default { staffId: Number } }, - computed: {}, + computed: { + canCreateProject() { + if (this.$store && this.$store.state.staff) + return this.$store.state.staff.staffGlobalLevel < 3 + else + return false + }, + }, mounted() { }, methods: { - canCreateProject() { - if (this.$store && this.$store.state.staff) - return this.$store.state.staff.staffGlobalLevel > 3 - else - return false - }, + showCloseProjectButton(row) { return this.$store.state.staff === null ? false : (this.$store.state.staff.staffId === row.projectCreator) }, diff --git a/src/views/Project.vue b/src/views/Project.vue index 0db87e7..5946519 100644 --- a/src/views/Project.vue +++ b/src/views/Project.vue @@ -60,6 +60,7 @@

项目团队

- 新增成员 + 新增成员
@@ -18,7 +18,7 @@