zx

src/views/HomePage/index.vue

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

src/views/HomePage/title.less

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

src/views/QuestManage/_questList/index.vue

@@ -23,6 +23,9 @@
                        <el-option label="已结束" :value="2"></el-option>
                    </el-select>
                </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-button type="primary" @click="confirm">查 询</el-button>
                    <el-button @click="reset">重 置</el-button>
@@ -50,6 +53,8 @@
                    </template>
                </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">
                    <template #default="scope">
                        <div v-if="scope.row.status == 0">
@@ -77,7 +82,7 @@
 </template>
 
 <script>
-import {defineComponent, reactive, watch, getCurrentInstance} from 'vue'
+import {defineComponent, reactive, ref, watch, getCurrentInstance} from 'vue'
 import {statusFormatter} from './config.js'
 export default defineComponent({
     name: 'v-questList',
@@ -87,6 +92,8 @@ export default defineComponent({
             tagIdList: [],
             brandIdList: [],
             status: undefined,
+            beginTime: undefined,
+            endTime: undefined,
         });
         const tableData = reactive({
             data: [],
@@ -95,6 +102,7 @@ export default defineComponent({
             tagData: [],
             brandData: [],
         });
+        const selTime = ref([]);
         const { proxy } = getCurrentInstance();
         const pagination = reactive({
             total: 0,
@@ -103,7 +111,7 @@ export default defineComponent({
         });
         return {
             form,proxy,
-            apiData,tableData,
+            apiData,tableData,selTime,
             statusFormatter,
             pagination
         }
@@ -151,6 +159,9 @@ export default defineComponent({
             this.form.tagIdList = [];
             this.form.brandIdList = [];
             this.form.status = undefined;
+            this.form.beginTime = undefined;
+            this.form.endTime = undefined;
+            this.selTime = [];
             this.getData()
         },
         hanlderStop(id) {
@@ -181,6 +192,12 @@ export default defineComponent({
                 }).catch(() => {});
             }).catch(() => {})
         },
+        dateRangeChange(value) {
+            if(value) {
+                this.form.beginTime = value[0];
+                this.form.endTime = value[1]
+            }
+        },
         goRelease() {
             this.$router.push({ name: "QuestRelease" })
         },