From 02cc4a12975e384e6dea4da6c8bef9bb4c3ff4f5 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Tue, 9 Jul 2024 15:11:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=B7=B3=E8=BD=AC=E5=B2=97?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/learnPath/allPath.vue   | 10 ++++++++--
 pages/learnPath/learnPath.vue |  5 ++++-
 pages/study/index.vue         |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pages/learnPath/allPath.vue b/pages/learnPath/allPath.vue
index 63d2b9f..878d0c1 100644
--- a/pages/learnPath/allPath.vue
+++ b/pages/learnPath/allPath.vue
@@ -45,6 +45,7 @@
 			              v-else-if="(t && t.permission)"
 			              src="@/static/images/learnpath/otherpath.png" 
 			              mode="aspectFit"
+						  @click="goOtherPath(t)"
 						  style="width: 40rpx;height: 36rpx;"
 			            />
 			           <!-- <image 
@@ -109,7 +110,6 @@
 			}
 		},
 		 onShow: function(options) {
-			 console.log('xixi')
 			  const bandCodeList = uni.getStorageSync('bandCodeList');
 			  const positionIdList = uni.getStorageSync('positionIdList');
 				getFullJobPath({
@@ -133,6 +133,12 @@
 		onLoad() {
 		},
 		methods: {
+			goOtherPath(item){
+				console.log(item,'item')
+				uni.navigateTo({
+					url: '/pages/learnPath/learnPath?growId='+item.growId+'&name='+item.growName + '&isAllPath=' + false
+				});
+			},
 			integrateTableData(data) {
 			    const { growFullPositionPathBoItemList, allBandCodeList } = data;
 			    const bandCodeIndexMap = new Map(allBandCodeList.map((code, index) => [code, index]));
@@ -152,7 +158,7 @@
 			          const codeTrimmed = code.trim();
 			          const index = bandCodeIndexMap.get(codeTrimmed);
 			          if (index !== undefined) {
-			            integratedDataMap.get(key).bandCodes[index] = { growId: item.growId, permission: item.permission ,isMajorPosition:item.isMajorPosition };
+			            integratedDataMap.get(key).bandCodes[index] = { growId: item.growId, permission: item.permission ,isMajorPosition:item.isMajorPosition,growName:item.growName };
 			          }
 			        });
 			      });
diff --git a/pages/learnPath/learnPath.vue b/pages/learnPath/learnPath.vue
index 04cb58b..e214db6 100644
--- a/pages/learnPath/learnPath.vue
+++ b/pages/learnPath/learnPath.vue
@@ -5,7 +5,8 @@
 		</view>
 		<view class="path_body" :style="{height:dataList.length<=7?'93vh':''}">
 			<view class="body_header">
-				<view class="left" @click="goAllPath">全岗位路径</view>
+				<view class="left" v-if="isAllPath" @click="goAllPath">全岗位路径</view>
+				<view v-else></view>
 				<view class="right">
 					<u-switch size="14" v-model="openDown"></u-switch>
 					<text class="text">高亮显示未完成</text>
@@ -93,9 +94,11 @@
 		onLoad(options) {
 			this.growId = options.growId
 			this.titleName = options.name
+			this.isAllPath = options.isAllPath == 'true'
 		},
 		data() {
 			return {
+				isAllPath: true,
 				istabId: '',
 				notColor: [],
 			    flagToggle: 0,
diff --git a/pages/study/index.vue b/pages/study/index.vue
index 4a464b9..6fb23e4 100644
--- a/pages/study/index.vue
+++ b/pages/study/index.vue
@@ -452,7 +452,7 @@
 		methods: {
 			goLearn() {
 				uni.navigateTo({
-					url: '/pages/learnPath/learnPath?growId='+this.detailData.growId+'&name='+this.detailData.growName
+					url: '/pages/learnPath/learnPath?growId='+this.detailData.growId+'&name='+this.detailData.growName + '&isAllPath=' + true
 					
 				});
 			},