-
工单:{{ list[index].workOrderName }}
+
工单名称:{{ list[index].workOrderName }}
@@ -214,7 +214,7 @@ export default {
{
// width: 160,
prop: 'workOrderName',
- label: '工单名',
+ label: '工单名称',
},
...this.dynamicProps,
{
diff --git a/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue b/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue
index 4e7a2b67..9199e2fc 100644
--- a/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue
+++ b/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/src/views/quality/monitoring/qualityInspectionRecord/index.vue b/src/views/quality/monitoring/qualityInspectionRecord/index.vue
index e0374fc6..baac3742 100644
--- a/src/views/quality/monitoring/qualityInspectionRecord/index.vue
+++ b/src/views/quality/monitoring/qualityInspectionRecord/index.vue
@@ -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,
diff --git a/src/views/quality/monitoring/statisticalData/index.vue b/src/views/quality/monitoring/statisticalData/index.vue
index c84cedc7..e4db32b7 100644
--- a/src/views/quality/monitoring/statisticalData/index.vue
+++ b/src/views/quality/monitoring/statisticalData/index.vue
@@ -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,
From 3bf2757e42c7017e3b2d3ff5ad042fd622546790 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Wed, 29 Nov 2023 16:58:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../base/energyQuantityRealtime/index.vue | 26 +++++++++++++++++-
.../monitoring/energyReportSearch/index.vue | 27 +------------------
.../group/base/groupTeamScheduling/index.vue | 3 ++-
3 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/views/energy/base/energyQuantityRealtime/index.vue b/src/views/energy/base/energyQuantityRealtime/index.vue
index fd101a3e..3c96905d 100644
--- a/src/views/energy/base/energyQuantityRealtime/index.vue
+++ b/src/views/energy/base/energyQuantityRealtime/index.vue
@@ -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
diff --git a/src/views/energy/monitoring/energyReportSearch/index.vue b/src/views/energy/monitoring/energyReportSearch/index.vue
index d10f444a..93e2c6cf 100644
--- a/src/views/energy/monitoring/energyReportSearch/index.vue
+++ b/src/views/energy/monitoring/energyReportSearch/index.vue
@@ -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 || []
diff --git a/src/views/group/base/groupTeamScheduling/index.vue b/src/views/group/base/groupTeamScheduling/index.vue
index 61389315..e4156796 100644
--- a/src/views/group/base/groupTeamScheduling/index.vue
+++ b/src/views/group/base/groupTeamScheduling/index.vue
@@ -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: