修复部分bug

src/api/sys/userSets.js

@@ -25,6 +25,13 @@ export default class userSets {
             params
         )
     };
+    //待办事项统计
+    Statistics(params) {
+        return request.get(
+            `/assign/assignWorkOrder/statistics`,
+            params
+        )
+    };
 
     //盐政通测试用户同步规则
     SchemaService(params) {

src/views/activityMan/nonReligiousInformation/nonReligiousInformationView.vue

@@ -51,7 +51,7 @@
           show-cancel-button
           @confirm="reselected2"
         >
-          <organizations-list @selected="selected2" :type="1"></organizations-list>
+          <organizations-list @selected="selected2" :type="1" :id="inputForm.nonReligiousCategoriesname"></organizations-list>
         </van-dialog>
       </van-cell-group>
 
@@ -238,13 +238,13 @@ export default {
       value: "id",
     };
     const getCategories = ({ selectedOptions }) => {
-      showCategories.value = false;
-      inputForm.value.nonReligiousCategories = selectedOptions[0].id;
-      inputForm.value.nonReligiousCategoriesname = selectedOptions[0].name;
-      console.log(selectedOptions[0]);
-      console.log(selectedOptions[0].name);
-      //类别选择完成后刷新
-      //getVideoAudioList();
+      var that=this;
+      if(selectedOptions[0]!=undefined&&selectedOptions[0]!=null){ 
+        showCategories.value = false;
+        inputForm.value.nonReligiousCategories = selectedOptions[0].id;
+        inputForm.value.nonReligiousCategoriesname = selectedOptions[0].name;
+        //organizationsList.flushByid(selectedOptions[0].id);
+      }
     };
 
 
@@ -301,22 +301,21 @@ export default {
     });
     // 全部选项选择完毕后，会触发 finish 事件
     const onFinish = ({ selectedOptions }) => {
-      showArea.value = false;
-      inputForm.value.placeSelectName = selectedOptions
-        .map((option) => option.name)
-        .join("/");
-        console.log("选择地区："+selectedOptions);
-
-        inputForm.value.place = selectedOptions
-        .map((option) => option.id)
-        .join("/");
+      if(selectedOptions[0]!=undefined&&selectedOptions[0]!=null){ 
+        showArea.value = false;
+        inputForm.value.placeSelectName = selectedOptions
+          .map((option) => option.name)
+          .join("/");
+          console.log("选择地区："+selectedOptions);
 
-        inputForm.value.placeSelectType3= selectedOptions[0].id;
-        inputForm.value.placeSelectType4= selectedOptions[1].id;
-        inputForm.value.placeSelectType5= selectedOptions[2].id;
-        console.log("11:"+inputForm.value);
+          inputForm.value.place = selectedOptions
+          .map((option) => option.id)
+          .join("/");
 
-        //inputForm.value.placeSelectType6= selectedOptions[2].id,
+          inputForm.value.placeSelectType3= selectedOptions[0].id;
+          inputForm.value.placeSelectType4= selectedOptions[1].id;
+          inputForm.value.placeSelectType5= selectedOptions[2].id;
+      }
 
     };
     const submit = () => {

src/views/activityMan/organizationsList.vue

@@ -19,7 +19,7 @@
           ref="checkboxGroup"
         >
           <van-button type="primary" size="mini" @click="checkAll"
-            >全选</van-button
+            >全选{{id}}</van-button
           >
           <van-cell-group inset>
             <van-cell
@@ -64,8 +64,11 @@
   export default {
     name: "organizationsList",
     emits: ["selected"],
-    props: ["type"],
+    props: ["type","id"],
     setup(props, { emit }) {
+
+      console.log("选择组织id："+props.id);
+      let oType=props.id;
       const list = ref([]);
       const loading = ref(false);
       const finished = ref(false);
@@ -76,7 +79,7 @@
         .NonReligiousInformationOrgList({
             current: index + 1,
             size: 10,
-            organizationType:1,//这边加筛选值
+            organizationType:oType,//这边加筛选值
         })
         .then(({ records }) => {
             list.value.push(...records);
@@ -114,6 +117,13 @@
         emit("selected", checked.value, 0);
       };
   
+      const flushByid= (val) =>{
+        index=0;
+        oType=val;
+        console.log("子组件更新："+val);
+        onLoad();
+      };
+
       return {
         // 场所
         list,
@@ -132,6 +142,7 @@
         checkboxGroup,
         // 单选
         selectes,
+        flushByid,
       };
     },
   };

src/views/activityMan/religiousConference/religiousConferenceView.vue

@@ -274,26 +274,25 @@ export default {
     });
     // 全部选项选择完毕后，会触发 finish 事件
     const onFinish = ({ selectedOptions }) => {
-      showArea.value = false;
-      inputForm.value.placeSelectName = selectedOptions
-        .map((option) => option.name)
-        .join("/");
-        console.log("选择地区："+selectedOptions);
+      if(selectedOptions[0]!=undefined&&selectedOptions[0]!=null){ 
+        showArea.value = false;
+        inputForm.value.placeSelectName = selectedOptions
+          .map((option) => option.name)
+          .join("/");
+          console.log("选择地区："+selectedOptions);
 
-        inputForm.value.venue = selectedOptions
-        .map((option) => option.id)
-        .join("/");
+          inputForm.value.venue = selectedOptions
+          .map((option) => option.id)
+          .join("/");
 
-        inputForm.value.venue = selectedOptions
-        .map((option) => option.id)
-        .join("/");
+          inputForm.value.venue = selectedOptions
+          .map((option) => option.id)
+          .join("/");
 
-        inputForm.value.placeSelectType3= selectedOptions[0].id;
-        inputForm.value.placeSelectType4= selectedOptions[1].id;
-        inputForm.value.placeSelectType5= selectedOptions[2].id;
-        console.log("11:"+inputForm.value);
-
-        //inputForm.value.placeSelectType6= selectedOptions[2].id,
+          inputForm.value.placeSelectType3= selectedOptions[0].id;
+          inputForm.value.placeSelectType4= selectedOptions[1].id;
+          inputForm.value.placeSelectType5= selectedOptions[2].id;
+      }
 
     };
     const submit = () => {

src/views/activityMan/securityFacilitiesErr/securityFacilitiesErrView.vue

@@ -188,21 +188,25 @@ export default {
       });
     let showPlace = ref(false);
     const getPlace = ({ selectedOptions }) => {
-      showPlace.value = false;
-      securityFacilitiesErr.siteName = selectedOptions[0];
-      //场所选择完成后刷新
-      getVideoAudioList();
-      getFireStationList();
+      if(selectedOptions[0]!=undefined&&selectedOptions[0]!=null){ 
+        showPlace.value = false;
+        securityFacilitiesErr.siteName = selectedOptions[0];
+        //场所选择完成后刷新
+        getVideoAudioList();
+        getFireStationList();
+      }
     };
     //选择设施类型
     let showLx = ref(false);
     const facilityTypes = [{text:"监控、音频",value:"0"},{text:"消防设备",value:"1"}];
-    const getfacilityType= ({ selectedOptions }) => {      
-      securityFacilitiesErr.facilityType = selectedOptions[0].value;
-      securityFacilitiesErr.facilityTypename = selectedOptions[0].text;
-      getVideoAudioList();
-      getFireStationList();
-      showLx.value = false;
+    const getfacilityType= ({ selectedOptions }) => {     
+      if(selectedOptions[0]!=undefined&&selectedOptions[0]!=null){  
+        securityFacilitiesErr.facilityType = selectedOptions[0].value;
+        securityFacilitiesErr.facilityTypename = selectedOptions[0].text;
+        getVideoAudioList();
+        getFireStationList();
+        showLx.value = false;
+      }
     };
 
     //选择视频音频点位
@@ -223,10 +227,12 @@ export default {
       }
       
     };
-    const setVideoAudios= ({ selectedOptions }) => {      
-      securityFacilitiesErr.videoAudioPoint = selectedOptions[0];
-      securityFacilitiesErr.position=selectedOptions[0].position;
-      showVideoAudio.value = false;
+    const setVideoAudios= ({ selectedOptions }) => {    
+      if(selectedOptions[0]!=undefined&&selectedOptions[0]!=null){
+        securityFacilitiesErr.videoAudioPoint = selectedOptions[0];
+        securityFacilitiesErr.position=selectedOptions[0].position;
+        showVideoAudio.value = false;
+      }            
     };
     
     
@@ -248,10 +254,12 @@ export default {
       }
       
     };
-    const setFireStations= ({ selectedOptions }) => {      
-      securityFacilitiesErr.siteFireProtection = selectedOptions[0];
-      securityFacilitiesErr.position=selectedOptions[0].position;
-      showFireStation.value = false;
+    const setFireStations= ({ selectedOptions }) => {     
+      if(selectedOptions[0]!=undefined&&selectedOptions[0]!=null){ 
+        securityFacilitiesErr.siteFireProtection = selectedOptions[0];
+        securityFacilitiesErr.position=selectedOptions[0].position;
+        showFireStation.value = false;
+      }
     };
 
     // 提交数据

src/views/activityMan/siteInspection/siteInspectionView.vue

@@ -168,10 +168,11 @@ export default {
       });
     let showPlace = ref(false);
     const getPlace = ({ selectedOptions }) => {
-      showPlace.value = false;
-      siteInspection.siteName = selectedOptions[0];
-      console.log(selectedOptions[0].placeSelectName);
-      siteInspection.place = selectedOptions[0].placeSelectName
+      if(selectedOptions[0]!=undefined&&selectedOptions[0]!=null){ 
+        showPlace.value = false;
+        siteInspection.siteName = selectedOptions[0];
+        siteInspection.place = selectedOptions[0].placeSelectName
+      }
     };
     // 获取督查时间
     let showAct = ref(false);
@@ -204,10 +205,12 @@ export default {
     });
     // 全部选项选择完毕后，会触发 finish 事件
     const onFinish = ({ selectedOptions }) => {
-      showArea.value = false;
-      siteInspection.place = selectedOptions
-        .map((option) => option.name)
-        .join("/");
+      if(selectedOptions[0]!=undefined&&selectedOptions[0]!=null){ 
+        showArea.value = false;
+        siteInspection.place = selectedOptions
+          .map((option) => option.name)
+          .join("/");
+      }
     };
     // 提交数据
     const submit = () => {

src/views/tab_a/tabAll.vue

@@ -1,11 +1,11 @@
 <template>
 <div class="bg">
-	<van-nav-bar
+	<!-- <van-nav-bar
 	  title="智慧“和顺”"
 	  left-text="民宗干事"
 	  left-arrow
 	  @click-left="onClickLeft"
-	/>
+	/> -->
 
 	<!-- <van-image
 		width="100%"
@@ -24,7 +24,7 @@
 		<div class="tabtitle1"></div>
 		<div class="tabtitle">我的待办</div>
 		<div class="tabtitle2">（</div>
-		<div class="tabtitle3">15</div>
+		<div class="tabtitle3">{{sum}}</div>
 		<div class="tabtitle4">）</div>
 		<van-icon name="ellipsis" class="tabtitle5" @click="goToBeDone" />
 	</div>
@@ -32,12 +32,12 @@
 	<div class="flexll">
 		<div class="ffl2">
 			<div class="textRegular">待处理</div>
-			<div class="textRed">{{con1}}</div>
+			<div class="textRed">{{sum1}}</div>
 		</div>
 		<div class="verticalLine"></div>
 		<div class="ffl2">
 			<div class="textRegular">已处理</div>
-			<div class="textBlue">8</div>
+			<div class="textBlue">{{sum2}}</div>
 		</div>
 	</div>
 	<div class="hLine"></div>
@@ -86,13 +86,16 @@ import userSets from "@/api/sys/userSets";
 				password:"",
 				password2:"",
 				con1:"0",
+				sum:"0",
+				sum1:"0",
+				sum2:"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();
 		},
 
@@ -177,6 +180,7 @@ import userSets from "@/api/sys/userSets";
 						that.$store.commit('setUser',res.account);
 						that.getBannerImg();//获取轮播图
 						that.getSelectColor();//获取主题颜色
+						that.getStatistics();//获取待办事项数
 					});
 
 					//})//上线取消注释
@@ -184,11 +188,23 @@ 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({