|
@@ -668,6 +668,9 @@
|
|
|
<div class="project-list">
|
|
|
<div class="filter-container">
|
|
|
<el-form :inline="true" :model="projectQueryParams" ref="projectForm">
|
|
|
+ <el-form-item>
|
|
|
+ <el-input prefix-icon="el-icon-search" @input="searchProjects" v-model="projectQueryParams.sort" placeholder="请输入题目序号" clearable size="small" />
|
|
|
+ </el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-input prefix-icon="el-icon-search" @input="searchProjects" v-model="projectQueryParams.title" placeholder="请输入题目标题" clearable size="small" />
|
|
|
</el-form-item>
|
|
@@ -896,7 +899,8 @@ export default {
|
|
|
pageSize: 10,
|
|
|
questionType: null,
|
|
|
questionSubType: null,
|
|
|
- title: null
|
|
|
+ title: null,
|
|
|
+ sort: null
|
|
|
},
|
|
|
projectLoading: false,
|
|
|
projectListTotal: 0,
|
|
@@ -1273,7 +1277,7 @@ export default {
|
|
|
this.uploadCancellationTokens.set(form.tempId, tokens);
|
|
|
}
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
let line_1 = `${process.env.VUE_APP_VIDEO_LINE_1}${data.urlPath}`;
|
|
|
form.fileKey = data.urlPath.substring(1);
|
|
|
form.videoUrl = line_1;
|
|
@@ -1310,7 +1314,7 @@ export default {
|
|
|
this.uploadCancellationTokens.set(form.tempId, tokens);
|
|
|
}
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
form.line2 = `${process.env.VUE_APP_VIDEO_LINE_2}/${data.urlPath}`;
|
|
|
|
|
|
// 更新线路2状态为成功
|
|
@@ -1355,7 +1359,7 @@ export default {
|
|
|
const file = options.file;
|
|
|
this.getMediaDuration(file);
|
|
|
this.currentUploadProgress = { total: 0, line1: 0, line2: 0, line1Status: 'pending', line2Status: 'pending' };
|
|
|
-
|
|
|
+
|
|
|
try {
|
|
|
await this.getFirstThumbnail(file, this.form);
|
|
|
const [line1Result, line2Result] = await Promise.allSettled([
|
|
@@ -1564,7 +1568,7 @@ export default {
|
|
|
console.error('Error cancelling COS upload:', error);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
// Cancel OBS upload if exists
|
|
|
if (cancellationTokens.obs) {
|
|
|
try {
|
|
@@ -1574,7 +1578,7 @@ export default {
|
|
|
console.error('Error cancelling OBS upload:', error);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
// Remove cancellation tokens
|
|
|
this.uploadCancellationTokens.delete(row.tempId);
|
|
|
}
|
|
@@ -2082,7 +2086,7 @@ export default {
|
|
|
console.error('Error cancelling COS upload:', error);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
// Cancel OBS upload if exists
|
|
|
if (cancellationTokens.obs) {
|
|
|
try {
|
|
@@ -2092,7 +2096,7 @@ export default {
|
|
|
console.error('Error cancelling OBS upload:', error);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
// Remove cancellation tokens
|
|
|
this.uploadCancellationTokens.delete(row.tempId);
|
|
|
}
|
|
@@ -2176,7 +2180,7 @@ export default {
|
|
|
tokens.cos = uploadInfo.cancel;
|
|
|
this.uploadCancellationTokens.set(tempVideo.tempId, tokens);
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
let line_1 = `${process.env.VUE_APP_VIDEO_LINE_1}${data.urlPath}`;
|
|
|
tempVideo.fileKey = data.urlPath.substring(1);
|
|
|
tempVideo.videoUrl = line_1;
|
|
@@ -2202,7 +2206,7 @@ export default {
|
|
|
tokens.obs = uploadInfo.cancel;
|
|
|
this.uploadCancellationTokens.set(tempVideo.tempId, tokens);
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
tempVideo.line2 = `${process.env.VUE_APP_VIDEO_LINE_2}/${data.urlPath}`;
|
|
|
return { success: true, url: tempVideo.line2 };
|
|
|
} catch (error) {
|