合并

fcba4742 · 张俊 · 6a822253 · 49de291e · fcba4742 · fcba4742
Commit fcba4742 authored May 09, 2020 by 张俊
39 changed files
--- a/build/webpack.dev.conf.js
+++ b/build/webpack.dev.conf.js
@@ -67,6 +67,13 @@ const devWebpackConfig = merge(baseWebpackConfig, {
        to: config.dev.assetsSubDirectory,
        ignore: ['.*']
      }
+    ]),
+    new CopyWebpackPlugin([
+      {
+        from: path.resolve(__dirname, '../docs'),
+        to: config.dev.assetsSubDirectory,
+        ignore: ['.*']
+      }
    ])
  ],
  optimization: {

--- a/docs/antv.json
+++ b/docs/antv.json
--- a/docs/data.json
+++ b/docs/data.json
--- a/docs/fwcs_data_service_list.json
+++ b/docs/fwcs_data_service_list.json
+{
+    "data": {
+        "data": [
+            {
+                "id": 0,
+                "title": "水路货物周转量情况",
+                "state": 0,
+                "resourceSummary": "提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务",
+                "provider": "提供机构提供机构提供机构",
+                "dataField": "经济建设",
+                "serviceType": "数据服务 专题数据服务 企业专题数据服务",
+                "updateTime": "2020-03-12 18:31:12",
+                "numberOfMonth": "2698755",
+                "rate": 3
+            },
+            {
+                "id": 1,
+                "title": "水路货物周转量情况",
+                "state": 2,
+                "resourceSummary": "提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务",
+                "provider": "提供机构提供机构提供机构",
+                "dataField": "经济建设",
+                "serviceType": "数据服务 专题数据服务 企业专题数据服务",
+                "updateTime": "2020-03-12 18:31:12",
+                "numberOfMonth": "2698745",
+                "rate": 3.4
+            },
+            {
+                "id": 2,
+                "title": "水路货物周转量情况",
+                "state": 1,
+                "resourceSummary": "提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务",
+                "provider": "提供机构提供机构提供机构",
+                "dataField": "经济建设",
+                "serviceType": "数据服务 专题数据服务 企业专题数据服务",
+                "updateTime": "2020-03-12 18:31:12",
+                "numberOfMonth": "2698455",
+                "rate": 2.5
+            },
+            {
+                "id": 3,
+                "title": "水路货物周转量情况",
+                "state": 0,
+                "resourceSummary": "提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务",
+                "provider": "提供机构提供机构提供机构",
+                "dataField": "经济建设",
+                "serviceType": "数据服务 专题数据服务 企业专题数据服务",
+                "updateTime": "2020-03-12 18:31:12",
+                "numberOfMonth": "267455",
+                "rate": 3.7
+            }
+        ]
+    }
+}
\ No newline at end of file
--- a/docs/fwcs_data_service_list_filter.json
+++ b/docs/fwcs_data_service_list_filter.json
+{
+  "data": {
+    "filterList": [
+      {
+        "id": 1283,
+        "name": "数据服务类型",
+        "children": [
+          {
+            "id": 1233,
+            "name": "诶哦尬舞",
+            "children": [
+              {
+                "id": 18273,
+                "name": "那我空间服务"
+              },
+              {
+                "id": 12378343,
+                "name": "诶哦尬舞"
+              },
+              {
+                "id": 123533,
+                "name": "诶哦尬舞"
+              }
+            ]
+          },
+          {
+            "id": 121833,
+            "name": "诶哦尬舞"
+          },
+          {
+            "id": 1234573,
+            "name": "诶哦尬舞"
+          },
+          {
+            "id": 134534233,
+            "name": "诶哦尬舞"
+          },
+          {
+            "id": 1234533,
+            "name": "诶哦尬舞"
+          },
+          {
+            "id": 123533,
+            "name": "诶哦尬舞",
+            "children": [
+              {
+                "id": 1824573,
+                "name": "那我空间服务"
+              },
+              {
+                "id": 123378343,
+                "name": "诶哦尬舞"
+              },
+              {
+                "id": 1235333,
+                "name": "诶哦尬舞"
+              }
+            ]
+          },
+          {
+            "id": 12112833,
+            "name": "诶哦尬舞"
+          },
+          {
+            "id": 12341573,
+            "name": "诶哦尬舞"
+          },
+          {
+            "id": 1345434233,
+            "name": "诶哦尬舞"
+          },
+          {
+            "id": 12345533,
+            "name": "诶哦尬舞"
+          }
+        ]
+      },
+      {
+        "id": 128133,
+        "name": "数据服务类型",
+        "children": [
+          {
+            "id": 123313,
+            "name": "诶哦尬舞",
+            "children": [
+              {
+                "id": 1821373,
+                "name": "那我个社工师空间服务"
+              },
+              {
+                "id": 123728343,
+                "name": "诶哦甲方推荐尬舞"
+              },
+              {
+                "id": 12312533,
+                "name": "诶哦库空调尬舞"
+              }
+            ]
+          },
+          {
+            "id": 121123833,
+            "name": "诶哦尬舞"
+          },
+          {
+            "id": 1231234573,
+            "name": "诶哦达瓦大尬舞"
+          },
+          {
+            "id": 13453334233,
+            "name": "诶哦达瓦大尬舞"
+          },
+          {
+            "id": 1234123533,
+            "name": "诶哦尬舞"
+          },
+          {
+            "id": 123512333,
+            "name": "诶哦尬舞",
+            "children": [
+              {
+                "id": 1824123573,
+                "name": "那我空间服务"
+              },
+              {
+                "id": 1233738343,
+                "name": "诶哦尬舞"
+              },
+              {
+                "id": 123125333,
+                "name": "诶哦尬舞"
+              }
+            ]
+          },
+          {
+            "id": 1211312833,
+            "name": "诶哦挖到尬舞"
+          },
+          {
+            "id": 12341231573,
+            "name": "诶哦尬舞"
+          },
+          {
+            "id": 13454314233,
+            "name": "诶哦色粉尬舞"
+          },
+          {
+            "id": 123452533,
+            "name": "诶环境日哦尬舞"
+          }
+        ]
+      }
+    ]
+  }
+}
\ No newline at end of file
--- a/docs/harbor_api_projects_3.json
+++ b/docs/harbor_api_projects_3.json
--- a/src/assets/css/index.css
+++ b/src/assets/css/index.css
@@ -454,3 +454,14 @@ width: 620px!important;
 .el-radio__input.is-checked .el-radio__inner::after {
  background-color: #e56600;
 }
+/* 面包屑样式 */
+.bread_crumb {
+  margin: 20px;
+  font-size: 14px;
+}
+.bread_crumb .el-breadcrumb__inner {
+  color: #b4c0f5 !important;
+}
+.bread_crumb .is-link {
+  color: #626de9 !important;
+}
\ No newline at end of file
--- a/src/assets/imgs/tool_ic_ganzhifw.png
+++ b/src/assets/imgs/tool_ic_ganzhifw.png
--- a/src/assets/imgs/tool_ic_ganzhifw_sel.png
+++ b/src/assets/imgs/tool_ic_ganzhifw_sel.png
--- a/src/assets/imgs/tool_ic_shikongfw.png
+++ b/src/assets/imgs/tool_ic_shikongfw.png
--- a/src/assets/imgs/tool_ic_shikongfw_sel.png
+++ b/src/assets/imgs/tool_ic_shikongfw_sel.png
--- a/src/assets/imgs/tool_ic_shipinfw.png
+++ b/src/assets/imgs/tool_ic_shipinfw.png
--- a/src/assets/imgs/tool_ic_shipinfw_sel.png
+++ b/src/assets/imgs/tool_ic_shipinfw_sel.png
--- a/src/assets/imgs/tool_ic_shujufw.png
+++ b/src/assets/imgs/tool_ic_shujufw.png
--- a/src/assets/imgs/tool_ic_shujufw_sel.png
+++ b/src/assets/imgs/tool_ic_shujufw_sel.png
--- a/src/assets/imgs/tool_ic_yingyongsd.png
+++ b/src/assets/imgs/tool_ic_yingyongsd.png
--- a/src/assets/imgs/tool_ic_yingyongsd_sel.png
+++ b/src/assets/imgs/tool_ic_yingyongsd_sel.png
--- a/src/assets/imgs/tool_ic_yunziyuanfw.png
+++ b/src/assets/imgs/tool_ic_yunziyuanfw.png
--- a/src/assets/imgs/tool_ic_yunziyuanfw_sel.png
+++ b/src/assets/imgs/tool_ic_yunziyuanfw_sel.png
--- a/src/assets/imgs/tool_ic_zongheyyfw.png
+++ b/src/assets/imgs/tool_ic_zongheyyfw.png
--- a/src/assets/imgs/tool_ic_zongheyyfw_sel.png
+++ b/src/assets/imgs/tool_ic_zongheyyfw_sel.png
--- a/src/components/commodity-cell.vue
+++ b/src/components/commodity-cell.vue
@@ -7,29 +7,48 @@
      />
    </div>
    <div class="com_cell_message">
-      <div class="com_cell_msg_title" @click="goUrl('ssurl')">水路货物周转量情况</div>
+      <div class="com_cell_msg_title">
+        {{ cellData.title }}
+        <span v-if="cellData.state == 1" class="tags shared">共享</span>
+        <span v-else-if="cellData.state ==  2" class="tags restricted">受限</span>
+        <span v-else class="tags sensitive">敏感</span>
+      </div>
      <div class="com_cell_item">
        <span class="com_cell_item_title">资源摘要：</span>
        <span
          class="com_cell_data"
-        >提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务提供水路货物周转量排名和同比增长的专题数据服务</span>
+        >{{ cellData.resourceSummary }}</span>
      </div>
      <div class="com_cell_item">
        <span class="com_cell_item_title">提供机构：</span>
-        <span class="com_cell_data">贵州省交通运输厅</span>
+        <span class="com_cell_data">{{ cellData.provider }}</span>
      </div>
      <div class="com_cell_item">
        <span class="com_cell_item_title">数据领域：</span>
-        <span class="com_cell_data">经济建设</span>
+        <span class="com_cell_data">{{ cellData.dataField }}</span>
      </div>
      <div class="com_cell_item">
        <span class="com_cell_item_title">服务类型：</span>
-        <span class="com_cell_data">数据服务 专题数据服务 企业专题数据服务</span>
+        <span class="com_cell_data">{{ cellData.serviceType }}</span>
      </div>
      <div class="com_cell_item">
        <span class="com_cell_item_title">更新时间：</span>
-        <span class="com_cell_data">2020-03-12 18:31:12</span>
+        <span class="com_cell_data">{{ cellData.updateTime }}</span>
+      </div>
+    </div>
+    <div class="com_cell_right">
+      <el-rate
+        v-model="cellData.rate"
+        disabled
+        show-score
+        text-color="#58617a"
+        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.numberOfMonth }}次</span>
      </div>
+      <el-button class="com_cell_right_btn" @click="goUrl('ssurl')">查看详情</el-button>
    </div>
  </div>
 </template>
@@ -38,7 +57,8 @@
 export default {
  components: {},
  props: {
-    url: { type: String, default: "" }
+    url: { type: String, default: "" },
+    cellData: { type: Object, default: {} }
  },
  data: () => ({}),
  computed: {},
@@ -58,7 +78,7 @@ export default {
 .com_cell {
  display: flex;
  justify-content: flex-start;
-  padding: 10px;
+  padding: 20px 10px;
  border-bottom: 2px #f4f7fc solid;
 }
 .com_cell_img_box {
@@ -73,20 +93,19 @@ export default {
 }
 .com_cell_message {
  padding-left: 20px;
-  width: calc(100% - 190px);
+  width: calc(100% - 420px);
 }
 .com_cell_msg_title {
  color: #0d1847;
  font-size: 22px;
  font-weight: 700;
  margin-bottom: 6px;
-  cursor: pointer;
 }
 .com_cell_item {
  font-size: 16px;
  line-height: 26px;
  margin-top: 1px;
-  color: #51ac14;
+  color: #8890a7;
  display: flex;
  align-self: start;
 }
@@ -96,10 +115,67 @@ export default {
 .com_cell_data {
  display: inline-block;
  width: calc(100% - 90px);
-  color: #f1ac14;
+  color: #242c43;
  overflow: hidden;
  text-overflow: ellipsis;
  white-space: nowrap;
 }
+.com_cell_right {
+  width: 250px;
+  padding: 25px 0 0 50px;
+}
+.com_cell_right_text {
+  font-size: 14px;
+  margin-top: 15px;
+}
+.com_cell_right_time_tit {
+  color: #8890a7;
+}
+.com_cell_right_time {
+  color: #242c43;
+}
+.com_cell_right_btn {
+  background-color: #0f2683;
+  color: #f8f9fd;
+  width: 160px;
+  height: 40px;
+  border-radius: 20px;
+  margin-top: 35px;
+}
+.tags {
+  display: inline-block;
+  margin-left: 10px;
+  padding: 1px 8px;
+  font-size: 12px;
+  font-weight: 500;
+  border-radius: 15px;
+  position: relative;
+  top: -2px;
+}
+.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;
+}
+</style>
+<style>
+.com_cell_right .el-rate__text {
+  display: inline-block;
+  margin-left: 10px;
+  font-size: 22px;
+  font-weight: 700;
+}
+.com_cell_right .el-rate__icon {
+  font-size: 20px;
+}
 </style>
\ No newline at end of file
--- a/src/components/commodity-list.vue
+++ b/src/components/commodity-list.vue
 <template>
  <div>
-    <commodity-cell v-for="item in datas" :url="url" :key="item"></commodity-cell>
+    <commodity-cell v-for="item in datas" :cellData="item" :url="url" :key="item.id"></commodity-cell>
    <!-- 分页 -->
    <section class="com-pagination" v-if="paginationShow">
      <div class="com_page_total">共 {{ pagination.total }} 个条目</div>
+      <div class="com_page_item">
        <div class="com_page_num" v-if="pageSizeShow">
+          <div>每页行数：</div>
          <div class="com_page_num_sel">
            <el-select
              v-model="pagination.rowsPerPage"
              placeholder="请选择"
-            size="mini"
+              size="small"
              @change="handleSizeChange"
            >
              <el-option
@@ -20,7 +22,6 @@
              ></el-option>
            </el-select>
          </div>
-        <div>条 / 页</div>
        </div>
        <div class="com_page_control">
          <el-button
@@ -44,6 +45,7 @@
          "
          ></el-button>
        </div>
+      </div>
    </section>
  </div>
 </template>
@@ -92,14 +94,14 @@ export default {
  methods: {
    handleSizeChange(val) {
      this.pagination.rowsPerPage = val;
-      this.$emit("refresh");
+      this.$emit("refresh", this.pagination);
    },
    handleCurrentChange(val) {
      this.pagination.page += val;
-      this.$emit("refresh");
+      this.$emit("refresh", this.pagination);
    },
    getTotal() {
-      this.total = this.datas.length;
+      this.pagination.total = this.datas.length;
    }
  },
  mounted() {
@@ -119,17 +121,30 @@ export default {
  align-items: center;
 }
 .com_page_num {
-  width: 120px;
+  width: 140px;
+  margin-right: 20px;
  display: flex;
  justify-content: space-around;
  align-items: center;
 }
 .com_page_num_sel {
-  width: 66px;
+  width: 50px;
+  font-size: 14px;
+  position: relative;
+  top: 1px;
+}
+.com_page_item {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
 }
 </style>
 <style>
 .com_page_control .el-button {
  border: 0;
 }
+.com_page_num .el-input__inner {
+  border: 0;
+  padding: 0;
+}
 </style>
\ No newline at end of file
--- a/src/components/service_list.vue
+++ b/src/components/service_list.vue
--- a/src/components/service_shop_menu.vue
+++ b/src/components/service_shop_menu.vue
+<template>
+  <div class="service_shop_menu">
+    <ul class="service_shop_menu_list">
+      <li v-for="(item, index) in menuList" :key="index" @click="active(item.id)">
+        <img
+          v-if="item.id == actives"
+          :src="require('../assets/imgs/' + item.active + '.png')"
+          class="menu_img"
+        />
+        <img v-else :src="require('../assets/imgs/' + item.default + '.png')" class="menu_img" />
+        <span :class="item.id == actives ? 'menu_item_active':'menu_item'">{{ item.label }}</span>
+      </li>
+    </ul>
+  </div>
+</template>
+<script>
+export default {
+  props: {},
+  data() {
+    return {
+      actives: 0,
+      menuList: [
+        {
+          id: 0,
+          label: "数据服务",
+          active: "tool_ic_shujufw_sel",
+          default: "tool_ic_shujufw"
+        },
+        {
+          id: 1,
+          label: "时空服务",
+          active: "tool_ic_shikongfw_sel",
+          default: "tool_ic_shikongfw"
+        },
+        {
+          id: 2,
+          label: "视频服务",
+          active: "tool_ic_shipinfw_sel",
+          default: "tool_ic_shipinfw"
+        },
+        {
+          id: 3,
+          label: "感知服务",
+          active: "tool_ic_ganzhifw_sel",
+          default: "tool_ic_ganzhifw"
+        },
+        {
+          id: 4,
+          label: "综合应用服务",
+          active: "tool_ic_zongheyyfw_sel",
+          default: "tool_ic_zongheyyfw"
+        },
+        {
+          id: 5,
+          label: "云资源服务",
+          active: "tool_ic_yunziyuanfw_sel",
+          default: "tool_ic_yunziyuanfw"
+        },
+        {
+          id: 6,
+          label: "应用商店",
+          active: "tool_ic_yingyongsd_sel",
+          default: "tool_ic_yingyongsd"
+        }
+      ]
+    };
+  },
+  computed: {
+    getActive() {
+      return this.$store.state.serviceShopMenu;
+    }
+  },
+  watch: {
+    getActive(newVal) {
+      this.getActiveMenu(newVal);
+    }
+  },
+  methods: {
+    active(id) {
+      this.$store.commit("serviceShopMenuAct", id);
+    },
+    getActiveMenu(val) {
+      this.actives = val;
+    }
+  }
+};
+</script>
+<style scoped>
+.service_shop_menu {
+  background-color: #0d1847;
+  position: fixed;
+  top: 84px;
+  left: 0;
+  width: 200px;
+  height: 100%;
+  padding-top: 30px;
+}
+.service_shop_menu_list > li {
+  padding: 16px 10px 8px 22px;
+  border-left: 5px solid #0d1847;
+  font-size: 16px;
+  line-height: 24px;
+  cursor: pointer;
+}
+.service_shop_menu_list > li:hover,
+.service_shop_menu_list > li.current {
+  border-left: 5px solid #e56600;
+  background-color: #182665;
+  color: #e6ebfe;
+}
+.menu_img {
+  width: 25px;
+  margin-right: 6px;
+}
+.menu_item {
+  position: relative;
+  color: #6573ae;
+  top: -6px;
+}
+.menu_item_active {
+  position: relative;
+  color: #e6ebfe;
+  top: -6px;
+}
+</style>
--- a/src/components/servive-info.vue
+++ b/src/components/servive-info.vue
 <template>
  <el-tabs
+    class="service_info_tab"
+    type="border-card"
    v-model="serviceTabsActiveName"
-    type="card"
-    @tab-click="handleClick"
    :stretch="true"
    style="margin-top: 20px;"
  >
@@ -545,22 +545,21 @@ export default {
      ],
    }, // 服务评价信息
  }),
-  methods: {
+  methods: {},
-    handleClick(tab, event) {
-      console.log(tab, event);
-    },
-  },
  mounted() {},
 };
 </script>
 <style scoped>
+.service_info_tab {
+  width: 70%;
+  margin: 0 auto;
+}
 .service_info {
-  width: 80%;
+  min-height: 500px;
  padding: 10px 20px;
-  margin: 0 auto;
  box-sizing: border-box;
-  background-color: #eee;
+  /* background-color: #eee; */
 }
 .service_info .fwxqxx_item {
  margin-bottom: 20px;

--- a/src/components/table-um.vue
+++ b/src/components/table-um.vue
@@ -182,12 +182,14 @@
    <!-- 分页 -->
    <section class="ces-pagination" v-if="paginationShow">
      <div class="ces_page_total">共 {{ pagination.total }} 个条目</div>
+      <div class="ces_page_item">
        <div class="ces_page_num" v-if="pageSizeShow">
+          <div>每页行数：</div>
          <div class="ces_page_num_sel">
            <el-select
              v-model="pagination.rowsPerPage"
              placeholder="请选择"
-            size="mini"
+              size="small"
              @change="handleSizeChange"
            >
              <el-option
@@ -198,7 +200,6 @@
              ></el-option>
            </el-select>
          </div>
-        <div>条 / 页</div>
        </div>
        <div class="ces_page_control">
          <el-button
@@ -222,6 +223,7 @@
          "
          ></el-button>
        </div>
+      </div>
    </section>
  </section>
 </template>
@@ -467,10 +469,12 @@ export default {
    },
    handleCurrentChange(val) {
      this.pagination.page += val;
+      this.getDataFromApiSync();
      this.$emit("refresh");
    },
    handleSizeChange(val) {
      this.pagination.rowsPerPage = val;
+      this.getDataFromApiSync();
      this.$emit("refresh");
    },
    renderHeader(h, obj) {
@@ -698,6 +702,13 @@ em.action {
 .th_pink {
  background-color: #faf2e2 !important;
 }
+.ces_page_control .el-button {
+  border: 0;
+}
+.ces_page_num .el-input__inner {
+  border: 0;
+  padding: 0;
+}
 </style>
 <style scoped>
 .ces-table {
@@ -728,13 +739,17 @@ em.action {
 /* .ces_page_total {
 } */
 .ces_page_num {
-  width: 120px;
+  width: 140px;
+  margin-right: 20px;
  display: flex;
  justify-content: space-around;
  align-items: center;
 }
 .ces_page_num_sel {
-  width: 66px;
+  width: 50px;
+  font-size: 14px;
+  position: relative;
+  top: 1px;
 }
 .table_radius {
  border-radius: 8px;
@@ -813,7 +828,9 @@ em.action {
  background-color: #515fe7;
  color: #f4f7fc;
 }
-.ces_page_control .el-button {
+.ces_page_item {
-  border: 0;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
 }
 </style>
--- a/src/pages/data_service_list.vue
+++ b/src/pages/data_service_list.vue
+<template>
+  <div class="service_list">
+    <el-container>
+      <el-aside width="200px">
+        <service-shop-menu></service-shop-menu>
+      </el-aside>
+      <el-main>
+        <service-list urlList="url1sss" urlFilter="urldwad2222"></service-list>
+      </el-main>
+    </el-container>
+  </div>
+</template>
+<script>
+import ServiceShopMenu from "@/components/service_shop_menu";
+import ServiceList from "@/components/service_list";
+export default {
+  components: {
+    ServiceShopMenu,
+    ServiceList
+  },
+  data: () => ({}),
+  mounted() {},
+  methods: {
+  }
+};
+</script>
+<style scoped>
+</style>
\ No newline at end of file
--- a/src/pages/example_com_list.vue
+++ b/src/pages/example_com_list.vue
@@ -17,7 +17,7 @@ export default {
    BlockRadius
  },
  data: () => ({
-    list: [1, 2, 3, 4, 5, 6]
+    list: [{ id: 0 }, { id: 1 }, { id: 2 }, { id: 3 }, { id: 4 }, { id: 5 }]
  }),
  mounted() {},
  methods: {}

--- a/src/pages/example_table.vue
+++ b/src/pages/example_table.vue
@@ -20,6 +20,7 @@
      @primary-del="delItem"
      :emptyText="emptyText"
      :stripe="true"
+      :paginationShow="true"
      :pageSizeShow="true"
      :filterList="filterList"
      cellClassName="cell_width"

--- a/src/pages/fwgl.vue
+++ b/src/pages/fwgl.vue
 <template>
  <div class="fwgl_container">
-    <side-nav-bar :nav-list="navList" :title-path="navList[0].path"></side-nav-bar>
+    <side-nav-bar
+      :nav-list="navList"
+      :title-path="navList[0] && navList[0].path"
+    ></side-nav-bar>
    <div class="main_container">
      <router-view
        :key="'type_' + $route.params && $route.params.type"
@@ -18,66 +21,75 @@ export default {
  },
  data: () => ({
    navList: [],
-    userLevel: 0,
  }),
-  mounted() {
+  watch: {
-    this.navList = [
+    "$route.fullPath"(path) {
+      this.initNavList();
+    },
+  },
+  methods: {
+    initNavList() {
+      let level = parseInt(this.$route.params.level);
      // 普通用户
+      if (level == 0) {
+        this.navList = [
          {
-        level: 0,
            name: "注册发布的服务",
-        path: "/fwgl/list/0/注册发布的服务",
+            path: `/fwgl/list/${level}/0`,
          },
          {
-        level: 0,
            name: "申请的服务",
-        path: "/fwgl/list/1/申请的服务",
+            path: `/fwgl/list/${level}/1`,
          },
          {
-        level: 0,
            name: "审批的服务",
-        path: "/fwgl/list/2/审批的服务",
+            path: `/fwgl/list/${level}/2`,
          },
          {
-        level: 0,
            name: "云资源服务",
-        path: "/fwgl/list/3/云资源服务",
+            path: `/fwgl/list/${level}/3`,
          },
+        ];
+      }
      // 组织管理员
+      else if (level == 1) {
+        this.navList = [
          {
-        level: 1,
            name: "组织服务管理",
-        path: "/fwgl/list/4/组织服务管理",
+            path: `/fwgl/list/${level}/0`,
          },
          {
-        level: 1,
            name: "服务审批管理",
-        path: "/fwgl/list/5/服务审批管理",
+            path: `/fwgl/list/${level}/1`,
          },
          {
-        level: 1,
            name: "云资源管理",
-        path: "/fwgl/list/6/云资源管理",
+            path: `/fwgl/list/${level}/2`,
          },
+        ];
+      }
      // 超级管理员
+      else if (level == 2) {
+        this.navList = [
          {
-        level: 2,
            name: "平台服务管理",
-        path: "/fwgl/list/7/平台服务管理",
+            path: `/fwgl/list/${level}/0`,
          },
          {
-        level: 2,
            name: "服务审批管理",
-        path: "/fwgl/list/8/服务审批管理",
+            path: `/fwgl/list/${level}/1`,
          },
          {
-        level: 2,
            name: "云资源管理",
-        path: "/fwgl/list/9/云资源管理",
+            path: `/fwgl/list/${level}/2`,
          },
-    ].filter((nav) => nav.level === this.userLevel);
+        ];
+      }
-    // this.$router.push(this.navList[0].path);
+    },
+  },
+  mounted() {
+    this.initNavList();
  },
 };
 </script>

--- a/src/pages/fwglList.vue
+++ b/src/pages/fwglList.vue
@@ -9,7 +9,7 @@
        class="r_yhgl_table"
        size="mini"
        url="tableData"
-        detailsUrl="/fwgl/servicedetail/"
+        :detailsUrl="`/fwgl/servicedetail/${$route.params.level}/`"
        :border="false"
        :headers="headers"
        :searchShow="true"
@@ -104,7 +104,7 @@ export default {
      this.$refs.myConfirm.showModel();
    },
    editItem(item) {
-      this.$router.push("/fwgl/serviceedit/" + item.id);
+      this.$router.push(`/fwgl/serviceedit/${this.$route.params.level}/${item.id}`);
    },
    soldOutItem(item) {
      this.confirmOptions.title = "是否删除该条服务？";
@@ -132,8 +132,10 @@ export default {
    },
  },
  mounted() {
-    switch (parseInt(this.$route.params.type)) {
+    let level = parseInt(this.$route.params.level);
-      case 0:
+    let type = parseInt(this.$route.params.type);
+    if (level == 0 && type == 0) {
      this.headers = [
        { label: "服务名称", prop: "name", type: "href", align: "left" },
        { label: "服务url", prop: "date", type: "", align: "center" },
@@ -169,8 +171,7 @@ export default {
          ],
        },
      ];
-        break;
+    } else if (level == 0 && type == 1) {
-      case 1:
      this.headers = [
        { label: "服务名称", prop: "name", type: "href", align: "left" },
        { label: "服务领域", prop: "date", type: "", align: "center" },
@@ -196,8 +197,7 @@ export default {
          ],
        },
      ];
-        break;
+    } else if (level == 0 && type == 2) {
-      case 2:
      this.headers = [
        { label: "服务名称", prop: "name", type: "href", align: "left" },
        { label: "服务领域", prop: "address", type: "", align: "center" },
@@ -225,8 +225,7 @@ export default {
          ],
        },
      ];
-        break;
+    } else if (level == 0 && type == 2) {
-      case 3:
      this.headers = [
        { label: "工作区域", prop: "name", type: "href", align: "left" },
        { label: "网络环境", prop: "name", type: "", align: "center" },
@@ -249,8 +248,7 @@ export default {
          ],
        },
      ];
-        break;
+    } else {
-      default:
      this.headers = [
        { label: "服务名称", prop: "name", type: "href", align: "left" },
        { label: "服务url", prop: "date", type: "", align: "center" },
@@ -267,7 +265,7 @@ export default {
          label: "操作",
          type: "Button",
          align: "center",
-            width: 160,
+          width: 240,
          btnList: [
            {
              type: "action-edit",
@@ -286,7 +284,6 @@ export default {
          ],
        },
      ];
-        break;
    }
  },
 };

--- a/src/pages/fwzc_fwcs.vue
+++ b/src/pages/fwzc_fwcs.vue
@@ -183,7 +183,12 @@
            </el-form-item>
            <el-form-item>
              <p class="formname">服务描述：</p>
-              <el-input type="textarea" v-model="form.desc" placeholder="请输入服务描述，不超过200个字" class="form_in"></el-input>
+              <el-input
+                type="textarea"
+                v-model="form.desc"
+                placeholder="请输入服务描述，不超过200个字"
+                class="form_in"
+              ></el-input>
            </el-form-item>
            <el-form-item>
              <p class="formname">服务领域：</p>
@@ -388,10 +393,6 @@ export default {
  margin-top: -157px;
  margin-bottom: 20px;
 }
-.bread_crumb {
-  margin: 20px;
-  font-size: 14px;
-}
 .fwcs_btn_act {
  width: 100px;
  background-color: #e56600;
@@ -521,12 +522,6 @@ export default {
 }
 </style>
 <style>
-.bread_crumb .el-breadcrumb__inner {
-  color: #b4c0f5 !important;
-}
-.bread_crumb .is-link {
-  color: #626de9 !important;
-}
 .fwcs_fwdz_inner .el-select .el-input {
  width: 130px;
  background-color: #0f2683;

--- a/src/pages/sjfwDetail.vue
+++ b/src/pages/sjfwDetail.vue
+<template>
+  <div class="com_ex">
+    <block-radius>
+      <el-breadcrumb separator="/" class="bread_crumb">
+        <el-breadcrumb-item>服务超市</el-breadcrumb-item>
+        <el-breadcrumb-item>数据服务</el-breadcrumb-item>
+        <el-breadcrumb-item>服务详情信息</el-breadcrumb-item>
+      </el-breadcrumb>
+      <Commodity :datas="datas" />
+      <servive-info></servive-info>
+    </block-radius>
+  </div>
+</template>
+<script>
+// @ is an alias to /src
+import Commodity from "@/components/commodity.vue";
+import BlockRadius from "@/components/block-radius";
+import serviveInfo from "@/components/servive-info";
+export default {
+  components: {
+    Commodity,
+    BlockRadius,
+    serviveInfo,
+  },
+  data: () => ({
+    datas: {
+      productName: "地图视频融合服务",
+      providedBy: "北京比格数据",
+      releaseTime: "2020-03-12 18:31:12",
+      updated: "2020-03-12 18:31:12",
+      dataField: "经济建设",
+      serviceType: "综合应用服务",
+      resourceSummary:
+        "提供视频监控的空间分布展示和视频监控直播的服务提供视频监控的空间分布展示和视频监控直播的服务",
+      openLevel: "共享",
+      views: "99999",
+      numberOfAcquisitions: "99999",
+      specifications:
+        "用户服务申请通过审核确认后，每日可对应急资源地图进行20次免费访问用户服务申请通过审核确认后，每日可对应急资源地图进行20次免费访问",
+    },
+  }),
+  mounted() {},
+  methods: {},
+};
+</script>
+<style scoped>
+.com_ex {
+  margin-top: 100px;
+  padding: 20px;
+}
+</style>
--- a/src/pages/skfwDetail.vue
+++ b/src/pages/skfwDetail.vue
+<template>
+  <div class="com_ex">
+    <block-radius>
+      <el-breadcrumb separator="/" class="bread_crumb">
+        <el-breadcrumb-item>服务超市</el-breadcrumb-item>
+        <el-breadcrumb-item>数据服务</el-breadcrumb-item>
+        <el-breadcrumb-item>服务详情信息</el-breadcrumb-item>
+      </el-breadcrumb>
+      <Commodity :datas="datas" />
+      <servive-info></servive-info>
+    </block-radius>
+  </div>
+</template>
+<script>
+// @ is an alias to /src
+import Commodity from "@/components/commodity.vue";
+import BlockRadius from "@/components/block-radius";
+import serviveInfo from "@/components/servive-info";
+export default {
+  components: {
+    Commodity,
+    BlockRadius,
+    serviveInfo,
+  },
+  data: () => ({
+    datas: {
+      productName: "地图视频融合服务",
+      providedBy: "北京比格数据",
+      releaseTime: "2020-03-12 18:31:12",
+      updated: "2020-03-12 18:31:12",
+      dataField: "经济建设",
+      serviceType: "综合应用服务",
+      resourceSummary:
+        "提供视频监控的空间分布展示和视频监控直播的服务提供视频监控的空间分布展示和视频监控直播的服务",
+      openLevel: "共享",
+      views: "99999",
+      numberOfAcquisitions: "99999",
+      specifications:
+        "用户服务申请通过审核确认后，每日可对应急资源地图进行20次免费访问用户服务申请通过审核确认后，每日可对应急资源地图进行20次免费访问",
+    },
+  }),
+  mounted() {},
+  methods: {},
+};
+</script>
+<style scoped>
+.com_ex {
+  margin-top: 100px;
+  padding: 20px;
+}
+</style>
--- a/src/pages/zhyyfwDetail.vue
+++ b/src/pages/zhyyfwDetail.vue
+<template>
+  <div class="com_ex">
+    <block-radius>
+      <el-breadcrumb separator="/" class="bread_crumb">
+        <el-breadcrumb-item>服务超市</el-breadcrumb-item>
+        <el-breadcrumb-item>数据服务</el-breadcrumb-item>
+        <el-breadcrumb-item>服务详情信息</el-breadcrumb-item>
+      </el-breadcrumb>
+      <Commodity :datas="datas" />
+      <servive-info></servive-info>
+    </block-radius>
+  </div>
+</template>
+<script>
+// @ is an alias to /src
+import Commodity from "@/components/commodity.vue";
+import BlockRadius from "@/components/block-radius";
+import serviveInfo from "@/components/servive-info";
+export default {
+  components: {
+    Commodity,
+    BlockRadius,
+    serviveInfo,
+  },
+  data: () => ({
+    datas: {
+      productName: "地图视频融合服务",
+      providedBy: "北京比格数据",
+      releaseTime: "2020-03-12 18:31:12",
+      updated: "2020-03-12 18:31:12",
+      dataField: "经济建设",
+      serviceType: "综合应用服务",
+      resourceSummary:
+        "提供视频监控的空间分布展示和视频监控直播的服务提供视频监控的空间分布展示和视频监控直播的服务",
+      openLevel: "共享",
+      views: "99999",
+      numberOfAcquisitions: "99999",
+      specifications:
+        "用户服务申请通过审核确认后，每日可对应急资源地图进行20次免费访问用户服务申请通过审核确认后，每日可对应急资源地图进行20次免费访问",
+    },
+  }),
+  mounted() {},
+  methods: {},
+};
+</script>
+<style scoped>
+.com_ex {
+  margin-top: 100px;
+  padding: 20px;
+}
+</style>
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -24,6 +24,21 @@ export default new Router({
      component: () => import("@/pages/index"),
      redirect: "/workplace",
      children: [
+        {
+          path: "/sjfwDetail",
+          name: "sjfwDetail",
+          component: () => import("@/pages/sjfwDetail"),
+        }, // 数据服务详情
+        {
+          path: "/skfwDetail",
+          name: "skfwDetail",
+          component: () => import("@/pages/skfwDetail"),
+        }, // 时空服务详情
+        {
+          path: "/zhyyfwDetail",
+          name: "zhyyfwDetail",
+          component: () => import("@/pages/zhyyfwDetail"),
+        }, // 综合应用服务详情
        {
          path: "/workplace",
          name: "workPlace",
@@ -43,23 +58,23 @@ export default new Router({
          ],
        },
        {
-          path: "/fwgl", // 服务管理
+          path: "/fwgl/:level", // 服务管理 level：用户等级
          name: "fwgl",
-          // redirect: "/fwgl/list",
+          redirect: "/fwgl/list/:level/0",
          component: () => import("@/pages/fwgl"),
          children: [
            {
-              path: "/fwgl/list/:type/:name", // 服务管理/我的服务
+              path: "/fwgl/list/:level/:type", // 服务管理/我的服务
              name: "fwglList",
              component: () => import("@/pages/fwglList"),
            },
            {
-              path: "/fwgl/servicedetail/:id",
+              path: "/fwgl/servicedetail/:level/:id",
              name: "servicedetail",
              component: () => import("@/pages/serviceDetail"),
            },
            {
-              path: "/fwgl/serviceedit/:id",
+              path: "/fwgl/serviceedit/:level/:id",
              name: "serviceedit",
              component: () => import("@/pages/serviceEdit"),
            },
@@ -75,6 +90,18 @@ export default new Router({
            },
          ],
        },
+        {
+          path: "/fwcs", // 服务超市
+          name: "fwcs",
+          component: () => import("@/pages/data_service_list"),
+          children: [
+            {
+              path: "/data_service_list", // 服务超市列表页
+              name: "fwcsDataList",
+              component: () => import("@/pages/data_service_list"),
+            },
+          ],
+        },
      ],
    },
    {
@@ -100,17 +127,17 @@ export default new Router({
    {
      path: "/example_topology", // 拓扑图实例
      name: "example_topology",
-      component: () => import("@/pages/example_topology")
+      component: () => import("@/pages/example_topology"),
    },
    {
      path: "/example_commodity", // 商品详情实例
      name: "example_commodity",
-      component: () => import("@/pages/example_commodity")
+      component: () => import("@/pages/example_commodity"),
    },
    {
      path: "/example_com_list", // 商品列表实例
      name: "example_com_list",
-      component: () => import("@/pages/example_com_list")
+      component: () => import("@/pages/example_com_list"),
-    }
+    },
-  ]
+  ],
 });
--- a/src/services/helper.js
+++ b/src/services/helper.js
@@ -13,3 +13,46 @@ module.exports.GetProperty = function (obj, prop) {
  }
  return res;
 }
+module.exports.ymhdateFormat = function (timestamp) {
+  let date = new Date(timestamp);
+  let ret;
+  const opt = {
+    "Y+": date.getFullYear().toString(),        // 年
+    "m+": (date.getMonth() + 1).toString(),     // 月
+    "d+": date.getDate().toString(),            // 日
+    "H+": date.getHours().toString(),           // 时
+    "M+": date.getMinutes().toString(),         // 分
+    "S+": date.getSeconds().toString()          // 秒
+    // 有其他格式化字符需求可以继续添加，必须转化成字符串
+  };
+  var fmt="YYYY-mm-dd HH:MM:SS"
+  for (let k in opt) {
+    ret = new RegExp("(" + k + ")").exec(fmt);
+    if (ret) {
+      fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+    };
+  };
+  return fmt;
+}
+module.exports.dateFormat = function (fmt, timestamp) {
+  let date = new Date(timestamp);
+  let ret;
+  const opt = {
+    "Y+": date.getFullYear().toString(),        // 年
+    "m+": (date.getMonth() + 1).toString(),     // 月
+    "d+": date.getDate().toString(),            // 日
+    "H+": date.getHours().toString(),           // 时
+    "M+": date.getMinutes().toString(),         // 分
+    "S+": date.getSeconds().toString()          // 秒
+    // 有其他格式化字符需求可以继续添加，必须转化成字符串
+  };
+  for (let k in opt) {
+    ret = new RegExp("(" + k + ")").exec(fmt);
+    if (ret) {
+      fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+    };
+  };
+  return fmt;
+}
\ No newline at end of file
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -5,7 +5,8 @@ Vue.use(Vuex);
 const store = new Vuex.Store({
  state: {
-    role:1,//0：普通用户，1：组织管理员，2：超级管理员
+    role: 1,//0：普通用户，1：组织管理员，2：超级管理员
+    serviceShopMenu: 0, // 服务超市侧边栏
  },
  modules: {
  },
@@ -13,6 +14,9 @@ const store = new Vuex.Store({
    rolefun(state, newValue) {
      state.role = newValue;
    },
+    serviceShopMenuAct(state, newValue) {
+      state.serviceShopMenu = newValue;
+    },
  },
 });