From ca7571548578c32bf0a72b269655f9baec1f6849 Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期五, 13 三月 2026 16:33:15 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/JiAnLiKu
---
WMS/WIDESEA_WMSClient/src/views/Index.vue | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/WMS/WIDESEA_WMSClient/src/views/Index.vue b/WMS/WIDESEA_WMSClient/src/views/Index.vue
index d7d5304..8394c1c 100644
--- a/WMS/WIDESEA_WMSClient/src/views/Index.vue
+++ b/WMS/WIDESEA_WMSClient/src/views/Index.vue
@@ -31,6 +31,10 @@
</div> -->
</div>
<div class="header-info">
+ <!--娑堟伅绠＄悊-->
+ <div class="h-link" @click="showDraw">
+ <a><i class="el-icon-message-solid"></i></a>
+ </div>
<div class="h-link">
<a href="javascript:void(0)" @click="to(item)" v-for="(item, index) in links.filter((c) => {
return c.icon;
@@ -91,7 +95,8 @@
<component :is="Component" :key="$route.name"
v-if="!$route.meta || ($route.meta && !$route.meta.hasOwnProperty('keepAlive'))" />
</keep-alive>
- <component :is="Component" :key="$route.name" v-if="$route.meta && $route.meta.hasOwnProperty('keepAlive')" />
+ <component :is="Component" :key="$route.name"
+ v-if="$route.meta && $route.meta.hasOwnProperty('keepAlive')" />
</router-view>
</el-scrollbar>
</div>
@@ -107,8 +112,11 @@
</div>
</el-drawer>
- <el-drawer title="娑堟伅鍒楄〃" v-model="messageModel" direction="rtl" destroy-on-close>
- <Message :list="messageList"></Message>
+ <el-drawer title="璐т綅棰勮" v-model="messageModel" direction="rtl" destroy-on-close>
+ <el-alert v-for="item in messageList" :title="item" type="warning" description="璇ヤ粨搴撹揣浣嶅崰鏈夌巼宸茶揪鍒�80%鎴栦互涓婏紝璇峰強鏃舵竻鐞嗚揣浣�"
+ closable="false"
+ show-icon>
+ </el-alert>
</el-drawer>
</div>
</template>
@@ -131,6 +139,7 @@
watch,
onMounted,
getCurrentInstance,
+ h,
} from "vue";
import { useRouter, useRoute } from "vue-router";
import store from "../store/index";
@@ -150,6 +159,7 @@
otherTabs: true,
menuLeft: 0,
menuTop: 0,
+ drawer: false,
// contextMenuVisible: false, // 鍙抽敭鍏抽棴鏄�/闅�
};
},
@@ -611,6 +621,18 @@
});
});
},
+ showDraw() {
+ http.post("/api/LocationInfo/LocationWarning", {}, true).then((result) => {
+ if (!result.status) {
+ this.$Message.$error(x.message);
+ } else {
+ console.log(result.data)
+ this.messageList = result.data
+ this.messageModel = true
+ console.log(this.messageList)
+ }
+ });
+ },
},
/**
@@ -713,4 +735,14 @@
transition: 0s width ease-in-out, 0s padding-left ease-in-out,
0s padding-right ease-in-out;
}
+
+/* 璐т綅棰勮鎶藉眽寮圭獥鐨勫叏灞�灞傜骇淇濋殰 */
+.el-drawer {
+ z-index: 9999 !important;
+}
+
+/* 鎶藉眽鐨勮挋灞備篃闇�瑕佸搴旀彁楂樺眰绾� */
+.el-drawer__mask {
+ z-index: 9998 !important;
+}
</style>
--
Gitblit v1.9.3