diff --git a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue index 1349aa4e..5c299241 100644 --- a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue +++ b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue @@ -55,7 +55,7 @@
- +
创建人 - {{ data.createUserId }} + + +
所在部门 - {{ data.createUserDept }} + + / + / +
群发时间 @@ -111,6 +116,7 @@ export default { }, onShow() { document.title = "群发审批" + this.getDetail() } } diff --git a/src/project/saas/AppCooperationPropaganda/selectUser.vue b/src/project/saas/AppCooperationPropaganda/selectUser.vue index 2034aa2d..9ca7c53a 100644 --- a/src/project/saas/AppCooperationPropaganda/selectUser.vue +++ b/src/project/saas/AppCooperationPropaganda/selectUser.vue @@ -52,21 +52,21 @@ export default { params: {} }).then(res => { if (res?.data) { - this.userList = res.data.records.map(e => ({userId: e.createUserId, isChecked: this.isSelected(e.id)})) - console.log(this.userList, '123456'); + let userArr = res.data.records.map(e => ({userId: e.createUserId, isChecked: this.isSelected(e.id)})) + // 数组去重 + this.userList = [] + userArr.forEach(item=> { + if(!this.userList.find(o=> o.userId === item.userId)) { + this.userList.push(item) + } + }) } }) }, itemCheck(row) { + this.userList.forEach(e => e.isChecked = false) row.isChecked = !row.isChecked - if (row.isChecked) { - this.selected[0] = row - } - console.log(this.selected, '胡很顾及到凤凰国际'); - // else { - // let index = this.selected.findIndex(e => e.id == row.id) - // this.selected.splice(index, 1) - // } + this.selected[0] = this.userList.filter(e => e.isChecked == true) this.$forceUpdate() }, submit() { diff --git a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue index 50f46f8c..08428057 100644 --- a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue +++ b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue @@ -554,6 +554,7 @@ export default { ], }); }, + // ...mapActions(['initOpenData', 'transCanvas']), // 宣发明细 getColData() { this.$http @@ -563,13 +564,27 @@ export default { }, }) .then((res) => { - if (res?.data) { - console.log(res); - this.colData = res.data; - } + // 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 + // } }); }, - getColumnarEcharts() { + getColumnarEcharts(xData, yData) { this.columnarEcharts = echarts.init( document.getElementById("columnarEcharts") ); @@ -589,7 +604,7 @@ export default { axisLine: { show: false, }, - data: ["卫健委", "法院", "团委", "扶贫办", "警察局"], + data: xData, }, yAxis: { type: "value", @@ -602,7 +617,7 @@ export default { }, series: [ { - data: [120, 200, 150, 80, 70, 110, 130], + data: yData, itemStyle: { normal: { color: "#5087ec",