|
|
@@ -158,7 +158,7 @@
|
|
|
<view class="time">
|
|
|
|
|
|
<view class="type">
|
|
|
- 供电时间段，在时间段里打开电源供电，超过时间段停电。
|
|
|
+ 在时间段开始时间开启电源供电，时间段结束时间停止供电。
|
|
|
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -189,6 +189,19 @@
|
|
|
<view class="progress2"> </view>
|
|
|
<view class="progress3" :style="progress3style"></view>
|
|
|
</view>
|
|
|
+ <view class="type" style=" color: #777777; margin-top: 16rpx;" >
|
|
|
+ <view></view>
|
|
|
+
|
|
|
+ </view>
|
|
|
+ <view class="type" style=" color: #777777;" v-if="switchStatus!=3">
|
|
|
+ <view v-if="switchStatus==1||switchStatus==2">设置生效后将在{{gethtml(startTime)}}供电</view>
|
|
|
+ <view v-if="switchStatus==0||switchStatus==2">设置生效后将在{{gethtml(endTime)}}停电</view>
|
|
|
+ </view>
|
|
|
+ <view class="type" style=" color: #777777;" v-else >
|
|
|
+ <view>设置生效后将在{{gethtml(startTime)}}开启“智能停电”</view>
|
|
|
+ <view>设置生效后将在{{gethtml(endTime)}}关闭“智能停电”</view>
|
|
|
+ </view>
|
|
|
+
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
@@ -254,11 +267,7 @@
|
|
|
<ujpPicker mode="time" jp="2" :default-time="endTime?'2024-1-1 '+endTime+':1':''" :defaultStartTime="startTime"
|
|
|
v-model="pickerShow2" :params="params" @confirm="pickerShow2confirm" ></ujpPicker>
|
|
|
<!-- 自定义重复 -->
|
|
|
-<<<<<<< HEAD
|
|
|
<ujpPicker2 :texts="['开启“智能停电”','停止“智能停电”']"
|
|
|
-=======
|
|
|
- <ujpPicker2 :texts="['开启"智能停电"','停止"智能停电"']"
|
|
|
->>>>>>> e73dcc9d2155f78c3385e274ba0b15e23f531c38
|
|
|
:defaultTime="startTime?'2024-1-1 '+startTime+':1':''"
|
|
|
:defaultTime2="endTime?'2024-1-1 '+endTime+':1':''"
|
|
|
|
|
|
@@ -338,7 +347,11 @@
|
|
|
import ujpPicker2 from '@/components/u-picker2.vue'
|
|
|
|
|
|
import * as API from '@/apis/pagejs/meterTimer.js'
|
|
|
-
|
|
|
+import {
|
|
|
+ hourDistanceArr,
|
|
|
+ parseUnixTime,
|
|
|
+ newDate
|
|
|
+ } from '@/apis/utils/index.js'
|
|
|
export default {
|
|
|
components: {
|
|
|
ujpPicker,ujpPicker2
|
|
|
@@ -542,6 +555,22 @@
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ gethtml(item) {
|
|
|
+ var str = parseUnixTime(new Date().getTime(), '{y}-{m}-{d}');
|
|
|
+ var time1 = new Date();
|
|
|
+ var time2 = newDate(str + ' ' + item + ':00');
|
|
|
+ var sz = []
|
|
|
+ if (time1 > time2) {
|
|
|
+ time2.setDate(time2.getDate() + 1)
|
|
|
+ sz = hourDistanceArr(time1, time2)
|
|
|
+ } else {
|
|
|
+
|
|
|
+ sz = hourDistanceArr(time1, time2)
|
|
|
+ }
|
|
|
+ console.log(sz[0])
|
|
|
+ return (sz[0] ? sz[0] + '小时' : '') + (sz[1] ? sz[1] + '分钟后' : '0分钟后')
|
|
|
+
|
|
|
+ },
|
|
|
showjp2time(time1,time2){
|
|
|
|
|
|
if(time1&&time2){
|
zhengkaixin