diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue
index 1bdcba851..52a0b4304 100755
--- a/resources/assets/js/App.vue
+++ b/resources/assets/js/App.vue
@@ -3,11 +3,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -27,10 +42,11 @@ import RightBottom from "./components/RightBottom";
import PreviewImageState from "./components/PreviewImage/state";
import NetworkException from "./components/NetworkException";
import AudioManager from "./components/AudioManager";
+import TaskOperation from "./pages/manage/components/TaskOperation";
import {mapState} from "vuex";
export default {
- components: {AudioManager, NetworkException, PreviewImageState, RightBottom, Spinner},
+ components: {TaskOperation, AudioManager, NetworkException, PreviewImageState, RightBottom, Spinner},
data() {
return {
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index 6c2756139..4677dc9dc 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -310,9 +310,6 @@
-
-
-
@@ -382,11 +379,9 @@ import TaskModal from "./manage/components/TaskModal";
import notificationKoro from "notification-koro1";
import {Store} from "le5le-store";
import ManageLoad from "../components/ManageLoad";
-import TaskOperation from "./manage/components/TaskOperation";
export default {
components: {
- TaskOperation,
ManageLoad,
TaskModal,
DialogModal,
@@ -461,10 +456,6 @@ export default {
$A.messageSuccess("清除成功");
}
//
- this.loadUser();
- this.$store.dispatch("getTaskPriority").catch(_ => {})
- //
- this.getReportUnread(0);
this.notificationInit();
this.onVisibilityChange();
//
@@ -474,6 +465,12 @@ export default {
document.addEventListener('keydown', this.shortcutEvent);
},
+ activated() {
+ this.loadUser();
+ this.getReportUnread(0);
+ this.$store.dispatch("getTaskPriority").catch(_ => {})
+ },
+
beforeDestroy() {
if (this.addTaskSubscribe) {
this.addTaskSubscribe.unsubscribe();
diff --git a/resources/assets/js/pages/manage/components/TaskOperation.vue b/resources/assets/js/pages/manage/components/TaskOperation.vue
index 33a815b2a..3bdf1f130 100644
--- a/resources/assets/js/pages/manage/components/TaskOperation.vue
+++ b/resources/assets/js/pages/manage/components/TaskOperation.vue
@@ -124,6 +124,10 @@ export default {
watch: {
taskOperation(data) {
if (data.event && data.task) {
+ if (this.$refs.dropdown.visible && this.element === data.event.target) {
+ this.hide();
+ return;
+ }
const eventRect = data.event.target.getBoundingClientRect();
this.styles = {
left: `${eventRect.left}px`,