From 78cc185a31fb9e11eac7f56ebba931751f06e8ea Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Sun, 19 May 2024 16:05:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../specialOperations/specialCheck.vue        | 87 ++++++++++---------
 .../specialOperations/specialOperations.vue   | 87 ++++++++++---------
 2 files changed, 96 insertions(+), 78 deletions(-)

diff --git a/pages/projectEnd/specialOperations/specialCheck.vue b/pages/projectEnd/specialOperations/specialCheck.vue
index 559b5511..2a6b83d1 100644
--- a/pages/projectEnd/specialOperations/specialCheck.vue
+++ b/pages/projectEnd/specialOperations/specialCheck.vue
@@ -5,17 +5,17 @@
 				特种作业
 			</view>
 		</headers>
-		<view class="sp-menu" v-if="menuList.length > 0">
-			<view class="menu-item" @click="handleNavigateTo(item.path)" v-for="(item,i) in menuList">
+		<view class="sp-menu">
+		<!-- <view class="sp-menu" v-if="menuList.length > 0"> -->
+			<!-- <view class="menu-item" @click="handleNavigateTo(item.path)" v-for="(item,i) in menuList">
 				<view class="item-icon">
 					<image :src="'/static/specialOperations/'+item.iconImg"></image>
-					<!-- <image src="@/static/specialOperations/tempElectricity.png"></image> -->
 				</view>
 				<view class="item-text">
 					<text>{{item.menuName}}</text>
 				</view>
-			</view>
-			<!-- <view class="menu-item" @click="handleNavigateTo(1)">
+			</view> -->
+			<view class="menu-item" @click="handleNavigateTo(1)">
 				<view class="item-icon">
 					<image src="@/static/specialOperations/fireWork.png"></image>
 				</view>
@@ -78,7 +78,7 @@
 				<view class="item-text">
 					<text>断路作业</text>
 				</view>
-			</view> -->
+			</view>
 		</view>
 	</view>
 </template>
@@ -104,42 +104,51 @@
 			
 		},
 		onLoad() {
-			uni.showLoading({
-					title: "加载中...",
-			})
-			setTimeout(() =>{
-				this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
-				this.moduleList = this.userInfo.menuAuthority.moduleList
-				this.moduleList.map(item => {
-					if(item.plugin === "specialOperations") this.menuList = item.menuList
-				})
-				if(this.menuList.length > 0){
-					this.menuList.map(item => {
-						if(item.path === "/project/specialWork/fireWork") item.iconImg = 'fireWork.png'
-						if(item.path === "/project/specialWork/confinedSpaceWork") item.iconImg = 'limitSpaceWork.png'
-						if(item.path === "/project/specialWork/blindPlugWork") item.iconImg = 'bindPlatePlug.png'
-						if(item.path === "/project/specialWork/towerOverWork") item.iconImg = 'highJob.png'
-						if(item.path === "/project/specialWork/riggingOutWork") item.iconImg = 'hoistSafe.png'
-						if(item.path === "/project/specialWork/temporaryPowerWork") item.iconImg = 'tempElectricity.png'
-						if(item.path === "/project/specialWork/startBuildingWork") item.iconImg = 'groundSafe.png'
-						if(item.path === "/project/specialWork/disconnectionWork") item.iconImg = 'openCircuit.png'
-					})
-				}
-				console.log("userInfo=======================",this.userInfo);
-				console.log("moduleList=======================",this.moduleList);
-			},500)
-			uni.hideLoading()
+			// uni.showLoading({
+			// 		title: "加载中...",
+			// })
+			// setTimeout(() =>{
+			// 	this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
+			// 	this.moduleList = this.userInfo.menuAuthority.moduleList
+			// 	this.moduleList.map(item => {
+			// 		if(item.plugin === "specialOperations") this.menuList = item.menuList
+			// 	})
+			// 	if(this.menuList.length > 0){
+			// 		this.menuList.map(item => {
+			// 			if(item.path === "/project/specialWork/fireWork") item.iconImg = 'fireWork.png'
+			// 			if(item.path === "/project/specialWork/confinedSpaceWork") item.iconImg = 'limitSpaceWork.png'
+			// 			if(item.path === "/project/specialWork/blindPlugWork") item.iconImg = 'bindPlatePlug.png'
+			// 			if(item.path === "/project/specialWork/towerOverWork") item.iconImg = 'highJob.png'
+			// 			if(item.path === "/project/specialWork/riggingOutWork") item.iconImg = 'hoistSafe.png'
+			// 			if(item.path === "/project/specialWork/temporaryPowerWork") item.iconImg = 'tempElectricity.png'
+			// 			if(item.path === "/project/specialWork/startBuildingWork") item.iconImg = 'groundSafe.png'
+			// 			if(item.path === "/project/specialWork/disconnectionWork") item.iconImg = 'openCircuit.png'
+			// 		})
+			// 	}
+			// 	console.log("userInfo=======================",this.userInfo);
+			// 	console.log("moduleList=======================",this.moduleList);
+			// },500)
+			// uni.hideLoading()
 		},
 		methods:{
 			handleNavigateTo(val){
-				if(val === "/project/specialWork/fireWork") uni.navigateTo({ url: "./fireWork/checkList" })
-				if(val === "/project/specialWork/confinedSpaceWork") uni.navigateTo({ url: "./limitSpaceWork/checkList" })
-				if(val === "/project/specialWork/blindPlugWork") uni.navigateTo({ url: "./bindPlatePlug/checkList" })
-				if(val === "/project/specialWork/towerOverWork") uni.navigateTo({ url: "./highJob/checkList" })
-				if(val === "/project/specialWork/riggingOutWork") uni.navigateTo({ url: "./hoistSafe/checkList" })
-				if(val === "/project/specialWork/temporaryPowerWork") uni.navigateTo({ url: "./tempElectricity/checkList" })
-				if(val === "/project/specialWork/startBuildingWork") uni.navigateTo({ url: "./groundSafe/checkList" })
-				if(val === "/project/specialWork/disconnectionWork") uni.navigateTo({ url: "./openCircuit/checkList" })
+				// if(val === "/project/specialWork/fireWork") uni.navigateTo({ url: "./fireWork/work" })
+				// if(val === "/project/specialWork/confinedSpaceWork") uni.navigateTo({ url: "./limitSpaceWork/work" })
+				// if(val === "/project/specialWork/blindPlugWork") uni.navigateTo({ url: "./bindPlatePlug/work" })
+				// if(val === "/project/specialWork/towerOverWork") uni.navigateTo({ url: "./highJob/work" })
+				// if(val === "/project/specialWork/riggingOutWork") uni.navigateTo({ url: "./hoistSafe/work" })
+				// if(val === "/project/specialWork/temporaryPowerWork") uni.navigateTo({ url: "./tempElectricity/work" })
+				// if(val === "/project/specialWork/startBuildingWork") uni.navigateTo({ url: "./groundSafe/work" })
+				// if(val === "/project/specialWork/disconnectionWork") uni.navigateTo({ url: "./openCircuit/work" })
+				
+				if(val === 1) uni.navigateTo({ url: "./fireWork/checkList" })
+				if(val === 2) uni.navigateTo({ url: "./limitSpaceWork/checkList" })
+				if(val === 3) uni.navigateTo({ url: "./bindPlatePlug/checkList" })
+				if(val === 4) uni.navigateTo({ url: "./highJob/checkList" })
+				if(val === 5) uni.navigateTo({ url: "./hoistSafe/checkList" })
+				if(val === 6) uni.navigateTo({ url: "./tempElectricity/checkList" })
+				if(val === 7) uni.navigateTo({ url: "./groundSafe/checkList" })
+				if(val === 8) uni.navigateTo({ url: "./openCircuit/checkList" })
 			}
 		}
 	}
diff --git a/pages/projectEnd/specialOperations/specialOperations.vue b/pages/projectEnd/specialOperations/specialOperations.vue
index 5028921e..c0aeabdd 100644
--- a/pages/projectEnd/specialOperations/specialOperations.vue
+++ b/pages/projectEnd/specialOperations/specialOperations.vue
@@ -5,17 +5,17 @@
 				特种作业
 			</view>
 		</headers>
-		<view class="sp-menu" v-if="menuList.length > 0">
-			<view class="menu-item" @click="handleNavigateTo(item.path)" v-for="(item,i) in menuList">
+		<view class="sp-menu">
+		<!-- <view class="sp-menu" v-if="menuList.length > 0"> -->
+			<!-- <view class="menu-item" @click="handleNavigateTo(item.path)" v-for="(item,i) in menuList">
 				<view class="item-icon">
 					<image :src="'/static/specialOperations/'+item.iconImg"></image>
-					<!-- <image src="@/static/specialOperations/tempElectricity.png"></image> -->
 				</view>
 				<view class="item-text">
 					<text>{{item.menuName}}</text>
 				</view>
-			</view>
-			<!-- <view class="menu-item" @click="handleNavigateTo(1)">
+			</view> -->
+			<view class="menu-item" @click="handleNavigateTo(1)">
 				<view class="item-icon">
 					<image src="@/static/specialOperations/fireWork.png"></image>
 				</view>
@@ -78,7 +78,7 @@
 				<view class="item-text">
 					<text>断路作业</text>
 				</view>
-			</view> -->
+			</view>
 		</view>
 	</view>
 </template>
@@ -104,42 +104,51 @@
 			
 		},
 		onLoad() {
-			uni.showLoading({
-					title: "加载中...",
-			})
-			setTimeout(() =>{
-				this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
-				this.moduleList = this.userInfo.menuAuthority.moduleList
-				this.moduleList.map(item => {
-					if(item.plugin === "specialOperations") this.menuList = item.menuList
-				})
-				if(this.menuList.length > 0){
-					this.menuList.map(item => {
-						if(item.path === "/project/specialWork/fireWork") item.iconImg = 'fireWork.png'
-						if(item.path === "/project/specialWork/confinedSpaceWork") item.iconImg = 'limitSpaceWork.png'
-						if(item.path === "/project/specialWork/blindPlugWork") item.iconImg = 'bindPlatePlug.png'
-						if(item.path === "/project/specialWork/towerOverWork") item.iconImg = 'highJob.png'
-						if(item.path === "/project/specialWork/riggingOutWork") item.iconImg = 'hoistSafe.png'
-						if(item.path === "/project/specialWork/temporaryPowerWork") item.iconImg = 'tempElectricity.png'
-						if(item.path === "/project/specialWork/startBuildingWork") item.iconImg = 'groundSafe.png'
-						if(item.path === "/project/specialWork/disconnectionWork") item.iconImg = 'openCircuit.png'
-					})
-				}
-				console.log("userInfo=======================",this.userInfo);
-				console.log("moduleList=======================",this.moduleList);
-			},500)
-			uni.hideLoading()
+			// uni.showLoading({
+			// 		title: "加载中...",
+			// })
+			// setTimeout(() =>{
+			// 	this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
+			// 	this.moduleList = this.userInfo.menuAuthority.moduleList
+			// 	this.moduleList.map(item => {
+			// 		if(item.plugin === "specialOperations") this.menuList = item.menuList
+			// 	})
+			// 	if(this.menuList.length > 0){
+			// 		this.menuList.map(item => {
+			// 			if(item.path === "/project/specialWork/fireWork") item.iconImg = 'fireWork.png'
+			// 			if(item.path === "/project/specialWork/confinedSpaceWork") item.iconImg = 'limitSpaceWork.png'
+			// 			if(item.path === "/project/specialWork/blindPlugWork") item.iconImg = 'bindPlatePlug.png'
+			// 			if(item.path === "/project/specialWork/towerOverWork") item.iconImg = 'highJob.png'
+			// 			if(item.path === "/project/specialWork/riggingOutWork") item.iconImg = 'hoistSafe.png'
+			// 			if(item.path === "/project/specialWork/temporaryPowerWork") item.iconImg = 'tempElectricity.png'
+			// 			if(item.path === "/project/specialWork/startBuildingWork") item.iconImg = 'groundSafe.png'
+			// 			if(item.path === "/project/specialWork/disconnectionWork") item.iconImg = 'openCircuit.png'
+			// 		})
+			// 	}
+			// 	console.log("userInfo=======================",this.userInfo);
+			// 	console.log("moduleList=======================",this.moduleList);
+			// },500)
+			// uni.hideLoading()
 		},
 		methods:{
 			handleNavigateTo(val){
-				if(val === "/project/specialWork/fireWork") uni.navigateTo({ url: "./fireWork/work" })
-				if(val === "/project/specialWork/confinedSpaceWork") uni.navigateTo({ url: "./limitSpaceWork/work" })
-				if(val === "/project/specialWork/blindPlugWork") uni.navigateTo({ url: "./bindPlatePlug/work" })
-				if(val === "/project/specialWork/towerOverWork") uni.navigateTo({ url: "./highJob/work" })
-				if(val === "/project/specialWork/riggingOutWork") uni.navigateTo({ url: "./hoistSafe/work" })
-				if(val === "/project/specialWork/temporaryPowerWork") uni.navigateTo({ url: "./tempElectricity/work" })
-				if(val === "/project/specialWork/startBuildingWork") uni.navigateTo({ url: "./groundSafe/work" })
-				if(val === "/project/specialWork/disconnectionWork") uni.navigateTo({ url: "./openCircuit/work" })
+				// if(val === "/project/specialWork/fireWork") uni.navigateTo({ url: "./fireWork/work" })
+				// if(val === "/project/specialWork/confinedSpaceWork") uni.navigateTo({ url: "./limitSpaceWork/work" })
+				// if(val === "/project/specialWork/blindPlugWork") uni.navigateTo({ url: "./bindPlatePlug/work" })
+				// if(val === "/project/specialWork/towerOverWork") uni.navigateTo({ url: "./highJob/work" })
+				// if(val === "/project/specialWork/riggingOutWork") uni.navigateTo({ url: "./hoistSafe/work" })
+				// if(val === "/project/specialWork/temporaryPowerWork") uni.navigateTo({ url: "./tempElectricity/work" })
+				// if(val === "/project/specialWork/startBuildingWork") uni.navigateTo({ url: "./groundSafe/work" })
+				// if(val === "/project/specialWork/disconnectionWork") uni.navigateTo({ url: "./openCircuit/work" })
+				
+				if(val === 1) uni.navigateTo({ url: "./fireWork/work" })
+				if(val === 2) uni.navigateTo({ url: "./limitSpaceWork/work" })
+				if(val === 3) uni.navigateTo({ url: "./bindPlatePlug/work" })
+				if(val === 4) uni.navigateTo({ url: "./highJob/work" })
+				if(val === 5) uni.navigateTo({ url: "./hoistSafe/work" })
+				if(val === 6) uni.navigateTo({ url: "./tempElectricity/work" })
+				if(val === 7) uni.navigateTo({ url: "./groundSafe/work" })
+				if(val === 8) uni.navigateTo({ url: "./openCircuit/work" })
 			}
 		}
 	}