From 9d959593b68518e01d05ed3f8c112a8d63e726a0 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 30 Oct 2024 08:52:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=20=E7=8F=AD=E7=BB=84=20?=
 =?UTF-8?q?=E7=AD=89=E9=A1=B5=E9=9D=A2=E8=BF=94=E5=9B=9E=E8=87=B3=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .hbuilderx/launch.json                    |    2 +-
 pages/realName/index/pages/personList.vue | 1159 +++++++++++----------
 pages/realName/index/pages/project.vue    |  343 +++---
 pages/realName/index/pages/teamList.vue   |    3 +-
 4 files changed, 805 insertions(+), 702 deletions(-)

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 9b0d791..4ccd172 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -13,7 +13,7 @@
             "type" : "uniCloud"
         },
         {
-            "playground" : "standard",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
         }
     ]
diff --git a/pages/realName/index/pages/personList.vue b/pages/realName/index/pages/personList.vue
index 213faef..a091d85 100644
--- a/pages/realName/index/pages/personList.vue
+++ b/pages/realName/index/pages/personList.vue
@@ -1,25 +1,26 @@
 <template>
   <view class="page">
-	<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>
+    <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%;">
-			<uni-data-select v-model="selectType" :localdata="range" :clear="false"></uni-data-select>
-		</view>
-        <view style="width: 70%;">
+        <view style="width: 25%">
+          <uni-data-select v-model="selectType" :localdata="range" :clear="false"></uni-data-select>
+        </view>
+        <view style="width: 70%">
           <uni-easyinput
             suffixIcon="search"
             v-model="keyWord"
@@ -32,84 +33,120 @@
       <view style="margin-top: 20rpx; color: #3f9dfd; letter-spacing: 2rpx">已查询{{ recordsTotal }}条数据</view>
     </view>
     <view style="padding: 0 20rpx">
-       <u-list class="data-container"  @scrolltolower="scrolltolower" height="74vh">
-		   <view v-if="companyInfoList.length==0" style="width: 96%;height: 60vh;display: flex;flex-direction: column;justify-content: center;align-items: center;" >
-				<image src="../../../../static/realName/noData.png" style="width: 100rpx;height: 120rpx;" mode=""></image>
-				<view>暂无数据</view>
-		   </view>
-		   <u-list-item  v-for="(item, index) in companyInfoList" v-if="companyInfoList.length>0" :key="index">
-      	<view class="scroll-item"> 
-          <view class="item-1">
-            <view>{{ index + 1 }}</view>
-            <view>
-				<text>{{ item.name }}-</text>
-				<text v-if="item.sex=='1.0'">男</text>
-				<text v-if="item.sex=='0.0'">女</text>
-				<text>-{{ item.age }}</text>(
-				<text v-if="item.workerType==0">临时用工</text>
-				<text v-if="item.workerType==1">固定用工</text>
-				<text v-if="item.workerType==2">分包管理人员</text>)
-				
-				<text v-if="item.isAtt!=null" style="color: #06E7A3;margin-left: 80rpx;font-weight: 600;">已考勤</text>
-				<text v-if="item.isAtt==null" style="color: #FF2F2F;margin-left: 80rpx;font-weight: 600;">未考勤</text>
-				
-			</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-3" @click="onViewWorkDetails(item)">
-          	<view style="width: 40%;margin:0 20rpx;display: flex;align-items: center;">
-          		<view style="width: 100rpx;">工种</view>
-          		<view style="font-weight: bold;margin-left: 40rpx;">{{item.postName}}</view>
-          	</view>
-          	<view style="width: 45%;margin:0 20rpx;display: flex;align-items: center;">
-          		<view style="width: 100rpx;">联系方式</view>
-          		<view style="color: #3f9dfd; font-weight: bold;margin-left: 40rpx;">{{item.phone}}</view>
-          	</view>
+      <u-list class="data-container" @scrolltolower="scrolltolower" height="74vh">
+        <view
+          v-if="companyInfoList.length == 0"
+          style="
+            width: 96%;
+            height: 60vh;
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+          "
+        >
+          <image src="../../../../static/realName/noData.png" style="width: 100rpx; height: 120rpx" mode=""></image>
+          <view>暂无数据</view>
+        </view>
+        <u-list-item v-for="(item, index) in companyInfoList" v-if="companyInfoList.length > 0" :key="index">
+          <view class="scroll-item">
+            <view class="item-1">
+              <view>{{ index + 1 }}</view>
+              <view>
+                <text>{{ item.name }}-</text>
+                <text v-if="item.sex == '1.0'">男</text>
+                <text v-if="item.sex == '0.0'">女</text>
+                <text>-{{ item.age }}</text>
+                (
+                <text v-if="item.workerType == 0">临时用工</text>
+                <text v-if="item.workerType == 1">固定用工</text>
+                <text v-if="item.workerType == 2">分包管理人员</text>
+                )
+
+                <text v-if="item.isAtt != null" style="color: #06e7a3; margin-left: 80rpx; font-weight: 600">
+                  已考勤
+                </text>
+                <text v-if="item.isAtt == null" style="color: #ff2f2f; margin-left: 80rpx; font-weight: 600">
+                  未考勤
+                </text>
+              </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-3" @click="onViewWorkDetails(item)">
+              <view style="width: 40%; margin: 0 20rpx; display: flex; align-items: center">
+                <view style="width: 100rpx">工种</view>
+                <view style="font-weight: bold; margin-left: 40rpx">{{ item.postName }}</view>
+              </view>
+              <view style="width: 45%; margin: 0 20rpx; display: flex; align-items: center">
+                <view style="width: 100rpx">联系方式</view>
+                <view style="color: #3f9dfd; font-weight: bold; margin-left: 40rpx">{{ item.phone }}</view>
+              </view>
+            </view>
+            <view class="item-3" @click="onViewWorkDetails(item)">
+              <view style="width: 40%; margin: 0 20rpx; display: flex; align-items: center">
+                <view style="width: 150rpx">是否为作业打卡</view>
+                <view style="font-weight: bold; margin-left: 40rpx">
+                  <text style="color: #06e7a3" v-if="item.isPlanWorker == 1">是</text>
+                  <text style="color: #ff2f2f" v-if="item.isPlanWorker == 0">否</text>
+                </view>
+              </view>
+              <view style="width: 45%; margin: 0 20rpx; display: flex; align-items: center">
+                <view style="width: 120rpx">红绿灯状态</view>
+                <view style="font-weight: bold; margin-left: 40rpx">
+                  <text style="color: #06e7a3" v-if="item.lightStatus == 2">绿灯</text>
+                  <text style="color: yellow" v-if="item.lightStatus == 1">黄灯</text>
+                  <text style="color: #ff2f2f" v-if="item.lightStatus == 0">红灯</text>
+                </view>
+              </view>
+            </view>
+            <view
+              style="width: 100%; font-size: 24rpx; padding: 20rpx 0; border-bottom: 1px solid #eee"
+              @click="onViewWorkDetails(item)"
+            >
+              <view
+                style="width: 95%%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
+              >
+                <view style="width: 100rpx">所在班组</view>
+                <view style="width: 83%">
+                  {{ item.teamName }}
+                </view>
+              </view>
+            </view>
+            <view
+              style="width: 100%; font-size: 24rpx; padding: 20rpx 0; border-bottom: 1px solid #eee"
+              @click="onViewWorkDetails(item)"
+            >
+              <view
+                style="width: 95%%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
+              >
+                <view style="width: 100rpx">所在分包</view>
+                <view style="width: 83%">
+                  {{ item.subName }}
+                </view>
+              </view>
+            </view>
+            <view
+              style="width: 100%; font-size: 24rpx; padding: 20rpx 0; border-bottom: 1px solid #eee"
+              @click="onViewWorkDetails(item)"
+            >
+              <view
+                style="width: 95%%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
+              >
+                <view style="width: 100rpx">所在工程</view>
+                <view style="width: 83%">
+                  {{ item.proName }}
+                </view>
+              </view>
+            </view>
           </view>
-		  <view class="item-3" @click="onViewWorkDetails(item)">
-		  	<view style="width: 40%;margin:0 20rpx;display: flex;align-items: center;">
-		  		<view style="width: 150rpx;">是否为作业打卡</view>
-		  		<view style="font-weight: bold;margin-left: 40rpx;">
-					<text style="color: #06E7A3;" v-if="item.isPlanWorker==1">是</text> 
-					<text style="color: #FF2F2F;" v-if="item.isPlanWorker==0">否</text>
-				</view>
-		  	</view>
-		  	<view style="width: 45%;margin:0 20rpx;display: flex;align-items: center;">
-		  		<view style="width: 120rpx;">红绿灯状态</view>
-		  		<view style="font-weight: bold;margin-left: 40rpx;">
-					<text style="color: #06E7A3;" v-if="item.lightStatus==2">绿灯</text>
-					<text style="color: yellow;" v-if="item.lightStatus==1">黄灯</text>
-					<text style="color: #FF2F2F;" v-if="item.lightStatus==0">红灯</text>
-				</view>
-		  	</view>
-		  </view>
-		  <view style="width: 100%;font-size: 24rpx;padding: 20rpx 0;border-bottom: 1px solid #eee;" @click="onViewWorkDetails(item)">
-		  	<view style="width:95%%;margin:0 20rpx;display: flex;align-items: center;justify-content: space-between;">
-		  		<view style="width: 100rpx;">所在班组</view>
-		  		<view style="width: 83%;">
-		  			{{item.teamName}}
-		  		</view>
-		  	</view>
-		  </view>
-		  <view style="width: 100%;font-size: 24rpx;padding: 20rpx 0;border-bottom: 1px solid #eee;" @click="onViewWorkDetails(item)">
-		  	<view style="width:95%%;margin:0 20rpx;display: flex;align-items: center;justify-content: space-between;">
-		  		<view style="width: 100rpx;">所在分包</view>
-		  		<view style="width: 83%;">
-		  			{{item.subName}}
-		  		</view>
-		  	</view>
-		  </view>
-		  <view style="width: 100%;font-size: 24rpx;padding: 20rpx 0;border-bottom: 1px solid #eee;" @click="onViewWorkDetails(item)">
-		  	<view style="width:95%%;margin:0 20rpx;display: flex;align-items: center;justify-content: space-between;">
-		  		<view style="width: 100rpx;">所在工程</view>
-		  		<view style="width: 83%;">
-		  			{{item.proName}}
-		  		</view>
-		  	</view>
-		  </view>
-		  </view>
-		  </u-list-item>
-		  </u-list>
+        </u-list-item>
+      </u-list>
     </view>
 
     <!-- 底部弹框 -->
@@ -121,7 +158,8 @@
           <scroll-view class="company-container" scroll-y="true">
             <view class="company-items">
               <view
-                v-for="(item, index) in companyList" :key="index" 
+                v-for="(item, index) in companyList"
+                :key="index"
                 :class="{ active: index === activeIndex }"
                 @tap="onSelectCompany(index, item.id)"
               >
@@ -135,7 +173,8 @@
           <scroll-view class="company-container" scroll-y="true">
             <view class="company-items">
               <view
-                v-for="(item, index) in lightList" :key="index" 
+                v-for="(item, index) in lightList"
+                :key="index"
                 :class="{ active: index === activeIndex2 }"
                 @tap="onSelectLight(index, item.id)"
               >
@@ -144,78 +183,83 @@
             </view>
           </scroll-view>
         </view>
-		<h2>用工类型</h2>
-		<view>
-		  <scroll-view class="company-container" scroll-y="true">
-		    <view class="company-items">
-		      <view
-		        v-for="(item, index) in workTypeList" :key="index" 
-		        :class="{ active: index === activeIndex3 }"
-		        @tap="onSelectWorkType(index, item.id)"
-		      >
-		        {{ item.name }}
-		      </view>
-		    </view>
-		  </scroll-view>
-		</view>
-		<h2>年龄分布</h2>
-		<view>
-		  <scroll-view class="company-container" scroll-y="true">
-		    <view class="company-items">
-		      <view
-		        v-for="(item, index) in ageTypeList" :key="index" 
-		        :class="{ active: index === activeIndex4 }"
-		        @tap="onSelectAgeType(index, item.id)"
-		      >
-		        {{ item.name }}
-		      </view>
-		    </view>
-		  </scroll-view>
-		</view>
-		<h2>性别</h2>
-		<view>
-		  <scroll-view class="company-container" scroll-y="true">
-		    <view class="company-items">
-		      <view
-		        v-for="(item, index) in sexTypeList" :key="index" 
-		        :class="{ active: index === activeIndex5 }"
-		        @tap="onSelectSexType(index, item.id)"
-		      >
-		        {{ item.name }}
-		      </view>
-		    </view>
-		  </scroll-view>
-		</view>
-		
-		<h2>考勤状态</h2>
-		<view>
-		  <scroll-view class="company-container" scroll-y="true">
-		    <view class="company-items">
-		      <view
-		        v-for="(item, index) in attTypeList" :key="index" 
-		        :class="{ active: index === activeIndex6 }"
-		        @tap="onSelectAttType(index, item.id)"
-		      >
-		        {{ item.name }}
-		      </view>
-		    </view>
-		  </scroll-view>
-		</view>
-		<h2>作业打卡</h2>
-		<view>
-		  <scroll-view class="company-container" scroll-y="true" style="padding-bottom: 150rpx;">
-		    <view class="company-items">
-		      <view
-		        v-for="(item, index) in dayAttTypeList" :key="index" 
-		        :class="{ active: index === activeIndex7 }"
-		        @tap="onSelectDayAttType(index, item.id)"
-		      >
-		        {{ item.name }}
-		      </view>
-		    </view>
-		  </scroll-view>
-		</view> 
-		<view class="bottom-btn">
+        <h2>用工类型</h2>
+        <view>
+          <scroll-view class="company-container" scroll-y="true">
+            <view class="company-items">
+              <view
+                v-for="(item, index) in workTypeList"
+                :key="index"
+                :class="{ active: index === activeIndex3 }"
+                @tap="onSelectWorkType(index, item.id)"
+              >
+                {{ item.name }}
+              </view>
+            </view>
+          </scroll-view>
+        </view>
+        <h2>年龄分布</h2>
+        <view>
+          <scroll-view class="company-container" scroll-y="true">
+            <view class="company-items">
+              <view
+                v-for="(item, index) in ageTypeList"
+                :key="index"
+                :class="{ active: index === activeIndex4 }"
+                @tap="onSelectAgeType(index, item.id)"
+              >
+                {{ item.name }}
+              </view>
+            </view>
+          </scroll-view>
+        </view>
+        <h2>性别</h2>
+        <view>
+          <scroll-view class="company-container" scroll-y="true">
+            <view class="company-items">
+              <view
+                v-for="(item, index) in sexTypeList"
+                :key="index"
+                :class="{ active: index === activeIndex5 }"
+                @tap="onSelectSexType(index, item.id)"
+              >
+                {{ item.name }}
+              </view>
+            </view>
+          </scroll-view>
+        </view>
+
+        <h2>考勤状态</h2>
+        <view>
+          <scroll-view class="company-container" scroll-y="true">
+            <view class="company-items">
+              <view
+                v-for="(item, index) in attTypeList"
+                :key="index"
+                :class="{ active: index === activeIndex6 }"
+                @tap="onSelectAttType(index, item.id)"
+              >
+                {{ item.name }}
+              </view>
+            </view>
+          </scroll-view>
+        </view>
+        <h2>作业打卡</h2>
+        <view>
+          <scroll-view class="company-container" scroll-y="true" style="padding-bottom: 150rpx">
+            <view class="company-items">
+              <view
+                v-for="(item, index) in dayAttTypeList"
+                :key="index"
+                :class="{ active: index === activeIndex7 }"
+                @tap="onSelectDayAttType(index, item.id)"
+              >
+                {{ item.name }}
+              </view>
+            </view>
+          </scroll-view>
+        </view>
+        <view class="bottom-btn">
           <button style="background-color: #fff; color: #00337a" @tap="onReset">重置</button>
           <button style="background-color: #00337a; color: #fff" @tap="onQuery">查询</button>
         </view>
@@ -239,178 +283,217 @@ export default {
       activeIndex7: 0,
       recordsTotal: 0,
       token: uni.getStorageSync('tjToken'),
-	  selectType:0,
-	  keyWord:"",
-	  range: [
-	    { value: 0, text: '姓名' },
-	    { value: 1, text: '分包' },
-	    { value: 2, text: '班组' },
-	    { value: 3, text: '工种' }
-	  ],
+      selectType: 0,
+      keyWord: '',
+      range: [
+        { value: 0, text: '姓名' },
+        { value: 1, text: '分包' },
+        { value: 2, text: '班组' },
+        { value: 3, text: '工种' }
+      ],
       // 查询参数
       queryParams: {
-		  page: 0,
+        page: 0,
         offset: 0,
         limit: 10,
         params: {
-          userId:uni.getStorageSync('realNameUser').userId+"",
-          workerName:"",//人员姓名
-		  subName:"",//分包名称
-		  teamName:"",//班组名称
-		  postName:"", //岗位名称
-          proId:"", //工程编号
-          subId:"", //分包编号
-          teamId:"",  //班组编号
-		  lightStatus:"", //灯状态
-		  workerType:"", //人员类型
-		  sex:"", //性别
-		  isAtt:"", //是否考勤
-		  subComId:"", //分公司编号
-          isPlanWorker:"", //是否作业打卡
-          startAge:"", //开始年龄
-          endAge:"", //结束年龄
-         
+          userId: uni.getStorageSync('realNameUser').userId + '',
+          workerName: '', //人员姓名
+          subName: '', //分包名称
+          teamName: '', //班组名称
+          postName: '', //岗位名称
+          proId: '', //工程编号
+          subId: '', //分包编号
+          teamId: '', //班组编号
+          lightStatus: '', //灯状态
+          workerType: '', //人员类型
+          sex: '', //性别
+          isAtt: '', //是否考勤
+          subComId: '', //分公司编号
+          isPlanWorker: '', //是否作业打卡
+          startAge: '', //开始年龄
+          endAge: '' //结束年龄
         }
       },
-	  isLoading:false,
+      isLoading: false,
       companyList: [{ name: '全部', id: '' }],
-	  lightList: [{name:'全部', id:'-1' },{name:'绿灯', id:'2' },{name:'黄灯', id:'1' },{name:'红灯', id:'0' }],
-	  workTypeList: [{name:'全部', id:'-1' },{name:'固定用工', id:'1,2' },{name:'临时用工', id:'0' }],
-	  ageTypeList: [{name:'全部', id:'-1' },{name:'<20', id:'0' },{name:'20-30', id:'1' },{name:'30-40', id:'2' },{name:'40-50', id:'3' },{name:'50-60', id:'4' }],
-	  sexTypeList: [{name:'全部', id:'-1' },{name:'男', id:'1' },{name:'女', id:'0' }],
-	  attTypeList: [{name:'全部', id:'-1' },{name:'已考勤', id:'0' },{name:'未考勤', id:'1' }],
-	  dayAttTypeList: [{name:'全部', id:'-1' },{name:'日计划打卡', id:'1' },{name:'非日计划打卡', id:'0' }],
-	  companyInfoList: []
+      lightList: [
+        { name: '全部', id: '-1' },
+        { name: '绿灯', id: '2' },
+        { name: '黄灯', id: '1' },
+        { name: '红灯', id: '0' }
+      ],
+      workTypeList: [
+        { name: '全部', id: '-1' },
+        { name: '固定用工', id: '1,2' },
+        { name: '临时用工', id: '0' }
+      ],
+      ageTypeList: [
+        { name: '全部', id: '-1' },
+        { name: '<20', id: '0' },
+        { name: '20-30', id: '1' },
+        { name: '30-40', id: '2' },
+        { name: '40-50', id: '3' },
+        { name: '50-60', id: '4' }
+      ],
+      sexTypeList: [
+        { name: '全部', id: '-1' },
+        { name: '男', id: '1' },
+        { name: '女', id: '0' }
+      ],
+      attTypeList: [
+        { name: '全部', id: '-1' },
+        { name: '已考勤', id: '0' },
+        { name: '未考勤', id: '1' }
+      ],
+      dayAttTypeList: [
+        { name: '全部', id: '-1' },
+        { name: '日计划打卡', id: '1' },
+        { name: '非日计划打卡', id: '0' }
+      ],
+      companyInfoList: []
     }
   },
   mounted() {
     this.getHomePageSelectData()
   },
   onLoad(option) {
-  	console.log(option)
-	this.queryParams.params.proId=option.proId||"";
-	this.queryParams.params.subId=option.subId||"";
-	this.queryParams.params.teamId=option.teamId||"";
-	if(option.isAtt&&option.isAtt==0&&option.isPlanWorker&&option.isPlanWorker==1){//日计划打卡
-		this.activeIndex6=1
-		this.activeIndex7=1
-		this.queryParams.params.isAtt = "0" 
-		this.queryParams.params.isPlanWorker = "1"
-		this.getListData()
-	}else if(option.isAtt&&option.isAtt==0){//已考勤
-		this.activeIndex6=1
-		this.queryParams.params.isAtt = "0"
-		this.getListData()
-	}else if(option.workerType&&option.workerType==1){//固定人员
-		this.activeIndex3 = 1
-		this.queryParams.params.workerType = "1,2"
-		this.getListData()
-	}else if(option.workerType&&option.workerType==0){//临时人员
-		this.activeIndex3 = 2
-		this.queryParams.params.workerType = "0"
-		this.getListData()
-	}else if(option.sex&&option.sex==1){//男
-		this.activeIndex5 = 1
-		this.queryParams.params.sex = "1"
-		this.getListData()
-	}else if(option.sex&&option.sex==0){//女
-		this.activeIndex5 = 2
-		this.queryParams.params.sex = "0"
-		this.getListData()
-	}else if(option.lightStatus&&option.lightStatus==2){//绿灯
-		this.activeIndex2 = 1
-		this.queryParams.params.lightStatus = "2"
-		this.getListData()
-	}else if(option.lightStatus&&option.lightStatus==1){//黄灯
-		this.activeIndex2 = 2
-		this.queryParams.params.lightStatus = "1"
-		this.getListData()
-	}else if(option.lightStatus&&option.lightStatus==0){//红灯
-		this.activeIndex2 = 3
-		this.queryParams.params.lightStatus = "0"
-		this.getListData()
-	}else if(option.isAtt&&option.isAtt==0&&option.workerType&&option.workerType==1){//已考勤-固定人员
-		this.activeIndex6=1
-		this.queryParams.params.isAtt = "0"
-		this.activeIndex3 = 1
-		this.queryParams.params.workerType = "1,2"
-		this.getListData()
-	}else if(option.isAtt&&option.isAtt==0&&option.workerType&&option.workerType==0){//已考勤-临时人员
-		this.activeIndex6=1
-		this.queryParams.params.isAtt = "0"
-		this.activeIndex3 = 2
-		this.queryParams.params.workerType = "0"
-		this.getListData()
-	}else if(option.selectType&&option.postName){//已考勤-临时人员
-		 this.selectType=Number(option.selectType)
-		 this.keyWord = option.postName||"";
-		 this.getListData()
-	}else if(option.ageType&&option.ageType!=""){//年龄
-		if(option.ageType==0){
-			this.activeIndex4 = 1
-			this.queryParams.params.startAge = '0'
-			this.queryParams.params.endAge = '20'
-		}else if(option.ageType==1){
-			this.activeIndex4 = 2 
-			this.queryParams.params.startAge = '20'
-			this.queryParams.params.endAge = '30'
-		}else if(option.ageType==2){
-			this.activeIndex4 = 3 
-			this.queryParams.params.startAge = '30'
-			this.queryParams.params.endAge = '40'
-		}else if(option.ageType==3){
-			this.activeIndex4 = 4 
-			this.queryParams.params.startAge = '40'
-			this.queryParams.params.endAge = '50'
-		}else if(option.ageType==4){
-			this.activeIndex4 = 5 
-			this.queryParams.params.startAge = '50'
-			this.queryParams.params.endAge = '60'
-		}
-		this.getListData()
-	}else{
-		this.getListData()
-	}
-	
+    console.log(option)
+    this.queryParams.params.proId = option.proId || ''
+    this.queryParams.params.subId = option.subId || ''
+    this.queryParams.params.teamId = option.teamId || ''
+    if (option.isAtt && option.isAtt == 0 && option.isPlanWorker && option.isPlanWorker == 1) {
+      //日计划打卡
+      this.activeIndex6 = 1
+      this.activeIndex7 = 1
+      this.queryParams.params.isAtt = '0'
+      this.queryParams.params.isPlanWorker = '1'
+      this.getListData()
+    } else if (option.isAtt && option.isAtt == 0) {
+      //已考勤
+      this.activeIndex6 = 1
+      this.queryParams.params.isAtt = '0'
+      this.getListData()
+    } else if (option.workerType && option.workerType == 1) {
+      //固定人员
+      this.activeIndex3 = 1
+      this.queryParams.params.workerType = '1,2'
+      this.getListData()
+    } else if (option.workerType && option.workerType == 0) {
+      //临时人员
+      this.activeIndex3 = 2
+      this.queryParams.params.workerType = '0'
+      this.getListData()
+    } else if (option.sex && option.sex == 1) {
+      //男
+      this.activeIndex5 = 1
+      this.queryParams.params.sex = '1'
+      this.getListData()
+    } else if (option.sex && option.sex == 0) {
+      //女
+      this.activeIndex5 = 2
+      this.queryParams.params.sex = '0'
+      this.getListData()
+    } else if (option.lightStatus && option.lightStatus == 2) {
+      //绿灯
+      this.activeIndex2 = 1
+      this.queryParams.params.lightStatus = '2'
+      this.getListData()
+    } else if (option.lightStatus && option.lightStatus == 1) {
+      //黄灯
+      this.activeIndex2 = 2
+      this.queryParams.params.lightStatus = '1'
+      this.getListData()
+    } else if (option.lightStatus && option.lightStatus == 0) {
+      //红灯
+      this.activeIndex2 = 3
+      this.queryParams.params.lightStatus = '0'
+      this.getListData()
+    } else if (option.isAtt && option.isAtt == 0 && option.workerType && option.workerType == 1) {
+      //已考勤-固定人员
+      this.activeIndex6 = 1
+      this.queryParams.params.isAtt = '0'
+      this.activeIndex3 = 1
+      this.queryParams.params.workerType = '1,2'
+      this.getListData()
+    } else if (option.isAtt && option.isAtt == 0 && option.workerType && option.workerType == 0) {
+      //已考勤-临时人员
+      this.activeIndex6 = 1
+      this.queryParams.params.isAtt = '0'
+      this.activeIndex3 = 2
+      this.queryParams.params.workerType = '0'
+      this.getListData()
+    } else if (option.selectType && option.postName) {
+      //已考勤-临时人员
+      this.selectType = Number(option.selectType)
+      this.keyWord = option.postName || ''
+      this.getListData()
+    } else if (option.ageType && option.ageType != '') {
+      //年龄
+      if (option.ageType == 0) {
+        this.activeIndex4 = 1
+        this.queryParams.params.startAge = '0'
+        this.queryParams.params.endAge = '20'
+      } else if (option.ageType == 1) {
+        this.activeIndex4 = 2
+        this.queryParams.params.startAge = '20'
+        this.queryParams.params.endAge = '30'
+      } else if (option.ageType == 2) {
+        this.activeIndex4 = 3
+        this.queryParams.params.startAge = '30'
+        this.queryParams.params.endAge = '40'
+      } else if (option.ageType == 3) {
+        this.activeIndex4 = 4
+        this.queryParams.params.startAge = '40'
+        this.queryParams.params.endAge = '50'
+      } else if (option.ageType == 4) {
+        this.activeIndex4 = 5
+        this.queryParams.params.startAge = '50'
+        this.queryParams.params.endAge = '60'
+      }
+      this.getListData()
+    } else {
+      this.getListData()
+    }
   },
   methods: {
-	  scrolltolower(){
-	  			this.queryParams.limit=10
-	  			//判断 如果页码*页容量大于等于总条数，提示该页数据加载完毕
-	  			if (this.queryParams.page * this.queryParams.limit >= this.recordsTotal) {
-	  				uni.$u.toast('数据加载完毕')
-	  				return
-	  			}
-	  			this.queryParams.page++
-	  			//页码+1,调用获取数据的方法获取第二页数据
-	  			if(this.queryParams.page==0){
-	  				this.queryParams.offset=0; 
-	  			}else{
-	  				this.queryParams.offset=this.queryParams.page * this.queryParams.limit;
-	  			}
-	  			//此处调用自己获取数据列表的方法
-	  			this.getListData()
-	  },
-	  searchList(){
-		  this.queryParams.page=0
-	  	this.companyInfoList=[]
-	  	this.getListData()
-	  },
+    scrolltolower() {
+      this.queryParams.limit = 10
+      //判断 如果页码*页容量大于等于总条数，提示该页数据加载完毕
+      if (this.queryParams.page * this.queryParams.limit >= this.recordsTotal) {
+        uni.$u.toast('数据加载完毕')
+        return
+      }
+      this.queryParams.page++
+      //页码+1,调用获取数据的方法获取第二页数据
+      if (this.queryParams.page == 0) {
+        this.queryParams.offset = 0
+      } else {
+        this.queryParams.offset = this.queryParams.page * this.queryParams.limit
+      }
+      //此处调用自己获取数据列表的方法
+      this.getListData()
+    },
+    searchList() {
+      this.queryParams.page = 0
+      this.companyInfoList = []
+      this.getListData()
+    },
     /* 获取列表 */
-    async getListData() { 
-		if(this.selectType==0){
-			this.queryParams.params.workerName=this.keyWord
-		}else if(this.selectType==1){
-			this.queryParams.params.subName=this.keyWord
-		}else if(this.selectType==2){
-			this.queryParams.params.teamName=this.keyWord
-		}else if(this.selectType==3){
-			this.queryParams.params.postName=this.keyWord
-		}
-		this.queryParams.offset=this.queryParams.offset+""
-		this.queryParams.limit=this.queryParams.limit+""
-		console.log(this.queryParams)
-		this.isLoading=true
+    async getListData() {
+      if (this.selectType == 0) {
+        this.queryParams.params.workerName = this.keyWord
+      } else if (this.selectType == 1) {
+        this.queryParams.params.subName = this.keyWord
+      } else if (this.selectType == 2) {
+        this.queryParams.params.teamName = this.keyWord
+      } else if (this.selectType == 3) {
+        this.queryParams.params.postName = this.keyWord
+      }
+      this.queryParams.offset = this.queryParams.offset + ''
+      this.queryParams.limit = this.queryParams.limit + ''
+      console.log(this.queryParams)
+      this.isLoading = true
       uni.request({
         url: config.realBmwUrl + '/homeSubPage/getAppWorkerMsg',
         method: 'POST',
@@ -421,19 +504,19 @@ export default {
         },
         success: res => {
           console.log('res****', res)
-		  if(res.data.data?.length>0){
-		  	if(this.queryParams.offset == 0){
-		  		this.companyInfoList = res.data.data
-		  	}else{
-		  		this.companyInfoList = [...this.companyInfoList, ...res.data.data];
-		  	}
-			this.recordsTotal = res.data.recordsTotal
-		  }
-		  this.isLoading=false
+          if (res.data.data?.length > 0) {
+            if (this.queryParams.offset == 0) {
+              this.companyInfoList = res.data.data
+            } else {
+              this.companyInfoList = [...this.companyInfoList, ...res.data.data]
+            }
+            this.recordsTotal = res.data.recordsTotal
+          }
+          this.isLoading = false
         },
         fail: err => {
-			this.isLoading=false
-		}
+          this.isLoading = false
+        }
       })
     },
     /* 获取公司数据 */
@@ -442,7 +525,8 @@ export default {
       this.companyList = this.companyList.concat(res.subList)
     },
     leftClick() {
-      uni.navigateTo({ url: `/pages/realName/index/index` })
+      //   uni.navigateTo({ url: `/pages/realName/index/index` })
+      uni.navigateBack()
     },
     onSearchFilter() {
       // 打开底部弹框
@@ -457,108 +541,107 @@ export default {
         this.queryParams.params.subComId = Id
       }
     },
-	onSelectLight(index, Id) {
+    onSelectLight(index, Id) {
       this.activeIndex2 = index
-      this.queryParams.params.lightStatus = Id 
+      this.queryParams.params.lightStatus = Id
+    },
+    onSelectWorkType(index, Id) {
+      this.activeIndex3 = index
+      this.queryParams.params.workerType = Id
+    },
+    onSelectAgeType(index, Id) {
+      this.activeIndex4 = index
+      if (Id == -1) {
+        this.queryParams.params.startAge = '0'
+        this.queryParams.params.endAge = '99'
+      } else if (Id == 0) {
+        this.queryParams.params.startAge = '0'
+        this.queryParams.params.endAge = '20'
+      } else if (Id == 1) {
+        this.queryParams.params.startAge = '20'
+        this.queryParams.params.endAge = '30'
+      } else if (Id == 2) {
+        this.queryParams.params.startAge = '30'
+        this.queryParams.params.endAge = '40'
+      } else if (Id == 3) {
+        this.queryParams.params.startAge = '40'
+        this.queryParams.params.endAge = '50'
+      } else if (Id == 3) {
+        this.queryParams.params.startAge = '50'
+        this.queryParams.params.endAge = '60'
+      }
+    },
+    onSelectSexType(index, Id) {
+      this.activeIndex5 = index
+      this.queryParams.params.sex = Id
+    },
+    onSelectAttType(index, Id) {
+      this.activeIndex6 = index
+      this.queryParams.params.isAtt = Id
+    },
+    onSelectDayAttType(index, Id) {
+      this.activeIndex7 = index
+      this.queryParams.params.isPlanWorker = Id
     },
-	onSelectWorkType(index, Id) {
-	  this.activeIndex3 = index
-	  this.queryParams.params.workerType = Id
-	  
-	},
-	onSelectAgeType(index, Id) {
-	  this.activeIndex4 = index
-	  if (Id == -1) {
-	    this.queryParams.params.startAge = '0'
-	    this.queryParams.params.endAge = '99'
-	  } else if (Id == 0) {
-	    this.queryParams.params.startAge = '0'
-	    this.queryParams.params.endAge = '20'
-	  } else if (Id == 1) {
-	    this.queryParams.params.startAge = '20'
-	    this.queryParams.params.endAge = '30'
-	  } else if (Id == 2) {
-	    this.queryParams.params.startAge = '30'
-	    this.queryParams.params.endAge = '40'
-	  } else if (Id == 3) {
-	    this.queryParams.params.startAge = '40'
-	    this.queryParams.params.endAge = '50'
-	  } else if (Id == 3) {
-	    this.queryParams.params.startAge = '50'
-	    this.queryParams.params.endAge = '60'
-	  }
-	},
-	onSelectSexType(index, Id) {
-	  this.activeIndex5 = index
-	  this.queryParams.params.sex = Id
-	},
-	onSelectAttType(index, Id) {
-	  this.activeIndex6 = index
-	  this.queryParams.params.isAtt = Id 
-	},
-	onSelectDayAttType(index, Id) {
-	  this.activeIndex7 = index
-	  this.queryParams.params.isPlanWorker = Id
-	},
     /* 重置 */
     onReset() {
       this.activeIndex = 0
       this.queryParams.params.subComId = ''
-	  this.activeIndex2 = 0
+      this.activeIndex2 = 0
       this.queryParams.params.lightStatus = ''
-	  this.activeIndex3 = 0
-	  this.queryParams.params.workerType = ''
-	  this.activeIndex4 = 0
-	  this.queryParams.params.ageType = ''
-	  this.activeIndex5 = 0
-	  this.queryParams.params.sex = ''
-	  this.activeIndex6 = 0
-	  this.queryParams.params.isAtt = ''
-	  this.activeIndex7 = 0
-	  this.queryParams.params.isPlanWorker = ''
+      this.activeIndex3 = 0
+      this.queryParams.params.workerType = ''
+      this.activeIndex4 = 0
+      this.queryParams.params.ageType = ''
+      this.activeIndex5 = 0
+      this.queryParams.params.sex = ''
+      this.activeIndex6 = 0
+      this.queryParams.params.isAtt = ''
+      this.activeIndex7 = 0
+      this.queryParams.params.isPlanWorker = ''
       this.onQuery()
     },
     /* 查询 */
     onQuery() {
-		this.queryParams.page=0
-	  this.companyInfoList=[]
+      this.queryParams.page = 0
+      this.companyInfoList = []
       this.getListData().then(() => {
         this.$refs.popup.close()
       })
     },
     /* 点击跳转详情 */
     onViewWorkDetails(row) {
-		console.log(row)
+      console.log(row)
       uni.navigateTo({ url: `/pages/realName/index/pages/personDetail?idNumber=${row.idNumber}` })
     },
-	goIndex() {
-	  uni.navigateTo({ url: `/pages/realName/index/index` })
-	},
+    goIndex() {
+      uni.navigateTo({ url: `/pages/realName/index/index` })
+    },
     /* 收藏与取消收藏 */
     onCollection(e, row) {
-		console.log(row)
-		 const params = {
-		   id: row.collectId,
-		   userId: uni.getStorageSync('realNameUser').userId,
-		   foreignId: row.idNumber,
-		   type: 4
-		 }
-		 uni.request({
-		    url: `${config.realAppUrl}${ row.isCollect == 0 ? '/offLine/insertCollect' : '/offLine/deleteCollect'}`,
-		   method: 'POST',
-		   data: JSON.stringify(params),
-		   header: {
-			 'Content-Type': 'application/json',
-			 token: this.token
-		   },
-		   success: res => {
-			 if (res.data.code === 200) {
-			   uni.showToast({ icon: 'none', title: ` ${row.isCollect == 0 ? '收藏成功' : '已取消收藏'}` })
-			   this.getListData()
-			 }
-		   },
-		   fail: err => {}
-		 })
+      console.log(row)
+      const params = {
+        id: row.collectId,
+        userId: uni.getStorageSync('realNameUser').userId,
+        foreignId: row.idNumber,
+        type: 4
+      }
+      uni.request({
+        url: `${config.realAppUrl}${row.isCollect == 0 ? '/offLine/insertCollect' : '/offLine/deleteCollect'}`,
+        method: 'POST',
+        data: JSON.stringify(params),
+        header: {
+          'Content-Type': 'application/json',
+          token: this.token
+        },
+        success: res => {
+          if (res.data.code === 200) {
+            uni.showToast({ icon: 'none', title: ` ${row.isCollect == 0 ? '收藏成功' : '已取消收藏'}` })
+            this.getListData()
+          }
+        },
+        fail: err => {}
+      })
     }
   }
 }
@@ -566,145 +649,145 @@ export default {
 
 <style lang="scss" scoped>
 .page {
-	width: 100vw;
-	height: 100vh;
-	background-color: #EFEFEF;
-	box-sizing: border-box;
+  width: 100vw;
+  height: 100vh;
+  background-color: #efefef;
+  box-sizing: border-box;
 }
 
-	.header-fixed {
-		width: 94%;
-		margin: 20rpx auto;
-		background-color: #FFF;
-		border-radius: 10rpx;
-		padding:20rpx;
+.header-fixed {
+  width: 94%;
+  margin: 20rpx auto;
+  background-color: #fff;
+  border-radius: 10rpx;
+  padding: 20rpx;
 
-		.search-content {
-		  display: flex;
-		  align-items: center;
-		
-			.search-icon {
-				width: 48rpx;
-				height: 40rpx;
-				margin-right: 60rpx;
-				margin-left: 30rpx;
-				background: url('../../../../static/realName/screen.png') no-repeat;
-				background-size: 100% 100%;
-			}
-		}
-	}
+  .search-content {
+    display: flex;
+    align-items: center;
 
-  .data-container {
-    width: 100%;
-    height: 75vh;
-
-    .scroll-item {
-      width: 100%;
-      height: auto;
-      background-color: #fff;
-      border-radius: 10rpx;
-      margin: 20rpx 0;
-    }
-
-    .item-1, 
-    .item-3 {
-      width: 96%;
-      margin: 0 auto;
-      padding: 20rpx 0;
-      border-bottom: 1px solid #eee;
-      display: flex;
-      align-items: center;
-	  position: relative;
-    }
-
-    .item-1 view:first-child {
-      width: 80rpx;
-      height: 56rpx;
-      margin-right: 16rpx;
-      text-align: center;
-      line-height: 56rpx;
-      background: url('../../../../static/realName/serial.png') no-repeat;
+    .search-icon {
+      width: 48rpx;
+      height: 40rpx;
+      margin-right: 60rpx;
+      margin-left: 30rpx;
+      background: url('../../../../static/realName/screen.png') no-repeat;
       background-size: 100% 100%;
-      color: #fff;
-      font-weight: bold;
-      font-size: 28rpx;
-    }
- 
-    .item-3 {
-	  font-size: 24rpx;
-      justify-content: space-around;
     }
   }
+}
 
-  .bottom-content {
-    height: 60vh;
-	overflow-y: auto;
+.data-container {
+  width: 100%;
+  height: 75vh;
 
-    h1,
-    h2 {
-      padding: 15rpx 0;
-      font-size: 32rpx;
-    }
-    h1 {
-      margin-top: 10rpx;
-      border-bottom: 1px solid #ccc;
-      text-align: center;
-    }
-    h2 {
-      padding-left: 16rpx;
-      // border-top: 1px solid #ccc;
-      border-bottom: 1px solid #ccc;
-    }
+  .scroll-item {
+    width: 100%;
+    height: auto;
+    background-color: #fff;
+    border-radius: 10rpx;
+    margin: 20rpx 0;
+  }
 
-    .company-container {
-      width: 96%;
-      height: auto;
-	  padding: 40rpx 20rpx;
-	 
-      .company-items {
-        width: 100%;
-        padding: 0 16rpx;
-        display: flex;
-        flex-wrap: wrap;
+  .item-1,
+  .item-3 {
+    width: 96%;
+    margin: 0 auto;
+    padding: 20rpx 0;
+    border-bottom: 1px solid #eee;
+    display: flex;
+    align-items: center;
+    position: relative;
+  }
 
-        view {
-          width: 48%;
-          height: 48rpx;
-          margin-top: 10rpx;
-          line-height: 48rpx;
-          border-radius: 10rpx;
-          text-align: center;
-          background-color: #eee;
-          color: #656565;
-        }
+  .item-1 view:first-child {
+    width: 80rpx;
+    height: 56rpx;
+    margin-right: 16rpx;
+    text-align: center;
+    line-height: 56rpx;
+    background: url('../../../../static/realName/serial.png') no-repeat;
+    background-size: 100% 100%;
+    color: #fff;
+    font-weight: bold;
+    font-size: 28rpx;
+  }
 
-        .active {
-          background-color: #3f9dfd;
-          color: #fff;
-        }
-      }
+  .item-3 {
+    font-size: 24rpx;
+    justify-content: space-around;
+  }
+}
 
-      .company-items view:nth-child(2n + 1) {
-        margin-right: 10rpx;
-      }
-    }
+.bottom-content {
+  height: 60vh;
+  overflow-y: auto;
 
-    .bottom-btn {
+  h1,
+  h2 {
+    padding: 15rpx 0;
+    font-size: 32rpx;
+  }
+  h1 {
+    margin-top: 10rpx;
+    border-bottom: 1px solid #ccc;
+    text-align: center;
+  }
+  h2 {
+    padding-left: 16rpx;
+    // border-top: 1px solid #ccc;
+    border-bottom: 1px solid #ccc;
+  }
+
+  .company-container {
+    width: 96%;
+    height: auto;
+    padding: 40rpx 20rpx;
+
+    .company-items {
       width: 100%;
-      position: fixed;
+      padding: 0 16rpx;
       display: flex;
-      bottom: 20rpx;
-      z-index: 9;
+      flex-wrap: wrap;
 
-      button {
-        flex: 1;
-        height: 80rpx;
-		margin: 0 20rpx;
-        line-height: 80rpx;
-        font-weight: normal;
-        border-radius: 20rpx;
-        border: 1rpx solid #00337a;
+      view {
+        width: 48%;
+        height: 48rpx;
+        margin-top: 10rpx;
+        line-height: 48rpx;
+        border-radius: 10rpx;
+        text-align: center;
+        background-color: #eee;
+        color: #656565;
+      }
+
+      .active {
+        background-color: #3f9dfd;
+        color: #fff;
       }
     }
+
+    .company-items view:nth-child(2n + 1) {
+      margin-right: 10rpx;
+    }
   }
+
+  .bottom-btn {
+    width: 100%;
+    position: fixed;
+    display: flex;
+    bottom: 20rpx;
+    z-index: 9;
+
+    button {
+      flex: 1;
+      height: 80rpx;
+      margin: 0 20rpx;
+      line-height: 80rpx;
+      font-weight: normal;
+      border-radius: 20rpx;
+      border: 1rpx solid #00337a;
+    }
+  }
+}
 </style>
diff --git a/pages/realName/index/pages/project.vue b/pages/realName/index/pages/project.vue
index 13b8be2..c7e8483 100644
--- a/pages/realName/index/pages/project.vue
+++ b/pages/realName/index/pages/project.vue
@@ -6,14 +6,15 @@
       placeholder
       @leftClick="leftClick"
       leftIconColor="#fff"
-	  rightIcon="list" @rightClick="goIndex"
+      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="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%">
@@ -29,98 +30,113 @@
       <view style="margin-top: 20rpx; color: #3f9dfd; letter-spacing: 2rpx">已查询{{ recordsTotal }}条数据</view>
     </view>
     <view style="padding: 0 20rpx">
-		<u-list class="data-container"  @scrolltolower="scrolltolower" height="74vh" >
-			<view v-if="companyInfoList.length==0" style="width: 96%;height: 60vh;display: flex;flex-direction: column;justify-content: center;align-items: center;" >
-				<image src="../../../../static/realName/noData.png" style="width: 100rpx;height: 120rpx;" mode=""></image>
-				<view>暂无数据</view>
-			</view>
-			<u-list-item  v-for="(item, index) in companyInfoList" v-if="companyInfoList.length>0" :key="index">
-				<view class="scroll-item">
-				   <view class="item-1">
-					 <view>{{ index + 1 }}</view>
-					 <view style="width: 80%;">{{ 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>
-					<view>{{ item.proType }}</view>
-					<view>{{ item.proStatusName }}</view>
-				  </view>
-				  <view class="item-3">
-					<view
-					  style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
-					  @tap="goSubListPage(item)"
-					>
-					  <view>分包</view>
-					  <view style="color: #3f9dfd; font-weight: bold">{{ item.subNum }}</view>
-					</view>
-					<view
-					  style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
-					  @tap="goTeamListPage(item)"
-					>
-					  <view>班组</view>
-					  <view style="color: #3f9dfd; font-weight: bold">{{ item.teamNum }}</view>
-					</view>
-					<view
-					  style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
-					  @tap="goAttPersonListPage(item)"
-					>
-					  <view>考勤人数</view>
-					  <view style="color: #3f9dfd; font-weight: bold">{{ item.attPersonNum }}</view>
-					</view>
-				  </view>
-				  <view class="item-3">
-					<view
-					  style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
-					  @tap="goAllPersonListPage(item)"
-					>
-					  <view>在场</view>
-					  <view style="color: #3f9dfd; font-weight: bold">{{ item.einPersonNum }}</view>
-					</view>
-					<view
-					  style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
-					  @tap="goWorkPersonListPage(item)"
-					>
-					  <view>固定</view>
-					  <view style="color: #3f9dfd; font-weight: bold">{{ item.formalPersonNum }}</view>
-					</view>
-					<view
-					  style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
-					  @tap="goTempPersonListPage(item)"
-					>
-					  <view>临时</view>
-					  <view style="color: #3f9dfd; font-weight: bold">{{ item.temporaryPersonNum }}</view>
-					</view>
-				  </view>
-				  <view class="item-3">
-					<view
-					  style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
-					  @tap="goLightPersonListPage(item, 2)"
-					>
-					  <view>绿灯</view>
-					  <view style="color: #3fb779; font-weight: bold">{{ item.greenPersonNum }}</view>
-					</view>
-					<view
-					  style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
-					  @tap="goLightPersonListPage(item, 1)"
-					>
-					  <view>黄灯</view>
-					  <view style="color: #e89c2d; font-weight: bold">{{ item.yellowPersonNum }}</view>
-					</view>
-					<view
-					  style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
-					  @tap="goLightPersonListPage(item, 0)"
-					>
-					  <view>红灯</view>
-					  <view style="color: #e8717f; font-weight: bold">{{ item.redPersonNum }}</view>
-					</view>
-				  </view>
-				</view>
-			
-			</u-list-item>
-	    </u-list>
+      <u-list class="data-container" @scrolltolower="scrolltolower" height="74vh">
+        <view
+          v-if="companyInfoList.length == 0"
+          style="
+            width: 96%;
+            height: 60vh;
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+          "
+        >
+          <image src="../../../../static/realName/noData.png" style="width: 100rpx; height: 120rpx" mode=""></image>
+          <view>暂无数据</view>
+        </view>
+        <u-list-item v-for="(item, index) in companyInfoList" v-if="companyInfoList.length > 0" :key="index">
+          <view class="scroll-item">
+            <view class="item-1">
+              <view>{{ index + 1 }}</view>
+              <view style="width: 80%">{{ 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>
+              <view>{{ item.proType }}</view>
+              <view>{{ item.proStatusName }}</view>
+            </view>
+            <view class="item-3">
+              <view
+                style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
+                @tap="goSubListPage(item)"
+              >
+                <view>分包</view>
+                <view style="color: #3f9dfd; font-weight: bold">{{ item.subNum }}</view>
+              </view>
+              <view
+                style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
+                @tap="goTeamListPage(item)"
+              >
+                <view>班组</view>
+                <view style="color: #3f9dfd; font-weight: bold">{{ item.teamNum }}</view>
+              </view>
+              <view
+                style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
+                @tap="goAttPersonListPage(item)"
+              >
+                <view>考勤人数</view>
+                <view style="color: #3f9dfd; font-weight: bold">{{ item.attPersonNum }}</view>
+              </view>
+            </view>
+            <view class="item-3">
+              <view
+                style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
+                @tap="goAllPersonListPage(item)"
+              >
+                <view>在场</view>
+                <view style="color: #3f9dfd; font-weight: bold">{{ item.einPersonNum }}</view>
+              </view>
+              <view
+                style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
+                @tap="goWorkPersonListPage(item)"
+              >
+                <view>固定</view>
+                <view style="color: #3f9dfd; font-weight: bold">{{ item.formalPersonNum }}</view>
+              </view>
+              <view
+                style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
+                @tap="goTempPersonListPage(item)"
+              >
+                <view>临时</view>
+                <view style="color: #3f9dfd; font-weight: bold">{{ item.temporaryPersonNum }}</view>
+              </view>
+            </view>
+            <view class="item-3">
+              <view
+                style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
+                @tap="goLightPersonListPage(item, 2)"
+              >
+                <view>绿灯</view>
+                <view style="color: #3fb779; font-weight: bold">{{ item.greenPersonNum }}</view>
+              </view>
+              <view
+                style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
+                @tap="goLightPersonListPage(item, 1)"
+              >
+                <view>黄灯</view>
+                <view style="color: #e89c2d; font-weight: bold">{{ item.yellowPersonNum }}</view>
+              </view>
+              <view
+                style="width: 25%; margin: 0 20rpx; display: flex; align-items: center; justify-content: space-between"
+                @tap="goLightPersonListPage(item, 0)"
+              >
+                <view>红灯</view>
+                <view style="color: #e8717f; font-weight: bold">{{ item.redPersonNum }}</view>
+              </view>
+            </view>
+          </view>
+        </u-list-item>
+      </u-list>
     </view>
 
     <!-- 底部弹框 -->
@@ -211,7 +227,7 @@ export default {
       token: uni.getStorageSync('tjToken'),
       // 查询参数
       queryParams: {
-		  page: 0,
+        page: 0,
         offset: 0,
         limit: 10,
         params: {
@@ -223,7 +239,7 @@ export default {
           proType: ''
         }
       },
-	  isLoading:false,
+      isLoading: false,
       companyList: [{ name: '全部', id: '' }],
       proStatusList: [{ name: '全部', id: '' }],
       levelList: [{ name: '全部', id: '' }],
@@ -243,61 +259,61 @@ export default {
         const { currentIndex, name } = voltageLevel
         this.activeIndex3 = currentIndex + 1
         this.queryParams.params.voltageLevel = this.levelList[currentIndex + 1].id
-		this.getListData()
+        this.getListData()
       } else if (option.proType) {
         // 获取工程类型
         const proType = JSON.parse(option.proType)
         const { currentIndex, name } = proType
         this.activeIndex4 = currentIndex + 1
         this.queryParams.params.proType = this.proTypeList[currentIndex + 1].id
-		this.getListData()
+        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()
-      } else if(option.proStatus&&option.proStatus==0){//在建
-	  		this.activeIndex2=1
-			this.queryParams.params.proStatus = "0"
-			this.getListData()
-	  }else{
-	  		this.getListData()
-	  }
-      
+        this.getListData()
+      } else if (option.proStatus && option.proStatus == 0) {
+        //在建
+        this.activeIndex2 = 1
+        this.queryParams.params.proStatus = '0'
+        this.getListData()
+      } else {
+        this.getListData()
+      }
     })
   },
   methods: {
-	  //下拉分页
-	scrolltolower(){
-		this.queryParams.limit=10
-		//判断 如果页码*页容量大于等于总条数，提示该页数据加载完毕
-		if (this.queryParams.page * this.queryParams.limit >= this.recordsTotal) {
-			uni.$u.toast('数据加载完毕')
-			return
-		}
-		this.queryParams.page++
-		//页码+1,调用获取数据的方法获取第二页数据
-		if(this.queryParams.page==0){
-			this.queryParams.offset=0; 
-		}else{
-			this.queryParams.offset=this.queryParams.page * this.queryParams.limit;
-		}
-		//此处调用自己获取数据列表的方法
-		this.getListData()
-	},
-	searchList(){
-		this.queryParams.page=0
-		this.companyInfoList=[]
-		this.getListData()
-	},
+    //下拉分页
+    scrolltolower() {
+      this.queryParams.limit = 10
+      //判断 如果页码*页容量大于等于总条数，提示该页数据加载完毕
+      if (this.queryParams.page * this.queryParams.limit >= this.recordsTotal) {
+        uni.$u.toast('数据加载完毕')
+        return
+      }
+      this.queryParams.page++
+      //页码+1,调用获取数据的方法获取第二页数据
+      if (this.queryParams.page == 0) {
+        this.queryParams.offset = 0
+      } else {
+        this.queryParams.offset = this.queryParams.page * this.queryParams.limit
+      }
+      //此处调用自己获取数据列表的方法
+      this.getListData()
+    },
+    searchList() {
+      this.queryParams.page = 0
+      this.companyInfoList = []
+      this.getListData()
+    },
     /* 获取作业计划列表 */
     async getListData() {
-		this.queryParams.offset=this.queryParams.offset+""
-		this.queryParams.limit=this.queryParams.limit+""
+      this.queryParams.offset = this.queryParams.offset + ''
+      this.queryParams.limit = this.queryParams.limit + ''
       console.log('this.queryParams参数', this.queryParams)
-	  this.isLoading=true
+      this.isLoading = true
       uni.request({
         url: config.realBmwUrl + '/homeSubPage/getAppBuildPro',
         method: 'POST',
@@ -308,22 +324,24 @@ export default {
         },
         success: res => {
           console.log('res****', res)
-		  if(res.data.data?.length>0){
-		  	if(this.queryParams.offset == 0){
-		  		this.companyInfoList = res.data.data
-		  	}else{
-		  		this.companyInfoList = [...this.companyInfoList, ...res.data.data];
-		  	}
-			this.recordsTotal = res.data.recordsTotal
-			this.companyInfoList.forEach(item=>{
-						  // console.log(item.proStatus)
-						  let index = Number(item.proStatus)+1
-						  item.proStatusName=this.proStatusList[index].name
-			})
-		  }
-		  this.isLoading=false
+          if (res.data.data?.length > 0) {
+            if (this.queryParams.offset == 0) {
+              this.companyInfoList = res.data.data
+            } else {
+              this.companyInfoList = [...this.companyInfoList, ...res.data.data]
+            }
+            this.recordsTotal = res.data.recordsTotal
+            this.companyInfoList.forEach(item => {
+              // console.log(item.proStatus)
+              let index = Number(item.proStatus) + 1
+              item.proStatusName = this.proStatusList[index].name
+            })
+          }
+          this.isLoading = false
         },
-        fail: err => {this.isLoading=false}
+        fail: err => {
+          this.isLoading = false
+        }
       })
     },
     /* 获取公司数据 */
@@ -336,7 +354,8 @@ export default {
       this.levelList = this.levelList.concat(res.levelList)
     },
     leftClick() {
-      uni.navigateTo({ url: `/pages/realName/index/index` })
+      // uni.navigateTo({ url: `/pages/realName/index/index` })
+      uni.navigateBack()
     },
     onSearchFilter() {
       // 打开底部弹框
@@ -389,8 +408,8 @@ export default {
     },
     /* 查询 */
     onQuery() {
-		this.queryParams.page=0
-	  this.companyInfoList=[]
+      this.queryParams.page = 0
+      this.companyInfoList = []
       this.getListData().then(() => {
         this.$refs.popup.close()
       })
@@ -424,12 +443,12 @@ export default {
       //绿2 黄1 红0
       uni.navigateTo({ url: `/pages/realName/index/pages/personList?proId=${row.proId}&lightStatus=${type}` })
     },
-	goIndex() {
+    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,
@@ -437,7 +456,7 @@ export default {
         type: 1
       }
       uni.request({
-        url: `${config.realAppUrl}${ row.isCollect == 0 ? '/offLine/insertCollect' : '/offLine/deleteCollect'}`,
+        url: `${config.realAppUrl}${row.isCollect == 0 ? '/offLine/insertCollect' : '/offLine/deleteCollect'}`,
         method: 'POST',
         data: JSON.stringify(params),
         header: {
@@ -492,11 +511,11 @@ export default {
   height: 75vh;
 
   .scroll-item {
-	   width: 100%;
-	   height: auto;
-	   background-color: #fff;
-	   border-radius: 10rpx;
-	   margin: 20rpx 0;
+    width: 100%;
+    height: auto;
+    background-color: #fff;
+    border-radius: 10rpx;
+    margin: 20rpx 0;
   }
 
   .item-1,
diff --git a/pages/realName/index/pages/teamList.vue b/pages/realName/index/pages/teamList.vue
index 55d57c4..54de2bd 100644
--- a/pages/realName/index/pages/teamList.vue
+++ b/pages/realName/index/pages/teamList.vue
@@ -231,7 +231,8 @@ export default {
       this.companyList = this.companyList.concat(res.subList)
     },
     leftClick() {
-      uni.navigateTo({ url: `/pages/realName/index/index` })
+      // uni.navigateTo({ url: `/pages/realName/index/index` })
+      uni.navigateBack()
     },
     onSearchFilter() {
       // 打开底部弹框