From d47d6828d5f34e1a53ed0e1a66f8e06eeed18619 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 19 Dec 2025 15:56:05 +0800
Subject: [PATCH] feat: 待执行详情移入任务详情
---
/dev/null | 18 ---------
src/pages.json | 30 +-------------
src/components/WebViewPlus.vue | 7 +++
src/subPackages/taskDetail/inProgress/index.vue | 0
src/pages/inspectionTask/index.vue | 6 +-
5 files changed, 13 insertions(+), 48 deletions(-)
diff --git a/src/components/WebViewPlus.vue b/src/components/WebViewPlus.vue
index 437b7a8..a6ca687 100644
--- a/src/components/WebViewPlus.vue
+++ b/src/components/WebViewPlus.vue
@@ -33,6 +33,13 @@
}
}
+
+onLoad((obj) => {
+ // const h5Params = obj?.cs && JSON.parse(obj?.cs)
+ // console.log('h5Params', h5Params)
+ // h5Params && viewMessage({detail: {data: [h5Params.data]}})
+})
+
onShow(() => {
if (window && window.addEventListener)
window.addEventListener("message", messageFun);
diff --git a/src/pages.json b/src/pages.json
index 96aae35..6ce2a2c 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -44,12 +44,6 @@
}
},
{
- "path": "pages/placeholder/placeholder",
- "style": {
- "navigationBarTitleText": "占位页面"
- }
- },
- {
"path": "pages/dispatcher/index",
"style": {
"navigationStyle": "custom"
@@ -65,24 +59,6 @@
"style": {
"navigationBarTitleText": "404",
"navigationStyle": "custom"
- }
- },
- {
- "path": "theme/index",
- "style": {
- "navigationBarTitleText": "主题设置"
- }
- },
- {
- "path": "taskDetail/index",
- "style": {
- "navigationBarTitleText": "任务详情"
- }
- },
- {
- "path": "inProgress/index",
- "style": {
- "navigationBarTitleText": "任务详情"
}
},
{
@@ -105,9 +81,9 @@
}
},
{
- "path": "taskDetail/inExecution/index",
+ "path": "taskDetail/inProgress/index",
"style": {
- "navigationBarTitleText": "执行中"
+ "navigationBarTitleText": "任务详情"
}
},
{
@@ -207,4 +183,4 @@
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8"
}
-}
\ No newline at end of file
+}
diff --git a/src/pages/inspectionTask/index.vue b/src/pages/inspectionTask/index.vue
index f01c518..ee00720 100644
--- a/src/pages/inspectionTask/index.vue
+++ b/src/pages/inspectionTask/index.vue
@@ -31,7 +31,7 @@
if (data.type === 'taskDetails'){
if ([1,2].includes(data.rowItem.status)){
uni.navigateTo({
- url: `/subPackages/inProgress/index?wayLineJobInfoId=${data.rowItem.id}`
+ url: `/subPackages/taskDetail/inProgress/index?wayLineJobInfoId=${data.rowItem.id}`
});
} else {
uni.navigateTo({
@@ -53,7 +53,7 @@
// 清除数据
const encodedData = encodeURIComponent(JSON.stringify({ device_sn: '' }))
uni.setStorageSync('webview_params', encodedData);
-
+
uni.setStorageSync('lastTab', 'task');
uni.setTabBarItem({
index: 2,
@@ -70,4 +70,4 @@
</script>
<style scoped lang="scss">
-</style>
\ No newline at end of file
+</style>
diff --git a/src/subPackages/taskDetail/inExecution/index.vue b/src/subPackages/taskDetail/inExecution/index.vue
deleted file mode 100644
index e05ae39..0000000
--- a/src/subPackages/taskDetail/inExecution/index.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- 执行中-直播画面 -->
-<template>
- <view> 基础 </view>
-</template>
-
-<script setup></script>
-
-<style lang="scss" scoped></style>
diff --git a/src/subPackages/inProgress/index.vue b/src/subPackages/taskDetail/inProgress/index.vue
similarity index 100%
rename from src/subPackages/inProgress/index.vue
rename to src/subPackages/taskDetail/inProgress/index.vue
diff --git a/src/subPackages/taskDetail/index.vue b/src/subPackages/taskDetail/index.vue
deleted file mode 100644
index 632f947..0000000
--- a/src/subPackages/taskDetail/index.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
- * @Author : yuan
- * @Date : 2025-09-29 10:58:31
- * @LastEditors : yuan
- * @LastEditTime : 2025-09-29 11:38:21
- * @FilePath : \src\subPackages\taskDetail\index.vue
- * @Description :
- * Copyright 2025 OBKoro1, All Rights Reserved.
- * 2025-09-29 10:58:31
--->
-<!-- 任务详情-执行中 -->
-<template>
- <view> 基础 </view>
-</template>
-
-<script setup></script>
-
-<style lang="scss" scoped></style>
--
Gitblit v1.9.3