Skip to content

X
xzf_uniapp-wechat-web
Commit 72f30bb0 authored by aifen@azjy1.onexmail.com's avatar aifen@azjy1.onexmail.com
Browse files
Options

Merge branch 'V1.6.7_feature' into develop

parents 28825299 b18e611c
Show whitespace changes
Inline Side-by-side
Showing with 165 additions and 55 deletions
src/pages/TemperatureRecords/HighTemperature/HighTemperature.vue
View file @ 72f30bb0
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
</view> </view>
</view> </view>
<view class="cardBox"> <view class="cardBox">
<view v-if="ifShow">
<view class="card" v-for="item of detailsList"> <view class="card" v-for="item of detailsList">
<view class="temperatureResult"> <view class="temperatureResult">
<view class="studentInfo"> <view class="studentInfo">
...@@ -32,6 +33,14 @@ ...@@ -32,6 +33,14 @@
</view> </view>
</view> </view>
</view> </view>
<view v-else class="nodata">
<view class="nodataImg">
</view>
<view class="nodataTxt">
<text>暂无数据~</text>
</view>
</view>
</view>
</view> </view>
</template> </template>
...@@ -47,10 +56,11 @@ ...@@ -47,10 +56,11 @@
searchValue: "", searchValue: "",
requestInfo: {}, requestInfo: {},
detailsList: [], detailsList: [],
ifShow: true,
} }
}, },
mounted() { mounted() {
this.userTemperatureDetail(2); this.userTemperatureDetail(2).then(() => this.ifShow = this.detailsList.length ? true : false);
}, },
methods: { methods: {
// 搜索框 // 搜索框
...@@ -89,8 +99,10 @@ ...@@ -89,8 +99,10 @@
} }
if (data.obj && Array.isArray(data.obj)) { if (data.obj && Array.isArray(data.obj)) {
this.detailsList = data.obj; this.detailsList = data.obj;
this.ifShow = true;
} else { } else {
this.detailsList == []; this.detailsList == [];
this.ifShow = false;
} }
} catch (e) { } catch (e) {
...@@ -209,6 +221,24 @@ ...@@ -209,6 +221,24 @@
color: #999999; color: #999999;
} }
} }
.nodata {
.nodataImg {
width: 228rpx;
height: 160rpx;
margin: 362rpx auto 14rpx;
background: url(../../../static/images/nodata.png) center/100% no-repeat;
}
.nodataTxt {
display: flex;
justify-content: center;
font-size: 28rpx;
font-family: PingFang SC;
font-weight: 500;
color: #999999;
}
}
} }
} }
</style> </style>
src/pages/TemperatureRecords/LowTemperature/LowTemperature.vue
View file @ 72f30bb0
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
</view> </view>
</view> </view>
<view class="cardBox"> <view class="cardBox">
<view v-if="ifShow">
<view class="card" v-for="item of detailsList"> <view class="card" v-for="item of detailsList">
<view class="temperatureResult"> <view class="temperatureResult">
<view class="studentInfo"> <view class="studentInfo">
...@@ -32,6 +33,14 @@ ...@@ -32,6 +33,14 @@
</view> </view>
</view> </view>
</view> </view>
<view v-else class="nodata">
<view class="nodataImg">
</view>
<view class="nodataTxt">
<text>暂无数据~</text>
</view>
</view>
</view>
</view> </view>
</template> </template>
...@@ -47,10 +56,11 @@ ...@@ -47,10 +56,11 @@
searchValue: "", searchValue: "",
requestInfo: {}, requestInfo: {},
detailsList: [], detailsList: [],
ifShow: true,
} }
}, },
mounted() { mounted() {
this.userTemperatureDetail(3); this.userTemperatureDetail(3).then(() => this.ifShow = this.detailsList.length ? true : false);
}, },
methods: { methods: {
// 搜索框 // 搜索框
...@@ -89,8 +99,10 @@ ...@@ -89,8 +99,10 @@
} }
if (data.obj && Array.isArray(data.obj)) { if (data.obj && Array.isArray(data.obj)) {
this.detailsList = data.obj; this.detailsList = data.obj;
this.ifShow = true;
} else { } else {
this.detailsList == []; this.detailsList == [];
this.ifShow = false;
} }
} catch (e) { } catch (e) {
...@@ -209,6 +221,24 @@ ...@@ -209,6 +221,24 @@
color: #999999; color: #999999;
} }
} }
.nodata {
.nodataImg {
width: 228rpx;
height: 160rpx;
margin: 362rpx auto 14rpx;
background: url(../../../static/images/nodata.png) center/100% no-repeat;
}
.nodataTxt {
display: flex;
justify-content: center;
font-size: 28rpx;
font-family: PingFang SC;
font-weight: 500;
color: #999999;
}
}
} }
} }
</style> </style>
src/pages/TemperatureRecords/NormalTemperatrue/NormalTemperatrue.vue
View file @ 72f30bb0
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
</view> </view>
</view> </view>
<view class="cardBox"> <view class="cardBox">
<view v-if="ifShow">
<view class="card" v-for="item of detailsList"> <view class="card" v-for="item of detailsList">
<view class="temperatureResult"> <view class="temperatureResult">
<view class="studentInfo"> <view class="studentInfo">
...@@ -32,6 +33,14 @@ ...@@ -32,6 +33,14 @@
</view> </view>
</view> </view>
</view> </view>
<view v-else class="nodata">
<view class="nodataImg">
</view>
<view class="nodataTxt">
<text>暂无数据~</text>
</view>
</view>
</view>
</view> </view>
</template> </template>
...@@ -47,10 +56,11 @@ ...@@ -47,10 +56,11 @@
searchValue: "", searchValue: "",
requestInfo: {}, requestInfo: {},
detailsList: [], detailsList: [],
ifShow: true,
} }
}, },
mounted() { mounted() {
this.userTemperatureDetail(1); this.userTemperatureDetail(1).then(() => this.ifShow = this.detailsList.length ? true : false);
}, },
methods: { methods: {
// 搜索框 // 搜索框
...@@ -77,7 +87,7 @@ ...@@ -77,7 +87,7 @@
url: gHost + '/ACAPI/applet/temperature-staits/userTemperatureDetail' url: gHost + '/ACAPI/applet/temperature-staits/userTemperatureDetail'
}, Object.assign(this.requestInfo, { }, Object.assign(this.requestInfo, {
temperatureStatus, temperatureStatus,
userName:this.searchValue userName: this.searchValue
})) }))
if (data.code != 200) { if (data.code != 200) {
uni.showToast({ uni.showToast({
...@@ -89,8 +99,10 @@ ...@@ -89,8 +99,10 @@
} }
if (data.obj && Array.isArray(data.obj)) { if (data.obj && Array.isArray(data.obj)) {
this.detailsList = data.obj; this.detailsList = data.obj;
this.ifShow = true;
} else { } else {
this.detailsList == []; this.detailsList == [];
this.ifShow = false;
} }
} catch (e) { } catch (e) {
...@@ -209,6 +221,24 @@ ...@@ -209,6 +221,24 @@
color: #999999; color: #999999;
} }
} }
.nodata {
.nodataImg {
width: 228rpx;
height: 160rpx;
margin: 362rpx auto 14rpx;
background: url(../../../static/images/nodata.png) center/100% no-repeat;
}
.nodataTxt {
display: flex;
justify-content: center;
font-size: 28rpx;
font-family: PingFang SC;
font-weight: 500;
color: #999999;
}
}
} }
} }
</style> </style>
src/pages/TemperatureRecords/Undetected/Undetected.vue
View file @ 72f30bb0
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
</view> </view>
</view> </view>
<view class="cardBox"> <view class="cardBox">
<view v-if="ifShow">
<view class="card" v-for="item of detailsList"> <view class="card" v-for="item of detailsList">
<view class="temperatureResult"> <view class="temperatureResult">
<view class="studentInfo"> <view class="studentInfo">
...@@ -27,8 +28,13 @@ ...@@ -27,8 +28,13 @@
<text>{{item.temperature}}°C</text> <text>{{item.temperature}}°C</text>
</view> </view>
</view> </view>
<view class="temperatureTime"> </view>
<text>测量时间：{{item.temperatureTime}}</text> </view>
<view v-else class="nodata">
<view class="nodataImg">
</view>
<view class="nodataTxt">
<text>暂无数据~</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -47,10 +53,11 @@ ...@@ -47,10 +53,11 @@
searchValue: "", searchValue: "",
requestInfo: {}, requestInfo: {},
detailsList: [], detailsList: [],
ifShow: true,
} }
}, },
mounted() { mounted() {
this.userNoTemperatureDetail(); this.userNoTemperatureDetail().then(() => this.ifShow = this.detailsList.length ? true : false);
}, },
methods: { methods: {
// 搜索框 // 搜索框
...@@ -88,8 +95,10 @@ ...@@ -88,8 +95,10 @@
} }
if (data.obj && Array.isArray(data.obj)) { if (data.obj && Array.isArray(data.obj)) {
this.detailsList = data.obj; this.detailsList = data.obj;
this.ifShow = true;
} else { } else {
this.detailsList == []; this.detailsList == [];
this.ifShow = false;
} }
} catch (e) { } catch (e) {
...@@ -173,7 +182,7 @@ ...@@ -173,7 +182,7 @@
.studentInfo { .studentInfo {
display: flex; display: flex;
align-items: flex-end; flex-direction: column;
.studentName { .studentName {
margin-right: 32rpx; margin-right: 32rpx;
...@@ -188,7 +197,6 @@ ...@@ -188,7 +197,6 @@
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #999999; color: #999999;
margin-top: 22rpx;
} }
} }
...@@ -197,12 +205,24 @@ ...@@ -197,12 +205,24 @@
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
color: #333333; color: #333333;
line-height: 72rpx; display: flex;
align-items: center;
}
} }
} }
.temperatureTime { .nodata {
font-size: 24rpx; .nodataImg {
width: 228rpx;
height: 160rpx;
margin: 362rpx auto 14rpx;
background: url(../../../static/images/nodata.png) center/100% no-repeat;
}
.nodataTxt {
display: flex;
justify-content: center;
font-size: 28rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #999999; color: #999999;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment