From 318b9aa8b541cf6fc720952edddda97e65142a40 Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Tue, 13 Jun 2023 12:04:17 +0800
Subject: [PATCH] =?UTF-8?q?REVIEW=20=E5=85=AC=E4=BC=97=E5=8F=B7=E7=B4=A0?=
 =?UTF-8?q?=E6=9D=90=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../penal/signal-message/SignalAndMessage.vue | 10 +-
 src/views/mp/draft/index.vue                  |  6 +-
 src/views/mp/material/index.vue               | 95 ++++++++-----------
 src/views/mp/menu/index.vue                   |  3 +-
 4 files changed, 50 insertions(+), 64 deletions(-)

diff --git a/src/components/bpmnProcessDesigner/package/penal/signal-message/SignalAndMessage.vue b/src/components/bpmnProcessDesigner/package/penal/signal-message/SignalAndMessage.vue
index e2c406db..2d47b8f0 100644
--- a/src/components/bpmnProcessDesigner/package/penal/signal-message/SignalAndMessage.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/signal-message/SignalAndMessage.vue
@@ -23,7 +23,7 @@
     </el-table>
 
     <el-dialog
-      v-model="modelVisible"
+      v-model="dialogVisible"
       :title="modelConfig.title"
       :close-on-click-modal="false"
       width="400px"
@@ -39,7 +39,7 @@
         </el-form-item>
       </el-form>
       <template #footer>
-        <el-button @click="modelVisible = false">取 消</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="addNewObject">保 存</el-button>
       </template>
     </el-dialog>
@@ -49,7 +49,7 @@
 const message = useMessage()
 const signalList = ref<any[]>([])
 const messageList = ref<any[]>([])
-const modelVisible = ref(false)
+const dialogVisible = ref(false)
 const modelType = ref('')
 const modelObjectForm = ref<any>({})
 const rootElements = ref()
@@ -85,7 +85,7 @@ const initDataList = () => {
 const openModel = (type) => {
   modelType.value = type
   modelObjectForm.value = {}
-  modelVisible.value = true
+  dialogVisible.value = true
 }
 const addNewObject = () => {
   if (modelType.value === 'message') {
@@ -101,7 +101,7 @@ const addNewObject = () => {
     const signalRef = bpmnInstances().moddle.create('bpmn:Signal', modelObjectForm.value)
     rootElements.value.push(signalRef)
   }
-  modelVisible.value = false
+  dialogVisible.value = false
   initDataList()
 }
 
diff --git a/src/views/mp/draft/index.vue b/src/views/mp/draft/index.vue
index d2ed1e24..ab5d5218 100644
--- a/src/views/mp/draft/index.vue
+++ b/src/views/mp/draft/index.vue
@@ -247,10 +247,8 @@
           </el-row>
         </div>
         <template #footer>
-          <div class="dialog-footer">
-            <el-button @click="dialogNewsVisible = false">取 消</el-button>
-            <el-button type="primary" @click="submitForm">提 交</el-button>
-          </div>
+          <el-button @click="dialogNewsVisible = false">取 消</el-button>
+          <el-button type="primary" @click="submitForm">提 交</el-button>
         </template>
       </el-dialog>
     </Teleport>
diff --git a/src/views/mp/material/index.vue b/src/views/mp/material/index.vue
index df4921fd..a57b6a2b 100644
--- a/src/views/mp/material/index.vue
+++ b/src/views/mp/material/index.vue
@@ -1,32 +1,31 @@
 <template>
-  <div class="app-container">
-    <doc-alert title="公众号素材" url="https://doc.iocoder.cn/mp/material/" />
-
-    <!-- 搜索工作栏 -->
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
     <el-form
+      class="-mb-15px"
       :model="queryParams"
       ref="queryFormRef"
-      size="small"
       :inline="true"
-      v-show="showSearch"
       label-width="68px"
     >
       <el-form-item label="公众号" prop="accountId">
-        <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
+        <el-select v-model="queryParams.accountId" placeholder="请选择公众号" class="!w-240px">
           <el-option
-            v-for="item in accounts"
-            :key="parseInt(item.id)"
+            v-for="item in accountList"
+            :key="item.id"
             :label="item.name"
-            :value="parseInt(item.id)"
+            :value="item.id"
           />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="handleQuery"><Icon icon="ep:search" />搜索</el-button>
+        <el-button @click="handleQuery"><Icon icon="ep:search" />搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" />重置</el-button>
       </el-form-item>
     </el-form>
+  </ContentWrap>
 
+  <ContentWrap>
     <el-tabs v-model="type" @tab-change="handleTabChange">
       <!-- tab 1：图片  -->
       <el-tab-pane name="image">
@@ -44,11 +43,11 @@
             :before-upload="beforeImageUpload"
             :on-success="handleUploadSuccess"
           >
-            <el-button size="small" type="primary">点击上传</el-button>
+            <el-button type="primary" plain>点击上传</el-button>
             <template #tip>
-              <span class="el-upload__tip" style="margin-left: 5px"
-                >支持 bmp/png/jpeg/jpg/gif 格式，大小不超过 2M</span
-              >
+              <span class="el-upload__tip" style="margin-left: 5px">
+                支持 bmp/png/jpeg/jpg/gif 格式，大小不超过 2M
+              </span>
             </template>
           </el-upload>
         </div>
@@ -64,14 +63,14 @@
                 circle
                 @click="handleDelete(item)"
                 v-hasPermi="['mp:material:delete']"
-                ><Icon icon="ep:delete"
-              /></el-button>
+              >
+                <Icon icon="ep:delete" />
+              </el-button>
             </el-row>
           </div>
         </div>
         <!-- 分页组件 -->
-        <pagination
-          v-show="total > 0"
+        <Pagination
           :total="total"
           v-model:page="queryParams.pageNo"
           v-model:limit="queryParams.pageSize"
@@ -95,11 +94,11 @@
             :on-success="handleUploadSuccess"
             :before-upload="beforeVoiceUpload"
           >
-            <el-button size="small" type="primary">点击上传</el-button>
+            <el-button type="primary" plain>点击上传</el-button>
             <template #tip>
-              <span class="el-upload__tip" style="margin-left: 5px"
-                >格式支持 mp3/wma/wav/amr，文件大小不超过 2M，播放长度不超过 60s</span
-              >
+              <span class="el-upload__tip" style="margin-left: 5px">
+                格式支持 mp3/wma/wav/amr，文件大小不超过 2M，播放长度不超过 60s
+              </span>
             </template>
           </el-upload>
         </div>
@@ -118,24 +117,23 @@
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template #default="scope">
-              <el-button type="primary" link size="small" plain @click="handleDownload(scope.row)"
-                ><Icon icon="ep:download" />下载</el-button
-              >
+              <el-button type="primary" link plain @click="handleDownload(scope.row)">
+                <Icon icon="ep:download" />下载
+              </el-button>
               <el-button
                 type="primary"
                 link
-                size="small"
                 plain
                 @click="handleDelete(scope.row)"
                 v-hasPermi="['mp:material:delete']"
-                ><Icon icon="ep:delete" />删除</el-button
               >
+                <Icon icon="ep:delete" />删除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
         <!-- 分页组件 -->
-        <pagination
-          v-show="total > 0"
+        <Pagination
           :total="total"
           v-model:page="queryParams.pageNo"
           v-model:limit="queryParams.pageSize"
@@ -149,7 +147,7 @@
           <span><Icon icon="ep:video-play" /> 视频</span>
         </template>
         <div class="add_but" v-hasPermi="['mp:material:upload-permanent']">
-          <el-button size="small" type="primary" @click="handleAddVideo">新建视频</el-button>
+          <el-button type="primary" plain @click="handleAddVideo">新建视频</el-button>
         </div>
         <!-- 新建视频的弹窗 -->
         <el-dialog
@@ -220,14 +218,9 @@
               <span>{{ formatDate(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            label="操作"
-            align="center"
-            fixed="right"
-            class-name="small-padding fixed-width"
-          >
+          <el-table-column label="操作" align="center" fixed="right">
             <template #default="scope">
-              <el-button type="primary" link size="small" plain @click="handleDownload(scope.row)"
+              <el-button type="primary" link plain @click="handleDownload(scope.row)"
                 ><Icon icon="ep:download" />下载</el-button
               >
               <el-button
@@ -237,14 +230,14 @@
                 plain
                 @click="handleDelete(scope.row)"
                 v-hasPermi="['mp:material:delete']"
-                ><Icon icon="ep:delete" />删除</el-button
               >
+                <Icon icon="ep:delete" />删除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
         <!-- 分页组件 -->
-        <pagination
-          v-show="total > 0"
+        <Pagination
           :total="total"
           v-model:page="queryParams.pageNo"
           v-model:limit="queryParams.pageSize"
@@ -252,11 +245,9 @@
         />
       </el-tab-pane>
     </el-tabs>
-  </div>
+  </ContentWrap>
 </template>
-
-<script setup>
-import { ref } from 'vue'
+<script setup name="MpMaterial">
 import WxVoicePlayer from '@/views/mp/components/wx-voice-play/main.vue'
 import WxVideoPlayer from '@/views/mp/components/wx-video-play/main.vue'
 import { getSimpleAccountList } from '@/api/mp/account'
@@ -275,8 +266,6 @@ const uploadVideoRef = ref()
 const type = ref('image')
 // 遮罩层
 const loading = ref(false)
-// 显示搜索条件
-const showSearch = ref(true)
 // 总条数
 const total = ref(0)
 // 数据列表
@@ -308,14 +297,14 @@ const uploadRules = reactive({
 })
 
 // 公众号账号列表
-const accounts = ref([])
+const accountList = ref([])
 
 onMounted(() => {
   getSimpleAccountList().then((data) => {
-    accounts.value = data
+    accountList.value = data
     // 默认选中第一个
-    if (accounts.value.length > 0) {
-      setAccountId(accounts.value[0].id)
+    if (accountList.value.length > 0) {
+      setAccountId(accountList.value[0].id)
     }
     // 加载数据
     getList()
@@ -365,8 +354,8 @@ const handleQuery = () => {
 const resetQuery = () => {
   queryFormRef.value?.resetFields()
   // 默认选中第一个
-  if (accounts.value.length > 0) {
-    setAccountId(accounts.value[0].id)
+  if (accountList.value.length > 0) {
+    setAccountId(accountList.value[0].id)
   }
   handleQuery()
 }
diff --git a/src/views/mp/menu/index.vue b/src/views/mp/menu/index.vue
index ae2b2491..8d979723 100644
--- a/src/views/mp/menu/index.vue
+++ b/src/views/mp/menu/index.vue
@@ -4,13 +4,12 @@
   <ContentWrap>
     <el-form
       class="-mb-15px"
-      :model="queryParams"
       ref="queryFormRef"
       :inline="true"
       label-width="68px"
     >
       <el-form-item label="公众号" prop="accountId">
-        <el-select v-model="accountId" placeholder="请选择公众号">
+        <el-select v-model="accountId" placeholder="请选择公众号" class="!w-240px">
           <el-option
             v-for="item in accountList"
             :key="item.id"