Merge branch 'dev' into xym

src/components/app-list/app-card.vue

@@ -4,7 +4,7 @@
       <i class="el-icon-close"></i>
     </a>
     <div class="app_card-icon">
-      <el-avatar shape="square" :size="56" fit="cover" src="data.logo" />
+      <el-avatar shape="square" :size="56" fit="cover" :src="data.logo" />
     </div>
     <div class="app_card-info">
       <p

src/components/menu.vue

@@ -2,21 +2,25 @@
   <div class="menu">
     <img src="../assets/imgs/home_img_logo.png" alt class="logo" />
     <div style="float:right;cursor: pointer;position:relative;" class="user_hover">
-      <span class="user">{{ userInfo.user_name }}</span>
+      <span
+        v-if="userInfo.user_name && userInfo.user_name !=''"
+        class="user"
+      >{{ userInfo.user_name }}</span>
+      <span v-else @click="gotopage('login')" class="user">请登录</span>
       <img
         class="user_pic"
         :src="
           userInfo.picture_path || require('../assets/imgs/home_ic_user.png')
         "
       />
-      <div class="user_menu">
+      <div v-if="userInfo.user_name && userInfo.user_name !=''" class="user_menu">
         <div
           v-for="(item, index) in user_arr"
           :key="index + 700"
           @click="gotopage(item.path)"
         >{{ item.name }}</div>
       </div>
-      <div class="sj"></div>
+      <div v-if="userInfo.user_name && userInfo.user_name !=''" class="sj"></div>
     </div>
     <div
       style="float:right;cursor: pointer;position:relative;"
@@ -27,7 +31,7 @@
         <el-badge v-if="menuCartNum != 0" :value="menuCartNum" :max="99" class="number"></el-badge>
         <img src="../assets/imgs/home_ic_shop.png" alt class="car_img" />
       </div>
-      <div class="shop_menu">
+      <div v-if="userInfo.user_name && userInfo.user_name !=''" class="shop_menu">
         <div class="shop_list_title">最近加入的服务：</div>
         <div
           v-for="(item, index) in shopping_list"
@@ -186,8 +190,10 @@ export default {
   methods: {
     gotopage(n) {
       if (n == "logout") {
+        window.location.href = "/iam/api/logout";
+      } else if (n == "login") {
         let path = this.$route.path;
-        window.location.href = "/iam/api/logout?ReturnUrl=" + path;
+        window.location.href = "/iam/login/#/login?ReturnUrl=" + path;
       } else {
         this.$router.push(n);
       }
@@ -262,7 +268,12 @@ export default {
 }
 .user {
   float: right;
-  margin-right: 113px;
+  display: inline-block;
+  width: 140px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  margin-right: 40px;
   font-size: 16px;
 }
 .user_pic {

src/components/topology.vue

@@ -36,32 +36,32 @@ export default {
         switch (node.data.nodeType) {
           case "workload":
             node.type = "image";
-            node.img = "/static/topology_ic_shujufw.svg";
+            node.img = "./static/topology_ic_shujufw.svg";
             node.size = [15, 15];
             break;
           case "app":
             node.type = "image";
-            node.img = "/static/topology_ic_shujufw.svg";
+            node.img = "./static/topology_ic_shujufw.svg";
             node.size = [15, 15];
             break;
           case "unknow source":
             node.type = "image";
-            node.img = "/static/topology_ic_shujufw.svg";
+            node.img = "./static/topology_ic_shujufw.svg";
             node.size = [15, 15];
             break;
           case "service":
             node.type = "image";
-            node.img = "/static/topology_ic_shujufw.svg";
+            node.img = "./static/topology_ic_shujufw.svg";
             node.size = [15, 15];
             break;
           case "service entry":
             node.type = "image";
-            node.img = "/static/topology_ic_shujufw.svg";
+            node.img = "./static/topology_ic_shujufw.svg";
             node.size = [15, 15];
             break;
           default:
             node.type = "image";
-            node.img = "/static/topology_ic_shujufw.svg";
+            node.img = "./static/topology_ic_shujufw.svg";
             node.size = [15, 15];
             break;
         }
@@ -224,7 +224,7 @@ export default {
             x: legendX,
             y: legendBeginY,
             type: "image",
-            img: "/static/topology_ic_shujufw.svg",
+            img: "./static/topology_ic_shujufw.svg",
             size: [15, 15],
             label: "数据服务"
           },
@@ -233,7 +233,7 @@ export default {
             x: legendX,
             y: legendBeginY + legendYPadding * 1,
             type: "image",
-            img: "/static/topology_ic_shikongfw.svg",
+            img: "./static/topology_ic_shikongfw.svg",
             size: [15, 15],
             label: "时空服务"
           },
@@ -242,7 +242,7 @@ export default {
             x: legendX,
             y: legendBeginY + legendYPadding * 2,
             type: "image",
-            img: "/static/topology_ic_shipinfw.svg",
+            img: "./static/topology_ic_shipinfw.svg",
             size: [15, 15],
             label: "视频服务"
           },
@@ -251,7 +251,7 @@ export default {
             x: legendX,
             y: legendBeginY + legendYPadding * 3,
             type: "image",
-            img: "/static/topology_ic_ganzhifw.svg",
+            img: "./static/topology_ic_ganzhifw.svg",
             size: [15, 15],
             label: "感知服务"
           },
@@ -260,7 +260,7 @@ export default {
             x: legendX,
             y: legendBeginY + legendYPadding * 4,
             type: "image",
-            img: "/static/topology_ic_zonghefw.svg",
+            img: "./static/topology_ic_zonghefw.svg",
             size: [15, 15],
             label: "综合服务"
           }

src/pages/example/example_code.vue

 <template>
   <div class="code-main">
-    <v-apaas-code url="/static/data.json"></v-apaas-code>
+    <v-apaas-code url="./static/data.json"></v-apaas-code>
   </div>
 </template>
 

src/pages/service_shop/services_shop.vue

@@ -75,7 +75,7 @@ export default {
   methods: {
     init() {
       this.$http
-        .get("/static/serviceshop.json")
+        .get("./static/serviceshop.json")
         .then((response) => {
           let data = response.body;
           let servicesShopInfo = [

src/pages/workbench/fwgl/serviceDetail.vue

@@ -532,7 +532,7 @@ export default {
       });
     },
     getData() {
-      let url = "/static/antv.json";
+      let url = "./static/antv.json";
       this.$http
         .get(url)
         .then((response) => {

src/pages/workbench/workPlace.vue

@@ -991,7 +991,7 @@ export default {
     },
     getUserData() {
       this.$http
-        .get("/static/workpalce.json")
+        .get("./static/workpalce.json")
         .then((response) => {
           console.log(response);
           let data = response.data.data;
@@ -1002,7 +1002,7 @@ export default {
     },
     getoperatingdata() {
       this.$http
-        .get("/static/workpalce.json")
+        .get("./static/workpalce.json")
         .then((response) => {
           console.log(response);
           let data = response.data.data;
@@ -1017,7 +1017,7 @@ export default {
     },
     getappusedata() {
       this.$http
-        .get("/static/workpalce.json")
+        .get("./static/workpalce.json")
         .then((response) => {
           console.log(response);
           let data = response.data.data;
@@ -1027,7 +1027,7 @@ export default {
     },
     getfwlxdata() {
       this.$http
-        .get("/static/workpalce.json")
+        .get("./static/workpalce.json")
         .then((response) => {
           console.log(response);
           let data = response.data.data;
@@ -1037,7 +1037,7 @@ export default {
     },
     getyylxdata() {
       this.$http
-        .get("/static/workpalce.json")
+        .get("./static/workpalce.json")
         .then((response) => {
           console.log(response);
           let data = response.data.data;
@@ -1047,7 +1047,7 @@ export default {
     },
     getHealth() {
       this.$http
-        .get("/static/workpalce.json")
+        .get("./static/workpalce.json")
         .then((response) => {
           console.log(response);
           let data = response.data.data;
@@ -1057,7 +1057,7 @@ export default {
     },
     getAppData() {
       this.$http
-        .get("/static/workpalce.json")
+        .get("./static/workpalce.json")
         .then((response) => {
           console.log(response);
           let data = response.data.data;
@@ -1067,7 +1067,7 @@ export default {
     },
     getInfoData() {
       this.$http
-        .get("/static/workpalce.json")
+        .get("./static/workpalce.json")
         .then((response) => {
           console.log(response);
           let data = response.data.data;

src/pages/workbench/yygl/apply_app_detail.vue

@@ -267,7 +267,7 @@ export default {
     },
     getServiceapplyInfo() {
       this.$http
-        .get("/static/applyappdetail.json")
+        .get("./static/applyappdetail.json")
         .then((response) => {
           let data = response.data.data;
           this.$set(this.servicead_arr[1], "info", data.appapplyinfo.scene);
@@ -279,7 +279,7 @@ export default {
     },
     getServiceBaseInfo() {
       this.$http
-        .get("/static/applyappdetail.json")
+        .get("./static/applyappdetail.json")
         .then((response) => {
           let data = response.data.data;
           this.$set(this.list_arr[0], "info", data.appbaseinfo.intorduce);
@@ -297,7 +297,7 @@ export default {
     },
     getServiceInfo() {
       this.$http
-        .get("/static/applyappdetail.json")
+        .get("./static/applyappdetail.json")
         .then((response) => {
           let data = response.data.data;
           this.$set(this.service_header_arr, "id", data.appInfo.id);

src/pages/workbench/yygl/approval_app_detail.vue

@@ -237,7 +237,7 @@ export default {
       },
       getapplyinfo(){
         this.$http
-        .get("/static/approvalappdetail.json")
+        .get("./static/approvalappdetail.json")
         .then((response) => {
           let data = response.data.data;
           this.$set(this.list_arr[0], "info", data.appbaseinfo.company);
@@ -252,7 +252,7 @@ export default {
       },
       getheaderinfo(){
         this.$http
-        .get("/static/approvalappdetail.json")
+        .get("./static/approvalappdetail.json")
         .then((response) => {
           let data = response.data.data;
           this.$set(this.service_header_arr, "name", data.appInfo.name);

src/pages/workbench/yygl/deploy_app_detail.vue

@@ -497,7 +497,7 @@ export default {
       },
     getImageInfo() {
       this.$http
-        .get("/static/deployappdetail.json")
+        .get("./static/deployappdetail.json")
         .then((response) => {
           console.log(response);
           let data = response.data.data;
@@ -507,7 +507,7 @@ export default {
     },
     getServiceyxztInfo() {
       this.$http
-        .get("/static/servicedetail1.json")
+        .get("./static/servicedetail1.json")
         .then((response) => {
           console.log(response);
           let data = response.data.data;

static/servicedetail1.json

@@ -33,7 +33,7 @@
             "example": "无请求示例",
             "format": "UTF-8",
             "responseParamUrl": "params_arr",
-            "codeExampleUrl": "/static/data.json"
+            "codeExampleUrl": "./static/data.json"
         },
         "servicebaseinfo": [
             {