展开收起
This commit is contained in:
@@ -68,7 +68,8 @@
|
|||||||
<p>小程序地址</p>
|
<p>小程序地址</p>
|
||||||
<navigator target="miniProgram" open-type="navigate"
|
<navigator target="miniProgram" open-type="navigate"
|
||||||
v-for="(item, index) in webpage" :key="index"
|
v-for="(item, index) in webpage" :key="index"
|
||||||
:app-id="item.mpAppid" path="item.mpPage" version="release"></navigator>
|
:app-id="item.mpAppid" path="item.mpPage" version="release"
|
||||||
|
>{{item.mpTitle}}</navigator>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -14,9 +14,7 @@
|
|||||||
<div class="itemYesterday">昨天<span>{{ nowMonth }}.{{ nowDate - 1 }}</span></div>
|
<div class="itemYesterday">昨天<span>{{ nowMonth }}.{{ nowDate - 1 }}</span></div>
|
||||||
|
|
||||||
<div v-if="calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length">
|
<div v-if="calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length">
|
||||||
<div v-if="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 v-for="(item,index) in calendarList[nowDate - 1].taskList.slice(0, 2)" :key="index">{{item.taskTitle}}</div>
|
||||||
</div>
|
|
||||||
<div v-if="calendarList[nowDate - 1].taskList.length > 2 && showYes">
|
<div v-if="calendarList[nowDate - 1].taskList.length > 2 && showYes">
|
||||||
<div v-for="(item,index) in calendarList[nowDate - 1].taskList.slice(2, calendarList[nowDate - 1].taskList.length)" :key="index">{{item.taskTitle}}</div>
|
<div v-for="(item,index) in calendarList[nowDate - 1].taskList.slice(2, calendarList[nowDate - 1].taskList.length)" :key="index">{{item.taskTitle}}</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -30,14 +28,12 @@
|
|||||||
<div class="itemToday">今天<span>{{ nowMonth }}.{{ nowDate }}</span></div>
|
<div class="itemToday">今天<span>{{ nowMonth }}.{{ nowDate }}</span></div>
|
||||||
|
|
||||||
<div v-if="calendarList && calendarList[nowDate] && calendarList[nowDate].taskList.length">
|
<div v-if="calendarList && calendarList[nowDate] && calendarList[nowDate].taskList.length">
|
||||||
<div v-if="calendarList[nowDate].taskList.length <=2">
|
|
||||||
<div v-for="(item,index) in calendarList[nowDate].taskList.slice(0, 2)" :key="index">{{item.taskTitle}}</div>
|
<div v-for="(item,index) in calendarList[nowDate].taskList.slice(0, 2)" :key="index">{{item.taskTitle}}</div>
|
||||||
</div>
|
<div v-if="calendarList[nowDate].taskList.length > 2 && showTo">
|
||||||
<div v-if="calendarList[nowDate].taskList.length > 2" && showTo>
|
|
||||||
<div v-for="(item,index) in calendarList[nowDate].taskList.slice(2, calendarList[nowDate].taskList.length)" :key="index">{{item.taskTitle}}</div>
|
<div v-for="(item,index) in calendarList[nowDate].taskList.slice(2, calendarList[nowDate].taskList.length)" :key="index">{{item.taskTitle}}</div>
|
||||||
</div>
|
</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>0)">今日暂无宣发任务</div>
|
||||||
<div class="isShow" v-if="calendarList && calendarList[nowDate] && calendarList[nowDate].taskList.length && 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>
|
||||||
|
|
||||||
@@ -46,10 +42,8 @@
|
|||||||
<div class="itemTomorrow">明天<span>{{ nowMonth }}.{{ nowDate + 1 }}</span></div>
|
<div class="itemTomorrow">明天<span>{{ nowMonth }}.{{ nowDate + 1 }}</span></div>
|
||||||
|
|
||||||
<div v-if="calendarList && calendarList[nowDate + 1] && calendarList[nowDate + 1].taskList.length">
|
<div v-if="calendarList && calendarList[nowDate + 1] && calendarList[nowDate + 1].taskList.length">
|
||||||
<div v-if="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 v-for="(item,index) in calendarList[nowDate + 1].taskList.slice(0, 2)" :key="index">{{item.taskTitle}}</div>
|
||||||
</div>
|
<div v-if="calendarList[nowDate + 1].taskList.length > 2 && showTom">
|
||||||
<div v-if="calendarList[nowDate + 1].taskList.length > 2" && showTom>
|
|
||||||
<div v-for="(item,index) in calendarList[nowDate + 1].taskList.slice(2, calendarList[nowDate + 1].taskList.length)" :key="index">{{item.taskTitle}}</div>
|
<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>
|
</div>
|
||||||
@@ -249,6 +243,7 @@ export default {
|
|||||||
this.getData();
|
this.getData();
|
||||||
this.getColData();
|
this.getColData();
|
||||||
this.getNowDate();
|
this.getNowDate();
|
||||||
|
// console.log(WWOpenData);
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.getBrokenEcharts1();
|
this.getBrokenEcharts1();
|
||||||
@@ -567,26 +562,28 @@ export default {
|
|||||||
})
|
})
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
if(res?.data) {
|
if(res?.data) {
|
||||||
let data = [
|
// let data = [
|
||||||
{taskCount: 4, deptId: "10"},
|
// {taskCount: 4, deptId: "10"},
|
||||||
{taskCount: 6, deptId: "13"},
|
// {taskCount: 6, deptId: "13"},
|
||||||
{taskCount: 24, deptId: "5"},
|
// {taskCount: 24, deptId: "5"},
|
||||||
{taskCount: 14, deptId: "22"},
|
// {taskCount: 14, deptId: "22"},
|
||||||
{taskCount: 12, deptId: "20"},
|
// {taskCount: 12, deptId: "20"},
|
||||||
{taskCount: 11, deptId: "15"}
|
// {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}
|
|
||||||
// items.push(i)
|
|
||||||
// yData.push(item.taskCount)
|
|
||||||
// })
|
|
||||||
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}
|
||||||
items.push(i)
|
items.push(i)
|
||||||
xData.push(item.deptId)
|
xData.push(item.deptId)
|
||||||
yData.push(item.taskCount)
|
yData.push(item.taskCount)
|
||||||
})
|
})
|
||||||
|
// data.map((item) => {
|
||||||
|
// var i = {type: 'departmentName', id: item.deptId, corpid: this.user.corpId}
|
||||||
|
// items.push(i)
|
||||||
|
// xData.push(item.deptId)
|
||||||
|
// 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,'data哈哈哈');
|
||||||
|
|||||||
Reference in New Issue
Block a user