From 8718413202742d6896bfa97524631819d7ddc1e9 Mon Sep 17 00:00:00 2001 From: du <1176658673@qq.com> Date: Fri, 1 Mar 2024 17:30:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 8 +- src/api/Sys.ts | 20 +++++ src/components/QuillEditor/index.vue | 4 +- .../system/message/add-modify-message.vue | 38 ++++++---- src/views/system/message/index.vue | 74 +++++++++++-------- 5 files changed, 95 insertions(+), 49 deletions(-) diff --git a/.env.development b/.env.development index 7815fc2..fd548a1 100644 --- a/.env.development +++ b/.env.development @@ -13,9 +13,11 @@ VITE_PROXY_API = /dev-api # http://42.193.40.239:8017/doc.html//线上 http://192.168.110.186:8017/doc.html//本地 -# VITE_PROXY = [ ["/dev-api", "http://42.193.40.239:8017" ],["/dev-img-api", "http://file.sczysoft.com" ]] -VITE_PROXY = [ ["/dev-api", "http://192.168.110.186:8017" ],["/dev-img-api", "http://file.sczysoft.com" ]] +VITE_PROXY = [ ["/dev-api", "http://42.193.40.239:8017" ],["/dev-img-api", "http://file.sczysoft.com" ]] +# VITE_PROXY = [ ["/dev-api", "http://192.168.110.186:8017" ],["/dev-img-api", "http://file.sczysoft.com" ]] # VITE_GLOB_UPLOAD_URL=/dev-api VITE_UPLOAD_IMG_URL=/dev-img-api -VITE_UPLOAD_URL = http://192.168.110.186 +# VITE_UPLOAD_URL = http://192.168.110.186 +VITE_UPLOAD_URL = http://42.193.40.239:8888 + diff --git a/src/api/Sys.ts b/src/api/Sys.ts index 231712e..e248b35 100644 --- a/src/api/Sys.ts +++ b/src/api/Sys.ts @@ -337,5 +337,25 @@ export function saveUser(data) { data:params }); } +/** + *消息管理-通知公告详情 + */ + export function noticeDetail(params) { + return request({ + url: `/admin/notice/noticeDetail/${params.govNoticeId}`, + method: "GET", + }); +} + +/** + *消息管理-通知公告删除 + */ + export function noticeDel(params) { + return request({ + url: `/admin/notice/noticeDel/${params.govNoticeId}`, + method: "POST", + }); +} + diff --git a/src/components/QuillEditor/index.vue b/src/components/QuillEditor/index.vue index f83b118..2ba0ea1 100644 --- a/src/components/QuillEditor/index.vue +++ b/src/components/QuillEditor/index.vue @@ -25,8 +25,8 @@ const content = ref('') const myQuillEditor = ref() watch(() => props.value, (val) => { // console.log(toRaw(myQuillEditor.value)) - // toRaw(myQuillEditor.value).setHTML(val) - content.value = val + toRaw(myQuillEditor.value).setHTML(val) + content.value = val; }, { deep: true }) const fileBtn = ref() const data = reactive({ diff --git a/src/views/system/message/add-modify-message.vue b/src/views/system/message/add-modify-message.vue index 7ad1598..b61daf0 100644 --- a/src/views/system/message/add-modify-message.vue +++ b/src/views/system/message/add-modify-message.vue @@ -62,7 +62,7 @@ import useUserStore from "@/store/modules/user"; import { getYears, getUUID, FileType } from "@/utils/common"; import { ElMessage, FormInstance, FormRules } from "element-plus"; import { uploadFile, getFile, delFile } from "@/api/file"; -import { noticeAdd } from "@/api/Sys"; +import { noticeAdd, noticeDetail } from "@/api/Sys"; const formRef = ref(); const userStore = useUserStore(); @@ -88,8 +88,10 @@ const props = defineProps({ const addMessageForm = ref({ content: "",title:"" }); const emits = defineEmits(["close", "onSubmit"]); //富文本 +const msgContent = ref('') const getMsg = (val) => { - addMessageForm.value.content = val; + // addMessageForm.content = val; + msgContent.value = val; }; //保存并退出 @@ -99,8 +101,9 @@ const handleSubmit = () => { let params = { ...addMessageForm.value, coverImg:fileList.value[0].filepath, + govNoticeId:addMessageForm.value.govNoticeId||uuid.value, + content : msgContent.value } - console.log(params,'params===>'); noticeAdd(params).then((res: any) => { if (res.code == 1) { ElMessage.success({ @@ -126,31 +129,40 @@ const baseUrl = ref(import.meta.env.VITE_UPLOAD_URL); }; //图片查询 const getFiles = (FileType) => { - console.log(FileType,'FileType==>'); - console.log(addMessageForm.value.govNoticeId,'addMessageForm.value.govNoticeId===>'); - getFile(addMessageForm.value.govNoticeId || uuid.value, FileType).then( (res: any) => { - console.log(res,'图片查询res==>'); - fileList.value = res.data; } ); }; - +//查询详情 +const getNoticeDetail = (id) =>{ + let params = { + govNoticeId:id + } + noticeDetail(params).then( + (res: any) => { + addMessageForm.value = res.data; + getFiles(FileType.messageCover); + msgContent.value = res.data.content; + } + ); +} //关闭弹窗 const onclone = () => { emits("close"); + addMessageForm.value = {}; + addMessageForm.value.content = ""; + addMessageForm.value.title = ""; }; watch( () => props.visible, () => { uuid.value = getUUID(); - addMessageForm.value = props.form; - console.log(addMessageForm.value,'addMessageForm===>'); - - getFiles(FileType.messageCover); + if (props.form.govNoticeId) { + getNoticeDetail(props.form.govNoticeId); + } } ); diff --git a/src/views/system/message/index.vue b/src/views/system/message/index.vue index a309478..d24e7f4 100644 --- a/src/views/system/message/index.vue +++ b/src/views/system/message/index.vue @@ -41,7 +41,6 @@ v-loading="tableDataloading" :data="tableData" header-row-class-name="el-one-header" - @selection-change="handleSelectionChange" border > + + + - - 详情 - + 删除 @@ -127,7 +130,7 @@