From d038dbb6b51f2ab5c283df96bc21d35e49f7b1f9 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Thu, 24 Oct 2024 14:09:50 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9zzy2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/realName/index/index.vue            | 25 ++++++----
 pages/realName/index/pages/personList.vue | 20 ++++++--
 pages/realName/index/pages/project.vue    | 57 +++++++++++++----------
 pages/realName/index/pages/subList.vue    | 28 ++++++-----
 pages/realName/index/pages/teamList.vue   | 20 ++++++--
 5 files changed, 99 insertions(+), 51 deletions(-)

diff --git a/pages/realName/index/index.vue b/pages/realName/index/index.vue
index ca0e076..7ceecb8 100644
--- a/pages/realName/index/index.vue
+++ b/pages/realName/index/index.vue
@@ -1,15 +1,20 @@
 <template>
   <view class="page">
-    <u-navbar
-      class="u-navbar"
-      title="首页"
-      placeholder
-      @leftClick="leftClick"
-      leftIconColor="#fff"
-      bgColor="#00337A"
-      :titleStyle="{ color: '#FFF', fontSize: '32rpx' }"
-    ></u-navbar>
-    <button class="refresh-btn" @tap="onRefreshPages">刷新</button>
+	<u-navbar
+	  class="u-navbar"
+	  title="首页"
+	  placeholder
+	  @leftClick="leftClick"
+	  leftIconColor="#fff"
+	  rightIcon="list" @rightClick="onRefreshPages"
+	  bgColor="#00337A"
+	  :titleStyle="{ color: '#FFF', fontSize: '32rpx' }"
+	>
+	<view class="u-nav-slot" slot="right">
+		<text style="color: #FFF;">刷新</text>
+	</view>
+	</u-navbar>
+    <!-- <button class="refresh-btn" @tap="onRefreshPages">刷新</button> -->
     <scroll-view scroll-y="true">
       <!-- 轮播图区域 -->
       <swiper class="swiper-container" autoplay interval="3000" circular indicator-dots>
diff --git a/pages/realName/index/pages/personList.vue b/pages/realName/index/pages/personList.vue
index b4d94ef..0ee7669 100644
--- a/pages/realName/index/pages/personList.vue
+++ b/pages/realName/index/pages/personList.vue
@@ -1,8 +1,19 @@
 <template>
   <view class="page">
-    <u-navbar class="u-navbar" title="人员信息" placeholder @leftClick="leftClick"
-      leftIconColor="#fff"  bgColor="#00337A" :titleStyle="{ color: '#FFF', fontSize: '32rpx' }"/>
-
+	<u-navbar
+	  class="u-navbar"
+	  title="人员信息"
+	  placeholder
+	  @leftClick="leftClick"
+	  leftIconColor="#fff"
+	  rightIcon="list" @rightClick="goIndex"
+	  bgColor="#00337A"
+	  :titleStyle="{ color: '#FFF', fontSize: '32rpx' }"
+	>
+	<view class="u-nav-slot" slot="right">
+		<text style="color: #FFF;">首页</text>
+	</view>
+	</u-navbar>
     <view class="header-fixed">
       <view class="search-content">
 		<view style="width: 25%;">
@@ -472,6 +483,9 @@ export default {
 		console.log(row)
       uni.navigateTo({ url: `/pages/realName/index/pages/personDetail?idNumber=${row.idNumber}` })
     },
+	goIndex() {
+	  uni.navigateTo({ url: `/pages/realName/index/index` })
+	},
     /* 收藏与取消收藏 */
     onCollection(e, row) {
 		e.stopPropagation()
diff --git a/pages/realName/index/pages/project.vue b/pages/realName/index/pages/project.vue
index bb5b5f8..b5c96ee 100644
--- a/pages/realName/index/pages/project.vue
+++ b/pages/realName/index/pages/project.vue
@@ -6,10 +6,14 @@
       placeholder
       @leftClick="leftClick"
       leftIconColor="#fff"
+	  rightIcon="list" @rightClick="goIndex"
       bgColor="#00337A"
       :titleStyle="{ color: '#FFF', fontSize: '32rpx' }"
-    />
-
+    >
+	<view class="u-nav-slot" slot="right">
+		<text style="color: #FFF;">首页</text>
+	</view>
+	</u-navbar>
     <view class="header-fixed">
       <view class="search-content">
         <view style="width: 90%">
@@ -27,18 +31,13 @@
     <view style="padding: 0 20rpx">
       <scroll-view class="data-container" scroll-y="true">
         <view class="scroll-item" v-for="(item, index) in companyInfoList" :key="index">
-          <view class="item-1">
-            <view>{{ index + 1 }}</view>
-            <view>{{ item.proName }}</view>
-            <uni-icons
-              :type="item.isCollect == 1 ? 'star-filled' : 'star'"
-              size="20"
-              @click="onCollection($event, item)"
-              :style="{ color: item.isCollect == 1 ? '#f9971e' : '' }"
-              style="position: absolute; right: 1%"
-            ></uni-icons>
-          </view>
-
+         
+           <view class="item-1">
+             <view>{{ index + 1 }}</view>
+             <view>{{ item.proName }}</view>
+             <uni-icons :type="item.isCollect == 1 ? 'star-filled' : 'star'" size="20" @click="onCollection($event, item)" :style="{ color: item.isCollect == 1 ? '#f9971e' : '' }" style="position: absolute;right: 1%;"></uni-icons>
+           </view>
+          
           <view class="item-2">
             <view>{{ item.subComName }}</view>
             <view>{{ item.voltageLevel }}</view>
@@ -236,22 +235,29 @@ export default {
         const { currentIndex, name } = voltageLevel
         this.activeIndex3 = currentIndex + 1
         this.queryParams.params.voltageLevel = this.levelList[currentIndex + 1].id
-      }
-      if (option.proType) {
+		this.getListData()
+      } else if (option.proType) {
         // 获取工程类型
         const proType = JSON.parse(option.proType)
         const { currentIndex, name } = proType
         this.activeIndex4 = currentIndex + 1
-        this.queryParams.params.proType = name
-      }
-      if (option.survey) {
+        this.queryParams.params.proType = this.proTypeList[currentIndex + 1].id
+		this.getListData()
+      } else if (option.survey) {
         // 获取工程概况
         const survey = JSON.parse(option.survey)
         const { currentIndex, name } = survey
         this.activeIndex2 = currentIndex
-        this.queryParams.params.proStatus = this.proStatusList[currentIndex].id
-      }
-      this.getListData()
+        this.queryParams.params.proStatus = this.proStatusList[currentIndex+ 1].id
+		this.getListData()
+      } else if(option.proStatus&&option.proStatus==0){//在建
+	  		this.activeIndex2=1
+			this.queryParams.params.proStatus = "0"
+			this.getListData()
+	  }else{
+	  		this.getListData()
+	  }
+      
     })
   },
   methods: {
@@ -370,10 +376,13 @@ export default {
       //绿2 黄1 红0
       uni.navigateTo({ url: `/pages/realName/index/pages/personList?proId=${row.proId}&lightStatus=${type}` })
     },
-
+	goIndex() {
+      
+      uni.navigateTo({ url: `/pages/realName/index/index` })
+    },
     /* 收藏与取消收藏 */
     onCollection(e, row) {
-      console.log(row)
+		console.log(row) 
       const params = {
         id: row.collectId,
         userId: uni.getStorageSync('realNameUser').userId,
diff --git a/pages/realName/index/pages/subList.vue b/pages/realName/index/pages/subList.vue
index 12d6c09..72e1765 100644
--- a/pages/realName/index/pages/subList.vue
+++ b/pages/realName/index/pages/subList.vue
@@ -1,15 +1,19 @@
 <template>
   <view class="page">
-    <u-navbar
-      class="u-navbar"
-      title="分包信息"
-      placeholder
-      @leftClick="leftClick"
-      leftIconColor="#fff"
-      bgColor="#00337A"
-      :titleStyle="{ color: '#FFF', fontSize: '32rpx' }"
-    />
-
+	<u-navbar
+	  class="u-navbar"
+	  title="分包信息"
+	  placeholder
+	  @leftClick="leftClick"
+	  leftIconColor="#fff"
+	  rightIcon="list" @rightClick="goIndex"
+	  bgColor="#00337A"
+	  :titleStyle="{ color: '#FFF', fontSize: '32rpx' }"
+	>
+	<view class="u-nav-slot" slot="right">
+		<text style="color: #FFF;">首页</text>
+	</view>
+	</u-navbar>
     <view class="header-fixed">
       <view class="search-content">
         <view style="width: 98%">
@@ -362,7 +366,9 @@ export default {
       //绿2 黄1 红0
       uni.navigateTo({ url: `/pages/realName/index/pages/personList?subId=${row.subId}&lightStatus=${type}` })
     },
-
+	goIndex() {
+	  uni.navigateTo({ url: `/pages/realName/index/index` })
+	},
     /* 收藏与取消收藏 */
     onCollection(e, row) {
       e.stopPropagation()
diff --git a/pages/realName/index/pages/teamList.vue b/pages/realName/index/pages/teamList.vue
index 356587f..9bdfa05 100644
--- a/pages/realName/index/pages/teamList.vue
+++ b/pages/realName/index/pages/teamList.vue
@@ -1,8 +1,19 @@
 <template>
   <view class="page">
-    <u-navbar class="u-navbar" title="班组信息" placeholder @leftClick="leftClick"
-      leftIconColor="#fff"  bgColor="#00337A" :titleStyle="{ color: '#FFF', fontSize: '32rpx' }"/>
-
+    <u-navbar
+	  class="u-navbar"
+	  title="班组信息"
+	  placeholder
+	  @leftClick="leftClick"
+	  leftIconColor="#fff"
+	  rightIcon="list" @rightClick="goIndex"
+	  bgColor="#00337A"
+	  :titleStyle="{ color: '#FFF', fontSize: '32rpx' }"
+	>
+	<view class="u-nav-slot" slot="right">
+		<text style="color: #FFF;">首页</text>
+	</view>
+	</u-navbar>
     <view class="header-fixed">
       <view class="search-content">
         <view style="width: 90%;">
@@ -219,6 +230,9 @@ export default {
    /* 点击跳转人员-灯 */
    goLightPersonListPage(row,type) {//绿2 黄1 红0
 	 uni.navigateTo({ url: `/pages/realName/index/pages/personList?teamId=${row.teamId}&lightStatus=${type}` })
+   },
+   goIndex() {
+     uni.navigateTo({ url: `/pages/realName/index/index` })
    },
     /* 收藏与取消收藏 */
     onCollection(e, row) {