From e055d2d93b516985fbc2df0f6f5a135f3230cccf Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 14 三月 2024 11:13:47 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/openRateFractionAnalysis/openRateFractionAnalysisMain.vue | 104 +++++++---------------------------------------------
1 files changed, 14 insertions(+), 90 deletions(-)
diff --git a/src/views/mdc/base/modules/openRateFractionAnalysis/openRateFractionAnalysisMain.vue b/src/views/mdc/base/modules/openRateFractionAnalysis/openRateFractionAnalysisMain.vue
index 630964f..0f05931 100644
--- a/src/views/mdc/base/modules/openRateFractionAnalysis/openRateFractionAnalysisMain.vue
+++ b/src/views/mdc/base/modules/openRateFractionAnalysis/openRateFractionAnalysisMain.vue
@@ -5,18 +5,18 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :md="6" :sm="6">
+ <a-col :md="7" :sm="7">
<a-form-item label="鏃堕棿">
<a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD"
- v-model="dates"/>
+ v-model="dates" :allowClear="false"/>
</a-form-item>
</a-col>
<a-col :md="17" :sm="17" :xs="17">
<a-form-item label="鏃堕棿娈�">
<a-space>
- <a-time-picker :default-value="moment('00:00', 'HH:mm')" format="HH:mm" @change="onChangeStart"/>
+ <a-time-picker :default-value="moment('00:00', 'HH:mm')" format="HH:mm" @change="onChangeStart" :allowClear="false"/>
鑷�
- <a-time-picker :default-value="moment('08:00', 'HH:mm')" format="HH:mm" @change="onChangeEnd"/>
+ <a-time-picker :default-value="moment('08:00', 'HH:mm')" format="HH:mm" @change="onChangeEnd" :allowClear="false"/>
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
</a-space>
</a-form-item>
@@ -225,96 +225,20 @@
this.dates = [v1[0], v1[1]]
},
searchQuery() {
+ // 鍥犺Е搴曞埛鏂颁細淇敼鍙傛暟鏃堕棿鍊硷紝鏁呭湪姝ょ敤鏃堕棿閫夋嫨鍣ㄧ殑鏃堕棿鍊煎鍙傛暟鏃堕棿鍊煎啀娆¤祴鍊硷紝鑻ヤ笉杩欐牱鍋氬垯鍙傛暟鏃堕棿鍊煎垯浼氫笌鏃堕棿閫夋嫨鍣ㄤ笂鐨勬椂闂村�间笉涓�鑷�
this.queryParam.startDate = moment(this.dates[0]).format('YYYYMMDD')
this.queryParam.endDate = moment(this.dates[1]).format('YYYYMMDD')
- if (this.queryParam.startTime && this.queryParam.endTime && this.dates[0] && this.dates[1]) {
- if (this.queryParam.typeTree == '1') {
- this.queryParam.parentId = this.queryParamEquip.parentId
- this.queryParam.equipmentId = this.queryParamEquip.equipmentId
- } else {
- this.queryParam.parentId = this.queryParamPeople.parentId
- this.queryParam.equipmentId = ''
- }
- this.requestAlldataSize = moment.duration(moment(this.queryParam.endDate) - moment(this.queryParam.startDate), 'millisecond').asDays() + 1
- this.loadData1()
- } else {
- this.$notification.warning({
- message: '鎻愮ず',
- description: '璇烽�夋嫨鏃堕棿鎴栨椂闂存'
- })
- }
- // this.onClearSelected()
+ if (this.queryParam.typeTree == '1') {
+ this.queryParam.parentId = this.queryParamEquip.parentId
+ this.queryParam.equipmentId = this.queryParamEquip.equipmentId
+ } else {
+ this.queryParam.parentId = this.queryParamPeople.parentId
+ this.queryParam.equipmentId = ''
+ }
+ this.requestAlldataSize = moment.duration(moment(this.queryParam.endDate) - moment(this.queryParam.startDate), 'millisecond').asDays() + 1
+ this.loadData1()
},
- // searchReset() {
- // this.typeTree = this.queryParam.typeTree
- // this.typeParent = this.queryParam.parentId
- // this.typeEquipment = this.queryParam.equipmentId
- // this.queryParam = {}
- // this.dates = []
- // this.queryParam.typeTree = this.typeTree
- // this.queryParam.parentId = this.typeParent
- // this.queryParam.equipmentId = this.typeEquipment
- // // this.ipagination.current = 1
- // this.loadData1();
- // // this.queryParam = {}
- // // this.dates = []
- // // this.loadData()
- // // this.onClearSelected()
- // },
- // loadData1() {
- // let that = this
- // that.columns=[
- // {
- // title: '璁惧缂栧彿',
- // align: 'center',
- // dataIndex: 'equipmentId',
- // width:'150px'
- // },
- // {
- // title: '璁惧鍚嶇О',
- // align: 'center',
- // dataIndex: 'equipmentName',
- // width:'150px'
- // },
- // ]
- // that.tableHeads = []
- // that.dataList = []
- // getAction(this.url.efficiencyList, that.queryParam).then(res => {
- // var tmp = {}
- // console.log(res)
- // if (res.success)
- //
- // that.dataSource = res.result.mdcEfficiencyList
- // for(var k = 0;k<that.dataSource[0].dataList.length;k++){
- // that.columns.push(
- // {
- // title:that.dataSource[0].dataList.theDate,
- // align: 'center',
- // width:'120px',
- // // dataIndex:'utilizationRate',
- // }
- // )
- // }
- // for(var i = 0;i<that.dataSource.length;i++){
- // for (var j = 0; j < that.dataSource[i].dataList.length;j++){
- // // that.columns.push(
- // // {
- // // title:that.dataSource[0].dataList[j].theDate,
- // // align: 'center',
- // // width:'120px',
- // // dataIndex:'utilizationRate',
- // // }
- // // )
- // }
- //
- // }
- // console.log(that.columns)
- // console.log(that.dataSource)
- // // this.initDeviceType(this.dataList)
- // this.draw()
- // }
- // }
loadData1() {
this.loading = true
this.tableHeads = []
--
Gitblit v1.9.3