开发
This commit is contained in:
parent
bb3e6c69fe
commit
7509335cf0
@ -23,7 +23,6 @@
|
|||||||
"navigationStyle": "custom"
|
"navigationStyle": "custom"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"path": "pages/deviceBind/index",
|
"path": "pages/deviceBind/index",
|
||||||
"style": {
|
"style": {
|
||||||
@ -38,7 +37,6 @@
|
|||||||
"navigationStyle": "custom"
|
"navigationStyle": "custom"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"path": "pages/device/index",
|
"path": "pages/device/index",
|
||||||
"style": {
|
"style": {
|
||||||
@ -65,7 +63,8 @@
|
|||||||
"selectedColor": "#007AFF",
|
"selectedColor": "#007AFF",
|
||||||
"backgroundColor": "#FFFFFF",
|
"backgroundColor": "#FFFFFF",
|
||||||
"borderStyle": "black",
|
"borderStyle": "black",
|
||||||
"list": [{
|
"list": [
|
||||||
|
{
|
||||||
"pagePath": "pages/index/index",
|
"pagePath": "pages/index/index",
|
||||||
"text": "首页",
|
"text": "首页",
|
||||||
"iconPath": "static/tabbar/index.png",
|
"iconPath": "static/tabbar/index.png",
|
||||||
|
@ -32,11 +32,16 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- 媒体内容 -->
|
<!-- 媒体内容 -->
|
||||||
<video class="img_video_warp" :src="socketData.videoUrl" v-if="socketData.videoUrl"
|
<!-- <video class="img_video_warp" :src="socketData.videoUrl" v-if="socketData.videoUrl"
|
||||||
@loadedmetadata="isMediaLoading = false" @error="isMediaLoading = false"></video>
|
@loadedmetadata="isMediaLoading = false" @error="isMediaLoading = false"></video>
|
||||||
|
|
||||||
<image class="img_video_warp" v-else :src="socketData.imageUrl" @load="isMediaLoading = false"
|
<image class="img_video_warp" v-else :src="socketData.imageUrl" @load="isMediaLoading = false"
|
||||||
@error="isMediaLoading = false"></image>
|
@error="isMediaLoading = false"></image> -->
|
||||||
|
<video class="img_video_warp" :src="socketData.videoUrl" v-if="socketData.videoUrl"
|
||||||
|
@loadedmetadata="handleMediaLoaded" @error="handleMediaError"></video>
|
||||||
|
|
||||||
|
<image class="img_video_warp" v-else :src="socketData.imageUrl" @load="handleMediaLoaded"
|
||||||
|
@error="handleMediaError"></image>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- 设备状态选择 -->
|
<!-- 设备状态选择 -->
|
||||||
@ -138,8 +143,8 @@
|
|||||||
|
|
||||||
<view class="device_status_warp" v-if="deviceType == 2">
|
<view class="device_status_warp" v-if="deviceType == 2">
|
||||||
<view class="empty_state_warp">
|
<view class="empty_state_warp">
|
||||||
<image class="empty_state_icon"
|
<image class="empty_state_icon" src="https://online.totustec.com/upload/deviceManage/empty_log_icon.png">
|
||||||
src="https://online.totustec.com/upload/deviceManage/empty_log_icon.png"></image>
|
</image>
|
||||||
<view class="empty_state_title">暂无日志数据</view>
|
<view class="empty_state_title">暂无日志数据</view>
|
||||||
<!-- <view class="empty_state_desc">设备运行日志将在这里显示</view> -->
|
<!-- <view class="empty_state_desc">设备运行日志将在这里显示</view> -->
|
||||||
</view>
|
</view>
|
||||||
@ -161,28 +166,23 @@
|
|||||||
<view class="deviceN_input_tip">文件位置:桌面File文件夹内</view>
|
<view class="deviceN_input_tip">文件位置:桌面File文件夹内</view>
|
||||||
<view class="device_operation_warp">
|
<view class="device_operation_warp">
|
||||||
<!--只有主状态等于0时候开始打印才能点击,其他都不能点击-->
|
<!--只有主状态等于0时候开始打印才能点击,其他都不能点击-->
|
||||||
<view class="device_operation_btn"
|
<view class="device_operation_btn" @click="operationData('PRINT')" :style="{ backgroundColor: deviceDetail.status === 0 ? '#ffffff' : '#cccccc' }
|
||||||
@click="operationData('PRINT')"
|
|
||||||
:style="{backgroundColor:deviceDetail.status === 0? '#ffffff':'#cccccc'}
|
|
||||||
">
|
">
|
||||||
<image class="operation_btn_icon"
|
<image class="operation_btn_icon" src="https://online.totustec.com/upload/deviceManage/print_status1.png">
|
||||||
src="https://online.totustec.com/upload/deviceManage/print_status1.png"></image>
|
</image>
|
||||||
<view class="operation_btn_txt"
|
<view class="operation_btn_txt" :style="{
|
||||||
:style="{
|
color: deviceDetail.status === 0 ? '#333333' : '#ece8e8',
|
||||||
color:deviceDetail.status === 0 ?'#333333':'#ece8e8' ,}"
|
}">开始打印</view>
|
||||||
>开始打印</view>
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!--继续打印-->
|
<!--继续打印-->
|
||||||
<view class="device_operation_btn"
|
<view class="device_operation_btn" @click="operationData('CONTINUE')"
|
||||||
@click="operationData('CONTINUE')"
|
:style="{ backgroundColor: deviceDetail.status === 0 || printInfo.status !== 6 ? '#cccccc' : '#ffffff' }">
|
||||||
:style="{backgroundColor:deviceDetail.status === 0 || printInfo.status !== 6? '#cccccc': '#ffffff'}"
|
|
||||||
>
|
|
||||||
<image class="operation_btn_icon" src="https://online.totustec.com/upload/deviceManage/print_status1.png">
|
<image class="operation_btn_icon" src="https://online.totustec.com/upload/deviceManage/print_status1.png">
|
||||||
</image>
|
</image>
|
||||||
<view class="operation_btn_txt"
|
<view class="operation_btn_txt"
|
||||||
:style="{color:deviceDetail.status === 0 || printInfo.status !== 6? '#ece8e8': '#333333'}"
|
:style="{ color: deviceDetail.status === 0 || printInfo.status !== 6 ? '#ece8e8' : '#333333' }">继续打印
|
||||||
>继续打印</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!--暂停打印 退出打印-->
|
<!--暂停打印 退出打印-->
|
||||||
@ -198,8 +198,7 @@
|
|||||||
color:
|
color:
|
||||||
printInfo.status !== 6 && deviceDetail.status !== 0
|
printInfo.status !== 6 && deviceDetail.status !== 0
|
||||||
? '#333333' : '#ece8e8',
|
? '#333333' : '#ece8e8',
|
||||||
}"
|
}">暂停打印</view>
|
||||||
>暂停打印</view>
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="device_operation_btn" @click="operationData('EXIT')" :style="{
|
<view class="device_operation_btn" @click="operationData('EXIT')" :style="{
|
||||||
@ -208,11 +207,9 @@
|
|||||||
}">
|
}">
|
||||||
<image class="operation_btn_icon" src="https://online.totustec.com/upload/deviceManage/print_status1.png">
|
<image class="operation_btn_icon" src="https://online.totustec.com/upload/deviceManage/print_status1.png">
|
||||||
</image>
|
</image>
|
||||||
<view class="operation_btn_txt"
|
<view class="operation_btn_txt" :style="{
|
||||||
:style="{
|
|
||||||
color: deviceDetail.status != 0 && deviceDetail.status != -1 ? '#333333' : '#ece8e8',
|
color: deviceDetail.status != 0 && deviceDetail.status != -1 ? '#333333' : '#ece8e8',
|
||||||
}"
|
}">退出打印</view>
|
||||||
>退出打印</view>
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
@ -403,6 +400,7 @@ export default {
|
|||||||
reconnectTimer: null, // 重连定时器
|
reconnectTimer: null, // 重连定时器
|
||||||
reconnectInterval: 5000, // 重连间隔(5秒)
|
reconnectInterval: 5000, // 重连间隔(5秒)
|
||||||
socketData: {},
|
socketData: {},
|
||||||
|
isMediaRequesting: false, // 媒体请求状态锁,防止并发请求
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
onLoad (options) {
|
onLoad (options) {
|
||||||
@ -427,6 +425,17 @@ export default {
|
|||||||
this.closeWebSocket(); // 页面卸载时关闭连接
|
this.closeWebSocket(); // 页面卸载时关闭连接
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
// 媒体加载成功处理
|
||||||
|
handleMediaLoaded () {
|
||||||
|
this.isMediaLoading = false;
|
||||||
|
this.isMediaRequesting = false; // 解锁请求状态
|
||||||
|
},
|
||||||
|
|
||||||
|
// 媒体加载失败处理
|
||||||
|
handleMediaError () {
|
||||||
|
this.isMediaLoading = false;
|
||||||
|
this.isMediaRequesting = false; // 解锁请求状态
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -635,13 +644,54 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
// getVideoImg (type) {
|
||||||
|
// this.isMediaLoading = true;
|
||||||
|
// if (!this.isMediaLoading) {
|
||||||
|
// if (type == "img") {
|
||||||
|
// uni.showToast({
|
||||||
|
// title: "请等待图片获取完毕再进行切换",
|
||||||
|
// icon: "none"
|
||||||
|
// });
|
||||||
|
// } else {
|
||||||
|
// uni.showToast({
|
||||||
|
// title: "请等待视频获取完毕再进行切换",
|
||||||
|
// icon: "none"
|
||||||
|
// });
|
||||||
|
// }
|
||||||
|
// return
|
||||||
|
// }
|
||||||
|
|
||||||
|
// if (type == "img") {
|
||||||
|
// this.getType = "img";
|
||||||
|
// this.sendWsCommand("IMAGE");
|
||||||
|
// } else {
|
||||||
|
// this.getType = "video";
|
||||||
|
// this.sendWsCommand("OPEN_VIDEO");
|
||||||
|
// }
|
||||||
|
// },
|
||||||
getVideoImg (type) {
|
getVideoImg (type) {
|
||||||
|
// 如果正在请求媒体资源,提示并阻止操作
|
||||||
|
if (this.isMediaRequesting) {
|
||||||
|
const tipText = this.getType === "img"
|
||||||
|
? "请等待图片获取完毕再切换"
|
||||||
|
: "请等待视频获取完毕再切换";
|
||||||
|
uni.showToast({
|
||||||
|
title: tipText,
|
||||||
|
icon: "none",
|
||||||
|
duration: 2000
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 开始新的媒体请求,锁定状态
|
||||||
|
this.isMediaRequesting = true;
|
||||||
this.isMediaLoading = true;
|
this.isMediaLoading = true;
|
||||||
if (type == "img") {
|
this.getType = type;
|
||||||
this.getType = "img";
|
|
||||||
|
// 根据类型发送对应指令
|
||||||
|
if (type === "img") {
|
||||||
this.sendWsCommand("IMAGE");
|
this.sendWsCommand("IMAGE");
|
||||||
} else {
|
} else {
|
||||||
this.getType = "video";
|
|
||||||
this.sendWsCommand("OPEN_VIDEO");
|
this.sendWsCommand("OPEN_VIDEO");
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -896,7 +946,8 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.deviceN_input {
|
.deviceN_input {
|
||||||
width: 419rpx;
|
/* width: 419rpx; */
|
||||||
|
width: 347rpx;
|
||||||
height: 74rpx;
|
height: 74rpx;
|
||||||
background: #ffffff;
|
background: #ffffff;
|
||||||
border-radius: 10rpx;
|
border-radius: 10rpx;
|
||||||
@ -904,6 +955,7 @@ export default {
|
|||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 28rpx;
|
font-size: 28rpx;
|
||||||
color: #666666;
|
color: #666666;
|
||||||
|
padding-right: 72rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.label_text {
|
.label_text {
|
||||||
@ -1044,10 +1096,9 @@ export default {
|
|||||||
|
|
||||||
.img_video_warp {
|
.img_video_warp {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 321;
|
height: 321px;
|
||||||
background: rgba(0, 0, 0, 0.3);
|
background: rgba(0, 0, 0, 0.3);
|
||||||
border-radius: 20rpx;
|
border-radius: 20rpx;
|
||||||
margin: 22rpx 0 32rpx 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.back_button_icon {
|
.back_button_icon {
|
||||||
|
@ -265,7 +265,7 @@
|
|||||||
</view> -->
|
</view> -->
|
||||||
</view>
|
</view>
|
||||||
<view class="table_nodata_area" v-else>
|
<view class="table_nodata_area" v-else>
|
||||||
<image class="table_nodata_img" src="https://online.totustec.com/upload/indexPage/table_nodata_img1.png">
|
<image class="table_nodata_img" src="https://online.totustec.com/upload/indexPage/table_nodata_img2.png">
|
||||||
</image>
|
</image>
|
||||||
<view class="table_nodata_text">暂无设备预警</view>
|
<view class="table_nodata_text">暂无设备预警</view>
|
||||||
</view>
|
</view>
|
||||||
|
Loading…
Reference in New Issue
Block a user