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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
aixianling
2022-07-27 09:57:29 +08:00
parent 4714eaaca3 2aa04caed7
commit 7f72e28f81
4 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -349,8 +349,12 @@ export default {
}
.pie_right {
width: 40%;
padding-right: 30px;
box-sizing: border-box;
div {
margin-bottom: 10px;
display: flex;
justify-content: space-between;
}
}
}

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

@@ -15,9 +15,9 @@
</div>
<div class="item">
<span>所在部门</span>
<span>
<span v-if="data.createUserDept">/<AiOpenData type="departmentName" :openId="data.createUserDept" style="display: inline-block"></AiOpenData></span>
<span v-if="data.createUserSecondDept">/<AiOpenData type="departmentName" :openId="data.createUserSecondDept" style="display: inline-block"></AiOpenData></span>
<span style="display: flex;">
<div v-if="data.createUserDept">/<AiOpenData type="departmentName" :openId="data.createUserDept" style="display: inline-block;"></AiOpenData></div>
<div v-if="data.createUserSecondDept">/<AiOpenData type="departmentName" :openId="data.createUserSecondDept" style="display: inline-block"></AiOpenData></div>
</span>
</div>
<div class="item">

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

@@ -63,25 +63,26 @@
<div class="broken_statistics">
<div class="broken_item">
<div>创建宣发任务数</div>
<div>{{ peopleNum }}</div>
<div>{{ peopleNum || 0 }}</div>
</div>
<div class="broken_item">
<div>执行宣发次数</div>
<div>{{ sendNum }}</div>
<div>{{ sendNum || 0 }}</div>
</div>
<div class="broken_item">
<div>触达人次</div>
<div>{{ predictNum }}</div>
<div>{{ predictNum || 0 }}</div>
</div>
</div>
<div class="title">触达人次</div>
<div id="brokenEcharts1"></div>
<div class="title">宣发次数</div>
<div id="brokenEcharts2"></div>
<div class="title">宣发任务数</div>
<div id="brokenEcharts3"></div>
<div class="title" >触达人次</div>
<div id="brokenEcharts1"></div>
<div class="title" >宣发次数</div>
<div id="brokenEcharts2"></div>
<div class="title">宣发任务数</div>
<div id="brokenEcharts3"></div>
</div>
<div class="columnarEcharts">
<div class="columnarEcharts" v-if="colData.length">
<div class="broken_title">
<div class="broken_left">宣发明细</div>
<div class="broken_right">
@@ -234,7 +235,7 @@ export default {
peopleNum: "",
sendNum: "",
predictNum: "",
isDepartData: false,
colData: []
};
},
@@ -565,6 +566,7 @@ export default {
.then((res) => {
if (res.code ===0) {
if(res.data && res.data.length) {
this.colData = res.data
let items = [], xData = [], yData = []
res.data.forEach((item) => {
const i = {type: 'departmentName', id: item.deptId, corpid: this.user.corpId}
@@ -714,7 +716,6 @@ export default {
.broken_right {
font-size: 24px;
// color: #3399FF;
img {
width: 28px;
@@ -765,6 +766,7 @@ export default {
}
}
.brokenEcharts,
.columnarEcharts {
background: #fff;

15
src/project/saas/AppPropagandaStatistics/calendarInfo.vue
View File

@@ -1,6 +1,9 @@
<template>
<div class="calendarInfo">
<uni-calendar :insert="true" :selected="selected" :lunar="false" @change="change" @monthSwitch="changeMonth"/>
<div class="calendar">
<uni-calendar :insert="true" :selected="selected" :lunar="false" @change="change" @monthSwitch="changeMonth"/>
</div>
<div class="dailyMatters">
<div v-if="list && list.length">
@@ -146,8 +149,16 @@ export default {
display: none
}
.calendar {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 750px;
}
.dailyMatters {
padding: 30px;
padding: 750px 30px 30px 30px;
box-sizing: border-box;
.daily_item {
background: #FFF;