This commit is contained in:
3321822538@qq.com 2024-05-21 10:49:02 +08:00
parent f8ab309fe7
commit 23197daaca
4 changed files with 175 additions and 197 deletions

View File

@ -14,7 +14,7 @@
</view> </view>
<view class="cen"> <view class="cen">
<view class="name"> <view class="name">
智能电表 智能开关
</view> </view>
<view class="mac"> <view class="mac">
MAC{{item.localName.substring(6)}} MAC{{item.localName.substring(6)}}

View File

@ -128,6 +128,13 @@
</view> </view>
<view class="bot">设置</view> <view class="bot">设置</view>
</view> </view>
<view class="cont" style="width: 60rpx;" @click="topage(5)">
<view class="top">
<image src="https://api.ccttiot.com/smartmeter/img/static/ubxoYVnbIK1rk0cfoL3j" mode="">
</image>
</view>
<view class="bot">配网</view>
</view>
</view> </view>
</view> </view>
@ -196,17 +203,6 @@
let value = 100; let value = 100;
let value2 = this.deviceInfo.orderAmount let value2 = this.deviceInfo.orderAmount
const option = { const option = {
// backgroundColor:"#061740",
// title: {
// show: false,
// text: ``, //
// x: 'center',
// y: '20',
// textStyle: {
// color: '#333', //'#fff',
// fontSize: 20,
// },
// },
series: [{ series: [{
type: 'pie', // type: 'pie', //
radius: ['98%', '70%'], // radius: ['98%', '70%'], //
@ -241,64 +237,8 @@
}, },
}, },
}, },
// {
// value: 100 - value2,
// name: '',
// label: {
// normal: {
// show: false,
// },
// },
// itemStyle: {
// normal: {
// color: '#173164',
// },
// },
// },
], ],
}, },
// {
// type: 'gauge', //
// radius: '130%', //
// center: ['50%', '50%'], //
// startAngle: 359,
// endAngle: 359.9,
// splitNumber: 2, //
// hoverAnimation: true,
// axisTick: {
// show: true, // 线
// length: 10, // 线
// lineStyle: {
// color: 'auto',
// width: 1,
// },
// },
// splitLine: {
// length: 0, // 线线
// lineStyle: {
// width: 1,
// color: '#061740',
// },
// },
// axisLabel: {
// show: false, //
// },
// pointer: {
// show: false, //
// },
// axisLine: {
// lineStyle: {
// opacity: 0,
// },
// },
// detail: {
// show: false, //
// },
// data: [{
// value: 0,
// name: '',
// }, ],
// },
], ],
}; };
@ -306,10 +246,6 @@
const chart = await this.$refs.chart.init(echarts); const chart = await this.$refs.chart.init(echarts);
// console.log(option,11); // console.log(option,11);
chart.setOption(option) chart.setOption(option)
// chart.resize({
// width: uni.upx2px(210), // Convert 210rpx to pixels
// height: uni.upx2px(190.14) // Convert 190.14rpx to pixels
// });
return chart return chart
}, },
@ -345,10 +281,7 @@
customPicture: _this.imglist customPicture: _this.imglist
} }
_this.putdevice(data) _this.putdevice(data)
// setTimeout(()=>{
// this.imglist = ''
// _this.getDevice(_this.id)
// },1000)
} }
}); });
} }
@ -481,6 +414,11 @@
uni.navigateTo({ uni.navigateTo({
url: '/page_user/setting?id=' + this.id url: '/page_user/setting?id=' + this.id
}) })
}else if(num == 5){
console.log(this.deviceInfo);
uni.navigateTo({
url:'/page_fenbao/device/lianjie?mac=' + this.deviceInfo.mac + '&storeId=' + this.deviceInfo.storeId
})
} }
} }

View File

@ -324,6 +324,11 @@
} }
}, },
deldevice() { deldevice() {
uni.showModal({
title: '确认解绑',
content: '您确定要解绑设备吗?',
success: (resModal) => {
if (resModal.confirm) {
this.$u.delete(`/app/device/mch/unbind/${this.id}`).then((res) => { this.$u.delete(`/app/device/mch/unbind/${this.id}`).then((res) => {
if (res.code == 200) { if (res.code == 200) {
uni.showToast({ uni.showToast({
@ -332,11 +337,32 @@
duration: 2000 duration: 2000
}); });
uni.navigateBack({ uni.navigateBack({
delta: 1 // delta: 2 //
});
} else {
uni.showToast({
title: '解绑失败',
icon: 'none',
duration: 2000
}); });
} }
}) }).catch((error) => {
//
uni.showToast({
title: '请求失败',
icon: 'none',
duration: 2000
});
});
} else if (resModal.cancel) { //
uni.showToast({
title: '已取消',
icon: 'none',
duration: 1000
});
}
}
});
}, },
confirm(e) { confirm(e) {
let data = { let data = {

View File

@ -3,7 +3,7 @@
<u-navbar :is-back="false" :title="tittxt" :border-bottom="false" :background="bgc" title-color='#2E4975' <u-navbar :is-back="false" :title="tittxt" :border-bottom="false" :background="bgc" title-color='#2E4975'
title-size='44' height='44' id="navbar"> title-size='44' height='44' id="navbar">
</u-navbar> </u-navbar>
<u-mask :show="showtip" @click="show = false" :z-index='1000'/> <u-mask :show="showtip" @click="show = false" :z-index='1000' />
<view class="tip_box" v-if="showtip"> <view class="tip_box" v-if="showtip">
<view class="top"> <view class="top">
<view class="txt"> <view class="txt">
@ -20,7 +20,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="fd" > <view class="fd">
<view class="fd_top"> <view class="fd_top">
<view class="fd_tit"> <view class="fd_tit">
@ -67,8 +67,8 @@
<view class="swiper" style="height: 100%;" :current='curtitidx' @change="swiperchange"> <view class="swiper" style="height: 100%;" :current='curtitidx' @change="swiperchange">
<view> <view>
<view class="swiper-item "> <view class="swiper-item ">
<view class="card_box" @scrolltolower="onReachBottom" @click="todetail(item.deviceId)" v-for="(item,index) in wateringList" <view class="card_box" @scrolltolower="onReachBottom" @click="todetail(item.deviceId)"
:key="index"> v-for="(item,index) in wateringList" :key="index">
<!-- deviceList --> <!-- deviceList -->
<view class="card"> <view class="card">
<view class="card_left"> <view class="card_left">
@ -94,8 +94,7 @@
</view> </view>
</view> </view>
<view class="card_right"> <view class="card_right">
<image :src="item.picture" <image :src="item.picture" mode=""></image>
mode=""></image>
</view> </view>
</view> </view>
</view> </view>
@ -103,7 +102,9 @@
</view> </view>
</view> </view>
<view v-if="wateringList.length == 0" style="margin-left:200rpx; color: #ccc;font-size: 36rpx;margin-top: 200rpx;width: 750rpx;">该店铺暂无设备...</view> <!-- <view
style="margin-left:200rpx; color: #ccc;font-size: 36rpx;margin-top: 200rpx;width: 750rpx;">
该店铺暂无设备...</view> -->
</view> </view>
</view> </view>
@ -176,17 +177,17 @@
total: '', total: '',
gps: {}, gps: {},
mac: '', mac: '',
deviceId:'', deviceId: '',
showtip:false, showtip: false,
orderinfo:[], orderinfo: [],
storeId:'', storeId: '',
pagenum: 1, pagenum: 1,
wateringList: [], wateringList: [],
pagesize: 10, pagesize: 10,
isLoading: false, isLoading: false,
noMoreData: false, noMoreData: false,
total: 0 total: 0,
} }
}, },
onLoad() { onLoad() {
@ -197,8 +198,8 @@
this.pagenum = 1 this.pagenum = 1
this.logins(); this.logins();
this.getgroup(); this.getgroup();
this.deviceId=uni.getStorageSync('deviceIds'); this.deviceId = uni.getStorageSync('deviceIds');
this.name=uni.getStorageSync('name'); this.name = uni.getStorageSync('name');
// console.log(this.deviceId,'aaa',this.name); // console.log(this.deviceId,'aaa',this.name);
let that = this; // this that let that = this; // this that
@ -222,13 +223,13 @@
} }
}); });
} }
}else{ } else {
if (uni.getStorageSync('billNo')) { if (uni.getStorageSync('billNo')) {
let billNo= uni.getStorageSync('billNo') let billNo = uni.getStorageSync('billNo')
this.$u.get(`/app/bill/recharge/${billNo}/bluetoothSuccess`).then((res) => { this.$u.get(`/app/bill/recharge/${billNo}/bluetoothSuccess`).then((res) => {
if(res.code==200){ if (res.code == 200) {
uni.removeStorageSync('billNo'); uni.removeStorageSync('billNo');
this.showtip=false this.showtip = false
this.order() this.order()
} }
// console.log(this.deviceInfo,'this.deviceInfo'); // console.log(this.deviceInfo,'this.deviceInfo');
@ -239,8 +240,8 @@
}, 2000); }, 2000);
}, },
methods: { methods: {
tocz(){ tocz() {
this.showtip=false this.showtip = false
uni.navigateTo({ uni.navigateTo({
url: '/page_fenbao/device/czDevice?orderinfo=' + JSON.stringify(this.orderinfo) url: '/page_fenbao/device/czDevice?orderinfo=' + JSON.stringify(this.orderinfo)
}); });
@ -248,27 +249,27 @@
checkModelTags(modelTags) { checkModelTags(modelTags) {
return modelTags && modelTags.some(tag => tag === 2); return modelTags && modelTags.some(tag => tag === 2);
}, },
order(){ order() {
console.log('调用了'); console.log('调用了');
this.$u.get("/app/bill/recharge/device/fail/list").then((res) => { this.$u.get("/app/bill/recharge/device/fail/list").then((res) => {
if(res.data.length!=0){ if (res.data.length != 0) {
this.showtip=true this.showtip = true
this.orderinfo=res.data[0] this.orderinfo = res.data[0]
}else{ } else {
this.orderinfo=null this.orderinfo = null
} }
}); });
}, },
towifi(mac){ towifi(mac) {
uni.navigateTo({ uni.navigateTo({
url: '/page_fenbao/device/wifiDevice?mac=' + mac url: '/page_fenbao/device/wifiDevice?mac=' + mac
}) })
}, },
tobind(){ tobind() {
this.$u.put(`/app/device/bind/${this.mac}`, this.gps).then((res) => { this.$u.put(`/app/device/bind/${this.mac}`, this.gps).then((res) => {
if (res.code === 200) { if (res.code === 200) {
@ -279,7 +280,8 @@
} else if (systemInfo.platform === 'ios') { } else if (systemInfo.platform === 'ios') {
// console.log('aaaaaaaaaaaa'); // console.log('aaaaaaaaaaaa');
uni.navigateTo({ uni.navigateTo({
url: '/page_components/wifilist/index?deviceId=' + this.deviceId + '&name=' + this.name url: '/page_components/wifilist/index?deviceId=' + this.deviceId +
'&name=' + this.name
}) })
} }
uni.showToast({ uni.showToast({
@ -335,8 +337,8 @@
} }
}); });
}, },
getlist(){ getlist() {
if(this.storeId == null){ if (this.storeId == null) {
this.$u.get(`/app/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}`).then((res) => { this.$u.get(`/app/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}`).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.total = res.total this.total = res.total
@ -347,13 +349,15 @@
this.pagenum++ this.pagenum++
} else { } else {
// //
this.noMoreData = true;
} }
this.isLoading = false; this.isLoading = false;
} }
}) })
}else{ } else {
this.$u.get(`/app/device/list?storeId=${this.storeId}&pageNum=${this.pagenum}&pageSize=${this.pagesize}`).then((res) => { this.$u.get(
`/app/device/list?storeId=${this.storeId}&pageNum=${this.pagenum}&pageSize=${this.pagesize}`)
.then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.total = res.total this.total = res.total
// this.wateringList = [] // this.wateringList = []
@ -363,7 +367,7 @@
this.pagenum++ this.pagenum++
} else { } else {
// //
this.noMoreData = true;
} }
this.isLoading = false; this.isLoading = false;
} }
@ -372,11 +376,11 @@
}, },
onReachBottom() { onReachBottom() {
let sum = this.total / this.pagesize let sum = this.total / this.pagesize
if (this.pagenum-1 < sum) { if (this.pagenum - 1 < sum) {
this.getlist(); // this.getlist(); //
} else { } else {
uni.showToast({ uni.showToast({
title: '没有更多店铺了', title: '没有更多设备了',
icon: 'none', icon: 'none',
duration: 1000 duration: 1000
}); });
@ -390,7 +394,7 @@
if (item == 1) { if (item == 1) {
this.getDeviceList() this.getDeviceList()
} else { } else {
if(item.storeId == null){ if (item.storeId == null) {
this.pagenum = 1 this.pagenum = 1
this.wateringList = [] this.wateringList = []
this.titlist = item.name this.titlist = item.name
@ -408,11 +412,13 @@
this.isLoading = false; this.isLoading = false;
} }
}); });
}else{ } else {
this.pagenum = 1 this.pagenum = 1
this.wateringList = [] this.wateringList = []
this.titlist = item.name this.titlist = item.name
this.$u.get(`/app/device/list?storeId=${item.storeId}&pageNum=${this.pagenum}&pageSize=${this.pagesize}`).then((res) => { this.$u.get(
`/app/device/list?storeId=${item.storeId}&pageNum=${this.pagenum}&pageSize=${this.pagesize}`
).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.total = res.total this.total = res.total
if (res.rows.length > 0) { if (res.rows.length > 0) {
@ -717,7 +723,7 @@
}, },
todetail(id) { todetail(id) {
uni.navigateTo({ uni.navigateTo({
url:'/page_user/sbdetail?id=' + id url: '/page_user/sbdetail?id=' + id
}) })
}, },
// //
@ -743,7 +749,8 @@
.page { .page {
padding-bottom: 200rpx; padding-bottom: 200rpx;
.tip_box{
.tip_box {
position: fixed; position: fixed;
left: 72rpx; left: 72rpx;
top: 788rpx; top: 788rpx;
@ -752,9 +759,11 @@
background: #F7FAFE; background: #F7FAFE;
border-radius: 30rpx 30rpx 30rpx 30rpx; border-radius: 30rpx 30rpx 30rpx 30rpx;
z-index: 10000000; z-index: 10000000;
.top{
.top {
padding: 52rpx 38rpx 42rpx 36rpx; padding: 52rpx 38rpx 42rpx 36rpx;
.txt{
.txt {
width: 100%; width: 100%;
text-align: center; text-align: center;
font-weight: 500; font-weight: 500;
@ -762,12 +771,14 @@
color: #3D3D3D; color: #3D3D3D;
} }
} }
.bot{
border-top: 2rpx solid #D8D8D8 ; .bot {
border-top: 2rpx solid #D8D8D8;
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
height: 100%; height: 100%;
.bot_left{
.bot_left {
width: 50%; width: 50%;
height: 98rpx; height: 98rpx;
display: flex; display: flex;
@ -777,14 +788,15 @@
font-size: 36rpx; font-size: 36rpx;
color: #3D3D3D; color: #3D3D3D;
} }
.bot_right{
.bot_right {
width: 50%; width: 50%;
height: 98rpx; height: 98rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
border-left: 2rpx solid #D8D8D8 ; border-left: 2rpx solid #D8D8D8;
font-weight: 500; font-weight: 500;
font-size: 36rpx; font-size: 36rpx;
color: #4C97E7; color: #4C97E7;
@ -793,6 +805,7 @@
} }
} }
.noDevice { .noDevice {
margin-top: 432rpx; margin-top: 432rpx;
display: flex; display: flex;
@ -1301,9 +1314,10 @@
margin-top: 30rpx; margin-top: 30rpx;
margin-left: auto; margin-left: auto;
margin-right: 50rpx; margin-right: 50rpx;
image { image {
width: 180rpx; width: 180rpx;
height:200rpx; height: 200rpx;
} }
} }
} }