修改bug

src/components/MeetingSuccessDialog/index.vue

 <template>
-  <el-dialog class="meeting-success-dialog" :title="`会议号${details.meeting_code ? '：' + details.meeting_code : ''}`" :visible="dialogVisible" width="520" :close-on-click-modal="false" center @close="dialogClose">
+  <el-dialog class="meeting-success-dialog" :title="`会议号${details.meeting_code ? '：' + details.meeting_code : ''}`" :visible="dialogVisible" :modal-append-to-body="false" width="520" :close-on-click-modal="false" center @close="dialogClose">
     <p style="padding-left:28px;margin-bottom:10px;" v-if="details.sso_user">{{details.sso_user.username}}邀请您参加腾讯会议</p>
     <el-form class="dialog-meeting-details" label-width="100px" ref="details">
       <el-form-item label="会议主题:">

src/components/Schedule/index.vue

@@ -192,6 +192,14 @@ export default {
       },
       deep: true
     },
+    'options.closeNewPopover': {
+      handler: function(nv, ov) {
+        if (nv) {
+          this.newPopoverVisible = false
+        }
+      },
+      deep: true
+    },
     date: {
       handler: function(nv) {
         if (nv) {

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

@@ -8,7 +8,7 @@
       <el-form-item label="开始时间" required>
         <el-col :span="11">
           <el-form-item prop="startDate">
-            <el-date-picker v-model="form.startDate" type="date" placeholder="选择日期" style="width: 100%;" size="small" :clearable="timerClear" :editable="timerClear" :picker-options="startDateOptions" @change="startDateChange" />
+            <el-date-picker v-model="form.startDate" type="date" placeholder="选择日期" style="width: 100%;" size="small" :clearable="timerClear" :editable="timerClear" :picker-options="startDateOptions" :format="startDateShowFormat" @change="startDateChange" />
           </el-form-item>
         </el-col>
         <el-col :span="2" class="line">-</el-col>
@@ -21,7 +21,7 @@
       <el-form-item label="结束时间" required>
         <el-col :span="11">
           <el-form-item prop="endDate">
-            <el-date-picker v-model="form.endDate" type="date" placeholder="选择日期" style="width: 100%;" size="small" :clearable="timerClear" :editable="timerClear" :picker-options="endDateOptions" @change="endDateChange" />
+            <el-date-picker v-model="form.endDate" type="date" placeholder="选择日期" style="width: 100%;" size="small" :clearable="timerClear" :editable="timerClear" :picker-options="endDateOptions" :format="endDateShowFormat" @change="endDateChange" />
           </el-form-item>
         </el-col>
         <el-col :span="2" class="line">-</el-col>
@@ -131,6 +131,22 @@ export default {
   },
   computed: {
     ...mapGetters(['user']),
+    startDateShowFormat() {
+      const date = this.form.startDate
+      if (typeof date === 'object' && date instanceof Date) {
+        return 'yyyy-MM-dd    周' + dateFormat(date, '{a}')
+      } else {
+        return 'yyyy-MM-dd'
+      }
+    },
+    endDateShowFormat() {
+      const date = this.form.startDate
+      if (typeof date === 'object' && date instanceof Date) {
+        return 'yyyy-MM-dd    周' + dateFormat(date, '{a}')
+      } else {
+        return 'yyyy-MM-dd'
+      }
+    },
     startTimestamp() {
       return this.getFullDateTime(this.form.startDate, this.form.startTime).getTime()
     },
@@ -200,6 +216,13 @@ export default {
       },
       immediate: true,
       deep: true
+    },
+    dialogVisible: {
+      handler: function (nv) {
+        if (!nv) {
+          this.$emit('closeNewPopover')
+        }
+      }
     }
   },
   components: { MeetingSuccessDialog },

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

@@ -2,14 +2,18 @@
   <div :class="getClass(ev)">
     <div class="status">
       {{ev.status | statusFilter}}
-      <span class="time-range">{{ev.start_time | timeFormat}}-{{ev.end_time | timeFormat}}</span>
+      <!-- <span class="time-range">{{ev.start_time | timeFormat}}-{{ev.end_time | timeFormat}}</span> -->
     </div>
     <div class="event-cont">
       <div class="title">
         <span>{{ev.subject}}</span>
       </div>
       <div class="creator">
-        <span><i class="el-icon-user"></i>:{{ev.sso_user.nickname}}</span>
+        <span>
+          <!-- <i class="el-icon-user"></i>: -->
+          创建人：
+          {{ev.sso_user.username}}
+          </span>
       </div>
     </div>
   </div>
@@ -55,9 +59,9 @@ export default {
         'schedule-ev-inner test': true,
         'status-start': ev.status === 1,
         'status-notstarted': ev.status === 0,
-        small: h < 120 && h >= 40,
-        medium: h >= 120 && h < 200,
-        large: h >= 200
+        small: h < 80 && h >= 40,
+        medium: h >= 80 && h < 120,
+        large: h >= 120
       }
     }
   }
@@ -107,6 +111,7 @@ export default {
   line-height: 18px;
   display: flex;
   height: calc(100% - 18px);
+  padding-left:16px;
 }
 .title {
   flex-grow: 1;
@@ -114,6 +119,8 @@ export default {
   align-items: center;
 }
 .title span {
+  word-break:break-all;
+  padding-right:5px;
   overflow: hidden;
   text-overflow: ellipsis;
   display: -webkit-box;
@@ -124,44 +131,55 @@ export default {
   display: flex;
   align-items: center;
   white-space: nowrap;
+  max-width:120px;
+}
+.creator span{
+  word-break:break-all;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-box-orient: vertical;
+}
+.small .creator, .medium .creator, .large .creator{
+  max-width:unset;
 }
 .small .status {
-  line-height: 30px;
+  line-height: 24px;
 }
 .small .event-cont {
-  height: calc(100% - 32px);
+  display: block;
+  height: calc(100% - 24px);
 }
-.small .title span {
-  -webkit-line-clamp: 3;
+.small .title {
+  height: calc(100% - 24px);
 }
 .medium .status {
-  line-height: 38px;
+  line-height: 32px;
 }
 .medium .event-cont {
   display: block;
-  height: calc(100% - 40px);
+  height: calc(100% - 34px);
 }
 .medium .title {
   height: calc(100% - 32px);
 }
 .medium .title span {
-  -webkit-line-clamp: 5;
+  -webkit-line-clamp: 3;
 }
 .medium .creator {
   line-height: 32px;
 }
 .large .status {
-  line-height: 46px;
+  line-height: 36px;
 }
 .large .event-cont {
   display: block;
-  height: calc(100% - 48px);
+  height: calc(100% - 38px);
 }
 .large .title {
   height: calc(100% - 36px);
 }
 .large .title span {
-  -webkit-line-clamp: 9;
+  -webkit-line-clamp: 5;
 }
 .large .creator {
   line-height: 36px;

src/pages/calendar/day/index.vue

@@ -8,7 +8,7 @@
         <details-popover :data="scope.data"/>
       </template>
       <template slot="new-schedule" slot-scope="scope">
-        <new-popover :data="scope.data" :date="defaultDate" @refreshPopover="refreshPop" @refreshData="getScheduleData"/>
+        <new-popover :data="scope.data" :date="defaultDate" @refreshPopover="refreshPop" @refreshData="getScheduleData" @closeNewPopover="options.closeNewPopover = true"/>
       </template>
     </schedule>
   </div>
@@ -44,7 +44,8 @@ export default {
         defaultViewTime: '8:00', // 滚动条滚动至需显示的起始时间，需要与step对应
         nowBeforeDisabled: true,
         minWidth: '200px',
-        refreshPopoverState: 0
+        refreshPopoverState: 0,
+        closeNewPopover: false
       },
       schedule: {
         id: 'live-1',

src/pages/calendar/list/index.vue

@@ -52,7 +52,7 @@
           </p>
         </template>
       </el-table-column>
-      <el-table-column prop="sso_user.nickname" label="创建人" min-width="100" align="center"></el-table-column>
+      <el-table-column prop="sso_user.username" label="创建人" min-width="100" align="center"></el-table-column>
       <el-table-column label="操作" width="240" align="center">
         <template slot-scope="scope">
           <table-handles :rowData="scope.row" @refresh="fetchMeetingList"/>

src/pages/meeting/tencent-meeting/components/MeetingForm.vue

@@ -6,7 +6,7 @@
     <el-form-item label="开始时间" required>
       <el-col :span="11">
         <el-form-item prop="startDate">
-          <el-date-picker v-model="form.startDate" type="date" placeholder="选择日期" style="width: 100%" size="small" :clearable="timerClear" :editable="timerClear" :picker-options="startDateOptions" @change="startDateChange" />
+          <el-date-picker v-model="form.startDate" type="date" placeholder="选择日期" style="width: 100%" size="small" :clearable="timerClear" :editable="timerClear" :picker-options="startDateOptions" :format="startDateShowFormat" @change="startDateChange" />
         </el-form-item>
       </el-col>
       <el-col :span="2" class="line">-</el-col>
@@ -19,7 +19,7 @@
     <el-form-item label="结束时间" required>
       <el-col :span="11">
         <el-form-item prop="endDate">
-          <el-date-picker v-model="form.endDate" type="date" placeholder="选择日期" style="width: 100%" size="small" :clearable="timerClear" :editable="timerClear" :picker-options="endDateOptions" @change="endDateChange" />
+          <el-date-picker v-model="form.endDate" type="date" placeholder="选择日期" style="width: 100%" size="small" :clearable="timerClear" :editable="timerClear" :picker-options="endDateOptions" :format="endDateShowFormat" @change="endDateChange" />
         </el-form-item>
       </el-col>
       <el-col :span="2" class="line">-</el-col>
@@ -129,7 +129,7 @@
       <el-checkbox v-model="form.live_config.enable_live_im">准许观众讨论</el-checkbox>
     </el-form-item>
     <el-form-item style="padding-left: 100px">
-      <el-button type="primary" @click="submitForm('ruleForm')" size="mini">创建</el-button>
+      <el-button type="primary" @click="submitForm('ruleForm')" size="mini">{{btnText}}</el-button>
       <!-- <el-button @click="resetForm('ruleForm')" size="mini">重置</el-button> -->
       <el-button @click="goList" size="mini">取消</el-button>
     </el-form-item>
@@ -210,6 +210,7 @@ export default {
     }
     return {
       timerClear: false,
+      // startDateShowFormat: 'yyyy-MM-dd',
       form: {
         subject: '',
         startDate: nowDate,
@@ -275,6 +276,22 @@ export default {
   },
   computed: {
     ...mapGetters(['user']),
+    startDateShowFormat() {
+      const date = this.form.startDate
+      if (typeof date === 'object' && date instanceof Date) {
+        return 'yyyy-MM-dd    周' + dateFormat(date, '{a}')
+      } else {
+        return 'yyyy-MM-dd'
+      }
+    },
+    endDateShowFormat() {
+      const date = this.form.startDate
+      if (typeof date === 'object' && date instanceof Date) {
+        return 'yyyy-MM-dd    周' + dateFormat(date, '{a}')
+      } else {
+        return 'yyyy-MM-dd'
+      }
+    },
     startDateOptions() {
       return {
         disabledDate(time) {
@@ -298,10 +315,11 @@ export default {
       const date = this.form.startDate
       return {
         disabledDate(time) {
-          return (
-            getTimestampYMD(time) < getTimestampYMD(date) ||
-            getTimestampYMD(time) > getTimestampYMD(date) + DAY_TIMESTAMP
-          )
+          // return (
+          //   getTimestampYMD(time) < getTimestampYMD(date) ||
+          //   getTimestampYMD(time) > getTimestampYMD(date) + DAY_TIMESTAMP
+          // )
+          return getTimestampYMD(time) !== getTimestampYMD(date)
         }
       }
     },
@@ -317,7 +335,7 @@ export default {
         options = {
           start: startTime,
           step: '00:30',
-          end: '23:30'
+          end: '24:00'
         }
       } else {
         // 结束时间和开始时间不能超过24小时，相隔一天，则向前推半小时
@@ -385,6 +403,11 @@ export default {
     },
     endTimestamp() {
       return this.getFullDateTime(this.form.endDate, this.form.endTime).getTime()
+    },
+    btnText() {
+      const path = this.$route.path
+      const text = path === '/meeting-create' ? '创建' : '更新'
+      return text
     }
   },
   filters: {

src/pages/meeting/tencent-meeting/meeting-update.vue

@@ -132,7 +132,7 @@ export default ({
     fetchUpdateMeeting(params) {
       const loading = this.$loading({
         lock: true,
-        text: '修改腾讯会议中，请稍后...',
+        text: '更新腾讯会议中，请稍后...',
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
@@ -141,11 +141,11 @@ export default ({
       updateMeeting(params).then(res => {
         loading.close()
         if (res.code === 0 && res.data.id) {
-          operateLog({ type: `修改会议，被修改会议meeting_code：${res.data.meeting_code}`, user: this.user })
-          this.$message.success('修改腾讯会议成功')
+          operateLog({ type: `更新会议，被更新会议meeting_code：${res.data.meeting_code}`, user: this.user })
+          this.$message.success('更新腾讯会议成功')
           this.showMeetingDetails(res.data)
         } else {
-          this.$message.error(res.message || res.msg || '修改腾讯会议失败')
+          this.$message.error(res.message || res.msg || '更新腾讯会议失败')
         }
       })
     },

src/pages/my/index.vue

@@ -5,7 +5,7 @@
       <div class="item">
         <div class="avatar"><img :src="user.avatar"></div>
         <div class="user">
-          <p>{{user.nickname}}</p>
+          <p>{{user.username}}</p>
           <p>ID：{{user.id}}</p>
         </div>
       </div>

src/pages/search/index.vue

@@ -94,7 +94,7 @@
             </p>
           </template>
         </el-table-column>
-        <el-table-column prop="sso_user.nickname" label="创建人" min-width="100" align="center"></el-table-column>
+        <el-table-column prop="sso_user.username" label="创建人" min-width="100" align="center"></el-table-column>
         <el-table-column label="操作" width="240" align="center">
           <template slot-scope="scope">
             <table-handles :rowData="scope.row" @refresh="fetchMeetingList"/>