From 016a01ba8d66f31b94c4cae47ef95f7f7364a4ee Mon Sep 17 00:00:00 2001 From: Double-_-Z <2492419643@qq.com> Date: Wed, 18 Dec 2024 14:30:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 4 +- public/favicon.ico | Bin 1150 -> 1931 bytes src/api/baseUrlHost.ts | 3 +- src/api/download/index.ts | 4 +- src/api/message/index.ts | 7 +++ src/layout/logo/index.vue | 2 +- src/utils/request.ts | 5 +- src/views/login/index.vue | 4 +- src/views/message/dialog.vue | 6 ++- src/views/message/index.vue | 74 +++++++++++++++++++++++++++++- src/views/photos/index.vue | 5 -- src/views/service/apply/index.vue | 2 + 12 files changed, 100 insertions(+), 16 deletions(-) diff --git a/index.html b/index.html index dc8466c..9025126 100644 --- a/index.html +++ b/index.html @@ -6,11 +6,11 @@
eS48jVIo7fm;rOxMWPqi|tiVOb=RC3wAF*tl_H zNjF)7s&Hjx<>Kt@?1QnfvD_SfkUMxh9`XA1>*?qYJ%j~O6r;Cn*-~sU^lMmsBuL#A zD^?u3mn?ymmzPhUHEUM6*=z<`mbp2+pj{{b#f0@DhO?tU|!ZkVoo93RwaXUbbx6 zf&0l4gfnN(ObK^VxF5(zUcY|*cHZp;p|P=X2yaIONZo>hf+M3xkN%UJdO^TqW-xC@ z3^r`o@G)-&fmtjTA4Uo-?>`dcJ)TYmJ_+00_B5b$MfcMc9Rr|^R#bK8&0lcr;5P>r z(wql@q4YQF>+6T}{v+Y@FtFG}7?vTb?I#7@LB!m40sKBKUYKQXV9XT-&|x0?z2fKW z36rua1G9s{a&mI2u&|iG`wxXk1aYx7UpXObfdZ}$KJWxkUy&Z;$J8t0ZaEoTtzb}l zRtxc#!m_VF-M3hs7y_F7{QOBsIE(i~f?UDn7GT_LALOkO!Q}vuP#p;ueX5J1C_Yn% z`D(-j1+wN!kTxyGm1q#PMi_I6ffipW7{ZJhGfqBE43_YA4U=Ko5-;dX05bMb?5DqQ zNg2-pxkN_;W;T!6nQCc|zn~NspH&KuxZuhtzH~1LSfTxDwOZTBuR?*;?Q{t+c7_OJ zX3FS)e4r0N%L*ERgm`PK2xg}i1~uEEI`gcu@Mtp}pU0>5K)@)`x@y&`T^K32DHwFP zbQ&3QP+hH_`h1`dKq{LDn4Lzw+35#=6xpI7u|)*?z>CVdopz|mRwr_()mmp~r#T}d z $XLzj~e^a1F^F!WuE)!M2- zHPM2r1tSI(u7jfsMW~!a{a)X6loE@Ji{GcVBuOB8@dFT_^)jk!7>Fm?txoF`kh(@w zKwSyd DsnL!8nli=* Qv-)5=N%=)F)UT<@| zd^%58mtOMY&9bCXbIsF`#^q?ql+@aVAUKy^$d_6y|~33CXau^r3`nlr0}N!S0n> z82&GvVo?^gcmtFC{wPTfy^W6pgWl-k&Bp){ZnX}B!m^Nr9Z;KEt>pdW$H@$0JOX+h zQ$3G_rS`MI4-z`q<3FYg8k21B%CV3twJLjyoS1EhEIB?M3>g=pOG33t@n^Z7ge)N- zmJn)N>xMSN4+{h^x`-?{h7rU;kafuCfrRUnFIUvT&13^k;HI#Hfd(^!*%?ImHZ%-r zgChm;5Z^9ypA9!Cu|$EsE169@6-4+3lrC+Cromb;;g?$^xC6yupH71noEfH`xsPy5 zqM#gJBw=QGSoY~pD7ecW=!i>!+>=;YV6?gi^-9U|TDUPH2Ic3bu!6`+;1~d4ZB1q? zcayD$u!4d45<9#o79AU1JR*D-%UVHX_JL_gR)D}C+C7Aup{&rU)TZjt9k?lMAZ01@ zdoTdllvlq`gSDRrMo3D`bTYKZmn-vs^kcr(Mu z@WS bK>B^{J(p)|!jtF6_xpKs@8!J^J;1x8gYX%p z>4!v*i70`<2$O$vr2oEbFFsK$s|H8D)cZ2^`uZ|G^1Gn}^&5DmSV#R+E{cAGHJ#VK zKFxut3O)kQCVNm@%;%jLp+93yXWLU3>5;1Ee|KeeA)`I#>_I)wJnAmHtm>@!eB-^j zGw<`;@I)~WJm{6+hb7DP%K8hvhZ-US{}|6vUs;Y368vIQQ+Hfjt~v(0i+B!Zh3BaE znAI8mK~qx>_J036AlIj6_GezDt6_MKo1VDIJgy^bm*X{|_1msG<=%1 W}RjZH2AGJkM|qC-4k3`*_WAjj-TNp&g~t*Wu|8+osq<1NR{~8(8Z* zvpS>yCirFCt0cmcdw@q?dzSfvYlNWv68tDw6LGWpCArLVnc*K|9<>r$9eo7su0AuF zPo)Lk1AB1B?y&bR!M_bOoZrmH^$>XfnW=7qzhqr!tbb~G2IG3~Mb=T5!1jpe<*KmN z8=M)R-w0q7dOg9v13xDCO2J7CvhMQ}lE3XHs^E{J(&@)DqJt-hNunP*Vnl~6L|H`c O5z%KqT9Lb#i2efjE94~r diff --git a/src/api/baseUrlHost.ts b/src/api/baseUrlHost.ts index 55b68c1..c7988fd 100644 --- a/src/api/baseUrlHost.ts +++ b/src/api/baseUrlHost.ts @@ -1,2 +1,3 @@ -export const baseUrlHost = "/vueAdminApi"; +// export const baseUrlHost = "/vueAdminApi"; +export const baseUrlHost = "/pixelApi"; export const pixelUrlHost = "/pixelApi"; \ No newline at end of file diff --git a/src/api/download/index.ts b/src/api/download/index.ts index d9ce1e4..305a116 100644 --- a/src/api/download/index.ts +++ b/src/api/download/index.ts @@ -1,4 +1,5 @@ import axios from "axios"; +import { ElMessage } from "element-plus"; const downloadPhoto = (imgSrc:any) => { axios({ @@ -15,8 +16,9 @@ const downloadPhoto = (imgSrc:any) => { a.click(); document.body.removeChild(a); window.URL.revokeObjectURL(url); + ElMessage({message: '图片下载成功!',type: 'success',}); }).catch(error => { - console.error('Download error:', error); + ElMessage({message: '图片下载失败!',type: 'error',}); }); }; diff --git a/src/api/message/index.ts b/src/api/message/index.ts index 2857969..468dd4c 100644 --- a/src/api/message/index.ts +++ b/src/api/message/index.ts @@ -25,5 +25,12 @@ export function messageApi() { method: 'get', }); }, + updateMessage: (data: object) => { + return request({ + url: baseUrlHost + '/cpMessage', + method: 'put', + data, + }) + }, }; } diff --git a/src/layout/logo/index.vue b/src/layout/logo/index.vue index 3bd8653..42eed67 100644 --- a/src/layout/logo/index.vue +++ b/src/layout/logo/index.vue @@ -1,7 +1,7 @@ - + {{ themeConfig.globalTitle }}
diff --git a/src/utils/request.ts b/src/utils/request.ts index 9719205..1b4c424 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -44,9 +44,10 @@ service.interceptors.response.use( ElMessageBox.alert('你已被登出,请重新登录', '提示', {}) .then(() => {}) .catch(() => {}); - }else if(res.code === 502 && res.errorMsg){ - return res; } + // else if(res.code === 502 && res.errorMsg){ + // return res; + // } return Promise.reject(service.interceptors.response); } else { return res; diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 6483f43..0f7ca31 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,13 +1,13 @@
@@ -71,6 +89,19 @@ const state = reactive({ size: 10, }, }, + replayDialog: { + loading: false, + form: { + id: '', + replay: '', + }, + show: false, + title: '回复', + message: '', + rules: { + replay: { required: true, message: '回复内容不能为空', trigger: 'blur' } + } + } }); // 类型列表 @@ -111,6 +142,37 @@ const toShowDetail = (id: any) => { messageDialogRef.value.openDialog(id); } +const replayFormRef = ref(); + +// 回复 +const replay = (row: any) => { + state.replayDialog.message = row.message; + state.replayDialog.form.id = row.id; + state.replayDialog.show = true; +} + +// 提交回复 +const commitReplay = () => { + try { + state.replayDialog.loading = true; + replayFormRef.value.validate(async(valid: boolean) => { + if (valid){ + let res = await mesApi.updateMessage(state.replayDialog.form); + if(res?.success){ + ElMessage.success('回复成功!'); + state.replayDialog.show = false; + }else{ElMessage.error('回复失败!');} + }else{ + ElMessage.error('请完善信息!'); + } + }); + } catch (error) { + ElMessage.error('回复失败!'); + }finally{ + state.replayDialog.loading = false; + } +} + // 日期格式化 const dateFormatter = (row: any, column: TableColumnCtx- +diff --git a/src/views/message/dialog.vue b/src/views/message/dialog.vue index 7614a29..d32f105 100644 --- a/src/views/message/dialog.vue +++ b/src/views/message/dialog.vue @@ -16,6 +16,9 @@![]()
{{ state.ruleForm.message }} + ++ {{ state.ruleForm.replay }} @@ -41,7 +44,8 @@ const state = reactive({ phone: "", type: "", message: "", - createtime: [] + createtime: [], + replay: null }, dialog: { isShowDialog: false, diff --git a/src/views/message/index.vue b/src/views/message/index.vue index 488d730..1bb0684 100644 --- a/src/views/message/index.vue +++ b/src/views/message/index.vue @@ -28,7 +28,7 @@@@ -47,6 +47,24 @@ 查看详情 -回复 +回复 + + + +++ ++ {{ state.replayDialog.message }} + ++ + ++ ) => { if(row.createtime === null) return '暂无'; @@ -148,4 +210,14 @@ onMounted(() => { } } } +.dialog-content{ + padding: 0; + display: flex; + flex-direction: column; +} +.dialog-footer{ + margin-top: 20px; + display: flex; + justify-content: flex-end; +} \ No newline at end of file diff --git a/src/views/photos/index.vue b/src/views/photos/index.vue index ae469b5..2edd9cb 100644 --- a/src/views/photos/index.vue +++ b/src/views/photos/index.vue @@ -463,11 +463,6 @@ const download = async(row:any) =>{ newPath = newPath.includes('http://localhost:8888/') ? newPath : viteUrl + newPath try{ await downloadPhoto(newPath); - - ElMessage({ - message: '图片下载成功!', - type: 'success', - }); }catch(error){ console.error(error); ElMessage.error('图片下载失败!') diff --git a/src/views/service/apply/index.vue b/src/views/service/apply/index.vue index a33187d..8a5a203 100644 --- a/src/views/service/apply/index.vue +++ b/src/views/service/apply/index.vue @@ -95,6 +95,8 @@ import { defineAsyncComponent, onMounted, reactive, ref } from 'vue'; // 基本路径 const viteUrl = import.meta.env.VITE_API_URL; +console.log('viteUrl:',viteUrl); + // upload/Attachment/20241207/0fb6372ed5cd4fb9be68315301093f57.png const defaultIcon:string = 'static/pixel/home/default-work.png';