Skip to content

N
national_museum_vod
Commit 693db2ab authored by qzhxx's avatar qzhxx
Browse files
Options

测试迭代

parent 350e477d
Show whitespace changes
Inline Side-by-side
Showing with 90 additions and 93 deletions
src/page/check/learn/index-.vue
View file @ 693db2ab
......@@ -8,7 +8,7 @@
<!--class="video-js vjs-default-skin vjs-big-play-centered" -->
<video :preload="preload"
:poster="videoImg" :height="height" :width="width" align="center" :controls="controls" :autoplay="autoplay">
<source :src="videoSrc" type="video/mp4">
<source :src="videoSrc" >
</video>
</div>
</template>
......
src/page/content/components/dialog/videoDialog.vue
View file @ 693db2ab
......@@ -3,32 +3,23 @@
<el-dialog
custom-class="party-dialog"
title="视频详情"
width="900px"
width="800px"
:visible.sync="dialogVisible"
:before-close="close"
>
<div>
<!--
<video :src="videoSrc" :poster="videoImg" :autoplay="playStatus" height="421" width="700" :muted="muteStatus">
your browser does not support the video tag
</video>
<button @click="playClick" :class="{hide: isPlay}">点击播放</button> -->
<!--class="video-js vjs-default-skin vjs-big-play-centered" -->
<span v-for="(item,index) in videoList" :key="index">
<video
:preload="preload"
:poster="videoImg"
:poster="item.cover"
:height="height"
:width="width"
align="center"
:controls="controls"
:autoplay="autoplay"
>
<source :src="videoSrc" type="video/mp4" />
<source :src="item.fileUrl" />
</video>
</div>
<!-- <div slot="footer" class="dialog-footer btn-group">
<el-button size="mini" type="primary" @click="close">关闭</el-button>
</div> -->
<span>&nbsp;&nbsp;&nbsp;&nbsp; </span>
</span>
</el-dialog>
</template>
......@@ -36,6 +27,7 @@
export default {
data() {
return {
videoList:[],
dialogVisible: false,
// videoSrc: 'https://video.pearvideo.com/mp4/short/20200209/cont-1650197-14888002-hd.mp4',
// videoImg: 'https://sm.ms/image/ueRFCZfk2xTONGb',
......@@ -45,8 +37,8 @@ export default {
muteStatus: "",
isMute: true,
isPlay: false,
width: "820", // 设置视频播放器的显示宽度（以像素为单位）
height: "500", // 设置视频播放器的显示高度（以像素为单位）
width: "350", // 设置视频播放器的显示宽度（以像素为单位）
height: "200", // 设置视频播放器的显示高度（以像素为单位）
preload: "auto", // 建议浏览器是否应在<video>加载元素后立即开始下载视频数据。
controls: true, // 确定播放器是否具有用户可以与之交互的控件。没有控件，启动视频播放的唯一方法是使用autoplay属性或通过Player API。
autoplay: "",
......
src/page/content/components/uploadVue/uploadImg.vue
View file @ 693db2ab
......@@ -44,7 +44,7 @@ export default {
};
},
uploadDisabled:function() {
return this.imageUrl !== ''
return this.fileList.length>0
},
},
methods: {
......
src/page/content/components/uploadVue/uploadQrcode.vue
View file @ 693db2ab
......@@ -48,7 +48,7 @@ export default {
return {'Authorization':localStorage.getItem('backToken')}
},
uploadDisabled:function() {
return this.imageUrl !== ''
return this.fileList.length>0
},
},
methods: {
......
src/page/content/components/videoPlay.vue
View file @ 693db2ab
......@@ -9,7 +9,7 @@
align="center"
:controls="controls"
>
<source :src="item.fileUrl" type="video/mp4" />
<source :src="item.fileUrl" />
</video>
<span>&nbsp;&nbsp;&nbsp;&nbsp; </span>
</span>
......
src/page/content/display/content/add.vue
View file @ 693db2ab
......@@ -126,7 +126,7 @@
</el-form-item>
<el-form-item label="参考资料" prop="datumIdList" >
<div style="color:red;">
（可支持word、excel、PDF、ppt、视频类型文件及图片上传）
（可支持word、PDF、ppt、视频类型文件及图片上传）
</div>
<upload-datum :fileList="ruleForm.datumList" @datumList="datumList"></upload-datum>
</el-form-item>
......@@ -304,8 +304,12 @@ export default {
},
this.$qs.stringify(this.ruleForm)
).then(res => {
this.$message.success("新增成功!");
this.close()
if(res.data.resultCode === "200"){
this.$message({ type: "success", message: "新增展板申请已提交,待审核！" });
history.go(-1);
}else{
this.$message({ type: "error", message: res.data.message });
}
}).catch(function(err) {
console.log(err);
});
......@@ -330,8 +334,12 @@ export default {
},
this.$qs.stringify(params)
).then(res => {
this.$message.success("修改成功!");
this.close()
if(res.data.resultCode === "200"){
this.$message({ type: "success", message: "修改展板申请已提交,待审核！" });
history.go(-1);
}else{
this.$message({ type: "error", message: res.data.message });
}
}).catch(function(err) {
console.log(err);
});
......
src/page/content/display/content/index.vue
View file @ 693db2ab
......@@ -104,12 +104,12 @@
</el-button>
</el-tooltip>
<el-tooltip content="上架" placement="top">
<el-button circle :disabled="scope.row.auditStatus !== 'APPROVED_FINAL'" v-show="!scope.row.published" @click="handlePublish(scope.row,true)">
<el-button circle :disabled="(scope.row.auditStatus !== 'APPROVED_FINAL')||(scope.row.auditStatus === 'REFUSED')" v-show="!scope.row.published" @click="handlePublish(scope.row,true)">
<i class="icon-table icon-enable"></i>
</el-button>
</el-tooltip>
<el-tooltip content="下架" placement="top">
<el-button circle :disabled="scope.row.auditStatus !== 'APPROVED_FINAL'" v-show="scope.row.published" @click="handlePublish(scope.row,false)">
<el-button circle :disabled="(scope.row.auditStatus !== 'APPROVED_FINAL')||(scope.row.auditStatus === 'REFUSED')" @click="handlePublish(scope.row,false)">
<i class="icon-table icon-disable"></i>
</el-button>
</el-tooltip>
......
src/page/content/display/copyright/add.vue
View file @ 693db2ab
......@@ -27,13 +27,10 @@
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item class="addTip">
<span>若没有相应的视频分类，请点击</span>
<el-button type="text" @click="addBoardClass">新建展板分类</el-button>
</el-form-item>
<el-form-item class="selectH100" label="请选择视频分类" prop="boardCatIdList">
<el-select
placeholder="请选择预设视频分类"
placeholder="请选择预设展板分类"
@focus="getAssetTypeData"
multiple
v-model="ruleForm.boardCatIdList"
......@@ -47,6 +44,10 @@
:key="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item class="addTip">
<span>若没有相应的视频分类，请点击</span>
<el-button type="text" @click="addBoardClass">新建展板分类</el-button>
</el-form-item>
<el-form-item label="备注">
<el-input type="textarea" v-model="ruleForm.remarks"></el-input>
......@@ -147,7 +148,7 @@ export default {
// { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" }
],
boardCatIdList:[
{required: true, message: "请选择视频分类", trigger: "change" }
{required: true, message: "请选择展板分类", trigger: "change" }
],
value1:[
{ required: true, message: "请填写版权方有效期", trigger: "change" }
......
src/page/content/learn/content/add.vue
View file @ 693db2ab
......@@ -15,7 +15,7 @@
label-position="top"
>
<el-form-item label="学习内容名称" prop="name" class="w50" style="padding-right: 100px">
<el-input v-model="ruleForm.name"></el-input>
<el-input oninput="value = value.trim()" v-model="ruleForm.name"></el-input>
</el-form-item>
<el-form-item label="适用范围">
<span v-show="userType === '1'">全平台</span>
......@@ -221,7 +221,8 @@ export default {
},
rules: {
name: [
{ required: true, message: "请输入学习内容名称", trigger: "blur" }
{ required: true, message: "请输入学习内容名称", trigger: "blur" },
{ min: 1, max: 20, message: "请输入1到20个字" },
],
cover: [
{
......@@ -349,6 +350,7 @@ export default {
// 获取展板类别列表
getAssetTypeData() {
let vm = this;
if(this.ruleForm.copyrightOwnerIdList.length>0){
vm.$https({
url: "exhibitionBoardCat/getList",
method: "post",
......@@ -361,6 +363,10 @@ export default {
.catch(function(err) {
console.log(err);
});
}else{
this.$message.warning("请先选择展板版权方！")
}
},
// 获取版权方列表
getAssetTypeData2() {
......@@ -440,8 +446,13 @@ export default {
this.$qs.stringify(this.ruleForm)
)
.then(res => {
this.$message({ type: "success", message: "新增成功!" });
if(res.data.resultCode === "200"){
this.$message({ type: "success", message: "新增学习内容申请已提交,待审核！" });
history.go(-1);
}else{
this.$message({ type: "error", message: res.data.message });
}
})
.catch(function(err) {
console.log(err);
......@@ -466,8 +477,12 @@ export default {
// this.ruleForm
)
.then(res => {
this.$message({ type: "success", message: "修改成功!" });
if(res.data.resultCode === "200"){
this.$message({ type: "success", message: "修改学习内容申请已提交,待审核！" });
history.go(-1);
}else{
this.$message({ type: "error", message: res.data.message });
}
})
.catch(function(err) {
console.log(err);
......@@ -483,6 +498,7 @@ export default {
this.ruleForm.cover = url;
this.$refs.ruleForm.validateField("cover");
},
// 展板类别发生变化
getSelectDep(exhibitionBoardCatIdList) {
if (exhibitionBoardCatIdList.length === this.videoContentCat.length) {
this.checkedThing = true;
......@@ -502,6 +518,7 @@ export default {
},
// 筛选展板备选清单选项条件
getTableParam(){
// debugger
const param = {
boardCopyrightOwnerIdList: this.ruleForm.copyrightOwnerIdList.toString(),
exhibitionBoardCatIdList: this.ruleForm.exhibitionBoardCatIdList.toString()
......@@ -514,6 +531,7 @@ export default {
},
// 根据展板类别，版权方获取展板备选清单
getTableData(param, type) {
let vm = this;
vm.$https(
{
......@@ -524,6 +542,8 @@ export default {
vm.$qs.stringify(param)
)
.then(res => {
// alert(1)
// console.log(res)
let data = res.data.data;
vm.tableData = data;
if (type) {
......@@ -540,6 +560,7 @@ export default {
selectAllThing() {
// debugger
this.ruleForm.exhibitionBoardCatIdList = [];
if (this.checkedThing) {
this.videoContentCat.map(item => {
......@@ -548,6 +569,7 @@ export default {
} else {
this.ruleForm.exhibitionBoardCatIdList = [];
}
this.getTableParam()
},
selectAllThing2() {
// debugger
......
src/page/content/learn/content/index.vue
View file @ 693db2ab
......@@ -82,7 +82,7 @@
</el-table-column>
<el-table-column label="创建时间" prop="createTime"></el-table-column>
<el-table-column label="创建者" prop=""></el-table-column>
<el-table-column label="创建者" prop="creatorName"></el-table-column>
<el-table-column
show-overflow-tooltip
label="所含展板数量"
......@@ -139,12 +139,12 @@
</el-button>
</el-tooltip>
<el-tooltip content="启用" placement="top">
<el-button circle :disabled="scope.row.auditStatus !== 'APPROVED_FINAL'" v-show="!scope.row.published" @click="handlePublish(scope.row, 'True')">
<el-button circle :disabled="(scope.row.auditStatus !== 'APPROVED_FINAL')||(scope.row.auditStatus === 'REFUSED')" v-show="!scope.row.published" @click="handlePublish(scope.row, 'True')">
<i class="icon-table icon-enable"></i>
</el-button>
</el-tooltip>
<el-tooltip content="禁用" placement="top">
<el-button circle :disabled="scope.row.auditStatus !== 'APPROVED_FINAL'" v-show="scope.row.published" @click="handlePublish(scope.row, 'False')">
<el-button circle :disabled="(scope.row.auditStatus !== 'APPROVED_FINAL')||(scope.row.auditStatus === 'REFUSED')" v-show="scope.row.published" @click="handlePublish(scope.row, 'False')">
<i class="icon-table icon-disable"></i>
</el-button>
</el-tooltip>
......
src/page/content/learn/project/index.vue
View file @ 693db2ab
......@@ -5,7 +5,7 @@
<el-form-item>
<el-input
placeholder="请输入学习项目名称"
v-model="form.name"
v-model="form.nameOrCode"
@keyup.enter.native="Search"
clearable
></el-input>
......@@ -107,7 +107,7 @@
class="party-form"
>
<el-form-item label="学习项目名称" prop="name">
<el-input v-model="classForm.name"></el-input>
<el-input oninput="value = value.trim()" v-model="classForm.name"></el-input>
</el-form-item>
<el-form-item label="备注">
<el-input type="textarea" v-model="classForm.remarks"></el-input>
......@@ -155,12 +155,14 @@ export default {
typeList: [],
rule:{
name: [
{ required: true, message: "请输入学习项目名称", trigger: "blur" }
{ required: true, message: "请输入学习项目名称", trigger: "blur" },
{ min: 1, max: 20, message: "请输入1到20个字" },
],
},
rules: {
name: [
{ required: true, message: "请输入学习项目名称", trigger: "blur" },
{ min: 1, max: 20, message: "请输入1到20个字" },
],
},
value: "",
......@@ -212,7 +214,7 @@ export default {
let searchObj = {
_index: 1,
_size: _this.page.pageSize,
name: _this.form.name,
nameOrCode: _this.form.nameOrCode,
startDate: this.value1 ? this.value1[0] : "",
endDate: this.value1 ? this.value1[1] : "",
};
......@@ -221,6 +223,7 @@ export default {
// 重置
Reset() {
this.form = {};
this.value1= []
this.Search();
},
// // 获取当前查询参数
......
src/page/content/video/content/add.vue
View file @ 693db2ab
......@@ -17,30 +17,6 @@
<el-form-item label="视频名称" prop="name">
<el-input v-model="ruleForm.name"></el-input>
</el-form-item>
<!-- <el-form-item label="版权方">
<mul-display @videoCopyright="videoCopyright"></mul-display>
</el-form-item> -->
<!-- <el-form-item class="addTip">
<span>若没有相应的视频分类，请点击</span>
<el-button type="text" @click="addVideoClass">新建视频分类</el-button>
</el-form-item>
<el-form-item class="selectH100" label="请选择预设视频分类">
<el-select
placeholder="请选择预设视频分类"
@focus="getVideoContentCatData"
multiple
v-model="ruleForm.videoContentCatIdList"
@change="getSelectDep"
>
<el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
<el-option
v-for="item in videoContentCat"
:label="item.name"
:value="item.id"
:key="item.id"
></el-option>
</el-select>
</el-form-item> -->
<el-form-item class="addTip">
<add-copyright ref="addCopyright"></add-copyright>
<span>若没有相应的视频版权方，请点击</span>
......@@ -69,7 +45,6 @@
placeholder="请选择预设视频分类"
@focus="getVideoContentCatData"
v-model="ruleForm.videoContentCatId"
@change="getVideoContentCat"
>
<el-option
v-for="item in videoContentCat"
......@@ -175,16 +150,7 @@ export default {
thumbnail:"",
videoFileIdList:[]
},
videoContentCat: [
{
value: "Beijing",
label: "北京"
},
{
value: "Shanghai",
label: "上海"
}
],
videoContentCat: [],
checkedThing: false,
selfstyle: {
......@@ -220,6 +186,7 @@ export default {
},
mounted() {
this.init();
this.getVideoContentCopyrightData()
},
methods: {
// 视频版权方名称id
......@@ -361,8 +328,12 @@ export default {
},
this.$qs.stringify(this.ruleForm)
).then(res => {
if(res.data.resultCode === "200"){
this.$message({ type: "success", message: "修改视频申请已提交,待审核！" });
history.go(-1);
}else{
this.$message({ type: "error", message: res.data.message });
}
}).catch(function(err) {
console.log(err);
});
......
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