From 7edf66cafb871c5fb28911dfb02611ef5c9910b2 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 06 二月 2024 17:05:49 +0800
Subject: [PATCH] 登录请求接口取消、设备切换图标和弹窗关闭按钮增大
---
src/stores/tasks.ts | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/src/stores/tasks.ts b/src/stores/tasks.ts
index 794268c..a1b3af8 100644
--- a/src/stores/tasks.ts
+++ b/src/stores/tasks.ts
@@ -4,12 +4,14 @@
import type { TaskListParams, TaskInfoParams } from '@/api'
import { getTaskList, getTaskInfo } from '@/api'
import { isNumber } from 'lodash-es'
+import { getToken } from '@/common/utils/index'
export interface ChannelMoreBtnStatus {
/** true 浠诲姟鏈姞杞藉畬 false 鎵�鏈変换鍔″凡缁忓姞杞藉畬鎴�*/
[channel: number]: boolean
}
+const token = getToken()
export const useTasksStore = defineStore('tasks', () => {
const channels = ref<TasksGroupByChannel>({})
@@ -28,6 +30,7 @@
limit: 3,
deviceID: localStorage.getItem('currentDeviceID') || ''
}
+
return getTaskList(params)
.then((res) => {
channels.value = res.data
@@ -51,7 +54,7 @@
return !!taskList?.length
})
- if (firstNotEmptyChannel) {
+ if (firstNotEmptyChannel && (token !== null || token !== '' || token !== 'undefined')) {
const channelNumber = +firstNotEmptyChannel[0]
// activeTask.value = channels[channelNumber].Tasks[0]
console.log(channels[channelNumber].Tasks[0].Procedure.ID, '1111')
@@ -81,7 +84,7 @@
*/
function autoSelectTask(channel: number) {
const currentChannelTaskList = channels.value[channel].Tasks
- if (currentChannelTaskList?.length) {
+ if (currentChannelTaskList?.length && (token !== null || token !== '' || token !== 'undefined')) {
// activeTask.value = currentChannelTaskList[0].Procedure.ID
const params: TaskInfoParams = {
deviceID: localStorage.getItem('currentDeviceID') || '',
@@ -114,9 +117,13 @@
* 鍒锋柊鎵�鏈夋暟鎹�
*/
function reloadChannel(channel: number) {
- return getChannels(currentType.value).then(() => {
- autoSelectTask(channel)
- })
+ if (token !== null || token !== '' || token !== 'undefined') {
+ return getChannels(currentType.value).then(() => {
+ autoSelectTask(channel)
+ })
+ } else {
+ return
+ }
}
function reloadAllData() {
@@ -132,16 +139,19 @@
limit: 10,
deviceID: localStorage.getItem('currentDeviceID') || ''
}
- getTaskList(params)
- .then((res) => {
- const existTasks = channels.value![channelNumber].Tasks ?? []
- channels.value[channelNumber] = res.data[channelNumber] ?? {}
- channels.value[channelNumber].Tasks = channels.value[channelNumber].Tasks ?? []
- channels.value[channelNumber].Tasks = [...existTasks, ...channels.value[channelNumber].Tasks]
- })
- .catch((err) => {
- console.error(err)
- })
+
+ if (token !== null || token !== '' || token !== 'undefined') {
+ getTaskList(params)
+ .then((res) => {
+ const existTasks = channels.value![channelNumber].Tasks ?? []
+ channels.value[channelNumber] = res.data[channelNumber] ?? {}
+ channels.value[channelNumber].Tasks = channels.value[channelNumber].Tasks ?? []
+ channels.value[channelNumber].Tasks = [...existTasks, ...channels.value[channelNumber].Tasks]
+ })
+ .catch((err) => {
+ console.error(err)
+ })
+ }
}
function foldChannelTasksBtn(channelNumber: number) {
--
Gitblit v1.8.0