Merge remote-tracking branch 'origin/master'

src/views/dm/system/index.vue

@@ -79,7 +79,7 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import dmUserTemp from '@/components/User/dmUserindex'
 
-const defaultForm = { systemName: null, systemUrl: null, storage: {}, dmUser: {}, isMenu: false, menuPath: null }
+const defaultForm = { id: null, systemName: null, systemUrl: null, storage: {}, dmUser: {}, isMenu: false, menuPath: null }
 export default {
   name: 'DmSystem',
   components: { pagination, crudOperation, rrOperation, udOperation, dmUserTemp },

src/views/middle.vue

@@ -246,54 +246,58 @@ export default {
   },
   methods: {
     getUser(token) {
-      ssoGetUser(token).then((res) => {
-        if (!sessionStorage.getItem('dmUser')) {
-          console.log(111)
-          sessionStorage.setItem('dmUser', JSON.stringify(res.data.data))
+      if (!localStorage.getItem('dmUser')) {
+        ssoGetUser(token).then((res) => {
+          // console.log(111)
+          localStorage.setItem('dmUser', JSON.stringify(res.data.data))
           this.dmUser = res.data.data
-        } else {
-          console.log(222)
-          this.dmUser = JSON.parse(sessionStorage.getItem('dmUser'))
-        }
-        console.log(this.dmUser)
-        const user = {
-          username: this.dmUser.user.username,
-          password: this.dmUser.user.ossPassword
-        }
-        this.$store.dispatch('Sso', user).then(() => {
-          crudDmSystem.queryByUserId(this.dmUser.user.id, 0).then((res) => {
-            this.systemList = res
-          })
-          crudDmSystem.queryByUserId(this.dmUser.user.id, 1).then((res) => {
-            this.systemListOne = res
-          })
+          this.allDate()
+        })
+      } else {
+        // console.log(222)
+        this.dmUser = JSON.parse(localStorage.getItem('dmUser'))
+        this.allDate()
+      }
+    },
+    allDate() {
+      // console.log(this.dmUser)
+      const user = {
+        username: this.dmUser.user.username,
+        password: this.dmUser.user.ossPassword
+      }
+      this.$store.dispatch('Sso', user).then(() => {
+        crudDmSystem.queryByUserId(this.dmUser.user.id, 0).then((res) => {
+          this.systemList = res
+        })
+        crudDmSystem.queryByUserId(this.dmUser.user.id, 1).then((res) => {
+          this.systemListOne = res
         })
-        this.getBalance(this.dmUser.user.dmUser.cardid)
-        this.getPlate(
-          this.dmUser.token,
-          this.dmUser.nonce,
-          this.dmUser.timestamp,
-          this.dmUser.user.id
-        )
-        this.getAccessTraffic(
-          this.dmUser.token,
-          this.dmUser.nonce,
-          this.dmUser.timestamp,
-          this.dmUser.user.id
-        )
-        this.orderRecord(
-          this.dmUser.token,
-          this.dmUser.nonce,
-          this.dmUser.timestamp,
-          this.dmUser.user.dmUser.cardid
-        )
-        this.getVisitors(
-          this.dmUser.token,
-          this.dmUser.nonce,
-          this.dmUser.timestamp,
-          this.dmUser.user.id
-        )
       })
+      this.getBalance(this.dmUser.user.dmUser.cardid)
+      this.getPlate(
+        this.dmUser.token,
+        this.dmUser.nonce,
+        this.dmUser.timestamp,
+        this.dmUser.user.id
+      )
+      this.getAccessTraffic(
+        this.dmUser.token,
+        this.dmUser.nonce,
+        this.dmUser.timestamp,
+        this.dmUser.user.id
+      )
+      this.orderRecord(
+        this.dmUser.token,
+        this.dmUser.nonce,
+        this.dmUser.timestamp,
+        this.dmUser.user.dmUser.cardid
+      )
+      this.getVisitors(
+        this.dmUser.token,
+        this.dmUser.nonce,
+        this.dmUser.timestamp,
+        this.dmUser.user.id
+      )
     },
     getBalance(card) {
       axios
@@ -405,6 +409,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.logout()
+        localStorage.clear()
       })
     },
     logout() {