kubbo/dvcp_v2_wxcp_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
shijingjing
2022-07-25 18:02:40 +08:00
parent 689c10e5c4
commit faea4c65bd
4 changed files with 39 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue
View File

@@ -3,7 +3,7 @@
<AiTopFixed> <AiTopFixed>
<div class="search"> <div class="search">
<div class="searchBox"> <div class="searchBox">
<u-search placeholder="请输入任务名称" v-model="taskTitle" @search="searchBtn" @clear="taskTitle='',current=1, list=[],getList()" :show-action="false"></u-search> <u-search placeholder="请输入任务名称" v-model="taskTitle" clearabled @search="searchBtn" @clear="taskTitle='',getList()" :show-action="false"></u-search>
</div> </div>
<div class="filterBtn" @click="filterShow = true"><img src="./images/shaixuan.png" alt="">筛选</div> <div class="filterBtn" @click="filterShow = true"><img src="./images/shaixuan.png" alt="">筛选</div>
</div> </div>
@@ -41,7 +41,7 @@
<scroll-view class="select-content" scroll-y="true"> <scroll-view class="select-content" scroll-y="true">
<div class="type-list"> <div class="type-list">
<div class="type-title">创建人</div> <div class="type-title">创建人</div>
<AiPagePicker type="custom" :selected.sync="userIdList" nodeKey="userId" :ops="{url:`./selectUser`,label: 'id'}"> <AiPagePicker type="custom" :selected.sync="userIdList" nodeKey="createUserId" :ops="{url:`./selectUser`,label: 'id'}">
<span class="label" v-if="userIdList.length">已选择</span> <span class="label" v-if="userIdList.length">已选择</span>
<span v-else style="color:#999;">请选择</span> <span v-else style="color:#999;">请选择</span>
<u-icon name="arrow-right" color="#999" size="24" style="margin-left:8px;"/> <u-icon name="arrow-right" color="#999" size="24" style="margin-left:8px;"/>
@@ -93,7 +93,7 @@ export default {
showStart: false, showStart: false,
showEnd: false, showEnd: false,
taskTitle: '', taskTitle: '',
userId: '', createUserId: '',
userList: [], userList: [],
userIdList: [] userIdList: []
} }
@@ -112,9 +112,9 @@ export default {
params: { params: {
current: this.current, current: this.current,
taskTitle: this.taskTitle, taskTitle: this.taskTitle,
createUserId: this.userId,
startTime: this.start, startTime: this.start,
endTime: this.end, endTime: this.end,
createUserId: this.createUserId,
} }
}).then(res=> { }).then(res=> {
if(res?.data) { if(res?.data) {
@@ -124,15 +124,22 @@ export default {
}, },
reset() { reset() {
this.start = '',
this.end = '',
this.startTime = '', this.startTime = '',
this.endTime = '', this.endTime = ''
this.userIdList = [] this.userIdList = []
uni.clearStorageSync('userSelect') // uni.clearStorageSync('userSelect') //清空会导致状态字典出问题
this.current = 1
this.list = []
this.getList()
}, },
selectConfirm() { selectConfirm() {
if(this.userIdList.length) { if(this.userIdList.length) {
this.userId = this.userIdList[0].userId this.createUserId = this.userIdList?.[0].userId
console.log(this.userIdList,'userIdList');
console.log(this.createUserId,'createUserId');
} }
// let arr = this.userIdList // let arr = this.userIdList
@@ -152,6 +159,8 @@ export default {
return return
} }
this.filterShow = false this.filterShow = false
this.current = 1
this.list = []
this.getList() this.getList()
}, },
confirmStart(val) { confirmStart(val) {
@@ -164,10 +173,9 @@ export default {
onShow() { onShow() {
document.title = '群发居民群' document.title = '群发居民群'
this.getList() this.getList()
this.$dict.load('mstStatus').then(() => { this.$dict.load(['mstStatus']).then(() => {
this.getList() this.getList()
}) })
}, },
onReachBottom() { onReachBottom() {
this.current ++ this.current ++

14
src/project/saas/AppCooperationPropaganda/cooperationDetail.vue
View File

@@ -34,23 +34,19 @@
<div id="pieEcharts"></div> <div id="pieEcharts"></div>
<div class="pie_right"> <div class="pie_right">
<div> <div>
<span v-show="tabIndex==0">计划送达居民:</span> <span>{{tabIndex==0? '计划送达居民：':'计划送达居民群：'}}</span>
<span v-show="tabIndex==1">计划送达居民群:</span>
<span>{{ info.planCount || 0 }}</span> <span>{{ info.planCount || 0 }}</span>
</div> </div>
<div> <div>
<span v-show="tabIndex==0">未送达居民:</span> <span>{{tabIndex==0? '未送达居民：':'未送达居民群：'}}</span>
<span v-show="tabIndex==1">未送达居民群:</span>
<span>{{ info.unExecutedCount || 0 }}</span> <span>{{ info.unExecutedCount || 0 }}</span>
</div> </div>
<div> <div>
<span v-show="tabIndex==0">已送达居民:</span> <span>{{tabIndex==0? '已送达居民：':'已送达居民群：'}}</span>
<span v-show="tabIndex==1">已送达居民群:</span>
<span>{{ info.executedCount || 0 }}</span> <span>{{ info.executedCount || 0 }}</span>
</div> </div>
<div> <div>
<span v-show="tabIndex==0">无法送达居民:</span> <span>{{tabIndex==0? '无法送达居民：':'无法送达居民群：'}}</span>
<span v-show="tabIndex==1">无法送达居民群:</span>
<span>{{ info.cannotExecuteCount || 0 }}</span> <span>{{ info.cannotExecuteCount || 0 }}</span>
</div> </div>
</div> </div>
@@ -242,7 +238,7 @@ export default {
}, },
}, },
}, },
{ value: this.info.unExecutedCount }, { value: this.info.unExecutedCount, name: "未送达数量" },
], ],
}, },
], ],

6
src/project/saas/AppCooperationPropaganda/selectUser.vue
View File

@@ -1,14 +1,14 @@
<template> <template>
<section class="selectUser"> <section class="selectUser">
<div class="header-middle"> <div class="header-middle">
<div class="userCards" v-for="e in userList" :key="e.id"> <div class="userCards" v-for="e in userList" :key="e.userId">
<div class="imges"> <div class="imges">
<div class="imgselect" :class="{ checked: e.isChecked }" @click.stop="itemCheck(e)" /> <div class="imgselect" :class="{ checked: e.isChecked }" @click.stop="itemCheck(e)" />
<img src="./images/tx@2x.png" alt="" class="avatras"/> {{e}} <img src="./images/tx@2x.png" alt="" class="avatras"/> {{e.userId}}
</div> </div>
<div class="rights fill"> <div class="rights fill">
<div class="applicationNames"> <div class="applicationNames">
<AiOpenData type="userName" :openid="e.id"/> <AiOpenData type="userName" :openid="e.userId"/>
</div> </div>
</div> </div>
</div> </div>

41
src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
View File

@@ -218,7 +218,7 @@ export default {
nowDate: "", nowDate: "",
calendarList: [], calendarList: [],
colData: {}, colData: {},
detailType: 0, detailType: '0',
timeType: "", timeType: "",
departId: "", departId: "",
startTime: "", startTime: "",
@@ -234,6 +234,7 @@ export default {
peopleNum: "", peopleNum: "",
sendNum: "", sendNum: "",
predictNum: "", predictNum: "",
isDepartData: false,
}; };
}, },
@@ -243,7 +244,6 @@ export default {
this.getData(); this.getData();
this.getColData(); this.getColData();
this.getNowDate(); this.getNowDate();
// console.log(WWOpenData);
}, },
mounted() { mounted() {
this.getBrokenEcharts1(); this.getBrokenEcharts1();
@@ -255,6 +255,7 @@ export default {
...mapState(['user']) ...mapState(['user'])
}, },
methods: { methods: {
...mapActions(['initOpenData', 'transCanvas']),
checkTime(index) { checkTime(index) {
if (index == 3) { if (index == 3) {
this.timeSelect = index; this.timeSelect = index;
@@ -295,6 +296,7 @@ export default {
confirmStart(val) { confirmStart(val) {
this.startTime = val.year + "-" + val.month + "-" + val.day; this.startTime = val.year + "-" + val.month + "-" + val.day;
}, },
confirmEnd(val) { confirmEnd(val) {
this.endTime = val.year + "-" + val.month + "-" + val.day; this.endTime = val.year + "-" + val.month + "-" + val.day;
}, },
@@ -376,7 +378,6 @@ export default {
this.getBrokenEcharts1(); this.getBrokenEcharts1();
this.getBrokenEcharts2(); this.getBrokenEcharts2();
this.getBrokenEcharts3(); this.getBrokenEcharts3();
this.getColumnarEcharts();
} }
}); });
}, },
@@ -551,47 +552,33 @@ export default {
], ],
}); });
}, },
...mapActions(['initOpenData', 'transCanvas']),
// 宣发明细 // 宣发明细
getColData() { getColData() {
this.$http this.$http.post(`/app/appmasssendingtask/statisticsDepart`, null, {
.post(`/app/appmasssendingtask/statisticsDepart`, null, {
params: { params: {
type: this.detailType, type: this.detailType,
}, },
}) })
.then((res) => { .then((res) => {
if(res?.data) { if(res?.data) {
let data = [
{taskCount: 4, deptId: "10"},
{taskCount: 6, deptId: "13"},
{taskCount: 24, deptId: "5"},
{taskCount: 14, deptId: "22"},
{taskCount: 12, deptId: "20"},
{taskCount: 11, deptId: "15"}
]
let items = [], xData = [], yData = [] let items = [], xData = [], yData = []
// res.data.map((item) => { res.data.map((item) => {
// var i = {type: 'departmentName', id: item.deptId, corpid: this.user.corpId} const i = {type: 'departmentName', id: item.deptId, corpid: this.user.corpId}
// items.push(i)
// yData.push(item.taskCount)
// })
data.map((item) => {
var i = {type: 'departmentName', id: item.deptId, corpid: this.user.corpId}
items.push(i) items.push(i)
// xData.push(item.deptId)
yData.push(item.taskCount) yData.push(item.taskCount)
}) })
this.initOpenData({canvas:true}) this.initOpenData({canvas:true})
this.transCanvas(items).then((data) => { this.transCanvas(items).then((data) => {
console.log(data,'data哈哈哈'); console.log(data.items,"data.items");
data.items.map((i) => { data.items.map((a) => {
xData.push(i.data) xData.push(a.data)
}) })
console.log(xData, yData, '111222');
this.getColumnarEcharts(xData, yData) this.getColumnarEcharts(xData, yData)
}) })
// this.getColumnarEcharts(xData, yData)
} }
}); });
}, },