mt-fe-group/yudao-dev
12
0
Förgrening 0
Kod Ärenden Pull-förfrågningar Släpp Wiki Aktiviteter

Merge branch 'projects/mes-test' into projects/mes-dy

Bläddra i källkod
This commit is contained in:
helloDy 2023-11-30 08:57:43 +08:00
förälder 2267444b4a 4e97989ede
incheckning a2672c1742
7 ändrade filer med 39 tillägg och 39 borttagningar
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/views/energy/base/energyQuantityRealtime/index.vue
Visa fil

@ -63,7 +63,7 @@ const tableProps = [
}
]
export default {
name: "EnergyPlc",
name: "EnergyQuantityRealtime",
data() {
return {
formConfig: [
@ -125,10 +125,34 @@ export default {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
if (location.href.indexOf('?') > 0) {
let arr = location.href.split('?')[1].split('&')
this.formConfig[1].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
} else {
this.formConfig[1].defaultSelect = [Date.now() - 7*24*3600000, Date.now()]
}
this.queryParams.startTime = this.formConfig[1].defaultSelect[0]
this.queryParams.endTime = this.formConfig[1].defaultSelect[1]
this.getList();
this.getTypeList()
},
watch: {
$route: 'initData'
},
methods: {
initData(to) {
if (to.name === 'EnergyQuantityRealtime') {
if (location.href.indexOf('?') > 0) {
let arr = location.href.split('?')[1].split('&')
this.formConfig[1].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
} else {
this.formConfig[1].defaultSelect = [Date.now() - 7*24*3600000, Date.now()]
}
this.queryParams.startTime = this.formConfig[1].defaultSelect[0]
this.queryParams.endTime = this.formConfig[1].defaultSelect[1]
this.getList()
}
},
buttonClick(val) {
this.queryParams.pageNo = 1;
this.queryParams.energyTypeId = val.energyTypeId

27
src/views/energy/monitoring/energyReportSearch/index.vue
Visa fil

@ -80,8 +80,7 @@ export default {
param: 'timeVal',
defaultSelect: [],
width: 350,
clearable: false,
required:true
clearable: false
},
{
type: 'button',
@ -122,35 +121,11 @@ export default {
this.tableH = this.tableHeight(260)
this.isFold = this.searchBarWidth('energyReportSearchBox', 1180)
})
if (location.href.indexOf('?') > 0) {
let arr = location.href.split('?')[1].split('&')
this.formConfig[2].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
} else {
this.formConfig[2].defaultSelect = [Date.now() - 7*24*3600000, Date.now()]
}
this.queryParams.startTime = this.formConfig[2].defaultSelect[0]
this.queryParams.endTime = this.formConfig[2].defaultSelect[1]
this.getList()
this.getTypeList()
this.isFold = this.searchBarWidth('energyReportSearchBox', 1180)
},
watch: {
$route: 'initData'
},
methods: {
initData(to) {
if (to.name === 'EnergyReportSearch') {
if (location.href.indexOf('?') > 0) {
let arr = location.href.split('?')[1].split('&')
this.formConfig[2].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
} else {
this.formConfig[2].defaultSelect = [Date.now() - 7*24*3600000, Date.now()]
}
this.queryParams.startTime = this.formConfig[2].defaultSelect[0]
this.queryParams.endTime = this.formConfig[2].defaultSelect[1]
this.getList()
}
},
getTypeList() {
getEnergyTypeListAll().then((res) => {
this.formConfig[1].selectOptions = res.data || []

3
src/views/group/base/groupTeamScheduling/index.vue
Visa fil

@ -290,7 +290,8 @@ export default {
break;
case '2': // 能源
this.$router.push({
path: '/energy/monitoring/energy-report-search?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime
// path: '/energy/monitoring/energy-report-search?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime
path: '/energy/base/energy-quantity-realtime?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime
})
break;
default:

4
src/views/quality/monitoring/currentData/index.vue
Visa fil

@ -11,7 +11,7 @@
<base-table class="base-table__margin" :table-props="productProps" :page="1" :limit="10" :table-data="list">
</base-table>
<div v-for="(item,index) in downProps" :key="index">
<div class="blue-title">工单:{{ list[index].workOrderName }}</div>
<div class="blue-title">工单名称:{{ list[index].workOrderName }}</div>
<base-table class="base-table__margin" :table-props="item" :page="1" :limit="10"
:table-data="downList[index]">
</base-table>
@ -214,7 +214,7 @@ export default {
{
// width: 160,
prop: 'workOrderName',
label: '工单名',
label: '工单名称',
},
...this.dynamicProps,
{

4
src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue
Visa fil

@ -9,8 +9,8 @@
<el-form ref="form" :model="innerDataForm" label-width="100px" v-loading="formLoading">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="工单号" prop="workOrderId" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
<el-select v-model="innerDataForm.workOrderId" placeholder="请选择工单号" filterable clearable>
<el-form-item label="工单名称" prop="workOrderId" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
<el-select v-model="innerDataForm.workOrderId" placeholder="请选择工单名称" filterable clearable>
<el-option v-for="opt in workOrderList" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>

6
src/views/quality/monitoring/qualityInspectionRecord/index.vue
Visa fil

@ -141,8 +141,8 @@ export default {
searchBarFormConfig: [
{
type: 'select',
label: '工单号',
placeholder: '请选择工单号',
label: '工单名称',
placeholder: '请选择工单名称',
param: 'workOrderId',
selectOptions: [],
filterable:true
@ -215,7 +215,7 @@ export default {
{
// width: 128,
prop: 'workOrderName',
label: '工单Id',
label: '工单名称',
},
{
// width: 128,

8
src/views/quality/monitoring/statisticalData/index.vue
Visa fil

@ -67,8 +67,8 @@ export default {
searchBarFormConfig: [
{
type: 'select',
label: '工单号',
placeholder: '请选择工单号',
label: '工单名称',
placeholder: '请选择工单名称',
param: 'workOrderIdList',
selectOptions: [],
multiple: true,
@ -205,8 +205,8 @@ export default {
return [
{
// width: 128,
prop: 'workOrderId',
label: '工单号',
prop: 'workOrderName',
label: '工单名称',
},
{
// width: 128,