From 2591e298a3fd1332ad0ca33059f6ba0b7d426f51 Mon Sep 17 00:00:00 2001
From: pengwei <2071057782@qq.com>
Date: 星期四, 20 三月 2025 10:08:00 +0800
Subject: [PATCH] 最新代码提交
---
项目代码/client/src/layout/index.vue | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/layout/index.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/layout/index.vue"
index af40482..f5a744c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/layout/index.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/layout/index.vue"
@@ -79,12 +79,12 @@
>
<div>
<span style="color: rgb(255, 255, 255); font-size: 0.88rem"
- >瑙掕壊锛氳秴绾х鐞嗗憳</span
+ >瑙掕壊锛歿{ acountInfo.roleName }}</span
>
</div>
<div style="margin-left: 2rem">
<span style="color: rgb(255, 255, 255); font-size: 0.88rem"
- >濮撳悕锛歿{ userName }}</span
+ >濮撳悕锛歿{ acountInfo.userTrueName }}</span
>
</div>
<img
@@ -181,13 +181,12 @@
<script>
// import { getTreeMenu } from "@/api/menu.js";
import { baseUrl } from "../utils";
-
-import loading from "@/components/basic/RouterLoading";
-import VolMenu from "@/components/basic/VolElementMenu.vue";
+import loading from "../components/basic/RouterLoading.vue";
+// import VolMenu from "@/components/basic/VolElementMenu.vue";
import Message from "@/views/index/Message.vue";
-import MessageConfig from "@/views/index/MessageConfig.js";
+// import MessageConfig from "@/views/index/MessageConfig.js";
-var imgUrl = require("@/assets/imgs/wms_x.png");
+var imgUrl = new URL("../assets/imgs/wms_x.png", import.meta.url).href;
var $this;
var $interval;
var $indexDate;
@@ -202,9 +201,11 @@
import { useRouter, useRoute } from "vue-router";
import store from "../store/index";
import http from "@/../src/api/http.js";
+import { GetUserInfo } from "@/api/user";
+
export default defineComponent({
components: {
- VolMenu,
+ // VolMenu,
loading,
Message,
},
@@ -256,7 +257,9 @@
},
]);
const errorImg = ref(
- 'this.src="' + require("@/assets/imgs/error-img.png") + '"'
+ 'this.src="' +
+ new URL("../assets/imgs/error-img.png", import.meta.url).href +
+ '"'
);
const selectId = ref("1");
// 銆愰椤点�戞爣绛惧簭鍙�(褰撳墠鍙抽敭閫変腑鐨勮彍鍗�)
@@ -556,6 +559,7 @@
}
}
Object.assign(_config.$tabs, { open: open, close: close });
+ getUser();
//鍒濆鍖栬彍鍗�
// getTreeMenu().then((res) => {
@@ -605,6 +609,12 @@
// selectId.value = "1";
// });
};
+ const acountInfo = ref({});
+ const getUser = () => {
+ GetUserInfo({}).then((res) => {
+ acountInfo.value = res.data;
+ });
+ };
created();
return {
menuWidth,
@@ -639,6 +649,7 @@
closeTabs,
currentMenuId,
router,
+ acountInfo,
};
},
/**
--
Gitblit v1.9.3