From 86c2d61ba9d33f1886cfc904dcaf17f033e4c80a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 17 Jan 2026 13:52:53 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/index.vue | 9 +++++++++
applications/task-work-order/src/store/modules/user.js | 4 ++--
applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue | 0
applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue | 9 +++++++++
applications/task-work-order/src/views/orderView/orderManage/clueEvents/index.vue | 0
applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/index.vue | 0
applications/drone-command/src/views/system/menu.vue | 4 ++++
applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue | 9 +++++++++
applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/index.vue | 9 +++++++++
applications/task-work-order/src/views/orderView/orderManage/operatingIncome/index.vue | 0
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue | 0
11 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/applications/drone-command/src/views/system/menu.vue b/applications/drone-command/src/views/system/menu.vue
index 1991771..3bffef7 100644
--- a/applications/drone-command/src/views/system/menu.vue
+++ b/applications/drone-command/src/views/system/menu.vue
@@ -206,6 +206,10 @@
label: '无人机管控',
value: 5,
},
+ {
+ label: '任务工单',
+ value: 6,
+ },
],
hide: true,
rules: [
diff --git a/applications/task-work-order/src/store/modules/user.js b/applications/task-work-order/src/store/modules/user.js
index 3950b41..a111e36 100644
--- a/applications/task-work-order/src/store/modules/user.js
+++ b/applications/task-work-order/src/store/modules/user.js
@@ -280,7 +280,7 @@
})
}
return new Promise(resolve => {
- getRoutes({tenantId,sysType: 5}).then(res => {
+ getRoutes({tenantId,sysType: 6}).then(res => {
const data = res.data.data;
let menu = deepClone(data);
if (!res.data?.data?.length){
@@ -299,7 +299,7 @@
},
GetButtons({ commit }) {
return new Promise(resolve => {
- getButtons({sysType: 5}).then(res => {
+ getButtons({sysType: 6}).then(res => {
const data = res.data.data;
commit('SET_PERMISSION', data);
resolve();
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/index.vue b/applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/index.vue
new file mode 100644
index 0000000..989d4d5
--- /dev/null
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/index.vue
@@ -0,0 +1,9 @@
+<template>
+ <basic-container>
+ 创新
+ </basic-container>
+</template>
+<script setup>
+</script>
+<style scoped lang="scss">
+</style>
diff --git a/applications/task-work-order/src/views/basicManage/index.vue b/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/index.vue
similarity index 100%
copy from applications/task-work-order/src/views/basicManage/index.vue
copy to applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/index.vue
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue b/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue
new file mode 100644
index 0000000..e3b7695
--- /dev/null
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue
@@ -0,0 +1,9 @@
+<template>
+ <basic-container>
+ 评价管理
+ </basic-container>
+</template>
+<script setup>
+</script>
+<style scoped lang="scss">
+</style>
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/index.vue b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/index.vue
new file mode 100644
index 0000000..faf27af
--- /dev/null
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/index.vue
@@ -0,0 +1,9 @@
+<template>
+ <basic-container>
+ 供需填报管理
+ </basic-container>
+</template>
+<script setup>
+</script>
+<style scoped lang="scss">
+</style>
diff --git a/applications/task-work-order/src/views/basicManage/index.vue b/applications/task-work-order/src/views/orderView/orderManage/clueEvents/index.vue
similarity index 100%
rename from applications/task-work-order/src/views/basicManage/index.vue
rename to applications/task-work-order/src/views/orderView/orderManage/clueEvents/index.vue
diff --git a/applications/task-work-order/src/views/basicManage/index.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue
similarity index 100%
copy from applications/task-work-order/src/views/basicManage/index.vue
copy to applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue
diff --git a/applications/task-work-order/src/views/basicManage/index.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
similarity index 100%
copy from applications/task-work-order/src/views/basicManage/index.vue
copy to applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
diff --git a/applications/task-work-order/src/views/basicManage/index.vue b/applications/task-work-order/src/views/orderView/orderManage/operatingIncome/index.vue
similarity index 100%
copy from applications/task-work-order/src/views/basicManage/index.vue
copy to applications/task-work-order/src/views/orderView/orderManage/operatingIncome/index.vue
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
new file mode 100644
index 0000000..086b752
--- /dev/null
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
@@ -0,0 +1,9 @@
+<template>
+ <basic-container>
+ 工单管理
+ </basic-container>
+</template>
+<script setup>
+</script>
+<style scoped lang="scss">
+</style>
--
Gitblit v1.9.3