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

柱状图

Browse Source
This commit is contained in:
shijingjing
2022-07-22 17:40:34 +08:00
parent 048fc9ed24
commit 01db21cd73
4 changed files with 58 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,7 +130,16 @@ export default {
// uni.clearStorageSync('selected')
},
selectConfirm() {
this.userId = this.userIdList?.[0].userId,
if(this.userIdList.length) {
this.userId = this.userIdList[0].userId
}
// let arr = this.userIdList
// console.log(arr[0],222);
// console.log(this.userIdList,111);
this.start = this.startTime,
this.end = this.endTime
let startTmp = this.start.split("-");
@@ -153,8 +162,8 @@ export default {
},
},
onShow() {
this.getList()
document.title = '群发居民群'
this.getList()
this.$dict.load('mstStatus').then(() => {
this.getList()
})

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

@@ -55,7 +55,7 @@
</div>
</div>
</div>
<div v-if="info.status == 4" class="btn" @click="remindSend">提醒成员发送</div>
<div v-if="detail.status == 4" class="btn" @click="remindSend">提醒成员发送</div>
</div>
</div>
@@ -116,6 +116,7 @@ export default {
firstClickTime: "",
currentClickTime: "",
flag: true,
detail: {}
};
},
computed: {
@@ -143,6 +144,14 @@ export default {
this.getStatistics()
},
getDetail() {
this.$http.post(`/app/appmasssendingtask/queryDetailById?id=${this.id}`).then(res=> {
if (res?.data) {
this.detail = res.data
}
})
},
toDetail() {
uni.navigateTo({ url: `./detail?id=${this.id}` });
},
@@ -164,8 +173,7 @@ export default {
this.flag = false;
}
})
.catch((err) => {
console.log(err);
.catch(() => {
});
} else {
time = 60 * 60 * 1000 - time;
@@ -255,6 +263,7 @@ export default {
onShow() {
document.title = "群发居民群统计";
this.getStatistics();
this.getDetail()
},
mounted() {
this.getPieEcharts();

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

@@ -16,8 +16,8 @@
<div class="item">
<span>所在部门</span>
<span>
<span v-if="data.createUserDept">/<AiOpenData type="userName" :openId="data.createUserDept" style="display: inline-block"></AiOpenData></span>
<span v-if="data.createUserSecondDept">/<AiOpenData type="userName" :openId="data.createUserSecondDept" style="display: inline-block"></AiOpenData></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>
</div>
<div class="item">
@@ -95,6 +95,7 @@ export default {
webpage: [],
miniapp: [],
pictres: [],
options: ''
}
},
onLoad(o) {
@@ -122,7 +123,7 @@ export default {
},
...mapActions(['previewFile']),
prevFile(file) {
this.previewFile(file)
this.previewFile({ ...file })
},
// 拒绝
refuseBtn() {
@@ -150,8 +151,7 @@ export default {
this.$u.toast('审批成功')
this.getDetail()
}
}).catch(err=> {
console.log(err);
}).catch(()=> {
})
},
},
@@ -164,7 +164,7 @@ export default {
<style lang="scss" scoped>
.detail {
padding: 32px 32px 120px 32px;
padding: 32px 32px 140px 32px;
box-sizing: border-box;
.task {
position: relative;
@@ -276,6 +276,7 @@ export default {
line-height: 112px;
border: 1px solid #DDDDDD;
font-size: 32px;
z-index: 9;
.refuse {
width: 40%;
background: #FFF;

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

@@ -13,7 +13,7 @@
<div class="yesterday">
<div class="itemYesterday">昨天<span>{{ nowMonth }}.{{ nowDate - 1 }}</span></div>
<div v-if="calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length > 0">
<div v-if="calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length">
<div v-show="calendarList[nowDate - 1].taskList.length <= 2">
<div v-for="(item,index) in calendarList[nowDate - 1].taskList.slice(0, 2)" :key="index">{{item.taskTitle}}</div>
</div>
@@ -21,7 +21,7 @@
<div v-for="(item,index) in calendarList[nowDate - 1].taskList.slice(2, calendarList[nowDate - 1].taskList.length)" :key="index">{{item.taskTitle}}</div>
</div>
</div>
<div v-if="!(calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length > 0)">今日暂无宣发任务</div>
<div v-if="!(calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length)">今日暂无宣发任务</div>
<div class="isShow" v-if="calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length > 0 && calendarList[nowDate - 1].taskList.length > 2" @click="showYes = !showYes">{{ showYes ? "收起" : "展开" }}</div>
</div>
@@ -29,7 +29,7 @@
<div class="today">
<div class="itemToday">今天<span>{{ nowMonth }}.{{ nowDate }}</span></div>
<div v-if="calendarList && calendarList[nowDate] && calendarList[nowDate].taskList.length > 0">
<div v-if="calendarList && calendarList[nowDate] && calendarList[nowDate].taskList.length">
<div v-show="calendarList[nowDate].taskList.length <=2">
<div v-for="(item,index) in calendarList[nowDate].taskList.slice(0, 2)" :key="index">{{item.taskTitle}}</div>
</div>
@@ -37,7 +37,7 @@
<div v-for="(item,index) in calendarList[nowDate].taskList.slice(2, calendarList[nowDate].taskList.length)" :key="index">{{item.taskTitle}}</div>
</div>
</div>
<div v-if="!(calendarList && calendarList[nowDate] && calendarList[nowDate].taskList.length > 0)">今日暂无宣发任务</div>
<div v-if="!(calendarList && calendarList[nowDate] && calendarList[nowDate].taskList.length)">今日暂无宣发任务</div>
<div class="isShow" v-if="calendarList && calendarList[nowDate] && calendarList[nowDate].taskList.length > 0 && calendarList[nowDate].taskList.length > 2" @click="showTo=!showTo">{{ showTo ? "收起" : "展开" }}</div>
</div>
@@ -45,7 +45,7 @@
<div class="tomorrow">
<div class="itemTomorrow">明天<span>{{ nowMonth }}.{{ nowDate + 1 }}</span></div>
<div v-if="calendarList && calendarList[nowDate + 1] && calendarList[nowDate + 1].taskList.length > 0">
<div v-if="calendarList && calendarList[nowDate + 1] && calendarList[nowDate + 1].taskList.length">
<div v-show="calendarList[nowDate + 1].taskList.length <= 2">
<div v-for="(item,index) in calendarList[nowDate + 1].taskList.slice(0, 2)" :key="index">{{item.taskTitle}}</div>
</div>
@@ -53,7 +53,7 @@
<div v-for="(item,index) in calendarList[nowDate + 1].taskList.slice(2, calendarList[nowDate + 1].taskList.length)" :key="index">{{item.taskTitle}}</div>
</div>
</div>
<div v-if="!(calendarList && calendarList[nowDate + 1] && calendarList[nowDate + 1].taskList.length > 0)">今日暂无宣发任务</div>
<div v-if="!(calendarList && calendarList[nowDate + 1] && calendarList[nowDate + 1].taskList.length)">今日暂无宣发任务</div>
<div class="isShow" v-if="calendarList && calendarList[nowDate + 1] && calendarList[nowDate + 1].taskList.length > 0 && calendarList[nowDate + 1].taskList.length > 2" @click="showTom=!showTom">{{ showTom ? "收起" : "展开" }}</div>
</div>
</div>
@@ -198,7 +198,7 @@
<script>
import echarts from "echarts";
import { mapActions } from 'vuex'
import { mapState, mapActions } from 'vuex'
export default {
name: "AppPropagandaStatistics",
appName: "宣发统计",
@@ -256,6 +256,9 @@ export default {
this.getBrokenEcharts3();
this.getColumnarEcharts();
},
computed: {
...mapState(['user'])
},
methods: {
checkTime(index) {
if (index == 3) {
@@ -554,7 +557,7 @@ export default {
],
});
},
// ...mapActions(['initOpenData', 'transCanvas']),
...mapActions(['initOpenData', 'transCanvas']),
// 宣发明细
getColData() {
this.$http
@@ -564,24 +567,23 @@ export default {
},
})
.then((res) => {
// if(res.data && res.data.length) {
// this.isDepartData = true
// let items = [], xData = [], yData = []
// res.data.map((item) => {
// var i = {type: 'departmentName', id: item.deptId, corpid: this.user.info.corpId}
// items.push(i)
// yData.push(item.taskCount)
// })
// this.initOpenData({canvas:true})
// this.transCanvas(items).then((data) => {
// data.items.map((i) => {
// xData.push(i.data)
// })
// this.getColumnarEcharts(xData, yData)
// })
// }else {
// this.isDepartData = false
// }
if(res?.data) {
console.log(res.data);
let items = [], xData = [], yData = []
res.data.map((item) => {
var i = {type: 'departmentName', id: item.deptId, corpid: this.user.corpId}
items.push(i)
yData.push(item.taskCount)
})
this.initOpenData({canvas:true})
this.transCanvas(items).then((data) => {
data.items.map((i) => {
xData.push(i.data)
})
console.log(xData,yData);
this.getColumnarEcharts(xData, yData)
})
}
});
},
getColumnarEcharts(xData, yData) {