广场管理优化

src/utils/filter.js

@@ -572,7 +572,7 @@ const vueFilter = {
 
   circleTypeFilter: (value) => {
     if(value == 0){
-      return "默认封闭"
+      return "封闭"
     }
     else if(value == 1){
       return "半开放"

src/views/activitymanagement/activity-member.vue

@@ -84,8 +84,8 @@
     >
       <p style="text-align: center;">{{detelMessage}}</p>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="confirmDelete">删 除</el-button>
-        <el-button type="primary" @click="hideDeleteFrom">取 消</el-button>
+        <el-button @click="hideDeleteFrom">取 消</el-button>
+        <el-button type="primary" @click="confirmDelete">确定</el-button>
       </span>
     </el-dialog>
 

src/views/plaza/plaza-list.vue

 <template>
   <div class="yqrange-index-wrapper">
+    <bread-crumb :curmbFirst="curmbFirst"></bread-crumb>
     <!--<bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb>-->
-    <div class="yqrange-index-content" id="screenSet">
-      <!--<div class="header-title">直播管理</div>-->
+    <div class="yqrange-index-content screenSet">
+      <div class="header-title">广场管理</div>
       <el-form
         ref="searchForm"
         :model="searchForm"
@@ -108,7 +109,7 @@
             <span>{{ scope.row.subjectTags | tagsFilter }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="createdTime" label="添加时间" min-width="100" align="center">
+        <el-table-column prop="createdTime" label="添加时间" min-width="70" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.createdTime | liveDateFilter }}</span>
           </template>
@@ -233,8 +234,8 @@
 
         </el-form>
         <div slot="footer" class="dialog-footer" style="text-align: center;">
-          <el-button type="default" size="small" @click="cancle()" left>取消</el-button>
-          <el-button type="primary" size="small" @click="savePlaza()" right>确定</el-button>
+          <el-button type="default" @click="cancle()" left>取消</el-button>
+          <el-button type="primary" @click="savePlaza()" right>确定</el-button>
         </div>
 
       </el-dialog>
@@ -263,8 +264,8 @@
     data() {
       return {
         rtcId: null,
-        curmbFirst: "云鹊小圈",
-        curmbSecond: "直播管理",
+        curmbFirst: "广场管理",
+        // curmbSecond: "直播管理",
         dialogStatisticsVisible: false,
         dialogLivelinkVisible: false,
         dialogLivePlaybackVisible: false,
@@ -432,149 +433,12 @@
         },
         vm.getSelectPlazaList(0);
       },
-      //弹出直播链接弹窗
-      liveLink(row) {
-        this.dialogLivelinkVisible = true;
-        this.scope = row.scope;
-        this.liveStatus = row.liveStatus;
-        this.streamType = row.streamType;
-        console.log(
-          "liveLink() : scope = " +
-          this.scope +
-          ", liveStatus = " +
-          this.liveStatus
-        );
-
-        vm.GET("rtc/liveAdmin/url/" + row.id, "").then(res => {
-          if (res.code == "000000") {
-          this.lecturerUrl = res.data.lecturerUrl;
-          this.guestUrl = res.data.guestUrl;
-          this.audienceUrl = res.data.audienceUrl;
-          this.dialogLivelinkVisible = true;
-        } else {
-          //
-        }
-      });
-      },
+
       //关闭直播链接弹窗
       handleClose() {
         vm.dialogVisible = false;
       },
 
-      // // 查询回放信息
-      // getPlayback(){
-      //
-      // }
-
-
-      //设置回放
-      setPlayback(row) {
-        vm.dialogLivePlaybackVisible = true;
-
-        const rtcId = row.id;
-
-        vm.streamType = row.streamType;
-
-
-        // 拉流直播不显示选择区域
-        if(vm.streamType == 2){
-          vm.selectFlag = false;
-          vm.uploadFlag = true;
-          vm.downloadVideoFlag = false;
-        }
-        else {
-          vm.selectFlag = true;
-
-        }
-
-        openLoading(this);
-        getPlayback({rtcId}).then((res) => {
-          closeLoading(this);
-        if(res.code == "000000") {
-          vm.playbackForm = res.data;
-          if(vm.playbackForm.playbackUrls != null){
-            // if(vm.playbackForm.playbackUrls.originalUrls != null){
-
-            vm.playbackForm.videoSource = String(vm.playbackForm.videoSource);
-
-            // if(vm.playbackForm.videos != null && vm.playbackForm.videos.length > 0){
-            //   vm.playbackForm.videos[0].videoSize = vm.videoSize(vm.playbackForm.videos[0].videoSize, 1);
-            // }
-
-
-
-            // 拉流直播 不显示两个选择按钮；只显示①上传回放视频
-            if(vm.streamType == 2){
-              vm.playbackForm.videoSource = "2";
-              vm.selectFlag = false;
-              vm.downloadVideoFlag = false;
-            }
-            // 网页直播
-            else {
-              // 存在多个原视频,如果直播原视频有大于1段，不显示两个选择按钮，而显示“存在..直播原视频，请下载合并后上传”
-              if(vm.playbackForm.playbackUrls.downloadUrls.length > 1){
-                vm.uploadFlag = true;
-                vm.selectFlag = false;
-                vm.numberShowFlag = true;
-                vm.videoNumber = this.playbackForm.playbackUrls.downloadUrls.length;
-                vm.playbackForm.videoSource = "2";
-                vm.downloadVideoFlag = true;
-              }
-              else {
-                vm.selectFlag = true;
-                vm.changeVideoSource();
-                vm.numberShowFlag = false;
-
-                // 当选择第二个按钮“上传回放视频”时，显示①下载②上传
-                if(vm.playbackForm.videoSource == "2"){
-                  vm.downloadVideoFlag = true;
-                }
-
-              }
-            }
-            // 如果回放视频有，则显示删除，不显示上传
-            if(vm.playbackForm.videos != null && vm.playbackForm.videos.length > 0){
-
-
-              // 当选择第二个按钮“上传回放视频”时，显示①下载②上传,如果videoSource等于1，原视频直播，要显示上传，不显示删除
-              if(vm.playbackForm.videoSource == "1"){
-                vm.fileFlag = true;
-                vm.deleteFileFlag = false;
-              }
-              // 当选择第二个按钮“上传回放视频”时，显示①下载②上传,如果videoSource等于2，回放视频，要显示删除，不显示上传
-              else {
-                vm.fileFlag = false;
-                vm.deleteFileFlag = true;
-
-              }
-
-            }
-
-            // // 初始化
-            // vm.uploadProgress1 = Number("0.00");
-            // vm.uploadProgress = Number("0.00");
-            // if(row.streamType == 1){
-            //
-            //   vm.downloadVideoFlag = true;
-            //   vm.changeVideoSource();
-            // }
-            // else {
-            //   vm.playbackForm.videoSource = "2";
-            // }
-
-            // }
-          }
-        }
-      }).catch((error) => {
-          vm.$message({
-          message: "请重试",
-          type: 'error'
-        });
-      })
-
-      },
-
-
       checkBusinessId(){
         if(vm.plazaForm.businessId == ""){
           this.$message.warning("请选择专区名称！");
@@ -645,7 +509,7 @@
               this.$message.success("添加成功！");
             }
             vm.dialogVisible = false;
-            vm.getPlazaList("", "");
+            vm.resetForm();
           } else {
             this.$message.error("添加失败，请重试");
           }
@@ -684,7 +548,7 @@
       //删除专区
       delPlaza(row) {
           this.$confirm(`移除专区后，用户将无法在广场中看到，但不会删除专区本身，确定移除？`, "", {
-            confirmButtonText: "删除",
+            confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning"
             // customClass: 'range-make-box',
@@ -749,22 +613,6 @@
           if (res.data.list == null) {
             return;
           }
-          // for (let i = 0; i < res.data.pageContents.length; i++) {
-          //   let obj = {
-          //     // liveName: res.data.pageContents[i].name,
-          //     // liveScope: res.data.pageContents[i].scope,
-          //     // liveStatus: res.data.pageContents[i].liveStatus,
-          //     // streamType: res.data.pageContents[i].streamType,
-          //     // playbackSetFlag: res.data.pageContents[i].playbackSetFlag,
-          //     // canPlayback: res.data.pageContents[i].canPlayback,
-          //     // createTime: res.data.pageContents[i].createdTime,
-          //     // startTime: res.data.pageContents[i].openTime,
-          //     // endTime: res.data.pageContents[i].endTime,
-          //     // rtcId: res.data.pageContents[i].id,
-          //     // isSign: res.data.pageContents[i].isSign
-          //   };
-          //   listData.push(obj);
-          // }
           this.tableData = res.data.list;
 
           this.totalRows = res.data.total;