From 04f368a3978484e7ca14fb3cc1d03a9f7353d5a0 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Wed, 21 Feb 2024 14:30:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=A2=84=E8=AD=A6=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/Home/Index.vue                  | 76 ++++++++++++++-----
 .../src/views/heli/storage/StorageForm.vue    |  2 +-
 .../src/views/heli/storage/StorageOut.vue     |  2 +-
 3 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue b/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue
index 99d233b8..ea6bab07 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue
@@ -1,22 +1,26 @@
 <template>
-  <div>
-    <el-card shadow="never">
-      <el-skeleton :loading="loading" animated>
-        <el-row :gutter="20" justify="space-between">
-          <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
-            <div class="flex items-center">
-              <img :src="avatar" alt="" class="mr-20px h-70px w-70px rounded-[50%]" />
-              <div>
-                <div class="text-20px">
-                  {{ t('workplace.welcome') }} {{ username }} {{ t('workplace.happyDay') }}
-                </div>
-<!--                <div class="mt-10px text-14px text-gray-500">
+  <el-card class="hl-card" style="min-height: 80vh">
+    <template #header>
+      <span>首页</span>
+    </template>
+    <div>
+      <el-card shadow="never">
+        <el-skeleton :loading="loading" animated>
+          <el-row :gutter="20" justify="space-between">
+            <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
+              <div class="flex items-center">
+                <img :src="avatar" alt="" class="mr-20px h-70px w-70px rounded-[50%]" />
+                <div>
+                  <div class="text-20px">
+                    {{ t('workplace.welcome') }} {{ username }} {{ t('workplace.happyDay') }}
+                  </div>
+                  <!--                <div class="mt-10px text-14px text-gray-500">
                   {{ t('workplace.toady') }}，20℃ - 32℃！
                 </div>-->
+                </div>
               </div>
-            </div>
-          </el-col>
-<!--          <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
+            </el-col>
+            <!--          <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
             <div class="h-70px flex items-center justify-end lt-sm:mt-10px">
               <div class="px-8px text-right">
                 <div class="mb-20px text-14px text-gray-400">{{ t('workplace.project') }}</div>
@@ -49,12 +53,12 @@
               </div>
             </div>
           </el-col>-->
-        </el-row>
-      </el-skeleton>
-    </el-card>
-  </div>
+          </el-row>
+        </el-skeleton>
+      </el-card>
+    </div>
 
-<!--  <el-row class="mt-5px" :gutter="20" justify="space-between">
+    <!--  <el-row class="mt-5px" :gutter="20" justify="space-between">
     <el-col :xl="16" :lg="16" :md="24" :sm="24" :xs="24" class="mb-10px">
       <el-card shadow="never">
         <template #header>
@@ -159,12 +163,13 @@
       </el-card>
     </el-col>
   </el-row>-->
+  </el-card>
 </template>
 <script lang="ts" setup>
 import { set } from 'lodash-es'
 import { EChartsOption } from 'echarts'
 import { formatTime } from '@/utils'
-
+import { ElNotification } from 'element-plus'
 import { useUserStore } from '@/store/modules/user'
 import { useWatermark } from '@/hooks/web/useWatermark'
 import avatarImg from '@/assets/imgs/smile.png'
@@ -378,4 +383,33 @@ const getAllApi = async () => {
 }
 
 getAllApi()
+
+const openwarn = () =>{
+ ElNotification({
+    title: `设计预警通知`,
+    message: `铸造工艺设计负责人: <span class="bordercolor">${`薛小宝`} </span>请注意!<br/>
+    项目编号【<span class="bordercolor">${`2546845`} </span>】的图纸设计即将超时，请及时完成。`,
+    type: 'warning',
+    offset: 100,
+    dangerouslyUseHTMLString: true,
+    duration: 0,
+    customClass: 'my-notification'
+  })
+}
+onMounted(() => {
+ openwarn()
+})
 </script>
+<style lang="scss">
+.my-notification {
+    width: 380px;
+  .el-notification__group {
+    .el-notification__content {
+      .bordercolor{
+        color: #409eff;
+      }
+    }
+  }
+ 
+}
+</style>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
index 04d9697d..df668ae4 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
@@ -421,7 +421,7 @@ const openerror = () => {
       ElMessageBox.alert(
         // 使用错误信息作为提示内容
           `文件名为：${failedAttachmentsName.value.join(' / ')}上传失败`,
-        `文件格式不正确或网络问题 请您稍微再试`,
+        `文件格式不正确或网络问题 请您稍后再试`,
         {
           dangerouslyUseHTMLString: false, // 由于我们不是使用HTML字符串，所以这里设置为false
           confirmButtonText: '知道了',
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
index 1c1a17c8..228e1079 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
@@ -437,7 +437,7 @@ const openerror = () => {
       ElMessageBox.alert(
         // 使用错误信息作为提示内容
         `文件名为：${failedAttachmentsName.value.join(' / ')}上传失败`,
-        `文件格式不正确或网络问题 请您稍微再试`,
+        `文件格式不正确或网络问题 请您稍后再试`,
         {
           dangerouslyUseHTMLString: false, 
           confirmButtonText: '知道了',