Merge branch 'main' into 'stg'

Main

See merge request cloud-mediate/mediate-manage-web!86

src/pages/event-tracing/components/voideDialog.vue

@@ -66,7 +66,10 @@
             <el-table-column prop="bookingEndTime" label="预约结束时间" show-overflow-tooltip></el-table-column>
             <el-table-column label="状态" show-overflow-tooltip>
               <template slot-scope="scope">
-                <span v-if="$util.getTimeContrast(scope.row.bookingEndTime)">
+                <span v-if="$util.getTimeContrast(scope.row.bookingEndTime) && scope.row.status.code == 0">
+                  未开始
+                </span>
+                <span v-else-if="scope.row.status.code != 0">
                   {{ scope.row.status.code == 0 ? '未开始': '' }}
                   {{ scope.row.status.code == 1 ? '进行中': '' }}
                   {{ scope.row.status.code == 2 ? '已结束': '' }}

src/pages/mediation-page/components/VideoInvitation.vue

@@ -185,6 +185,7 @@ export default {
           videoTelephone.videoInvite({...this.repaymentObj, litigants: resultArr}).then(res => {
             this.handleClose()
             this.$message.success("邀请成功");
+            this.$emit('submitHand', null)
           })
         }
       })

src/pages/mediation-page/components/VideoRoom.vue

@@ -27,7 +27,7 @@
       </div>
       <!--  远端    -->
       <div class="video-col position-r" :class="personnelNumber <= 4 ? 'w-50' : 'w-33'"
-           v-for="(item, index) in remoteUsersViews" :key="index">
+           v-for="(item) in remoteUsersViews" :key="item.id">
         <div class="video-col-Graphics border-radius-4" :id="item.id"></div>
         <div class="video-col-btn" v-if="zoomActive">
           <div class="cursor-pointer" v-if="item.microphone" @click="handleOffRemoteAudio(item.userId)">
@@ -68,7 +68,7 @@
       </div>
     </div>
 
-    <VideoInvitation v-if="InviteDialog" :eventDialog.sync="InviteDialog" />
+    <VideoInvitation v-if="InviteDialog" :eventDialog.sync="InviteDialog" @submitHand="getVideoDetail" />
   </div>
 </template>
 
@@ -358,6 +358,7 @@ export default {
       const { userId, streamType } = event;
       try {
         let obj = this.arrPersonnel.find(item => item.phone === userId)
+        console.log(obj, '---obj远端进入房间')
         let data = {
           id: `${userId}_main`,
           name: obj.name,

src/pages/mediation-page/components/cassWrit.vue

@@ -56,7 +56,7 @@
           handleBy 操作人
           handleTime 操作时间 -->
           <a class="color-86909C f12 pt-6 pb-6">{{item.handleBy}}&nbsp;&nbsp;{{ $util.formatDate(item.handleTime, 'YYYY-MM-DD HH:mm:ss')}}</a>
-          <div class="flex-row align-items-center color-86909C" v-if="(item.signList.length > 0 || item.unsignList.length > 0)&&(item.signStatus != null && item.signStatus.code == 1)">
+          <div class="flex-row align-items-center color-86909C" v-if="(item.signList.length > 0 || item.unsignList.length > 0)&&(item.signStatus != null && (item.signStatus.code != 1))">
             <div>签字</div>
             <div class="flex-row" v-for="(item1, index1) in item.unsignList" :key="index1">
               <el-tag v-if="item1.signStatus.code == 2" class="ml-4" size="small" type="success" effect="plain">{{item1.signName}}</el-tag>