From 6a10afd04ee445cde3b8b18670229f3f9ccced12 Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Thu, 16 Nov 2023 16:12:05 +0800 Subject: [PATCH 1/5] 1 --- src/views/order/base/orderManage/components/addWorkOrder.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/order/base/orderManage/components/addWorkOrder.vue b/src/views/order/base/orderManage/components/addWorkOrder.vue index 4e50fcf7..b8d0f46a 100644 --- a/src/views/order/base/orderManage/components/addWorkOrder.vue +++ b/src/views/order/base/orderManage/components/addWorkOrder.vue @@ -202,7 +202,7 @@ export default { }, methods: { init(data, param) { - this.form.orderId = data.id + this.form.orderId = data this.getList() if (param === 'add') { this.isBind = false From d37c5881a5ea90cc53e021cbede1a97a546cb873 Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Thu, 16 Nov 2023 16:53:35 +0800 Subject: [PATCH 2/5] 2 --- src/views/order/base/orderManage/components/addWorkOrder.vue | 2 +- src/views/order/base/orderManage/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/order/base/orderManage/components/addWorkOrder.vue b/src/views/order/base/orderManage/components/addWorkOrder.vue index b8d0f46a..4e50fcf7 100644 --- a/src/views/order/base/orderManage/components/addWorkOrder.vue +++ b/src/views/order/base/orderManage/components/addWorkOrder.vue @@ -202,7 +202,7 @@ export default { }, methods: { init(data, param) { - this.form.orderId = data + this.form.orderId = data.id this.getList() if (param === 'add') { this.isBind = false diff --git a/src/views/order/base/orderManage/index.vue b/src/views/order/base/orderManage/index.vue index a30a4344..746dbf2c 100644 --- a/src/views/order/base/orderManage/index.vue +++ b/src/views/order/base/orderManage/index.vue @@ -397,7 +397,7 @@ export default { this.workIssueTitle = '绑定工单' this.addWorkOrdervisible = true this.$nextTick(() => { - this.$refs.addWorkOrder.init(val.data.id, 'bind') + this.$refs.addWorkOrder.init(val.data, 'bind') }) break case 'complete': From 0884159dd756b9ae64743ac2700dbc03d195762e Mon Sep 17 00:00:00 2001 From: lb Date: Thu, 16 Nov 2023 17:16:37 +0800 Subject: [PATCH 3/5] update login --- public/static/videos/login.webm | Bin 9255816 -> 9255817 bytes src/assets/styles/login.scss | 10 +++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/public/static/videos/login.webm b/public/static/videos/login.webm index 43e188f66e9ae93aedcb968622211e85f86b6a63..18203c3904ff6280a1eaf8ec707e9ef0d69b5999 100644 GIT binary patch delta 10724 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 Date: Thu, 16 Nov 2023 17:23:58 +0800 Subject: [PATCH 4/5] update --- src/assets/styles/login.scss | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/assets/styles/login.scss b/src/assets/styles/login.scss index 151f798f..bea1fe9d 100644 --- a/src/assets/styles/login.scss +++ b/src/assets/styles/login.scss @@ -94,7 +94,7 @@ $buttonHeight: $buttonH * 1px; display: flex; .pic { - flex: 1; + flex: 3; width: 1px; min-width: 800px; // 元素 @@ -119,8 +119,8 @@ $buttonHeight: $buttonH * 1px; .field { position: relative; margin-top: 8%; - // flex: 1; - width: 800px; + flex: 2; + // width: 800px; display: flex; flex-direction: column; align-items: center; @@ -311,6 +311,19 @@ $buttonHeight: $buttonH * 1px; } // - - - - - PC 最小尺寸设置 +@media screen and (min-width: 1920px) { + .container { + .content { + + .field { + flex: initial; + width: 800px; + } + } + } +} + + @media screen and (min-width: 599px) and (max-width: 1366px) { .container { min-width: 599px; From b349432eaab113a669df71aa9d2110a7f4e3d0e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’> Date: Thu, 16 Nov 2023 18:52:55 +0800 Subject: [PATCH 5/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 --- .env.prod | 10 +- src/api/extend/processEquMaterialBom.js | 4 +- src/api/extend/processEquValueBom.js | 6 +- src/api/monitoring/statisticalData.js | 4 +- src/views/base/custom/index.vue | 115 +++++++++--------- .../extend/processEquMaterialBom/index.vue | 2 +- src/views/extend/processEquValueBom/index.vue | 6 +- .../base/qualityInspectionDet/index.vue | 2 +- .../base/qualityInspectionType/index.vue | 8 +- .../qualityInspectionRecord/dialogForm.vue | 2 +- .../monitoring/qualityRecentHours/index.vue | 3 +- .../monitoring/statisticalData/index.vue | 18 ++- src/views/report/jmreport/index.vue | 5 +- 13 files changed, 104 insertions(+), 81 deletions(-) diff --git a/.env.prod b/.env.prod index 43504e8f..70b8fb4a 100644 --- a/.env.prod +++ b/.env.prod @@ -1,3 +1,10 @@ +### + # @Author: zhp + # @Date: 2023-11-07 19:11:40 + # @LastEditTime: 2023-11-16 16:40:59 + # @LastEditors: zhp + # @Description: +### # 生产环境配置 ENV = 'production' @@ -5,7 +12,8 @@ ENV = 'production' VUE_APP_TITLE = MES系统 # 芋道管理系统/生产环境 -VUE_APP_BASE_API = '/prod-api' +VUE_APP_BASE_API = 'http://192.168.0.33:48082' + # 根据服务器或域名修改 # PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/' diff --git a/src/api/extend/processEquMaterialBom.js b/src/api/extend/processEquMaterialBom.js index 5be7bfb0..def6ad48 100644 --- a/src/api/extend/processEquMaterialBom.js +++ b/src/api/extend/processEquMaterialBom.js @@ -1,7 +1,7 @@ /* * @Author: zhp * @Date: 2023-11-07 19:47:48 - * @LastEditTime: 2023-11-08 16:59:32 + * @LastEditTime: 2023-11-16 17:49:23 * @LastEditors: zhp * @Description: */ @@ -12,7 +12,7 @@ export function processEquMaterialBomPage(data) { return request({ url: '/extend/process-equ-material-bom/page', method: 'get', - data: data + params: data }) } diff --git a/src/api/extend/processEquValueBom.js b/src/api/extend/processEquValueBom.js index 8048c56b..93d6a740 100644 --- a/src/api/extend/processEquValueBom.js +++ b/src/api/extend/processEquValueBom.js @@ -1,18 +1,18 @@ /* * @Author: zhp * @Date: 2023-11-09 09:37:14 - * @LastEditTime: 2023-11-09 14:20:02 + * @LastEditTime: 2023-11-16 17:47:21 * @LastEditors: zhp * @Description: */ import request from '@/utils/request' -// 获得能耗统计查询分页 + export function processEquValueBomPage(data) { return request({ url: '/extend/process-equ-value-bom/page', method: 'get', - data: data + params: data }) } diff --git a/src/api/monitoring/statisticalData.js b/src/api/monitoring/statisticalData.js index cdf92812..2d0f19be 100644 --- a/src/api/monitoring/statisticalData.js +++ b/src/api/monitoring/statisticalData.js @@ -1,7 +1,7 @@ /* * @Author: zhp * @Date: 2023-11-07 14:10:18 - * @LastEditTime: 2023-11-14 14:46:04 + * @LastEditTime: 2023-11-16 17:49:52 * @LastEditors: zhp * @Description: */ @@ -12,7 +12,7 @@ export function getStatisticalDataPage(query) { return request({ url: '/base/statistical-data/getStatisticData', method: 'get', - data: query + params: query }) } diff --git a/src/views/base/custom/index.vue b/src/views/base/custom/index.vue index 4f5ffd56..23b591f5 100644 --- a/src/views/base/custom/index.vue +++ b/src/views/base/custom/index.vue @@ -202,7 +202,7 @@ export default { } }, created() { - this.init() + // this.init() // console.log('aaaaaa') // this.otherPaper() }, @@ -227,64 +227,67 @@ export default { changeMode() { // hiprintTemplate.clear() // console.log(this.modelData) - const { mode } = this - const provider = providers[mode] - hiprint.init({ - providers: [provider.f] - }) + this.$nextTick(() => { + const { mode } = this + const provider = providers[mode] + hiprint.init({ + providers: [provider.f] + }) - // $('#hiprint-printTemplate').empty() - // console.log(JSON.parse(this.modelData)) - hiprint.setConfig() - // 替换配置 - hiprint.setConfig({ - movingDistance: 2.5, - text: { - supportOptions: [ - { - name: 'styler', - hidden: true - }, - { - name: 'formatter', - hidden: true - } - ] + // $('#hiprint-printTemplate').empty() + // console.log(JSON.parse(this.modelData)) + hiprint.setConfig() + // 替换配置 + hiprint.setConfig({ + movingDistance: 2.5, + text: { + supportOptions: [ + { + name: 'styler', + hidden: true + }, + { + name: 'formatter', + hidden: true + } + ] + } + }) + + // console.log(this.modelData) + // console.log($('#hiprint-printTemplate').empty()) + if (this.modelData != {}) { + console.log(this.modelData); + $('.hiprintEpContainer').empty() + hiprint.PrintElementTypeManager.build('.hiprintEpContainer', provider.value) + $('.hiprint-printTemplate').empty() + hiprintTemplate = new hiprint.PrintTemplate({ + template: JSON.parse(this.modelData), + settingContainer: '#PrintElementOptionSetting', + paginationContainer: '.hiprint-printPagination' + }) + } else { + $('.hiprintEpContainer').empty() + console.log(this.modelData); + hiprint.PrintElementTypeManager.build('.hiprintEpContainer', provider.value) + $('.hiprint-printTemplate').empty() + // const templates = this.$ls.get('KEY_TEMPLATES', {}) + const template = provider.value + // console.log(template) + hiprintTemplate = new hiprint.PrintTemplate({ + template: template, + settingContainer: '#PrintElementOptionSetting', + paginationContainer: '.hiprint-printPagination' + }) } + hiprintTemplate.design('#hiprint-printTemplate') + // console.log(hiprintTemplate) + console.log(hiprintTemplate); + // hiprintTemplate.design('#hiprint-printTemplate', { grid: true }) + // 获取当前放大比例, 当zoom时传true 才会有 + this.scaleValue = hiprintTemplate.editingPanel.scale || 1 + // this.scaleValue = hiprintTemplate.editingPanel.scale || 1 }) - - // console.log(this.modelData) - // console.log($('#hiprint-printTemplate').empty()) - if (this.modelData) { - // console.log(this.modelData); - $('.hiprintEpContainer').empty() - hiprint.PrintElementTypeManager.build('.hiprintEpContainer', provider.value) - $('.hiprint-printTemplate').empty() - hiprintTemplate = new hiprint.PrintTemplate({ - template: JSON.parse(this.modelData), - settingContainer: '#PrintElementOptionSetting', - paginationContainer: '.hiprint-printPagination' - }) - } else { - $('.hiprintEpContainer').empty() - hiprint.PrintElementTypeManager.build('.hiprintEpContainer', provider.value) - $('.hiprint-printTemplate').empty() - // const templates = this.$ls.get('KEY_TEMPLATES', {}) - const template = provider.value - // console.log(template) - hiprintTemplate = new hiprint.PrintTemplate({ - template: template, - settingContainer: '#PrintElementOptionSetting', - paginationContainer: '.hiprint-printPagination' - }) - } - // hiprintTemplate.design('#hiprint-printTemplate') - // console.log(hiprintTemplate) - console.log(hiprintTemplate); - hiprintTemplate.design('#hiprint-printTemplate', { grid: true }) - // 获取当前放大比例, 当zoom时传true 才会有 - this.scaleValue = hiprintTemplate.editingPanel.scale || 1 - // this.scaleValue = hiprintTemplate.editingPanel.scale || 1 }, /** * 设置纸张大小 diff --git a/src/views/extend/processEquMaterialBom/index.vue b/src/views/extend/processEquMaterialBom/index.vue index d235e6db..31dedc8e 100644 --- a/src/views/extend/processEquMaterialBom/index.vue +++ b/src/views/extend/processEquMaterialBom/index.vue @@ -174,7 +174,7 @@ export default { this.listQuery.pageSize = 10; this.listQuery.equipmentId = val.equipmentId ? val.equipmentId : undefined; this.listQuery.name = val.name ? val.name : undefined; - this.listQuery.name = val.name ? val.name : undefined; + this.listQuery.code = val.code ? val.code : undefined; this.getDataList(); break; case 'reset': diff --git a/src/views/extend/processEquValueBom/index.vue b/src/views/extend/processEquValueBom/index.vue index 9ea4bf71..536abef5 100644 --- a/src/views/extend/processEquValueBom/index.vue +++ b/src/views/extend/processEquValueBom/index.vue @@ -96,7 +96,7 @@ export default { }, { type: 'input', - label: '物料配方名称', + label: '参数配方名称', // selectOptions: [], // labelField: 'name', // valueField: 'id', @@ -104,7 +104,7 @@ export default { }, { type: 'input', - label: '物料配方编码', + label: '参数配方编码', // selectOptions: [], // labelField: 'name', // valueField: 'id', @@ -174,7 +174,7 @@ export default { this.listQuery.pageSize = 10; this.listQuery.equipmentId = val.equipmentId ? val.equipmentId : undefined; this.listQuery.name = val.name ? val.name : undefined; - this.listQuery.name = val.name ? val.name : undefined; + this.listQuery.code = val.code ? val.code : undefined; this.getDataList(); break; case 'reset': diff --git a/src/views/quality/base/qualityInspectionDet/index.vue b/src/views/quality/base/qualityInspectionDet/index.vue index a5518679..d2a40135 100644 --- a/src/views/quality/base/qualityInspectionDet/index.vue +++ b/src/views/quality/base/qualityInspectionDet/index.vue @@ -42,7 +42,7 @@ --> -
+
@@ -17,6 +17,7 @@ import {getAccessToken} from "@/utils/auth"; export default { name: "JimuReport", components: { iFrame }, + data() { return { url: process.env.VUE_APP_BASE_API + "/jmreport/list?token=" + getAccessToken(),