diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 7c02de0..87a689c 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -20,6 +20,7 @@ export const useUserStore = defineStore('user', () => { * @returns */ const login = async (userInfo: LoginData): Promise => { + console.log('login', userInfo); const [err, res] = await to(loginApi(userInfo)); if (res) { const data = res.data; diff --git a/src/views/login.vue b/src/views/login.vue index 974c864..1506660 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -76,8 +76,6 @@ const captchaEnabled = ref(true); const register = ref(false); const redirect = ref(undefined); const loginRef = ref(); -// 租户列表 -const tenantList = ref([]); watch(() => router.currentRoute.value, (newRoute: any) => { redirect.value = newRoute.query && newRoute.query.redirect; diff --git a/src/views/scale/SysScale/index.vue b/src/views/scale/SysScale/index.vue index 0af7b65..35553ce 100644 --- a/src/views/scale/SysScale/index.vue +++ b/src/views/scale/SysScale/index.vue @@ -69,7 +69,7 @@ @@ -164,8 +164,8 @@ - 正常 - 停用 + 停用 + 正常 @@ -278,8 +278,8 @@ const queryFormRef = ref(); const SysScaleFormRef = ref(); const statusOptions = [ - { label: '正常', value: 0 }, - { label: '停用', value: 1 } + { label: '停用', value: 0 }, + { label: '正常', value: 1 } ] const dimensionTypeOptions = [ diff --git a/src/views/scale/SysScaleFactor/index.vue b/src/views/scale/SysScaleFactor/index.vue index f924cf4..e2bbbb4 100644 --- a/src/views/scale/SysScaleFactor/index.vue +++ b/src/views/scale/SysScaleFactor/index.vue @@ -8,13 +8,6 @@ - - - - - 搜索 重置 @@ -50,8 +43,12 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - @@ -173,14 +181,12 @@ diff --git a/src/views/scale/SysScalePublish/index.vue b/src/views/scale/SysScalePublish/index.vue index faa2c4b..271f976 100644 --- a/src/views/scale/SysScalePublish/index.vue +++ b/src/views/scale/SysScalePublish/index.vue @@ -61,7 +61,7 @@