设备监控点击数据查看表格
This commit is contained in:
@ -43,22 +43,6 @@ export default {
|
||||
|
||||
}
|
||||
},
|
||||
watch:{
|
||||
dataUnit:{
|
||||
handler(newVal,oldVal){
|
||||
console.log('wacth到了dataUnit的变化',newVal,oldVal)
|
||||
this.init()
|
||||
// if(!oldVal && newVal){
|
||||
// this.init()
|
||||
// }else{
|
||||
// this.init()
|
||||
// //为了触发调用图表接口
|
||||
// this.$emit('updateDate',this.dateRange || [])
|
||||
// }
|
||||
},
|
||||
immediate: true,
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
loading:false,
|
||||
@ -73,7 +57,7 @@ export default {
|
||||
},
|
||||
methods: {
|
||||
init(){
|
||||
const {dataUnit} = this
|
||||
const {dataUnit} = this
|
||||
const timeDis= dataUnit === 3? 30 * 24 * 60 * 60 * 1000 :dataUnit === 2 ? 24 * 60 * 60 * 1000 : 60 * 60 * 1000
|
||||
const now = new Date(),formatNow = formatDate(now.getTime(),dataUnit !== 3 );
|
||||
const timeAgo = formatDate(new Date(now.getTime() - timeDis),dataUnit !== 3)
|
||||
|
||||
@ -6,11 +6,6 @@
|
||||
prop="siteIds"
|
||||
:rules="[{ required: true, message: '请选择站点' }]"
|
||||
>
|
||||
<!-- <el-checkbox-group v-model="form.siteIds">-->
|
||||
<!-- <el-checkbox v-for="(item,index) in siteList" :key="index+'zdListSearch'" :label="item.siteId" >-->
|
||||
<!-- {{ item.siteName }}-->
|
||||
<!-- </el-checkbox>-->
|
||||
<!-- </el-checkbox-group>-->
|
||||
<el-radio-group v-model="form.siteIds" >
|
||||
<el-radio v-for="(item,index) in siteList" :key="index+'zdListSearch'" :label="item.siteId">
|
||||
{{ item.siteName }}
|
||||
@ -43,13 +38,13 @@
|
||||
@select="handleSelect"
|
||||
></el-autocomplete>
|
||||
</el-form-item>
|
||||
<el-form-item label="横坐标" prop="dataUnit" :rules="[{ required: true, message: '请选择横坐标' }]">
|
||||
<el-radio-group v-model="form.dataUnit">
|
||||
<el-radio :label="1">分钟</el-radio>
|
||||
<el-radio :label="2">小时</el-radio>
|
||||
<el-radio :label="3">天</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="横坐标" prop="dataUnit" :rules="[{ required: true, message: '请选择横坐标' }]">-->
|
||||
<!-- <el-radio-group v-model="form.dataUnit">-->
|
||||
<!-- <el-radio :label="1">分钟</el-radio>-->
|
||||
<!-- <el-radio :label="2">小时</el-radio>-->
|
||||
<!-- <el-radio :label="3">天</el-radio>-->
|
||||
<!-- </el-radio-group>-->
|
||||
<!-- </el-form-item>-->
|
||||
</div>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="submitForm">生成图表</el-button>
|
||||
@ -57,8 +52,14 @@
|
||||
</el-form>
|
||||
<el-card shadow="always" class="common-card-container common-card-container-body-no-padding time-range-card">
|
||||
<div slot="header" class="time-range-header">
|
||||
<span class="card-title"></span>
|
||||
<date-time-select :data-unit="this.form.dataUnit" @initDate="((e)=>form.dataRange=e||[])" @updateDate="updateDate"/>
|
||||
<span class="card-title">
|
||||
<el-radio-group v-model="form.dataUnit">
|
||||
<el-radio :label="1">分钟</el-radio>
|
||||
<el-radio :label="2">小时</el-radio>
|
||||
<el-radio :label="3">天</el-radio>
|
||||
</el-radio-group>
|
||||
</span>
|
||||
<date-time-select ref="dateTimeSelect" :data-unit="form.dataUnit" @initDate="((e)=>form.dataRange=e||[])" @updateDate="updateDate"/>
|
||||
</div>
|
||||
<div style="height: 350px" id="searchChart"></div>
|
||||
</el-card>
|
||||
@ -92,7 +93,16 @@ export default {
|
||||
!newVal && (this.form.child = [])
|
||||
}
|
||||
},
|
||||
|
||||
'form.dataUnit':{
|
||||
handler(newVal,oldVal){
|
||||
console.log('wacth到了dataUnit的变化',newVal,oldVal)
|
||||
this.$nextTick(()=>{
|
||||
this.$refs.dateTimeSelect.init()
|
||||
this.getDate()
|
||||
})
|
||||
// this.submitForm()
|
||||
},
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
@ -318,6 +328,7 @@ export default {
|
||||
this.loading= true
|
||||
this.$nextTick(()=>{
|
||||
this.initChart()
|
||||
this.$refs.dateTimeSelect.init()
|
||||
Promise.all([this.getDeviceCategory(), this.getZdList()]).finally(()=>this.loading=false)
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user