修改法规预警搜索时间问题
This commit is contained in:
高嵩
@@ -230,7 +230,12 @@
|
||||
// this.queryParam['WarnTimeText'] = '2'
|
||||
// }
|
||||
let startTime = moment(new Date()).format('YYYY-MM-DD')
|
||||
let endTime = this.getNowdate()
|
||||
let endTime = ''
|
||||
if (!this.queryParam['WarnTimeText']){
|
||||
endTime = '2099-01-01'
|
||||
}else{
|
||||
endTime = this.getNowdate()
|
||||
}
|
||||
if(this.queryParam['WarnTimeText'] == '5'){
|
||||
this.queryParam['WarnTime'] = [endTime, startTime]
|
||||
}else{
|
||||
|
||||
@@ -5,19 +5,19 @@
|
||||
:searchQueryList="searchQueryList"
|
||||
:flag="'1'"
|
||||
:isDefault="true"
|
||||
:url="url"/>
|
||||
:url="url" />
|
||||
</div>
|
||||
<div class="table-operator">
|
||||
<div @click="handleCompare" v-has="'regulatoryEarlyWarning:push'"
|
||||
class="operator-text">
|
||||
<a-icon type="share-alt"/>
|
||||
{{$t('share')}}
|
||||
<a-icon type="share-alt" />
|
||||
{{ $t('share') }}
|
||||
</div>
|
||||
<div @click="handleExport"
|
||||
v-has="'regulatoryEarlyWarning:export'"
|
||||
class="operator-text">
|
||||
<a-icon type="export" :rotate="-90"/>
|
||||
{{$t('export')}}
|
||||
<a-icon type="export" :rotate="-90" />
|
||||
{{ $t('export') }}
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
@@ -40,39 +40,39 @@
|
||||
:columns="columns"
|
||||
>
|
||||
<span slot="serial_number" slot-scope="text,result">
|
||||
<a @click="standClick(result)" :title="text">{{text}}</a>
|
||||
<a @click="standClick(result)" :title="text">{{ text }}</a>
|
||||
</span>
|
||||
<span slot="vehicleInProductionDate" slot-scope="text,result" :title="text">
|
||||
<span v-if="result.xin1_che1_xing2_shi2_shi1_ri4_qi1 == 'yellow'">
|
||||
{{text}}
|
||||
{{ text }}
|
||||
</span>
|
||||
<span v-else-if="result.xin1_che1_xing2_shi2_shi1_ri4_qi1 == 'red'">
|
||||
{{text}}
|
||||
{{ text }}
|
||||
</span>
|
||||
<span v-else>
|
||||
{{text}}
|
||||
{{ text }}
|
||||
</span>
|
||||
</span>
|
||||
<span slot="ImplementationDate" slot-scope="text,result" :title="text">
|
||||
<span v-if="result.new_colour == 'yellow'" style="color: #fdd835">
|
||||
{{text}}
|
||||
{{ text }}
|
||||
</span>
|
||||
<span v-else-if="result.new_colour == 'red'" style="color: red">
|
||||
{{text}}
|
||||
{{ text }}
|
||||
</span>
|
||||
<span v-else>
|
||||
{{text}}
|
||||
{{ text }}
|
||||
</span>
|
||||
</span>
|
||||
<span slot="vehicleInProductionDate" slot-scope="text,result" :title="text">
|
||||
<span v-if="result.implement_colour == 'yellow'" style="color: #fdd835">
|
||||
{{text}}
|
||||
{{ text }}
|
||||
</span>
|
||||
<span v-else-if="result.implement_colour == 'red'" style="color: red">
|
||||
{{text}}
|
||||
{{ text }}
|
||||
</span>
|
||||
<span v-else>
|
||||
{{text}}
|
||||
{{ text }}
|
||||
</span>
|
||||
</span>
|
||||
</a-table>
|
||||
@@ -98,20 +98,20 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import search from '@/components/search/index'
|
||||
import libraryPush from '@/components/libraryPush/index'
|
||||
import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
|
||||
import moment from 'moment'
|
||||
import eventBUs from '../../common/event'
|
||||
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
|
||||
import search from '@/components/search/index'
|
||||
import libraryPush from '@/components/libraryPush/index'
|
||||
import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
|
||||
import moment from 'moment'
|
||||
import eventBUs from '../../common/event'
|
||||
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
|
||||
|
||||
export default {
|
||||
export default {
|
||||
name: 'index',
|
||||
components: {
|
||||
search,
|
||||
libraryPush
|
||||
},
|
||||
mixins: [ResizeColumnProvide,ResizeHeader],
|
||||
mixins: [ResizeColumnProvide, ResizeHeader],
|
||||
data() {
|
||||
return {
|
||||
//url传参严格按照当前命名
|
||||
@@ -137,7 +137,7 @@
|
||||
option: [
|
||||
{
|
||||
value: '1',
|
||||
name:this.$t('inRecentMonths3')
|
||||
name: this.$t('inRecentMonths3')
|
||||
},
|
||||
{
|
||||
value: '2',
|
||||
@@ -158,7 +158,7 @@
|
||||
{
|
||||
value: '6',
|
||||
name: this.$t('inRecentYear3')
|
||||
},
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
@@ -258,7 +258,7 @@
|
||||
eventBUs.$off('searchQuery')
|
||||
},
|
||||
methods: {
|
||||
standClick(val){
|
||||
standClick(val) {
|
||||
let newUrl = this.$router.resolve({
|
||||
path: '/docManage/library/detail',
|
||||
query: {
|
||||
@@ -316,11 +316,13 @@
|
||||
this.selectedRowKeys = []
|
||||
},
|
||||
clearSelected() {
|
||||
let endTime = ''
|
||||
if (!this.searchParmes['WarnTimeText']) {
|
||||
this.searchParmes['WarnTimeText'] = '2'
|
||||
endTime = '2099-01-01'
|
||||
} else {
|
||||
endTime = this.getNowdate()
|
||||
}
|
||||
let startTime = moment(new Date()).format('YYYY-MM-DD')
|
||||
let endTime = this.getNowdate()
|
||||
this.searchParmes['WarnTime'] = [startTime, endTime]
|
||||
this.searchParmes = { ...this.searchParmes }
|
||||
this.pageNo = 1
|
||||
@@ -341,10 +343,47 @@
|
||||
} else if (this.searchParmes['WarnTimeText'] == '4') {
|
||||
monthData = 25
|
||||
yearData = 2
|
||||
}else if (this.queryParam['WarnTimeText'] == '6') {
|
||||
} else if (this.searchParmes['WarnTimeText'] == '5') {
|
||||
monthData = 7
|
||||
yearData = -1
|
||||
} else if (this.searchParmes['WarnTimeText'] == '6') {
|
||||
monthData = 37
|
||||
yearData = 3
|
||||
}
|
||||
if (this.searchParmes['WarnTimeText'] == '5') {
|
||||
var time = new Date()
|
||||
time.setTime(time.getTime())
|
||||
var s2 = time.getFullYear() + '-' + (time.getMonth() + 1) + '-' + time.getDate()
|
||||
var monthNum = 6 //要减的月数(6)自己定义
|
||||
var dateArr = s2.split('-') //s2当前时间
|
||||
var year = dateArr[0] //获取当前日期的年份
|
||||
var month = dateArr[1] //获取当前日期的月份
|
||||
var day = dateArr[2] //获取当前日期的日
|
||||
var days = new Date(year, month, 0)
|
||||
days = days.getDate() //获取当前日期中月的天数
|
||||
var year2
|
||||
if (month < 6) {
|
||||
year2 = year - 1
|
||||
} else {
|
||||
year2 = year
|
||||
}
|
||||
var month2 = parseInt(month) - monthNum
|
||||
if (month2 <= 0) {
|
||||
year2 = parseInt(year2) - parseInt(month2 / 12 == 0 ? 1 : parseInt(month2) / 12)
|
||||
month2 = 12 - (Math.abs(month2) % 12)
|
||||
}
|
||||
var day2 = day
|
||||
var days2 = new Date(year2, month2, 0)
|
||||
days2 = days2.getDate()
|
||||
if (day2 > days2) {
|
||||
day2 = days2
|
||||
}
|
||||
if (month2 < 10) {
|
||||
month2 = '0' + month2
|
||||
}
|
||||
var t2 = year2 + '-' + month2 + '-' + day2
|
||||
return t2
|
||||
} else {
|
||||
var date_now = new Date()//获取当前时间
|
||||
var year = date_now.getFullYear()//获取当前时间的年份
|
||||
var month = date_now.getMonth()//获取当前时间的月份
|
||||
@@ -368,7 +407,10 @@
|
||||
}
|
||||
var time = year2 + '-' + month2 + '-' + day2
|
||||
return time
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
pageOnChange(page) {
|
||||
this.pageNo = page
|
||||
this.getList()
|
||||
@@ -405,27 +447,27 @@
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="less">
|
||||
@import '~@assets/less/common.less';
|
||||
@import '~@assets/less/common.less';
|
||||
|
||||
.page {
|
||||
.page {
|
||||
text-align: right;
|
||||
margin-top: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
::v-deep .ant-table-row:first-child {
|
||||
::v-deep .ant-table-row:first-child {
|
||||
background: #fff !important;
|
||||
opacity: 0.9;
|
||||
}
|
||||
}
|
||||
|
||||
::v-deep .ant-table-body {
|
||||
::v-deep .ant-table-body {
|
||||
background: transparent !important;
|
||||
}
|
||||
}
|
||||
|
||||
/deep/ .ant-table-placeholder{
|
||||
/deep/ .ant-table-placeholder {
|
||||
margin-top: 8px !important;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user