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/components/CommonModal.vue | 2
src/views/dashboard/index.vue | 10 +++-
src/stores/tasks.ts | 40 ++++++++++++-------
src/views/login/loginView.vue | 32 +++++++---------
src/views/dashboard/components/DashboardTitle.vue | 2
5 files changed, 48 insertions(+), 38 deletions(-)
diff --git a/src/components/CommonModal.vue b/src/components/CommonModal.vue
index 43c79aa..c800800 100644
--- a/src/components/CommonModal.vue
+++ b/src/components/CommonModal.vue
@@ -7,7 +7,7 @@
<slot name="title"></slot>
</div>
<div class="modal-title-close" @click="closeModal">
- <el-icon :size="22"><CloseBold /></el-icon>
+ <el-icon :size="36"><CloseBold /></el-icon>
</div>
</div>
</template>
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) {
diff --git a/src/views/dashboard/components/DashboardTitle.vue b/src/views/dashboard/components/DashboardTitle.vue
index 863d4eb..50d533e 100644
--- a/src/views/dashboard/components/DashboardTitle.vue
+++ b/src/views/dashboard/components/DashboardTitle.vue
@@ -196,7 +196,7 @@
float: left;
}
.text-icon {
- font-size: 32px;
+ font-size: 40px;
margin-left: 4px;
cursor: pointer;
}
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 32c8153..3798c36 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -131,6 +131,8 @@
import { updateCraftParams } from '@/api'
import { Loading } from '@element-plus/icons-vue'
import { isNumber } from 'lodash-es'
+import { getToken } from '@/common/utils/index'
+const token = getToken()
defineOptions({
name: 'DashboardView'
@@ -172,9 +174,11 @@
* @param task
*/
function reloadChannel(task: Task) {
- tasksStore.reloadChannel(task.Channel).then(() => {
- // plcStore.startPollingPLC()
- })
+ // if (token !== null || token !== '' || token !== 'undefined') {
+ // tasksStore.reloadChannel(task.Channel).then(() => {
+ // // plcStore.startPollingPLC()
+ // })
+ // }
}
function reloadAllData() {
diff --git a/src/views/login/loginView.vue b/src/views/login/loginView.vue
index 6ad0216..d1a3c06 100644
--- a/src/views/login/loginView.vue
+++ b/src/views/login/loginView.vue
@@ -78,11 +78,9 @@
const captchaId = ref('')
const getCaptchaData = () => {
- getCaptcha().then((rsp) => {
- if (rsp.code == 200) {
- captcha.value = rsp.data.picPath
- captchaId.value = rsp.data.captchaId
- }
+ getCaptcha().then((rsp: any) => {
+ captcha.value = rsp?.data?.picPath
+ captchaId.value = rsp?.data?.captchaId
})
}
onMounted(() => {
@@ -107,19 +105,17 @@
password: ruleForm.pass,
captcha: ruleForm.code,
captchaId: captchaId.value
- }).then((rsp) => {
- if (rsp.code == 200) {
- console.log(rsp)
- setToken(rsp.data.token)
- ElMessage({
- message: '鐧诲綍鎴愬姛锛�',
- type: 'success'
- })
- ruleForm.accountNumber = ''
- ruleForm.pass = ''
- ruleForm.code = ''
- router.push('/')
- }
+ }).then((rsp: any) => {
+ console.log(rsp)
+ setToken(rsp?.data?.token)
+ ElMessage({
+ message: '鐧诲綍鎴愬姛锛�',
+ type: 'success'
+ })
+ ruleForm.accountNumber = ''
+ ruleForm.pass = ''
+ ruleForm.code = ''
+ router.push('/')
})
} else {
console.log('error submit!')
--
Gitblit v1.8.0