feat(login): remove unnecessary logic

dgiot · May 6, 2022 · 82e401f · 82e401f
1 parent 153b249
commit 82e401f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -137,7 +137,7 @@
   },
   "config": {
     "commitizen": {
-      "path": "./node_modules/cz-conventional-changelog"
+      "path": "cz-conventional-changelog"
     }
   },
   "husky": {

diff --git a/src/dgiot/components/DgiotRoleTree/index.vue b/src/dgiot/components/DgiotRoleTree/index.vue
@@ -128,6 +128,7 @@
     },
     data() {
       return {
+        firstChild: false,
         updateKey: 1,
         // 在需要对节点进行过滤时，调用 Tree 实例的filter方法，参数为关键字。
         filterText: '',
@@ -157,6 +158,12 @@
     watch: {},
     created() {
       this.$nextTick(() => {
+        // 确保只有获取不到currentDepartment 再点击
+        console.error(this.currentDepartment, 'this.currentDepartment')
+        if (!this.currentDepartment?.objectId) {
+          document.querySelector('.el-tree-node__content').click()
+          this.firstChild = true
+        }
         this.$refs.tree.setCurrentKey(this.currentDepartment.objectId)
       })
     },
@@ -246,14 +253,15 @@
             .getDgiotlog('src/dgiot/components/DgiotRoleTree/index.vue')
             .info('DgiotRoleTree ->', data, checked)
           console.groupEnd()
-          this.$baseNotify(
-            this.$translateTitle('message.Department has been switched to') +
-              data.depname,
-            this.$translateTitle('message.Tips'),
-            'success',
-            '',
-            5000
-          )
+          if (!this.firstChild)
+            this.$baseNotify(
+              this.$translateTitle('message.Department has been switched to') +
+                data.depname,
+              this.$translateTitle('message.Tips'),
+              'success',
+              '',
+              5000
+            )
         } catch (error) {
           dgiotlog.log(error)
           this.$baseMessage(
@@ -262,6 +270,7 @@
             'dgiot-hey-message-error'
           )
         }
+        this.firstChild = false
       },
       handleCheckClick(data, checked) {
         console.groupCollapsed(

diff --git a/src/views/DeviceCloud/manage/component/task.vue b/src/views/DeviceCloud/manage/component/task.vue
@@ -1,5 +1,6 @@
 <!-- Language: vue -->
 <!-- Path: src/views/DeviceCloud/manage/component/task.vue -->
+
 <template>
   <div class="task-con-container">{{ productid }}</div>
 </template>

diff --git a/src/views/MultiTenant/user/login/index.vue b/src/views/MultiTenant/user/login/index.vue
@@ -128,6 +128,7 @@
   import { Roletree } from '@/api/Menu'
   import { Permission } from '@/api/Permission'
   import { getProtocol } from '@/api/Protocol/index'
+
   export default {
     name: 'Login',
     directives: {
@@ -204,6 +205,7 @@
         logo: 'user/logo',
         objectId: 'user/objectId',
         backgroundimage: 'user/backgroundimage',
+        currentDepartment: 'user/currentDepartment',
       }),
     },
     watch: {
@@ -340,7 +342,6 @@
           }
           await setTimeout(async () => {
             if (this.objectId) {
-              document.querySelector('.el-tree-node__content').click()
               console.log('userid', this.objectId)
               const { results: permission = [] } = await Permission()
               this.setPermission(permission)