coys il y a 2 ans
Parent
commit
dd7f541788

+ 3 - 3
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')
         })
 
       })

+ 15 - 5
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){
       

+ 2 - 2
src/views/menu/protection/components/item.vue

@@ -3,10 +3,10 @@
     <div class="top flex flex-row items-center justify-between">
       <label style="width: 50%">{{ data.name }}</label>
       <label style="width: 50%; text-align: right">
-        <van-button size="mini" type="primary" @click="updateStatus(data, '1')" v-if="data.status != '1' && data.orgId==this.orgId"
+        <van-button size="mini" type="info" @click="updateStatus(data, '1')" v-if="data.status != '1' && data.orgId==this.orgId"
           >布防时间登记</van-button
         >
-        <van-button size="mini" type="primary" @click="updateStatus(data, '0')" v-if="data.status != '0' && data.orgId==this.orgId"
+        <van-button size="mini" type="info" @click="updateStatus(data, '0')" v-if="data.status != '0' && data.orgId==this.orgId"
           >撤防时间登记</van-button
         >
       </label>

+ 10 - 6
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>
@@ -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