This commit is contained in:
shijingjing
2022-07-25 09:11:26 +08:00
parent 01db21cd73
commit 44d5e489db
3 changed files with 13 additions and 16 deletions

View File

@@ -127,14 +127,14 @@ export default {
this.startTime = '', this.startTime = '',
this.endTime = '', this.endTime = '',
this.userIdList = [] this.userIdList = []
// uni.clearStorageSync('selected') uni.clearStorageSync('userSelect')
}, },
selectConfirm() { selectConfirm() {
if(this.userIdList.length) { if(this.userIdList.length) {
this.userId = this.userIdList[0].userId this.userId = this.userIdList[0].userId
} }
// let arr = this.userIdList // let arr = this.userIdList
// console.log(arr[0],222); // console.log(arr[0],222);
// console.log(this.userIdList,111); // console.log(this.userIdList,111);

View File

@@ -12,7 +12,7 @@
</div> </div>
</div> </div>
</div> </div>
<AiEmpty description="暂无数据" v-if="!hasData"/> <AiEmpty description="暂无数据" v-if="!userList"/>
</div> </div>
<div class="subBtn" @click="submit"> <div class="subBtn" @click="submit">
<div>确定选择</div> <div>确定选择</div>
@@ -41,6 +41,7 @@ export default {
onLoad() { onLoad() {
this.selected = uni.getStorageSync('userSelect') || [] this.selected = uni.getStorageSync('userSelect') || []
this.getDeptsAndUsersByParent() this.getDeptsAndUsersByParent()
console.log(this.selected);
}, },
methods: { methods: {
isSelected(id) { isSelected(id) {

View File

@@ -22,7 +22,7 @@
</div> </div>
</div> </div>
<div v-if="!(calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length)">今日暂无宣发任务</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 class="isShow" v-if="calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length && calendarList[nowDate - 1].taskList.length > 2" @click="showYes = !showYes">{{ showYes ? "收起" : "展开" }}</div>
</div> </div>
<!-- 今天 --> <!-- 今天 -->
@@ -38,7 +38,7 @@
</div> </div>
</div> </div>
<div v-if="!(calendarList && calendarList[nowDate] && calendarList[nowDate].taskList.length)">今日暂无宣发任务</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 class="isShow" v-if="calendarList && calendarList[nowDate] && calendarList[nowDate].taskList.length && calendarList[nowDate].taskList.length > 2" @click="showTo=!showTo">{{ showTo ? "收起" : "展开" }}</div>
</div> </div>
<!-- 明天 --> <!-- 明天 -->
@@ -54,7 +54,7 @@
</div> </div>
</div> </div>
<div v-if="!(calendarList && calendarList[nowDate + 1] && calendarList[nowDate + 1].taskList.length)">今日暂无宣发任务</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 class="isShow" v-if="calendarList && calendarList[nowDate + 1] && calendarList[nowDate + 1].taskList.length && calendarList[nowDate + 1].taskList.length > 2" @click="showTom=!showTom">{{ showTom ? "收起" : "展开" }}</div>
</div> </div>
</div> </div>
@@ -93,17 +93,17 @@
<div class="broken_right"> <div class="broken_right">
<span <span
:class="detailType == 0 ? 'active' : ''" :class="detailType == 0 ? 'active' : ''"
@click="(detailType = 0), getColData()" @click="detailType = 0, getColData()"
>近七天</span >近七天</span
> >
<span <span
:class="detailType == 1 ? 'active' : ''" :class="detailType == 1 ? 'active' : ''"
@click="(detailType = 1), getColData()" @click="detailType = 1, getColData()"
>近30天</span >近30天</span
> >
<span <span
:class="detailType == 2 ? 'active' : ''" :class="detailType == 2 ? 'active' : ''"
@click="(detailType = 2), getColData()" @click="detailType = 2, getColData()"
>近1年</span >近1年</span
> >
</div> </div>
@@ -117,7 +117,7 @@
<div class="title"> <div class="title">
<div <div
class="cancel" class="cancel"
@click.stop="(filterShow = false), (timeSelect = 0)" @click.stop="filterShow = false, timeSelect = 0"
> >
取消 取消
</div> </div>
@@ -392,7 +392,7 @@ export default {
this.brokenEcharts1 = echarts.init( this.brokenEcharts1 = echarts.init(
document.getElementById("brokenEcharts1") document.getElementById("brokenEcharts1")
); );
const option = { this.brokenEcharts1.setOption({
tooltip: { tooltip: {
trigger: "axis", trigger: "axis",
}, },
@@ -441,8 +441,7 @@ export default {
}, },
}, },
], ],
}; });
option && this.brokenEcharts1.setOption(option);
}, },
// 宣发次数 // 宣发次数
getBrokenEcharts2() { getBrokenEcharts2() {
@@ -568,7 +567,6 @@ export default {
}) })
.then((res) => { .then((res) => {
if(res?.data) { if(res?.data) {
console.log(res.data);
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} var i = {type: 'departmentName', id: item.deptId, corpid: this.user.corpId}
@@ -580,7 +578,6 @@ export default {
data.items.map((i) => { data.items.map((i) => {
xData.push(i.data) xData.push(i.data)
}) })
console.log(xData,yData);
this.getColumnarEcharts(xData, yData) this.getColumnarEcharts(xData, yData)
}) })
} }
@@ -640,7 +637,6 @@ export default {
type: ["department"], type: ["department"],
selectedDepartmentIds: this.departList?.map(e => e.id) selectedDepartmentIds: this.departList?.map(e => e.id)
}).then((res)=>{ }).then((res)=>{
console.log(res,111);
if(res?.departmentList) { if(res?.departmentList) {
this.departmentId = res.departmentList[0].id this.departmentId = res.departmentList[0].id
} }