From 68d3b46bab3fad24fc58d84db41662e032a0d942 Mon Sep 17 00:00:00 2001 From: lb Date: Tue, 28 Nov 2023 09:04:57 +0800 Subject: [PATCH 1/9] update process flow --- .../components/BomSelector.vue | 3 +- .../components/ProcessBomList.vue | 57 +++++++++++-------- .../components/ProcessDetail.vue | 2 +- 3 files changed, 37 insertions(+), 25 deletions(-) diff --git a/src/views/extend/processFlowView/components/BomSelector.vue b/src/views/extend/processFlowView/components/BomSelector.vue index a52be51c..136a06cb 100644 --- a/src/views/extend/processFlowView/components/BomSelector.vue +++ b/src/views/extend/processFlowView/components/BomSelector.vue @@ -19,7 +19,7 @@ - +
@@ -78,6 +78,7 @@
+
; diff --git a/src/views/extend/processFlowView/components/ProcessBomList.vue b/src/views/extend/processFlowView/components/ProcessBomList.vue index e98f32c6..d56eb442 100644 --- a/src/views/extend/processFlowView/components/ProcessBomList.vue +++ b/src/views/extend/processFlowView/components/ProcessBomList.vue @@ -218,34 +218,45 @@ export default { this.total = 0; } + this.selectedBoms = []; // 获取设备及bom列表 this.http('/extend/process-flow-det/getEquipmentDetBySectionId', 'post', { sectionId, flowDetId: detId, - }).then(({ code, data }) => { - if (code == 0) { - this.bomList = data.map((eq) => { - eq.materialsBom = eq.materialsBom || []; - eq.valuesBom = eq.valuesBom || []; - // 设置选中状态 - eq.materialsBom.chosen = eq.materialsBomChoseId ?? null; - eq.valuesBom.chosen = eq.valuesBomChoseId ?? null; - if (eq.equChose || eq.materialsBom.chosen || eq.valuesBom.chosen) { - this.selectedBoms.push({ - equipmentId: eq.id, - equMaterialBomId: eq.materialsBom.chosen, - equValueBomId: eq.valuesBom.chosen, - }); - } - // 设置设备id - eq.materialsBom.equipmentId = eq.id; - eq.valuesBom.equipmentId = eq.id; - return eq; - }); - } else { + }) + .then(({ code, data }) => { + if (code == 0) { + this.bomList = data.map((eq) => { + eq.materialsBom = eq.materialsBom || []; + eq.valuesBom = eq.valuesBom || []; + // 设置选中状态 + eq.materialsBom.chosen = eq.materialsBomChoseId ?? null; + eq.valuesBom.chosen = eq.valuesBomChoseId ?? null; + if ( + eq.equChose || + eq.materialsBom.chosen || + eq.valuesBom.chosen + ) { + this.selectedBoms.push({ + equipmentId: eq.id, + equMaterialBomId: eq.materialsBom.chosen, + equValueBomId: eq.valuesBom.chosen, + }); + } + // 设置设备id + eq.materialsBom.equipmentId = eq.id; + eq.valuesBom.equipmentId = eq.id; + return eq; + }); + } else { + this.bomList.splice(0); + this.selectedBoms = []; + } + }) + .catch((err) => { this.bomList.splice(0); - } - }); + this.selectedBoms = []; + }); }, async handleAddEquipment() { this.open = true; diff --git a/src/views/extend/processFlowView/components/ProcessDetail.vue b/src/views/extend/processFlowView/components/ProcessDetail.vue index 77368267..81d27ce9 100644 --- a/src/views/extend/processFlowView/components/ProcessDetail.vue +++ b/src/views/extend/processFlowView/components/ProcessDetail.vue @@ -34,7 +34,7 @@ class="btn-refresh" @click="handleUpdateLayout" icon="el-icon-refresh"> - 刷新布局 + 保存布局 Date: Tue, 28 Nov 2023 10:54:51 +0800 Subject: [PATCH 2/9] =?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/api/quality/processTraceability.js | 10 +- src/views/base/mixins/basic-page.js | 7 +- src/views/base/packagingPrintLog/index.vue | 25 +++- .../equipment/base/alarm/Record/index.vue | 8 +- .../processEquMaterialBom/add-or-updata.vue | 4 +- .../processEquValueBom/add-or-updata.vue | 6 +- .../extend/processEquValueBom/attr-add.vue | 4 +- .../extend/processTraceability/index.vue | 46 ++++--- .../components/ProcessBomList.vue | 38 +++--- .../components/ProcessDetail.vue | 10 +- .../components/ProcessInfo.vue | 21 +-- .../base/qualityInspectionDet/index.vue | 120 +++++++----------- .../base/qualityInspectionType/index.vue | 114 +++++++---------- .../base/qualityScrapType/add-or-updata.vue | 8 +- .../quality/monitoring/currentData/index.vue | 6 +- .../monitoring/materielDateFrom/index.vue | 5 +- .../monitoring/processTraceability/index.vue | 83 ++++++------ .../components/ProcessBomList.vue | 38 +++--- .../components/ProcessDetail.vue | 10 +- .../components/ProcessInfo.vue | 21 +-- .../processTraceabilityDetail/index.vue | 11 +- .../monitoring/statisticalData/index.vue | 7 +- 22 files changed, 315 insertions(+), 287 deletions(-) diff --git a/src/api/quality/processTraceability.js b/src/api/quality/processTraceability.js index d2152584..5faac726 100644 --- a/src/api/quality/processTraceability.js +++ b/src/api/quality/processTraceability.js @@ -1,7 +1,7 @@ /* * @Author: zhp * @Date: 2023-10-31 15:05:06 - * @LastEditTime: 2023-11-03 09:05:50 + * @LastEditTime: 2023-11-28 09:28:05 * @LastEditors: zhp * @Description: */ @@ -24,6 +24,14 @@ export function getWorkOrderList(query) { params: query, }) } + +export function getCoreProduct(id) { + return request({ + url: '/base/core-product/get?id=' + id, + method: 'get' + }) +} + // 导出物料信息 // export function exportEnergyPlcExcel(query) { // return request({ diff --git a/src/views/base/mixins/basic-page.js b/src/views/base/mixins/basic-page.js index b3b14aaa..06c2b851 100644 --- a/src/views/base/mixins/basic-page.js +++ b/src/views/base/mixins/basic-page.js @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2022-08-24 11:19:43 * @LastEditors: zhp - * @LastEditTime: 2023-11-01 10:30:12 + * @LastEditTime: 2023-11-24 09:29:36 * @Description: */ export default { @@ -85,6 +85,7 @@ export default { }, //tableBtn点击 handleClick(val) { + console.log(val.data.packagingCode); if (val.type === "edit") { this.addOrUpdateVisible = true; this.addOrEditTitle = "编辑"; @@ -92,7 +93,7 @@ export default { this.$refs.addOrUpdate.init(val.data.id); }); } else if (val.type === "delete") { - this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex) + this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex,val.data.packagingCode ) } else if (val.type === "change") { this.changeStatus(val.data.id) } else { @@ -101,7 +102,7 @@ export default { }, // 删除 deleteHandle(id, name, index) { - this.$confirm(`是否确认删除${name ? '[' + name + ']' : '[' + index + ']'}数据项?`, "提示", { + this.$confirm(`是否确认删除${name ? ' 名称为'+ name : '[' + index + ']'}数据项?`, "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", diff --git a/src/views/base/packagingPrintLog/index.vue b/src/views/base/packagingPrintLog/index.vue index 06918805..3e4ec4ea 100644 --- a/src/views/base/packagingPrintLog/index.vue +++ b/src/views/base/packagingPrintLog/index.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2023-08-01 14:55:51 * @LastEditors: zhp - * @LastEditTime: 2023-11-22 14:40:59 + * @LastEditTime: 2023-11-24 09:13:50 * @Description: --> From a5c17d2276d72cb9856a6412d5aecb43a1731ada Mon Sep 17 00:00:00 2001 From: lb Date: Tue, 28 Nov 2023 16:14:24 +0800 Subject: [PATCH 5/9] fix conflicts --- .../core/analysis/balanceAnalysis/index.vue | 78 ++++++++++--------- .../equipment/base/alarm/Record/index.vue | 19 +---- 2 files changed, 43 insertions(+), 54 deletions(-) diff --git a/src/views/core/analysis/balanceAnalysis/index.vue b/src/views/core/analysis/balanceAnalysis/index.vue index 5579da4a..8ce3b630 100644 --- a/src/views/core/analysis/balanceAnalysis/index.vue +++ b/src/views/core/analysis/balanceAnalysis/index.vue @@ -162,50 +162,54 @@ export default { buildProps(nameData) { return new Promise((resolve, reject) => { - const dateArr = Array.from( - new Set( - nameData - .map((item) => (item.tree == 1 ? item.name : undefined)) - .filter((v) => v) - ) - ); - // 排个序 - dateArr.sort().forEach((date) => { - this.tableProps.push({ - label: date, - align: 'center', - children: [ - { - prop: date + '_eq_ct', - label: '设备CT', - align: 'center', - }, - { - prop: date + '_eq_tt', - label: '设备TT', - align: 'center', - }, - { - prop: date + '_pl_ct', - label: '产线CT', - align: 'center', - }, - { - prop: date + '_pl_tt', - label: '产线TT', - align: 'center', - }, - ], + try { + const dateArr = Array.from( + new Set( + nameData + .map((item) => (item.tree == 1 ? item.name : undefined)) + .filter((v) => v) + ) + ); + // 排个序 + dateArr.sort().forEach((date) => { + this.tableProps.push({ + label: date, + align: 'center', + children: [ + { + prop: date + '_eq_ct', + label: '设备CT', + align: 'center', + }, + { + prop: date + '_eq_tt', + label: '设备TT', + align: 'center', + }, + { + prop: date + '_pl_ct', + label: '产线CT', + align: 'center', + }, + { + prop: date + '_pl_tt', + label: '产线TT', + align: 'center', + }, + ], + }); }); - }); - resolve(); + resolve(); + } catch (err) { + reject(err); + } }); }, async buildTableData(data) { /** 处理 工段 分组 */ - const sectionList = data.map(item => {}) + const sectionList = data.map((item) => {}); }, setRowSpan(arr) { diff --git a/src/views/equipment/base/alarm/Record/index.vue b/src/views/equipment/base/alarm/Record/index.vue index c4f93007..91a9f310 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 8/9] =?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 9/9] =?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; +}