xinyi/kaiguan-zfb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

开关代理模式新增 时间待调

Browse Source
This commit is contained in:
3321822538@qq.com 2024-11-05 18:03:35 +08:00
parent a5628ff71d
commit 5f5562ebe1
9 changed files with 168 additions and 360 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
page_components/bindszthr.vue
View File

@ -154,7 +154,8 @@
countdown: 10, // 初始倒计时时间
intervalId: null,
contwz:'',
sn:''
sn:'',
arrlists:[]
}
},
onLoad(option) {
@ -306,6 +307,8 @@
this.$u.get("/app/device/" + id).then((res) => {
if (res.code == 200) {
this.listobj = res.data
this.arrlists.push(res.data)
uni.setStorageSync('tcidlist', this.arrlists)
}
})
},

19
page_components/eletj.vue
View File

@ -343,6 +343,7 @@
computed: {
// 计算剩余时间
formattedTime() {
// console.log(this.timeday,'00000');
if (this.timeday.days > 0) {
// 只展示天和小时
return `${this.timeday.days}天${this.timeday.hours}小时`
@ -400,7 +401,7 @@
}, 1000)
},
onHide() {
this.stopTimer();
// this.stopTimer();
},
beforeDestroy() {
// 组件销毁前清除定时器，防止内存泄漏
@ -615,6 +616,7 @@
// 点击进行强刷数据
shuaxin(txt){
// this.timeday = ''
this.$u.get(`/app/device/${this.sbid}/refreshIot`).then((res) => {
if(res.code == 200){
this.getDevice()
@ -1158,7 +1160,10 @@
clearInterval(this.timerId)
}
// 设置定时器，每分钟执行一次 timerCallback 函数
this.timerId = setInterval(this.getDevice, 60000)
// this.timerId = setInterval(this.getDevice,this.shuaxin, 60000)
this.timerId = setInterval(() => {
this.shuaxin()
}, 60000);
},
// 销毁定时器
stopTimer() {
@ -1208,14 +1213,16 @@
if (this.detaobj.suitExpireTime == null) {
this.timeday = 0
} else {
let expireTimeStr = this.detaobj.suitExpireTime
let expireTimeStr = ''
expireTimeStr = this.detaobj.suitExpireTime
let expireTimeParts = expireTimeStr.split(" ")
let expireDateParts = expireTimeParts[0].split("-")
let expireTimePartsTime = expireTimeParts[1].split(":")
let expireDate = new Date(expireDateParts[0], expireDateParts[1] - 1, expireDateParts[
2], expireTimePartsTime[0], expireTimePartsTime[1], expireTimePartsTime[2])
let expireDate = new Date(expireDateParts[0], expireDateParts[1] - 1, expireDateParts[2], expireTimePartsTime[0], expireTimePartsTime[1], expireTimePartsTime[2])
let now = new Date()
let differenceInMs = expireDate - now;
let differenceInMs = expireDate - now
console.log(differenceInMs,expireDate,now,this.formatMilliseconds(differenceInMs),'101010');
this.timeday == ''
if (differenceInMs <= 0) {
this.timeday = 0
} else {

150
page_components/fuwu/index.vue
View File

@ -206,7 +206,8 @@
userId:'',
hasCalledGetczly:false,
hasCalledGetczlys:false,
hasCalledGetczlyss:false
hasCalledGetczlyss:false,
arrlists:[]
}
},
onLoad(option) {
@ -284,15 +285,17 @@
})
},
methods: {
// 点击我已知晓
// 点击我已知晓判断设备是否有套餐
btnswindleflag(){
this.swindleflag = false
if(this.userId == this.deviceobj.userId && this.deviceobj.suitList.length == 0){
let that = this
uni.showModal({
title: '提示',
content: '该设备暂无套餐,是否前去配置？',
success: function(res) {
if (res.confirm) {
uni.setStorageSync('tcidlist', that.arrlists)
uni.navigateTo({
url: '/page_components/newtaocan'
})
@ -331,6 +334,8 @@
if (res.code == 200) {
that.$u.get(`/app/device/${that.id}/bySn`).then((res) => {
if (res.code == 200) {
that.arrlists.push(res.data)
console.log(that.arrlists);
that.mac = 'CTKG-' + res.data.mac
that.onlineStatus = res.data.onlineStatus
}
@ -796,39 +801,6 @@
// })
}
})
// this.czflag = true
// let that = this
// xBlufi.initXBlufi(1);
// xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEvents);
// xBlufi.notifyStartDiscoverBle({
// 'isStart': true
// })
// setTimeout(() => {
// xBlufi.notifyStartDiscoverBle({
// 'isStart': false
// })
// if (that.devicesList.length > 0) {
// xBlufi.notifyConnectBle({
// isStart: true,
// deviceId: that.deviceId,
// name: that.name
// })
// }
// }, 2000)
// setTimeout(()=>{
// if(this.ver_data == ''){
// uni.showToast({
// title: '未连接成功，如多次失败请点击右上角联系客服咨询',
// icon: 'none',
// duration: 5000
// })
// this.czflag = false
// this.zhifuflag = false
// setTimeout(()=>{
// uni.hideLoading()
// },5000)
// }
// },10000)
}
})
} else {
@ -932,38 +904,6 @@
// })
}
})
// that.czflag = true
// xBlufi.initXBlufi(1);
// xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEventss);
// xBlufi.notifyStartDiscoverBle({
// 'isStart': true
// })
// setTimeout(() => {
// xBlufi.notifyStartDiscoverBle({
// 'isStart': false
// })
// if (that.devicesList.length > 0) {
// xBlufi.notifyConnectBle({
// isStart: true,
// deviceId: that.deviceId,
// name: that.name
// })
// }
// }, 2000)
// setTimeout(()=>{
// if(that.ver_data == ''){
// uni.showToast({
// title: '未连接成功，如多次失败请点击右上角联系客服咨询',
// icon: 'none',
// duration: 5000
// })
// that.czflag = false
// that.zhifuflag = false
// setTimeout(()=>{
// uni.hideLoading()
// },5000)
// }
// },10000)
}
})
if(that.ver_data != ''){
@ -1139,38 +1079,6 @@
// })
}
})
// that.czflag = true
// xBlufi.initXBlufi(1);
// xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEvents);
// xBlufi.notifyStartDiscoverBle({
// 'isStart': true
// })
// setTimeout(() => {
// xBlufi.notifyStartDiscoverBle({
// 'isStart': false
// })
// if (that.devicesList.length > 0) {
// xBlufi.notifyConnectBle({
// isStart: true,
// deviceId: that.deviceId,
// name: that.name
// })
// }
// }, 2000)
// setTimeout(()=>{
// if(that.ver_data == ''){
// uni.showToast({
// title: '未连接成功，如多次失败请点击右上角联系客服咨询',
// icon: 'none',
// duration: 5000
// })
// that.czflag = false
// that.zhifuflag = false
// setTimeout(()=>{
// uni.hideLoading()
// },5000)
// }
// },10000)
}
})
} else {
@ -1305,53 +1213,9 @@
// })
}
})
// that.czflag = true
// xBlufi.initXBlufi(1);
// xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEventss);
// xBlufi.notifyStartDiscoverBle({
// 'isStart': true
// })
// setTimeout(() => {
// xBlufi.notifyStartDiscoverBle({
// 'isStart': false
// })
// if (that.devicesList.length > 0) {
// xBlufi.notifyConnectBle({
// isStart: true,
// deviceId: that.deviceId,
// name: that.name
// })
// }
// }, 2000)
// setTimeout(()=>{
// if(that.ver_data == ''){
// uni.showToast({
// title: '未连接成功，如多次失败请点击右上角联系客服咨询',
// icon: 'none',
// duration: 5000
// })
// that.czflag = false
// that.zhifuflag = false
// setTimeout(()=>{
// uni.hideLoading()
// },5000)
// }else{
// uni.showToast({
// title: '未连接成功，如多次失败请点击右上角联系客服咨询',
// icon: 'none',
// duration: 5000
// })
// that.czflag = false
// that.zhifuflag = false
// setTimeout(()=>{
// uni.hideLoading()
// },5000)
// }
// },10000)
}
})
} else {
console.log('手机未连接网络')
// this.baiflag = false

6
page_components/shebeixz.vue
View File

@ -72,6 +72,7 @@
onLoad(option) {
uni.removeStorageSync('tcidlist')
this.shu = option.shu
this.deviceId = option.id
if(option.title == '确定'){
this.titflag = '确定'
@ -215,7 +216,7 @@
let data = {
pageNum: 1,
pageSize: 99,
modelTag:this.shu
// modelTag:this.shu
}
this.$u.get(`/app/device/list`, data).then((res) => {
if (res.code == 200) {
@ -231,7 +232,6 @@
}else{
this.getao()
}
// console.log(this.list);
this.loading = true
}else{
@ -239,7 +239,7 @@
}
}
});
})
},
}

61
page_components/shiming.vue
View File

@ -133,26 +133,49 @@
url:'/page_user/yetx'
})
},
btnyz() {
let data = {
realName: this.name,
realIdCard: this.names,
type:this.type
}
this.$u.put('/app/user/realName', data).then(res => {
if (res.code == 200) {
let https = encodeURIComponent(res.data.jumpUrl)
uni.navigateTo({
url: '/pages/sjshiming?https=' + https
})
} else {
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
})
}
})
function isAgeOver18(idCard) {
// 提取出生年份
const birthYear = idCard.substr(6, 4); // 身份证号码的第7到第10位是出生年份
// 获取当前年份
const currentYear = new Date().getFullYear();
// 计算年龄
const age = currentYear - parseInt(birthYear, 10);
// 判断是否年满18岁
return age >= 18;
}
const idCard = this.names
// 调用函数并输出结果
if (isAgeOver18(idCard)) {
console.log('身份证对应的用户已年满18岁');
let data = {
realName: this.name,
realIdCard: this.names,
type:this.type
}
this.$u.put('/app/user/realName', data).then(res => {
if (res.code == 200) {
let https = encodeURIComponent(res.data.jumpUrl)
uni.navigateTo({
url: '/pages/sjshiming?https=' + https
})
} else {
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
})
}
})
} else {
console.log('身份证对应的用户未满18岁');
uni.showToast({
title: '实名认证需年满18岁',
icon: 'none',
duration: 2000
})
}
}
}

15
page_fenbao/statulist/taocanlist/addtaocan/index.vue
View File

@ -471,6 +471,21 @@
this.getxieyi()
if (uni.getStorageSync('tcidlist')) {
this.deviceList = uni.getStorageSync('tcidlist')
function uniqueByProperty(arr, prop) {
const seen = new Set();
return arr.filter(item => {
const val = item[prop];
if (seen.has(val)) {
return false;
} else {
seen.add(val);
return true;
}
});
}
// 使用该函数对 this.deviceList 进行去重，假设我们基于 'id' 属性进行去重
this.deviceList = uniqueByProperty(this.deviceList, 'id');
console.log(this.deviceList)
}
setTimeout(() => {
if (this.suitId) {

84
pages/daili/dailibing.vue
View File

@ -27,16 +27,16 @@
<view class="li" @click.stop="sremakemc()">
<view class="tit">
设备名称
服务费费率
</view>
<view class="info">
<view class="txt">
{{listobj.deviceName}}
{{listobj.agentServiceRate == undefined ? '--' : listobj.agentServiceRate + '%'}}
</view>
<view class="iconfont icon-xiangyou1"></view>
</view>
</view>
<view class="li" @click.stop="sremake()">
<!-- <view class="li" @click.stop="sremake()">
<view class="tit">
备注（代理）
</view>
@ -46,14 +46,15 @@
</view>
<view class="iconfont icon-xiangyou1"></view>
</view>
</view>
<view class="li" @click.stop="sremakes()">
</view> -->
<!-- @click.stop="sremakes()" -->
<view class="li">
<view class="tit">
所属商户
</view>
<view class="info">
<view class="txt">
{{listobj.storeName == null ? '' : listobj.storeName}}
{{listobj.userName == null ? '' : listobj.userName}}
</view>
<!-- <view class="iconfont icon-xiangyou1"></view> -->
</view>
@ -164,7 +165,7 @@
<u-popup v-model="showmc" mode="center" border-radius='20'>
<view class="popcard" v-if="showmc">
<view class="tit">
修改名称
修改服务费费率
</view>
<view class="ipt">
<u-input v-model="xgname" placeholder=" " border='surround' placeholder-style='font-size: 24rpx;' />
@ -329,7 +330,6 @@
this.showshop = true
},
confirms(e){
// console.log(e);
let data = {
deviceId: this.id,
storeId:e[0].value
@ -341,26 +341,26 @@
},
gettanc(){
this.$u.get('/app/store/listCount').then((res) => {
if (res.code == 200) {
this.total = res.total
if (res.data.length > 0) {
// 有数据，追加到列表
let arr = res.data.map(row => ({
value: row.storeId, // 将storeId赋值给value
label: row.name // 将name赋值给label
}));
this.wateringList = this.wateringList.concat(arr)
this.wateringList = this.wateringList.slice(1)
this.pagenum++
console.log(this.wateringList);
} else {
// 没有更多数据
this.noMoreData = true;
}
this.isLoading = false;
}
})
// this.$u.get('/app/store/listCount').then((res) => {
// if (res.code == 200) {
// this.total = res.total
// if (res.data.length > 0) {
// // 有数据，追加到列表
// let arr = res.data.map(row => ({
// value: row.storeId, // 将storeId赋值给value
// label: row.name // 将name赋值给label
// }));
// this.wateringList = this.wateringList.concat(arr)
// this.wateringList = this.wateringList.slice(1)
// this.pagenum++
// console.log(this.wateringList);
// } else {
// // 没有更多数据
// this.noMoreData = true;
// }
// this.isLoading = false;
// }
// })
},
onReachBottom() {
@ -372,7 +372,7 @@
title: '没有更多订单记录了',
icon: 'none',
duration: 1000
});
})
}
},
@ -415,10 +415,9 @@
this.showmc = false
this.putdevice(data)
}else if(num == 3){
// console.log(this.xgname);
let data = {
deviceId: this.id,
deviceName: this.xgname,
agentServiceRate: this.xgname,
}
this.showpopup = false
this.showpeice = false
@ -482,7 +481,7 @@
this.putdevice(data)
},
putdevice(data) {
this.$u.put('/app/device', data).then((res) => {
this.$u.put('/agent/device', data).then((res) => {
if (res.code == 200) {
this.getDevice()
uni.showToast({
@ -496,7 +495,7 @@
sremakemc(){
// console.log(1);
this.showmc = true
this.xgname = this.listobj.deviceName
this.xgname = this.listobj.agentServiceRate
},
sremake() {
this.showpopup = true
@ -514,7 +513,6 @@
},
getDevice(id) {
this.$u.get("/app/device/" + this.id).then((res) => {
// this.$forceUpdate()
if (res.code == 200) {
this.deviceInfo = res.data
console.log(this.deviceInfo, 'resres');
@ -531,14 +529,14 @@
})
},
getgroup() {
this.$u.get("/app/store/listCount").then((res) => {
// this.$forceUpdate()
if (res.code == 200) {
this.groupList = res.data
// this.loadings=true
// this.initChart()
}
});
// this.$u.get("/app/store/listCount").then((res) => {
// // this.$forceUpdate()
// if (res.code == 200) {
// this.groupList = res.data
// // this.loadings=true
// // this.initChart()
// }
// });
},
getlistobj(id) {
@ -550,7 +548,7 @@
})
}
}
}
}
</script>
<style lang="scss">

37
pages/daili/devicexq.vue
View File

@ -1,6 +1,6 @@
<template>
<view class="page">
<u-navbar :title="tittxt" :border-bottom="false" :background="bgc" back-icon-color="#000" title-color='#000'
<u-navbar :title="tittxt" :border-bottom="false" :background="bgc" back-icon-color="#fff" title-color='#fff'
title-size='36' height='50' id="navbar">
</u-navbar>
<view class="zhuhu">
@ -34,10 +34,12 @@
</view>
<view class="txt" v-if="deviceInfo">
SN：{{ deviceInfo.deviceNo == null ? '' : deviceInfo.deviceNo }}</view>
<view class="" style="font-size: 24rpx;color: #95989D;">
<view class="" style="font-size: 24rpx;color: #95989D;width: 100%;">
更新时间：{{deviceInfo.lastPullTime == null ? '--' : deviceInfo.lastPullTime}}</view>
<view class="" style="font-size: 24rpx;color: #95989D;">
归属商户：111</view>
归属商户：{{deviceInfo.userName == null ? '--' : deviceInfo.userName}}</view>
<view class="" style="font-size: 24rpx;color: #95989D;width: 100%;">
服务费费率：{{deviceInfo.agentServiceRate == null ? '--' : deviceInfo.agentServiceRate + '%'}}</view>
</view>
<view class="mid_left" style="position: relative;">
<view v-if="opflag"
@ -235,14 +237,6 @@
</view>
<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode=""></image>
</view>
<!-- <view class="cont" @click="topage(2)">
<view class="top">
<image src="https://api.ccttiot.com/smartmeter/img/static/ueQ5V8QAidDZGt0FpqXb" mode=""
style="width: 44rpx;height: 40rpx;"></image>
<view class="bot">上报异常</view>
</view>
<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode=""></image>
</view> -->
<view class="cont" @click="topage(4)">
<view class="top" style="border: 0;">
<image style="width: 44rpx;height: 44rpx;"
@ -327,7 +321,7 @@
style="width: 100%;height: 100vh;position: fixed;top: 0;left: 0;background-color: #000;opacity: .1;z-index: 999;">
</view>
</view>
</view>
</template>
<script>
@ -364,7 +358,7 @@
label: '度'
}],
bgc: {
backgroundColor: "#F9F8FF ",
backgroundColor: "#8883f0 ",
},
ec: {
lazyLoad: true
@ -621,7 +615,7 @@
fail: (err) => {
console.error(err);
}
});
})
},
//**生成二维码**//
qrFun: function() {
@ -1353,8 +1347,7 @@
customData: 'mmney@' + that.cztime
})
xBlufi.notifySendCustomData({
customData: '11mmney@' + that
.cztime
customData: '11mmney@' + that.cztime
})
that.getaddtime()
} else if (that.damweiid == 4) {
@ -1367,22 +1360,18 @@
that.getaddtime()
} else if (that.damweiid == 3) {
xBlufi.notifySendCustomData({
customData: 'time@' + that.cztime *
60
customData: 'time@' + that.cztime * 60
})
xBlufi.notifySendCustomData({
customData: '11time@' + that
.cztime * 60
customData: '11time@' + that.cztime * 60
})
that.getaddtime()
} else if (that.damweiid == 2) {
xBlufi.notifySendCustomData({
customData: 'time@' + that.cztime *
60 * 60
customData: 'time@' + that.cztime * 60 * 60
})
xBlufi.notifySendCustomData({
customData: '11time@' + that
.cztime * 60 * 60
customData: '11time@' + that.cztime * 60 * 60
})
that.getaddtime()
}

151
pages/daili/index.vue
View File

@ -8,19 +8,20 @@
</view>
<u-mask :show="showtip" @click="show = false" :z-index='1000' />
<view class="mxshanghuflag" v-if="shanghuflag"></view>
<view class="fd">
<!-- 刷新动画 -->
<view class="shuaxin" v-if="shuaxin">
<image src="https://api.ccttiot.com/smartmeter/img/static/uO9UFjzbzS9YlabzL4HV" mode=""></image>
</view>
<view class="fd_top u-skeleton-fillet" style="display: flex;justify-content: space-between;align-items: center;">
<view class="fd_top u-skeleton-fillet" style="display: flex;justify-content: space-between;align-items: center;position: relative;z-index: 999;">
<u-select v-model="pxshow" :list="pxlist" @confirm="pxconfirm"></u-select>
<view class="inpus">
<input type="text" placeholder="请输入搜索内容"/> <u-icon name="arrow-down" color="#000" size="28" style="margin-left: 30rpx;" @click="btnshanghu"></u-icon>
<input type="text" placeholder="请输入搜索内容" v-model="keyword"/>
<!-- <u-icon name="arrow-down" color="#000" size="28" style="margin-left: 30rpx;" @click="btnshanghu"></u-icon> -->
</view>
<view class="seachsou">
<view class="seachsou" @click="btnsousuo">
搜索
</view>
<view class="right">
@ -33,7 +34,7 @@
{{item.name}}
</view>
</view>
<view class="mxshanghuflag" v-if="shanghuflag"></view>
<u-mask :show="showfz" @click="showfz=false"></u-mask>
<view class="fz" v-show="showfz">
@ -67,12 +68,12 @@
<swiper class="swiper" style="height: 100%;" :current='curtitidx' @change="swiperchange"
@touchstart="touchStart" @touchend="touchEnd">
<swiper-item class="">
<!-- <view class="" v-if="wateringList && wateringList.length == 0"
<view class="" v-if="wateringList == '' && wateringList.length == 0"
style="width: 100%;height: 200rpx;margin: auto;margin-top: 230rpx;text-align: center;">
<image style="width: 200rpx;height: 200rpx;"
src="https://api.ccttiot.com/smartmeter/img/static/uZFUpcz0YZZ4f4RjvGg2" mode=""></image>
<view class="" style="font-size: 28rpx;color: #808080;margin-top: 30rpx;"></view>
</view> -->
<view class="" style="font-size: 28rpx;color: #808080;margin-top: 30rpx;">暂无设备...</view>
</view>
<view class="swiper_item">
<view class="card_box" v-for="(item,indexs) in wateringList" :key="indexs">
<view class="card">
@ -104,14 +105,14 @@
S/N码：{{item.deviceNo}}
</view>
<!-- @click="sremakes(item)" -->
<view v-if="item.storeId == null" class="dianpu"
<view v-if="item.userName == null" class="dianpu" @click="todetail(item.deviceId)"
style="border: 1px solid #ccc;padding: 5rpx;font-size:26rpx: border-box;width: 180rpx;border-radius: 20rpx;color: #ccc;text-align: center;margin-top: 10rpx;">
未绑定商户
</view>
<view v-else :class="item.onlineStatus == 0 ? 'activewzgl' : ''"
style="color: #95989D;padding-top: 20rpx;font-size: 26rpx;"
@click="todetail(item.deviceId)">
归属商户：{{item.storeName == null ? '--' : item.storeName}}
归属商户：{{item.userName == null ? '--' : item.userName}}
</view>
</view>
<view class="card_right" @click="todetail(item.deviceId)">
@ -128,9 +129,10 @@
<!-- 选择店铺 -->
<u-select v-model="showshop" :list="shoplist" @confirm="confirms"></u-select>
<image v-if="curtitidx == 0" class="saoyisao" @click="saoyisao"
src="https://api.ccttiot.com/smartmeter/img/static/uiDR6MnGHguBRNSYFTVw" mode=""></image>
<!-- 扫描二维码 -->
<!-- <image v-if="curtitidx == 0" class="saoyisao" @click="saoyisao"
src="https://api.ccttiot.com/smartmeter/img/static/uiDR6MnGHguBRNSYFTVw" mode=""></image> -->
<!-- <tab-bar :indexs='0'></tab-bar> -->
@ -292,7 +294,8 @@
deviceNo: '',
btnmsk:false,
pxzt:'onlineStatus',
qingqiuflag:true
qingqiuflag:true,
keyword:''
}
},
onLoad() {
@ -771,9 +774,11 @@
})
}
},
// 点击搜索
btnsousuo(){
this.pagenum = 1
this.getlist()
},
// 按下
touchStart(e) {
this.touchStartX = e.touches[0].clientX;
@ -1045,7 +1050,7 @@
getlist() {
this.shujuflag = false
// if (this.storeId == null) {
this.$u.get(`/app/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}&orderByColumn=${this.pxzt}&isAsc=desc`).then((res) => {
this.$u.get(`/agent/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}&orderByColumn=${this.pxzt}&isAsc=desc&keyword=${this.keyword}`).then((res) => {
if (res.code == 200) {
this.xiaflag = true
this.shuaxin = false
@ -1063,42 +1068,13 @@
this.wateringList = this.wateringList.concat(res.rows)
this.shujuflag = false
this.qingqiuflag = true
// console.log(this.wateringList);
// this.groupLists.forEach(groupItem => {
// groupItem.wateringList
// })
// this.wateringList.forEach(wateringItem => {
// this.groupLists[0].wateringList.push(wateringItem)
// })
// this.wateringList.forEach(wateringItem => {
// this.groupLists.forEach(groupItem => {
// if (groupItem.storeId !== null && wateringItem.storeId !== null && groupItem.storeId == wateringItem.storeId) {
// if (!groupItem.wateringList.some(item => item.storeId === wateringItem.storeId)) {
// groupItem.wateringList.push(wateringItem)
// }
// }
// })
// })
uni.hideLoading()
} else {
this.pagenum++
this.wateringList = res.rows
this.qingqiuflag = true
// console.log(this.wateringList,'000')
// this.groupLists.forEach(groupItem => {
// groupItem.wateringList = []
// })
// this.wateringList.forEach(wateringItem => {
// this.groupLists[0].wateringList.push(wateringItem);
// })
// this.wateringList.forEach(wateringItem => {
// this.groupLists.forEach(groupItem => {
// if (groupItem.storeId !== null && wateringItem.storeId !== null && groupItem.storeId == wateringItem.storeId) {
// groupItem.wateringList.push(wateringItem)
// }
// })
// })
// console.log(this.groupLists)
uni.hideLoading()
}
this.isLoading = false
@ -1109,75 +1085,7 @@
}
})
},
changeGp(item, index) {
// console.log(item);
this.pagenum = 1
this.showfz = false
if (item == 1) {
this.getDeviceList()
} else {
if (item.storeId == null) {
this.pagenum = 1
// this.wateringList = []
this.$u.get(`/app/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}`).then((res) => {
if (res.code == 200) {
this.total = res.total
if (res.rows.length > 0) {
// 有数据，追加到列表
// this.wateringList = this.wateringList.concat(res.rows)
// this.pagenum++
this.shujuflag = false
uni.hideLoading()
} else {
// 没有更多数据
this.shujuflag = true
uni.hideLoading()
}
if (this.pagenum > 1) {
this.wateringList = this.wateringList.concat(res.rows)
this.shujuflag = false
} else {
this.wateringList = res.rows
}
this.pagenum++
this.isLoading = false
}
})
} else {
this.pagenum = 1
// this.wateringList = []
this.$u.get(`/app/device/list?storeId=${item.storeId}&pageNum=${this.pagenum}&pageSize=${this.pagesize}`).then((res) => {
if (res.code == 200) {
this.total = res.total
// if(this.pagenum > 1){
// this.wateringList = this.wateringList.concat(res.rows)
// }else{
// this.wateringList = res.rows
// }
if (res.rows.length > 0) {
// 有数据，追加到列表
// this.wateringList = this.wateringList.concat(res.rows)
// this.pagenum++
this.shujuflag = false
uni.hideLoading()
} else {
// 没有更多数据
this.shujuflag = true
uni.hideLoading()
}
if (this.pagenum > 1) {
this.wateringList = this.wateringList.concat(res.rows)
this.shujuflag = false
} else {
this.wateringList = res.rows
}
this.pagenum++
this.isLoading = false
}
})
}
}
},
tosetpage() {
this.showfz = false
uni.navigateTo({
@ -1482,12 +1390,12 @@
}
.mxshanghuflag{
width: 100%;
height: 90vh;
height: 100vh;
background-color: #000;
opacity: .5 !important;
border-radius: 20rpx;
position: fixed;
top: 320rpx;
top: 0;
left:0;
z-index: 998;
animation: slideDown .5s ease-out forwards;
@ -1499,6 +1407,7 @@
border-radius: 10rpx;
padding-right: 20rpx;
box-sizing: border-box;
background-color: #fff;
input{
width: 400rpx;
height: 60rpx;
@ -1585,7 +1494,7 @@
position: fixed;
top: 0;
left: 0;
z-index: 99;
z-index: 999;
text-align: center;
.img {