修改现场问题
This commit is contained in:
@@ -38,11 +38,7 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<timeindex
|
||||
:id="id"
|
||||
ref="fff"
|
||||
:interval="interval"
|
||||
></timeindex>
|
||||
<timeindex :id="id" ref="fff" :interval="interval" :pushForward="true"></timeindex>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="querfromdata" icon="el-icon-search">查询</el-button>
|
||||
@@ -93,7 +89,7 @@
|
||||
<template slot-scope="scope">
|
||||
<span>
|
||||
{{
|
||||
scope.row.number
|
||||
scope.row.number
|
||||
? scope.row.number + `次 ` + scope.row.targetName
|
||||
: scope.row.targetName
|
||||
}}
|
||||
@@ -235,7 +231,7 @@
|
||||
<script>
|
||||
import { getheight } from '../../assets/commjs/common'
|
||||
import { A, B, C, AB, BC, CA } from '../../assets/commjs/color'
|
||||
import timeindex from'@/views/cgy-components/cgytree/TimeintervalTemplat.vue'
|
||||
import timeindex from '@/views/cgy-components/cgytree/TimeintervalTemplat.vue'
|
||||
import pagination from '@/views/cgy-components/pagination/index'
|
||||
import api from '@/api/harmonic/onlineData'
|
||||
import FileSaver from 'file-saver'
|
||||
@@ -351,7 +347,7 @@ export default {
|
||||
searchBeginTime: '',
|
||||
searchEndTime: ''
|
||||
},
|
||||
interval: 4,
|
||||
interval: 5,
|
||||
device: 1,
|
||||
limit: 8,
|
||||
limit2: 8,
|
||||
@@ -554,6 +550,8 @@ export default {
|
||||
},
|
||||
mounted() {
|
||||
this.vh = window.sessionStorage.getItem('appheight') - 120
|
||||
this.$refs.fff.buttonShow=false
|
||||
this.$refs.fff.interchange(5)
|
||||
this.querfromdata()
|
||||
},
|
||||
methods: {
|
||||
@@ -693,12 +691,10 @@ export default {
|
||||
|
||||
// this.formData.searchBeginTime = this.$refs.fff.timeValue[0];
|
||||
// this.formData.searchEndTime = this.$refs.fff.timeValue[1];
|
||||
this.formData.searchBeginTime =this.$refs.fff.intervald == 5
|
||||
? this.$refs.fff.DayTime
|
||||
: this.$refs.fff.timeValue[0]
|
||||
this.formData.searchEndTime =this.$refs.fff.intervald == 5
|
||||
? this.$refs.fff.DayTime
|
||||
: this.$refs.fff.timeValue[1]
|
||||
this.formData.searchBeginTime =
|
||||
this.$refs.fff.intervald == 5 ? this.$refs.fff.DayTime : this.$refs.fff.timeValue[0]
|
||||
this.formData.searchEndTime =
|
||||
this.$refs.fff.intervald == 5 ? this.$refs.fff.DayTime : this.$refs.fff.timeValue[1]
|
||||
this.formData.condition = this.value
|
||||
this.formData.inHarmonics = this.inharmonic
|
||||
if (this.number == 111) {
|
||||
|
||||
Reference in New Issue
Block a user