From 9fa4cce190a59a6fd87d0c8bc18b566e15aba93c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 18 Oct 2021 19:56:13 +0800
Subject: [PATCH] commit

---
 src/App.vue                                   | 12 ++---
 .../config/pages/mechanismManage/index.vue    | 53 ++++++++++++++++++-
 .../otherBussStandardDetails/index.vue        |  4 +-
 src/pages/home1/components/release/index.vue  |  2 +-
 src/pages/home2/components/release/index.vue  |  2 +-
 5 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index f4d57b343..31060e64e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -191,7 +191,7 @@
             return
           }
 
-          if (userInfoModifyTimeInLocalStorage === null) {
+          if (userInfoModifyTimeInLocalStorage === null && webLoginType === 'idm') {
             this.$store.dispatch('syncStorageData')
 
             const currentPage = this.$route.name
@@ -206,7 +206,7 @@
             });
             this.messageForLogin && this.messageForLogin.close()
             this.messageForLogin = this.$message({
-              message: `用户已退出，${this.currentMinute}秒后将跳转到登录页面`,
+              message: `用户已退出，${this.currentMinute}秒后将跳转到登录1页面`,
               type: 'warning'
             })
 
@@ -216,14 +216,14 @@
                 clearInterval(this.intervalForLogin)
                 this.loading.close()
 
-                this.$router.push('/login')
-                console.log('切换到登录页面', currentPage)
+                  this.$router.push('/login')
+                  console.log('切换到登录页面', currentPage)
               }
               this.currentMinute--
               this.messageForLogin.message = `用户已退出，${this.currentMinute}秒后将跳转到登录页面`
-            }, 1000)
+            }, 0)
 
-          } else if (userInfoModifyTime !== userInfoModifyTimeInLocalStorage) {
+          } else if (userInfoModifyTime !== userInfoModifyTimeInLocalStorage && webLoginType === 'idm') {
             this.$store.dispatch('syncStorageData')
 
             console.log('用户信息已更改，同步数据')
diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue
index 60231784e..cf1d1930e 100644
--- a/src/pages/config/pages/mechanismManage/index.vue
+++ b/src/pages/config/pages/mechanismManage/index.vue
@@ -3,11 +3,26 @@
   <div id="mechanism-manage" :class="{ 'tree-close': sideClose }" class="v-class">
     <div class="tree-content" :class="{ 'tree-closed': sideClose }">
       <div class="tree">
+<!--        @keyup.enter.native="searchPeople"-->
         <el-input
           class="filter-tree-input"
           placeholder="输入关键字进行过滤"
           v-model="filterText">
         </el-input>
+<!--        <el-tree-->
+<!--          node-key="id"-->
+<!--          :data="treeData"-->
+<!--          :props="defaultProps"-->
+<!--          :default-checked-keys="nodeList"-->
+<!--          :current-node-key="nodeKeyId"-->
+<!--          highlight-current-->
+<!--          check-strictly-->
+<!--          :expand-on-click-node="false"-->
+<!--          ref="tree"-->
+<!--          :load="loadNode"-->
+<!--          @node-click="handleNodeClick"-->
+<!--          lazy>-->
+<!--        </el-tree>-->
         <el-tree
           :data="treeData"
           :props="defaultProps"
@@ -15,6 +30,7 @@
           node-key="id"
           :filter-node-method="filterNode"
           highlight-current
+          default-expand-all
           ref="tree"
           :expand-on-click-node="false"
           @node-click="handleNodeClick">
@@ -274,7 +290,6 @@ export default {
       }, {}, res => {
         if (res.ok) {
           this.$message.success('配置岗位成功')
-
           this.modalPost = false
           this.getData()
         }
@@ -350,6 +365,41 @@ export default {
       this.id = data.id
       this.getData()
     },
+    // searchPeople(){
+    //   console.log(this.filterText);
+    // },
+    // loadNode(node, resolve) {
+    //   if (node.level === 0) {
+    //     return resolve(this.treeData);
+    //   }
+    //   this.getChildren(node, resolve)
+    // },
+    // getChildren (node, resolve) {
+    //   this.id = node.key
+    //   this.getData()
+    //   this.$http.get('SarInstitution/institution/getNext', {
+    //     institutionId: node.key
+    //   }, {}, res => {
+    //     let people = [];
+    //     res.forEach(item => {
+    //       if(item.disabled === true){
+    //         people.push(item)
+    //       }
+    //     })
+    //     resolve(people)
+    //   })
+    // },
+    // getTree() {
+    //   this.$http.get('SarInstitution/institution/getFirstInstitution', {}, {
+    //     _this: this,
+    //     loading: 'treeLoading'
+    //   }, res => {
+    //     this.treeData = res
+    //     this.nodeKeyId = this.treeData[0].id
+    //     this.treeLoading = false
+    //   }, e => {
+    //   })
+    // },
     getTree() {
       this.$http.get('SarInstitution/institution', {}, {
         _this: this,
@@ -378,7 +428,6 @@ export default {
         _this: this,
         loading: 'Loading'
       }, res => {
-        console.log(res.data)
         res.data.records.forEach((item) => {
           let NameList = ''
           item.positions.forEach((items) => {
diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index e3656326e..3bbd4c9cf 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -124,8 +124,8 @@
                   :key="fileIndex"
                 >
                   <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
-                  <i title="下载" @click="downloadFile(file.id)" class="icon-download" v-btn-permission="'0a0d0d1956ab6ca62a8efd6a1ff536ad'"/>
-                  <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="'bfed56ba55181d154bfb4cd1cfbca806'"/>
+                  <i title="下载" @click="downloadFile(file.id)" class="icon-download" v-btn-permission="'9882f477aad895ec56a7464f3e9c0b11'"/>
+                  <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="'9bab2662fbd9d0507b39be813371a597'"/>
                   <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                 </p>
 <!--                <el-button-->
diff --git a/src/pages/home1/components/release/index.vue b/src/pages/home1/components/release/index.vue
index 3fe4a1059..543adaa4a 100644
--- a/src/pages/home1/components/release/index.vue
+++ b/src/pages/home1/components/release/index.vue
@@ -28,7 +28,7 @@ export default {
   mounted() {
     this.getDate()
     this.getAdvice()
-    this.addDate()
+    // this.addDate()
   },
   methods: {
     // 点击查看
diff --git a/src/pages/home2/components/release/index.vue b/src/pages/home2/components/release/index.vue
index b3b3d089f..62081407a 100644
--- a/src/pages/home2/components/release/index.vue
+++ b/src/pages/home2/components/release/index.vue
@@ -56,7 +56,7 @@ export default {
   mounted() {
     this.getDate()
     this.getAdvice()
-    this.addDate()
+    // this.addDate()
   },
   methods: {
     // 点击查看