优化前端代码
This commit is contained in:
parent
52e9836bbf
commit
da3672e6be
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "DooTask",
|
||||
"version": "0.6.57",
|
||||
"version": "0.6.60",
|
||||
"description": "DooTask is task management system.",
|
||||
"main": "main.js",
|
||||
"license": "MIT",
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "DooTask",
|
||||
"version": "0.6.57",
|
||||
"version": "0.6.60",
|
||||
"description": "DooTask is task management system.",
|
||||
"scripts": {
|
||||
"start": "./cmd dev",
|
||||
|
2
public/css/app.css
vendored
2
public/css/app.css
vendored
File diff suppressed because one or more lines are too long
2
public/js/app.js
vendored
2
public/js/app.js
vendored
File diff suppressed because one or more lines are too long
1
public/js/build/63.js
vendored
Normal file
1
public/js/build/63.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
public/js/build/683.js
vendored
1
public/js/build/683.js
vendored
File diff suppressed because one or more lines are too long
@ -11,11 +11,11 @@
|
||||
<UserAvatar :userid="userId" :size="36" tooltipDisabled/>
|
||||
</div>
|
||||
<span>{{userInfo.nickname}}</span>
|
||||
<Badge v-if="reportUnreadNumber > 0" class="manage-box-top-report" :count="reportUnreadNumber"/>
|
||||
<div class="manage-box-arrow">
|
||||
<Icon type="ios-arrow-up" />
|
||||
<Icon type="ios-arrow-down" />
|
||||
</div>
|
||||
<Badge v-if="reportUnreadNumber > 0" class="manage-box-top-report" :count="reportUnreadNumber"/>
|
||||
</div>
|
||||
<DropdownMenu slot="list">
|
||||
<DropdownItem
|
||||
@ -180,7 +180,7 @@
|
||||
v-model="workReportShow"
|
||||
placement="right"
|
||||
:size="1100">
|
||||
<Report v-if="workReportShow" :reportType="reportTabs" :reportUnreadNumber="reportUnreadNumber" @read="reportUnread" />
|
||||
<Report v-if="workReportShow" :reportType="reportTabs" :reportUnreadNumber="reportUnreadNumber" @read="getReportUnread" />
|
||||
</DrawerOverlay>
|
||||
|
||||
<!--查看所有团队-->
|
||||
@ -293,7 +293,7 @@ export default {
|
||||
//
|
||||
this.notificationInit();
|
||||
this.onVisibilityChange();
|
||||
this.reportUnread(); // 工作汇报未读标记
|
||||
this.getReportUnread(); // 工作汇报未读标记
|
||||
//
|
||||
this.addTaskSubscribe = Store.subscribe('addTask', this.onAddTask);
|
||||
this.dialogMsgSubscribe = Store.subscribe('dialogMsgPush', this.addDialogMsg);
|
||||
@ -741,7 +741,7 @@ export default {
|
||||
document.addEventListener(visibilityChangeEvent, visibilityChangeListener);
|
||||
},
|
||||
|
||||
reportUnread() {
|
||||
getReportUnread() {
|
||||
this.reportTabs = "my";
|
||||
this.$store.dispatch("call", {
|
||||
url: 'report/unread',
|
||||
|
@ -48,27 +48,28 @@ export default {
|
||||
reportTabs: "my",
|
||||
showDetailDrawer: false,
|
||||
detailData: {},
|
||||
reportId: 0,
|
||||
tabRebder: data => {
|
||||
return h => {
|
||||
if (data > 0) {
|
||||
return h('div', [
|
||||
h('span', {class: 'navbar-item-content'}, '收到的汇报'),
|
||||
h('Badge', {class: 'manage-box-report'}, data),
|
||||
])
|
||||
} else {
|
||||
return h('div', [
|
||||
h('span', {class: 'navbar-item-content'}, '收到的汇报'),
|
||||
])
|
||||
}
|
||||
}
|
||||
}
|
||||
reportId: 0
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.reportTabs = this.reportType;
|
||||
},
|
||||
methods: {
|
||||
tabRebder(data) {
|
||||
return h => {
|
||||
if (data > 0) {
|
||||
return h('div', [
|
||||
h('span', {class: 'navbar-item-content'}, this.$L('收到的汇报')),
|
||||
h('Badge', {class: 'manage-box-report'}, data),
|
||||
])
|
||||
} else {
|
||||
return h('div', [
|
||||
h('span', {class: 'navbar-item-content'}, this.$L('收到的汇报')),
|
||||
])
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
showDetail(row) {
|
||||
this.showDetailDrawer = true;
|
||||
this.detailData = row;
|
||||
|
@ -55,7 +55,7 @@ export default {
|
||||
},
|
||||
mounted() {
|
||||
if (this.data.id > 0) this.sendRead();
|
||||
console.log(this.data)
|
||||
// console.log(this.data)
|
||||
},
|
||||
watch: {
|
||||
data() {
|
||||
|
1
resources/assets/sass/pages/page-manage.scss
vendored
1
resources/assets/sass/pages/page-manage.scss
vendored
@ -70,6 +70,7 @@
|
||||
}
|
||||
}
|
||||
.manage-box-top-report {
|
||||
margin-right: -6px;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
|
Loading…
x
Reference in New Issue
Block a user