Merge branch 'dev' into vite

# Conflicts:
#	examples/main.js
#	examples/router/autoRoutes.js
#	package.json
#	packages/bigscreen/designer/AppDesigner.vue
#	packages/bigscreen/designer/components/Add.vue
#	packages/bigscreen/designer/components/Layout.vue
#	packages/bigscreen/designer/components/List.vue
#	packages/bigscreen/designer/components/SourceData.vue
#	packages/bigscreen/designer/components/form/DataConfig.vue
#	packages/bigscreen/designer/config.js
#	packages/bigscreen/viewer/AppGigscreenViewer.vue
#	packages/conv/creditScore/scoreManage/scoreChange.vue
#	packages/index.js
#	project/dv/apps/AppGridDV.vue
#	project/dvui/components/AiMonitor/dhVideo.vue
#	project/dvui/components/AiSwiper.vue
#	project/dvui/layout/AiDvBackground.vue
#	project/dvui/layout/AiDvSummary/AiDvSummary.vue
#	project/dvui/layout/AiDvWrapper/AiDvWrapper.vue
#	project/dvui/package.json
#	public/index.html
#	vue.config.js
This commit is contained in:
aixianling
2022-07-07 09:01:40 +08:00
208 changed files with 14871 additions and 8799 deletions

View File

@@ -0,0 +1,50 @@
<template>
<section class="AppMassNotification">
<keep-alive :include="['List']">
<component ref="component" :is="currentPage" :instance="instance" :params="params" :dict="dict" @change="onChange"/>
</keep-alive>
</section>
</template>
<script>
import List from "./components/List.vue";
import Add from "./components/Add.vue";
export default {
name: "AppMassNotification",
label: "群发通知",
props: {
instance: Function,
dict: Object,
},
components: {Add, List},
data() {
return {
component: "List",
params: {},
include: [],
}
},
computed: {
currentPage() {
const {hash} = this.$route
return hash == "#add" ? Add : List
},
},
methods: {
onChange(data) {
if (data.type === "Add") {
this.$router.push({hash: "#add", query: data.params})
} else {
this.$router.push({})
}
},
},
}
</script>
<style lang="scss" scoped>
.AppMassNotification {
height: 100%;
}
</style>

View File

@@ -0,0 +1,413 @@
<template>
<section class="Add">
<ai-detail v-if="!$route.query.id">
<template slot="title">
<ai-title title="群发通知" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
</template>
<template slot="content">
<ai-card>
<template #title>
<div class="ai-card__title">
<h2>发送条件</h2>
</div>
</template>
<template #content>
<el-form size="small" class="ai-form" :rules="rules" ref="form" :model="form" label-width="100px" label-position="right">
<el-form-item label="发送方式" prop="messageSource" style="width: 50%">
<el-radio-group v-model="form.messageSource" @change="sourceChange" >
<el-radio label="2">居民群</el-radio>
<el-radio label="1">居民</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="地区选择" style="width: 100%">
<ai-area-get v-model="areaId" :root="areaRootId" :instance="instance" @select="handleAreaSelect" multiple size="small" placeholder="请选择"/>
</el-form-item>
<el-form-item label="发送范围" prop="deptList" style="width: 100%">
<select-dept-user v-model="form.deptList" v-bind="$props" :source="form.messageSource"/>
</el-form-item>
</el-form>
</template>
</ai-card>
<ai-card title="群发消息设置">
<template #content>
<el-form class="ai-form" ref="form" :rules="rules" :model="form" label-width="110px" label-position="right">
<el-form-item class="el-form-item__textarea" label="群发内容" prop="content" style="width: 100%">
<el-input type="textarea" placeholder="请输入…" v-model="form.content" maxlength="1000" :rows="5" show-word-limit></el-input>
</el-form-item>
<!-- 图片 -->
<el-form-item label="图片" style="width: 100%">
<ai-uploader :instance="instance" isWechat v-model="imgList" multiple acceptType=".jpg,.png,.jpeg" :limit="9"
url="/app/wxcp/upload/uploadFile?type=image"></ai-uploader>
</el-form-item>
<!-- 视频 -->
<el-form-item label="视频" style="width: 100%">
<ai-uploader :instance="instance" fileType="file" isWechat multiple acceptType=".mp4" v-model="videoList" :limit="9"
url="/app/wxcp/upload/uploadFile?type=video"></ai-uploader>
</el-form-item>
<!-- 附件 -->
<el-form-item label="附件" style="width: 100%">
<ai-uploader :instance="instance" fileType="file" isWechat multiple v-model="filesList" :limit="9"
url="/app/wxcp/upload/uploadFile?type=file"></ai-uploader>
</el-form-item>
</el-form>
</template>
</ai-card>
</template>
<template #footer>
<el-button @click="cancel">取消</el-button>
<el-button type="primary" @click="confirm">确认发送</el-button>
</template>
</ai-detail>
<ai-detail class="add" v-if="$route.query.id">
<template slot="title">
<ai-title title="群发通知详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
</template>
<template slot="content">
<ai-card title="详情">
<template #content>
<ai-wrapper>
<ai-info-item label="创建者" :value="data.userName" isLine></ai-info-item>
<ai-info-item label="发送方式" :value="data.messageSource" isLine>{{ data.messageSource | format }}</ai-info-item>
</ai-wrapper>
<ai-wrapper v-for="item in data.fileList" :key="item.id">
<ai-info-item label="群发内容" :value="item.content" isLine v-if="item.contentType == 'text'"></ai-info-item>
</ai-wrapper>
<ai-wrapper>
<ai-info-item label="图片" isLine v-show="images.length">
<ai-uploader v-model="images" :instance="instance" :limit="9" disabled/>
</ai-info-item>
</ai-wrapper>
<ai-wrapper>
<ai-info-item label="视频" isLine v-show="videoArr.length" v-for="(item,index) in videoArr" :key="index">
<video :src="item.accessUrl" style="width: 100%; height:100%; object-fit: fill;" muted controls="controls"></video>
</ai-info-item>
</ai-wrapper>
<ai-wrapper>
<ai-info-item label="附件" isLine v-show="fileDownLoad.length">
<ai-file-list :fileList="fileDownLoad"></ai-file-list>
</ai-info-item>
</ai-wrapper>
</template>
</ai-card>
</template>
</ai-detail>
</section>
</template>
<script>
import {mapState} from "vuex";
import SelectDeptUser from "./SelectDeptUser";
export default {
name: 'Add',
components: {SelectDeptUser},
props: {
instance: Function,
dict: Object
},
data() {
return {
isShow: false,
data: {},
form: {
areaId: '',
tag: '',
messageSource: '2',
sendTime: '',
content: '',
contentType: 'text',
fileList: [],
organization: '',
deptList: [],
},
tags: [],
subTags: {},
areaId: [],
areaName: [],
imgList: [],
videoList: [],
filesList: [],
fileDownLoad: [],
areaRootId: '',
users: [],
images: [],
imgs: [],
videos: [],
videoArr: [],
files: [],
flag: false,
rules: {
deptList: [{required: true, message: '请选择发送范围'}],
content: [{required: true, message: '请输入群发内容'}],
messageSource: [{required: true, message: '请选择群发方式'}],
},
}
},
computed: {
...mapState(['user']),
tagsChange() {
if (this.tags?.length) {
return this.form.tag = this.tags.toString();
}
},
areaid() {
return this.form.areaId = this.areaId.toString();
},
},
created() {
if (this.$route.query.id) {
this.getInfo()
}
this.areaRootId = [this.user.info.areaId.substr(0, 6), '000000'].join("")
},
filters: {
format(val) {
if(val == 1) {
return '居民'
} else if(val == 2) {
return '居民群'
}
}
},
methods: {
handleAreaSelect(v) {
this.areaName = v?.[0]?.label
},
sourceChange(val) {
this.form.messageSource = val
this.form.deptList = []
},
getInfo() {
this.instance.post(`/app/pushmessage/detail?id=${this.$route.query.id}`).then(res => {
if (res?.data) {
this.data = res.data
this.images = res.data.fileList.filter(e => e.contentType == "image")?.map(i => {
return {
url: i.accessUrl
}
})
this.fileDownLoad = res.data.fileList.filter(e => e.contentType == "file")?.map(v => {
return {
url: v.accessUrl
}
})
if (res.data.fileList.filter(e => e.contentType == "video")) {
this.videoArr = res.data.fileList.filter(e => e.contentType == "video")
}
}
})
},
confirm() {
if(this.flag) return
if(!this.form.deptList.length) {
return this.$message.error('请选择发送范围')
}
this.$refs.form.validate((valid) => {
if (valid) {
this.flag = true
this.form.fileList = []
let contentList = [{
content: this.form.content,
contentType: 'text'
}]
if (this.imgList.length) {
this.imgs = this.imgList.map(item => {
return {
contentType: 'image',
mediaId: item.media.mediaId,
accessUrl: item.url,
}
})
}
if (this.videoList.length) {
this.videos = this.videoList.map(item => {
return {
contentType: 'video',
mediaId: item.media.mediaId,
accessUrl: item.url,
}
})
}
if (this.filesList.length) {
this.files = this.filesList.map(item => {
return {
contentType: 'file',
mediaId: item.media.mediaId,
accessUrl: item.url,
}
})
}
this.form.fileList = [...contentList, ...this.imgs, ...this.videos, ...this.files]
this.instance.post(`/app/pushmessage/addOrUpdate`, {
...this.form
}).then(res => {
if (res.code == 0) {
this.$message.success('提交成功')
setTimeout(() => {
this.cancel(true)
}, 600)
} else {
this.flag = false
}
}).catch(() => {
this.flex = false
})
}
})
},
cancel(isRefresh) {
this.$emit('change', {
type: 'List',
isRefresh: !!isRefresh
})
}
}
}
</script>
<style scoped lang="scss">
.Add {
height: 100%;
}
.ai-card__title {
display: flex;
align-items: center;
h2 {
margin-right: 20px;
color: #222222;
font-size: 16px;
font-weight: 700;
}
span {
color: #888888;
font-size: 14px;
}
}
.appletss {
display: flex;
flex-wrap: wrap;
.applets-item {
display: flex;
align-items: center;
width: 400px;
height: 60px;
margin-right: 8px;
margin-bottom: 8px;
padding: 0 17px;
background: #FFFFFF;
border-radius: 2px;
border: 1px solid #D0D4DC;
cursor: pointer;
&:hover {
border-color: #2266FF;
}
::v-deep {
.el-radio__label {
display: none;
}
}
img {
width: 40px;
height: 40px;
margin: 0 8px 0 13px;
}
span {
color: #222222;
font-size: 12px;
}
.el-radio {
margin: 0;
}
&.applets-active {
border-color: #2266FF;
}
}
}
.tips {
position: relative;
top: 2px;
padding-left: 8px;
color: #222222;
font-size: 14px;
}
.el-form-item-item__textarea {
position: relative;
}
.el-form-item__btn {
position: absolute;
bottom: 12px;
left: 12px;
line-height: 1;
z-index: 1;
color: #2266FF;
font-size: 14px;
user-select: none;
background: #fff;
cursor: pointer;
}
.tags {
// padding: 10px;
.tag_title {
font-weight: 600;
}
.tag_item {
margin: 5px 0;
span {
display: inline-block;
// padding: 5px 10px;
width: 80px;
text-align: center;
height: 30px;
line-height: 30px;
background: #DDD;
color: #333;
border-radius: 4px;
margin-right: 8px;
}
.active {
background: #53bcea;
color: #FFFFFF;
}
}
}
</style>

View File

@@ -0,0 +1,210 @@
<template>
<ai-list class="List">
<template #title>
<ai-title title="群发通知" isShowBottomBorder></ai-title>
</template>
<template #content>
<ai-search-bar>
<template #left>
<el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
</template>
</ai-search-bar>
<ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
@getList="getTableData" show-overflow-tooltip :col-configs="colConfigs" :dict="dict">
<!-- <el-table-column slot="type" width="240px" label="消息内容" align="center">
<template slot-scope="{ row }">
<el-popover
placement="bottom"
width="400"
:visible-arrow="false"
popper-class="wechat-message__container"
trigger="hover">
<div class="count row-content" slot="reference" v-if="row.content">{{ row.content }}</div>
<div class="message-info">
<h2 :style="{marginBottom: row.accessUrl ? '16px' : '0'}">{{ row.content }}</h2>
<div class="message-info__wrapper" v-if="row.accessUrl">
<img v-if="row.contentType == 'image'" :src="row.accessUrl">
<video style="width:40px; height: 40px;" v-if="row.contentType == 'video'" :src="row.accessUrl"></video>
<img src="../../../../examples/assets/file.png" v-if="row.contentType == 'file'" width="40" height="40"/>
<div class="message-info__wrapper--right">
<h3 v-if="row.contentType === 'image'">{{ row.media.file.name }}</h3>
<h3 v-if="row.contentType === 'video'">{{ row.media.file.name }}</h3>
<p v-if="row.contentType === 'image'">{{ row.media.file.fileSizeStr }}</p>
<p v-if="row.contentType === 'video'">{{ row.media.file.fileSizeStr }}</p>
</div>
</div>
</div>
</el-popover>
</template>
</el-table-column> -->
<el-table-column slot="options" label="操作" align="center">
<template slot-scope="{ row }">
<el-button type="text" @click="toAdd(row.id)">详情</el-button>
<!-- <el-button type="text" @click="handleDelete(row.id)">删除</el-button> -->
</template>
</el-table-column>
</ai-table>
</template>
</ai-list>
</template>
<script>
import {mapState} from 'vuex'
export default {
name: "List",
props: {
dict: Object,
instance: Function,
params: Object,
},
data() {
return {
tableData: [],
page: {current: 1, size: 10, total: 0, pages: 0},
id: '',
}
},
created() {
this.getTableData()
},
computed: {
colConfigs() {
let conType = {
text: "文本",
image: "图片",
video: "视频",
file: "附件"
}
return [
// { prop: "fileList", label: '消息类型', align: "center", width: "250px", formart: v => v?.map(e=> conType[e.contentType]).toString() },
{ prop: "fileList", label: '消息内容', align: "center", width: "250px", formart: v => v?.filter(e=> e.contentType == 'text')[0].content },
// { prop: "fileList", label: '消息内容', align: "center", width: "250px", formart: v => v?.filter(e => e.contentType == 'text')[0].content},
// { slot: 'type' },
{ prop: "messageSource", label: '消息类型', align: "center", formart: v => v==1? '居民': '居民群'},
{ prop: "createTime", label: '创建时间', align: "center", width: "250px"},
{ prop: "userName", label: '创建人', align: "center", width: "250px", },
{ slot: "options" ,},
]
},
...mapState(['user'])
},
methods: {
getTableData() {
this.instance.post(`/app/pushmessage/list?`, null, {
params: {
...this.page,
}
}).then(res => {
if (res?.data) {
this.tableData = res.data.records
this.page.total = res.data.total
}
})
},
mapType(type) {
return {
'image': '图片',
'video': '视频',
'file': '文件',
'text': '文本'
}[type]
},
toAdd(id) {
this.$emit('change', {
type: 'Add',
params: {
id: id || '',
},
})
}
},
}
</script>
<style lang="scss" scoped>
.List {
height: 100%;
background: #f3f4f5;
.count {
cursor: pointer;
color: #2266FF;
font-size: 14px;
&:hover {
opacity: 0.6;
}
}
}
img, video {
width: 40px;
height: 40px;
margin-right: 10px;
object-fit: cover;
}
.message-info {
padding: 8px;
min-height: 116px;
h2 {
color: #222222;
font-weight: 500;
font-size: 14px;
}
.message-info__wrapper {
display: flex;
align-items: center;
width: 368px;
height: 60px;
padding: 10px;
background: #FFFFFF;
border-radius: 2px;
border: 1px solid #D0D4DC;
.message-info__wrapper--right {
flex: 1;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
h3 {
width: 100%;
color: #222222;
font-size: 14px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-weight: normal;
}
img, video {
width: 40px;
height: 40px;
margin-right: 10px;
object-fit: cover;
}
p {
margin-top: 6px;
font-size: 14px;
color: #888888;
}
}
}
.row-content {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
</style>

View File

@@ -0,0 +1,195 @@
<template>
<section class="SelectDeptUser">
<el-input :value="selectText" disabled size="small" @click.native="dialog=true">
<el-button type="text" slot="append">开始选择</el-button>
</el-input>
<ai-dialog :visible.sync="dialog" title="选择部门/人员" width="700px" @onConfirm="handleSubmit" @close="selected=[],getDepts()">
<el-breadcrumb separator="/">
<el-breadcrumb-item v-for="(item, index) in selectDeptPath" :key="index">
<el-button type="text" @click="deptNameClick(item)">{{ item.name }}</el-button>
</el-breadcrumb-item>
</el-breadcrumb>
<div class="optionsItem" v-for="(row, index) in options" :key="index">
<el-row type="flex">
<el-checkbox class="fill" :label="row.uid" v-model="row.checked" @change="handleCheck(row,index)">{{ row.name }}</el-checkbox>
<el-button type="text" v-if="!row.parentid&&row.kind=='dept'" @click="openDialogTag(row)">添加标签</el-button>
<el-button type="text" v-if="row.kind=='dept'" @click="itemClick(row)">更多</el-button>
</el-row>
<el-tag effect="dark" size="small" v-for="tag in row.selectedTags" :key="tag.id" class="mar-4">{{ tag.name }}</el-tag>
</div>
<ai-empty v-if="!options.length"/>
<ai-dialog :visible.sync="dialogTag" title="选择标签" width="500px" @onConfirm="handleSelectTag" @close="selectedTags=[]" append-to-body>
<el-checkbox-group v-model="selectedTags">
<div class="optionsItem" v-for="(cls, index) in tagOps" :key="index">
<ai-title :title="cls.name"/>
<el-checkbox class="fill" v-for="(op, i) in cls.tagList" :key="i" :label="op.id">{{ op.name }}</el-checkbox>
</div>
</el-checkbox-group>
<ai-empty v-if="!tagOps.length"/>
</ai-dialog>
</ai-dialog>
</section>
</template>
<script>
export default {
name: "SelectDeptUser",
model: {
event: "change",
prop: "value"
},
props: {
value: {default: ""},
instance: Function,
dict: Object,
source: {default: 1}
},
computed: {
selectText: v => v.value?.length > 0 ? "已选择" : "请选择",
tagAction: v => v.source == 2 ? '/app/wxcp/wxgroupchattag/listAllByCorp' : '/app/wxcp/wxcorptag/listAllByCorp'
},
data() {
return {
dialog: false,
dialogTag: false,
currentCorp: {},
selected: [],
selectDeptPath: [],
selectedTags: [],
options: [],
tagOps: [],
allData: [],
tags: {}
}
},
methods: {
getDepts() {
this.instance.post('/app/wxcp/wxdepartment/listAllByCorp').then(res => {
if (res?.data) {
let parents = res.data.map(e => e.parentid)
this.allData = res.data.map(e => ({
...e,
hasChildren: parents.includes(e.id),
uid: [e.corpId, e.id].join("_"),
kind: 'dept',
checked: false
}))
this.deptInit()
}
})
},
getTagsByCorp(dvcpCorpId) {
return this.instance.post(this.tagAction, null, {
params: {
dvcpCorpId,
size: 9999
}
}).then(res => {
if (res?.data) {
return this.tagOps = res.data.records || []
}
})
},
deptInit() {
this.options = this.allData.filter(e => !e.parentid)
this.selectDeptPath = [{name: "可选范围", id: ''}]
},
itemClick(row) {
let index = this.selectDeptPath.findIndex(e => e.id == row.id)
if (index == -1) {
this.selectDeptPath.push(row)
this.getDeptsAndUsersByParent(row)
}
},
getDeptsAndUsersByParent(row) {
let {id: departmentId, corpId: cid} = row
this.options = this.allData.filter(e => e.parentid == departmentId && e.corpId == cid) || []
this.instance.post(`/app/wxcp/wxuser/listByDeptId`, null, {
params: {departmentId, status: 1, cid}
}).then(res => {
if (res?.data) {
res.data = res.data.map(e => ({
...e, kind: "user", checked: this.selected.some(s => {
if (e.id == s.id) return true
})
}))
this.options = [this.options, res.data].flat()
}
})
},
deptNameClick(row, index) {
if (!index) { //第一级别
this.deptInit()
} else {
let length = this.selectDeptPath.length - index
this.selectDeptPath.splice(index + 1, length)
this.getDeptsAndUsersByParent(row.id)
}
},
openDialogTag(row) {
this.getTagsByCorp(row.corpId).then(() => {
this.currentCorp = row
this.dialogTag = true
})
},
handleSelectTag() {
let {corpId} = this.currentCorp
this.currentCorp.selectedTags = this.$copy(this.tagOps.map(e => e.tagList).flat().filter(e => this.selectedTags.includes(e.id)))
this.tags[corpId] = this.$copy(this.currentCorp.selectedTags)
this.dialogTag = false
},
handleSubmit() {
let result = {}
this.selected?.map(e => {
let {kind, id} = e
result[e.corpId] = [result[e.corpId], {kind, id}].flat()
})
let selected = Object.keys(result).map(corpId => {
let res
if (result[corpId]) {
res = {
corpId,
objList: result[corpId].filter(e => !!e)
}
if (this.tags[corpId]?.length > 0) {
res.tagId = this.tags[corpId]?.map(e => e.id)
}
}
return res
}).filter(e => !!e)
this.$emit("change", selected)
this.dialog = false
},
isSelected(uid) {
return !!this.selected.find(e => e.uid == uid)
},
handleCheck(row, i) {
if (row.checked) {
this.selected.push(row)
} else {
this.selected.splice(i, 1)
}
this.$forceUpdate()
}
},
created() {
this.getDepts()
}
}
</script>
<style lang="scss" scoped>
.SelectDeptUser {
::v-deep.optionsItem {
border: 1px solid #eee;
margin-bottom: 8px;
padding: 8px;
border-radius: 4px;
.mar-4 {
margin-right: 4px;
margin-bottom: 4px;
}
}
}
</style>

View File

@@ -62,8 +62,8 @@
<el-tooltip class="item" effect="dark" :content="row.content" placement="top">
<div class="table-left__wrapper--text" v-if="row.contentType == 'text'">{{ row.content }}</div>
</el-tooltip>
<div class="ellipsis" v-if="row.contentType !== 'text'">{{ row.file.name }}</div>
<div v-if="row.contentType !== 'text'">{{ row.file.size | size }}KB</div>
<div class="ellipsis" v-if="row.contentType !== 'text' && row.file && row.file.name">{{ row.file.name }}</div>
<div v-if="row.contentType !== 'text' && row.file && row.file.size">{{ row.file.size | size }}KB</div>
</div>
</div>
</template>