chuangte/smartswrtch-app
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aaa

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
page_fenbao/device/index.vue
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)}}

88
page_user/sbdetail.vue
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
})
} }
} }

32
page_user/setting.vue
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 = {

38
pages/index/index.vue
View File

@ -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>
@ -186,7 +187,7 @@
pagesize: 10, pagesize: 10,
isLoading: false, isLoading: false,
noMoreData: false, noMoreData: false,
total: 0 total: 0,
} }
}, },
onLoad() { onLoad() {
@ -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({
@ -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;
} }
@ -376,7 +380,7 @@
this.getlist(); // 上拉加载更多 this.getlist(); // 上拉加载更多
} else { } else {
uni.showToast({ uni.showToast({
title: '没有更多店铺了', title: '没有更多设备了',
icon: 'none', icon: 'none',
duration: 1000 duration: 1000
}); });
@ -412,7 +416,9 @@
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) {
@ -743,6 +749,7 @@
.page { .page {
padding-bottom: 200rpx; padding-bottom: 200rpx;
.tip_box { .tip_box {
position: fixed; position: fixed;
left: 72rpx; left: 72rpx;
@ -752,8 +759,10 @@
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;
@ -762,11 +771,13 @@
color: #3D3D3D; color: #3D3D3D;
} }
} }
.bot { .bot {
border-top: 2rpx solid #D8D8D8; 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;
@ -777,6 +788,7 @@
font-size: 36rpx; font-size: 36rpx;
color: #3D3D3D; color: #3D3D3D;
} }
.bot_right { .bot_right {
width: 50%; width: 50%;
height: 98rpx; height: 98rpx;
@ -793,6 +805,7 @@
} }
} }
.noDevice { .noDevice {
margin-top: 432rpx; margin-top: 432rpx;
display: flex; display: flex;
@ -1301,6 +1314,7 @@
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;