|
|
@@ -23,47 +23,51 @@
|
|
|
</view>
|
|
|
<view class="wormtime">
|
|
|
<view class="wormtime_item">
|
|
|
- <image src="../../../../static/images/cb/shijianqi.png" mode="" class="img"></image>
|
|
|
+ <image src="../../../static/images/cb/shijianqi.png" mode="" class="img"></image>
|
|
|
<p>始见期</p>
|
|
|
<p>{{timeobj.startTime}}</p>
|
|
|
</view>
|
|
|
<view class="wormtime_item">
|
|
|
- <image src="../../../../static/images/cb/gaofengqi.png" mode="" class="img"></image>
|
|
|
+ <image src="../../../static/images/cb/gaofengqi.png" mode="" class="img"></image>
|
|
|
<p>高峰期</p>
|
|
|
<p>{{timeobj.highTime}}</p>
|
|
|
<p>数量：{{timeobj.highNum}}头</p>
|
|
|
</view>
|
|
|
<view class="wormtime_item">
|
|
|
- <image src="../../../../static/images/cb/zhongjianqi.png" mode="" class="img"></image>
|
|
|
+ <image src="../../../static/images/cb/zhongjianqi.png" mode="" class="img"></image>
|
|
|
<p>终见期</p>
|
|
|
<p>{{timeobj.endTime}}</p>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="selecttimes" @click="tiemshow=!tiemshow">
|
|
|
- <view class="" style="line-height: 28px;">
|
|
|
- 时间选择器
|
|
|
- </view>
|
|
|
- <view class="timesbox">
|
|
|
- <!-- <image
|
|
|
+ <view class="" style="line-height: 28px;">
|
|
|
+ 日期
|
|
|
+ </view>
|
|
|
+ <view class="timesbox">
|
|
|
+ <!-- <image
|
|
|
:src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
|
|
|
mode=""></image> -->
|
|
|
- <p>{{timetab(oldtime)}}</p>
|
|
|
- <p class="or">至</p>
|
|
|
- <p>{{timetab(newtime)}}</p>
|
|
|
- <!-- <u-icon name="rili" custom-prefix="custom-icon" class="icon"></u-icon> -->
|
|
|
- </view>
|
|
|
+ <p>{{oldtime}}</p>
|
|
|
+ <p class="or">至</p>
|
|
|
+ <p>{{newtime}}</p>
|
|
|
+ <!-- <u-icon name="rili" custom-prefix="custom-icon" class="icon"></u-icon> -->
|
|
|
+ </view>
|
|
|
+ <u-button type="primary" text="归档时间" size="mini" @click="timeshow = true">归档时间</u-button>
|
|
|
+ </view>
|
|
|
+ <view class="pickerBox">
|
|
|
<u-calendar v-model="tiemshow" mode="range" @change="tiemchange"></u-calendar>
|
|
|
+ <u-select v-model="timeshow" mode="mutil-column" :list="list" @confirm="Hourchange" :default-value="defaultValue"></u-select>
|
|
|
</view>
|
|
|
- <view class="tendency">
|
|
|
- <canvas canvas-id="canvasColumnA" id="canvasColumnA" class="charts" @touchstart="touchLineA($event)" v-show="chartstf"
|
|
|
+ <view class="tendency" v-show="!tiemshow && !timeshow && !pickertfone && !pickertfworm">
|
|
|
+ <canvas canvas-id="canvasColumnA" id="canvasColumnA" class="charts" @touchstart="touchLineA($event)"
|
|
|
@touchmove="moveLineA($event)" @touchend="touchEndLineA($event)" disable-scroll=true
|
|
|
:style="{'width':cWidth*pixelRatio+'px','height':cHeight*pixelRatio+'px', 'transform': 'scale('+(1/pixelRatio)+')','margin-left':-cWidth*(pixelRatio-1)/2+'px','margin-top':-cHeight*(pixelRatio-1)/2+'px'}"></canvas>
|
|
|
</view>
|
|
|
- <view class="tendency">
|
|
|
- <canvas canvas-id="canvasRing" id="canvasRing" class="charts" @touchstart="touchRing" v-show="chartstf"
|
|
|
+ <view class="tendency" v-show="!tiemshow && !timeshow && !pickertfone && !pickertfworm">
|
|
|
+ <canvas canvas-id="canvasRing" id="canvasRing" class="charts" @touchstart="touchRing"
|
|
|
:style="{'width':cWidth*pixelRatio+'px','height':cHeight*pixelRatio+'px', 'transform': 'scale('+(1/pixelRatio)+')','margin-left':-cWidth*(pixelRatio-1)/2+'px','margin-top':-cHeight*(pixelRatio-1)/2+'px'}"></canvas>
|
|
|
</view>
|
|
|
- <view class="tendency_pro">
|
|
|
+ <view class="tendency_pro" v-show="!tiemshow && !timeshow && !pickertfone && !pickertfworm">
|
|
|
<view class="" v-for="(item,index) in progresslist">
|
|
|
<span>{{index+1}}、{{item.name}}</span>
|
|
|
<u-line-progress :active-color="colorlist[index%6]"
|
|
|
@@ -71,7 +75,7 @@
|
|
|
<span>{{Number((item.data/pestsum*100).toFixed(2))}}%</span>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="tablebox">
|
|
|
+ <view class="tablebox" v-show="!tiemshow && !timeshow && !pickertfone && !pickertfworm">
|
|
|
<view class="top_text">
|
|
|
<view :class="topindex==index?'title_text_color':'tltle_text'" v-for="(item,index) in toptext"
|
|
|
:key="index" @click="changeindex(index)">
|
|
|
@@ -122,7 +126,7 @@
|
|
|
<button @click="next" :disabled=" page == pagesum ">下一页</button>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <u-modal v-model="show" :mask-close-able="true" @confirm="modalconfirm" title="24小时数据">
|
|
|
+ <u-modal v-model="show" :mask-close-able="true" title="24小时数据">
|
|
|
<view class="modalbox">
|
|
|
<p v-for="(item,key) in pest_dict">{{key}}--{{pest_dict[key]}}头</p>
|
|
|
</view>
|
|
|
@@ -141,6 +145,206 @@
|
|
|
d_id: "",
|
|
|
oldtime: "",
|
|
|
newtime: "",
|
|
|
+ sp_hour_st: '00:00', // 归档开始时间
|
|
|
+ sp_hour_ed: '00:00', // 归档结束时间
|
|
|
+ timeshow: false, // 归档时间设置弹框
|
|
|
+ defaultValue:[0,0],
|
|
|
+ list: [
|
|
|
+ [{
|
|
|
+ value: '00:00',
|
|
|
+ label: '00时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '01:00',
|
|
|
+ label: '01时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '02:00',
|
|
|
+ label: '02时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '03:00',
|
|
|
+ label: '03时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '04:00',
|
|
|
+ label: '04时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '05:00',
|
|
|
+ label: '05时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '06:00',
|
|
|
+ label: '06时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '07:00',
|
|
|
+ label: '07时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '08:00',
|
|
|
+ label: '08时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '09:00',
|
|
|
+ label: '09时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '10:00',
|
|
|
+ label: '10时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '11:00',
|
|
|
+ label: '11时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '12:00',
|
|
|
+ label: '12时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '13:00',
|
|
|
+ label: '13时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '14:00',
|
|
|
+ label: '14时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '15:00',
|
|
|
+ label: '15时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '16:00',
|
|
|
+ label: '16时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '17:00',
|
|
|
+ label: '17时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '18:00',
|
|
|
+ label: '18时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '19:00',
|
|
|
+ label: '19时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '20:00',
|
|
|
+ label: '20时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '21:00',
|
|
|
+ label: '21时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '22:00',
|
|
|
+ label: '22时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '23:00',
|
|
|
+ label: '23时'
|
|
|
+ },
|
|
|
+ ],
|
|
|
+ [{
|
|
|
+ value: '00:00',
|
|
|
+ label: '00时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '01:00',
|
|
|
+ label: '01时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '02:00',
|
|
|
+ label: '02时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '03:00',
|
|
|
+ label: '03时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '04:00',
|
|
|
+ label: '04时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '05:00',
|
|
|
+ label: '05时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '06:00',
|
|
|
+ label: '06时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '07:00',
|
|
|
+ label: '07时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '08:00',
|
|
|
+ label: '08时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '09:00',
|
|
|
+ label: '09时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '10:00',
|
|
|
+ label: '10时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '11:00',
|
|
|
+ label: '11时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '12:00',
|
|
|
+ label: '12时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '13:00',
|
|
|
+ label: '13时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '14:00',
|
|
|
+ label: '14时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '15:00',
|
|
|
+ label: '15时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '16:00',
|
|
|
+ label: '16时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '17:00',
|
|
|
+ label: '17时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '18:00',
|
|
|
+ label: '18时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '19:00',
|
|
|
+ label: '19时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '20:00',
|
|
|
+ label: '20时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '21:00',
|
|
|
+ label: '21时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '22:00',
|
|
|
+ label: '22时'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '23:00',
|
|
|
+ label: '23时'
|
|
|
+ },
|
|
|
+ ],
|
|
|
+ ],
|
|
|
tiemshow: false,
|
|
|
cWidth: '350',
|
|
|
cHeight: '350',
|
|
|
@@ -150,6 +354,7 @@
|
|
|
yearlist: [],
|
|
|
yserindex: "",
|
|
|
pickertfworm: false,
|
|
|
+ pickertfworm: false,
|
|
|
wormvalue: "",
|
|
|
wormlist: [],
|
|
|
wormindex: "",
|
|
|
@@ -182,22 +387,9 @@
|
|
|
forbidden1: false,
|
|
|
forbidden2: false,
|
|
|
show: false,
|
|
|
- pest_dict: {},
|
|
|
- chartstf:true
|
|
|
+ pest_dict: {}
|
|
|
}
|
|
|
},
|
|
|
- watch:{
|
|
|
- pickertfone:function(e){
|
|
|
- console.log(e)
|
|
|
- this.chartstf = !e
|
|
|
- },
|
|
|
- tiemshow:function(e){
|
|
|
- this.chartstf = !e
|
|
|
- },
|
|
|
- pickertfworm:function(e){
|
|
|
- this.chartstf = !e
|
|
|
- },
|
|
|
- },
|
|
|
methods: {
|
|
|
getyear() {
|
|
|
var Year = new Date().getFullYear();
|
|
|
@@ -216,6 +408,7 @@
|
|
|
d_ids: this.d_id,
|
|
|
identify_model: 'A',
|
|
|
year: this.yservalue,
|
|
|
+ device_type: 'xct'
|
|
|
}
|
|
|
})
|
|
|
console.log(res)
|
|
|
@@ -249,7 +442,10 @@
|
|
|
d_ids: this.d_id,
|
|
|
identify_model: 'A',
|
|
|
start_time: this.oldtime,
|
|
|
- end_time: this.newtime
|
|
|
+ end_time: this.newtime,
|
|
|
+ sp_hour_st: this.sp_hour_st,
|
|
|
+ sp_hour_ed: this.sp_hour_ed,
|
|
|
+ device_type: 'xct'
|
|
|
}
|
|
|
})
|
|
|
// console.log(res)
|
|
|
@@ -298,13 +494,40 @@
|
|
|
if (res.at_ah_info.length != 0) {
|
|
|
var aharr = []
|
|
|
var atarr = []
|
|
|
+ var pestArr = []
|
|
|
+ let indentText = 0;
|
|
|
for (var i = 0; i < res.at_ah_info.length; i++) {
|
|
|
var times = new Date(res.at_ah_info[i].addtime * 1000)
|
|
|
- xtitle.push(times.getMonth() + 1 + "/" + times.getDate() + "-" + times.getHours() + ":" +
|
|
|
- times.getSeconds())
|
|
|
+ xtitle.push(times.getMonth() + 1 + "/" + times.getDate())
|
|
|
atarr.push(res.at_ah_info[i].at == "" ? "0" : res.at_ah_info[i].at)
|
|
|
aharr.push(res.at_ah_info[i].ah == "" ? "0" : res.at_ah_info[i].ah)
|
|
|
+ if (this.checkObj(res.char_data) && res.char_data[this.wormvalue]) {
|
|
|
+ if (res.char_data[this.wormvalue][i - indentText] && (res.char_data[this.wormvalue][i -
|
|
|
+ indentText
|
|
|
+ ].addtime == res.at_ah_info[i].addtime)) {
|
|
|
+ pestArr.push(res.char_data[this.wormvalue][i - indentText].sum)
|
|
|
+ } else {
|
|
|
+ indentText++
|
|
|
+ pestArr.push(null)
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
+ // console.log(this.wormvalue)
|
|
|
+ // if (this.checkObj(res.char_data)) {
|
|
|
+ // for (var key in res.char_data) {
|
|
|
+ // if (this.wormvalue == key) {
|
|
|
+ // var wormobj = {
|
|
|
+ // name: key,
|
|
|
+ // data: [],
|
|
|
+ // }
|
|
|
+ // for (var i = 0; i < res.char_data[key].length; i++) {
|
|
|
+ // wormobj.data.push(res.char_data[key][i].ah == "" ? "0" : res.char_data[key][i].sum)
|
|
|
+ // }
|
|
|
+ // obj.push(wormobj)
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+
|
|
|
+ // }
|
|
|
var atobj = {
|
|
|
name: '温度',
|
|
|
data: atarr,
|
|
|
@@ -315,24 +538,13 @@
|
|
|
data: aharr,
|
|
|
color: '#6CBBFF'
|
|
|
}
|
|
|
+ var pestObj = {
|
|
|
+ name: this.wormvalue,
|
|
|
+ data: pestArr,
|
|
|
+ }
|
|
|
obj.push(atobj)
|
|
|
obj.push(ahobj)
|
|
|
- }
|
|
|
- // console.log(this.wormvalue)
|
|
|
- if (this.checkObj(res.char_data)) {
|
|
|
- for (var key in res.char_data) {
|
|
|
- if (this.wormvalue == key) {
|
|
|
- var wormobj = {
|
|
|
- name: key,
|
|
|
- data: [],
|
|
|
- }
|
|
|
- for (var i = 0; i < res.char_data[key].length; i++) {
|
|
|
- wormobj.data.push(res.char_data[key][i].ah == "" ? "0" : res.char_data[key][i].sum)
|
|
|
- }
|
|
|
- obj.push(wormobj)
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
+ obj.push(pestObj)
|
|
|
}
|
|
|
this.showColumn("canvasColumnA", xtitle, obj)
|
|
|
},
|
|
|
@@ -344,8 +556,10 @@
|
|
|
},
|
|
|
tiemchange(e) {
|
|
|
console.log(e)
|
|
|
- this.oldtime = +new Date(e.startDate) / 1000 - 8 * 60 * 60
|
|
|
- this.newtime = +new Date(e.endDate) / 1000 + 16 * 60 * 60 - 1
|
|
|
+ // this.oldtime = +new Date(e.startDate) / 1000 - 8 * 60 * 60
|
|
|
+ // this.newtime = +new Date(e.endDate) / 1000 + 16 * 60 * 60 - 1
|
|
|
+ this.newtime = e.endDate;
|
|
|
+ this.oldtime = e.startDate;
|
|
|
// newtime: "",
|
|
|
console.log(this.oldtime, this.newtime)
|
|
|
this.page = 1
|
|
|
@@ -355,6 +569,15 @@
|
|
|
} else if (this.topindex == 1) {
|
|
|
this.gettabledata2()
|
|
|
}
|
|
|
+ },
|
|
|
+ Hourchange(e) {
|
|
|
+ this.sp_hour_st = e[0].value;
|
|
|
+ this.sp_hour_ed = e[1].value;
|
|
|
+ // 本地缓存
|
|
|
+ uni.setStorageSync('sp_hour_st_xc', this.sp_hour_st);
|
|
|
+ uni.setStorageSync('sp_hour_ed_xc', this.sp_hour_ed);
|
|
|
+ this.getyear();
|
|
|
+ console.log(e)
|
|
|
},
|
|
|
timetab(e) {
|
|
|
e = new Date(e * 1000)
|
|
|
@@ -461,7 +684,10 @@
|
|
|
identify_model: 'A',
|
|
|
start_time: this.oldtime,
|
|
|
end_time: this.newtime,
|
|
|
- page: this.page
|
|
|
+ sp_hour_st: this.sp_hour_st,
|
|
|
+ sp_hour_ed: this.sp_hour_ed,
|
|
|
+ page: this.page,
|
|
|
+ device_type: 'xct'
|
|
|
}
|
|
|
})
|
|
|
this.pagesum = Math.ceil(res.total_count / 10)
|
|
|
@@ -481,6 +707,8 @@
|
|
|
identify_model: 'A',
|
|
|
start_time: this.oldtime,
|
|
|
end_time: this.newtime,
|
|
|
+ sp_hour_st: this.sp_hour_st,
|
|
|
+ sp_hour_ed: this.sp_hour_ed,
|
|
|
page: this.page
|
|
|
}
|
|
|
})
|
|
|
@@ -523,9 +751,6 @@
|
|
|
this.show = true
|
|
|
this.pest_dict = data
|
|
|
},
|
|
|
- modalconfirm(){
|
|
|
- this.pest_dict = {}
|
|
|
- },
|
|
|
examine(url) {
|
|
|
var imgarr = [url]
|
|
|
uni.previewImage({
|
|
|
@@ -536,9 +761,12 @@
|
|
|
},
|
|
|
onLoad(option) {
|
|
|
this.d_id = option.d_id
|
|
|
- var date = +new Date() / 1000
|
|
|
- this.oldtime = Math.floor(date - 24 * 60 * 60)
|
|
|
- this.newtime = Math.floor(date)
|
|
|
+ var date = +new Date()
|
|
|
+ this.oldtime = this.formatTime(date, 'yyyy-MM-dd');
|
|
|
+ this.newtime = this.formatTime(date, 'yyyy-MM-dd');
|
|
|
+ this.sp_hour_st = uni.getStorageSync('sp_hour_st_xc') == '' ? '00:00' : uni.getStorageSync('sp_hour_st_xc');
|
|
|
+ this.sp_hour_ed = uni.getStorageSync('sp_hour_ed_xc') == '' ? '00:00' : uni.getStorageSync('sp_hour_ed_xc');
|
|
|
+ this.defaultValue=[this.sp_hour_st.substring(0, 1) == '0' ? this.sp_hour_st.substring(1, 2): this.sp_hour_st.substring(0, 2), this.sp_hour_ed.substring(0, 1) == '0' ? this.sp_hour_ed.substring(1, 2): this.sp_hour_ed.substring(0, 2)]
|
|
|
this.cWidth = uni.upx2px(650);
|
|
|
this.cHeight = uni.upx2px(500);
|
|
|
this.getyear()
|
|
|
@@ -559,7 +787,12 @@
|
|
|
background-color: #f1f4ff;
|
|
|
padding-top: 10px;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
+ .pickerBox{
|
|
|
+ position: relative;
|
|
|
+ background: #FFFFFF;
|
|
|
+ z-index: 10;
|
|
|
+ }
|
|
|
.selecttimes {
|
|
|
// box-shadow: 0 0 10rpx #bcb9ca;
|
|
|
// padding: 10rpx 20rpx;
|
|
|
@@ -568,7 +801,9 @@
|
|
|
margin: 10px auto 0;
|
|
|
display: flex;
|
|
|
background-color: #fff;
|
|
|
+ justify-content: space-between;
|
|
|
width: 95%;
|
|
|
+
|
|
|
.timesbox {
|
|
|
display: flex;
|
|
|
justify-content: space-around;
|
|
|
@@ -578,21 +813,22 @@
|
|
|
padding: 5px;
|
|
|
font-size: 12px;
|
|
|
border-radius: 5px;
|
|
|
+
|
|
|
image {
|
|
|
width: 30rpx;
|
|
|
height: 30rpx;
|
|
|
margin-top: 6rpx;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.icon {
|
|
|
color: #949494;
|
|
|
text-align: right;
|
|
|
margin-left: 30rpx;
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.wormtime {
|
|
|
width: 95%;
|
|
|
padding: 10px;
|
|
|
@@ -700,8 +936,8 @@
|
|
|
text-overflow: ellipsis; //...
|
|
|
}
|
|
|
|
|
|
- /deep/.u-progress {
|
|
|
- width: calc(100% - 150px) !important;
|
|
|
+ .u-progress {
|
|
|
+ width: calc(100% - 150px);
|
|
|
}
|
|
|
|
|
|
span:last-child {
|
