Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/89pull/90/head^2
@@ -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/' | |||
@@ -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 | |||
}) | |||
} | |||
@@ -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 | |||
}) | |||
} | |||
@@ -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 | |||
}) | |||
} | |||
@@ -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 | |||
}, | |||
/** | |||
* 设置纸张大小 | |||
@@ -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': | |||
@@ -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': | |||
@@ -42,7 +42,7 @@ | |||
<DialogForm | |||
v-if="open" | |||
ref="form" | |||
:dataForm="form" | |||
v-model="form" | |||
:rows="[ | |||
[ | |||
{ | |||
@@ -40,7 +40,7 @@ | |||
<DialogForm | |||
v-if="open" | |||
ref="form" | |||
:dataForm="form" | |||
v-model="form" | |||
:rows="[ | |||
[ | |||
{ | |||
@@ -208,7 +208,11 @@ export default { | |||
name: null, | |||
}, | |||
// 表单参数 | |||
form: {}, | |||
form: { | |||
name: null, | |||
code: undefined, | |||
remark:undefined | |||
}, | |||
}; | |||
}, | |||
// watch: { | |||
@@ -246,7 +246,7 @@ export default { | |||
// 获取工段列表 | |||
async getWorksectionList(plId) { | |||
const response = await this.$axios( | |||
'/base/workshop-section/listByParentId', | |||
'/base/core-workshop-section/listByParentId', | |||
{ | |||
params: { | |||
id: plId, | |||
@@ -13,9 +13,8 @@ | |||
<!-- <pre><code v-html="jsondemo"></code></pre> --> | |||
<el-skeleton v-if="initing" :rows="6" animated /> | |||
<div v-else :class="{ 'no-data-bg': !list || list.length == 0 }"> | |||
<div v-else > | |||
<base-table | |||
v-if="list && list.length > 0" | |||
:table-props="tableProps" | |||
:page="queryParams.pageNo" | |||
:limit="queryParams.pageSize" | |||
@@ -71,7 +71,10 @@ export default { | |||
placeholder: '请选择工单号', | |||
param: 'workOrderIdList', | |||
selectOptions: [], | |||
multiple:true, | |||
multiple: true, | |||
labelField: 'name', | |||
valueField: 'id', | |||
defaultSelect: [] | |||
}, | |||
{ | |||
type: 'select', | |||
@@ -91,8 +94,8 @@ export default { | |||
label: '时间段', | |||
dateType: 'daterange', // datetimerange | |||
// format: 'yyyy-MM-dd HH:mm:ss', | |||
format: 'yyyy-MM-dd', | |||
valueFormat: 'timestamp', | |||
format: 'yyyy-MM-dd HH:mm:ss', | |||
valueFormat: 'yyyy-MM-dd HH:mm:ss', | |||
rangeSeparator: '-', | |||
startPlaceholder: '开始日期', | |||
endPlaceholder: '结束日期', | |||
@@ -246,7 +249,11 @@ export default { | |||
}, | |||
mounted() { | |||
if (this.$route.query.woIdString) { | |||
this.queryParams.workOrderIdList = this.$route.query.woIdString | |||
console.log(this.$route.query.woIdString); | |||
this.queryParams.workOrderIdList = [this.$route.query.woIdString] | |||
// let arr =[] | |||
this.searchBarFormConfig[0].defaultSelect = [this.$route.query.woIdString] | |||
console.log(this.searchBarFormConfig[0].defaultSelect); | |||
} | |||
// if (this.$route.params.startTime && this.$route.params.endTime) { | |||
// this.searchBarFormConfig[0].defaultSelect = [ | |||
@@ -301,7 +308,8 @@ export default { | |||
this.getDict() | |||
}, | |||
/** 查询列表 */ | |||
async getDataList() { | |||
async getDataList() { | |||
console.log(this.queryParams); | |||
this.loading = true; | |||
// 执行查询 | |||
const { | |||
@@ -1,13 +1,13 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-10-17 09:26:38 | |||
* @LastEditTime: 2023-10-30 14:53:34 | |||
* @LastEditTime: 2023-11-16 18:52:00 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
<template> | |||
<div> | |||
<doc-alert title="报表设计器" url="https://doc.iocoder.cn/report/" /> | |||
<!-- <doc-alert title="报表设计器" url="https://doc.iocoder.cn/report/" /> --> | |||
<i-frame :src="url" /> | |||
</div> | |||
</template> | |||
@@ -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(), | |||