init

2024-01-29 19:04:53 +08:00
parent 5a0e1ffd58
commit 1fb2d171c2
13 changed files with 774 additions and 304 deletions
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
    "nprogress": "0.2.0",
    "quill": "1.3.7",
    "screenfull": "5.0.2",
-    "sortablejs": "1.10.2",
+    "sortablejs": "^1.10.2",
    "vue": "2.6.12",
    "vue-count-to": "1.0.13",
    "vue-cropper": "0.5.5",
--- a/src/assets/drainageCode/default_icon.png
+++ b/src/assets/drainageCode/default_icon.png
--- a/src/assets/drainageCode/header.png
+++ b/src/assets/drainageCode/header.png
--- a/src/assets/drainageCode/miniprogram-icon.png
+++ b/src/assets/drainageCode/miniprogram-icon.png
--- a/src/assets/drainageCode/miniprogram-img.png
+++ b/src/assets/drainageCode/miniprogram-img.png
--- a/src/assets/drainageCode/miniprogram-link.png
+++ b/src/assets/drainageCode/miniprogram-link.png
--- a/src/assets/drainageCode/preview-bg.png
+++ b/src/assets/drainageCode/preview-bg.png
--- a/src/components/ImageUpload2/index.vue
+++ b/src/components/ImageUpload2/index.vue
@@ -26,6 +26,7 @@
      <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
      <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
      的文件
+      <span style="color: red"><br/>{{customTip}}</span>
    </div>

    <el-dialog
@@ -68,6 +69,10 @@ export default {
    isShowTip: {
      type: Boolean,
      default: true
+    },
+    customTip:{
+      type: String,
+      default: ''
    }
  },
  data() {
--- a/src/components/PreviewInMobileClient/index.vue
+++ b/src/components/PreviewInMobileClient/index.vue
@@ -0,0 +1,224 @@
+<template>
+  <div class="preview">
+    <div class="title">{{ name }}</div>
+    <div class="content">
+      <div class="item" v-if="data.type === 0">
+        <div class="msg" style="width: 100%">
+          <div class="word">
+            {{data.onlyText}}
+          </div>
+        </div>
+      </div>
+      <div class="item" v-if="data.type === 1">
+        <div class="msg" style="width: 100%">
+          <div class="word-title" v-if="data.title">
+            {{ data.title }}
+          </div>
+          <div class="word-time">
+            2024-01-29 10:10:11
+          </div>
+          <div class="word" v-if="data.textText1">
+            {{ data.textText1 }}
+          </div>
+          <div class="word" v-if="textContext">
+            <div v-for="val in textContext">
+              {{val.n}} : {{val.v}}
+            </div>
+          </div>
+          <div class="word" v-if="data.textText2">
+            {{ data.textText2 }}
+          </div>
+        </div>
+      </div>
+      <div class="item" v-if="data.type === 2">
+        <div class="msg" style="width: 100%">
+          <div class="miniprogram">
+            <div style="position: relative;">
+              <img class="mini-img" :src="imageFunc(data.oneImageImage)" @click="goTo(data.oneImageLinkType,data.oneImageLinkUrl)"/>
+              <span style="position: absolute; bottom: 0; left: 0;">添加文字...添加文字...添加文字...</span>
+            </div>
+            <div class="word-title" v-if="data.title">
+              {{ data.title }}
+            </div>
+            <div class="word" v-if="data.oneImageText && data.oneImageTitleType === 0">
+              {{ data.oneImageText }}
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="item" v-if="data.type === 3">
+        <div class="msg" style="width: 100%">
+          <div class="miniprogram" >
+            <div class="mini-img" :style="{'background-image': 'https://nono-1257812345.cos.ap-shanghai.myqcloud.com/images/avatar/woman.png'}">
+            </div>
+            <div>
+              <div>12231231</div>
+              <img class="mini-img" :src="imageFunc(data.oneImageImage)" @click="goTo(data.oneImageLinkType,data.oneImageLinkUrl)"/>
+            </div>
+            <div>
+              <div>12231231</div>
+              <img class="mini-img" :src="imageFunc(data.oneImageImage)" @click="goTo(data.oneImageLinkType,data.oneImageLinkUrl)"/>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="item" v-if="data.type === 4">
+        <div class="msg" style="width: 100%">
+          <div class="miniprogram">
+            <img class="mini-img" :src="imageFunc(data.onlyImage)"/>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'PreviewClient',
+  props: {
+    name: {
+      type: String,
+      default: '系统通知'
+    },
+    data: {
+      type: Object,
+      default: () => ({
+      })
+    },
+    textContext: {
+      type: Array,
+      default: []
+    },
+    imageContext:{
+      type: Array,
+      default: []
+    }
+  },
+  methods:{
+    imageFunc(image){
+      if(image){
+        return process.env.VUE_APP_COS_BASE_URL + image;
+      }
+      return image;
+    },
+    goTo(linkType,linkUrl){
+      if(linkType === 1 && linkUrl){
+        window.open(linkUrl)
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.preview {
+  margin: 0 auto;
+  position: relative;
+  width: 300px;
+  height: 500px;
+  background: url(../../assets/drainageCode/preview-bg.png);
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+
+  .title {
+    position: absolute;
+    top: 37px;
+    left: 50%;
+    transform: translateX(-50%);
+    font-size: 14px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #333333;
+  }
+
+  .content {
+    position: absolute;
+    height: 405px;
+    width: 280px;
+    overflow-y: auto;
+    top: 70px;
+    left: 50%;
+    transform: translateX(-50%);
+    border-bottom-left-radius: 10px;
+    border-bottom-right-radius: 10px;
+    padding: 15px;
+
+    .item {
+      font-size: 12px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #666666;
+      display: flex;
+      margin-top: 20px;
+
+      &:first-child {
+        margin-top: 0;
+      }
+
+      .avatar222 {
+        // align-self: center;
+        margin-right: 5px;
+      }
+
+      .msg {
+        position: relative;
+        min-height: 26px;
+        background: #ffffff;
+        box-shadow: 0px 2px 6px 0px rgba(60, 136, 240, 0.1);
+        border: 1px solid #e1edfc;
+        display: inline-block;
+        border-radius: 4px;
+        box-sizing: border-box;
+        word-break: break-all;
+        margin-left: 5px;
+
+        &:before {
+          content: " ";
+          display: block;
+          position: absolute;
+          left: -5px;
+          box-shadow: 0px 2px 6px 0px rgba(60, 136, 240, 0.1);
+          border-width: 5px;
+          border-left: 0;
+          width: 0;
+          border-style: solid;
+          border-color: transparent;
+          border-right-color: #fff;
+          top: 8px;
+          z-index: 888;
+        }
+
+        .word-title {
+          font-weight: bold;
+          padding: 4px 12px;
+        }
+        .word-time{
+          color: #99a9bf;
+          padding: 0px 12px;
+        }
+        .word {
+          padding: 5px 12px;
+        }
+
+        .image {
+          padding: 12px;
+
+          img {
+            width: 94px;
+            height: 90px;
+          }
+        }
+
+        .miniprogram {
+          padding: 12px;
+          .mini-img {
+            margin: 10px 0;
+            width: 100%;
+            height: 120px;
+          }
+        }
+      }
+    }
+  }
+}
+</style>
--- a/src/constant/statusMap.js
+++ b/src/constant/statusMap.js
@@ -262,3 +262,36 @@ export const userErrorLogHomeIndexList = [
  { value: 'video', label: '直播期间',listClass: listClass.danger},
  { value: 'other', label: '其他',listClass: listClass.success},
 ]
+
+export const systemPushGroupIdList = [
+  { value: 0, label: '单个用户'},
+  { value: 1, label: '全部用户'},
+  { value: 2, label: '男用户'},
+  { value: 3, label: '女用户'},
+  { value: 4, label: '认证女神'},
+]
+
+export const systemPushLogStatus = [
+  { value: 0, label: '未推送'},
+  { value: 1, label: '推送中'},
+  { value: 2, label: '推送失败'},
+  { value: 3, label: '推送成功'},
+]
+
+export const systemPushSendTimeTypeList = [
+  { value: 0, label: '手动发送'},
+  { value: 1, label: '定时发送'},
+]
+export const systemPushStatusList = [
+  { value: 0, label: '未执行'},
+  { value: 1, label: '执行中'},
+  { value: 2, label: '队列执行中'},
+  { value: 3, label: '已完成'},
+]
+export const systemPushTypeList = [
+  { value: 0, label: '纯文字消息'},
+  { value: 1, label: '文本消息'},
+  { value: 2, label: '单图文消息'},
+  { value: 3, label: '多图文消息'},
+  { value: 4, label: '纯图文消息'},
+]
--- a/src/views/cai/sysPush/add-sys-push-dialog.vue
+++ b/src/views/cai/sysPush/add-sys-push-dialog.vue
@@ -0,0 +1,458 @@
+<template>
+  <el-dialog title="新增系统推送" :close-on-click-modal="false" :visible.sync="open" width="900px" append-to-body>
+    <el-row>
+      <el-col style="width: 550px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-form-item label="群体类型" prop="groupId">
+            <el-select v-model="form.groupId" size="small" style="width: 100%">
+              <el-option
+                  v-for="dict in systemPushGroupIdList"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="form.groupId === 0" :label="systemName+'号'" prop="usercode">
+            <el-autocomplete
+                class="inline-input"
+                v-model="form.usercode"
+                :fetch-suggestions="querySearch"
+                placeholder="请输入内容"
+                @select="handleSelect"
+                style="width: 100%"
+            ></el-autocomplete>
+          </el-form-item>
+          <el-form-item label="昵称" v-if="form.groupId === 0 && userInfo.nickname">
+            {{ userInfo.nickname }} 【{{ userInfo.usercode }}】
+          </el-form-item>
+          <el-form-item label="头像" v-if="form.groupId === 0 && userInfo.avatar">
+            <image-avatar :src="userInfo.avatar"/>
+          </el-form-item>
+          <el-form-item label="发送类型" prop="sendTimeType">
+            <el-select v-model="form.sendTimeType" size="small" style="width: 100%">
+              <el-option
+                  v-for="dict in systemPushSendTimeTypeList"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="标题" prop="title">
+            <el-input v-model="form.title" placeholder="请输入标题"/>
+          </el-form-item>
+          <el-form-item label="消息类型" prop="type">
+            <el-select v-model="form.type" size="small" @change="typeSelectHandle" style="width: 100%">
+              <el-option
+                  v-for="dict in systemPushTypeList"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="消息内容" prop="onlyText" v-if="form.type === 0">
+            <el-input v-model="form.onlyText" placeholder="请输入消息内容" type="textarea" :rows="2"/>
+          </el-form-item>
+          <el-form-item label="文本一" prop="textText1" v-if="form.type === 1">
+            <el-input v-model="form.textText1" placeholder="请输入第一段文本" type="textarea" :rows="2"/>
+          </el-form-item>
+          <el-form-item label="内容" prop="textContext" v-show="form.type === 1">
+            <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" @click="textContextAddHandle">追加
+            </el-button>
+            <el-table
+                :data="textContext"
+                ref="textContextRef"
+                style="width: 100%"
+                :row-key="(row) => {return row.id}"
+            >
+              <el-table-column align="center" prop="n" label="字段" min-width="180">
+                <template v-slot="scope">
+                  <el-input v-model="scope.row.n" placeholder="字段"/>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" prop="v" label="值" min-width="180">
+                <template v-slot="scope">
+                  <el-input v-model="scope.row.v" placeholder="值"/>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="操作">
+                <template v-slot="scope">
+                  <el-button size="mini" type="text" @click="textContextRemoveHandle(scope.row)" icon="el-icon-delete"/>
+                  <el-button size="mini" type="text" icon="el-icon-rank"/>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form-item>
+          <el-form-item label="文本二" prop="textText2" v-if="form.type === 1">
+            <el-input v-model="form.textText2" placeholder="请输入第二段文本" type="textarea" :rows="2"/>
+          </el-form-item>
+          <el-form-item label="链接类型" prop="textLinkType" v-if="form.type === 1">
+            <el-select v-model="form.textLinkType" size="small">
+              <el-option :key="0" label="不可点击" :value="0"/>
+              <el-option :key="1" label="打开H5" :value="1"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="链接地址" prop="textLinkUrl" v-if="form.type === 1 && form.textLinkType === 1">
+            <el-input v-model="form.textLinkUrl" placeholder="请输入链接地址" type="textarea" :rows="2"/>
+          </el-form-item>
+
+          <el-form-item label="标题类型" prop="oneImageTitleType" v-if="form.type === 2">
+            <el-select v-model="form.oneImageTitleType" size="small">
+              <el-option :key="0" label="普通标题" :value="0"/>
+              <el-option :key="1" label="水印标题" :value="1"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="图片" prop="oneImageImage" v-if="form.type === 2">
+            <image-upload2 v-model="form.oneImageImage" custom-tip="建议图片比例16:9"/>
+          </el-form-item>
+          <el-form-item label="文本" prop="oneImageText" v-if="form.type === 2 && form.oneImageTitleType === 0">
+            <el-input v-model="form.oneImageText" placeholder="请输入消息文本" type="textarea" :rows="2"/>
+          </el-form-item>
+          <el-form-item label="链接类型" prop="oneImageLinkType" v-if="form.type === 2">
+            <el-select v-model="form.oneImageLinkType" size="small">
+              <el-option :key="0" label="不可点击" :value="0"/>
+              <el-option :key="1" label="打开H5" :value="1"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="链接地址" prop="oneImageLinkUrl" v-if="form.type === 2 && form.oneImageLinkType === 1">
+            <el-input v-model="form.oneImageLinkUrl" placeholder="请输入链接地址" type="textarea" :rows="2"/>
+          </el-form-item>
+          <el-form-item label="内容" prop="imageContext" v-show="form.type === 3">
+            <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" @click="imageContextAddHandle">新增</el-button>
+            <span style="color: red">　　建议：第一张图片比例16:9，其他图片正方形。</span>
+            <el-table
+                :data="imageContext"
+                ref="imageContextRef"
+                style="width: 100%"
+                :row-key="(row) => {return row.id}"
+            >
+              <el-table-column align="center" prop="image" label="图片" min-width="60">
+                <template v-slot="scope">
+                  <image-preview :src="scope.row.image" :width="60" :height="40"/>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" prop="linkType" label="链接类型" min-width="50">
+                <template v-slot="scope">
+                  <span v-if="scope.row.linkType === 0">不可点击</span>
+                  <span v-if="scope.row.linkType === 1">打开H5</span>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" prop="linkUrl" label="链接" min-width="100" show-overflow-tooltip/>
+              <el-table-column align="center" label="操作">
+                <template v-slot="scope">
+                  <el-button size="mini" type="text" @click="imageContextUpdateHandle(scope.row)" icon="el-icon-edit"/>
+                  <el-button size="mini" type="text" @click="imageContextRemoveHandle(scope.row)" icon="el-icon-delete"/>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form-item>
+
+          <el-form-item label="图片" prop="onlyImage" v-if="form.type === 4">
+            <image-upload2 v-model="form.onlyImage"/>
+          </el-form-item>
+          <el-form-item label="remark" prop="remark">
+            <el-input v-model="form.remark" placeholder="请输入备注说明" type="textarea" :rows="2"/>
+          </el-form-item>
+        </el-form>
+      </el-col>
+      <el-col style="width: 10px">
+        <div style="width: 100%"></div>
+      </el-col>
+      <el-col style="width: 200px;">
+        <preview-client :data="form" :textContext="textContext" :imageContext="imageContext"></preview-client>
+      </el-col>
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="open = false">取 消</el-button>
+    </div>
+    <el-dialog :title="imageTitle" :close-on-click-modal="false" :visible.sync="imageOpen" width="500px" append-to-body>
+      <el-form ref="imageForm" :model="imageForm" :rules="imageRules" label-width="80px">
+        <el-form-item label="图片标题" prop="title">
+          <image-upload2 v-model="imageForm.image"/>
+        </el-form-item>
+        <el-form-item label="图片" prop="image">
+          <image-upload2 v-model="imageForm.image"/>
+        </el-form-item>
+        <el-form-item label="链接类型" prop="linkType">
+          <el-select v-model="imageForm.linkType" size="small">
+            <el-option :key="0" label="不可点击" :value="0"/>
+            <el-option :key="1" label="打开H5" :value="1"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="链接地址" prop="linkUrl" v-if="this.imageForm.linkType === 1">
+          <el-input v-model="imageForm.linkUrl" placeholder="请输入链接地址" type="textarea" :rows="2"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="imageSubmitForm">确 定</el-button>
+        <el-button @click="imageOpen = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </el-dialog>
+</template>
+
+<script>
+import { addBanner, updateBanner } from '@/api/cai/banner'
+import {
+  systemPushGroupIdList,
+  systemPushLogStatus,
+  systemPushSendTimeTypeList,
+  systemPushStatusList,
+  systemPushTypeList
+} from '@/constant/statusMap'
+import { getUserByUsercode, listUserByUserCode } from '@/api/cai/user'
+import Sortable from 'sortablejs'
+import PreviewClient from '@/components/PreviewInMobileClient/index.vue'
+
+export default {
+  components: {
+    PreviewClient
+  },
+  data() {
+    return {
+      systemPushGroupIdList, systemPushLogStatus, systemPushSendTimeTypeList, systemPushStatusList, systemPushTypeList,
+      systemName: process.env.VUE_APP_SYSTEM_HOME,
+      open: false,
+      form: {
+        id: undefined,
+        groupId: 0,
+        usercode: undefined,
+
+        onlyText: undefined,
+
+        textText1: undefined,
+        textText2: undefined,
+        textLinkType: 0,
+        textLinkUrl: undefined,
+
+        oneImageTitleType:0,
+        oneImageImage:undefined,
+        oneImageText:undefined,
+        oneImageLinkType: 0,
+        oneImageLinkUrl: undefined,
+
+        onlyImage:undefined,
+
+        sendTimeType: 0,
+        title: undefined,
+        type: 0,
+        remark: undefined
+      },
+      imageForm:{
+        title: undefined,
+        image: undefined,
+        linkType: undefined,
+        linkUrl: undefined
+      },
+      imageOpen: false,
+      imageTitle: '',
+      textContext: [],
+      imageContext:[],
+      userInfo: {},
+      // 表单校验
+      rules: {
+        groupId: [
+          { required: true, message: '群体类型不能为空', trigger: 'blur' }
+        ],
+        sendTimeType: [
+          { required: true, message: '发送类型不能为空', trigger: 'blur' }
+        ],
+        title: [
+          { required: true, message: '标题不能为空', trigger: 'blur' }
+        ],
+        type: [
+          { required: true, message: '消息类型不能为空', trigger: 'blur' }
+        ],
+        onlyText: [
+          { required: true, message: '文本消息不能为空', trigger: 'blur' }
+        ],
+        textLinkUrl: [
+          { required: true, message: '链接地址不能为空', trigger: 'blur' }
+        ],
+        oneImageLinkUrl: [
+          { required: true, message: '链接地址不能为空', trigger: 'blur' }
+        ],
+        oneImageImage: [
+          { required: true, message: '图片不能为空', trigger: 'blur' }
+        ],
+        onlyImage: [
+          { required: true, message: '图片不能为空', trigger: 'blur' }
+        ],
+      },
+      imageRules:{
+        image: [
+          { required: true, message: '图片不能为空', trigger: 'blur' }
+        ],
+        linkType: [
+          { required: true, message: '链接类型不能为空', trigger: 'blur' }
+        ],
+        linkUrl: [
+          { required: true, message: '链接不能为空', trigger: 'blur' }
+        ],
+      },
+      buttonLoading: false
+    }
+  },
+  mounted() {
+  },
+  created() {
+  },
+  methods: {
+    init(id) {
+      this.form.id = id || undefined
+      this.open = true
+      this.$nextTick(() => {
+        this.$refs['form'].resetFields()
+      })
+    },
+    rowDrop() {
+      const tbody = this.$refs.textContextRef.$el.querySelector(
+          ".el-table__body > tbody"
+      );
+      console.log(tbody)
+      const _this = this
+      Sortable.create(tbody, {
+        animation: 180,
+        delay: 0,
+        onEnd({ newIndex, oldIndex }) {
+          const currRow = _this.textContext.splice(oldIndex, 1)[0]
+          _this.textContext.splice(newIndex, 0, currRow)
+        }
+      })
+    },
+    typeSelectHandle(value){
+      if(value === 1){
+        this.$nextTick(() => {
+          this.rowDrop()
+        })
+      }
+    },
+    querySearch(querySearch, cb) {
+      listUserByUserCode(querySearch).then(res => {
+        cb(res.data.map((terminal) => {
+          return {
+            value: terminal,
+            name: terminal
+          }
+        }))
+      })
+    },
+    handleSelect(item) {
+      getUserByUsercode(item.value).then(res => {
+        this.userInfo = res.data
+      })
+    },
+    textContextRemoveHandle(row) {
+      const index = this.textContext.findIndex((item) => {
+        return item.id === row.id
+      })
+      // 根据索引删除数据
+      this.textContext.splice(index, 1)
+    },
+    imageContextAddHandle(){
+      this.imageOpen = true;
+      this.imageTitle = "添加多图文信息";
+      this.$nextTick(() => {
+        this.$refs['imageForm'].resetFields()
+        this.imageForm.id = undefined
+      })
+    },
+    imageContextRemoveHandle(row){
+      const index = this.imageContext.findIndex((item) => {
+        return item.id === row.id
+      })
+      // 根据索引删除数据
+      this.imageContext.splice(index, 1)
+    },
+    imageContextUpdateHandle(row){
+      this.imageOpen = true;
+      this.imageTitle = "编辑多图文信息";
+      this.$nextTick(() => {
+        this.$refs['imageForm'].resetFields()
+        let copy = {}
+        Object.assign(copy,row)
+        this.imageForm = copy;
+      })
+    },
+    imageSubmitForm(){
+      this.$refs["imageForm"].validate(valid => {
+        if (valid) {
+          if (this.imageForm.id != null) {
+            const index = this.imageContext.findIndex((item) => {
+              return item.id === this.imageForm.id
+            })
+            let copy = {}
+            Object.assign(copy,this.imageForm)
+            this.imageContext[index] = copy
+            this.imageOpen = false
+            console.log(this.imageContext)
+          } else {
+            this.imageContext.push({
+              id: this.genNonDuplicateID(),
+              image: this.imageForm.image,
+              linkType: this.imageForm.linkType,
+              linkUrl: this.imageForm.linkUrl
+            })
+            this.imageOpen = false
+            console.log(this.imageContext)
+          }
+        }
+      });
+    },
+    textContextAddHandle() {
+      let b = false;
+      if(this.textContext.length === 0){
+        b = true;
+      }
+      this.textContext.push({
+        id: this.genNonDuplicateID(),
+        n: undefined,
+        v: undefined
+      })
+      if(b){
+        this.rowDrop()
+      }
+    },
+    /**
+     * 生成一个用不重复的ID
+     */
+    genNonDuplicateID(randomLength) {
+      if (randomLength) {
+        randomLength = 8
+      }
+      return Number(Math.random().toString().substr(3, randomLength) + Date.now()).toString(36)
+    },
+    // 表单提交
+    submitForm() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.buttonLoading = true
+          if (this.form.id != null) {
+            updateBanner(this.form).then(data => {
+              this.$modal.msgSuccess('修改成功')
+              this.$modal.buttonLoading = false
+              this.open = false
+              this.$emit('refreshDataList')
+            }).finally(() => {
+              this.buttonLoading = false
+            })
+          } else {
+            addBanner(this.form).then(data => {
+              this.$modal.msgSuccess('修改成功')
+              this.buttonLoading = false
+              this.open = false
+              this.$emit('refreshDataList')
+            }).finally(() => {
+              this.buttonLoading = false
+            })
+          }
+
+        }
+      })
+    }
+  }
+}
+</script>
--- a/src/views/cai/sysPush/index.vue
+++ b/src/views/cai/sysPush/index.vue
@@ -1,21 +1,16 @@
 <template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="群体类型: 0=单个用户,1=全部用户,2=男用户,3=女用户, 4 =认证女神" prop="groupId">
-        <el-input
-          v-model="queryParams.groupId"
-          placeholder="请输入群体类型: 0=单个用户,1=全部用户,2=男用户,3=女用户, 4 =认证女神"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用户id,仅在group_id=单个用户时生效" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入用户id,仅在group_id=单个用户时生效"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="群体类型" prop="groupId">
+        <el-select v-model="queryParams.groupId" clearable size="small">
+          <el-option
+              v-for="dict in systemPushGroupIdList"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+              @keyup.enter.native="handleQuery"
+          />
+        </el-select>
      </el-form-item>
      <el-form-item label="标题" prop="title">
        <el-input
@@ -25,46 +20,6 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
-      <el-form-item label="发送时间" prop="sendTime">
-        <el-date-picker clearable
-          v-model="queryParams.sendTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择发送时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="已推送人数" prop="num">
-        <el-input
-          v-model="queryParams.num"
-          placeholder="请输入已推送人数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="完成时间" prop="endtime">
-        <el-date-picker clearable
-          v-model="queryParams.endtime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择完成时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createtime">
-        <el-date-picker clearable
-          v-model="queryParams.createtime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择创建时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="更新时间" prop="updatetime">
-        <el-date-picker clearable
-          v-model="queryParams.updatetime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择更新时间">
-        </el-date-picker>
-      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -82,74 +37,41 @@
          v-hasPermi="['cai:sysPush:add']"
        >新增</el-button>
      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['cai:sysPush:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['cai:sysPush:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['cai:sysPush:export']"
-        >导出</el-button>
-      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-table v-loading="loading" :data="sysPushList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="" align="center" prop="id" v-if="true"/>
-      <el-table-column label="群体类型: 0=单个用户,1=全部用户,2=男用户,3=女用户, 4 =认证女神" align="center" prop="groupId" />
-      <el-table-column label="消息类型:0=纯文字消息,1=文本消息,2=单图文消息,3=多图文消息" align="center" prop="type" />
-      <el-table-column label="用户id,仅在group_id=单个用户时生效" align="center" prop="userId" />
+      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="群体类型" align="center" prop="groupId" >
+        <template v-slot="scope">
+          <cai-dict-tag :options="systemPushGroupIdList" :value="scope.row.groupId"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="消息类型" align="center" prop="type" >
+        <template v-slot="scope">
+          <cai-dict-tag :options="systemPushTypeList" :value="scope.row.type"/>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="用户id,仅在group_id=单个用户时生效" align="center" prop="userId" />-->
      <el-table-column label="标题" align="center" prop="title" />
      <el-table-column label="内容" align="center" prop="content" />
      <el-table-column label="前端参数" align="center" prop="params" />
      <el-table-column label="备注说明" align="center" prop="remark" />
-      <el-table-column label="发送类型:0=手动发送,1=定时发送" align="center" prop="sendTimeType" />
-      <el-table-column label="发送时间" align="center" prop="sendTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sendTime, '{y}-{m}-{d}') }}</span>
+      <el-table-column label="发送类型" align="center" prop="sendTimeType" >
+        <template v-slot="scope">
+          <cai-dict-tag :options="systemPushSendTimeTypeList" :value="scope.row.type"/>
        </template>
      </el-table-column>
+      <el-table-column label="发送时间" align="center" prop="sendTime" width="180" />
      <el-table-column label="已推送人数" align="center" prop="num" />
-      <el-table-column label="状态:0=未执行,1=执行中,2队列执行中,3=已完成" align="center" prop="status" />
-      <el-table-column label="完成时间" align="center" prop="endtime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endtime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createtime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createtime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新时间" align="center" prop="updatetime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updatetime, '{y}-{m}-{d}') }}</span>
+      <el-table-column label="状态" align="center" prop="status">
+        <template v-slot="scope">
+          <cai-dict-tag :options="systemPushStatusList" :value="scope.row.status"/>
        </template>
      </el-table-column>
+      <el-table-column label="完成时间" align="center" prop="endtime" width="180" />
+      <el-table-column label="创建时间" align="center" prop="createtime" width="180" />
+<!--      <el-table-column label="更新时间" align="center" prop="updatetime" width="180" />-->
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
@@ -178,75 +100,30 @@
      @pagination="getList"
    />

-    <!-- 添加或修改推送系统消息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="群体类型: 0=单个用户,1=全部用户,2=男用户,3=女用户, 4 =认证女神" prop="groupId">
-          <el-input v-model="form.groupId" placeholder="请输入群体类型: 0=单个用户,1=全部用户,2=男用户,3=女用户, 4 =认证女神" />
-        </el-form-item>
-        <el-form-item label="用户id,仅在group_id=单个用户时生效" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入用户id,仅在group_id=单个用户时生效" />
-        </el-form-item>
-        <el-form-item label="标题" prop="title">
-          <el-input v-model="form.title" placeholder="请输入标题" />
-        </el-form-item>
-        <el-form-item label="内容">
-          <editor v-model="form.content" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="备注说明" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="发送时间" prop="sendTime">
-          <el-date-picker clearable
-            v-model="form.sendTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择发送时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="已推送人数" prop="num">
-          <el-input v-model="form.num" placeholder="请输入已推送人数" />
-        </el-form-item>
-        <el-form-item label="完成时间" prop="endtime">
-          <el-date-picker clearable
-            v-model="form.endtime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择完成时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createtime">
-          <el-date-picker clearable
-            v-model="form.createtime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择创建时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="更新时间" prop="updatetime">
-          <el-date-picker clearable
-            v-model="form.updatetime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择更新时间">
-          </el-date-picker>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+    <add-sys-push-dialog v-if="addSysPushDialogVisible" ref="addSysPushDialog" />
  </div>
 </template>

 <script>
-import { listSysPush, getSysPush, delSysPush, addSysPush, updateSysPush } from "@/api/cai/sysPush";
+import { delSysPush, listSysPush } from '@/api/cai/sysPush'
+import {
+  systemPushGroupIdList,
+  systemPushLogStatus,
+  systemPushSendTimeTypeList,
+  systemPushStatusList,
+  systemPushTypeList
+} from '@/constant/statusMap'
+import AddSysPushDialog from '@/views/cai/sysPush/add-sys-push-dialog.vue'

 export default {
  name: "SysPush",
+  components: {
+    AddSysPushDialog
+  },
  data() {
    return {
+      systemPushGroupIdList,systemPushLogStatus,systemPushSendTimeTypeList,systemPushStatusList,systemPushTypeList,
+      addSysPushDialogVisible: false,
      // 按钮loading
      buttonLoading: false,
      // 遮罩层
@@ -263,78 +140,18 @@ export default {
      total: 0,
      // 推送系统消息表格数据
      sysPushList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
      // 查询参数
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        groupId: undefined,
        type: undefined,
-        userId: undefined,
        title: undefined,
        content: undefined,
        params: undefined,
        sendTimeType: undefined,
-        sendTime: undefined,
-        num: undefined,
        status: undefined,
-        endtime: undefined,
-        createtime: undefined,
-        updatetime: undefined
      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ],
-        groupId: [
-          { required: true, message: "群体类型: 0=单个用户,1=全部用户,2=男用户,3=女用户, 4 =认证女神不能为空", trigger: "blur" }
-        ],
-        type: [
-          { required: true, message: "消息类型:0=纯文字消息,1=文本消息,2=单图文消息,3=多图文消息不能为空", trigger: "change" }
-        ],
-        userId: [
-          { required: true, message: "用户id,仅在group_id=单个用户时生效不能为空", trigger: "blur" }
-        ],
-        title: [
-          { required: true, message: "标题不能为空", trigger: "blur" }
-        ],
-        content: [
-          { required: true, message: "内容不能为空", trigger: "blur" }
-        ],
-        params: [
-          { required: true, message: "前端参数不能为空", trigger: "blur" }
-        ],
-        remark: [
-          { required: true, message: "备注说明不能为空", trigger: "blur" }
-        ],
-        sendTimeType: [
-          { required: true, message: "发送类型:0=手动发送,1=定时发送不能为空", trigger: "change" }
-        ],
-        sendTime: [
-          { required: true, message: "发送时间不能为空", trigger: "blur" }
-        ],
-        num: [
-          { required: true, message: "已推送人数不能为空", trigger: "blur" }
-        ],
-        status: [
-          { required: true, message: "状态:0=未执行,1=执行中,2队列执行中,3=已完成不能为空", trigger: "change" }
-        ],
-        endtime: [
-          { required: true, message: "完成时间不能为空", trigger: "blur" }
-        ],
-        createtime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" }
-        ],
-        updatetime: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ]
-      }
    };
  },
  created() {
@@ -350,32 +167,6 @@ export default {
        this.loading = false;
      });
    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        groupId: undefined,
-        type: undefined,
-        userId: undefined,
-        title: undefined,
-        content: undefined,
-        params: undefined,
-        remark: undefined,
-        sendTimeType: undefined,
-        sendTime: undefined,
-        num: undefined,
-        status: undefined,
-        endtime: undefined,
-        createtime: undefined,
-        updatetime: undefined
-      };
-      this.resetForm("form");
-    },
    /** 搜索按钮操作 */
    handleQuery() {
      this.queryParams.pageNum = 1;
@@ -394,46 +185,10 @@ export default {
    },
    /** 新增按钮操作 */
    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加推送系统消息";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true;
-      this.reset();
-      const id = row.id || this.ids
-      getSysPush(id).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改推送系统消息";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true;
-          if (this.form.id != null) {
-            updateSysPush(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-            addSysPush(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          }
-        }
-      });
+      this.addSysPushDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.addSysPushDialog.init()
+      })
    },
    /** 删除按钮操作 */
    handleDelete(row) {
@@ -450,12 +205,6 @@ export default {
        this.loading = false;
      });
    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('cai/sysPush/export', {
-        ...this.queryParams
-      }, `sysPush_${new Date().getTime()}.xlsx`)
-    }
  }
 };
 </script>
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,8 @@ module.exports = {
    proxy: {
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
+        // target: `http://localhost:8080`,
+        target: `http://124.222.254.188:9779/prod-api`,
        changeOrigin: true,
        pathRewrite: {
          ['^' + process.env.VUE_APP_BASE_API]: ''