Commit 40c55b31 authored by 吴卿华's avatar 吴卿华

Merge remote-tracking branch 'origin/master'

parents b0e34e21 d784946b
......@@ -55,7 +55,8 @@ service.interceptors.response.use(res => {
const msg = errorCode[code] || res.data.msg || errorCode['default']
if (code === 401) {
MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', {
confirmButtonText: '重新登录',
// 重新登录
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}
......
......@@ -2,7 +2,7 @@
* @Author: 纪泽龙 jizelong@qq.com
* @Date: 2022-09-22 10:38:49
* @LastEditors: 纪泽龙 jizelong@qq.com
* @LastEditTime: 2022-12-26 09:54:47
* @LastEditTime: 2023-01-04 17:50:46
* @FilePath: /danger-manage-web/src/views/lessonsProgram/components/addLesson.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
......
......@@ -2,7 +2,7 @@
* @Author: 纪泽龙 jizelong@qq.com
* @Date: 2022-09-22 10:59:44
* @LastEditors: 纪泽龙 jizelong@qq.com
* @LastEditTime: 2022-09-28 17:52:32
* @LastEditTime: 2023-01-04 17:47:53
* @FilePath: /danger-manage-web/src/views/lessonsProgram/components/Lession.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
......@@ -65,6 +65,7 @@
@resFun="getFileInfoFile"
@remove="listRemoveFile"
:fileArr="fileListFile"
:fileType="fileType"
/>
<el-input v-show="false" disabled v-model="form.enclosure"></el-input>
</el-form-item>
......@@ -104,6 +105,7 @@ export default {
video: "",
enclosure: "",
},
fileType: ["doc", "docx", "xls", "xlsx", "ppt", "txt", "pdf"],
fileListVideo: [],
fileListFile: [],
readOnly: false,
......
......@@ -2,7 +2,7 @@
* @Author: 纪泽龙 jizelong@qq.com
* @Date: 2022-09-20 20:14:18
* @LastEditors: 纪泽龙 jizelong@qq.com
* @LastEditTime: 2022-09-28 16:59:32
* @LastEditTime: 2023-01-05 09:38:13
* @FilePath: /danger-manage-web/src/views/myLessons/CheckLesson.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
......@@ -38,10 +38,10 @@
</div>
</div>
<div class="bt flex fz14 video">
<div class="bt flex fz14 video" >
<div class="a">视频文件</div>
<div class="b">
<div class="video">
<div class="video" v-if="lessonData.video">
<video-player
class="video-player vjs-custom-skin"
ref="videoPlayer"
......@@ -49,6 +49,7 @@
:options="playerOptions"
></video-player>
</div>
<div v-else>未上传视频</div>
</div>
</div>
......@@ -60,6 +61,9 @@
<el-button style="padding: 0; margin-left: 20px" type="text">
<a :href="lessonData.enclosure">下载</a>
</el-button>
<el-button style="padding: 0; margin-left: 20px" type="text">
<a @click="openXslx(lessonData.enclosure)">预览</a>
</el-button>
</div>
</div>
</div>
......@@ -99,6 +103,9 @@
:visible.sync="answerOpen"
@jj="jj"
/>
<el-dialog :visible.sync="iframeVisible" width="80%">
<iframe style="width: 100%; height: 600px" :src="ky"></iframe>
</el-dialog>
</div>
</template>
......@@ -117,6 +124,7 @@ export default {
playerOptions: {
aspectRatio: "16:9",
},
// 课程类型
courseOptions: [],
lessonData: {},
......@@ -128,6 +136,8 @@ export default {
fenshu: 0,
answerOpen: false,
lessonTypeName: "",
iframeVisible: false,
ky: "https://view.xdocin.com/222-223-203-154-8082_o52uv3.htm",
};
},
created() {
......@@ -238,6 +248,12 @@ export default {
};
xhr.send();
},
openXslx(url, name) {
// window.open(`https://view.xdocin.com/view?src=${url}`);
console.log(url)
this.ky=`https://view.xdocin.com/view?src=${url}`;
this.iframeVisible=true;
},
},
};
</script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment