diff --git a/src/api/userApp/index.ts b/src/api/userApp/index.ts index ea99873..31453a7 100644 --- a/src/api/userApp/index.ts +++ b/src/api/userApp/index.ts @@ -19,5 +19,13 @@ export const deviceList = (params): AxiosPromise => { params }); }; +// 账号状态 +export const userStatus = (data): AxiosPromise => { + return request({ + url: '/api/app/device', + method: 'put', + data + }); +}; -export default { userList,deviceList } \ No newline at end of file +export default { userList,deviceList,userStatus } \ No newline at end of file diff --git a/src/api/userApp/types.ts b/src/api/userApp/types.ts index e69de29..ec718b1 100644 --- a/src/api/userApp/types.ts +++ b/src/api/userApp/types.ts @@ -0,0 +1,16 @@ +export interface userQuery { + pageNum: number | string | undefined; + pageSize: number | string | undefined; + userName: string; + status: string; +} + + +export interface userForm { + configId: number | string | undefined; + configName: string; + configKey: string; + configValue: string; + configType: string; + remark: string; +} \ No newline at end of file diff --git a/src/assets/images/login-background.jpg b/src/assets/images/login-background.jpg index fa6408b..3e49b10 100644 Binary files a/src/assets/images/login-background.jpg and b/src/assets/images/login-background.jpg differ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index ded9533..ae86369 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -14,47 +14,6 @@ - - - - -
@@ -69,9 +28,6 @@ {{ proxy.$t('navbar.personalCenter') }} - - {{ proxy.$t('navbar.layoutSetting') }} - {{ proxy.$t('navbar.logout') }} diff --git a/src/views/appUser/index.vue b/src/views/appUser/index.vue index 7a0267c..58e392e 100644 --- a/src/views/appUser/index.vue +++ b/src/views/appUser/index.vue @@ -5,14 +5,14 @@
- - + + - - + - - + + @@ -29,11 +29,11 @@ - - diff --git a/src/views/equipmentManagement/devices/index.vue b/src/views/equipmentManagement/devices/index.vue index dbcaf92..d875a7f 100644 --- a/src/views/equipmentManagement/devices/index.vue +++ b/src/views/equipmentManagement/devices/index.vue @@ -687,10 +687,11 @@ const handleAssignConfirm = () => { getList(); assignDialogVisible.value = false return proxy?.$modal.msgSuccess(`设备已分配给客户: ${customerName}`) - } else { loadingIng.value = false; } + }).catch(()=>{ + loadingIng.value = false; }) }; const importUpload = ref() @@ -757,9 +758,8 @@ const handleBatchAssignConfirm = () => { if (!batchAssignCustomerId.value) { return proxy?.$modal.msgError('请选择客户') } - // 这里可以调用批量分配API，传递 crud.selections 和 batchAssignCustomerId // 提取选中设备的 ID 数组 - const selectedIds = ids.value.map((item) => item.id) + const selectedIds = ids.value.map((item:any) => item.id) // 构造请求数据 const data = { customerId: batchAssignCustomerId.value, // 目标客户ID @@ -771,11 +771,11 @@ const handleBatchAssignConfirm = () => { getList(); return proxy?.$modal.msgSuccess(`分配成功`) } + }).catch(()=>{ + }) }; - - watch(() => form.value.deviceType, (newVal) => { if (dialog.title === '新增设备') { // Only for add form handleDeviceTypeChange(newVal); diff --git a/src/views/login.vue b/src/views/login.vue index 1f554d5..bb3e083 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -3,7 +3,6 @@
- {{ proxy.$t('login.login') }} @@ -72,14 +53,12 @@ import { useUserStore } from '@/store/modules/user'; import { LoginData, TenantVO } from '@/api/types'; import { to } from 'await-to-js'; import { HttpStatus } from '@/enums/RespEnum'; -import { useI18n } from 'vue-i18n'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; const title = import.meta.env.VITE_APP_TITLE; const userStore = useUserStore(); const router = useRouter(); -const { t } = useI18n(); const loginForm = ref({ tenantId: '000000', @@ -91,10 +70,10 @@ const loginForm = ref({ } as LoginData); const loginRules: ElFormRules = { - tenantId: [{ required: true, trigger: 'blur', message: t('login.rule.tenantId.required') }], - username: [{ required: true, trigger: 'blur', message: t('login.rule.username.required') }], - password: [{ required: true, trigger: 'blur', message: t('login.rule.password.required') }], - code: [{ required: true, trigger: 'change', message: t('login.rule.code.required') }] + tenantId: [{ required: true, trigger: 'blur', message: '请输入您的租户编号'}], + username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }], + password: [{ required: true, trigger: 'blur', message: '请输入您的密码'}], + code: [{ required: true, trigger: 'change', message: '请输入验证码'}] }; const codeUrl = ref('');