Commit d3da9bad authored by qzhxx's avatar qzhxx

学习优化,测试修改

parent 5b4eb6a5
......@@ -95,6 +95,7 @@ export default {
type: "success",
message: resData.message,
});
localStorage.setItem("userType",resData.user.type)
localStorage.setItem("user", resData.user.userName);
localStorage.setItem("backToken", resData.token);
localStorage.setItem(
......
......@@ -91,8 +91,8 @@
</div>
</template>
</el-table-column>
<el-table-column label="审核" header-align="center" align="center">
<template slot-scope="scope" width="220">
<el-table-column label="审核" width="220" header-align="center" align="center">
<template slot-scope="scope" >
<!-- <div class="table-btn-group">
<el-tooltip content="通过" placement="top">
......
......@@ -71,8 +71,8 @@
</div>
</template>
</el-table-column>
<el-table-column label="审核" header-align="center" align="center">
<template slot-scope="scope" width="220">
<el-table-column label="审核" width="220" header-align="center" align="center">
<template slot-scope="scope">
<div class="table-btn-group">
<el-button
round
......
......@@ -69,8 +69,8 @@
</div>
</template>
</el-table-column>
<el-table-column label="审核" header-align="center" align="center">
<template slot-scope="scope" width="220">
<el-table-column label="审核" width="220" header-align="center" align="center">
<template slot-scope="scope">
<div class="table-btn-group">
<el-button
round
......
......@@ -114,9 +114,9 @@ export default {
this.$qs.stringify(this.ruleForm)
)
.then(res => {
if(res.resultCode === "200"){
this.$message({ type: "success", message: "新成功!" });
history.go(-1);
if(res.data.resultCode === "200"){
this.$message({ type: "success", message: "新建视频版权方成功!" });
this.dialogVisible = false
}else{
this.$message({ type: "error", message: res.message });
}
......@@ -148,12 +148,13 @@ export default {
_this.$qs.stringify(this.ruleForm)
)
.then(res => {
if(res.data.resultCode === "200"){
_this.$message({ type: "success", message: "新增成功!" });
_this.dialogVisible =false
}else{
_this.$message({ type: "error", message: res.data.message });
}
console.log(res)
// if(res.data.resultCode === "200"){
// _this.$message({ type: "success", message: "新增成功!" });
// _this.dialogVisible =false
// }else{
// _this.$message({ type: "error", message: res.data.message });
// }
})
......
<template>
<div class="info">
<div class="info-header">新建展板</div>
<div class="info-header">{{ type === 'Update'?'修改':'新建'}}展板</div>
<div class="info-container">
<div class="info-wrapper">
<div class="pageTips">
......
<template>
<div class="info">
<video-dialog ref="videoDialog"></video-dialog>
<div class="info-header">新建学习内容</div>
<!-- <div class="info-header">新建学习内容</div> -->
<div class="info-header">{{ type === 'Update'?'修改':'新建'}}学习内容</div>
<div class="info-container">
<div class="info-wrapper">
<el-form
......@@ -13,27 +14,18 @@
:inline="true"
label-position="top"
>
<el-form-item
label="学习内容名称"
prop="name"
class="w50"
style="padding-right: 100px"
>
<el-form-item label="学习内容名称" prop="name" class="w50" style="padding-right: 100px">
<el-input v-model="ruleForm.name"></el-input>
</el-form-item>
<el-form-item label="适用范围">
<!-- ALL_PLAT,THIS_ORGAN,THIS_ORGAN_SUB -->
全平台
<span v-show="userType === '1'">全平台</span>
<el-radio-group v-show="userType === '2'" v-model="ruleForm.applicableScope">
<el-radio label="THIS_ORGAN">仅本单位</el-radio>
<el-radio label="THIS_ORGAN_SUB">本单位及下属单位</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item
label="所属学习项目"
class="w50"
prop="learningProjectId"
>
<el-select
placeholder="请选所属学习项目"
v-model="ruleForm.learningProjectId"
>
<el-form-item label="所属学习项目" class="w50" prop="learningProjectId">
<el-select placeholder="请选所属学习项目" v-model="ruleForm.learningProjectId">
<el-option
v-for="item in learningProjectIdList"
:label="item.name"
......@@ -45,23 +37,14 @@
<el-form-item label="学习内容宣传图" prop="cover" class="w100">
<upload-img ref="uploadImg" @imgUrl="imgUrl"></upload-img>
</el-form-item>
<el-form-item
class="w50"
label="展板类别"
prop="exhibitionBoardCatIdList"
>
<el-form-item class="w50" label="展板类别" prop="exhibitionBoardCatIdList">
<el-select
placeholder="请选择展板类别"
multiple
v-model="ruleForm.exhibitionBoardCatIdList"
@change="getSelectDep"
>
<el-checkbox
:style="selfstyle"
v-model="checkedThing"
@change="selectAllThing"
>全选</el-checkbox
>
<el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
<el-option
v-for="item in videoContentCat"
:label="item.name"
......@@ -77,12 +60,7 @@
v-model="ruleForm.copyrightOwnerIdList"
@change="getSelectDep2"
>
<el-checkbox
:style="selfstyle"
v-model="checkedThing2"
@change="selectAllThing2"
>全选</el-checkbox
>
<el-checkbox :style="selfstyle" v-model="checkedThing2" @change="selectAllThing2">全选</el-checkbox>
<el-option
v-for="item in assetType2"
:label="item.name"
......@@ -91,11 +69,8 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item
label="展板备选清单"
class="w100"
prop="exhibitionBoardIdList"
>
<el-form-item label="展板备选清单" class="w100" prop="exhibitionBoardIdList">
<div class="party-table">
<el-table
border
@selection-change="handleSelectionChange"
......@@ -105,29 +80,26 @@
:data="tableData"
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column
type="index"
width="120"
label="序号"
></el-table-column>
<el-table-column
show-overflow-tooltip
label="版权方名称"
prop="name"
></el-table-column>
<el-table-column
show-overflow-tooltip
label="展板类别"
prop="exhibitionBoardCatName"
></el-table-column>
<el-table-column
show-overflow-tooltip
label="展板版权方"
prop="boardCopyrightOwnerName"
></el-table-column>
<el-table-column type="index" width="120" label="序号"></el-table-column>
<el-table-column show-overflow-tooltip label="版权方名称" prop="name"></el-table-column>
<el-table-column show-overflow-tooltip label="展板类别" prop="exhibitionBoardCatName"></el-table-column>
<el-table-column show-overflow-tooltip label="展板版权方" prop="boardCopyrightOwnerName"></el-table-column>
<el-table-column label="操作" width="180">
<template slot-scope="scope">
<el-button
<div class="table-btn-group">
<el-tooltip content="视频预览" placement="top">
<el-button circle @click="videoPreview(scope.row)">
<i class="icon-table icon-video"></i>
</el-button>
</el-tooltip>
<el-tooltip content="展板预览" placement="top">
<el-button circle @click="displayPreview(scope.row)">
<i class="icon-table icon-board"></i>
</el-button>
</el-tooltip>
</div>
<!-- <el-button
type="text"
style="padding: 0"
@click="videoPreview(scope.row)"
......@@ -138,12 +110,15 @@
style="padding: 0"
@click="displayPreview(scope.row)"
>展板预览</el-button
>
>-->
</template>
</el-table-column>
</el-table>
</div>
</el-form-item>
</el-form>
<!--新增弹框-->
<el-dialog
custom-class="party-dialog"
......@@ -166,26 +141,16 @@
<el-input v-model="classForm.name" readonly></el-input>
</el-form-item>
<el-form-item label="版权方">
<el-input
v-model="classForm.boardCopyrightOwnerName"
readonly
></el-input>
<el-input v-model="classForm.boardCopyrightOwnerName" readonly></el-input>
</el-form-item>
<el-form-item label="展板分类">
<el-input
v-model="classForm.exhibitionBoardCatName"
readonly
></el-input>
<el-input v-model="classForm.exhibitionBoardCatName" readonly></el-input>
</el-form-item>
<el-form-item label="展板宣传图">
<img class="imgSize" :src="classForm.cover" alt="" />
<img class="imgSize" :src="classForm.cover" alt />
</el-form-item>
<el-form-item label="简介">
<el-input
type="textarea"
v-model="classForm.remarks"
readonly
></el-input>
<el-input type="textarea" v-model="classForm.remarks" readonly></el-input>
</el-form-item>
</el-form>
</div>
......@@ -195,25 +160,22 @@
<div class="info-footer">
<div class="btn-group">
<!-- 确定、取消 -->
<el-button
v-show="type === 'add'"
size="mini"
type="primary"
class="btn_form_search"
@click="submitForm('ruleForm')"
>提交审核</el-button
>
>提交审核</el-button>
<el-button
v-show="type === 'Update'"
size="mini"
type="primary"
class="btn_form_search"
@click="updateForm('ruleForm')"
>提交审核</el-button
>
<el-button size="mini" class="btn_form_search" @click="close"
>取消</el-button
>
>提交审核</el-button>
<el-button size="mini" class="btn_form_search" @click="close">取消</el-button>
</div>
</div>
</div>
......@@ -227,7 +189,7 @@ export default {
components: {
uploadImg,
videoDialog,
audioPlay,
audioPlay
},
data() {
return {
......@@ -242,7 +204,7 @@ export default {
selfstyle: {
textAlign: "right",
width: "100%",
paddingRight: "10px",
paddingRight: "10px"
},
tableData: [],
ruleForm: {
......@@ -252,50 +214,52 @@ export default {
learningProjectId: "", //所属学习项目
exhibitionBoardCatIdList: [], //展板类别
copyrightOwnerIdList: [], //版权方
exhibitionBoardIdList: [], // 展板备选
exhibitionBoardIdList: [] // 展板备选
},
rules: {
name: [
{ required: true, message: "请输入学习内容名称", trigger: "blur" },
{ required: true, message: "请输入学习内容名称", trigger: "blur" }
],
cover: [
{
required: true,
message: "请选择学习内容宣传图",
},
message: "请选择学习内容宣传图"
}
],
learningProjectId: [
{ required: true, message: "请选择所属学习项目", trigger: "change" },
{ required: true, message: "请选择所属学习项目", trigger: "change" }
],
exhibitionBoardCatIdList: [
{
required: true,
type: "array",
message: "请选择展板类别",
trigger: "change",
},
trigger: "change"
}
],
copyrightOwnerIdList: [
{
required: true,
type: "array",
message: "请选择版权方",
trigger: "change",
},
trigger: "change"
}
],
exhibitionBoardIdList: [
{
required: true,
type: "array",
message: "请选择展板",
trigger: "change",
},
],
trigger: "change"
}
]
},
multipleSelection: [],
userType: ""
};
},
mounted() {
this.userType = localStorage.getItem("userType");
this.init();
},
methods: {
......@@ -329,9 +293,9 @@ export default {
vm.$https({
url: "learningContent/get/" + id,
method: "get",
authType: this.backToken,
authType: this.backToken
})
.then((res) => {
.then(res => {
let data = res.data.data;
this.ruleForm = data;
this.ruleForm = {
......@@ -342,21 +306,21 @@ export default {
learningProjectId: data.learningProjectId,
exhibitionBoardCatIdList: data.exhibitionBoardCatIdList,
id: data.id,
exhibitionBoardIdList: data.exhibitionBoardIdList,
exhibitionBoardIdList: data.exhibitionBoardIdList
};
// this.tableData = data.exhibitionBoardList;
this.multipleSelection = data.exhibitionBoardList;
this.$refs.uploadImg.showImg(this.ruleForm.cover);
this.getExhibitionBoardTable();
})
.catch(function (err) {
.catch(function(err) {
console.log(err);
});
},
getExhibitionBoardTable() {
const param = {
boardCopyrightOwnerIdList: this.ruleForm.copyrightOwnerIdList,
exhibitionBoardCatIdList: this.ruleForm.exhibitionBoardCatIdList,
exhibitionBoardCatIdList: this.ruleForm.exhibitionBoardCatIdList
};
this.getTableData(param, "update");
},
......@@ -367,8 +331,8 @@ export default {
let _this = this;
let tableData = this.tableData;
let multipleSelection = this.multipleSelection;
tableData.forEach((v) => {
multipleSelection.forEach((m) => {
tableData.forEach(v => {
multipleSelection.forEach(m => {
if (v.id == m.id) {
_this.$refs.multipleTable.toggleRowSelection(v);
}
......@@ -381,13 +345,13 @@ export default {
vm.$https({
url: "exhibitionBoardCat/getList",
method: "get",
authType: this.backToken,
authType: this.backToken
})
.then((res) => {
.then(res => {
let data = res.data.data;
vm.videoContentCat = data;
})
.catch(function (err) {
.catch(function(err) {
console.log(err);
});
},
......@@ -398,15 +362,15 @@ export default {
{
url: "copyrightOwner/getList",
method: "get",
authType: this.backToken,
authType: this.backToken
},
{ copyrightOwnerType: "EXHIBITION_BOARD" }
)
.then((res) => {
.then(res => {
let data = res.data.data;
vm.assetType2 = data;
})
.catch(function (err) {
.catch(function(err) {
console.log(err);
});
},
......@@ -416,13 +380,13 @@ export default {
vm.$https({
url: "learningProject/getList",
method: "get",
authType: this.backToken,
authType: this.backToken
})
.then((res) => {
.then(res => {
let data = res.data.data;
vm.learningProjectIdList = data;
})
.catch(function (err) {
.catch(function(err) {
console.log(err);
});
},
......@@ -433,45 +397,45 @@ export default {
{
url: "learningContentBoard/getList",
method: "get",
authType: this.backToken,
authType: this.backToken
},
{ learningContentId: this.$route.query.id }
)
.then((res) => {
.then(res => {
let data = res.data.data;
console.log(data);
})
.catch(function (err) {
.catch(function(err) {
console.log(err);
});
},
// 多选赋值
handleSelectionChange(val) {
this.multipleSelection = val;
let newArray = val.map((item) => {
let newArray = val.map(item => {
return item.id;
});
this.ruleForm.exhibitionBoardIdList = newArray;
},
// 新增
submitForm(formName) {
this.$refs[formName].validate((valid) => {
this.$refs[formName].validate(valid => {
console.log(this.ruleForm);
if (valid) {
this.$https(
{
url: "/learningContent/save",
method: "post",
authType: this.backToken,
authType: this.backToken
},
// this.ruleForm
this.$qs.stringify(this.ruleForm)
)
.then((res) => {
.then(res => {
this.$message({ type: "success", message: "新增成功!" });
history.go(-1);
})
.catch(function (err) {
.catch(function(err) {
console.log(err);
});
} else {
......@@ -482,22 +446,22 @@ export default {
},
// 修改版权方
updateForm(formName) {
this.$refs[formName].validate((valid) => {
this.$refs[formName].validate(valid => {
if (valid) {
this.$https(
{
url: "learningContent/update",
method: "put",
authType: this.backToken,
authType: this.backToken
},
this.$qs.stringify(this.ruleForm)
// this.ruleForm
)
.then((res) => {
.then(res => {
this.$message({ type: "success", message: "修改成功!" });
history.go(-1);
})
.catch(function (err) {
.catch(function(err) {
console.log(err);
});
} else {
......@@ -527,7 +491,7 @@ export default {
}
const param = {
boardCopyrightOwnerIdList: this.ruleForm.copyrightOwnerIdList,
exhibitionBoardCatIdList: this.ruleForm.exhibitionBoardCatIdList,
exhibitionBoardCatIdList: this.ruleForm.exhibitionBoardCatIdList
};
this.getTableData(param);
},
......@@ -538,11 +502,11 @@ export default {
{
url: "exhibitionBoard/getList",
method: "get",
authType: this.backToken,
authType: this.backToken
},
vm.$qs.stringify(param)
)
.then((res) => {
.then(res => {
let data = res.data.data;
vm.tableData = data;
if (type) {
......@@ -552,7 +516,7 @@ export default {
}, 1000);
}
})
.catch(function (err) {
.catch(function(err) {
console.log(err);
});
},
......@@ -561,7 +525,7 @@ export default {
// debugger
this.ruleForm.exhibitionBoardCatIdList = [];
if (this.checkedThing) {
this.videoContentCat.map((item) => {
this.videoContentCat.map(item => {
this.ruleForm.exhibitionBoardCatIdList.push(item.id);
});
} else {
......@@ -572,7 +536,7 @@ export default {
// debugger
this.ruleForm.copyrightOwnerIdList = [];
if (this.checkedThing2) {
this.assetType2.map((item) => {
this.assetType2.map(item => {
this.ruleForm.copyrightOwnerIdList.push(item.id);
});
} else {
......@@ -596,7 +560,7 @@ export default {
} else {
this.$message({
message: "已经是第一条,上移失败",
type: "warning",
type: "warning"
});
}
},
......@@ -604,17 +568,18 @@ export default {
if (index + 1 == this.tableData.length) {
this.$message({
message: "已经是最后一条,下移失败",
type: "warning",
type: "warning"
});
} else {
let downData = this.tableData[index + 1];
this.tableData.splice(index + 1, 1);
this.tableData.splice(index, 0, downData);
}
},
},
}
}
};
</script>
<style lang="less">
@import "../../../../style/table.less";
</style>
......@@ -57,7 +57,30 @@
show-overflow-tooltip
label="学习内容名称"
prop="name"
></el-table-column>
>
<template slot-scope="scope">
<div class="table-btn-group">
<el-tooltip content="上移" placement="top">
<el-button circle :disabled="scope.$index == 0"
@click="moveUpward(scope.row, scope.$index)" >
<i class="icon-table-up icon-up"></i>
</el-button>
</el-tooltip>
<el-tooltip content="下移" placement="top">
<el-button circle
:disabled="(scope.$index + 1) == tableData.length"
@click="moveDown(scope.row, scope.$index)">
<i class="icon-table-up icon-down"></i>
</el-button>
</el-tooltip>
<span>&nbsp;&nbsp;</span>
<span>{{scope.row.name}}</span>
</div>
</template>
</el-table-column>
<el-table-column label="创建时间" prop="createTime"></el-table-column>
<el-table-column label="创建者" prop=""></el-table-column>
<el-table-column
......@@ -91,6 +114,19 @@
>
<template slot-scope="scope">
<div class="table-btn-group">
<!-- <el-tooltip content="上移" placement="top">
<el-button circle :disabled="scope.$index == 0"
@click="moveUpward(scope.row, scope.$index)" >
<i class="icon-table-up icon-up"></i>
</el-button>
</el-tooltip>
<el-tooltip content="下移" placement="top">
<el-button circle
:disabled="(scope.$index + 1) == tableData.length"
@click="moveDown(scope.row, scope.$index)">
<i class="icon-table-up icon-down"></i>
</el-button>
</el-tooltip> -->
<el-tooltip content="修改" placement="top">
<el-button circle @click="openEdit(scope.row)">
<i class="icon-table icon-edit"></i>
......@@ -111,7 +147,8 @@
<i class="icon-table icon-disable"></i>
</el-button>
</el-tooltip>
<el-button
<!-- <el-button
type="text"
style="padding:0"
:disabled="scope.$index == 0"
......@@ -122,12 +159,7 @@
style="padding:0"
:disabled="(scope.$index + 1) == tableData.length"
@click="moveDown(scope.row, scope.$index)"
>下移</el-button>
<!-- <el-tooltip content="删除" placement="top">
<el-button circle @click="handleDelete(scope.row)">
<i class="icon-table icon-del"></i>
</el-button>
</el-tooltip> -->
>下移</el-button> -->
</div>
</template>
</el-table-column>
......
<template>
<div class="info">
<div class="info-header">新建视频</div>
<div class="info-header">{{ type === 'Update'?'修改':'新建'}}视频</div>
<div class="info-container">
<div class="info-wrapper">
<div class="pageTips">
......@@ -277,7 +277,7 @@ export default {
addVideoClass() {
this.dialogVisible = true;
},
// 弹窗保存
// 新建视频分类弹窗保存
save(formName) {
this.$refs[formName].validate(valid => {
this.ruleForm.expireDateEnd = this.value1[1];
......@@ -289,10 +289,14 @@ export default {
method: "post",
authType: this.backToken
},
this.classForm
this.$qs.stringify(this.classForm)
).then(res => {
this.$message({ type: "success", message: "新增分类成功!" });
if(res.data.resultCode === "200"){
this.$message({ type: "success", message: "新增分类成功!" });
this.dialogVisible = false;
}else{
this.$message({ type: "error", message: res.data.message });
}
}).catch(function(err) {
this.$message({
type: "fail",
......
......@@ -75,8 +75,8 @@
<span v-else-if="scope.row.auditStatus === 'APPROVED_FINAL'">通过</span>
</template>
</el-table-column>
<el-table-column label="操作" header-align="center" align="center">
<template slot-scope="scope" width="220">
<el-table-column label="操作" header-align="center" width="220" align="center">
<template slot-scope="scope" >
<div class="table-btn-group">
<el-tooltip content="修改" placement="top">
<el-button circle @click="openEdit(scope.row)">
......
......@@ -258,7 +258,7 @@ export default {
)
.then(res => {
if(res.data.resultCode === "200"){
this.$message({ type: "success", message: "新增视频版权方申请已提交,待审核!" });
this.$message({ type: "success", message: "新增视频版权成功!" });
history.go(-1);
}else{
this.$message({ type: "error", message: res.data.message });
......@@ -294,7 +294,7 @@ export default {
)
.then(res => {
if(res.data.resultCode === "200"){
this.$message({ type: "success", message: "修改视频版权方申请已提交,待审核!" });
this.$message({ type: "success", message: "修改视频版权方成功!" });
history.go(-1);
}else{
this.$message({ type: "error", message: res.data.message });
......
......@@ -550,6 +550,18 @@
.icon-disable {
background-image: url("~@/assets/icons/disable.png");
}
.icon-up{
background-image: url("~@/assets/icons/up.png");
}
.icon-down{
background-image: url("~@/assets/icons/down.png");
}
.icon-video{
background-image: url("~@/assets/icons/video.png");
}
.icon-board{
background-image: url("~@/assets/icons/board.png");
}
.icon-del {
background-image: url("~@/assets/icons/del.png");
......
......@@ -40,6 +40,14 @@
background-repeat: no-repeat;
background-position: center;
}
.icon-table-up{
display: inline-block;
width: 12px;
height: 24px;
background-size: cover;
background-repeat: no-repeat;
background-position: center;
}
.passed,
......
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