diff --git a/index.html b/index.html index 5cbf6a9..7307789 100644 --- a/index.html +++ b/index.html @@ -1,13 +1,81 @@ - - - - - 局长信箱 - - -
- - - + + + + + + 局长信箱 + + + +
+ +
+ + + + + + \ No newline at end of file diff --git a/package.json b/package.json index 0631d8a..64d7532 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,8 @@ }, "devDependencies": { "@vitejs/plugin-vue": "^4.5.2", + "amfe-flexible": "^2.2.1", + "postcss-pxtorem": "^6.1.0", "sass": "^1.69.7", "unplugin-auto-import": "^0.17.3", "unplugin-vue-components": "^0.26.0", diff --git a/src/assets/icons/return.svg b/src/assets/icons/return.svg new file mode 100644 index 0000000..88258c9 --- /dev/null +++ b/src/assets/icons/return.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/MailLevel.vue b/src/components/MailLevel.vue index 437e63a..89f1e87 100644 --- a/src/components/MailLevel.vue +++ b/src/components/MailLevel.vue @@ -38,12 +38,17 @@ watch(() => props.value, (val) => { content: ''; width: 10px; height: 10px; + background-color: #14C104; + border: 1px solid #6CFF5E; border-radius: 50%; - background-color: #6CFF5E; position: absolute; left: 0; top: 50%; transform: translateY(-50%); } + &[type=danger]::before { + background-color: #FF0000; + border-color: #FFBFBF; + } } \ No newline at end of file diff --git a/src/layout/components/Aside.vue b/src/layout/components/Aside.vue index 0a5bca7..5651b30 100644 --- a/src/layout/components/Aside.vue +++ b/src/layout/components/Aside.vue @@ -13,7 +13,7 @@ {{ route.meta.title }} - @@ -283,10 +283,12 @@ const closeCreateMailSelf = () => { const todos = ref([]); const showModel = ref(false); const activeMailId = ref(""); +const activeWorkType = ref("") -function handleMail(mailId) { +function handleMail(row) { showModel.value = true; - activeMailId.value = mailId; + activeMailId.value = row.mailId; + activeWorkType.value = row.workType } function getList() { diff --git a/src/views/work/components/MailDialog.vue b/src/views/work/components/MailDialog.vue index 4fc525c..ae2dd5f 100644 --- a/src/views/work/components/MailDialog.vue +++ b/src/views/work/components/MailDialog.vue @@ -64,18 +64,23 @@ ref="leftContainerRef" >
- - + style="height: 210px" + > + + + +
- {{ - getDictLable( - dictData.mail_level, - mail.mailLevel - ) - }} +
@@ -170,6 +173,13 @@ + + - \ No newline at end of file diff --git a/src/views/work/components/MailReturen.vue b/src/views/work/components/MailReturen.vue new file mode 100644 index 0000000..c0639b6 --- /dev/null +++ b/src/views/work/components/MailReturen.vue @@ -0,0 +1,95 @@ + + + \ No newline at end of file diff --git a/src/views/work/components/MailReturnDetail.vue b/src/views/work/components/MailReturnDetail.vue new file mode 100644 index 0000000..b4d63ce --- /dev/null +++ b/src/views/work/components/MailReturnDetail.vue @@ -0,0 +1,51 @@ + + + \ No newline at end of file diff --git a/src/views/work/components/RemainingTime.vue b/src/views/work/components/RemainingTime.vue index 29bf1be..245d5a7 100644 --- a/src/views/work/components/RemainingTime.vue +++ b/src/views/work/components/RemainingTime.vue @@ -1,6 +1,6 @@