Merge branch 'xym' into dev

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

@@ -4,12 +4,12 @@
       <i class="el-icon-close"></i>
     </a>
     <div class="app_card-icon">
-      <el-avatar shape="square" :size="56" fit="cover" :src="data.img" />
+      <el-avatar shape="square" :size="56" fit="cover" :src="data.logo" />
     </div>
     <div class="app_card-info">
       <p
         class="app_card-name text_clip"
-        v-text="data.name"
+        v-text="data.app_name"
         @click="intoDetail"
       ></p>
       <p class="app_card-version text_clip" v-text="data.version"></p>
@@ -24,7 +24,7 @@
         <i class="el-icon-time"></i>
         <span>上线时间：</span>
       </span>
-      <span class="text_clip" v-text="data.time"></span>
+      <span class="text_clip" v-text="data.created"></span>
     </p>
   </div>
 </template>
@@ -53,7 +53,7 @@ export default {
       this.$emit("delete-action", this.data);
     },
     intoDetail() {
-      this.$router.push(`${this.detailsUrl}${this.data.id}`);
+      this.$router.push(`${this.detailsUrl}${this.data.up_userid}`);
     },
   },
 };

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

@@ -60,12 +60,12 @@ export default {
 
 <style scoped>
 .app_list {
-  margin: 20px -25px 0;
+  margin: 0 -20px;
   padding: 30px 0 0;
-  border-top: 1px solid #e3e5ef;
   display: flex;
   flex-wrap: wrap;
   justify-content: flex-start;
   align-items: flex-start;
+  align-content: flex-start;
 }
 </style>

src/pages/workbench/fwgl/fwglList.vue

@@ -39,7 +39,7 @@ export default {
     listHeader: [],
     listData: [],
     filterList: [],
-    roleFilter: [],
+    otherFilter: [],
     dialogInfo: {
       title: "",
       msg: "",
@@ -73,20 +73,24 @@ export default {
       Promise.all([
         this.$http.get("/apaas/service/v3/service/manager/servtype"),
         this.$http.get("/apaas/service/v3/service/manager/servarea"),
-      ]).then((response) => {
-        let data = response.map((item) => {
-          return {
-            name: item.body.data[0].type_name,
-            prop: item.body.data[0].type_code,
-            data: item.body.data.map((v) => ({
-              name: v.name,
-              value: v.id,
-            })),
-          };
-        });
+      ])
+        .then((response) => {
+          let data = response.map((item) => {
+            return {
+              name: item.body.data[0].type_name,
+              prop: item.body.data[0].type_code,
+              data: item.body.data.map((v) => ({
+                name: v.name,
+                value: v.id,
+              })),
+            };
+          });
 
-        this.filterList = [...data, ...this.roleFilter];
-      });
+          this.filterList = [...data, ...this.otherFilter];
+        })
+        .catch((error) => {
+          console.log(error);
+        });
     },
     initHeader() {
       let _self = this;
@@ -163,7 +167,7 @@ export default {
             ],
           },
         ];
-        this.roleFilter = [
+        this.otherFilter = [
           {
             name: "开放程度",
             prop: "openness",
@@ -267,7 +271,7 @@ export default {
             ],
           },
         ];
-        this.roleFilter = [
+        this.otherFilter = [
           {
             name: "开放程度",
             prop: "openness",
@@ -419,7 +423,7 @@ export default {
             align: "center",
           },
         ];
-        this.roleFilter = [
+        this.otherFilter = [
           {
             name: "开放程度",
             prop: "openness",
@@ -532,7 +536,7 @@ export default {
             ],
           },
         ];
-        this.roleFilter = [
+        this.otherFilter = [
           {
             name: "开放程度",
             prop: "openness",
@@ -696,7 +700,7 @@ export default {
             ],
           },
         ];
-        this.roleFilter = [
+        this.otherFilter = [
           {
             name: "开放程度",
             prop: "openness",
@@ -795,7 +799,7 @@ export default {
             ],
           },
         ];
-        this.roleFilter = [
+        this.otherFilter = [
           {
             name: "开放程度",
             prop: "openness",

src/store/index.js

@@ -12,7 +12,7 @@ const store = new Vuex.Store({
       ["平台服务管理", "服务审批管理" /* , "云资源管理" */], // 超级管理员
     ], // 服务管理列表，onlyRead
     yyglNav: [
-      ["应用仓库", "我部署的应用", "申请的应用", "审批的应用"], // 普通用户
+      ["应用仓库", "我部署的应用", "申请的应用" /* "审批的应用" */], // 普通用户
       ["应用仓库管理", "部署的应用", "应用审批管理"], // 组织管理员
       ["平台应用管理", "应用部署管理", "应用审批管理"], // 超级管理员
     ], // 应用管理列表，onlyRead