Skip to content

P
pica-admin-IM
提交 5ec5ba6f 编写于 作者: guangjun.yang's avatar guangjun.yang
浏览文件
操作

Merge branch 'dev-phase1-0111' of... 

Merge branch 'dev-phase1-0111' of 192.168.110.53:com.pica.cloud.education.frontend/pica-admin-IM into dev-phase1-0111

* 'dev-phase1-0111' of 192.168.110.53:com.pica.cloud.education.frontend/pica-admin-IM:
  群发消息接口联调
上级 34efae87 03ef70dc
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 465 行增加 和 116 行删除
package-lock.json
浏览文件 @ 5ec5ba6f
...@@ -1576,6 +1576,16 @@ ...@@ -1576,6 +1576,16 @@
"integrity": "sha1-hQeHN5E7iA9uyf/ntl6D7Hd2KE8=", "integrity": "sha1-hQeHN5E7iA9uyf/ntl6D7Hd2KE8=",
"dev": true "dev": true
}, },
"clipboard": {
"version": "2.0.6",
"resolved": "http://192.168.110.93:4873/clipboard/-/clipboard-2.0.6.tgz",
"integrity": "sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==",
"requires": {
"good-listener": "^1.2.2",
"select": "^1.1.2",
"tiny-emitter": "^2.0.0"
}
},
"cliui": { "cliui": {
"version": "5.0.0", "version": "5.0.0",
"resolved": "http://192.168.110.93:4873/cliui/-/cliui-5.0.0.tgz", "resolved": "http://192.168.110.93:4873/cliui/-/cliui-5.0.0.tgz",
...@@ -2125,6 +2135,11 @@ ...@@ -2125,6 +2135,11 @@
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
"dev": true "dev": true
}, },
"delegate": {
"version": "3.2.0",
"resolved": "http://192.168.110.93:4873/delegate/-/delegate-3.2.0.tgz",
"integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
},
"delegates": { "delegates": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "http://192.168.110.93:4873/delegates/-/delegates-1.0.0.tgz", "resolved": "http://192.168.110.93:4873/delegates/-/delegates-1.0.0.tgz",
...@@ -3434,6 +3449,14 @@ ...@@ -3434,6 +3449,14 @@
"minimatch": "~3.0.2" "minimatch": "~3.0.2"
} }
}, },
"good-listener": {
"version": "1.2.2",
"resolved": "http://192.168.110.93:4873/good-listener/-/good-listener-1.2.2.tgz",
"integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=",
"requires": {
"delegate": "^3.1.2"
}
},
"graceful-fs": { "graceful-fs": {
"version": "4.2.4", "version": "4.2.4",
"resolved": "http://192.168.110.93:4873/graceful-fs/-/graceful-fs-4.2.4.tgz", "resolved": "http://192.168.110.93:4873/graceful-fs/-/graceful-fs-4.2.4.tgz",
...@@ -7257,6 +7280,11 @@ ...@@ -7257,6 +7280,11 @@
} }
} }
}, },
"select": {
"version": "1.1.2",
"resolved": "http://192.168.110.93:4873/select/-/select-1.1.2.tgz",
"integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
},
"semver": { "semver": {
"version": "5.7.1", "version": "5.7.1",
"resolved": "http://192.168.110.93:4873/semver/-/semver-5.7.1.tgz", "resolved": "http://192.168.110.93:4873/semver/-/semver-5.7.1.tgz",
...@@ -8037,6 +8065,11 @@ ...@@ -8037,6 +8065,11 @@
"setimmediate": "^1.0.4" "setimmediate": "^1.0.4"
} }
}, },
"tiny-emitter": {
"version": "2.1.0",
"resolved": "http://192.168.110.93:4873/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
"integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
},
"to-arraybuffer": { "to-arraybuffer": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "http://192.168.110.93:4873/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", "resolved": "http://192.168.110.93:4873/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
...@@ -8417,6 +8450,24 @@ ...@@ -8417,6 +8450,24 @@
"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
"dev": true "dev": true
}, },
"v-viewer": {
"version": "1.5.1",
"resolved": "http://192.168.110.93:4873/v-viewer/-/v-viewer-1.5.1.tgz",
"integrity": "sha512-Q5ICKzmYQD0qTf+hti2Lhgy6UYY2zgFr+YrN9a3yPgr7pOjYrG405Pz4+6Z6FXlhdhGysCWFJUNCI2tsIyvjWQ==",
"dev": true,
"requires": {
"throttle-debounce": "^2.0.1",
"viewerjs": "^1.5.0"
},
"dependencies": {
"throttle-debounce": {
"version": "2.3.0",
"resolved": "http://192.168.110.93:4873/throttle-debounce/-/throttle-debounce-2.3.0.tgz",
"integrity": "sha1-/TGGXmZQIHHkEYF+JBRls+nDcuI=",
"dev": true
}
}
},
"validate-npm-package-license": { "validate-npm-package-license": {
"version": "3.0.4", "version": "3.0.4",
"resolved": "http://192.168.110.93:4873/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", "resolved": "http://192.168.110.93:4873/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
...@@ -8458,6 +8509,12 @@ ...@@ -8458,6 +8509,12 @@
} }
} }
}, },
"viewerjs": {
"version": "1.9.0",
"resolved": "http://192.168.110.93:4873/viewerjs/-/viewerjs-1.9.0.tgz",
"integrity": "sha1-bfr1REDDsvdpG4Vma6bSdwjtlZI=",
"dev": true
},
"vm-browserify": { "vm-browserify": {
"version": "0.0.4", "version": "0.0.4",
"resolved": "http://192.168.110.93:4873/vm-browserify/-/vm-browserify-0.0.4.tgz", "resolved": "http://192.168.110.93:4873/vm-browserify/-/vm-browserify-0.0.4.tgz",
......
src/views/IM/chain-history/detail.vue
浏览文件 @ 5ec5ba6f
<template>
<div class="chain-history-detail">
<bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb>
<div class="component-content screenSet" id="screenSet">
<div>群发标题：{{detailData.title}}</div>
<div>目标用户：{{detailData.title}}</div>
<div v-for="(item, index) in contentList" :key="index">
<div v-if="item.type == 1" class="text-content">
<div>{{item.content}}</div>
</div>
<div v-if="item.type == 2" class="file-content">
<div v-if="item.fileType == 1">
</div>
<div v-if="item.fileType == 2">
<img :src="item.content" />
</div>
</div>
<div v-if="item.type == 3" class="link-content">
<div class="link-text">{{item.content}}</div>
</div>
</div>
</div>
</div>
</template>
<script>
import BreadCrumb from "@/components/breadcrumb.vue";
import { doUpload, getFilePath } from "@/utils/qiniu-util";
import { validateWord } from "@/utils/validate.js";
import { openLoading, closeLoading } from "@/utils/utils";
import * as commonUtil from "@/utils/utils";
export default {
components: {
BreadCrumb
},
data() {
return {
curmbFirst: "历史群发",
curmbSecond: "任务详情",
detailData: {
title: ''
},
contentList: [{
type: 1,
content: '这个是内容区'
},{
type: 2,
fileType: 1,
content: '这是个文件'
},{
type: 2,
fileType: 2,
content: ''
},{
type: 3,
content: '这是个链接'
}],
};
},
created() {
this.search();
},
// 挂载到Dom完成时
mounted: function() {
commonUtil.resizeHeight();
},
methods: {
// 列表查询
search() {
this.getData();
},
// 获取数据
getData() {
let subject = 0,
status = 0,
name = 0;
this.loading = true;
let cStatus = this.categoryStatus ? this.categoryStatus : "0"; //'0'表示默认查所有的
let url =
"/interaction/discuss/" +
cStatus +
"/" +
subject +
"/" +
name +
"/" +
status +
"/" +
this.searchParam.pageNo +
"/" +
this.searchParam.pageSize;
this.GET(url).then(res => {
this.loading = false;
if (res.code == "000000") {
console.log(res.data);
this.tableData = res.data.resp.discuss || [];
this.nextSessionId = this.tableData[0] && this.tableData[0].id;
console.log("this.nextSessionId", this.nextSessionId);
if (res.data.typeList && res.data.typeList.length) {
let arr = [];
for (let i = 0; i < res.data.typeList.length; i++) {
let obj = {};
obj.label = res.data.typeList[i];
obj.value = res.data.typeList[i];
arr.push(obj);
}
this.category = arr;
}
}
});
},
// 查看消息详情
edit() {
this.$router.push({
path: `/chain-history-detail`,
query: {}
});
},
}
};
</script>
<style lang="scss" scoped>
.chain-history-detail {
.component-content {
padding: 10px;
background: #fff;
// margin: 84px 20px 20px;
.search-title {
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
padding: 10px 12px;
font-size: 12px;
margin-bottom: 20px;
border-bottom: 1px solid #efefef;
.num {
color: #449284;
}
}
}
}
</style>
\ No newline at end of file
src/views/IM/chain-history/list.vue
浏览文件 @ 5ec5ba6f
...@@ -5,20 +5,24 @@ ...@@ -5,20 +5,24 @@
<el-row :gutter="30" class="row" type="flex" style="margin-top: 10px;margin-right:0px;"> <el-row :gutter="30" class="row" type="flex" style="margin-top: 10px;margin-right:0px;">
<el-form ref="serchForm" inline :model="searchParam" label-width="15px" style="width:100%;text-align:right;"> <el-form ref="serchForm" inline :model="searchParam" label-width="15px" style="width:100%;text-align:right;">
<el-form-item label=""> <el-form-item label="">
<el-input clearable v-model="searchParam.name" size="mini" placeholder="请输入任务编号" ><el-button slot="append" icon="el-icon-search" @click="search()"></el-button></el-input> <el-input clearable v-model="searchParam.messageLogId" size="mini" placeholder="请输入任务编号" ><el-button slot="append" icon="el-icon-search" @click="search()"></el-button></el-input>
</el-form-item> </el-form-item>
<el-form-item label="" style="position:relative;top:-8px;left:0;margin-bottom: 0px;"> <el-form-item label="" style="position:relative;top:-8px;left:0;margin-bottom: 0px;">
<el-date-picker v-model="searchParam.name" size="mini" type="date" placeholder="请选择日期"></el-date-picker> <el-date-picker v-model="searchParam.chooseDate" size="mini" type="date" placeholder="请选择日期"></el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-row> </el-row>
<el-table :data="tableData" style="width: 100%" v-loading="loading"> <el-table :data="tableData" style="width: 100%" v-loading="loading">
<el-table-column prop="id" label="任务ID" min-width="50" align="center"></el-table-column> <el-table-column prop="id" label="任务ID" min-width="50" align="center"></el-table-column>
<el-table-column prop="subject" label="任务名" min-width="100" align="center"></el-table-column> <el-table-column prop="subject" label="任务名" min-width="100" align="center"></el-table-column>
<el-table-column prop="category" label="群发人数" min-width="50" align="center"></el-table-column> <el-table-column prop="totalNumber" label="群发人数" min-width="50" align="center"></el-table-column>
<el-table-column prop="remark" label="发送日期" min-width="100" align="center"></el-table-column> <el-table-column prop="createdTime" label="发送日期" min-width="100" align="center"></el-table-column>
<el-table-column prop="createdusername" label="发送者" min-width="50" align="center"></el-table-column> <el-table-column prop="createdName" label="发送者" min-width="50" align="center"></el-table-column>
<el-table-column prop="createdusername" label="发送状态" min-width="50" align="center"></el-table-column> <el-table-column label="发送状态" min-width="50" align="center">
<template slot-scope="scope">
<span>{{scope.row.status | statusFilter}}</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" min-width="100"> <el-table-column label="操作" fixed="right" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="edit(scope.row)">查看</el-button> <el-button type="text" size="small" @click="edit(scope.row)">查看</el-button>
...@@ -31,6 +35,19 @@ ...@@ -31,6 +35,19 @@
</div> </div>
</div> </div>
</el-table> </el-table>
<!-- 分页 -->
<div class="pagination">
<el-pagination
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="searchParam.pageNo"
:page-sizes="[15, 30, 50, 100, 200, 500, 700, 1000, 1500, 2000]"
:page-size="searchParam.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="totalRows">
</el-pagination>
</div>
</div> </div>
</div> </div>
</template> </template>
...@@ -50,30 +67,27 @@ export default { ...@@ -50,30 +67,27 @@ export default {
curmbFirst: "云鹊客服", curmbFirst: "云鹊客服",
curmbSecond: "消息查询", curmbSecond: "消息查询",
searchParam: { searchParam: {
theme: "", chooseDate: '',
type: "", messageLogId: '',
name: "", token: '',
status: "",
pageNo: 1, pageNo: 1,
pageSize: 15 pageSize: 15
}, },
category: [], tableData: [],
categoryStatus: "", totalRows: 0,
tableData: [{}],
loading: false, loading: false,
nextSessionId: ""
}; };
}, },
computed: {}, computed: {},
filters: { filters: {
filteFun(index) { statusFilter(index) {
let str = ""; let str = "";
if (index == 1) { if (index == 1) {
str = "未发布"; str = "发送中";
} else if (index == 2) { } else if (index == 2) {
str = "已发布"; str = "发送成功";
} else if (index == 3) { } else if (index == 3) {
str = "已下线"; str = "发送失败";
} }
return str; return str;
} }
...@@ -91,48 +105,20 @@ export default { ...@@ -91,48 +105,20 @@ export default {
methods: { methods: {
// 列表查询 // 列表查询
search() { search() {
//this.getData(); this.getData();
}, },
// 获取数据 // 获取数据
getData() { getData() {
let subject = 0,
status = 0,
name = 0;
this.loading = true; this.loading = true;
let cStatus = this.categoryStatus ? this.categoryStatus : "0"; //'0'表示默认查所有的 let url = `/im/group/list`
let url = let params = this.searchParam;
"/interaction/discuss/" + this.GET(url, {params}).then(res => {
cStatus +
"/" +
subject +
"/" +
name +
"/" +
status +
"/" +
this.searchParam.pageNo +
"/" +
this.searchParam.pageSize;
this.GET(url).then(res => {
this.loading = false; this.loading = false;
if (res.code == "000000") { if (res.code == "000000") {
console.log(res.data); console.log(res.data);
this.tableData = res.data.resp.discuss || []; this.tableData = res.data.list;
this.nextSessionId = this.tableData[0] && this.tableData[0].id; this.totalRows = res.data.total;
console.log("this.nextSessionId", this.nextSessionId);
if (res.data.typeList && res.data.typeList.length) {
let arr = [];
for (let i = 0; i < res.data.typeList.length; i++) {
let obj = {};
obj.label = res.data.typeList[i];
obj.value = res.data.typeList[i];
arr.push(obj);
}
this.category = arr;
}
} }
}); });
}, },
...@@ -144,6 +130,14 @@ export default { ...@@ -144,6 +130,14 @@ export default {
query: {} query: {}
}); });
}, },
handleSizeChange(value) {
this.searchParam.pageSize = value;
this.handleGoSearch();
},
handleCurrentChange(value) {
this.searchParam.pageNo = value;
this.handleGoSearch();
}
} }
}; };
</script> </script>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或