Merge branch 'master' of http://111.229.35.227:3000/gitadmin/wms-antdvue

# Conflicts:
#	src/App.vue

src/views/system/user/index.vue

@@ -124,8 +124,8 @@
       @success="reloadTable('noRefresh')"
     />
     <userUpload v-if="importVisible" v-model:visible="importVisible" @success="reloadTable()" />
-     <!-- 发送WebSocket消息 -->
+    <!-- 发送WebSocket消息 -->
-     <sendMsgDialog v-if="sendMsgVisible" v-model:visible="sendMsgVisible" :receiveId="receiveId" />
+    <sendMsgDialog v-if="sendMsgVisible" v-model:visible="sendMsgVisible" :receiveId="receiveId" />
   </PageWrapper>
 </template>
 
@@ -139,7 +139,7 @@
     DownloadOutlined,
     UploadOutlined,
     PrinterOutlined,
-    CommentOutlined
+    CommentOutlined,
   } from '@ant-design/icons-vue';
   import { useForm } from '@/components/Form/index';
   import {
@@ -322,11 +322,11 @@
       showModal: true,
     });
   };
-    /**
+  /**
    * 发送消息
    * 此处写的是Socket消息发送案例，实际业务研发时根据实际需求自行接入模板消息
    */
-   const sendMessage = async () => {
+  const sendMessage = async () => {
     if (selectionData.value.length == 0) {
       message.error('请选择数据');
       return;

src/views/system/user/sendMsg.vue

@@ -1,17 +1,12 @@
 <template>
-  <a-modal
+  <a-modal v-model:visible="props.visible" title="发送消息" width="800px" @cancel="dialogClose">
-    v-model:visible="props.visible"
-    title="发送消息"
-    width="800px"
-    @cancel="dialogClose"
-  >
     <a-form :model="formData" :label-col="{ style: { width: '10-0px' } }" ref="formRef">
       <a-form-item
         label="消息内容"
         name="message"
         :rules="{ required: true, message: '请输入消息内容', trigger: 'blur' }"
       >
-        <a-textarea v-model:value="formData.message"/>
+        <a-textarea v-model:value="formData.message" />
       </a-form-item>
     </a-form>
     <template #footer>