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/api/base/delivery.js b/src/api/base/delivery.js index 82c371c3..d04fd210 100644 --- a/src/api/base/delivery.js +++ b/src/api/base/delivery.js @@ -18,6 +18,15 @@ export function deliveryProgressPage(data) { }) } +// 获取订单列表 +export function listOrderList(query) { + return request({ + url: '/extend/delivery-log/listOrderList', + method: 'get', + params: query + }) +} + // 获取发货进度分页 export function deliveryLogDetPage(data) { return request({ diff --git a/src/styles/index.scss b/src/styles/index.scss index 6b3ebaee..d162abed 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -196,4 +196,8 @@ input, textarea{ margin-right: 8px; vertical-align: middle; } -// 抽屉head区域---end \ No newline at end of file +// 抽屉head区域---end +// 弹出框，上下分布，去掉label的padding-bottom +.el-form--label-top .el-form-item__label { + padding: 0; +} \ No newline at end of file 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/base/coreWorkOrder/add-or-updata.vue b/src/views/base/coreWorkOrder/add-or-updata.vue index 621469d4..0ba46ebd 100644 --- a/src/views/base/coreWorkOrder/add-or-updata.vue +++ b/src/views/base/coreWorkOrder/add-or-updata.vue @@ -2,23 +2,23 @@ * @Author: zwq * @Date: 2021-11-18 14:16:25 * @LastEditors: DY - * @LastEditTime: 2023-11-24 18:20:26 + * @LastEditTime: 2023-11-28 14:09:09 * @Description: --> - - 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: '完成状态' }, diff --git a/src/views/group/base/groupTeam/components/groupTeamAdd.vue b/src/views/group/base/groupTeam/components/groupTeamAdd.vue index 249facd2..750e063f 100644 --- a/src/views/group/base/groupTeam/components/groupTeamAdd.vue +++ b/src/views/group/base/groupTeam/components/groupTeamAdd.vue @@ -15,7 +15,7 @@ - +
- - - -
-
+
- -
- - - - - - - - -
-
- - -
@@ -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/order/base/orderManage/components/addWorkOrder.vue b/src/views/order/base/orderManage/components/addWorkOrder.vue index 100fd955..45f2a62e 100644 --- a/src/views/order/base/orderManage/components/addWorkOrder.vue +++ b/src/views/order/base/orderManage/components/addWorkOrder.vue @@ -6,7 +6,7 @@ - + - + - + - + { - this.tableH = this.tableHeight(315) + this.tableH = this.tableHeight(305) }) let start = moment().subtract(30, 'days').format('yyyy-MM-DD') let end = moment().format('yyyy-MM-DD') @@ -347,6 +347,9 @@ export default { .el-tabs__item { color: rgba(0, 0, 0, 0.45); } + .searchBarBox { + margin-bottom: 0; + } .boxTitle { display: inline-block; font-size: 16px; diff --git a/src/views/quality/monitoring/statisticalData/index.vue b/src/views/quality/monitoring/statisticalData/index.vue index a30838d7..c84cedc7 100644 --- a/src/views/quality/monitoring/statisticalData/index.vue +++ b/src/views/quality/monitoring/statisticalData/index.vue @@ -256,10 +256,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) {