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(),