From 5033bbb206c5a9ada6dd01b8410b7d8050f7f645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’> Date: Tue, 28 Nov 2023 10:59:24 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/equipment/base/alarm/Record/index.vue | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/views/equipment/base/alarm/Record/index.vue b/src/views/equipment/base/alarm/Record/index.vue index c4f93007..fc03d30b 100644 --- a/src/views/equipment/base/alarm/Record/index.vue +++ b/src/views/equipment/base/alarm/Record/index.vue @@ -59,14 +59,9 @@ - - diff --git a/src/views/equipment/base/inspection/Record/index.vue b/src/views/equipment/base/inspection/Record/index.vue index 77b995ad..5dcee26b 100644 --- a/src/views/equipment/base/inspection/Record/index.vue +++ b/src/views/equipment/base/inspection/Record/index.vue @@ -93,7 +93,7 @@ export default { tableProps: [ { prop: 'configName', label: '配置名称' }, { prop: 'equipmentName', label: '设备名称' }, - // { prop: 'lineName', label: '数据来源' }, + { prop: 'origin', label: '数据来源', filter: (val) => ['', '手动', '自动'][val] }, // { prop: 'sectionName', label: '计划巡检时间' }, { prop: 'actualTime', label: '实际巡检时间', filter: parseTime }, // { prop: 'maintenanceDetail', label: '完成状态' }, From 27faa04c7a225de6a65b0dff5b6494d70b39fb70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’> Date: Wed, 29 Nov 2023 08:48:09 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/quality/monitoring/statisticalData/index.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/quality/monitoring/statisticalData/index.vue b/src/views/quality/monitoring/statisticalData/index.vue index 756e2a64..f489f16c 100644 --- a/src/views/quality/monitoring/statisticalData/index.vue +++ b/src/views/quality/monitoring/statisticalData/index.vue @@ -259,10 +259,11 @@ export default { }, mounted() { if (this.$route.query.woIdString) { - console.log(this.$route.query.woIdString); - this.queryParams.workOrderIdList = [this.$route.query.woIdString] + console.log(this.$route.query.woIdString) + this.queryParams.workOrderIdList = this.$route.query.woIdString.split(',') + // this.queryParams.workOrderIdList = [this.$route.query.woIdString] // let arr =[] - this.searchBarFormConfig[0].defaultSelect = [this.$route.query.woIdString] + this.searchBarFormConfig[0].defaultSelect = this.$route.query.woIdString.split(',') console.log(this.searchBarFormConfig[0].defaultSelect); } // if (this.$route.params.startTime && this.$route.params.endTime) { From de65afef11e4112688344646f83830f56129e5ea Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Wed, 29 Nov 2023 10:12:41 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 3 -- .env.front | 3 -- .env.prod | 3 -- .env.stage | 3 -- .env.static | 3 -- src/utils/ruoyi.js | 13 ------- src/views/login.vue | 85 ++++----------------------------------------- 7 files changed, 7 insertions(+), 106 deletions(-) diff --git a/.env.dev b/.env.dev index 3497fe49..1da25e71 100644 --- a/.env.dev +++ b/.env.dev @@ -31,9 +31,6 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true # 多租户的开关 VUE_APP_TENANT_ENABLE = true -# 验证码的开关 -VUE_APP_CAPTCHA_ENABLE = true - # 文档的开关 VUE_APP_DOC_ENABLE = true diff --git a/.env.front b/.env.front index 743152e3..d1645075 100644 --- a/.env.front +++ b/.env.front @@ -14,9 +14,6 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true # 多租户的开关 VUE_APP_TENANT_ENABLE = true -# 验证码的开关 -VUE_APP_CAPTCHA_ENABLE = true - # 文档的开关 VUE_APP_DOC_ENABLE = true diff --git a/.env.prod b/.env.prod index 4fa71c08..8526c196 100644 --- a/.env.prod +++ b/.env.prod @@ -28,9 +28,6 @@ VUE_APP_APP_NAME ='yudao-admin' # 多租户的开关 VUE_APP_TENANT_ENABLE = true -# 验证码的开关 -VUE_APP_CAPTCHA_ENABLE = true - # 文档的开关 VUE_APP_DOC_ENABLE = false diff --git a/.env.stage b/.env.stage index b25d7a96..763cc8b5 100644 --- a/.env.stage +++ b/.env.stage @@ -15,9 +15,6 @@ PUBLIC_PATH = 'http://static.yudao.iocoder.cn/' # 多租户的开关 VUE_APP_TENANT_ENABLE = true -# 验证码的开关 -VUE_APP_CAPTCHA_ENABLE = true - # 文档的开关 VUE_APP_DOC_ENABLE = false diff --git a/.env.static b/.env.static index 35e7a28e..bdb29f8f 100644 --- a/.env.static +++ b/.env.static @@ -17,9 +17,6 @@ VUE_APP_APP_NAME ='/admin-ui-vue2/' # 多租户的开关 VUE_APP_TENANT_ENABLE = true -# 验证码的开关 -VUE_APP_CAPTCHA_ENABLE = true - # 文档的开关 VUE_APP_DOC_ENABLE = true diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js index fd5d1095..3b4e5256 100644 --- a/src/utils/ruoyi.js +++ b/src/utils/ruoyi.js @@ -187,19 +187,6 @@ export function getTenantEnable() { return process.env.VUE_APP_TENANT_ENABLE || true; } -/** - * 获得验证码功能是否开启 - */ -export function getCaptchaEnable() { - if (process.env.VUE_APP_CAPTCHA_ENABLE === "true") { - return true; - } - if (process.env.VUE_APP_CAPTCHA_ENABLE === "false") { - return false; - } - return process.env.VUE_APP_CAPTCHA_ENABLE || true; -} - /** * 获得文档是否开启 */ diff --git a/src/views/login.vue b/src/views/login.vue index 2f229f11..4434c6eb 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -80,13 +80,6 @@
- - - -
-
+
- -
- - - - - - - - -
-
- - -
@@ -241,7 +177,7 @@ import { sendSmsCode, socialAuthRedirect } from '@/api/login'; import { getTenantIdByName } from '@/api/system/tenant'; import { SystemUserSocialTypeEnum } from '@/utils/constants'; -import { getCaptchaEnable, getTenantEnable } from '@/utils/ruoyi'; +import { getTenantEnable } from '@/utils/ruoyi'; import { getPassword, getRememberMe, @@ -269,7 +205,7 @@ export default { data() { return { codeUrl: '', - captchaEnable: true, + captchaEnable: false, tenantEnable: true, mobileCodeTimer: 0, loginForm: { @@ -347,8 +283,6 @@ export default { } }); } - // 验证码开关 - this.captchaEnable = getCaptchaEnable(); // 重定向地址 this.redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) @@ -360,15 +294,7 @@ export default { }, methods: { getCode() { - // 情况一，未开启：则直接登录 - if (!this.captchaEnable) { - this.handleLogin({}); - return; - } - - // 情况二，已开启：则展示验证码；只有完成验证码的情况，才进行登录 - // 弹出验证码 - this.$refs.verify.show(); + this.handleLogin({}); }, getCookie() { const username = getUsername(); @@ -522,4 +448,7 @@ export default { top: 22%; } } +.form-cont { + padding-top: 40px; +}