From 75f956534a20ecdec0716db3262477e5fb2c895b Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 25 Nov 2025 19:01:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/store/modules/app/index.js | 11 ++++++++++-
src/subPackages/droneConsole/index.vue | 4 ++--
src/hooks/useGlobalWS.js | 6 ++++++
src/subPackages/userDetail/password/index.vue | 7 ++++---
src/pages/inspectionTask/index.vue | 10 +++++++++-
5 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/src/hooks/useGlobalWS.js b/src/hooks/useGlobalWS.js
index 450c29a..303727c 100644
--- a/src/hooks/useGlobalWS.js
+++ b/src/hooks/useGlobalWS.js
@@ -1,21 +1,27 @@
import {useUserStore} from "@/store/index.js";
import {getEnvObj} from "@/utils/index.js";
import {enterRoom} from "@/utils/voiceCallByTX/index.js";
+import useAppStore from "../store/modules/app/index.js";
let socketTask = null
export function useGlobalWS() {
const userStore = useUserStore();
+ const appStore = useAppStore();
+
const userId = computed(() => userStore?.userInfo?.user_id)
const access_token = computed(() => userStore?.userInfo?.access_token)
const {VITE_APP_WS_API_URL} = getEnvObj()
// 消息处理
function messageHandler(payload) {
+ console.log(payload, '767')
switch (payload.biz_code) {
case 'JOB_ISREFRESH':
+ appStore.setJobUpdateKeyAdd()
break
case 'DEVICE_ISREFRESH':
+ appStore.setDeviceUpdateKeyAdd()
break
case 'DOWNLOAD_PROGRESS':
break
diff --git a/src/pages/inspectionTask/index.vue b/src/pages/inspectionTask/index.vue
index 2a6ff67..63ef01b 100644
--- a/src/pages/inspectionTask/index.vue
+++ b/src/pages/inspectionTask/index.vue
@@ -8,12 +8,20 @@
import WebViewPlus from "@/components/WebViewPlus.vue";
import {onHide, onShow} from "@dcloudio/uni-app";
import {errorFactory} from "sass-loader/dist/utils.js";
+import { useAppStore } from "@/store/index.js"
+
+const appStore = useAppStore()
// const viewUrl = getWebViewUrl('/inspectionTask')
const updateKey = ref(0)
+const sxListKey = ref(0)
const viewUrl = computed(() => {
- return getWebViewUrl( '/inspectionTask', { updateKey: updateKey.value })
+ return getWebViewUrl( '/inspectionTask', { updateKey: updateKey.value,sxListKey: sxListKey.value })
+})
+
+watch(() => [appStore.jobUpdateKey, appStore.deviceUpdateKey], () => {
+ sxListKey.value = sxListKey.value + 1
})
diff --git a/src/store/modules/app/index.js b/src/store/modules/app/index.js
index 8ffada5..b77db8d 100644
--- a/src/store/modules/app/index.js
+++ b/src/store/modules/app/index.js
@@ -7,7 +7,9 @@
const useAppStore = defineStore('app', {
state: () => ({
systemInfo: {}, // 原本 TS: {} as UniApp.GetSystemInfoResult
- theme: storage.get(THEME_KEY) || 'light'
+ theme: storage.get(THEME_KEY) || 'light',
+ deviceUpdateKey: 0, //设备刷新key
+ jobUpdateKey: 0, //任务刷新key
}),
getters: {
getSystemInfo (state) {
@@ -21,6 +23,13 @@
setSystemInfo (info) {
this.systemInfo = info
},
+ setDeviceUpdateKeyAdd () {
+ console.log(111, this.deviceUpdateKey + 1)
+ this.deviceUpdateKey = this.deviceUpdateKey + 1
+ },
+ setJobUpdateKeyAdd (state, data) {
+ this.deviceUpdateKey = this.deviceUpdateKey + 1
+ },
initSystemInfo () {
uni.getSystemInfo({
success: (res) => {
diff --git a/src/subPackages/droneConsole/index.vue b/src/subPackages/droneConsole/index.vue
index a745229..7128beb 100644
--- a/src/subPackages/droneConsole/index.vue
+++ b/src/subPackages/droneConsole/index.vue
@@ -18,8 +18,8 @@
function onPostMessage(data) {
if (data.type === 'back'){
- uni.navigateBack({
- delta: 1 // 返回的页面数，默认1（返回上一页）
+ uni.navigateTo({
+ url: `/subPackages/inProgress/index?wayLineJodInfoId=${data.taskDetails.id}`
});
}
}
diff --git a/src/subPackages/userDetail/password/index.vue b/src/subPackages/userDetail/password/index.vue
index d8b2c52..7038a91 100644
--- a/src/subPackages/userDetail/password/index.vue
+++ b/src/subPackages/userDetail/password/index.vue
@@ -210,9 +210,10 @@
color: #222324;
font-family: Source Han Sans CN, Source Han Sans CN;
}
-
+ :deep(.uni-input-placeholder) {
+ color: #D5D5D5;
+ }
input.input-item::placeholder {
- color: #c9c9c9;
font-size: 30rpx;
}
}
@@ -232,4 +233,4 @@
width: 276rpx;
height: 76rpx;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3