Merge remote-tracking branch 'HS_MZAP/master'

# Conflicts:
#	src/views/tab_a/tabAll.vue

src/views/placeManage/placePerson.vue

@@ -1,5 +1,4 @@
 <template>
-  <van-nav-bar title="人员档案信息" left-arrow @click-left="goback" />
   <div class="serach">
     <van-search
       v-model="value"

src/views/placeManage/placePersoninfo.vue

@@ -1,5 +1,4 @@
 <template>
-  <van-nav-bar title="人员档案信息" left-arrow @click="goback" />
   <div class="banner">
     <h2>扎实提升“三力”</h2>
     <h2>深入推进“三化”</h2>
@@ -221,12 +220,10 @@ export default {
       //个人数据
       data:{},
     })
-    let id = ref('')
     //数据接收
     const router = useRouter();
     onMounted(()=>{
       var item = JSON.parse(router.currentRoute.value.query.data)
-      console.log(item);
       data.data = item;
     })
     //返回
@@ -277,14 +274,14 @@ html {
 .content {
   position: fixed;
   width: 85%;
-  top: 180px;
+  top: 140px;
   left: 50%;
   padding: 20px 10px;
   transform: translateX(-50%);
   background-color: #fff;
   border-radius: 10px;
   font-size: 16px;
-  height: 680px;
+  height: 540px;
   overflow: auto;
   h3 {
     margin: 0;

src/views/placeManage/placeRegister.vue

@@ -1,5 +1,4 @@
 <template>
-  <van-nav-bar title="智慧“和顺”" left-arrow @click-left="goback" />
   <div class="main">
     <p class="title">宗教场所录入</p>
     <div class="formArea">

src/views/placeManage/placeTablet.vue

@@ -1,5 +1,4 @@
 <template>
-  <van-nav-bar title="牌位管理" left-arrow @click="goback" />
   <div class="PersonList">
     <div class="PersonItem" v-for="item in TabletData.data" :key="item.id" @click="goTabletInfo(item)">
       <van-row>

src/views/placeManage/placeTabletInfo.vue

@@ -1,5 +1,4 @@
 <template>
-  <van-nav-bar title="牌位管理" left-arrow @click="goback" />
   <div class="banner">
     <h2>扎实提升“三力”</h2>
     <h2>深入推进“三化”</h2>
@@ -144,8 +143,7 @@
 
 <script>
 import { useRouter } from 'vue-router'
-import {onMounted, reactive,ref} from "vue"
-import UserManage from '@/api/user/UserManage';
+import {onMounted, reactive} from "vue"
 export default {
   setup(){
     const data = reactive({
@@ -210,14 +208,14 @@ html {
 .content {
   position: fixed;
   width: 85%;
-  top: 180px;
+  top: 140px;
   left: 50%;
   padding: 20px 10px;
   transform: translateX(-50%);
   background-color: #fff;
   border-radius: 10px;
   font-size: 16px;
-  height: 680px;
+  height: 540px;
   overflow: auto;
   h3 {
     margin: 0;

src/views/tab_a/tabAll.vue

@@ -20,24 +20,24 @@
 		</van-swipe-item>
 	</van-swipe>
 
-	<div class="tabtitlelay">
+	<div class="tabtitlelay" @click="goToBeDone">
 		<div class="tabtitle1"></div>
 		<div class="tabtitle">我的待办</div>
 		<div class="tabtitle2">（</div>
-		<div class="tabtitle3">{{sum}}</div>
+		<div class="tabtitle3">{{con1+con2}}</div>
 		<div class="tabtitle4">）</div>
-		<van-icon name="ellipsis" class="tabtitle5" @click="goToBeDone" />
+		<van-icon name="ellipsis" class="tabtitle5" />
 	</div>
 
 	<div class="flexll">
-		<div class="ffl2">
-			<div class="textRegular">待处理</div>
-			<div class="textRed">{{sum1}}</div>
+		<div class="ffl2" id="0" @click="goToBeDone($event)">
+			<div class="textRegular" >待处理</div>
+			<div class="textRed">{{con1}}</div>
 		</div>
 		<div class="verticalLine"></div>
-		<div class="ffl2">
-			<div class="textRegular">已处理</div>
-			<div class="textBlue">{{sum2}}</div>
+		<div class="ffl2" id="1" @click="goToBeDone($event)">
+			<div class="textRegular" >已处理</div>
+			<div class="textBlue">{{con2}}</div>
 		</div>
 	</div>
 	<div class="hLine"></div>
@@ -76,7 +76,7 @@
 import tool from "@/tool";
 import  qs  from "qs";
 import userSets from "@/api/sys/userSets";
-
+import toBeDone from '@/api/toBeDone/toBeDone';
 	export default {
 		data() {
 			return{
@@ -85,33 +85,50 @@ import userSets from "@/api/sys/userSets";
 				sms:"",
 				password:"",
 				password2:"",
-				con1:"0",
-				sum:"0",
-				sum1:"0",
-				sum2:"0",
+				con1:0,
+				con2:0,
 				BannerImgurls:['https://img1.baidu.com/it/u=2086445453,3056906789&fm=253&fmt=auto&app=138&f=GIF?w=1378&h=400','https://img1.baidu.com/it/u=2086445453,3056906789&fm=253&fmt=auto&app=138&f=GIF?w=1378&h=400']
 			}
 		},
 
 		created(){
 			let id=this.$route.query.id;
-			//window.xm.setNavigationBarTitle({ title: '智慧“和顺”'})
+			window.xm.setNavigationBarTitle({ title: '智慧“和顺”'})
 			this.TokenLogin2();
+			this.dataNumber();
 		},
 
 		methods:{
-            goToBeDone() {
-              this.$router.push("/toBeDone");
+			// 待办跳转
+            goToBeDone(e) {
+				let value = JSON.stringify(e.currentTarget.id)
+				// console.log(e.currentTarget.id);
+              this.$router.push({
+				path:"/toBeDone",
+				query:{"name":value}
+			  });
             },
+			// 场所登记跳转
 			goPlaceRegister() {
               this.$router.push("/placeRegister");
             },
+			// 人员档案跳转
 			goPlacePerson() {
               this.$router.push("/placePerson");
             },
+			// 牌位管理跳转
 			goPlaceTablet(){
 				this.$router.push("/placeTablet");
 			},
+			//待办数据获取
+			dataNumber(){
+				new toBeDone().list().then((res)=>{
+					this.con1 = res.records.length;
+				})
+				new toBeDone().list2().then((res1)=>{
+					this.con2 = res1.records.length;
+				})
+			},
 			onClickLeft(){
 				history.back();
 			},
@@ -180,7 +197,6 @@ import userSets from "@/api/sys/userSets";
 						that.$store.commit('setUser',res.account);
 						that.getBannerImg();//获取轮播图
 						that.getSelectColor();//获取主题颜色
-						that.getStatistics();//获取待办事项数
 					});
 
 					//})//上线取消注释
@@ -188,23 +204,11 @@ import userSets from "@/api/sys/userSets";
 				}else{
 					that.getBannerImg();//获取轮播图
 					that.getSelectColor();//获取主题颜色
-					that.getStatistics();//获取待办事项数
 				}
 
 
 			},
 
-			getStatistics(){
-				let that=this;
-				new userSets()
-				.Statistics()
-				.then((res) => {
-					that.sum=res[0].sum;
-					that.sum1=res[0].sum1;
-					that.sum2=res[0].sum2;
-				});
-			},
-
 			getBannerImg(){
 				new userSets()
 				.BannerImg({

src/views/toBeDone/toBeDone.vue

@@ -1,5 +1,4 @@
 <template>
-  <van-nav-bar title="我的待办" left-arrow @click-left="goback" />
   <van-tabs
     v-model:active="active"
     title-inactive-color="#bdbdbd"
@@ -60,7 +59,7 @@
 </template>
 
 <script>
-import {reactive,ref} from "vue"
+import {onMounted,reactive,ref} from "vue"
 import { useRouter } from 'vue-router'
 import ToBeDone from '@/api/toBeDone/toBeDone'
 export default {
@@ -72,6 +71,7 @@ export default {
       //已处理
       toBeDoneList2:[]
     })
+    const active = ref(0);
     //获取待办列表
     let workDBList = ref([])
     new ToBeDone().list({}).then((res)=>{
@@ -84,9 +84,15 @@ export default {
     })
     //跳转
     let router = useRouter()
+    //数据接收
+    onMounted(()=>{
+      var item = JSON.parse(router.currentRoute.value.query.name)
+      if(item==1){
+        active.value = 1
+      }
+    })
     const goToBeDoneinfo = (item)=>{
       let data = JSON.stringify(item)
-      // console.log(data);
       router.push({
         path:"/toBeDone_details",
         query:{'data':data}
@@ -98,7 +104,8 @@ export default {
     return {
       goback,
       toBeDone,
-      goToBeDoneinfo
+      goToBeDoneinfo,
+      active 
     }
   }
 };

src/views/toBeDone/toBeDone_details.vue

@@ -1,5 +1,4 @@
 <template>
-  <van-nav-bar title="我的待办" left-arrow @click-left="goback" />
   <div class="banner">
     <h2>扎实提升“三力”</h2>
     <h2>深入推进“三化”</h2>
@@ -154,8 +153,8 @@ html {
 .content {
   position: fixed;
   width: 85%;
-  height: 680px;
-  top: 180px;
+  height: 540px;
+  top: 140px;
   left: 50%;
   padding: 20px 10px;
   transform: translateX(-50%);