12.4 ok

src/api/modules/rai/videoListApi.js

@@ -70,4 +70,17 @@ export default {
   askseriePreserveAndEdit: (params) => {
     return http.post("/cygx/askserie_video/preserveAndEdit", params);
   },
+  /*发布/取消发布 */
+  askseriePublishAndcancel: (params) => {
+    return http.post("/cygx/askserie_video/publishAndcancel", params);
+  },
+  /*发布/取消发布 */
+  activityVoiceAndVideoList: (params) => {
+    return http.get("/cygx/activity_voice_and_video/list", params);
+  },
+  /*发布/取消发布 */
+  activityVoiceAndVideoCommentList: (params) => {
+    return http.get("/cygx/activity_voice_and_video/commentList", params);
+  },
+  
 };

src/views/rai_manage/activityManage/roadShow/components/playDetailsDlg.vue

@@ -3,19 +3,12 @@
     <el-dialog v-dialogDrag :close-on-click-modal="false" :modal-append-to-body="false" center title="播放详情" :visible.sync="playDetailsVisible" width="1242px" :before-close="cancelHandle">
       <el-table :data="dataList" style="width: 100%" border height="400">
         <template v-for="item in tableColums">
-          <el-table-column
-            :key="item.label"
-            :label="item.label"
-            :width="item.widthsty"
-            :min-width="item.minwidthsty"
-            align="center"
-            v-if="(tabActive == 1 || tabActive == 2) && item.key != 'PlaySeconds'"
-          >
+          <el-table-column :key="item.label" :label="item.label" :width="item.widthsty" :min-width="item.minwidthsty" align="center" v-if="tabActive == 4 && item.key != 'PlaySeconds'">
             <template slot-scope="{ row }">
               <span>{{ handleRowContent(row, item.key) }}</span>
             </template>
           </el-table-column>
-          <el-table-column :key="item.label" :label="item.label" :width="item.widthsty" :min-width="item.minwidthsty" align="center" v-else-if="tabActive == 3">
+          <el-table-column :key="item.label" :label="item.label" :width="item.widthsty" :min-width="item.minwidthsty" align="center" v-else-if="tabActive != 4">
             <template slot-scope="{ row }">
               <span>{{ handleRowContent(row, item.key) }}</span>
             </template>
@@ -63,14 +56,15 @@ export default {
     "playDetailsList.VideoId": {
       handler(newval) {
         if (newval) {
-          this.tabActive == 1 ? this.getVideoDeatil() : this.activityVideoDeatil();
+          this.tabActive == 4 && this.getVideoDeatil();
         }
       },
     },
-    "playDetailsList.ActivityVoiceId": {
+    "playDetailsList.FileName": {
       handler(newval) {
         if (newval) {
-          this.getVoiceDeatil();
+          newval == "视频" && this.activityVideoDeatil();
+          newval == "音频" && this.getVoiceDeatil();
         }
       },
     },
@@ -97,7 +91,7 @@ export default {
       }
     },
     async getVoiceDeatil() {
-      const res = await raiVideoApi.voiceDeatil({ VoiceId: this.playDetailsList.ActivityVoiceId });
+      const res = await raiVideoApi.voiceDeatil({ VideoId: this.playDetailsList.VideoId });
       if (res.Ret === 200) {
         this.dataList = res.Data || [];
       }
@@ -111,7 +105,7 @@ export default {
     async askserieVideoHistoryList() {
       const res = await raiVideoApi.askserie_videoHistory_list({ AskserieVideoId: this.playDetailsList.AskserieVideoId });
       if (res.Ret === 200) {
-        this.dataList = res.Data || [];
+        this.dataList = res.Data.List || [];
       }
     },
     handleRowContent(row, key) {

src/views/rai_manage/activityManage/roadShow/tableTabs.js

@@ -1,6 +1,6 @@
 //表格列
 export const tableColums = (type) => {
-  return type === 1 || type === 4
+  return type === 1 || type === 2
     ? [
         {
           label: "文件名称",
@@ -8,28 +8,29 @@ export const tableColums = (type) => {
           widthsty: 300,
         },
         {
-          label: "行业",
-          key: "ChartPermissionName",
+          label: "文件类型",
+          key: "FileName",
           widthsty: 90,
         },
         {
-          label: "产业",
-          key: "IndustryName",
+          label: "行业",
+          key: "ChartPermissionName",
+          widthsty: 90,
         },
         {
-          label: "发布状态",
-          key: "PublishStatus",
-          widthsty: 90,
+          label: "活动类型",
+          key: "ActivityTypeName",
+          minwidthsty: "110",
         },
         {
-          label: "发布时间",
-          key: "PublishDate",
-          widthsty: 160,
+          label: "活动标签",
+          key: "Label",
+          minwidthsty: "120",
         },
         {
-          label: "更新时间",
-          key: "ModifyDate",
-          widthsty: 160,
+          label: "活动时间",
+          key: "ActivityTimeText",
+          minwidthsty: "200",
         },
         {
           label: "时长",
@@ -47,7 +48,7 @@ export const tableColums = (type) => {
           widthsty: 100,
         },
       ]
-    : type === 2
+    : type === 3
     ? [
         {
           label: "文件名称",
@@ -60,19 +61,23 @@ export const tableColums = (type) => {
           widthsty: 90,
         },
         {
-          label: "活动类型",
-          key: "ActivityTypeName",
-          minwidthsty: "110",
+          label: "产业",
+          key: "IndustryName",
         },
         {
-          label: "活动标签",
-          key: "Label",
-          minwidthsty: "120",
+          label: "发布状态",
+          key: "PublishStatus",
+          widthsty: 90,
         },
         {
-          label: "活动时间",
-          key: "ActivityTimeText",
-          minwidthsty: "200",
+          label: "发布时间",
+          key: "PublishDate",
+          widthsty: 160,
+        },
+        {
+          label: "更新时间",
+          key: "ModifyDate",
+          widthsty: 160,
         },
         {
           label: "时长",
@@ -93,7 +98,7 @@ export const tableColums = (type) => {
     : [
         {
           label: "文件名称",
-          key: "VoiceName",
+          key: "VideoName",
           widthsty: 300,
         },
         {
@@ -102,28 +107,32 @@ export const tableColums = (type) => {
           widthsty: 90,
         },
         {
-          label: "活动类型",
-          key: "ActivityTypeName",
-          minwidthsty: "110",
+          label: "产业",
+          key: "IndustryName",
         },
         {
-          label: "活动标签",
-          key: "Label",
-          minwidthsty: "120",
+          label: "发布状态",
+          key: "PublishStatus",
+          widthsty: 90,
         },
         {
-          label: "活动时间",
-          key: "ActivityTimeText",
-          minwidthsty: "200",
+          label: "发布时间",
+          key: "PublishDate",
+          widthsty: 160,
+        },
+        {
+          label: "更新时间",
+          key: "ModifyDate",
+          widthsty: 160,
         },
         {
           label: "时长",
-          key: "VoicePlaySeconds",
+          key: "VideoDuration",
           widthsty: 100,
         },
         {
           label: "播放量",
-          key: "VoiceCounts",
+          key: "VideoCounts",
           widthsty: 100,
         },
         {
@@ -161,8 +170,8 @@ export const PalyTable = [
   },
 ];
 export const TopTabs = [
-  { name: "路演回放", value: 2 },
-  { name: "调研反馈", value: 3 },
-  { name: "问答系列", value: 4 },
-  { name: "产业视频", value: 1 },
+  { name: "路演回放", value: 1 },
+  { name: "调研反馈", value: 2 },
+  { name: "问答系列", value: 3 },
+  { name: "产业视频", value: 4 },
 ];

src/views/rai_manage/activityManage/roadShowList.vue

@@ -26,8 +26,8 @@
           </el-select>
         </div>
         <div>
-          <el-button type="primary" v-if="tabActive === 1" @click="addEditdialogVisib = true">添加视频</el-button>
-          <el-button type="primary" v-if="tabActive === 4" @click="addEditdialogReleaseAudio = true">发布问答</el-button>
+          <el-button type="primary" v-if="tabActive === 4" @click="addEditdialogVisib = true">添加视频</el-button>
+          <el-button type="primary" v-if="tabActive === 3" @click="addEditdialogReleaseAudio = true">发布问答</el-button>
         </div>
       </div>
       <el-table :data="dataList" style="width: 100%" border @sort-change="sortChangeHandle">
@@ -46,7 +46,7 @@
         >
         <el-table-column align="center" prop="LastUpdatedTime" width="170" label="操作">
           <template slot-scope="{ row }">
-            <div v-if="tabActive === 1 || tabActive === 4">
+            <div v-if="tabActive === 4 || tabActive === 3">
               <span class="editsty" @click="handlePublish(row)">{{ row.PublishStatus == 1 ? "取消发布" : "发布" }}</span>
               &nbsp;&nbsp;
               <span class="editsty" @click="handleEditVideo(row, '产业')">编辑</span>
@@ -91,7 +91,7 @@ export default {
     return {
       tableColums: [],
       dataList: [],
-      tabActive: 2, //tabs 选中
+      tabActive: 1, //tabs 选中
       chartPermissionList: [], //行业的数组
       chartPermissionId: "", //行业的id
       issueTime: "", //活动时间
@@ -166,7 +166,7 @@ export default {
       }
     },
     async getVideoList() {
-      let SortParam = this.sortType && this.tabActive == 1 ? "videoCounts" : this.sortType && this.tabActive == 2 ? "voiceCounts" : "";
+      // let SortParam = this.sortType && this.tabActive == 4 ? "videoCounts" : this.sortType && this.tabActive == 1 ? "voiceCounts" : "";
       let params = {
         PageSize: this.PageSize,
         CurrentIndex: this.page_no,
@@ -177,16 +177,17 @@ export default {
         ChartPermissionId: this.chartPermissionId,
         ActivityTypeId: this.cactivityTypeVal,
         SortType: this.sortType,
-        SortParam,
+        SortParam: "videoCounts",
+        SearchType: this.tabActive,
       };
       const res =
-        this.tabActive == 1
+        this.tabActive == 4
           ? await raiVideoApi.videoList(params)
-          : this.tabActive == 2
-          ? await raiVideoApi.getActivityVideo(params)
-          : this.tabActive == 4
+          : this.tabActive == 1
+          ? await raiVideoApi.activityVoiceAndVideoList(params)
+          : this.tabActive == 3
           ? await raiVideoApi.askserie_videoList(params)
-          : await raiVideoApi.voiceList(params);
+          : await raiVideoApi.activityVoiceAndVideoList(params);
       if (res.Ret === 200) {
         this.dataList = res.Data.List;
         this.total = res.Data.Paging.Totals;
@@ -207,7 +208,6 @@ export default {
     },
     /* 点击表格的排序 */
     sortChangeHandle({ prop, order }) {
-      console.log(order);
       this.sortType = order == "ascending" ? "asc" : order == "descending" ? "desc" : "";
       this.getVideoList();
     },
@@ -247,7 +247,7 @@ export default {
         this.playDetailsList = row;
       } else if (key == "CommentNum") {
         this.generaitondialogVisib = true;
-        this.generaitonId = this.tabActive == 3 ? row.ActivityId : this.tabActive == 4 ? row.AskserieVideoId : row.VideoId;
+        this.generaitonId = this.tabActive == 1 || this.tabActive == 2 ? row.ActivityId : this.tabActive == 3 ? row.AskserieVideoId : row.VideoId;
       }
     },
     /*
@@ -264,16 +264,23 @@ export default {
     },
     //发布或者取消发布
     handlePublish(item) {
-      this.$confirm(item.PublishStatus == 1 ? "确认取消发布该视频吗？" : "确认发布该视频吗？", "提示", {
+      let str = this.tabActive == 3 ? "音频" : "视频";
+      this.$confirm(item.PublishStatus == 1 ? `确认取消发布该${str}吗？` : `确认发布该${str}吗？`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(async () => {
-          const res = await raiVideoApi.videoPublish({
-            VideoId: item.VideoId,
-            PublishOrCancle: item.PublishStatus == 1 ? 0 : 1,
-          });
+          const res =
+            this.tabActive == 3
+              ? await raiVideoApi.askseriePublishAndcancel({
+                  AskserieVideoId: item.AskserieVideoId,
+                  PublishOrCancle: item.PublishStatus == 1 ? 0 : 1,
+                })
+              : await raiVideoApi.videoPublish({
+                  VideoId: item.VideoId,
+                  PublishOrCancle: item.PublishStatus == 1 ? 0 : 1,
+                });
           if (res.Ret === 200) {
             this.$message.success("操作成功！");
             this.getVideoList();
@@ -298,7 +305,7 @@ export default {
         });
       } else {
         this.editDetails = item;
-        if (this.tabActive == 4) {
+        if (this.tabActive == 3) {
           this.addEditdialogReleaseAudio = true;
         } else {
           this.addEditdialogVisib = true;

src/views/rai_manage/components/generationAsk.vue

@@ -60,11 +60,11 @@ export default {
       } else if (this.generaitonType == "报名") {
         url = "/cygx/activitySignup/askListExport?ActivityId=";
       } else if (this.generaitonType == "微路演") {
-        this.tabActiveRoadshow == 1
+        this.tabActiveRoadshow == 4
           ? (url = "/cygx/microRoadshow/commentListExport/video?VideoId=")
-          : this.tabActiveRoadshow == 2
-          ? (url = "/cygx/activityVideo/commnetListExport?VideoId=")
-          : (url = "/cygx/microRoadshow/commentListExport/voice?ActivityId=");
+          : this.tabActiveRoadshow == 3
+          ? (url = "/cygx/askserie_video/collection_list?IsExport=true&AskserieVideoId=")
+          : (url = "/cygx/activity_voice_and_video/commentList?IsExport=true&ActivityId=");
       } else {
         url = "/cygx/summaryManage/commentListExport?ArticleId=";
       }
@@ -136,19 +136,15 @@ export default {
     //微路演
     async getRoadshowList() {
       const res =
-        this.tabActiveRoadshow == 1
+        this.tabActiveRoadshow == 4
           ? await raiVideoApi.getMicroRoadshowVideo({
               VideoId: this.generaitonId,
             })
-          : this.tabActiveRoadshow == 2
-          ? await raiVideoApi.getMicroRoadshowVoice({
-              VideoId: this.generaitonId,
-            })
-          : this.tabActiveRoadshow == 4
+          : this.tabActiveRoadshow == 3
           ? await raiVideoApi.askserieVideoCollectionList({
               AskserieVideoId: this.generaitonId,
             })
-          : await raiVideoApi.getMicroRoadshowCommentList({
+          : await raiVideoApi.activityVoiceAndVideoCommentList({
               ActivityId: this.generaitonId,
             });