From 6d44b481fc42a6f18dc4cbc444396d0e9b10700b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Tue, 21 Nov 2023 08:16:10 +0800
Subject: [PATCH] =?UTF-8?q?:swap:=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/article/manager.vue          |  3 ++-
 src/views/system/menu/index.vue               |  2 +-
 .../EmailLog.vue => tool/email/emailLog.vue}  | 26 ++++++++++++++-----
 src/views/tool/email/emailTpl.vue             |  2 +-
 src/views/tool/email/sendEmail.vue            |  2 +-
 5 files changed, 25 insertions(+), 10 deletions(-)
 rename src/views/{monitor/EmailLog.vue => tool/email/emailLog.vue} (94%)

diff --git a/src/views/system/article/manager.vue b/src/views/system/article/manager.vue
index 78fa8f3..06438ae 100644
--- a/src/views/system/article/manager.vue
+++ b/src/views/system/article/manager.vue
@@ -135,7 +135,8 @@ function handleQuery() {
 
 /** 新增按钮操作 */
 function handleAdd() {
-  router.replace({ path: '/article/publish' })
+  // router.replace({ path: '/article/publish' })
+  router.push({ path: '/article/publish' })
 }
 
 /** 删除按钮操作 */
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 0c3bc79..4c83073 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -350,7 +350,7 @@ const state = reactive({
     orderNum: [{ required: true, message: '菜单顺序不能为空', trigger: 'blur' }],
     path: [
       { required: true, message: '路由地址不能为空', trigger: 'blur' },
-      { pattern: /^[A-Za-z].+$/, message: '输入格式不正确，字母开头', trigger: 'blur' }
+      { pattern: /^[/A-Za-z].+$/, message: '输入格式不正确，字母开头', trigger: 'blur' }
     ],
     visible: [{ required: true, message: '显示状态不能为空', trigger: 'blur' }]
   },
diff --git a/src/views/monitor/EmailLog.vue b/src/views/tool/email/emailLog.vue
similarity index 94%
rename from src/views/monitor/EmailLog.vue
rename to src/views/tool/email/emailLog.vue
index 6764203..5a363d7 100644
--- a/src/views/monitor/EmailLog.vue
+++ b/src/views/tool/email/emailLog.vue
@@ -31,7 +31,12 @@
     <!-- 工具区域 -->
     <el-row :gutter="15" class="mb10">
       <el-col :span="1.5">
-        <el-button type="primary" :disabled="multiple" v-hasPermi="['tool:email:send']" plain icon="upload" @click="handleSend"> 发送 </el-button>
+        <el-button type="primary" v-hasPermi="['tool:email:send']" plain icon="plus" @click="handleSendEmail"> 发送邮件 </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" :disabled="multiple" v-hasPermi="['tool:email:send']" plain icon="upload" @click="handleSend">
+          批量发送
+        </el-button>
       </el-col>
 
       <el-col :span="1.5">
@@ -64,9 +69,13 @@
           <DictTag :options="options.isSendOptions" :value="row.isSend"></DictTag>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="210" align="center">
+      <el-table-column label="操作" width="200">
         <template #default="scope">
           <el-button type="primary" size="small" icon="view" text @click="handlePreview(scope.row)"> 预览 </el-button>
+
+          <el-button type="danger" size="small" icon="delete" text v-hasPermi="['emaillog:delete']" @click="handleDelete(scope.row)">
+            删除
+          </el-button>
           <el-button
             type="primary"
             size="small"
@@ -77,9 +86,6 @@
             v-if="scope.row.isSend == 0">
             发送
           </el-button>
-          <el-button type="danger" size="small" icon="delete" text v-hasPermi="['emaillog:delete']" @click="handleDelete(scope.row)">
-            删除
-          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -97,8 +103,10 @@
 </template>
 
 <script setup name="emaillog">
-import { listEmailLog, sendEmail, delEmailLog, getEmailLog } from '@/api/system/emaillog.js'
+import { listEmailLog, sendEmail, delEmailLog } from '@/api/system/emaillog.js'
 const { proxy } = getCurrentInstance()
+
+const router = useRouter()
 const ids = ref([])
 const loading = ref(false)
 const showSearch = ref(true)
@@ -220,6 +228,12 @@ function handlePreview(row) {
   form.value = row
   open.value = true
 }
+function handleSendEmail() {
+  router.push({
+    path: '/tool/email/sendemail'
+  })
+}
+
 // 添加&修改 表单提交
 function handleSend(row) {
   const Ids = row.id != undefined ? [row.id] : ids.value
diff --git a/src/views/tool/email/emailTpl.vue b/src/views/tool/email/emailTpl.vue
index 3c89fc6..f3b1452 100644
--- a/src/views/tool/email/emailTpl.vue
+++ b/src/views/tool/email/emailTpl.vue
@@ -269,7 +269,7 @@ const handleOpenPre = function (row) {
   info.value = { ...row }
 }
 function handleSend() {
-  proxy.$tab.openPage('/tool/sendEmail')
+  proxy.$tab.openPage('/tool/email/sendEmail')
 }
 handleQuery()
 </script>
diff --git a/src/views/tool/email/sendEmail.vue b/src/views/tool/email/sendEmail.vue
index 5e395de..0888f64 100644
--- a/src/views/tool/email/sendEmail.vue
+++ b/src/views/tool/email/sendEmail.vue
@@ -125,7 +125,7 @@ function formSubmit() {
         if (res.code == 200) {
           proxy.$message.success('发送成功')
           reset()
-          router.push({ path: '/system/log/EmailLog' })
+          router.push({ name: 'emaillog' })
         }
         proxy.$modal.closeLoading()
       })