优化日程展示

src/components/Schedule/index.vue

@@ -366,7 +366,7 @@ export default {
 }
 .time-now{
   width:calc(100% - 50px);
-  padding-left:50px;
+  padding-left:48px;
   position:absolute;
   left:0;
   top:10px;
@@ -424,6 +424,12 @@ export default {
   bottom:0;
   z-index:8;
 }
+.schedule ::v-deep.el-scrollbar__wrap{
+  overflow-x: auto;
+}
+.schedule ::v-deep.el-scrollbar__wrap::-webkit-scrollbar{
+  display: none;
+}
 .schedule ::v-deep.el-scrollbar__bar{
   z-index:9;
 }

src/pages/calendar/day/components/DetailsPopover.vue

 <template>
-  <div class="details" v-if="ev">
+  <div class="details" v-if="details">
     <h5>会议详情</h5>
-    <p>
-      <i class="el-icon-tickets"></i>主题：
-      <span>{{ev.subject}}</span>
-    </p>
-    <p>
-      <i class="el-icon-star-off"></i>会议号：
-      <span>{{ev.meeting_code}}</span>
-    </p>
-    <p>
-      <i class="el-icon-time"></i>时间：
-      <span v-if="isSameDate">{{ev.start_time | timeFormat('{m}月{d}日')}} {{ev.end_time | timeFormat('周{a}')}}  {{ev.start_time | timeFormat}}-{{ev.end_time | timeFormat}}</span>
+    <div class="details-item">
+      <label>会议主题：</label>
+      <p>{{details.subject}}</p>
+      <span style="width:40px;color:#409eff" v-if="details.meeting_type === 1">(周期)</span>
+    </div>
+    <div class="details-item">
+      <label>会议时间：</label>
+      <span v-if="isSameDate">{{details.start_time | timeFormat('{m}月{d}日')}} {{details.end_time | timeFormat('周{a}')}}  {{details.start_time | timeFormat}}-{{details.end_time | timeFormat}}</span>
       <template v-else>
-        <span v-if="isEndTimeZeroPoint">{{ev.start_time | timeFormat('{m}月{d}日 {h}:{i}')}} - 24:00</span>
-        <span v-else>{{ev.start_time | timeFormat('{m}月{d}日 {h}:{i}')}} - {{ev.end_time | timeFormat('{m}月{d}日 {h}:{i}')}}</span>
+        <span v-if="isEndTimeZeroPoint">{{details.start_time | timeFormat('{m}月{d}日 {h}:{i}')}} - 24:00</span>
+        <span v-else>{{details.start_time | timeFormat('{m}月{d}日 {h}:{i}')}} - {{details.end_time | timeFormat('{m}月{d}日 {h}:{i}')}}</span>
       </template>
-    </p>
-    <p>
-      <i class="el-icon-user"></i>创建人：
-      <span>{{ev.sso_user.realname || ev.sso_user.username}}</span>
-    </p>
+    </div>
+    <div class="details-item">
+      <label>会议号：</label>
+      <p>{{details.meeting_code}}</p>
+    </div>
+    <div class="details-item" v-if="enableJoin">
+      <label>会议链接：</label>
+      <p class="link" @click="handleLink(details.join_url)">{{details.join_url}} <span>(点击进入会议)</span></p>
+    </div>
+    <div class="details-item" v-if="details.password && enableJoin">
+      <label>会议密码：</label>
+      <p>{{details.password}}</p>
+    </div>
+    <div class="details-item">
+      <label>创建人：</label>
+      <span>{{details.sso_user.realname || details.sso_user.username}}</span>
+    </div>
+    <div class="details-item" v-if="details.enable_live === 1 && enableJoin">
+      <label>直播链接：</label>
+      <p class="link" @click="handleLink(details.live_config.live_addr)">{{details.live_config.live_addr}} <span>(点击进入直播)</span></p>
+    </div>
+    <div class="details-item" v-if="details.enable_live === 1 && details.live_config.live_password && enableJoin">
+      <label>会议密码：</label>
+      <p>{{details.live_config.live_password}}</p>
+    </div>
+    <!-- <div class="details-item">
+      <label>主持人：</label>
+      <p><span v-for="(it, index) in details.hosts" :key="it.userid">{{index > 0 ? '、' : ''}}{{it.username}}</span></p>
+    </div> -->
   </div>
 </template>
 <script>
-import { dateFormat } from '@/utils/dateAlgs'
+import { dateFormat, timeTrans } from '@/utils/dateAlgs'
 export default {
   props: {
     data: {
@@ -40,18 +61,23 @@ export default {
     return {}
   },
   computed: {
-    ev() {
+    details() {
       return this.data.ev
     },
     isSameDate() {
-      return dateFormat(this.ev.start_time, '{m}-{d}') === dateFormat(this.ev.end_time, '{m}-{d}')
+      return dateFormat(this.details.start_time, '{m}-{d}') === dateFormat(this.details.end_time, '{m}-{d}')
     },
     isEndTimeZeroPoint() {
-      return dateFormat(this.ev.end_time, '{h}:{i}') === '00:00'
+      return dateFormat(this.details.end_time, '{h}:{i}') === '00:00'
+    },
+    enableJoin() {
+      return this.details.status < 3 && timeTrans(this.details.end_time).getTime() > Date.now()
     }
   },
-  created() {
-    // console.log(this.data)
+  methods: {
+    handleLink(url) {
+      window.open(url, '_blank');
+    }
   }
 }
 </script>
@@ -62,15 +88,30 @@ h5{
   color:#409eff;
   margin-bottom:10px;
 }
-p{
+.details-item{
   display:flex;
   line-height:22px;
+  margin-bottom:6px;
 }
-p>i{
+.details-item>label{
+  width:76px;
+}
+.details-item>label>i{
   width:20px;
   padding-top:4px;
 }
-p>span{
-  flex:1;
+.details-item>p{
+  max-width:calc(100% - 120px);
+  color: #4e4e4e;
+}
+.details-item>p.link{
+  max-width:calc(100% - 90px);
+  cursor:pointer;
+}
+.details-item>p.link:hover{
+  color:#AA1941;
+}
+.details-item>p.link span{
+  color:#409eff;
 }
 </style>
\ No newline at end of file

src/pages/calendar/day/index.vue

@@ -165,7 +165,4 @@ export default {
 .schedule{
   height:100%;
 }
-.day .schedule ::v-deep.el-scrollbar__wrap{
-  overflow-x: hidden;
-}
 </style>
\ No newline at end of file

src/pages/search/index.vue

@@ -43,7 +43,7 @@
         </el-row>
       </div>
       <el-table :data="listData" style="width: 100%" height="calc(100% - 116px)" v-loading="loading">
-        <el-table-column prop="meeting_code" label="会议号" width="120"></el-table-column>
+        <el-table-column prop="meeting_code" label="会议号" width="120" align="center"></el-table-column>
         <el-table-column label="会议时间" min-width="220" align="center">
           <template slot-scope="scope">
             <p style="color: #aeaeae">
@@ -128,7 +128,7 @@ export default {
       listData: [],
       curPage: 1,
       pageSize: 20,
-      total: 200,
+      total: 0,
       loading: false
     }
   },

src/utils/dateAlgs.js

@@ -101,7 +101,7 @@ export function getCurHalfHourDate(type, date) {
   return new Date(date.getFullYear(), date.getMonth(), date.getDate(), h, m, 0)
 }
 /**
- * 将日期转换为年月日整时
+ * 将日期转换为年月日0点整时
  * @param {(Object|string|number)} date
  * @returns {Date Object}
  */
@@ -110,7 +110,7 @@ export function getYMDByDate(date) {
   return new Date(date.getFullYear(), date.getMonth(), date.getDate())
 }
 /**
- * 将日期转换为年月日整时
+ * 将日期转换为年月日整时的时间戳
  * @param {(Object|string|number)} date
  * @returns {Date Object}
  */