Merge branch 'zj' into dev

src/pages/workbench/yygl/deploy_app_detail.vue

@@ -204,6 +204,7 @@ import norCard from "@/components/card";
 import exampleIcon from "@/pages/example/example_icon";
 import Topology from "@/components/topology.vue";
 import { getRole } from "@/utils/common";
+import { mapGetters,mapState } from 'vuex'
 export default {
   components: {
     infoList,
@@ -478,20 +479,40 @@ export default {
       public_form: false,
     };
   },
+  computed:{
+    ...mapGetters([
+      'level',
+    ]),
+    ...mapState(['userInfo']),
+  },
   watch: {},
   created() {
-    this.now_user = this.$store.state.role;
-    getRole().then((data) => {
-      this.now_user = data;
-      this.$store.commit("rolefun", data);
-      this.getServiceInfo();
-      this.getServiceBaseInfo();
-      this.getServiceyxztInfo();
-      this.getImageInfo();
-    });
+    if(this.userInfo){
+      this.now_user = this.level
+    }else{
+      this.getCurrentUser()
+    }
+    this.getServiceInfo();
+    this.getServiceBaseInfo();
+    this.getServiceyxztInfo();
+    this.getImageInfo();
   },
   mounted() {},
   methods: {
+    getCurrentUser() {
+      this.$api.user.getNowUser().then(({ data }) => {
+        if (data.success == 1) {
+          console.log("--- user info ---");
+          console.log(data.data);
+          console.log("--- user info ---");
+          this.$store.commit("userInfofun", data.data);
+          this.now_user = this.level
+           console.log(this.level);
+        } else {
+          console.log(data.errMsg);
+        }
+      });
+    },
       detail(val){
         console.log(val);
       },