sws
/
EXEED_manage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.oa00.com/SWS/starWaySystem

Browse Source
master
zx 3 years ago
parent 4fedf01090 6971ca782c
commit 2f06199205
3 changed files with 43 additions and 13 deletions
Show Stats Download Patch File Download Diff File

30
src/views/HomePage/index.vue
Unescape View File

@ -132,12 +132,16 @@
<el-tab-pane label="转发" :name="5"></el-tab-pane> <el-tab-pane label="转发" :name="5"></el-tab-pane>
<el-tab-pane label="推荐" :name="6"></el-tab-pane> <el-tab-pane label="推荐" :name="6"></el-tab-pane>
</el-tabs> </el-tabs>
<div style="padding: 6px"> <div class="middle-tab" style="">
<!-- <el-button @click="changeDateType(1)" size="default" text>今日</el-button> --> <el-radio-group @change="changeDateType" v-model="playNumForm.dateCondition" size="default">
<el-button @click="changeDateType(2)" size="default" text>本周</el-button> <el-radio-button :label="2">本周</el-radio-button>
<el-radio-button :label="3">本月</el-radio-button>
<el-radio-button :label="4">全年</el-radio-button>
</el-radio-group>
<!-- <el-button @click="changeDateType(2)" size="default" text>本周</el-button>
<el-button @click="changeDateType(3)" size="default" text>本月</el-button> <el-button @click="changeDateType(3)" size="default" text>本月</el-button>
<el-button @click="changeDateType(4)" size="default" text>全年</el-button> <el-button @click="changeDateType(4)" size="default" text>全年</el-button> -->
<el-date-picker value-format="YYYY-MM-DD HH:mm:ss" type="daterange" v-model="selTime" @change="dateRangeChange"></el-date-picker> <el-date-picker style="margin-left: 24px" size="default" value-format="YYYY-MM-DD HH:mm:ss" type="daterange" v-model="selTime" @change="dateRangeChange"></el-date-picker>
</div> </div>
</div> </div>
<div class="chart-content"> <div class="chart-content">
@ -153,9 +157,14 @@
<el-tab-pane label="员工统计" :name="2"></el-tab-pane> <el-tab-pane label="员工统计" :name="2"></el-tab-pane>
</el-tabs> </el-tabs>
<div style="padding: 6px"> <div style="padding: 6px">
<el-button size="default" @click="changeRankDateType(2)" text>本周</el-button> <el-radio-group @change="changeRankDateType" v-model="form.dateCondition" size="default">
<el-radio-button :label="2">本周</el-radio-button>
<el-radio-button :label="3">本月</el-radio-button>
<el-radio-button :label="4">全年</el-radio-button>
</el-radio-group>
<!-- <el-button size="default" @click="changeRankDateType(2)" text>本周</el-button>
<el-button size="default" @click="changeRankDateType(3)" text>本月</el-button> <el-button size="default" @click="changeRankDateType(3)" text>本月</el-button>
<el-button size="default" @click="changeRankDateType(4)" text>全年</el-button> <el-button size="default" @click="changeRankDateType(4)" text>全年</el-button> -->
</div> </div>
</div> </div>
<div class="table-content"> <div class="table-content">
@ -225,18 +234,17 @@ export default defineComponent({
} }
}).catch(() => {}); }).catch(() => {});
}, },
changeDateType(value) { changeDateType() {
this.selTime = []; this.selTime = [];
this.playNumForm.beginTime = undefined; this.playNumForm.beginTime = undefined;
this.playNumForm.endTime = undefined; this.playNumForm.endTime = undefined;
this.playNumForm.dateCondition = value;
this.drawChart(); this.drawChart();
}, },
changeRankDateType(value) { changeRankDateType() {
this.form.dateCondition = value;
this.getRank(); this.getRank();
}, },
dateRangeChange(value) { dateRangeChange(value) {
this.playNumForm.dateCondition = undefined;
this.playNumForm.beginTime = value[0]; this.playNumForm.beginTime = value[0];
this.playNumForm.endTime = value[1]; this.playNumForm.endTime = value[1];
this.drawChart(); this.drawChart();

5
src/views/HomePage/title.less
Unescape View File

@ -120,4 +120,9 @@
background: #FFF; background: #FFF;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.middle-tab {
padding: 6px;
display: flex;
justify-content: center;
}
} }

21
src/views/QuestManage/_questList/index.vue
Unescape View File

@ -23,6 +23,9 @@
<el-option label="已结束" :value="2"></el-option> <el-option label="已结束" :value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="时间">
<el-date-picker size="small" value-format="YYYY-MM-DD HH:mm:ss" type="daterange" v-model="selTime" @change="dateRangeChange"></el-date-picker>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="confirm">查 询</el-button> <el-button type="primary" @click="confirm">查 询</el-button>
<el-button @click="reset">重 置</el-button> <el-button @click="reset">重 置</el-button>
@ -50,6 +53,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="status" label="状态" :formatter="statusFormatter"></el-table-column> <el-table-column prop="status" label="状态" :formatter="statusFormatter"></el-table-column>
<el-table-column prop="start" label="开始时间" width="240"></el-table-column>
<el-table-column prop="end" label="结束时间" width="240"></el-table-column>
<el-table-column prop="action" label="操作" fixed="right" width="240"> <el-table-column prop="action" label="操作" fixed="right" width="240">
<template #default="scope"> <template #default="scope">
<div v-if="scope.row.status == 0"> <div v-if="scope.row.status == 0">
@ -77,7 +82,7 @@
</template> </template>
<script> <script>
import {defineComponent, reactive, watch, getCurrentInstance} from 'vue' import {defineComponent, reactive, ref, watch, getCurrentInstance} from 'vue'
import {statusFormatter} from './config.js' import {statusFormatter} from './config.js'
export default defineComponent({ export default defineComponent({
name: 'v-questList', name: 'v-questList',
@ -87,6 +92,8 @@ export default defineComponent({
tagIdList: [], tagIdList: [],
brandIdList: [], brandIdList: [],
status: undefined, status: undefined,
beginTime: undefined,
endTime: undefined,
}); });
const tableData = reactive({ const tableData = reactive({
data: [], data: [],
@ -95,6 +102,7 @@ export default defineComponent({
tagData: [], tagData: [],
brandData: [], brandData: [],
}); });
const selTime = ref([]);
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const pagination = reactive({ const pagination = reactive({
total: 0, total: 0,
@ -103,7 +111,7 @@ export default defineComponent({
}); });
return { return {
form,proxy, form,proxy,
apiData,tableData, apiData,tableData,selTime,
statusFormatter, statusFormatter,
pagination pagination
} }
@ -151,6 +159,9 @@ export default defineComponent({
this.form.tagIdList = []; this.form.tagIdList = [];
this.form.brandIdList = []; this.form.brandIdList = [];
this.form.status = undefined; this.form.status = undefined;
this.form.beginTime = undefined;
this.form.endTime = undefined;
this.selTime = [];
this.getData() this.getData()
}, },
hanlderStop(id) { hanlderStop(id) {
@ -181,6 +192,12 @@ export default defineComponent({
}).catch(() => {}); }).catch(() => {});
}).catch(() => {}) }).catch(() => {})
}, },
dateRangeChange(value) {
if(value) {
this.form.beginTime = value[0];
this.form.endTime = value[1]
}
},
goRelease() { goRelease() {
this.$router.push({ name: "QuestRelease" }) this.$router.push({ name: "QuestRelease" })
}, },

Write Preview
Loading…
Cancel
Save