|
@@ -15,8 +15,12 @@
|
|
|
<view class="card_particulars" v-for="(item,index) in humitureList" :key="index">
|
|
|
<view class="card_describe">
|
|
|
<view class="describe_title">{{item.title}}</view>
|
|
|
- <view class="describe_time">{{item.startTime}}</view>
|
|
|
- <view class="describe_time">{{item.endTime}}</view>
|
|
|
+ <!-- <view class="describe_time">{{item.startTime}}</view>
|
|
|
+ <view class="describe_time">{{item.endTime}}</view> -->
|
|
|
+ </view>
|
|
|
+ <view class="dateTime_card" style="margin: 20rpx 10rpx;">
|
|
|
+ <uni-datetime-picker v-model="item.datetimeRange" type="datetimerange"
|
|
|
+ @change="changeDatetime($event,item)" />
|
|
|
</view>
|
|
|
<view class="humiture_details" @click="foldingPanel(item)">
|
|
|
<view class="title_details">温湿度</view>
|
|
@@ -26,8 +30,9 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<view v-show="item.collapseil">
|
|
|
- <x-humiture ref="humiture" :taskId="item.id" :waybillNo="orderList.waybillNo"
|
|
|
- :current="item.presentNum" :probeList="item.deviceSensorList"></x-humiture>
|
|
|
+ <x-humiture ref="humiture" :startTime="item.datetimeRange[0]" :endTime="item.datetimeRange[1]"
|
|
|
+ :taskId="item.id" :waybillNo="orderList.waybillNo" :current="item.presentNum"
|
|
|
+ :probeList="item.deviceSensorList"></x-humiture>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
@@ -128,7 +133,8 @@
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
- }
|
|
|
+ },
|
|
|
+ datetimeRange: [],
|
|
|
}
|
|
|
},
|
|
|
mounted() {
|
|
@@ -148,14 +154,19 @@
|
|
|
waybillNo: this.orderList.waybillNo,
|
|
|
}).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
- this.humitureList = res.data.list
|
|
|
+ this.humitureList = JSON.parse(JSON.stringify(res.data.list))
|
|
|
this.humitureList.forEach((item, index) => {
|
|
|
item.title = ''
|
|
|
item.collapseil = false
|
|
|
+ item.datetimeRange = []
|
|
|
+ item.datetimeRange.push(item.startTime)
|
|
|
+ item.datetimeRange.push(item.endTime)
|
|
|
if (item.car.id) {
|
|
|
item.title = item.car.carNo
|
|
|
} else if (item.warehouse.id) {
|
|
|
item.title = item.warehouse.name
|
|
|
+ } else if (item.coolerBox.id) {
|
|
|
+ item.title = item.coolerBox.name
|
|
|
}
|
|
|
})
|
|
|
}
|
|
@@ -168,7 +179,7 @@
|
|
|
if (item.collapseil) {
|
|
|
item.collapseil = false
|
|
|
} else {
|
|
|
- this.$refs.humiture[index].getlist(item.deviceSensorList[0].T_id)
|
|
|
+ this.$refs.humiture[index].getlistil(item.deviceSensorList[0].T_id)
|
|
|
item.collapseil = true
|
|
|
}
|
|
|
}
|
|
@@ -184,7 +195,7 @@
|
|
|
change(e) {
|
|
|
if (e[0].status == 'open') {
|
|
|
this.humitureList.forEach((item, index) => {
|
|
|
- this.$refs.humiture[index].getlist(item.deviceSensorList[0].T_id)
|
|
|
+ this.$refs.humiture[index].getlistil(item.deviceSensorList[0].T_id)
|
|
|
})
|
|
|
}
|
|
|
},
|
|
@@ -236,6 +247,44 @@
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ // 时间范围选择
|
|
|
+ changeDatetime(value, item) {
|
|
|
+ this.humitureList.forEach((item1, index) => {
|
|
|
+ if (item1.id == item.id) {
|
|
|
+ setTimeout(() => {
|
|
|
+ item.datetimeRange = value
|
|
|
+ // this.getDatas()
|
|
|
+ this.$refs.humiture[index].getlistil(item.deviceSensorList[0].T_id)
|
|
|
+ }, 500)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ this.$forceUpdate()
|
|
|
+ },
|
|
|
+ getDateTime(date, addZero = true) {
|
|
|
+ return `${this.getDate(date, addZero)} ${this.getTime(date, addZero)}`
|
|
|
+ },
|
|
|
+ getDate(date, addZero = true) {
|
|
|
+ date = new Date(date)
|
|
|
+ const year = date.getFullYear()
|
|
|
+ const month = date.getMonth() + 1
|
|
|
+ const day = date.getDate()
|
|
|
+ return `${year}-${addZero ? this.addZero(month) : month}-${addZero ? this.addZero(day) : day}`
|
|
|
+ },
|
|
|
+ getTime(date, addZero = true) {
|
|
|
+ date = new Date(date)
|
|
|
+ const hour = date.getHours()
|
|
|
+ const minute = date.getMinutes()
|
|
|
+ const second = date.getSeconds()
|
|
|
+ return this.hideSecond ?
|
|
|
+ `${addZero ? this.addZero(hour) : hour}:${addZero ? this.addZero(minute) : minute}` :
|
|
|
+ `${addZero ? this.addZero(hour) : hour}:${addZero ? this.addZero(minute) : minute}:${addZero ? this.addZero(second) : second}`
|
|
|
+ },
|
|
|
+ addZero(num) {
|
|
|
+ if (num < 10) {
|
|
|
+ num = `0${num}`
|
|
|
+ }
|
|
|
+ return num
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
@@ -304,4 +353,8 @@
|
|
|
width: 80%;
|
|
|
height: 500rpx;
|
|
|
}
|
|
|
+
|
|
|
+ .dateTime_card ::v-deep .icon-calendar {
|
|
|
+ display: none;
|
|
|
+ }
|
|
|
</style>
|