Merge branch 'xym' into dev

src/components/apass-list.vue

@@ -4,6 +4,8 @@
       <slot name="breadcrumb"></slot>
     </div>
     <div class="main-container">
+      <slot name="top"></slot>
+
       <div class="header-container" v-if="!hideHeader">
         <div class="header-left apass_button">
           <el-button
@@ -18,6 +20,28 @@
               "
             ></i>
           </el-button>
+
+          <div
+            v-for="(item, index) in selectFilter"
+            :key="'select_' + index"
+            class="select_container"
+          >
+            <span class="select_title" v-text="item.name"></span>
+            <el-select
+              v-model="item.value"
+              placeholder="请选择"
+              @change="listAction"
+            >
+              <el-option
+                v-for="(v, i) in item.options"
+                :key="'select_' + index + '_option_' + i"
+                :label="v.name"
+                :value="v.value"
+              >
+              </el-option>
+            </el-select>
+          </div>
+
           <slot name="header-left"></slot>
         </div>
         <div class="header-center">
@@ -51,7 +75,7 @@
         <list-table
           :header="listHeader"
           :data="listData"
-          :padding-left="35"
+          :padding-left="listPaddingLeft"
         ></list-table>
       </div>
 
@@ -84,6 +108,10 @@ export default {
       type: Array,
       default: () => [],
     },
+    otherFilter: {
+      type: Array,
+      default: () => [],
+    },
     listHeader: {
       type: Array,
       default: () => [],
@@ -116,8 +144,21 @@ export default {
     currentPage: 1,
     timer: null,
     pageSizes: [15, 50, 100],
+    selectFilter: [],
   }),
   methods: {
+    initOtherFilter() {
+      this.otherFilter.forEach((item) => {
+        this.$set(this.filter, item.prop, item.default);
+
+        this.selectFilter.push({
+          name: item.name,
+          prop: item.prop,
+          value: item.default,
+          options: item.options,
+        });
+      });
+    },
     searchAction(value) {
       this.listAction();
     },
@@ -140,8 +181,15 @@ export default {
       }
 
       this.timer = setTimeout(() => {
+        let selectFilter = {};
+
+        this.selectFilter.forEach((item) => {
+          selectFilter[item.prop] = item.value;
+        });
+
         this.$emit("list-action", {
           ...this.filter,
+          ...selectFilter,
           keyword: this.searchValue,
           size: this.pageSize,
           page: this.currentPage,
@@ -150,6 +198,10 @@ export default {
     },
   },
   mounted() {
+    if (this.otherFilter && this.otherFilter.length > 0) {
+      this.initOtherFilter();
+    }
+
     this.listAction();
   },
 };
@@ -182,7 +234,17 @@ export default {
   justify-content: space-between;
   align-items: center;
 }
-.header-container .el-button + .el-button {
+.header-container .select_container {
+  display: inline-block;
+  vertical-align: middle;
+}
+.header-container .select_container .select_title {
+  font-size: 14px;
+  color: #242c43;
+  margin-right: 10px;
+}
+.header-container .el-button + .el-button,
+.header-container .select_container + .select_container {
   margin-left: 25px;
 }
 .apass_filter {

src/components/apass-table.vue

 <template>
   <div class="apass_table">
     <el-table :data="data">
-      <el-table-column :width="Math.max(paddingLeft - 10, 0)"></el-table-column>
+      <el-table-column
+        v-if="paddingLeft > 10"
+        :width="paddingLeft - 10"
+      ></el-table-column>
       <el-table-column
         v-for="(item, index) in header"
         :label="item.label"
@@ -43,6 +46,33 @@
               @click="item.callback && item.callback(scope.row)"
             ></a>
           </div>
+          <div v-else-if="item.type === 'image'" class="img_content">
+            <img
+              :src="item.getImage && item.getImage(scope.row)"
+              :width="item.size"
+            />
+          </div>
+          <div
+            v-else-if="
+              item.type === 'tooltip' &&
+                item.getLength &&
+                item.getLength(scope.row) > 1
+            "
+          >
+            <el-tooltip
+              placement="right-start"
+              popper-class="apass_table_tooltip"
+            >
+              <div
+                slot="content"
+                v-html="item.getContent && item.getContent(scope.row)"
+              ></div>
+              <span
+                v-text="(item.getText && item.getText(scope.row)) + '..'"
+                style="text-decoration: underline;color: #515fe7;"
+              ></span>
+            </el-tooltip>
+          </div>
           <span
             v-else
             v-text="
@@ -73,3 +103,19 @@ export default {
   },
 };
 </script>
+
+<style scoped>
+.img_content {
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+</style>
+
+<style>
+.apass_table_tooltip {
+  font-size: 12px;
+  line-height: 20px;
+}
+</style>

src/components/service-tabs/service-tab-comments.vue

@@ -50,11 +50,11 @@ export default {
       score: 0,
       starInfo: [
         {
-          star: 1,
+          star: 5,
           percent: 0,
         },
         {
-          star: 2,
+          star: 4,
           percent: 0,
         },
         {
@@ -62,11 +62,11 @@ export default {
           percent: 0,
         },
         {
-          star: 4,
+          star: 2,
           percent: 0,
         },
         {
-          star: 5,
+          star: 1,
           percent: 0,
         },
       ],
@@ -79,7 +79,7 @@ export default {
 
       return {
         score: data.avgScore || 0,
-        starInfo: [1, 2, 3, 4, 5].map((star) => {
+        starInfo: [5,4,3,2,1].map((star) => {
           let percent =
             this.commentsTtotal > 0
               ? (((data.scoreStatic && data.scoreStatic[star]) || 0) /

src/components/service-tabs/service-tabs.vue

@@ -13,7 +13,7 @@
       ></service-tab-detail>
     </el-tab-pane>
 
-    <!-- 规格定价 -->
+    <!-- 规格说明 -->
     <el-tab-pane
       :label="specificationTitle"
       name="specification"
@@ -25,7 +25,7 @@
       ></service-tab-specification>
     </el-tab-pane>
 
-    <!-- 提供机构 -->
+    <!-- 提供组织 -->
     <el-tab-pane :label="providerTitle" name="provider" v-if="providerData">
       <service-tab-provider
         class="service_info"
@@ -65,11 +65,11 @@ export default {
     },
     specificationTitle: {
       type: String,
-      default: () => "规格定价",
+      default: () => "规格说明",
     },
     providerTitle: {
       type: String,
-      default: () => "提供机构",
+      default: () => "提供组织",
     },
     commentsTitle: {
       type: String,

src/store/index.js

@@ -8,9 +8,9 @@ const store = new Vuex.Store({
     userInfo: null, // 用户信息
     serviceShopMenu: "/shop/data_service_list", // 服务超市侧边栏
     fwglNav: [
-      ["注册发布的服务", "申请的服务" /* , "云资源服务" */], // 普通用户
-      ["组织服务管理", "服务审批管理" /* , "云资源管理" */], // 组织管理员
-      ["平台服务管理", "服务审批管理" /* , "云资源管理" */], // 超级管理员
+      ["注册发布的服务", "申请的服务", "云资源服务"], // 普通用户
+      ["组织服务管理", "服务审批管理", "云资源管理"], // 组织管理员
+      ["平台服务管理", "服务审批管理", "云资源管理"], // 超级管理员
     ], // 服务管理列表，onlyRead
     yyglNav: [
       ["应用仓库", "我部署的应用", "申请的应用"], // 普通用户