Merge branch 'dev' of https://cloud.wodcloud.com/git/apaas/apaas-v3-ui into dev

index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
     <title>Beagle aPaaS Platform v3.0</title>
-    <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
+    <!-- <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" /> -->
     <style>
       body{
         background-color: #f6f7fb;

src/assets/css/index.css

@@ -261,15 +261,15 @@ div {
 }
 
 .el-tabs__item {
-  font-size: 16px;
+  font-size: 14px;
   color: #8890a7;
-  line-height: 24px !important;
+  line-height: 14px !important;
   font-weight: bold;
 }
 
 .el-tabs__nav-scroll .el-tabs__item {
-  line-height: 38px !important;
-  height: 44px !important;
+  line-height: 14px !important;
+  height: 38px !important;
 }
 
 .el-tabs__item:hover {
@@ -499,7 +499,7 @@ border-radius:8px;
   margin-left: 35px;
 } */
 .el-input__inner {
-  border-radius: 8px;
+  border-radius: 6px;
 }
 
 .el-input-group__append,

src/components/apass-list.vue

@@ -84,7 +84,6 @@
           :header="listHeader"
           :data="listData"
           :padding-left="listPaddingLeft"
-          :select="listSelect"
           @select="selectAction"
         ></list-table>
       </div>
@@ -149,19 +148,21 @@ export default {
       type: String,
       default: () => "请输入关键字",
     },
-    listSelect: {
-      type: Boolean,
-      default: false,
+    pageSize: {
+      type: Number,
+      default: () => 10,
+    },
+    pageSizes: {
+      type: Array,
+      default: () => [10, 20, 50],
     },
   },
   data: () => ({
     showListFilter: false,
     filter: {},
     searchValue: "",
-    pageSize: 10,
     currentPage: 1,
     timer: null,
-    pageSizes: [10, 20, 50],
     selectFilter: [],
   }),
   watch: {
@@ -241,6 +242,7 @@ export default {
     },
   },
   mounted() {
+    console.log(this.pageSize);
     this.initOtherFilter();
     this.listAction();
   },

src/components/general/block-radius.vue

 <template>
-  <div class="block_radius">
+  <div class="block_radius" :style="'border-radius:' + borRadius + 'px;padding:' +  paddingNum + 'px;'">
     <div v-if="show_header" class="block_header">
       <div class="block_header_title">{{ title }}</div>
       <div class="block_header_button_group">
@@ -32,6 +32,14 @@ export default {
     title: {
       type: String,
       default: ""
+    },
+    borRadius: {
+      type: Number,
+      default: 10,
+    },
+    paddingNum: {
+      type: Number,
+      default: 20,
     }
   },
   components: {},
@@ -56,7 +64,6 @@ export default {
 .block_radius {
   background-color: #fff;
   box-shadow: 0px 3px 6px 0px rgba(15, 19, 65, 0.05);
-  border-radius: 10px;
   padding: 20px;
   margin-bottom: 20px;
 }

src/components/infoList.vue

@@ -93,10 +93,10 @@ a {
   text-align: center;
   color: #e6ebfe;
   background-color: #515fe7;
-  border-radius: 8px;
+  border-radius: 6px;
   display: inline-block;
   font-size: 14px;
-  margin-left: 20px;
+  margin-left: 8px;
   cursor: pointer;
 }
 </style>

src/components/menu.vue

 <template>
   <div class="menu">
-    <img src="../assets/imgs/home_img_logo.png" alt class="logo" />
+    <img src="../assets/imgs/nav-logo.png" alt class="logo" />
     <div
       style="float: right; cursor: pointer; position: relative"
       class="user_hover"
@@ -320,7 +320,7 @@ export default {
 }
 .logo {
   float: left;
-  margin: 15px 0 0 40px;
+  margin: 22px 0 0 40px;
   cursor: pointer;
 }
 .user {

src/components/organization-list/organization-list.vue

@@ -41,16 +41,16 @@ export default {
       this.$emit("delete-action", item);
     },
     pageResize() {
-      let listWidth = this.$refs.container.clientWidth;
-      this.rowNum = Math.floor(listWidth / 310);
+      // let listWidth = this.$refs.container.clientWidth;
+      // this.rowNum = Math.floor(listWidth / 310);
     },
   },
   mounted() {
-    this.pageResize();
-    window.addEventListener("resize", this.pageResize);
+    // this.pageResize();
+    // window.addEventListener("resize", this.pageResize);
   },
   destroyed() {
-    window.removeEventListener("resize", this.pageResize);
+    // window.removeEventListener("resize", this.pageResize);
   },
 };
 </script>

src/components/service-header.vue

@@ -306,7 +306,8 @@ export default {
 .info_detail p {
   color: #8890a7;
 }
-.info_detail span {
+.info_detail span,
+.info_detail a {
   color: #242c43;
   font-weight: 600;
   margin-right: 48px;

src/components/service-info/service-info.vue

 <template>
-  <div class="service_info apaas_button" v-if="data">
+  <div class="service_info apaas_button" v-if="data && showItem">
     <div class="service_title">
       <span class="service_name" v-text="data.name"></span>
       <span class="service_type" v-if="data.type" v-text="data.type"></span>
@@ -89,7 +89,13 @@
             class="commodity_text"
             >暂无</span
           >
-          <div v-else class="btn_container">
+          <div
+            v-else-if="
+              data.serviceRequestSpcs.spcs_type_1 &&
+              data.serviceRequestSpcs.spcs_type_1.length != 0
+            "
+            class="btn_container"
+          >
             <el-button
               v-for="(item, index) in data.serviceRequestSpcs.spcs_type_1"
               :key="'spcs_' + index"
@@ -191,6 +197,7 @@ export default {
     specification: {}, // 规格
     duration: 1, // 时长
     showTime: false,
+    showItem: false,
   }),
   computed: {
     actionDisabled() {
@@ -268,10 +275,15 @@ export default {
   mounted() {
     // 初始化购买方式
     if (this.data.serviceRequestSpcs && this.data.serviceRequestSpcs.length) {
+      if (!this.data.serviceRequestSpcs.spcs_type_1) {
+        this.data.serviceRequestSpcs.spcs_type_1 = [];
+      }
+      if (!this.data.serviceRequestSpcs.spcs_type_2) {
+        this.data.serviceRequestSpcs.spcs_type_2 = [];
+      }
       let types = Array.from(
         new Set(this.data.serviceRequestSpcs.map((item) => item.type))
       );
-
       if (types.indexOf(3) > -1) {
         this.types = [
           {
@@ -316,6 +328,7 @@ export default {
     ) {
       this.specification = this.data.serviceRequestSpcs.spcs_type_2[0];
     }
+    this.showItem = true;
   },
 };
 </script>

src/components/service-list/commodity-card.vue

 <template>
-  <div class="com_card">
-    <div class="com_card_top">
-      <img :src="cellData.logo" class="com_card_img" />
-      <div class="com_card_name_v">
-        <div class="com_card_msg_name">{{ cellData.app_name }}</div>
-        <div class="com_card_msg_version">V{{ cellData.version }}</div>
+  <div class="com_cell">
+    <div class="com_cell_up" @click="goUrl(cellData.app_id)">
+      <div class="com_cell_up_img_init">
+        <img :src="cellData.logo" class="com_cell_up_img" />
       </div>
+      <div class="com_cell_up_right">
+        <div class="up_title">
+          <div class="up_tit_name_in">
+            <span class="up_tit_name" :title="cellData.app_name + ' ( V' + cellData.version + ' )'">
+              {{ cellData.app_name }} ( V{{ cellData.version }} )
+            </span>
           </div>
-    <div class="com_card_msg">
-      <div class="com_card_msg_tit">
-        <img :src="require('@/assets/imgs/icon_shijian.png')" />&nbsp;上线时间
         </div>
-      <div class="com_card_msg_num">{{ helper.dateStringTransform(cellData.create_date) }}</div>
+        <div class="up_rate">
+          <el-rate
+            v-model="cellData.score"
+            disabled
+            show-score
+            text-color="#ea7d19"
+            score-template="{value}"
+          ></el-rate>
+          <p class="get_num">
+            本月获取：
+            <span class="com_cell_right_time">
+              {{ cellData.deploy_times }}
+            </span>
+            <span class="ci"> 次</span>
+          </p>
         </div>
-    <div class="com_card_msg">
-      <div class="com_card_msg_tit">
-        <img :src="require('@/assets/imgs/icon_huoqu1.png')" />&nbsp;部署次数
       </div>
-      <div class="com_card_msg_num1">{{ cellData.deploy_times }}</div>
+      <div class="get_detail">
+        <img src="@/assets/imgs/shop_ic_enter.png" />
       </div>
-    <div class="com_card_btn">
-      <el-button size="medium" class="btn_1" @click="addShop(cellData.app_id)">加入购物车</el-button>
-      <el-button size="medium" class="btn_2" @click="goUrl(cellData.app_id)">查看详情</el-button>
+    </div>
+    <div class="com_cell_down">
+      <p class="com_detail">
+        {{ cellData.yyjj }}
+      </p>
+      <el-row :gutter="16">
+        <el-col :span="14" class="com_other">
+          <span class="name_title">应用类型：</span>
+          {{ cellData.type_name }}
+          &nbsp;&nbsp;{{ cellData.data_service_type2_name }} &nbsp;&nbsp;{{
+            cellData.data_service_type3_name
+          }}
+        </el-col>
+        <el-col :span="10" class="com_other">
+          <span class="name_title">业务领域：</span>
+          {{ cellData.ywly_name }}
+        </el-col>
+        <el-col :span="14" class="com_other">
+          <span class="name_title">上线时间：</span>
+          {{ helper.dateStringTransform(cellData.create_date) }}
+        </el-col>
+      </el-row>
     </div>
   </div>
 </template>
 
 <script>
 import helper from "@/services/helper.js";
+// if you meet date which like 2020-06-05T00:00:00+08:00, use helper.dateStringTransform()
 export default {
   components: {},
   props: {
     url: { type: String, default: "" },
     cellData: { type: Object, default: {} },
   },
-  data: () => ({
-    helper: helper,
-  }),
+  data: () => ({ helper: helper }),
   computed: {},
   watch: {},
   methods: {
@@ -45,129 +76,136 @@ export default {
         this.$router.push(this.url + "/" + parame);
       }
     },
-    addShop(id) {
-      let query = {
-        service_id: 0, // 0表示不是服务
-        app_id: parseFloat(id),
-        spec_id: 1,
-        duration: 1,
-        duration_method: 1,
-        is_subscribe: 0, // 是否订阅
-      };
-      this.$api.serviceShop
-        .addShoppingCart(query)
-        .then(({ data }) => {
-          if (data.success == 1) {
-            this.$message({
-              message: data.errMsg,
-              type: "success",
-            });
-            this.$store.commit("setMenuCartState");
-          } else {
-            this.$message({
-              message: data.errMsg,
-              type: "warning",
-            });
-          }
-        })
-        .catch((error) => {
-          this.$message({
-            message: `添加购物车失败`,
-            type: "warning",
-          });
-        });
-    },
   },
   mounted() {},
 };
 </script>
 
 <style scoped>
-.com_card {
-  width: 290px;
-  height: 266px;
-  padding: 20px;
-  border-radius: 16px;
-  background-color: #fff;
-  border: solid 2px transparent;
-  -webkit-box-shadow: 0px 3px 10px 0px rgba(3, 10, 37, 0.15);
-  box-shadow: 0px 3px 10px 0px rgba(3, 10, 37, 0.15);
-}
-.com_card:hover {
-  border: solid 2px #b4c0f5;
-}
-.com_card_top {
+.com_cell {
+  width: 496px;
+  height: 208px;
+  background-color: #ffffff;
+  box-shadow: 0px 3px 6px 0px rgba(15, 19, 65, 0.04);
+  border-radius: 8px;
+  border: solid 1px #e3e4ef;
+  margin-bottom: 24px;
+}
+.com_cell_up {
+  height: 88px;
+  background-color: #f9fafc;
+  border-radius: 8px 8px 0px 0px;
+  padding: 16px;
   display: flex;
-  justify-content: space-between;
-  margin-bottom: 28px;
+  position: relative;
+  cursor: pointer;
 }
-.com_card_name_v {
-  width: calc(100% - 80px);
+.com_cell_up_img_init {
+  width: 56px;
+  height: 56px;
+  margin-right: 16px;
+  flex: 0 0 auto;
 }
-.com_card_img {
-  width: 60px;
-  height: 60px;
-  border-radius: 8px;
-  border: 3px solid #f6f7fb;
+.com_cell_up_img {
+  width: 100%;
+  height: 100%;
+  border-radius: 4px;
 }
-.com_card_msg {
-  margin-top: 20px;
-  display: flex;
-  justify-content: space-between;
+.com_cell_up_right {
+  flex: 1 1 auto;
 }
-.com_card_msg_name {
-  font-size: 18px;
-  font-weight: 700;
+.up_title {
+  font-size: 16px;
   margin-top: 4px;
-  margin-bottom: 12px;
+  display: flex;
+  align-items: center;
+}
+.up_tit_name_in {
+  max-width: calc(100% - 150px);
+  display: inline-block;
+}
+.up_tit_name {
+  width: 100%;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
   overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
 }
-.com_card_msg_version {
-  font-size: 14px;
-  color: #8890a7;
+.up_tit_name:hover {
+  text-decoration: underline;
 }
-.com_card_msg_tit {
-  color: #8890a7;
-  font-size: 16px;
+.up_rate {
+  margin-top: 12px;
+  display: flex;
 }
-.com_card_msg_num {
-  color: #8890a7;
+.get_num {
+  margin-left: 40px;
   font-size: 14px;
-  position: relative;
-  top: 2px;
+  color: #58617a;
+}
+.com_cell_right_time {
+  color: #ea7d19;
 }
-.com_card_msg_num1 {
+.ci {
   color: #242c43;
-  font-size: 16px;
-  font-weight: bold;
 }
-.com_card_btn {
-  margin-top: 35px;
-  display: flex;
-  justify-content: space-between;
-}
-.btn_1 {
-  width: 110px;
-  padding: 10px;
-  background-color: #d0d5e7;
-  border: solid 2px #a5afd6;
-  color: #0f2683;
-}
-.btn_1:hover {
-  background-color: #d5daec;
-  border: solid 2px #a5afd6;
-  color: #0f2683;
-}
-.btn_2 {
-  width: 110px;
-  padding: 10px;
-  background-color: #0f2683;
-  color: #f8f9fd;
-}
-.btn_2:hover {
-  background-color: #1d3694;
-  color: #f8f9fd;
+.get_detail {
+  position: absolute;
+  top: 26px;
+  right: 16px;
+}
+.tags {
+  display: inline-block;
+  margin-left: 8px;
+  padding: 2px 8px 3px;
+  font-size: 12px;
+  font-weight: 500;
+  line-height: 12px;
+  border-radius: 4px;
+  position: relative;
+  top: 1px;
+}
+.map_service {
+  background-color: #626de9;
+  border: solid 1px #626de9;
+  color: #fff;
+}
+.shared {
+  background-color: #e7fdfc;
+  border: solid 1px #8bd6d0;
+  color: #25bdb1;
+}
+.restricted {
+  background-color: #fffee8;
+  border: solid 1px #e4c884;
+  color: #ef9433;
+}
+.sensitive {
+  background-color: #ffefef;
+  border: solid 1px #d7a4a9;
+  color: #e15260;
+}
+.com_cell_down {
+  padding: 12px 16px 0 16px;
+}
+.com_detail {
+  color: #8890a7;
+  font-size: 14px;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+  height: 50px;
+}
+.com_other {
+  color: #58617a;
+  margin-bottom: 6px;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  overflow: hidden;
+}
+.name_title {
+  color: #8890a7;
 }
 </style>
\ No newline at end of file

src/components/service-list/commodity-cell.vue

 <template>
   <div class="com_cell">
-    <div class="com_cell_img_box">
-      <img :src="cellData.cover" class="com_cell_img" />
+    <div class="com_cell_up" @click="goUrl(cellData.id)">
+      <div class="com_cell_up_img_init">
+        <img :src="cellData.cover" class="com_cell_up_img" />
       </div>
-    <div class="com_cell_message">
-      <div class="com_cell_msg_title">
+      <div class="com_cell_up_right">
+        <div class="up_title">
+          <div class="up_tit_name_in">
+            <span class="up_tit_name" :title="cellData.name">
               {{ cellData.name }}
+            </span>
+          </div>
           <span
             v-if="cellData.data_service_type1 == 6"
             class="tags map_service"
-        >mapService</span>
+          >
+            mapService
+          </span>
           <span v-if="cellData.openness == 1" class="tags shared">共享</span>
-        <span v-else-if="cellData.openness ==  2" class="tags restricted">受限</span>
+          <span v-else-if="cellData.openness == 2" class="tags restricted">
+            受限
+          </span>
           <span v-else class="tags sensitive">敏感</span>
         </div>
-      <div class="message_block">
-        <div class="com_cell_item">
-          <div class="com_cell_data_detail">
-            <span class="detail_span">{{ cellData.descript }}</span>
-          </div>
-        </div>
-        <div class="com_cell_item">
-          <span class="com_cell_item_title">服务类型：</span>
-          <span
-            class="com_cell_data"
-          >{{ cellData.data_service_type1_name }}&nbsp;&nbsp;{{ cellData.data_service_type2_name }}&nbsp;&nbsp;{{ cellData.data_service_type3_name }}</span>
-          <span class="com_cell_item_title left_blank">数据领域：</span>
-          <span class="com_cell_data">{{ cellData.sectors_name }}</span>
-        </div>
-        <div class="com_cell_item">
-          <span class="com_cell_item_title">更新时间：</span>
-          <span class="com_cell_data">{{ helper.dateStringTransform(cellData.update_date) }}</span>
-        </div>
-      </div>
-    </div>
-    <div class="com_cell_right">
+        <div class="up_rate">
           <el-rate
             v-model="cellData.score"
             disabled
             show-score
-        text-color="#58617a"
+            text-color="#ea7d19"
             score-template="{value}"
           ></el-rate>
-      <div class="com_cell_right_text">
-        <span class="com_cell_right_time_tit">本月获取次数：</span>
-        <span class="com_cell_right_time">{{ cellData.apply_num }}次</span>
+          <p class="get_num">
+            本月获取：
+            <span class="com_cell_right_time">
+              {{ cellData.apply_num }}
+            </span>
+            <span class="ci"> 次</span>
+          </p>
+        </div>
+      </div>
+      <div class="get_detail">
+        <img src="@/assets/imgs/shop_ic_enter.png" />
+      </div>
     </div>
-      <el-button class="com_cell_right_btn" @click="goUrl(cellData.id)">查看详情</el-button>
+    <div class="com_cell_down">
+      <p class="com_detail">
+        {{ cellData.descript }}
+      </p>
+      <el-row :gutter="16">
+        <el-col :span="14" class="com_other">
+          <span class="name_title">服务类型：</span>
+          {{ cellData.data_service_type1_name }}
+          &nbsp;&nbsp;{{ cellData.data_service_type2_name }} &nbsp;&nbsp;{{
+            cellData.data_service_type3_name
+          }}
+        </el-col>
+        <el-col :span="10" class="com_other">
+          <span class="name_title">服务领域：</span>
+          {{ cellData.sectors_name }}
+        </el-col>
+        <el-col :span="14" class="com_other">
+          <span class="name_title">更新时间：</span>
+          {{ helper.dateStringTransform(cellData.update_date) }}
+        </el-col>
+      </el-row>
     </div>
   </div>
 </template>
@@ -76,94 +94,87 @@ export default {
 
 <style scoped>
 .com_cell {
+  width: 496px;
+  height: 208px;
+  background-color: #ffffff;
+  box-shadow: 0px 3px 6px 0px rgba(15, 19, 65, 0.04);
+  border-radius: 12px 12px 8px 8px;
+  border: solid 1px #e3e4ef;
+  margin-bottom: 24px;
+}
+.com_cell_up {
+  height: 88px;
+  background-color: #f9fafc;
+  border-radius: 12px 12px 0px 0px;
+  padding: 16px;
   display: flex;
-  justify-content: space-between;
-  padding: 20px 10px;
-  border-bottom: 2px #f4f7fc solid;
-}
-.com_cell_img_box {
-  width: 200px;
-  height: 200px;
-  border-radius: 12px;
-  overflow: hidden;
-  border: 4px #f4f7fc solid;
+  position: relative;
+  cursor: pointer;
+}
+.com_cell_up_img_init {
+  width: 56px;
+  height: 56px;
+  margin-right: 16px;
+  flex: 0 0 auto;
 }
-.com_cell_img {
+.com_cell_up_img {
   width: 100%;
   height: 100%;
+  border-radius: 4px;
 }
-.com_cell_message {
-  padding-left: 20px;
-  width: calc(100% - 500px);
-}
-.com_cell_msg_title {
-  color: #0d1847;
-  font-size: 18px;
-  line-height: 30px;
-  font-weight: 700;
-  margin-bottom: 10px;
+.com_cell_up_right {
+  flex: 1 1 auto;
 }
-.com_cell_item {
-  font-size: 14px;
-  line-height: 28px;
-  margin-top: 1px;
-  color: #8890a7;
+.up_title {
+  font-size: 16px;
+  margin-top: 4px;
   display: flex;
-  align-self: start;
-}
-.com_cell_item_title {
-  /* width: 80px; */
+  align-items: center;
 }
-.com_cell_data {
+.up_tit_name_in {
+  max-width: calc(100% - 150px);
   display: inline-block;
-  color: #242c43;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
 }
-.com_cell_data_detail {
-  color: #242c43;
-  height: 78px;
-  font-size: 16px;
-}
-.detail_span {
+.up_tit_name {
+  width: 100%;
   display: -webkit-box;
   -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
+  -webkit-line-clamp: 1;
   overflow: hidden;
 }
-.com_cell_right {
-  width: 300px;
-  padding: 25px 0 0 50px;
+.up_tit_name:hover {
+  text-decoration: underline;
 }
-.com_cell_right_text {
-  font-size: 16px;
-  margin-top: 25px;
+.up_rate {
+  margin-top: 12px;
+  display: flex;
 }
-.com_cell_right_time_tit {
-  color: #8890a7;
+.get_num {
+  margin-left: 40px;
+  font-size: 14px;
+  color: #58617a;
 }
 .com_cell_right_time {
+  color: #ea7d19;
+}
+.ci {
   color: #242c43;
 }
-.com_cell_right_btn {
-  background-color: #0f2683;
-  color: #f8f9fd;
-  width: 220px;
-  height: 40px;
-  border-radius: 20px;
-  margin-top: 25px;
+.get_detail {
+  position: absolute;
+  top: 26px;
+  right: 16px;
 }
 .tags {
   display: inline-block;
-  margin-left: 10px;
-  padding: 2px 10px 3px;
+  margin-left: 8px;
+  padding: 2px 8px 3px;
   font-size: 12px;
   font-weight: 500;
   line-height: 12px;
   border-radius: 4px;
   position: relative;
-  top: -1px;
+  top: 1px;
 }
 .map_service {
   background-color: #626de9;
@@ -185,24 +196,27 @@ export default {
   border: solid 1px #d7a4a9;
   color: #e15260;
 }
-.message_block {
-  width: 80%;
-  padding: 10px 20px;
-  background-color: #f8f9fd;
-  border-radius: 10px;
+.com_cell_down {
+  padding: 12px 16px 0 16px;
 }
-.left_blank {
-  margin-left: 20px;
+.com_detail {
+  color: #8890a7;
+  font-size: 14px;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+  height: 50px;
 }
-</style>
-<style>
-.com_cell_right .el-rate__text {
-  display: inline-block;
-  margin-left: 10px;
-  font-size: 32px;
-  font-weight: 700;
+.com_other {
+  color: #58617a;
+  margin-bottom: 6px;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  overflow: hidden;
 }
-.com_cell_right .el-rate__icon {
-  font-size: 28px;
+.name_title {
+  color: #8890a7;
 }
 </style>
\ No newline at end of file

src/components/service-list/commodity-list.vue

 <template>
   <div>
-    <div v-if="urlFilter=='app'" ref="commodityList" class="commodity_card">
-      <div ref="commodityCardIn" class="commodity_card_list">
-        <div
+    <div v-if="urlFilter == 'app'" ref="commodityList" class="commodity_card">
+      <commodity-card
         v-for="item in datas"
+        :key="item.id"
         :cellData="item"
         :url="url"
-          :key="item.id"
-          class="commodity_card_item"
-        >
-          <commodity-card class="commodity_card_item_in" :cellData="item" :url="url"></commodity-card>
-        </div>
-      </div>
+      ></commodity-card>
     </div>
     <div v-else class="commodity_cell">
-      <commodity-cell v-for="item in datas" :cellData="item" :url="url" :key="item.id"></commodity-cell>
+      <commodity-cell
+        v-for="item in datas"
+        :cellData="item"
+        :url="url"
+        :key="item.id"
+      ></commodity-cell>
     </div>
     <!-- 分页 -->
     <section class="com-pagination" v-if="paginationShow">
@@ -46,9 +46,8 @@
             @click="handleCurrentChange(-1)"
             :disabled="pagination.page == 1"
           ></el-button>
-          &nbsp;&nbsp;第{{ pagination.page }}页 / 共{{
-          Math.ceil((total == 0 ? 1 : total) / pagination.rowsPerPage)
-          }}页
+          &nbsp;&nbsp;第{{ pagination.page }}页 / 共
+          {{ Math.ceil((total == 0 ? 1 : total) / pagination.rowsPerPage) }}页
           <el-button
             icon="el-icon-arrow-right"
             circle
@@ -128,30 +127,11 @@ export default {
     refreshData() {
       this.$emit("refresh", this.pagination);
     },
-    pageResize() {
-      let listWidth = this.$refs.commodityCardIn.clientWidth;
-      let rowCardNum = Math.floor(listWidth / 310);
-      let cardArr = this.$refs.commodityCardIn.children;
-      // console.log(rowCardNum, listWidth / rowCardNum);
-      for (let i = 0; i < cardArr.length; i++) {
-        cardArr[i].style.width = listWidth / rowCardNum - 1 + "px";
-      }
-      // console.log(this.$refs.commodityCardIn);
-    },
   },
   mounted() {},
   watch: {
     datas: {
-      handler(val) {
-        if (this.urlFilter == "app") {
-          setTimeout(() => {
-            this.pageResize();
-            window.onresize = () => {
-              this.pageResize();
-            };
-          }, 0);
-        }
-      },
+      handler(val) {},
     },
     url: {
       handler() {
@@ -194,6 +174,9 @@ export default {
   align-items: center;
 }
 .commodity_card {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
 }
 .commodity_card_list {
   width: 100%;
@@ -206,6 +189,11 @@ export default {
 .commodity_card_item_in {
   margin: 0 auto;
 }
+.commodity_cell {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
 </style>
 <style>
 .com_page_control .el-button {

src/components/service-list/service_shop_menu.vue

@@ -65,32 +65,32 @@ export default {
             }
             switch (uri) {
               case "data_service_list":
-                item.active = "tool_ic_shujufw_sel";
-                item.default = "tool_ic_shujufw";
+                item.active = "shop_tool_ic_sjfw_sel";
+                item.default = "shop_tool_ic_sjfw";
                 break;
               case "space_time_service_list":
-                item.active = "tool_ic_shikongfw_sel";
-                item.default = "tool_ic_shikongfw";
+                item.active = "shop_tool_ic_skfw_sel";
+                item.default = "shop_tool_ic_skfw";
                 break;
               case "video_service_list":
-                item.active = "tool_ic_shipinfw_sel";
-                item.default = "tool_ic_shipinfw";
+                item.active = "shop_tool_ic_spfw_sel";
+                item.default = "shop_tool_ic_spfw";
                 break;
               case "perception_service_list":
-                item.active = "tool_ic_ganzhifw_sel";
-                item.default = "tool_ic_ganzhifw";
+                item.active = "shop_tool_ic_ganzhifw_sel";
+                item.default = "shop_tool_ic_ganzhifw";
                 break;
               case "comprehensive_app_list":
-                item.active = "tool_ic_zongheyyfw_sel";
-                item.default = "tool_ic_zongheyyfw";
+                item.active = "shop_tool_ic_zhyyfw_sel";
+                item.default = "shop_tool_ic_zhyyfw";
                 break;
               case "cloud":
-                item.active = "tool_ic_yunziyuanfw_sel";
-                item.default = "tool_ic_yunziyuanfw";
+                item.active = "shop_tool_ic_yzyfw_sel";
+                item.default = "shop_tool_ic_yzyfw";
                 break;
               case "app_store_list":
-                item.active = "tool_ic_yingyongsd_sel";
-                item.default = "tool_ic_yingyongsd";
+                item.active = "shop_ic_yysd_sel";
+                item.default = "shop_ic_yysd";
                 break;
               default:
                 item.active = "1";
@@ -111,37 +111,48 @@ export default {
 .service_shop_menu {
   background-color: #0d1847;
   position: fixed;
-  top: 58px;
-  left: 0;
-  width: 180px;
-  height: 100%;
-  padding-top: 30px;
+  top: 76px;
+  left: calc(50% - 600px);
+  width: 176px;
+  padding: 8px;
+	background-color: #ffffff;
+	box-shadow: 0px 3px 6px 0px 
+		rgba(15, 19, 65, 0.04);
+	border-radius: 8px;
 }
 .service_shop_menu_list > li {
-  padding: 16px 10px 8px 22px;
-  border-left: 5px solid #0d1847;
+  box-sizing: border-box;
+  height: 40px;
+  padding: 8px 0 0 22px;
+  margin-bottom: 16px;
   font-size: 15px;
   line-height: 24px;
   cursor: pointer;
 }
+.service_shop_menu_list > li:nth-last-child(1) {
+  margin-bottom: 0;
+}
 .service_shop_menu_list > li:hover,
 .service_shop_menu_list > li.current {
-  border-left: 5px solid #e56600;
-  background-color: #182665;
-  color: #e6ebfe;
+  background-color: rgba(242, 246, 253, 0.4);
+  color: #515fe7;
 }
 .menu_img {
-  width: 25px;
+  width: 24px;
   margin-right: 6px;
 }
 .menu_item {
   position: relative;
-  color: #6573ae;
+  font-weight: bold;
+  font-size: 15px;
+  color: #96a0c5;
   top: -6px;
 }
 .menu_item_active {
   position: relative;
-  color: #e6ebfe;
+  font-weight: bold;
+  font-size: 15px;
+  color: #515fe7;
   top: -6px;
 }
 </style>

src/pages/authority/organization/organization.vue

@@ -2,6 +2,8 @@
   <div class="organization_list">
     <apass-list
       @list-action="initDatas"
+      :page-size="20"
+      :page-sizes="[20, 50]"
       search-placeholder="请输入关键字"
       :list-total="listTotal"
     >

src/pages/data-analysis/org-service.vue

@@ -315,10 +315,10 @@ export default {
     right_3_state: 0,
     last_id: 0,
     mult_data_state: [
-      { name: "正常", value: 0 },
-      { name: "警告", value: 0 },
-      { name: "错误", value: 0 },
+      { name: "健康", value: 0 },
       { name: "未使用", value: 0 },
+      { name: "故障", value: 0 },
+      { name: "警告", value: 0 },
     ],
     mult_data: [
       { name: "数据服务", value: 0 },
@@ -535,7 +535,25 @@ export default {
     getServiceHealth() {
       this.$api.dataAnalysis.getServiceHealth().then((response) => {
         if (response.data.success == 1) {
-          this.mult_data_state = response.data.data.seriesData;
+          let data = response.data.data.seriesData;
+          let jk = data.find((item) => {
+            return item.name == "健康";
+          });
+          let wsy = data.find((item) => {
+            return item.name == "未使用";
+          });
+          let gz = data.find((item) => {
+            return item.name == "故障";
+          });
+          let jg = data.find((item) => {
+            return item.name == "警告";
+          });
+          this.mult_data_state = [
+            { name: "健康", value: jk.value },
+            { name: "未使用", value: wsy.value },
+            { name: "故障", value: gz.value },
+            { name: "警告", value: jg.value },
+          ];
         }
       });
     },

src/pages/data-analysis/super-service.vue

@@ -309,10 +309,10 @@ export default {
     right_3_state: 0,
     last_id: 0,
     mult_data_state: [
-      { name: "正常", value: 0 },
-      { name: "警告", value: 0 },
-      { name: "错误", value: 0 },
+      { name: "健康", value: 0 },
       { name: "未使用", value: 0 },
+      { name: "故障", value: 0 },
+      { name: "警告", value: 0 },
     ],
     mult_data: [
       { name: "数据服务", value: 0 },
@@ -529,7 +529,25 @@ export default {
     getServiceHealth() {
       this.$api.dataAnalysis.getServiceHealth().then((response) => {
         if (response.data.success == 1) {
-          this.mult_data_state = response.data.data.seriesData;
+          let data = response.data.data.seriesData;
+          let jk = data.find((item) => {
+            return item.name == "健康";
+          });
+          let wsy = data.find((item) => {
+            return item.name == "未使用";
+          });
+          let gz = data.find((item) => {
+            return item.name == "故障";
+          });
+          let jg = data.find((item) => {
+            return item.name == "警告";
+          });
+          this.mult_data_state = [
+            { name: "健康", value: jk.value },
+            { name: "未使用", value: wsy.value },
+            { name: "故障", value: gz.value },
+            { name: "警告", value: jg.value },
+          ];
         }
       });
     },

src/pages/service_shop/shop_cloud.vue

 <template>
-  <div>
+  <div class="shop_list_cont">
     <el-container>
-      <el-aside width="180px">
+      <el-aside width="176px">
         <service-shop-menu></service-shop-menu>
       </el-aside>
-      <el-main>
+      <el-main class="main_init">
         <shop-cloud name="云资源服务"></shop-cloud>
       </el-main>
     </el-container>
@@ -25,4 +25,12 @@ export default {
 };
 </script>
 <style scoped>
+.shop_list_cont {
+  width: 1200px;
+  margin: 0 auto;
+  position: relative;
+}
+.main_init {
+  padding: 2px 0 16px 16px;
+}
 </style>
\ No newline at end of file

src/pages/service_shop/shop_list.vue

 <template>
-  <div>
+  <div class="shop_list_cont">
     <el-container>
-      <el-aside width="180px">
+      <el-aside width="176px">
         <service-shop-menu></service-shop-menu>
       </el-aside>
-      <el-main>
+      <el-main class="main_init">
         <service-list
           :filterNames="filterNames"
           :name="name"
@@ -123,4 +123,12 @@ export default {
   background: url("~@/assets/imgs/img_default_quesheng.png") no-repeat center
     center;
 }
+.shop_list_cont {
+  width: 1200px;
+  margin: 0 auto;
+  position: relative;
+}
+.main_init {
+  padding: 16px 0 16px 16px;
+}
 </style>
\ No newline at end of file

src/pages/service_shop/sjfwDetail.vue

@@ -103,7 +103,7 @@ export default {
               name: "请求参数",
               type: "table",
               value: {
-                datas: this.getTableData(datas.req_fields),
+                datas: this.getTableData(datas.req_query),
                 columns: [
                   {
                     prop: "name",

src/pages/service_shop/skfwDetail.vue

@@ -14,7 +14,6 @@
 
     <service-tabs
       :detail-data="detailData"
-      :specification-data="specificationData"
       :provider-data="providerData"
       :comments-data="commentsData"
       :comments-url="commentsUrl"
@@ -34,7 +33,6 @@ export default {
   data: () => ({
     baseInfo: null,
     detailData: null,
-    specificationData: null,
     providerData: null,
     commentsData: null,
   }),
@@ -61,17 +59,6 @@ export default {
         })
         .then(({ data }) => {
           let datas = data.data;
-          let specificationData =
-            (datas.serviceRequestSpcs &&
-              datas.serviceRequestSpcs.map((item) => ({
-                id: item.id,
-                type: item.type,
-                pv: item.pv,
-                count: item.count,
-                name: `访问次数：${item.pv}次/日 访问量：${item.count}次/日`,
-                descript: item.des,
-              }))) ||
-            [];
 
           this.baseInfo = {
             portal_id: datas.portal_id || "", // 时空服务id
@@ -93,9 +80,9 @@ export default {
               datas.data_service_type3_name,
             ],
             descript: datas.descript,
-            serviceRequestSpcs: specificationData,
             scoreDetail: datas.scoreDetail,
             month_sale: data.month_sale,
+            serviceRequestSpcs: datas.serviceRequestSpcs,
           };
 
           this.detailData = [
@@ -145,7 +132,6 @@ export default {
               ],
             }, */
           ];
-          this.specificationData = specificationData;
           this.providerData = {
             organization_name: datas.organization_name,
             picture_path: datas.organization_picture,

src/pages/service_shop/zhfwDetail.vue

@@ -14,7 +14,6 @@
 
     <service-tabs
       :detail-data="detailData"
-      :specification-data="specificationData"
       :provider-data="providerData"
       :comments-data="commentsData"
       :comments-url="commentsUrl"
@@ -34,7 +33,6 @@ export default {
   data: () => ({
     baseInfo: null,
     detailData: null,
-    specificationData: null,
     providerData: null,
     commentsData: null,
   }),
@@ -56,18 +54,6 @@ export default {
         })
         .then(({ data }) => {
           let datas = data.data;
-          let specificationData =
-            (datas.serviceRequestSpcs &&
-              datas.serviceRequestSpcs.map((item) => ({
-                id: item.id,
-                type: item.type,
-                pv: item.pv,
-                count: item.count,
-                name: `访问次数：${item.pv}次/日 访问量：${item.count}次/日`,
-                descript: item.des,
-              }))) ||
-            [];
-
           this.baseInfo = {
             service_id: this.id,
             app_id: 0,
@@ -88,7 +74,7 @@ export default {
               datas.data_service_type3_name,
             ],
             descript: datas.descript,
-            serviceRequestSpcs: specificationData,
+            serviceRequestSpcs: datas.serviceRequestSpcs,
             scoreDetail: datas.scoreDetail,
             month_sale: data.month_sale,
           };
@@ -141,7 +127,6 @@ export default {
               value: datas.workflows_id,
             });
           }
-          this.specificationData = specificationData;
           this.providerData = {
             organization_name: datas.organization_name,
             picture_path: datas.organization_picture,

src/pages/workbench/component-center/process-management/designer/index.vue

@@ -176,7 +176,7 @@ export default {
         {
           label: "流程编号",
           prop: "workflows_code",
-          width: 180,
+          width: 130,
         },
         {
           label: "流程名称",
@@ -188,7 +188,7 @@ export default {
           label: "服务领域",
           prop: "sector_name",
           align: "center",
-          width: 240,
+          width: 200,
         },
         {
           label: "创建时间",
@@ -206,7 +206,7 @@ export default {
             return ["未部署", "已部署", "已发布"][item.state || 0];
           },
           align: "center",
-          width: 180,
+          width: 80,
         },
         {
           label: "工作区域",

src/pages/workbench/fwzc_fwcs.vue

@@ -417,14 +417,16 @@
             class="reset"
             v-if="activeBtn == 0 && resSuccess"
             @click="resetSjfw"
-            >重置</el-button
           >
+            重置
+          </el-button>
           <el-button
             :disabled="!resSuccess"
             :class="resSuccess ? 'next' : ''"
             @click="nextJcxx"
-            >下一步</el-button
           >
+            下一步
+          </el-button>
         </div>
       </block-radius>
       <div v-if="activeBtn == 4 && zhyyVal == 24">
@@ -1058,6 +1060,7 @@ export default {
       this.jkwds = [];
     },
     getUrl(enUrl) {
+      enUrl = enUrl.replace(/\s*/g, "");
       let url = decodeURI(enUrl);
       let arr = [];
       if (url.indexOf("?") != -1) {
@@ -1226,6 +1229,15 @@ export default {
         ) {
           if (this.jkwds.length == 0) {
             this.$message.error("请上传接口文档");
+          } else {
+            if (
+              this.activeBtn == 2 ||
+              (this.activeBtn == 4 && this.zhyyVal == 22)
+            ) {
+              this.request_fields = [];
+              this.response_fields = [];
+              this.jcxxtx = true;
+              this.getOrganization();
             } else {
               let requestData = this.$refs.fwcs_sjfw_qqcs.getTableData();
               let responseData = this.$refs.fwcs_sjfw_fhcs.getTableData();
@@ -1244,6 +1256,7 @@ export default {
                 this.$message.error("请完善返回参数信息中的字段名称");
               }
             }
+          }
         } else {
           let requestData = this.$refs.fwcs_sjfw_qqcs.getTableData();
           let responseData = this.$refs.fwcs_sjfw_fhcs.getTableData();
@@ -1343,13 +1356,22 @@ export default {
                 data_service_type1: 6,
                 data_service_type2: this.skfwQqt,
                 encode_method: this.form.code,
+                portal_id: this.portal_id,
+                doc_file: "",
+                urls: [
+                  {
+                    name: "",
+                    response_type: "JSON",
+                    req_auth_mthod: 0,
+                    req_auth_token: "",
                     method: "GET",
                     url: this.serviceUrl,
                     request_fields: [],
                     request_query_fields: [],
                     response_fields: [],
-                content_type: "json",
-                portal_id: this.portal_id,
+                    content_type: "JSON",
+                  },
+                ],
               };
             } else if (this.is_map == 4) {
               query = {
@@ -1362,13 +1384,21 @@ export default {
                 data_service_type1: 21,
                 data_service_type2: 34,
                 encode_method: this.form.code,
+                portal_id: this.portal_id,
+                urls: [
+                  {
+                    name: "",
+                    response_type: "JSON",
+                    req_auth_mthod: 0,
+                    req_auth_token: "",
                     method: "GET",
                     url: this.serviceUrl,
                     request_fields: [],
                     request_query_fields: [],
                     response_fields: [],
-                content_type: "json",
-                portal_id: this.portal_id,
+                    content_type: "JSON",
+                  },
+                ],
               };
             }
             this.$api.workbench.serviceAdd(query).then((response) => {
@@ -1429,7 +1459,10 @@ export default {
     registePt() {
       this.$refs.form.validate((valid) => {
         if (valid) {
-          if ((this.activeBtn == 2 && this.jkwds.length == 0) || (this.activeBtn == 3 && this.jkwds.length == 0)) {
+          if (
+            (this.activeBtn == 2 && this.jkwds.length == 0) ||
+            (this.activeBtn == 3 && this.jkwds.length == 0)
+          ) {
             this.$message.error("请上传接口文档");
           } else {
             if (this.cover.length != 0) {
@@ -1437,7 +1470,11 @@ export default {
               if (this.activeBtn == 1 && !this.is_portal) {
                 this.addPortalItem();
               } else {
-                if (this.activeBtn == 0 || this.activeBtn == 2 || this.activeBtn == 3) {
+                if (
+                  this.activeBtn == 0 ||
+                  this.activeBtn == 2 ||
+                  this.activeBtn == 3
+                ) {
                   contentType = this.sjfwQqt;
                 } else if (this.activeBtn == 4) {
                   if (this.activeZh == "1") {
@@ -1840,6 +1877,7 @@ export default {
       });
     },
     getUrlOne(enUrl, indexOne) {
+      enUrl = enUrl.replace(/\s*/g, "");
       let url = decodeURI(enUrl);
       let arr = [];
       if (url.indexOf("?") != -1) {

src/router/index.js

@@ -11,6 +11,9 @@ Router.prototype.push = function push(location, onResolve, onReject) {
 };
 
 export default new Router({
+  scrollBehavior (to, from, savedPosition) {
+    return { x: 0, y: 0 }
+  },
   routes: [
     {
       path: "/",