Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_app into V0.0.2

src/components/orgTree/index.vue

@@ -43,10 +43,9 @@ export default {
         if(!val){
           this.selected = null
         }else {
-          if(this.treeData&&this.treeData.length>0){
-
+         
             this.selected = this.value
-          }
+         
         }
       },
     },
@@ -68,6 +67,7 @@ export default {
       deptTreeList(this.orgId).then(res => {
         this.$nextTick(() => {
           this.treeData = res.data
+          this.$emit('getTree')
         })
 
       })

src/components/peopleList/index.vue

@@ -113,15 +113,20 @@ export default {
     show(val){
       if(val){
         this.getpeople()
+        
       }
     },
     //监听人员数组变化
     userList(val) {
+      this.peoplesId=[]
       this.$set(this.$data,'peoples',val.map(item => item.userName).join(','))
 
       
       
-      this.peoplesId = [val.map(item => item.userId).join(',')]
+       val.map(item => {
+        this.peoplesId.push(item.userId)
+      })
+     
     }
   },
 
@@ -142,10 +147,13 @@ export default {
             item.userId=item.id
           })
           this.peopleListCpoy = JSON.parse(JSON.stringify(this.peopleList))
-         
+        
           this.peopleListCpoy.forEach(item => {
             this.peoplesId.forEach(i => {
+             
+              console.log(this.peoplesId);
               if (item.userId === i) {
+                
                 this.$set(item, 'checked', true)
               }else{
                 this.$set(item, 'checked', false)

src/views/menu/monitoringCall/index.vue

@@ -3,7 +3,7 @@
     <NavBar :go="{type:'push',path:'/menu'}" />
     <van-row>
       <van-col span="24">
-        <org-tree v-model="cascaderValue" @change="getDataList"></org-tree>
+        <org-tree v-model="cascaderValue" @change="getDataList" @getTree="getTreeHandler"></org-tree>
       </van-col>
     </van-row>
     <van-row>
@@ -154,15 +154,25 @@ export default {
       return new Date(+newDateMonth().split('-')[0], +newDateMonth().split('-')[1] - 1)
     }
   },
-  mounted() {
+  created(){
     this.init()
-    setTimeout(() => {
-      this.cascaderValue = JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + ''
-    }, 1500)
+  },
+  mounted() {
+
     
    
   },
+  updated(){
+   
+      // this.cascaderValue = JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + ''
+   
+  },
   methods: {
+    //
+    getTreeHandler(){
+      this.cascaderValue = JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + ''
+
+    },
     //单元格点击事件
     linkHandler(status,id,item){
       

src/views/menu/training/components/addTraining.vue

@@ -3,12 +3,12 @@
     <NavBar :go="{ type: 'push', path: '/training' }" />
     <van-form class="bigbox" ref="form">
       <div class="mainItem">
-        <div>标题</div>
-        <div>{{ trainingData?.title }}</div>
+        <div class="label">标题</div>
+        <div >{{ trainingData?.title }}</div>
       </div>
       <div class="mainItem">
-        <div>单位名称</div>
-        <div>{{ trainingData?.orgName }}</div>
+        <div class="label">单位名称</div>
+        <div >{{ trainingData?.orgName }}</div>
       </div>
       <van-field
         readonly
@@ -376,7 +376,7 @@ export default {
       obj.imageList = obj.imageList.map(item => item.path).join(',')
       console.log(obj.imageList);
       obj.taskUserList = []
-      debugger
+      
       obj.taskUserList.push(...this.userPeopleList, ...this.lackPeopleList)
 
       edittrainingInfo({
@@ -405,6 +405,15 @@ export default {
   padding: 34px;
   justify-content: space-between;
   background-color: #fff;
+  div {
+    flex: 1;
+    text-align: left;
+  }
+  .label {
+    width: 200px;
+    flex: none;
+    text-align: left;
+  }
 }
 .bigbox {
   height: calc(100vh - 200px);

src/views/menu/training/index.vue

@@ -5,7 +5,7 @@
 
       <van-row>
         <van-col span="24">
-          <org-tree v-model="cascaderValue" :name="'sss'" @changeItem="getDataList"></org-tree>
+          <org-tree v-model="cascaderValue" :name="'sss'" @getTree="getTreeHandler" @changeItem="getDataList"></org-tree>
         </van-col>
       </van-row>
       <van-row>
@@ -95,10 +95,10 @@
             <div class="titleClass">
               <div class="title">{{ item.title }}</div>
               <div>
-                <van-button plain type="info" v-if="isSign(item)" size="mini" @click="trainSign(item.id)"
+                <van-button  type="info" v-if="isSign(item)" size="mini" @click="trainSign(item.id)"
                   >培训登记</van-button
                 >
-                <van-button plain type="info" v-if="isSignature(item)" size="mini" @click="signature(item.id)"
+                <van-button  type="info" v-if="isSignature(item)" size="mini" @click="signature(item.id)"
                   >签名</van-button
                 >
               </div>
@@ -191,7 +191,7 @@ export default {
       fieldValue: '全部', //状态名称
       statusValue: ' ', //状态值
       columns: ['全部', '待记录', '待签名', '已完成'], //状态数组
-      typeColumns: ['每月安全培训教育', '专项安全培训教育'], //类型数组
+      typeColumns: ['全部','每月安全培训教育', '专项安全培训教育'], //类型数组
       currentDate: newDateMonth(), //月份值
       conditionShow: false //机构弹框显示隐藏
     }
@@ -238,11 +238,15 @@ export default {
   },
   mounted() {
     this.init()
-    setTimeout(() => {
-      this.cascaderValue = JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + ''
-    }, 500)
+    // setTimeout(() => {
+    //   this.cascaderValue = JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + ''
+    // }, 500)
   },
   methods: {
+    getTreeHandler(){
+      this.cascaderValue = JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + ''
+
+    },
     //机构搜索
     getDataList(val) {
       this.cascaderValue = val.id
@@ -418,8 +422,11 @@ export default {
         case '专项安全培训教育':
           this.typeValue = '1'
           break
+        case '全部':
+          this.typeValue = ' '
+          break
       }
-      console.log(this.typeValue)
+      
       this.typeStatus = false
       this.selectListAppHandler()
     },