From ac0dea78e43435ef85a1e9ea9d505f652f8c3d17 Mon Sep 17 00:00:00 2001
From: liudianxin <liudianxin@bd-apaas.com>
Date: Fri, 17 Jul 2020 14:05:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=AE=A1=E7=90=86+i18n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/i18n/language-zh.js                |  30 ++++--
 src/assets/imgs/tool_ic_tuisong.png           | Bin 0 -> 1137 bytes
 src/components/order-list/order-list-cell.vue |   2 +-
 src/components/service-list/service_list.vue  |   2 +-
 src/pages/data-analysis/my-application.vue    |   4 +-
 src/pages/data-analysis/my-service.vue        |   4 +-
 .../message-management/banner/banner-list.vue |  19 ++++
 .../directed-push/directed-push-list.vue      |  19 ++++
 .../message-alert/message-alert-list.vue      |  19 ++++
 .../message-template-list.vue                 |  19 ++++
 src/pages/message-management/message.vue      |  94 ++++++++++++++++++
 .../recommended/recommended-list.vue          |  19 ++++
 src/pages/user/message.vue                    |  81 ---------------
 src/pages/user/user.vue                       |  14 ---
 src/pages/user/user_info.vue                  |   2 +-
 src/pages/workbench/fwgl/cloud-detail.vue     |  15 +--
 src/router/index.js                           |  38 ++++++-
 17 files changed, 257 insertions(+), 124 deletions(-)
 create mode 100644 src/assets/imgs/tool_ic_tuisong.png
 create mode 100644 src/pages/message-management/banner/banner-list.vue
 create mode 100644 src/pages/message-management/directed-push/directed-push-list.vue
 create mode 100644 src/pages/message-management/message-alert/message-alert-list.vue
 create mode 100644 src/pages/message-management/message-template/message-template-list.vue
 create mode 100644 src/pages/message-management/message.vue
 create mode 100644 src/pages/message-management/recommended/recommended-list.vue
 delete mode 100644 src/pages/user/message.vue

diff --git a/src/assets/i18n/language-zh.js b/src/assets/i18n/language-zh.js
index 4ce6cd1..f368162 100644
--- a/src/assets/i18n/language-zh.js
+++ b/src/assets/i18n/language-zh.js
@@ -4,25 +4,33 @@ export const lang = {
     // .
     // .
     // part personal center
-    personalCenter: "个人中心",
+    personal_center: "个人中心",
     profile: "个人档案",
-    messageCenter: "消息中心",
+    message_center: "消息中心",
 
     // unit of purchase duration
-    byYear: "按年",
-    byMonth: "按月",
+    by_year: "按年",
+    by_month: "按月",
 
     // service shop menu item
-    serviceShop: "服务超市",
+    service_shop: "服务超市",
 
     // work bench
     workBench: "工作台",
-    cloudResourcesService: "云资源服务",
-    cloudResourcesManagement: "云资源管理",
-    cloudResourcesDetail: "云资源详情",
+    cloud_resources_service: "云资源服务",
+    cloud_resources_management: "云资源管理",
+    cloud_resources_detail: "云资源详情",
 
     // data analysis
-    dataAnalysis: "数据分析中心",
-    myServiceDataAnalysis: "我的服务数据分析",
-    myApplicationDataAnalysis: "我的应用数据分析"
+    data_analysis: "数据分析中心",
+    my_service_data_analysis: "我的服务数据分析",
+    my_application_data_analysis: "我的应用数据分析",
+
+    // message
+    message: "消息与推送管理",
+    recommended: "推荐位管理",
+    directed_push: "定向推送管理",
+    message_alert: "消息提醒管理",
+    banner: "banner管理",
+    message_template: "消息模板管理",
 }
\ No newline at end of file
diff --git a/src/assets/imgs/tool_ic_tuisong.png b/src/assets/imgs/tool_ic_tuisong.png
new file mode 100644
index 0000000000000000000000000000000000000000..a88a26d43784690c767e7f75bc8fbb954a43d8ec
GIT binary patch
literal 1137
zcmaJ>O>EOv9CsHMph+O=iq<k!dYBI}wD>C@)K)!`+WiPxsxD+A+9p=Ver>GQe#U;q
zZcl}AfNA2=!z5Zw;{qHIY7d+kS~Vgj&?;3Ny1@xJa0PZ4*FBe}a3Hf}zYqO>zyHVk
zJzpFh8A`P8ZKo(IQ5;swWK5E`b4QeX&)4qwWa!2NReS=CV_$P2RWMKuf}*8Oz%tZ~
znbY@SA4NqDnUyN8mcEd5WHDNZVFJq`Y>MhT7C4$d2{EX_3DcJ87q@?-foaI}$!v)$
zISQ<s!?P|tF*{PxXD4;hppShH`T~gvSP*L<u%>KJ3S@diS0eLpo29`91W(HJo206x
zQJ^3ff-I9u>3k*&j*1MQOJ_v!Gazt$FU$3^d^*MFqzoqs0@!?L63sQnrLsD>8H=oB
zx{k3Uv8?a=jGtzZJHhgzD6*Wu3POq?Qr?V>wIF4C`<n_X^mNyBu!(FCDrz+}jb)l-
z`lbZS*^;%r%{GySv4Q5WJi~=0HG!ql|3fWn3+>@De4Fokg}us*1KBe4(6p<QgB#x;
zhH@mug&Ia~1)-^C7f0&|Bd?AepeSM2L~!_|X&cD*KHcDyN>b7Gux9J9sLC`^VNBDI
z1SONs_H$|Fs5-#&1BL#<bU{%?Rm>_mzE>D*a#f^HThPW$uJM+eX~_-kU^yhR3SILI
zGzMK{fsL{yvvn?fOTA65(K;8QC6^`1u;JmpbJ)!-;-GN4WnHq^GC#D5<6UCyudeR;
zom`8jMYT`~9@nORetD^F`x5o+R{qajjnnyG6ASdAzRQ2LEq5kkkyjny47f+_1gCa4
z{y1ChD1Mu~@LEai8CqXC*Lc3|nVi3|I`_%850<6m0`<zr9~&KO@yOTt#j~riLcH;P
zaw>X#er#@UE^@xe<+~Qzemu~%GJLovnHY;M&0qPc=Mj|<;%jr=E0M+>qib#Z!`ShQ
z*XFA8@yKF+w!l331;oWX!$oT|LL%59Jdr!+Kdd?z{K)c=%YXL(X5TvXCHQyfqi=?P
oi2ZYA=fUKI?{@FGOHpl6YVl?FqgZ>T9{vQ110(9q{;_la0diPnwEzGB

literal 0
HcmV?d00001

diff --git a/src/components/order-list/order-list-cell.vue b/src/components/order-list/order-list-cell.vue
index 6925cb3..38f1bf1 100644
--- a/src/components/order-list/order-list-cell.vue
+++ b/src/components/order-list/order-list-cell.vue
@@ -40,7 +40,7 @@
           <div>规格：日访问次数：{{ cellItem.spec_svc_count }}次，日访问量：{{ cellItem.spec_svc_pv }}</div>
           <div
             class="cell_specification_type"
-          >申请方式：{{ cellItem.duration_unit == 1 ? $t('lang.byMonth') : $t('lang.byYear') }}</div>
+          >申请方式：{{ cellItem.duration_unit == 1 ? $t('lang.by_month') : $t('lang.by_year') }}</div>
         </div>
         <div v-else-if="cellItem.order_type == 2">
           <div>规格：{{ cellItem.spec_app == 0 ? "申请获取应用镜像部署权限" : "申请获取应用镜像开发权限" }}</div>
diff --git a/src/components/service-list/service_list.vue b/src/components/service-list/service_list.vue
index 3ce9e09..1290c9a 100644
--- a/src/components/service-list/service_list.vue
+++ b/src/components/service-list/service_list.vue
@@ -9,7 +9,7 @@
   <div>
     <div class="head_flex">
       <el-breadcrumb separator="/" class="bread_crumb1 bread_left">
-        <el-breadcrumb-item :to="{ path: '/shop' }">{{ $t('lang.serviceShop') }}</el-breadcrumb-item>
+        <el-breadcrumb-item :to="{ path: '/shop' }">{{ $t('lang.service_shop') }}</el-breadcrumb-item>
         <el-breadcrumb-item>{{ name }}</el-breadcrumb-item>
       </el-breadcrumb>
       <div class="input_right">
diff --git a/src/pages/data-analysis/my-application.vue b/src/pages/data-analysis/my-application.vue
index 67e952f..dfb9d7e 100644
--- a/src/pages/data-analysis/my-application.vue
+++ b/src/pages/data-analysis/my-application.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-breadcrumb separator="/" class="bread_crumb1">
-      <el-breadcrumb-item :to="{ path: '/data_analysis' }">{{ $t("lang.dataAnalysis") }}</el-breadcrumb-item>
-      <el-breadcrumb-item>{{ $t("lang.myApplicationDataAnalysis") }}</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/data_analysis' }">{{ $t("lang.data_analysis") }}</el-breadcrumb-item>
+      <el-breadcrumb-item>{{ $t("lang.my_application_data_analysis") }}</el-breadcrumb-item>
     </el-breadcrumb>
     <el-row class="in_analysis">
       <!-- 可横向铺满 -->
diff --git a/src/pages/data-analysis/my-service.vue b/src/pages/data-analysis/my-service.vue
index 8ec8d9a..4c98929 100644
--- a/src/pages/data-analysis/my-service.vue
+++ b/src/pages/data-analysis/my-service.vue
@@ -3,12 +3,12 @@
     <el-breadcrumb separator="/" class="bread_crumb1">
       <el-breadcrumb-item :to="{ path: '/data_analysis' }">
         {{
-        $t("lang.dataAnalysis")
+        $t("lang.data_analysis")
         }}
       </el-breadcrumb-item>
       <el-breadcrumb-item>
         {{
-        $t("lang.myServiceDataAnalysis")
+        $t("lang.my_service_data_analysis")
         }}
       </el-breadcrumb-item>
     </el-breadcrumb>
diff --git a/src/pages/message-management/banner/banner-list.vue b/src/pages/message-management/banner/banner-list.vue
new file mode 100644
index 0000000..585e1ff
--- /dev/null
+++ b/src/pages/message-management/banner/banner-list.vue
@@ -0,0 +1,19 @@
+<template>
+  <div>
+    <el-breadcrumb separator="/" class="bread_crumb1 bread_left">
+      <el-breadcrumb-item :to="{ path: '/message' }">{{ $t("lang.message") }}</el-breadcrumb-item>
+      <el-breadcrumb-item>{{ $t("lang.banner") }}</el-breadcrumb-item>
+    </el-breadcrumb>
+  </div>
+</template>
+
+<script>
+export default {
+  components: {},
+  data: () => ({}),
+  mounted() {},
+  methods: {}
+};
+</script>
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/pages/message-management/directed-push/directed-push-list.vue b/src/pages/message-management/directed-push/directed-push-list.vue
new file mode 100644
index 0000000..74a362b
--- /dev/null
+++ b/src/pages/message-management/directed-push/directed-push-list.vue
@@ -0,0 +1,19 @@
+<template>
+  <div>
+    <el-breadcrumb separator="/" class="bread_crumb1 bread_left">
+      <el-breadcrumb-item :to="{ path: '/message' }">{{ $t("lang.message") }}</el-breadcrumb-item>
+      <el-breadcrumb-item>{{ $t("lang.directed_push") }}</el-breadcrumb-item>
+    </el-breadcrumb>
+  </div>
+</template>
+
+<script>
+export default {
+  components: {},
+  data: () => ({}),
+  mounted() {},
+  methods: {}
+};
+</script>
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/pages/message-management/message-alert/message-alert-list.vue b/src/pages/message-management/message-alert/message-alert-list.vue
new file mode 100644
index 0000000..5da7d63
--- /dev/null
+++ b/src/pages/message-management/message-alert/message-alert-list.vue
@@ -0,0 +1,19 @@
+<template>
+  <div>
+    <el-breadcrumb separator="/" class="bread_crumb1 bread_left">
+      <el-breadcrumb-item :to="{ path: '/message' }">{{ $t("lang.message") }}</el-breadcrumb-item>
+      <el-breadcrumb-item>{{ $t("lang.message_alert") }}</el-breadcrumb-item>
+    </el-breadcrumb>
+  </div>
+</template>
+
+<script>
+export default {
+  components: {},
+  data: () => ({}),
+  mounted() {},
+  methods: {}
+};
+</script>
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/pages/message-management/message-template/message-template-list.vue b/src/pages/message-management/message-template/message-template-list.vue
new file mode 100644
index 0000000..c644ac7
--- /dev/null
+++ b/src/pages/message-management/message-template/message-template-list.vue
@@ -0,0 +1,19 @@
+<template>
+  <div>
+    <el-breadcrumb separator="/" class="bread_crumb1 bread_left">
+      <el-breadcrumb-item :to="{ path: '/message' }">{{ $t("lang.message") }}</el-breadcrumb-item>
+      <el-breadcrumb-item>{{ $t("lang.message_template") }}</el-breadcrumb-item>
+    </el-breadcrumb>
+  </div>
+</template>
+
+<script>
+export default {
+  components: {},
+  data: () => ({}),
+  mounted() {},
+  methods: {}
+};
+</script>
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/pages/message-management/message.vue b/src/pages/message-management/message.vue
new file mode 100644
index 0000000..b62d93e
--- /dev/null
+++ b/src/pages/message-management/message.vue
@@ -0,0 +1,94 @@
+<template>
+  <div class="fwgl_container">
+    <side-nav-bar
+      title="消息与推送管理"
+      imgSrc="tool_ic_tuisong"
+      :nav-list="navList"
+      :title-path="navList[0] && navList[0].path"
+    ></side-nav-bar>
+    <div class="main_container">
+      <router-view :key="'type_' + $route.params.type"></router-view>
+    </div>
+  </div>
+</template>
+
+<script>
+import sideNavBar from "@/components/side-nav-bar";
+
+export default {
+  components: {
+    sideNavBar
+  },
+  data: () => ({
+    userNav: [
+      {
+        name: "推荐位管理",
+        path: `/message/recommended`
+      },
+      {
+        name: "定向推送管理",
+        path: `/message/directed_push`
+      },
+      {
+        name: "消息提醒管理",
+        path: `/message/message_alert`
+      },
+      {
+        name: "benner管理",
+        path: `/message/banner`
+      },
+      {
+        name: "消息模板管理",
+        path: `/message/message_template`
+      }
+    ],
+    navList: []
+  }),
+  watch: {
+    "$route.fullPath"(path) {
+      this.initNavList();
+    }
+  },
+  methods: {
+    initNavList() {
+      // this.$api.general.getNowMenu({ teamName: "APAAS3" }).then(response => {
+      //   if (response.data.success == 1) {
+      //     let arr = response.data.data[0].Child;
+      //     let user_index = arr.findIndex(item => item.visit_url == "/message");
+      //     if (user_index != -1) {
+      //       this.navList = arr[user_index].Child;
+      //       this.navList.forEach(item => {
+      //         item.name = item.menu_name;
+      //         item.path = item.visit_url;
+      //       });
+      //     }
+      //   }
+      // });
+      this.navList = this.userNav;
+    }
+  },
+  mounted() {
+    this.initNavList();
+  }
+};
+</script>
+
+<style scoped>
+.fwgl_container {
+  height: calc(100vh - 84px);
+  display: flex;
+  justify-content: flex-start;
+  align-items: stretch;
+}
+.side_nav_bar {
+  width: 180px;
+  flex-shrink: 0;
+}
+.main_container {
+  width: calc(100% - 180px);
+  flex-grow: 1;
+  flex-shrink: 1;
+  background-color: #f6f7fb;
+  overflow: auto;
+}
+</style>
diff --git a/src/pages/message-management/recommended/recommended-list.vue b/src/pages/message-management/recommended/recommended-list.vue
new file mode 100644
index 0000000..732c85e
--- /dev/null
+++ b/src/pages/message-management/recommended/recommended-list.vue
@@ -0,0 +1,19 @@
+<template>
+  <div>
+    <el-breadcrumb separator="/" class="bread_crumb1 bread_left">
+      <el-breadcrumb-item :to="{ path: '/message' }">{{ $t("lang.message") }}</el-breadcrumb-item>
+      <el-breadcrumb-item>{{ $t("lang.recommended") }}</el-breadcrumb-item>
+    </el-breadcrumb>
+  </div>
+</template>
+
+<script>
+export default {
+  components: {},
+  data: () => ({}),
+  mounted() {},
+  methods: {}
+};
+</script>
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/pages/user/message.vue b/src/pages/user/message.vue
deleted file mode 100644
index b7e4cda..0000000
--- a/src/pages/user/message.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-  <div>
-    <el-breadcrumb separator="/" class="bread_crumb1 bread_left">
-      <el-breadcrumb-item :to="{ path: '/user' }">{{ $t("lang.personalCenter") }}</el-breadcrumb-item>
-      <el-breadcrumb-item>{{ $t("lang.messageCenter") }}</el-breadcrumb-item>
-    </el-breadcrumb>
-    <block-radius class="message_block">
-      <ces-table
-        size="mini"
-        url="tableData"
-        :detailsUrl="detailsUrl"
-        :border="false"
-        :headers="headers"
-        :searchShow="false"
-        :autoAdd="false"
-        emptyText="没有消息哦"
-        :stripe="true"
-        :paginationShow="true"
-        :pageSizeShow="true"
-        :isIndex="false"
-      ></ces-table>
-    </block-radius>
-  </div>
-</template>
-
-<script>
-import CesTable from "@/components/table/table-um";
-import BlockRadius from "@/components/general/block-radius";
-export default {
-  components: {
-    CesTable,
-    BlockRadius
-  },
-  data: () => ({
-    headers: [
-      {
-        label: "服务url",
-        prop: "date",
-        type: "href",
-        align: "left"
-      },
-      {
-        label: "服务名称",
-        prop: "name",
-        type: "href",
-        align: "center"
-      },
-      {
-        label: "中文名",
-        prop: "address",
-        type: "href",
-        align: "right"
-      },
-      {
-        label: "操作",
-        type: "Button",
-        align: "center",
-        btnList: [
-          {
-            type: "primary-edit",
-            label: "编辑",
-            line: "|"
-          },
-          {
-            type: "primary-del",
-            label: "删除"
-          }
-        ]
-      }
-    ],
-    detailsUrl: "details"
-  }),
-  mounted() {},
-  methods: {}
-};
-</script>
-<style scoped>
-.message_block {
-  margin: 0 20px;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/user/user.vue b/src/pages/user/user.vue
index 6825347..3397e62 100644
--- a/src/pages/user/user.vue
+++ b/src/pages/user/user.vue
@@ -20,20 +20,6 @@ export default {
     sideNavBar
   },
   data: () => ({
-    userNav: [
-      {
-        name: "个人档案",
-        path: `/user/user_info`
-      },
-      {
-        name: "消息管理",
-        path: `/user/message`
-      },
-      {
-        name: "订单管理",
-        path: `/user/order_list`
-      }
-    ],
     navList: []
   }),
   watch: {
diff --git a/src/pages/user/user_info.vue b/src/pages/user/user_info.vue
index 1a91fa0..b85c215 100644
--- a/src/pages/user/user_info.vue
+++ b/src/pages/user/user_info.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-breadcrumb separator="/" class="bread_crumb1 bread_left">
-      <el-breadcrumb-item :to="{ path: '/user' }">{{ $t("lang.personalCenter") }}</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/user' }">{{ $t("lang.personal_center") }}</el-breadcrumb-item>
       <el-breadcrumb-item>{{ $t("lang.profile") }}</el-breadcrumb-item>
     </el-breadcrumb>
     <block-radius class="info_block">
diff --git a/src/pages/workbench/fwgl/cloud-detail.vue b/src/pages/workbench/fwgl/cloud-detail.vue
index c2bf598..90e9121 100644
--- a/src/pages/workbench/fwgl/cloud-detail.vue
+++ b/src/pages/workbench/fwgl/cloud-detail.vue
@@ -10,8 +10,8 @@
     <el-breadcrumb separator="/" class="bread_crumb1 bread_left">
       <el-breadcrumb-item
         :to="{ path: getUrl() }"
-      >{{ this.$route.params.level == 1 ? $t('lang.cloudResourcesService') : $t('lang.cloudResourcesManagement') }}</el-breadcrumb-item>
-      <el-breadcrumb-item>{{ $t('lang.cloudResourcesDetail') }}</el-breadcrumb-item>
+      >{{ this.$route.params.level == 1 ? $t('lang.cloud_resources_service') : $t('lang.cloud_resources_management') }}</el-breadcrumb-item>
+      <el-breadcrumb-item>{{ $t('lang.cloud_resources_detail') }}</el-breadcrumb-item>
     </el-breadcrumb>
     <BlockRadius class="in_cloud_block">
       <div class="cloud_block_head">
@@ -653,7 +653,7 @@ export default {
           let count = data.cloud_resource_count; //  resource usage
           if (count) {
             this.data1.total = count.cpu_total;
-            this.data1.remaining = count.cpu_total - count.cpu_use;
+            this.data1.remaining = (count.cpu_total - count.cpu_use).toFixed(2);
             if (count.cpu_total != 0 && count.cpu_use != 0) {
               this.data1.data = Math.round(
                 (count.cpu_use / count.cpu_total) * 100
@@ -662,7 +662,9 @@ export default {
               this.data1.data = 0;
             }
             this.data2.total = count.memory_total;
-            this.data2.remaining = count.memory_total - count.memory_use;
+            this.data2.remaining = (
+              count.memory_total - count.memory_use
+            ).toFixed(2);
             if (count.memory_total != 0 && count.memory_use != 0) {
               this.data2.data = Math.round(
                 (count.memory_use / count.memory_total) * 100
@@ -671,8 +673,9 @@ export default {
               this.data2.data = 0;
             }
             this.data3.total = count.containers_total;
-            this.data3.remaining =
-              count.containers_total - count.containers_use;
+            this.data3.remaining = (
+              count.containers_total - count.containers_use
+            ).toFixed(2);
             if (count.containers_total != 0 && count.containers_use != 0) {
               this.data3.data = Math.round(
                 (count.containers_use / count.containers_total) * 100
diff --git a/src/router/index.js b/src/router/index.js
index e6f0ce5..91fb88d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -248,11 +248,6 @@ export default new Router({
               name: "userInfo",
               component: () => import("@/pages/user/user_info"),
             },
-            {
-              path: "/user/message", // 消息管理页
-              name: "message",
-              component: () => import("@/pages/user/message"),
-            },
             {
               path: "/user/order_list", // 订单管理页
               name: "orderList",
@@ -373,6 +368,39 @@ export default new Router({
             },
           ],
         },
+        {
+          path: "/message", // 消息与推送管理
+          name: "message",
+          redirect: "/message/recommended",
+          component: () => import("@/pages/message-management/message"),
+          children: [
+            {
+              path: "/message/recommended", // 推荐位管理列表
+              name: "recommended",
+              component: () => import("@/pages/message-management/recommended/recommended-list"),
+            },
+            {
+              path: "/message/directed_push", // 定向推送列表
+              name: "directed_push",
+              component: () => import("@/pages/message-management/directed-push/directed-push-list"),
+            },
+            {
+              path: "/message/message_alert", // 消息提醒列表
+              name: "message_alert",
+              component: () => import("@/pages/message-management/message-alert/message-alert-list"),
+            },
+            {
+              path: "/message/banner", // benner列表
+              name: "banner",
+              component: () => import("@/pages/message-management/banner/banner-list"),
+            },
+            {
+              path: "/message/message_template", // 消息模板列表
+              name: "message_template",
+              component: () => import("@/pages/message-management/message-template/message-template-list"),
+            },
+          ],
+        }, // 消息与推送管理
       ],
     },
     {
-- 
2.26.0