From e220a11760bb56f12da82a18e0b441dfdc588fac Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期四, 07 十二月 2023 15:30:25 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/notice/components/noticeDialog.vue | 129 ++++++++++++++++++++++++++++--------------
1 files changed, 86 insertions(+), 43 deletions(-)
diff --git a/src/views/safetyReview/notice/components/noticeDialog.vue b/src/views/safetyReview/notice/components/noticeDialog.vue
index 27f66bd..69294e7 100644
--- a/src/views/safetyReview/notice/components/noticeDialog.vue
+++ b/src/views/safetyReview/notice/components/noticeDialog.vue
@@ -11,36 +11,13 @@
<el-input v-model.trim="state.noticeForm.noticeTitle" v-if="!isReview" ></el-input>
<span v-else>{{state.noticeForm.noticeTitle}}</span>
</el-form-item>
- <div style="margin: 0 0 15px 30px" v-if="!isReview">
- <el-upload
- v-model:file-list="fileList"
- class="upload-demo"
- action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
- multiple
- :on-preview="handlePreview"
- :on-remove="handleRemove"
- :before-remove="beforeRemove"
- :limit="3"
- >
- <el-button type="primary">附件上传</el-button>
- </el-upload>
- </div>
- <el-form-item v-else label="附件:" >
- <div class="file">
- <el-link v-for="(item,index) in state.noticeForm.fileList" type="primary" :key="index" :underline="false">
- <i class="el-icon-paperclip" style="margin-right: 5px;color: #1e6abc"></i>{{item.fileName}}
- </el-link>
- </div>
- </el-form-item>
- <el-form-item v-if="!isReview" style="margin-left: -80px" prop="noticeContent">
-<!-- <tinymce v-model="state.noticeForm.noticeContent"></tinymce>-->
- <editor ref="myQuillEditor" v-model="state.noticeForm.noticeContent" :height="300"></editor>
-
+ <el-form-item label="公告内容:" v-if="showEditor" required>
+ <we-editor ref="myEditor" :propData="state.noticeForm.noticeContent" @childFn="getEditorData" />
</el-form-item>
<el-form-item label="公告内容:" v-else>
- <div class="ql-container ql-snow" style="height: 300px;width: 100%;margin-top: 10px;" >
+ <div class="ql-container ql-snow" style="height: 500px;width: 100%;margin-top: 10px;" >
<div class="ql-editor">
- <div v-html="state.noticeForm.noticeContent"></div>
+ <div class="reviewTable" v-html="state.noticeForm.noticeContent" @click="showFile($event)"></div>
</div>
</div>
</el-form-item>
@@ -48,7 +25,7 @@
<template #footer v-if="!isReview">
<span class="dialog-footer">
<el-button @click="handleClose" size="default">取 消</el-button>
- <el-button type="primary" @click="onSubmit" size="default">确认发布</el-button>
+ <el-button type="primary" @click="onSubmit" size="default" v-preReClick>确认发布</el-button>
</span>
</template>
</el-dialog>
@@ -56,33 +33,41 @@
</template>
<script setup>
import {reactive, ref, toRefs} from 'vue'
+import WeEditor from "@/components/WeEditor/index.vue";
import Editor from "@/components/Editor/index.vue";
import {ElMessage} from "element-plus";
import {addNotice, editNotice, getNoticeDetail} from "@/api/backManage/notice";
+import axios from "axios";
+import {getToken} from "@/utils/auth";
+
+
+
+
const emit = defineEmits(["getList"]);
const dialogVisible = ref(false);
const title = ref("");
const noticeRef = ref();
const fileList = ref([]);
-const myQuillEditor = ref();
+const myEditor = ref();
const isReview = ref(false);
+const showEditor = ref(true);
const state = reactive({
noticeForm: {
id: '',
noticeTitle: '',
noticeContent: '',
- fileList: []
},
formRules:{
noticeTitle: [{ required: true, message: '请填写公告标题', trigger: 'blur' }],
- noticeContent: [{ required: true, message: '请输入公告内容', trigger: 'blur' }],
+ // noticeContent: [{ required: true, message: '请输入公告内容', trigger: 'blur' }],
},
})
const openDialog = async (type, value) => {
isReview.value = false;
+ showEditor.value = false
title.value = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看' ;
if(type === 'edit' || type === 'review') {
const param = {
@@ -96,9 +81,15 @@
}else{
ElMessage.warning(res.message)
}
+
}
if(type === 'review') {
+ showEditor.value = false
isReview.value = true;
+ }
+ if(type === 'edit' || type === 'add') {
+ showEditor.value = true;
+ isReview.value = false;
}
if(type === 'add'){
reset()
@@ -106,10 +97,49 @@
dialogVisible.value = true;
}
+const getEditorData = (val) =>{
+ state.noticeForm.noticeContent = val;
+}
+
+const showFile = (e) => {
+ if(e.target.nodeName === 'A'){
+ console.log("e",e)
+ e.preventDefault();
+ const file = {
+ fileUrl: e.target.href,
+ fileName: e.target.download
+ }
+ axios.get( file.fileUrl,{
+ headers:
+ {
+ 'Content-Type': 'application/json',
+ 'Authorization':getToken(),
+ },
+ responseType: 'blob'
+ }
+ ).then(res=>{
+ if (res) {
+ const link = document.createElement('a')
+ let blob = new Blob([res.data],{type: res.data.type})
+ link.style.display = "none";
+ link.href = URL.createObjectURL(blob); // 创建URL
+ link.setAttribute("download", file.fileName);
+ document.body.appendChild(link);
+ link.click();
+ document.body.removeChild(link);
+ } else {
+ this.$message.error('获取文件失败')
+ }
+ this.handleClose();
+ })
+ }
+}
const onSubmit = async () => {
+ console.log("点击提交")
+ myEditor.value.submit();
const valid = await noticeRef.value.validate();
if(valid){
- if(state.noticeForm.noticeContent === "<p><br></p>"){
+ if(state.noticeForm.noticeContent == "") {
ElMessage({
type: 'warning',
message: '请输入公告内容'
@@ -132,10 +162,10 @@
}
emit("getList")
reset();
+ myEditor.value.clear();
noticeRef.value.clearValidate();
dialogVisible.value = false;
}else if(title.value === '编辑') {
- const nowDate = new Date()
const param = {
id: state.noticeForm.id,
content: state.noticeForm.noticeContent,
@@ -152,6 +182,7 @@
}
emit("getList")
reset();
+ myEditor.value.clear();
noticeRef.value.clearValidate();
dialogVisible.value = false;
}
@@ -159,6 +190,12 @@
}
const handleClose = () => {
+ if(title ==="新增"|| title ==='编辑'){
+ myEditor.value.clear();
+ showEditor.value=false
+
+ }
+
noticeRef.value.clearValidate();
dialogVisible.value = false;
}
@@ -169,16 +206,6 @@
noticeContent: ''
}
}
-const handleRemove = (file, fileList) => {
- console.log(file, fileList);
-}
-const handlePreview = (uploadFile) => {
- console.log(uploadFile)
-}
-const beforeRemove = (file, fileList) => {
- return this.$confirm(`确定移除 ${ file.name }？`);
-}
-
defineExpose({
openDialog
@@ -197,4 +224,20 @@
align-items: flex-start;
}
}
+.reviewTable {
+ :deep(table){
+ border: 1px solid #ccc;
+ text-align: center;
+ }
+ :deep(table td){
+ border: 1px solid #ccc;
+ text-align: center;
+ padding: 0 5px;
+ }
+ :deep(table th){
+ border: 1px solid #ccc;
+ }
+}
+
+
</style>
--
Gitblit v1.9.2