Merge branch 'xym' into dev

src/assets/css/index.css

@@ -619,21 +619,17 @@ width: 620px!important;
   color: #58617a;
 }
 
-
-.apass_scroll::-webkit-scrollbar {
-  /*滚动条整体样式*/
-  width: 16px; /*高宽分别对应横竖滚动条的尺寸*/
+.apaas_scroll::-webkit-scrollbar {
+  width: 16px;
   height: 1px;
 }
-.apass_scroll::-webkit-scrollbar-thumb {
-  /*滚动条里面小方块*/
+.apaas_scroll::-webkit-scrollbar-thumb {
   border-radius: 8px;
   /* background: #dde4ff; */
   box-shadow: 8px 0 0 #a5adb7 inset;
   border: 4px solid rgba(0, 0, 0, 0);
 }
-.apass_scroll::-webkit-scrollbar-track {
-  /*滚动条里面轨道*/
+.apaas_scroll::-webkit-scrollbar-track {
   border-radius: 8px;
   /* background: #f4f4f4; */
   box-shadow: 8px 0 0 #f4f4f4 inset;
@@ -702,14 +698,22 @@ width: 620px!important;
 }
 .apaas_steps .apaas_step {
   height: 100%;
+  position: relative;
 }
 .apaas_steps .apaas_step .apaas_step_content {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
   height: calc(100% - 64px);
   border-bottom: 1px solid #f4f7fc;
   overflow: hidden;
 }
 .apaas_steps .apaas_step .apaas_step_action {
-  padding-top: 20px;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
   display: flex;
   justify-content: space-between;
   align-items: flex-start;

src/components/e-charts/commentlist.vue

 <template>
-  <ul class="comments_list apass_scroll">
+  <ul class="comments_list apaas_scroll">
     <li class="comment_card" v-for="(item, index) in data" :key="'comment_' + index">
       <div class="comment-left">
         <el-avatar :size="45" fit="cover" :src="item.message" />

src/components/e-charts/starlist.vue

 <template>
-  <ul class="star_list apass_scroll">
+  <ul class="star_list apaas_scroll">
     <li class="item_list" v-for="(option, index) in options" :key="'star_info_' + index">
       <el-rate
         v-if="show_star"

src/components/e-charts/toplist.vue

 <template>
-  <div class="top_list apass_scroll" @mouseenter="mouseenter" @mouseleave="mouseleave">
+  <div class="top_list apaas_scroll" @mouseenter="mouseenter" @mouseleave="mouseleave">
     <ul>
       <li class="item_list" v-for="(option, index) in options" :key="index">
         <div class="item_index">

src/pages/data-analysis/my-application.vue

@@ -135,7 +135,7 @@
                     </div>
                   </div>
                 </div>
-                <div class="right-content apass_scroll">
+                <div class="right-content apaas_scroll">
                   <apass-table
                     class="hot-search-table"
                     :header="hotSearchHeader"

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

@@ -146,7 +146,7 @@
                     </div>
                   </div>
                 </div>
-                <div class="right-content apass_scroll">
+                <div class="right-content apaas_scroll">
                   <apass-table
                     class="hot-search-table"
                     :header="hotSearchHeader"

src/pages/message-management/directed-push/directed-push-add.vue

@@ -26,11 +26,11 @@
         <step
           title="选择推送服务"
           :step="0"
-          :active-icon="require('@/assets/imgs/progress_ic_xinxitx.png')"
+          :active-icon="require('@/assets/imgs/progress_ic_tuisongfw.png')"
           class="apaas_step"
         >
           <div class="apaas_step_content">
-            <p style="margin: 50px;text-align: center;">选择推送服务</p>
+            <p style="padding: 50px;text-align: center;">选择推送服务</p>
           </div>
           <div class="apaas_button apaas_step_action">
             <el-button type="defalut" @click="backToList">
@@ -44,11 +44,11 @@
         <step
           title="选择消息模板"
           :step="1"
-          :active-icon="require('@/assets/imgs/progress_ic_bushudata.png')"
+          :active-icon="require('@/assets/imgs/progress_ic_xiaoximb.png')"
           class="apaas_step"
         >
-          <div class="apaas_step_content">
-            <p style="margin: 50px;text-align: center;">选择消息模板</p>
+          <div class="apaas_step_content apaas_scroll">
+            <p style="padding: 50px;text-align: center;">选择消息模板</p>
           </div>
           <div class="apaas_button apaas_step_action">
             <el-button type="defalut" @click="backToList">
@@ -67,11 +67,11 @@
         <step
           title="选择目标用户"
           :step="2"
-          :active-icon="require('@/assets/imgs/progress_ic_jingxiang.png')"
+          :active-icon="require('@/assets/imgs/progress_ic_renyuan.png')"
           class="apaas_step"
         >
-          <div class="apaas_step_content">
-            <p style="margin: 50px;text-align: center;">选择目标用户</p>
+          <div class="apaas_step_content apaas_scroll">
+            <p style="padding: 50px;text-align: center;">选择目标用户</p>
           </div>
           <div class="apaas_button apaas_step_action">
             <el-button type="defalut" @click="backToList">

src/pages/message-management/directed-push/directed-push-list.vue

@@ -95,7 +95,7 @@
             消息详情：
           </p>
           <div class="full_content">
-            <div class="apass_scroll">
+            <div class="apaas_scroll">
               <p class="item_content">
                 {{ templateDetail.contents }}
               </p>
@@ -107,7 +107,7 @@
             目标用户：
           </p>
           <div class="full_content">
-            <div class="apass_scroll">
+            <div class="apaas_scroll">
               <p class="item_content">
                 {{ templateDetail.receive_user }}
               </p>
@@ -159,14 +159,6 @@ export default {
     listHeader: [],
     listData: [],
     listTotal: 0,
-    dialogInfo: {
-      msg: "",
-      cancelText: "",
-      cancelType: "",
-      cancel: null,
-      sunbmitText: "",
-      submit: null,
-    },
     topFilter: {
       name: "",
       state: "",
@@ -276,11 +268,8 @@ export default {
 
       this.initList(this.tempFilter);
     },
-    showDialog() {
-      this.$refs.dialog.show();
-    },
     addNew() {
-      this.$router.push("/message/directed_push/add")
+      this.$router.push("/message/directed_push/add");
     },
     detailAction(item) {
       this.$http
@@ -362,7 +351,7 @@ export default {
   background-color: #f8f9fd;
   margin-top: 5px;
 }
-.detail_dialog .detail_item .full_content > .apass_scroll {
+.detail_dialog .detail_item .full_content > .apaas_scroll {
   height: 176px;
   overflow: auto;
 }

src/pages/message-management/message-alert/message-alert-add.vue

+<template>
+  <div class="apaas_detail_container">
+    <div class="apass_breadcrumb">
+      <el-breadcrumb separator="/">
+        <el-breadcrumb-item :to="{ path: '/message' }">
+          {{ $t("lang.message") }}
+        </el-breadcrumb-item>
+        <el-breadcrumb-item :to="{ path: '/message/message_alert' }">
+          {{ $t("lang.message_alert") }}
+        </el-breadcrumb-item>
+        <el-breadcrumb-item>
+          新建
+        </el-breadcrumb-item>
+      </el-breadcrumb>
+    </div>
+
+    <div class="main_contaner locked_height">
+      <steps
+        :active-step="step"
+        :done="done"
+        :show-done="true"
+        done-title="推送成功"
+        done-sub-title="用户可通过用户中心-消息通知查收推送内容"
+        class="apaas_steps"
+      >
+        <step
+          title="选择消息模板"
+          :step="0"
+          :active-icon="require('@/assets/imgs/progress_ic_xiaoximb.png')"
+          class="apaas_step"
+        >
+          <div class="apaas_step_content apaas_scroll">
+            <p style="padding: 50px;text-align: center;">选择消息模板</p>
+          </div>
+          <div class="apaas_button apaas_step_action">
+            <el-button type="defalut" @click="backToList">
+              取消
+            </el-button>
+            <el-button type="primary" @click="step1Action">
+              下一步
+            </el-button>
+          </div>
+        </step>
+        <step
+          title="选择目标用户"
+          :step="1"
+          :active-icon="require('@/assets/imgs/progress_ic_renyuan.png')"
+          class="apaas_step"
+        >
+          <div class="apaas_step_content apaas_scroll">
+            <p style="padding: 50px;text-align: center;">选择目标用户</p>
+          </div>
+          <div class="apaas_button apaas_step_action">
+            <el-button type="defalut" @click="backToList">
+              取消
+            </el-button>
+            <span>
+              <el-button type="defalut" @click="step = 0">
+                上一步
+              </el-button>
+              <el-button type="primary" @click="step2Action">
+                完成选择
+              </el-button>
+            </span>
+          </div>
+        </step>
+
+        <template slot="action">
+          <el-button type="primary" @click="backToList">
+            返回列表
+          </el-button>
+        </template>
+      </steps>
+    </div>
+  </div>
+</template>
+
+<script>
+import Steps from "@/components/app-build-steps/app-build-steps";
+import Step from "@/components/app-build-steps/app-build-step";
+
+export default {
+  components: {
+    Steps,
+    Step,
+  },
+  data() {
+    return {
+      step: 0,
+      done: false,
+    };
+  },
+  computed: {},
+  created() {},
+  methods: {
+    backToList() {
+      this.$router.push("/message/message_alert");
+    },
+    step1Action() {
+      this.step = 1;
+    },
+    step2Action() {
+      this.done = true;
+    },
+  },
+};
+</script>
+
+<style scoped>
+.main_contaner {
+  padding: 20px;
+}
+</style>

src/router/index.js

@@ -404,6 +404,11 @@ export default new Router({
               name: "message_alert",
               component: () => import("@/pages/message-management/message-alert/message-alert-list"),
             },
+            {
+              path: "/message/message_alert/add", // 新建消息提醒
+              name: "message_alert_add",
+              component: () => import("@/pages/message-management/message-alert/message-alert-add"),
+            },
             {
               path: "/message/banner", // benner列表
               name: "banner",