zm/nuttyreading-master-html
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-master-html

Browse Source
This commit is contained in:
始于初见
2024-06-06 17:19:03 +08:00
parent 918ecfa47a 292ce24ba0
commit 53697d0582
2 changed files with 466 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/components/commonBookTags/tags.vue
View File

@@ -387,7 +387,7 @@ export default {
);
this.addForm = {};
// console.log(this.$refs.tree.handleClickNodes(), "当前选中节点");
console.log(node, data, "当前选中节点");
console.log(node, data, "当前选中节点-----------");
this.currentNode = node;
this.isFresh = false;
this.isFresh = true;
@@ -436,6 +436,7 @@ export default {
children: [],
delFlag: 0,
isLast: 0,
content:'',
pid: 0,
sort: 0,
title: ""

400
src/views/modules/course/medicalLabel.vue
View File

@@ -14,13 +14,14 @@
<div
v-if="isFresh"
v-loading="!isFresh"
style="width: calc(100% - 360px); height: 100%; float: right; border: 1px solid #bababa; box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); border-radius: 10px;position: relative;"
style="width: calc(100% - 360px); height: 100%; overflow-y: scroll; float: right; border: 1px solid #bababa; border-top:none; box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); border-radius: 10px;position: relative;"
>
<el-tabs type="card" v-model="activeName">
<el-tab-pane label="基本标签信息" name="first">
<div class="border_box info_box">
<div class="title_box">
<div class="title"><span class="line"></span>基本标签信息</div>
</div>
<div class="addFormBox">
<el-form :model="addForm" ref="addForm" label-width="80px">
<el-form-item label="标签名称" prop="title" class="form_item">
@@ -45,34 +46,6 @@
>
</el-input-number>
</el-form-item>
<el-form-item
label="封面图"
prop="icon"
label-width="120px"
class="form_item"
>
<div style="display:flex; align-items:center">
<div>
<el-upload
class="avatar-uploader"
:action="baseUrl + '/oss/fileoss'"
:show-file-list="false"
:on-success="handlePicSuccess"
>
<!-- <img v-if="!refreshImg" :src="addForm.images" class="avatar"> -->
<img v-if="fimages" :src="fimages" class="avatar" />
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</div>
<div>
<div v-if="fimages != ''">
<el-tag class="delImgBtn" @click="delImg()" type="danger"
>清空图片</el-tag
>
</div>
</div>
</div>
</el-form-item>
<el-form-item
label="是否为最终级"
prop="isLast"
@@ -90,14 +63,138 @@
>
</el-switch>
</el-form-item>
<div
class="flexBox"
style="width:100%;justify-content: space-between;"
>
<div class="subBox" style="display:flex">
<div style="display:flex; align-items:center; width:100%;justify-content:center">
<div style="margin-right:15px">封面图</div>
<div>
<el-upload
class="avatar-uploader"
:action="baseUrl + '/oss/fileoss'"
:show-file-list="false"
:on-success="handlePicSuccess"
>
<img v-if="fimages" :src="fimages" class="avatar" />
<i
v-else
class="el-icon-plus avatar-uploader-icon"
></i>
</el-upload>
</div>
<div>
<div v-if="fimages != ''">
<el-tag
class="delImgBtn"
@click="delImg()"
type="danger"
>清空图片</el-tag
>
</div>
</div>
</div>
</el-form-item>
</div>
<div class="subBox">
<div style="">
<div class="dataType flexBox" >
<el-radio v-model="addForm.mediaType" :label="1"
>加密视频</el-radio
>
<el-radio v-model="addForm.mediaType" :label="2"
>上传音频</el-radio
>
</div>
<div>
<div v-if="addForm.mediaType == 2" style="margin:20px auto; margin-top:20px ; width: 50%; ">
<el-upload
class="upload-demo audioUpload"
:action="baseUrl + '/oss/fileoss'"
:on-remove="audioHandleRemove"
:on-success="audioUploadSuccess"
accept=".mp3"
:limit="1"
:file-list="audioFileList"
>
<el-button size="small" type="primary"
>点击上传</el-button
>
<div slot="tip" class="el-upload__tip" style="float:right">
只能上传.mp3文件
</div>
</el-upload>
</div>
<el-form-item style="margin-top:20px" v-else label="加密视频id">
<el-input v-model="addForm.media"></el-input>
</el-form-item>
</div>
</div>
</div>
</div>
<div style="width:100%">
<div style="margin:10px 0"><span class="line"></span> 标签介绍</div>
<el-form-item prop="productDetails" label-width="0">
<el-upload
style="display:none"
class="avatar-uploader11"
:action="baseUrl + '/oss/fileoss'"
accept=".jpeg,.jpg,.gif,.png"
:show-file-list="false"
:on-success="contentUploadSuccess"
>
</el-upload>
<quill-editor
v-model="addForm.content"
ref="myQuillEditor"
:options="editorOption"
@blur="onEditorBlur($event)"
@focus="onEditorFocus($event)"
@ready="onEditorReady($event)"
class="shangpin_editor ql-container"
>
</quill-editor>
</el-form-item>
</div>
</el-form>
</div>
<div
<!-- <div
style=" border: 1px dashed #bababa;"
v-if="currentNode && currentNode.data.isLast == 1"
></div>
></div> -->
</div>
<div class="submitButton submitButtonBox">
<el-button
type="primary"
@click="dataFormSubmit('addForm')"
size="small"
>确定</el-button
>
<!-- </div> -->
</div>
<!-- <div
class="submitButton submitButtonBox"
style="position: absolute;bottom: 13px;right: 15px;"
v-if="!isEdit"
>
<el-button
type="primary"
@click="dataFormSubmit('addForm')"
size="small"
>确定</el-button
>
</div> -->
</el-tab-pane>
<el-tab-pane
label="已关联课程列表" name="second"
v-if="currentNode && currentNode.data.isLast == 1"
>
<div
class="border_box tree_content_box"
v-if="currentNode && currentNode.data.isLast == 1"
@@ -142,7 +239,7 @@
@delete="dataFormDelete"
:isEdit="isEdit"
ref="commonShop"
:style="`height: calc(100% - 50px); `"
:style="`height: calc(100vh - 310px); `"
>
<template slot="searchFormItem" slot-scope="slotProps">
<!-- <el-form-item
@@ -180,7 +277,12 @@
</el-form-item> -->
</template>
<template slot="tableItem" slot-scope="slotProps">
<el-table-column label="课程ID" width="70" align="center" prop="id">
<el-table-column
label="课程ID"
width="70"
align="center"
prop="id"
>
<!-- <template slot-scope="scope">
{{ (pageIndex - 1) * pageSize + scope.$index + 1 }}
</template> -->
@@ -217,7 +319,6 @@
>
</el-table-column>
<el-table-column
header-align="center"
align="center"
label="课程等级"
@@ -229,7 +330,6 @@
</template>
</el-table-column>
<el-table-column
header-align="center"
align="center"
label="课程属性"
@@ -242,36 +342,9 @@
</el-table-column>
</template>
</commonShop>
<div class="submitButton submitButtonBox">
<!-- <el-button size="small" @click.stop="dataFormEdit()">
取消
</el-button> -->
<el-button
type="primary"
@click="dataFormSubmit('addForm')"
size="small"
>确定</el-button
>
<!-- </div> -->
</div>
</div>
<div
class="submitButton submitButtonBox"
style="position: absolute;bottom: 13px;right: 15px;"
v-if="!isEdit"
>
<!-- <el-button size="small" @click.stop="dataFormEdit()">
取消
</el-button> -->
<el-button
type="primary"
@click="dataFormSubmit('addForm')"
size="small"
>确定</el-button
>
<!-- </div> -->
</div>
</el-tab-pane>
</el-tabs>
</div>
<!-- <el-form
@@ -362,12 +435,44 @@
</template>
<script>
import { quillEditor } from "vue-quill-editor";
import global from "../../common/common.vue"; //引入共用组间
import debounce from "lodash/debounce"; //导入lodash中的debounce
import AddOrUpdate from "@/views/components/commonBookTags/bookTagsForm.vue";
import commonShop from "@/views/components/commonBookTags/shopproduct.vue";
import commonShopTable from "@/views/components/commonBookTags/shopproductTable.vue";
import commonTree from "@/views/components/commonBookTags/tags.vue";
import "quill/dist/quill.core.css";
import "quill/dist/quill.snow.css";
import "quill/dist/quill.bubble.css";
const toolbarOptions = [
["bold", "italic", "underline", "strike"], // 加粗，斜体，下划线，删除线
["blockquote", "code-block"], //引用，代码块
[{ header: 1 }, { header: 2 }], // 几级标题
[{ list: "ordered" }, { list: "bullet" }], // 有序列表，无序列表
[{ script: "sub" }, { script: "super" }], // 下角标，上角标
[{ indent: "-1" }, { indent: "+1" }], // 缩进
[{ direction: "rtl" }], // 文字输入方向
[{ size: ["small", false, "large", "huge"] }], // 字体大小
[{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题
[{ color: [] }, { background: [] }], // 颜色选择
[
{
font: [
"SimSun",
"SimHei",
"Microsoft-YaHei",
"KaiTi",
"FangSong",
"Arial"
]
}
], // 字体
[{ align: [] }], // 居中
["clean"], // 清除样式,
["link", "image"] // 上传图片、上传视频
];
// import dialogComponent from './seckillprodrelation'
export default {
data() {
@@ -385,10 +490,11 @@ export default {
edit: "/master/courseMedical/editCourseMedical",
hasBindProductList: "/master/courseMedical/getCourseListForMedical",
CanBindProductList: "/master/courseMedical/getCourseListCanMedical",
editCourse:'/master/courseMedical/updateCourseToMedicalSort'
editCourse: "/master/courseMedical/updateCourseToMedicalSort"
},
activeName:'first',
addForm: {},
audioFileList: [],
isFresh: false,
dataRule: {
name: [
@@ -399,7 +505,7 @@ export default {
}
]
},
fimages:'',
fimages: "",
currentNode: {},
treeDataList: [],
associatedGoodsList: [], //已关联商品列表
@@ -461,14 +567,39 @@ export default {
headerAlign: "center",
slot: "productImages"
}
]
],
// 富文本编辑器配置
editorOption: {
modules: {
history: {
delay: 1000,
maxStack: 50,
userOnly: false
},
toolbar: {
container: toolbarOptions,
handlers: {
image: function(value) {
// if (value) {
// 调用element的图片上传组件
document.querySelector(".avatar-uploader11 input").click();
// } else {
// this.quill.format("image", false);
// }
}
}
}
},
placeholder: "请输入简介说明"
}
};
},
components: {
AddOrUpdate,
commonShop,
commonTree,
commonShopTable
commonShopTable,
quillEditor
},
watch: {
filterText(val) {
@@ -480,6 +611,49 @@ export default {
this.getDataList();
},
methods: {
audioHandleRemove(file, fileList) {
console.log(file, fileList);
this.audioFileList = []
this.addForm.media = ''
},
audioUploadSuccess(res, file) {
this.audioFileList = []
this.audioFileList.push(file)
console.log(this.audioFileList,res, "上传成功");
this.addForm.media = res.url
},
// 失去焦点事件
onEditorBlur(quill) {
// console.log('editor blur!', quill)
},
// 获得焦点事件
onEditorFocus(quill) {
//console.log('editor focus!', quill)
},
// 准备富文本编辑器
onEditorReady(quill) {
// console.log('editor ready!', quill)
},
contentUploadSuccess888(res, file) {
console.log(res);
},
contentUploadSuccess(res, file) {
// console.log(res)
let quill = this.$refs.myQuillEditor.quill;
// 如果上传成功
if (res) {
// 获取光标所在位置
let length = quill.getSelection().index;
// 插入图片，res为服务器返回的图片链接地址
quill.insertEmbed(length, "image", res.url);
// 调整光标到最后
quill.setSelection(length + 1);
} else {
// 提示信息，需引入Message
this.$message.error("图片插入失败！");
}
},
UpNumber(e) {
e.target.value = e.target.value.replace(/[^\d]/g, "");
},
@@ -553,9 +727,19 @@ export default {
this.isEdit = false;
this.isFresh = true;
console.log("🚀 ~ getCommonShopDataList ~ type, id:", type, id);
this.currentNode = { data: { ...form } };
this.addForm = form;
this.fimages = this.addForm.icon
if(this.addForm.isLast == 0){
this.activeName = 'first'}
this.fimages = this.addForm.icon;
this.audioFileList = []
if(this.addForm.mediaType == 2 && this.addForm.media != ''){
this.audioFileList.push({
url:this.addForm.media,
name:'audio--'
})
}
await this.getDataList();
// this.$refs.commonTree.setCurrentNodeShow();
@@ -578,12 +762,16 @@ export default {
this.addForm.icon = "";
},
handlePicSuccess(res, file) {
// console.log(res,'res')
// if (res.msg == "success") {
this.fimages = res.url;
this.addForm.icon = res.url;
this.$message.success("上传成功");
console.log(this.fimages, this.addForm.icon, "上传");
// console.log(res, "上传");
},
handlePicSuccess11() {
console.log("上传音频---");
},
handlePicSuccess111() {
console.log("上传音频");
},
//新增修改
dataFormSubmit: debounce(async function(formName) {
@@ -592,8 +780,11 @@ export default {
this.$message.error("请输入标签名称");
return false;
}
console.log(this.addForm, "this.addForm-----------");
if(!this.addForm.content){
this.addForm.content = ''
}
console.log(this.addForm, "this.addForm-----------");
await this.$refs[formName].validate(async valid => {
if (valid) {
await this.$http({
@@ -608,12 +799,8 @@ export default {
if (data && data.code === 0) {
// var status = await this.correlationShop(data.result.id);
await this.getDataList();
this.$nextTick(async () => {
this.$refs.commonTree.setCurrentNodeShow(data.Medical.id);
this.fimages = data.market.icon
this.addForm = data.market;
this.currentNode = { data: { ...data.Medical } };
this.$message({
message: "操作成功",
type: "success",
@@ -622,6 +809,20 @@ export default {
this.visible = false;
}
});
// this.$refs.commonShopTable.getAssociatedGoodsList();
if (data.Medical.icon && data.Medical.icon != "") {
this.fimages = data.Medical.icon;
}
this.addForm = data.Medical;
this.audioFileList = []
if(this.addForm.mediaType == 2 && this.addForm.media != ''){
this.audioFileList.push({
url:this.addForm.media,
name:'audio'
})
}
/// this.currentNode = { data: { ...data.Medical } };
});
} else {
this.$message.error(data.msg);
@@ -712,6 +913,7 @@ export default {
// console.log(this.$refs.tree.handleClickNodes(), "当前选中节点");
console.log(node, data, "当前选中节点");
this.currentNode = node ? node : {};
this.isFresh = false;
this.isFresh = true;
@@ -729,6 +931,7 @@ export default {
delFlag: 0,
isLast: 0,
icon: "",
content:'',
pid: data.id,
sort: 0,
title: ""
@@ -736,7 +939,6 @@ export default {
break;
}
this.addForm = { ...form };
this.$nextTick(() => {
this.$refs.commonShop.clear();
// this.$refs.commonShop.bookMarketId = null;
@@ -1100,9 +1302,18 @@ export default {
box-sizing: border-box;
// background: #fafafa;
}
.flexBox {
display: flex;
}
.subBox {
border: 1px solid #d6d6d6;
border-radius: 10px;
overflow: hidden;
width: 49%;
padding: 10px;
}
.border_box {
height: 100px;
// height: 100px;
margin-bottom: 10px;
.title_box {
@@ -1139,7 +1350,7 @@ export default {
.border_box {
width: 100%;
float: right;
// float: right;
background: #fffefe;
border-radius: 10px;
@@ -1172,6 +1383,10 @@ export default {
}
}
.dataType{
margin: 20px 0;
justify-content: center;
}
.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
background-color: #eaebed;
color: #4796ec;
@@ -1207,14 +1422,16 @@ p {
}
.submitButtonBox {
margin-top: 20px;
display: flex;
align-items: center;
justify-content: space-between;
// margin-top: 20px;
// display: flex;
// align-items: center;
// justify-content: space-between;
}
.submitButton {
float: right;
// float: right;
text-align: center;
margin: 15px auto;
}
// .el-tree-node__content .el-button {
@@ -1236,7 +1453,7 @@ p {
overflow: hidden;
.form_item {
width: 25%;
width: 33%;
float: left;
}
}
@@ -1266,4 +1483,9 @@ p {
.shopFormBox {
min-width: auto !important;
}
.ql-container {
min-height: 200px;
}
/deep/ .quill-editor{min-height: 200px !important;}
</style>