From fb876f841b1e0043e34dbabadd0d107f8302e1ac Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 8 Sep 2023 09:42:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                  | 13 ++++++++-----
 pages/device/WorkManage.vue | 19 +++++++++++++++++++
 pages/home/home.vue         | 27 +++++++++++++++------------
 utils/getData2.js           | 17 -----------------
 4 files changed, 42 insertions(+), 34 deletions(-)
 create mode 100644 pages/device/WorkManage.vue

diff --git a/pages.json b/pages.json
index 33cc8af..d3a9a11 100644
--- a/pages.json
+++ b/pages.json
@@ -57,17 +57,13 @@
 			} 
 		},
 		{
-<<<<<<< HEAD
 			"path": "pages/modules/EquipMaintainSure",
 			"style": {
 				"navigationStyle": "custom"
 			} 
 		},
 		{
-			"path": "pages/modules/EquipRepairExecute",
-=======
 			"path": "pages/device/RepairWork",
->>>>>>> 7f09ba976650bb89b69572bac02657185529bbed
 			"style": {
 				"navigationStyle": "custom"
 			} 
@@ -90,7 +86,14 @@
             	"navigationStyle": "custom"
             }
             
-        }
+        },
+		{
+		    "path" : "pages/device/WorkManage",
+		    "style": {
+		    	"navigationStyle": "custom"
+		    }
+		    
+		}
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/device/WorkManage.vue b/pages/device/WorkManage.vue
new file mode 100644
index 0000000..239d03a
--- /dev/null
+++ b/pages/device/WorkManage.vue
@@ -0,0 +1,19 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="stylus">
+
+</style>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 7038775..e96e2d8 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -35,31 +35,34 @@
 </template>
 
 <script>
-	import {authority} from '@/utils/getData2.js'
 	export default {
 		data() {
 			return {
 				userName: this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).username : '',
-				menuList: [],
+				menuList: [
+			{menu_id: '1', icon: 'RF06', name: '仓储管理', sonTree: [
+				{menu_id: '1', name: '原辅料收料', path: '/pages/warehouse/RawmaterialRevice'},
+				{menu_id: '2', name: '半成品入库', path: '/pages/warehouse/SemifinishedInStore'},
+				{menu_id: '3', name: '半成品出库', path: '/pages/warehouse/SemifinishedOutStore'},
+				{menu_id: '4', name: '空箱出库', path: '/pages/warehouse/EmptyOutStore'}
+				]},
+			{menu_id: '2', icon: 'RF01', name: '设备管理', sonTree: [
+				{menu_id: '1', name: '设备作业管理', path: '/pages/device/WorkManage'},
+				{menu_id: '2', name: '设备维修作业', path: '/pages/device/RepairWork'},
+				{menu_id: '3', name: '设备点检作业', path: '/pages/modules/EquipMaintainExecute'},
+				{menu_id: '4', name: '设备润滑作业', path: '/pages/modules/EquipMaintainExecute'},
+				{menu_id: '5', name: '设备保养作业', path: '/pages/modules/EquipMaintainExecute'}
+			]}
+		],
 				show: false,
 				secM: []
 			};
 		},
 		created () {
-			this._authority()
 			this.$store.dispatch('publicObj', '')
 		},
 		methods: {
-			async _authority () {
-				let res = await authority()
-				this.menuList = [...res.sonTree]
-				
-			},
 			toPage1 (e) {
-				// let url = e.path
-				// uni.redirectTo({
-				// 	url: url
-				// })
 				if (e.sonTree.length > 0) {
 					this.show = true
 					this.secM = e.sonTree
diff --git a/utils/getData2.js b/utils/getData2.js
index 12cd192..926232b 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -59,23 +59,6 @@ export const handRequest = () => request({
 	data: {}
 })
 
-// 菜单
-
-export const authority = () => {
-	let res = {
-		sonTree: [
-			// {menu_id: '5', icon: 'RF04', name: '设备点检', path: '/pages/modules/equip-inspection', sonTree: []}
-			{menu_id: '1', icon: 'RF06', name: '仓储管理', sonTree: [
-				{menu_id: '1', name: '半成品入库', path: '/pages/modules/SemifinishedInStore'},
-				{menu_id: '2', name: '半成品出库', path: '/pages/modules/SemifinishedOutStore'},
-				{menu_id: '3', name: '空箱出库', path: '/pages/modules/EmptyOutStore'}
-				]},
-			{menu_id: '2', icon: 'RF01', name: '生产管理', path: '', sonTree: []}
-		]
-	}
-	return res
-}
-
 /**
  * 半成品入库
  */