Commit 530e37bc by 周志凯

[chg]: changed parameter

1 parent bd2f131c
...@@ -697,9 +697,9 @@ ...@@ -697,9 +697,9 @@
</el-select> </el-select>
</div> </div>
<div class="query-item"> <div class="query-item">
<span v-show="featureRevisitType !== 3" class="query-item__title" >日期 : </span> <span v-show="isSendDateParam" class="query-item__title" >日期 : </span>
<el-date-picker <el-date-picker
v-show="featureRevisitType !== 3" v-show="isSendDateParam"
v-model="query.dateVal" v-model="query.dateVal"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
...@@ -708,7 +708,7 @@ ...@@ -708,7 +708,7 @@
></el-date-picker> ></el-date-picker>
<el-button <el-button
type="primary" type="primary"
:class="featureRevisitType === 1 ? '' : 'query-button'" :class="isSendDateParam ? '' : 'query-button'"
@click="onSearchClick" @click="onSearchClick"
>开 始</el-button> >开 始</el-button>
</div> </div>
...@@ -803,16 +803,16 @@ ...@@ -803,16 +803,16 @@
</el-select> </el-select>
</div> </div>
<div class="query-item"> <div class="query-item">
<span v-show="featureLibRebuildType!== 1" class="query-item__title">日期 : </span> <span v-show="isSendDateParam" class="query-item__title">日期 : </span>
<el-date-picker <el-date-picker
v-show="featureLibRebuildType !== 1" v-show="isSendDateParam"
v-model="query.dateVal" v-model="query.dateVal"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
:picker-options="pickerOpts" :picker-options="pickerOpts"
placeholder="选择日期" placeholder="选择日期"
></el-date-picker> ></el-date-picker>
<el-button type="primary" :class="featureLibRebuildType === 1 ? '' : 'query-button'" @click="onSearchClick">开 始</el-button> <el-button type="primary" :class="isSendDateParam ? '' : 'query-button'" @click="onSearchClick">开 始</el-button>
</div> </div>
</div> </div>
</div> </div>
...@@ -1155,6 +1155,18 @@ ...@@ -1155,6 +1155,18 @@
} }
}, },
computed: { computed: {
isSendDateParam() {
if (
(this.dateFormat === 'rebuildFeatureLib'
&& this.featureLibRebuildType === 1
) || (
this.dateFormat === 'revisitFeature'
&& this.featureRevisitType === 3)
) {
return false
}
return true
},
totalTime() { totalTime() {
const { startTiming, endTiming } = this const { startTiming, endTiming } = this
return endTiming - startTiming return endTiming - startTiming
...@@ -1193,11 +1205,9 @@ ...@@ -1193,11 +1205,9 @@
: typeHandler[val] : typeHandler[val]
}, },
featureRevisitType(val) { featureRevisitType(val) {
this.query.dateVal = val === 3 ? null : this.createDate()
this.query.type = val this.query.type = val
}, },
featureLibRebuildType(val) { featureLibRebuildType(val) {
this.query.dateVal = val === 1 ? null : this.createDate()
this.query.type = val this.query.type = val
}, },
rematchPersonType(val) { rematchPersonType(val) {
...@@ -1901,7 +1911,7 @@ ...@@ -1901,7 +1911,7 @@
return val === 1 ? '/mall/staff' : '/mall/custom' return val === 1 ? '/mall/staff' : '/mall/custom'
} }
} }
const { dateFormat, query } = this const { dateFormat, query, isSendDateParam } = this
const { const {
dateVal, mallVal, type dateVal, mallVal, type
} = query } = query
...@@ -1914,7 +1924,7 @@ ...@@ -1914,7 +1924,7 @@
scheduleType: scheduleType, scheduleType: scheduleType,
// featureType: dateFormat === 'revisitFeature' ? type : null // featureType: dateFormat === 'revisitFeature' ? type : null
} }
if (dateVal) { if (isSendDateParam) {
parameter.startDate = dateVal + ' 00:00:00' parameter.startDate = dateVal + ' 00:00:00'
parameter.endDate = dateVal + ' 23:59:59' parameter.endDate = dateVal + ' 23:59:59'
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!