init

src/views/cai/sysPush/add-sys-push-dialog.vue

@@ -320,7 +320,33 @@ export default {
       this.form.id = id || undefined
       this.open = true
       this.$nextTick(() => {
-        this.$refs['form'].resetFields()
+        // this.$refs['form'].resetFields()
+        this.form = {
+          id: undefined,
+          groupId: 0,
+          usercode: undefined,
+
+          onlyText: undefined,
+
+          textText1: undefined,
+          textText2: undefined,
+          textLinkType: 0,
+          textLinkUrl: undefined,
+
+          oneImageTitleType:2,
+          oneImageImage:undefined,
+          oneImageText:undefined,
+          oneImageLinkType: 0,
+          oneImageLinkUrl: undefined,
+
+          onlyImage:undefined,
+
+          sendTimeType: 0,
+          sendTime: undefined,
+          title: undefined,
+          type: 0,
+          remark: undefined
+        }
         this.userInfo = {}
         this.textContext = []
         this.imageContext = []

src/views/cai/sysPushLog/index.vue

@@ -38,6 +38,36 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+
+    <el-dialog title="推送名单" :close-on-click-modal="false" :visible.sync="showUserOpen" width="700px" append-to-body>
+      <el-form :model="userForm" ref="userForm" size="small" :inline="true" label-width="68px">
+        <el-form-item :label="systemName+'号'" prop="name">
+          <el-input
+              v-model="userForm.name"
+              :placeholder="'请输入'+systemName+'号'"
+              clearable
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleUserQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetUserQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <div class="people_list" >
+        <div class="people_list-item" v-for="value in userList">
+<!--          <el-tag
+              class="people_list-item_name"
+              :key="value.usercode"
+              type="info"
+              effect="plain">
+            {{ value.usercode }}
+          </el-tag>-->
+          <el-tooltip class="item" effect="dark" :content="value.nickname+'('+value.usercode+')'" placement="top-start">
+            <div class="people_list-item_name">{{value.nickname}}({{ value.usercode }})</div>
+          </el-tooltip>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -56,6 +86,7 @@ export default {
   data() {
     return {
       systemPushGroupIdList,systemPushLogStatus,systemPushSendTimeTypeList,systemPushStatusList,systemPushTypeList,
+      systemName: process.env.VUE_APP_SYSTEM_HOME,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -77,6 +108,12 @@ export default {
         sysPushId: undefined,
         status: undefined,
       },
+      sourceUserList:[],
+      userList: [],
+      showUserOpen: false,
+      userForm:{
+        name: undefined
+      }
     };
   },
   created() {
@@ -93,7 +130,9 @@ export default {
       });
     },
     handleShowUser(row){
-
+      this.userList = JSON.parse(row.userJson);
+      this.sourceUserList = JSON.parse(row.userJson);
+      this.showUserOpen = true
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -105,6 +144,24 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    handleUserQuery(){
+      let name = this.userForm.name
+      console.log(name)
+      if(name){
+        let list = []
+        this.sourceUserList.forEach(value => {
+          console.log(value)
+          if(value.usercode == name){
+            list.push(value)
+          }
+        })
+        this.userList = list
+      }
+    },
+    resetUserQuery(){
+      this.userForm.name = undefined
+      this.userList = this.sourceUserList
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
@@ -114,3 +171,30 @@ export default {
   }
 };
 </script>
+
+<style lang="scss" scoped>
+.people_list {
+  width: 100%;
+  border: 1px solid #ccc;
+  overflow: auto;
+  padding: 5px;
+  height: 600px;
+}
+.people_list-item {
+  width: 16.5%;
+  height: 22px;
+  padding: 2px 4px;
+  box-sizing: border-box;
+  float: left;
+  margin-bottom: 5px;
+}
+.people_list-item_name {
+  box-sizing: border-box;
+  border-radius: 2px;
+  border: 1px solid #ccc;
+  padding: 0 2px;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  white-space: nowrap;
+}
+</style>

vue.config.js

@@ -35,8 +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`,
+        target: `http://124.222.254.188:9779/prod-api`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''