Merge remote-tracking branch 'origin/master_fhhx_20250718' into master_fhhx_20250718

src/views/live/liveVideo/index.vue

@@ -473,6 +473,9 @@ export default {
     videoTypeFormatter(row, column) {
       return this.selectDictLabel(this.videoTypeOptions, row.status);
     },
+    categoryFormatter(row, column) {
+      return this.selectDictLabel(this.categoryOptions, row.category);
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -763,30 +766,30 @@ export default {
     handleDelete(row) {
       const videoIds = row.videoId || this.ids;
       this.$confirm('是否确认删除直播视频编号为"' + videoIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delLiveVideo(videoIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(() => {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return delLiveVideo(videoIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有直播视频数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          this.exportLoading = true;
-          return exportLiveVideo(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-          this.exportLoading = false;
-        }).catch(() => {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.exportLoading = true;
+        return exportLiveVideo(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
     },
     /** 批量修改分类 */
     handleBatchUpdateCategory() {