diff --git a/src/views/bydlms/BydWorkorder.vue b/src/views/bydlms/BydWorkorder.vue index 6b158fa..def29c8 100644 --- a/src/views/bydlms/BydWorkorder.vue +++ b/src/views/bydlms/BydWorkorder.vue @@ -57,7 +57,6 @@ - @@ -117,7 +116,10 @@ - + + + + @@ -135,9 +137,6 @@ - - - @@ -177,29 +176,21 @@ - - - - - - - - @@ -209,9 +200,6 @@ - - - @@ -376,7 +364,17 @@ const state = reactive({ }, options: { // ⼯单类型 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'} - orderTypeOptions: [] + orderTypeOptions: [], + // 排程状态(0:新建,1、下达,2、开线,3、⽣ 产、4、暂停、5、取消、6、完成、) + scheduleStatusOptions: [ + { dictLabel: '新建', dictValue: '0' }, + { dictLabel: '下达', dictValue: '1' }, + { dictLabel: '开线', dictValue: '2' }, + { dictLabel: '⽣产', dictValue: '3' }, + { dictLabel: '暂停', dictValue: '4' }, + { dictLabel: '取消', dictValue: '5' }, + { dictLabel: '完成', dictValue: '6' }, + ] } }) diff --git a/src/views/login.vue b/src/views/login.vue index 4d4f7a2..66821e0 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -23,20 +23,16 @@ - + - + @@ -47,7 +43,8 @@ - + {{ $t('login.btnLogin') }} 登 录 中... @@ -114,7 +111,7 @@ const loginType = computed({ const codeUrl = ref('') const loading = ref(false) // 验证码开关 -const captchaOnOff = ref('') +const captchaOnOff = ref('off') // 注册开关 const register = ref(false) const redirect = ref() @@ -177,6 +174,7 @@ function handleLogin() { } function getCode() { + return getCodeImg().then((res) => { codeUrl.value = 'data:image/gif;base64,' + res.data.img loginForm.value.uuid = res.data.uuid @@ -229,6 +227,7 @@ getCookie()