xunyingcloud/totustec-unipp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加友好提示

Browse Source
This commit is contained in:
18796357645 2025-07-19 18:39:37 +08:00
parent 13cd1c300b
commit 30fe13dac2
2 changed files with 169 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pages/deviceBind/index.vue
View File

@ -136,9 +136,19 @@ export default {
showCancel: false // 不显示取消按钮（可选） showCancel: false // 不显示取消按钮（可选）
}); });
// console.log('res', res); // console.log('res', res);
if (res.statusCode === 200) { if (res.statusCode === 200) {
uni.showToast({ title: "绑定成功" }); uni.showToast({
title: "绑定成功",
icon: "success", // 可选，增加成功图标
duration: 1500 // 1.5秒后自动关闭
});
// 1.5秒后跳转到设备页面
setTimeout(() => {
uni.navigateTo({
url: "/pages/device/index"
});
}, 1500);
} }
} catch (error) { } catch (error) {
console.error("设备绑定失败:", error); console.error("设备绑定失败:", error);

145
pages/deviceManage/index.vue
View File

@ -24,11 +24,6 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 临时调试 -->
<!-- <video class="img_video_warp" :src="socketData.videoUrl" v-if="socketData.videoUrl"></video>
<image class="img_video_warp" v-else :src="socketData.imageUrl"></image> -->
<!-- 视频、图片区域（含加载动画） --> <!-- 视频、图片区域（含加载动画） -->
<view class="media_container"> <view class="media_container">
<!-- 加载动画（转圈效果） --> <!-- 加载动画（转圈效果） -->
@ -66,21 +61,21 @@
<view class="item_content_warp"> <view class="item_content_warp">
<view class="item_content_left">{{ field.label }}</view> <view class="item_content_left">{{ field.label }}</view>
<view class="item_content_middel"> <view class="item_content_middel">
<!-- 状态处理 完成-->
<!-- 状态处理 -->
<template v-if="field.isStatus"> <template v-if="field.isStatus">
<view class="label_warp" v-if="deviceDetail.status == 0"> <view class="label_warp" v-if="deviceDetail.status == 0">
<view class="label_icon"></view> <view class="label_icon"></view>
<view class="label_text">空闲</view> <view class="label_text">空闲</view>
</view> </view>
<view class="label_warp" v-if="deviceDetail.status == 2">
<view class="label_icon" style="background: #00abff"></view>
<view class="label_text" style="color: #00abff">准备中</view>
</view>
<view class="label_warp" v-if="deviceDetail.status == 1"> <view class="label_warp" v-if="deviceDetail.status == 1">
<view class="label_icon" style="background: #00d195"></view> <view class="label_icon" style="background: #00d195"></view>
<view class="label_text" style="color: #00d195">打印中</view> <view class="label_text" style="color: #00d195">打印中</view>
</view> </view>
<view class="label_warp" v-if="deviceDetail.status == 2">
<view class="label_icon" style="background: #00abff"></view>
<view class="label_text" style="color: #00abff">准备中</view>
</view>
<view class="label_warp" v-if="deviceDetail.status == 3"> <view class="label_warp" v-if="deviceDetail.status == 3">
<view class="label_icon" style="background: #fdcb3b"></view> <view class="label_icon" style="background: #fdcb3b"></view>
<view class="label_text" style="color: #fdcb3b">铲件中</view> <view class="label_text" style="color: #fdcb3b">铲件中</view>
@ -94,10 +89,9 @@
<!-- 子状态处理 --> <!-- 子状态处理 -->
<template v-else-if="field.isErrorStatus"> <template v-else-if="field.isErrorStatus">
<view class="label_warp2"> <view class="label_warp2">
<view class="label_icon" :style="{ background: getStatusColor(deviceDetail.printStatus) }"> <view class="label_icon" :style="{ background: getStatusColor(printInfo.status) }"></view>
</view> <view class="label_text label_text2" :style="{ color: getStatusColor(printInfo.status) }">
<view class="label_text label_text2" :style="{ color: getStatusColor(deviceDetail.printStatus) }"> {{ getStatusText2(printInfo.status) }}
{{ getStatusText2(deviceDetail.printStatus) }}
</view> </view>
</view> </view>
</template> </template>
@ -144,7 +138,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" src="https://online.totustec.com/upload/deviceManage/empty_log_icon.png"></image> <image class="empty_state_icon"
src="https://online.totustec.com/upload/deviceManage/empty_log_icon.png"></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>
@ -165,44 +160,52 @@
</view> </view>
<view class="deviceN_input_tip">文件位置：桌面File文件夹内</view> <view class="deviceN_input_tip">文件位置：桌面File文件夹内</view>
<view class="device_operation_warp"> <view class="device_operation_warp">
<view class="device_operation_btn" @click="operationData('PRINT')" :style="{ <!--只有主状态等于0时候开始打印才能点击，其他都不能点击-->
backgroundColor: <view class="device_operation_btn"
deviceDetail.status == 0 @click="operationData('PRINT')"
? '#ffffff' :style="{backgroundColor:deviceDetail.status === 0? '#ffffff':'#cccccc'}
: '#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">开始打印</view> :style="{
color:deviceDetail.status === 0 ?'#333333':'#ece8e8' ,}"
>开始打印</view>
</view> </view>
<view class="device_operation_btn" @click="operationData('CONTINUE')" :style="{ <!--继续打印-->
backgroundColor: <view class="device_operation_btn"
deviceDetail.status != 0 && @click="operationData('CONTINUE')"
deviceDetail.status != 1 && :style="{backgroundColor:deviceDetail.status === 0 || printInfo.status !== 6? '#cccccc': '#ffffff'}"
deviceDetail.printStatus != 6 && >
deviceDetail.status != -1
? '#ffffff'
: '#cccccc',
}">
<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> <view class="operation_btn_txt"
:style="{color:deviceDetail.status === 0 || printInfo.status !== 6? '#ece8e8': '#333333'}"
>继续打印</view>
</view> </view>
</view> </view>
<!--暂停打印 退出打印-->
<view class="device_operation_warp"> <view class="device_operation_warp">
<view class="device_operation_btn" @click="operationData('PAUSE')" :style="{ <view class="device_operation_btn" @click="operationData('PAUSE')" :style="{
backgroundColor: backgroundColor:
deviceDetail.status == 1 || deviceDetail.status == 2 deviceDetail.status === 1 ||
deviceDetail.status === 2 ||
printInfo.status === 6
? '#ffffff' ? '#ffffff'
: '#cccccc', : '#cccccc',
}"> }">
<!-- <image class="operation_btn_icon" src="https://online.totustec.com/upload/deviceManage/print_status1.png">
</image> -->
<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> <view class="operation_btn_txt"
:style="{
color:
deviceDetail.status === 1 ||
deviceDetail.status === 2 ||
printInfo.status === 6
?'#333333':'#ece8e8' ,
}"
>暂停打印</view>
</view> </view>
<view class="device_operation_btn" @click="operationData('EXIT')" :style="{ <view class="device_operation_btn" @click="operationData('EXIT')" :style="{
@ -211,10 +214,17 @@
}"> }">
<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> <view class="operation_btn_txt"
:style="{
color:
deviceDetail.status != -1
?'#ece8e8': '#333333',
}"
>退出打印</view>
</view> </view>
</view> </view>
<!-- 报警继续 报警退出-->
<view class="device_operation_warp"> <view class="device_operation_warp">
<view class="device_operation_btn" @click="sendWsCommand('ALARM_CONTINUE')"> <view class="device_operation_btn" @click="sendWsCommand('ALARM_CONTINUE')">
<image class="operation_btn_icon" src="https://online.totustec.com/upload/deviceManage/print_status2.png"> <image class="operation_btn_icon" src="https://online.totustec.com/upload/deviceManage/print_status2.png">
@ -425,6 +435,9 @@ export default {
this.closeWebSocket(); // 页面卸载时关闭连接 this.closeWebSocket(); // 页面卸载时关闭连接
}, },
methods: { methods: {
// ---------------------- WebSocket 核心方法 ---------------------- // ---------------------- WebSocket 核心方法 ----------------------
connectWebSocket() { connectWebSocket() {
const wsUrl = BASE_STOKECT_URL; const wsUrl = BASE_STOKECT_URL;
@ -554,7 +567,6 @@ export default {
}); });
return; return;
} }
// 检查设备状态 // 检查设备状态
if (this.deviceDetail.status == 0 && this.deviceDetail.status != -1) { if (this.deviceDetail.status == 0 && this.deviceDetail.status != -1) {
// 显示确认提示框 // 显示确认提示框
@ -572,19 +584,30 @@ export default {
}); });
} }
} }
if (type == "CONTINUE") { if (type === "CONTINUE") {
if ( // 检查设备状态
this.deviceDetail.status != 0 && if (this.deviceDetail.status === 0) {
this.deviceDetail.status != 1 && uni.showToast({
this.deviceDetail.printStatus != 6 && title: "当前设备空闲，禁止继续打印",
this.deviceDetail.status != -1 icon: "none",
) { duration: 1500
});
console.log("设备未就绪，禁止继续打印");
return;
}
if (this.printInfo.status !== 6) {
uni.showToast({
title: "当前设备未暂定，禁止继续打印",
icon: "none",
duration: 1500
});
return;
}
this.sendWsCommand(type); this.sendWsCommand(type);
} }
}
if (type == 'PAUSE') { if (type == 'PAUSE') {
if ((this.deviceDetail.status == 1 || this.deviceDetail.status == 2) && this.deviceDetail.status != - if ((this.deviceDetail.status == 1 || this.deviceDetail.status == 2 || this.printInfo.status == 3) && this.deviceDetail.status != -1) {
1) {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '确定要暂停打印吗？', content: '确定要暂停打印吗？',
@ -632,7 +655,8 @@ export default {
return this.statusMap[status]?.text || ""; return this.statusMap[status]?.text || "";
}, },
getStatusText2(status) { getStatusText2(status) {
if (status == -1) { //如果状态为-1就算断开
if (status === -1) {
return "断开"; return "断开";
} }
return this.childStatusMap[status]?.text || ""; return this.childStatusMap[status]?.text || "";
@ -647,12 +671,13 @@ export default {
getCurrentTime() { getCurrentTime() {
const date = new Date(); const date = new Date();
const year = date.getFullYear(); const year = date.getFullYear();
const month = String(date.getMonth() + 1).padStart(2, "0"); const month = String(date.getMonth() + 1).padStart(2, "0"); // 月份补零
const day = String(date.getDate()).padStart(2, "0"); const day = String(date.getDate()).padStart(2, "0"); // 日期补零
const hours = String(date.getHours()).padStart(2, "0"); const hours = String(date.getHours()).padStart(2, "0"); // 小时补零
const minutes = String(date.getMinutes()).padStart(2, "0"); const minutes = String(date.getMinutes()).padStart(2, "0"); // 分钟补零
const seconds = String(date.getSeconds()).padStart(2, "0"); // 新增：秒补零
return `${year}年${month}月${day}日${hours}时${minutes}分`; // 格式：YYYY.MM.DD HH:MM:SS
return `${year}.${month}.${day} ${hours}:${minutes}:${seconds}`;
}, },
goBack() { goBack() {
uni.navigateBack(); uni.navigateBack();
@ -810,6 +835,8 @@ export default {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
border: 2rpx solid #cccccc;
color: #cccccc;
} }
.device_operation_warp { .device_operation_warp {