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/core/analysis/balanceAnalysis/chart.vue b/src/views/core/analysis/balanceAnalysis/chart.vue new file mode 100644 index 00000000..3df9d162 --- /dev/null +++ b/src/views/core/analysis/balanceAnalysis/chart.vue @@ -0,0 +1,228 @@ + + + + + + + diff --git a/src/views/core/analysis/balanceAnalysis/index.vue b/src/views/core/analysis/balanceAnalysis/index.vue index 8ce3b630..a4877d42 100644 --- a/src/views/core/analysis/balanceAnalysis/index.vue +++ b/src/views/core/analysis/balanceAnalysis/index.vue @@ -1,51 +1,56 @@ + diff --git a/src/views/equipment/timing-diagram/status/index.vue b/src/views/equipment/timing-diagram/status/index.vue index 6ea4f148..2c639b08 100644 --- a/src/views/equipment/timing-diagram/status/index.vue +++ b/src/views/equipment/timing-diagram/status/index.vue @@ -80,6 +80,8 @@
- - - -
-
+
- -
- - - - - - - - -
-
- - -
@@ -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; +} diff --git a/src/views/monitoring/equipmentFullParams/index.vue b/src/views/monitoring/equipmentFullParams/index.vue index a6f89dbb..463c788c 100644 --- a/src/views/monitoring/equipmentFullParams/index.vue +++ b/src/views/monitoring/equipmentFullParams/index.vue @@ -115,12 +115,12 @@ export default { vm.$set( vm.searchBarFormConfig[0], 'defaultSelect', - to.params.equipmentCode + to.params.equipmentName ); vm.$set( vm.searchBarFormConfig[1], 'defaultSelect', - to.params.equipmentName + to.params.equipmentCode ); vm.handleQuery(); }); diff --git a/src/views/monitoring/equipmentProcessAmount/index.vue b/src/views/monitoring/equipmentProcessAmount/index.vue index 0848b288..d61257dc 100644 --- a/src/views/monitoring/equipmentProcessAmount/index.vue +++ b/src/views/monitoring/equipmentProcessAmount/index.vue @@ -33,7 +33,7 @@ :data-value="fc.id" class="factory-list__item" :class="{ 'is-current': fc.id == currentFactory?.id }"> - + {{ fc.label }} -
+