coys

src/views/menu/monitoringCall/index.vue

@@ -58,7 +58,6 @@
           <van-datetime-picker
             v-model="presentDate"
             @cancel="onCancel"
-           
             @confirm="onDateConfirm"
             type="year-month"
             title="月份"
@@ -73,38 +72,36 @@
     <!-- 调阅列表 -->
     <div class="bigbox">
       <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
-      
-     
-      <van-panel :title="item.title" v-for="(item) in taskList" :key="item.id" class="card" status="状态">
-        <template #header>
-          <div class="titleClass">
-            <div class="title">
-              {{ item.taskName }} <span :class="monitor[item.status]">{{ item.status | statusFilter(this_) }}</span>
-            </div>
-            <div>
-              <van-button type="info" size="small" v-if="item.status == 0" @click="startMonitorHandler(item.id)"
-                >开始调阅</van-button
-              >
-              <van-button
-                type="info"
-                size="small"
-                v-else-if="item.status != 0 && item.status != 3"
-                @click="lookInfoHandler(item.id, item.status)"
-                ><van-icon name="arrow"
-              /></van-button>
+        <van-panel :title="item.title" v-for="item in taskList" :key="item.id" class="card" status="状态">
+          <template #header>
+            <div class="titleClass">
+              <div class="title">
+                {{ item.taskName }} <span :class="monitor[item.status]">{{ item.status | statusFilter(this_) }}</span>
+              </div>
+              <div>
+                <van-button type="info" size="small" v-if="item.status == 0" @click="startMonitorHandler(item.id)"
+                  >开始调阅</van-button
+                >
+                <van-button
+                  type="info"
+                  size="small"
+                  v-else-if="item.status != 0 && item.status != 3"
+                  @click="lookInfoHandler(item.id, item.status)"
+                  ><van-icon name="arrow"
+                /></van-button>
+              </div>
             </div>
+          </template>
+          <div class="mainItem">
+            <div>开始时间:</div>
+            <div class="date">{{ item.planStartTime }}</div>
+          </div>
+          <div class="mainItem">
+            <div>结束时间:</div>
+            <div class="date">{{ item.planEndTime }}</div>
           </div>
-        </template>
-        <div class="mainItem">
-          <div>开始时间:</div>
-          <div class="date">{{ item.planStartTime }}</div>
-        </div>
-        <div class="mainItem">
-          <div>结束时间:</div>
-          <div class="date">{{ item.planEndTime }}</div>
-        </div>
-      </van-panel>
-    </van-list>
+        </van-panel>
+      </van-list>
     </div>
 
     <!-- 扫描弹框 -->
@@ -119,11 +116,11 @@ import { Toast } from 'vant'
 import { newDateMonth } from '@/utils/date.js'
 import scandialog from '@/components/nfcPopup/alone.vue'
 import { base64ToBlob } from '@/utils/base64TurnImg.js'
-import {upload} from "@/api/public";
+import { upload } from '@/api/public'
 export default {
   data() {
     return {
-      pageNum:1,
+      pageNum: 1,
       loading: false, //加载状态
       finished: false, //是否全部加载完成
       str: '',
@@ -131,7 +128,7 @@ export default {
       monitor: ['monitor', 'monitored', 'monitoring', 'waringtoring'], //状态样式
       value1: JSON.parse(sessionStorage.getItem('SET_USER_ORGNAME')) || '', //输入框model
       currentDate: newDateMonth(),
-      presentDate:'2020-01-01',//当前时间
+      presentDate:  '', //当前时间
       cascaderValue: JSON.parse(sessionStorage.getItem('SET_USER_ORGID')) || '',
       columns: ['全部'],
       statusList: [], //调阅状态字典数组
@@ -178,22 +175,25 @@ export default {
   },
   created() {
     this.init()
-
+    this.presentDate=this.presentDateCpd
   },
-  mounted(){
-  
-
+  computed:{
+    presentDateCpd(){
+      return new Date(+newDateMonth().split('-')[0],+newDateMonth().split('-')[1]-1)
+       
+    }
   },
+  mounted() {},
   methods: {
     //onLoad下拉刷新
     onLoad() {
-      if(this.pageNum==1){
-        this.pageNum=2
+      if (this.pageNum == 1) {
+        this.pageNum = 2
       }
-      
-      this.selectListAppHandler(()=>{
+
+      this.selectListAppHandler(() => {
         this.loading = false
-this.pageNum++
+        this.pageNum++
       })
     },
     //清空查询条件
@@ -227,23 +227,23 @@ this.pageNum++
       })
       this.selectListAppHandler()
     },
-    selectListAppHandler(callBack=(()=>{})) {
+    selectListAppHandler(callBack = () => {}) {
       //获取任务列表
       selectListApp({
-        pageNum:this.pageNum,
-        pageSize:10,
+        pageNum: this.pageNum,
+        pageSize: 10,
         status: this.str || '',
         orgId: this.cascaderValue || '',
         moth: this.currentDate || ''
       }).then(res => {
         let { code, rows, msg } = res
         if (code == 200) {
-          
           this.taskList.push(...rows)
-          if(rows.length==0){//已经没有数据判断
-            this.finished=true
+          if (rows.length == 0) {
+            //已经没有数据判断
+            this.finished = true
             return
-          } 
+          }
           callBack()
           // if(num===1){
           //   this.loading = false

src/views/menu/training/index.vue

@@ -65,7 +65,7 @@
         />
         <van-popup v-model="showDate" round position="bottom">
           <van-datetime-picker
-            v-model="currentDate"
+            v-model="presentDate"
             @cancel="onCancel"
             @confirm="onDateConfirm"
             type="year-month"
@@ -171,6 +171,7 @@ import { newDateMonth } from '@/utils/date.js'
 export default {
   data() {
     return {
+      presentDate:'',//默认时间
       pageNum: 1,
       loading: false, //加载状态
       finished: false, //是否全部加载完毕
@@ -247,6 +248,13 @@ export default {
 
   created() {
     this.init()
+    this.presentDate=this.presentDateCpd
+  },
+  computed:{
+    presentDateCpd(){
+      return new Date(+newDateMonth().split('-')[0],+newDateMonth().split('-')[1]-1)
+       
+    }
   },
   methods: {
     //判断是否展示签名按钮
@@ -326,7 +334,7 @@ export default {
       })
       this.selectListAppHandler()
     },
-    selectListAppHandler(callback=()=>{}) {
+    selectListAppHandler(type=0,callback=()=>{}) {
       let obj = {
         isAppSelect: 1,
         pageNum: this.pageNum,
@@ -350,13 +358,18 @@ export default {
       gettrainingList(obj).then(res => {
         let { code, rows, msg } = res
         if (code == 200) {
-          this.taskList.push(...rows)
+          if(type){
+            this.taskList.push(...rows)
           if(rows.length==0){
             //已加载完全部数据
             this.finished=true
             return
           }
           callback()
+          }else{
+            this.taskList=rows
+          }
+          
         }
       })
     },
@@ -453,7 +466,7 @@ export default {
         this.pageNum=2
       }
       this.loading = true
-      this.selectListAppHandler(() => {
+      this.selectListAppHandler(1,() => {
         this.pageNum++
         this.loading = false
         console.log(1);