duanshenglang hace 1 mes
padre
commit
d472ce991b
Se han modificado 2 ficheros con 34 adiciones y 16 borrados
  1. 14 11
      lottery/js/select-date.js
  2. 20 5
      lottery/jxs.html

+ 14 - 11
lottery/js/select-date.js

@@ -26,14 +26,14 @@ var demoComponent = Vue.extend({
         }
     },
     created() { 
-        let nowDat = new Date();
+        let nowDat = new Date()
         let dateY = nowDat.getFullYear()
         let dateM = nowDat.getMonth()
         let dateD = nowDat.getDate()
         // 设置日期可选最小值minDate、最大值maxDate
         this.minDate = new Date(dateY - 1, dateM, dateD)
         //日历可选范围为一年,dateY + 1
-        this.maxDate = new Date()
+        this.maxDate = new Date(dateY, dateM, dateD - 1)
     },
   methods: {
     handleChangeNumDateType(type) {
@@ -51,15 +51,18 @@ var demoComponent = Vue.extend({
             this.$emit('change-date', this.currentDate)
           }
       },
-      onConfirm(date) {
-        const [start, end] = date
-        this.currentDate = [this.formatDate(start), this.formatDate(end)]
-        this.showDate = false
-        this.$emit('change-date', this.currentDate)
-      },
-      formatDate(date) {
-        return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`
-      },
+    onConfirm(date) {
+      const [start, end] = date
+      this.currentDate = [this.formatDate(start), this.formatDate(end)]
+      if (this.formatDate(new Date()) === this.currentDate[1]) {
+        this.currentDate[1] = this.formatDate(start)
+      }
+      this.showDate = false
+      this.$emit('change-date', this.currentDate)
+    },
+    formatDate(date) {
+      return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`
+    },
     getDateTime (day) {
         let today = new Date()
         let targetday_milliseconds = today.getTime() + 1000 * 60 * 60 * 24 * day

+ 20 - 5
lottery/jxs.html

@@ -613,7 +613,7 @@
                 <div style="width: 80px;max-width: 80px;">{{item.memberName}}</div>
                 <div style="width: 50px;">{{item.replyMsg}}</div>
                 <div style="width: 40px;">{{item.timeoutMsg}}</div>
-                <div style="width: 50px;">{{(item.avgReplyDuration/60).toFixed(2)}}分钟</div>
+                <div style="width: 50px;">{{formatTime(item.avgReplyDuration)}}</div>
                 <div style="width: 30px;color: #1677FF;" @click="handleItemMemberReply(item)">详情</div>
               </div>
             </div>
@@ -656,7 +656,7 @@
                 <div style="width: 50px;">{{item.clientName}}</div>
                 <div style="width: 80px;">{{item.clientPhone}}</div>
                 <div style="width: 80px;">{{timeFormat(item.msgTime)}}</div>
-                <div style="width: 60px;">{{(item.waitSeconds/60).toFixed(2)}}分钟</div>
+                <div style="width: 60px;">{{formatTime(item.waitSeconds)}}</div>
                 <div style="width: 60px;">{{item.content}}</div>
               </div>
             </div>
@@ -848,7 +848,7 @@
                   <div>较昨日:
                     <span v-if="chatIndicators.yda.clientReplyPercent" class="selected_color"
                       :style="{color: chatIndicators.yda.clientReplyPercent > 0 ? '#1677FF' : '#FF4E4E'}">
-                      {{chatIndicators.yda.clientReplyPercent > 0 ? '+' : '-'}}{{chatIndicators.yda.clientReplyPercent}}%</span>
+                      {{chatIndicators.yda.clientReplyPercent > 0 ? '+' : ''}}{{chatIndicators.yda.clientReplyPercent}}%</span>
                   </div>
                   <image class="client_item_icon" v-if="chatIndicators.yda.clientReplyPercent" :src="chatIndicators.yda.clientReplyPercent > 0 ? './img/jxs-up1.png' : './img/jxs-down2.png'"></image>
                 </div>
@@ -890,7 +890,7 @@
                   <div>较昨日:
                     <span v-if="chatIndicators.yda.avgReplyDuration" class="selected_color"
                       :style="{color: chatIndicators.yda.avgReplyDuration > 0 ? '#FF4E4E' : '#1677FF'}">
-                      {{chatIndicators.yda.avgReplyDuration > 0 ? '+' : '-'}}{{chatIndicators.yda.avgReplyDuration}}秒</span>
+                      {{chatIndicators.yda.avgReplyDuration > 0 ? '+' : ''}}{{chatIndicators.yda.avgReplyDuration}}秒</span>
                   </div>
                   <image class="client_item_icon" v-if="chatIndicators.yda.avgReplyDuration"
                     :src="chatIndicators.yda.avgReplyDuration > 0 ? './img/jxs-up2.png' : './img/jxs-down1.png'"></image>
@@ -1161,7 +1161,7 @@
       // 设置日期可选最小值minDate、最大值maxDate
       this.minDate = new Date(dateY - 1, dateM, dateD)
       //日历可选范围为一年,dateY + 1
-      this.maxDate = new Date()
+      this.maxDate = new Date(dateY, dateM, dateD - 1)
 
       this.bId = this.getQueryParam('bId')
       this.env = this.getQueryParam('env')
@@ -3195,6 +3195,9 @@
       },
       onSelfConfirm (date) {
         const [start, end] = date
+        if (this.formatDate(new Date()) === this.formatDate(end)) {
+          this.formatDate(end) = this.formatDate(start)
+        }
         this.memberStartTime = this.formatDate(start)
         this.memberEndTime = this.formatDate(end)
         this.showSelfDate = false
@@ -3774,6 +3777,18 @@
         })
         this.handleLoginOut()
       },
+      formatTime(seconds) {
+        if (seconds === undefined || seconds === '' || seconds === null) {
+          return '--'
+        }
+        if (seconds >= 60) {
+          // 转换为分钟并保留整数部分
+          const minutes = Math.floor(seconds / 60);
+          return `${minutes}分钟`;
+        } else {
+          return `${seconds}秒`;
+        }
+      },
       // 日期格式处理
       getDateTime(day) {
         let today = new Date()