From 0da6ffc479eceef01478c6aaf6621fe293e3f7c3 Mon Sep 17 00:00:00 2001 From: lxl <lixuliang_hd@126.com> Date: 星期三, 26 十月 2022 09:53:19 +0800 Subject: [PATCH] 菜单 --- src/views/datamanage/metadataManage.vue | 6 +- src/api/api.js | 35 ++++++----- src/store/index.js | 6 ++ src/components/navMenu.vue | 74 +++++++++++++----------- 4 files changed, 69 insertions(+), 52 deletions(-) diff --git a/src/api/api.js b/src/api/api.js index cb83e27..4537e07 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -411,11 +411,11 @@ export function querySitePoint(size, index, name) { return service.get( '/LFServer/SitePoint/Query?pageSize=' + - size + - '&pageIndex=' + - (index - 1) + - '&name=' + - name + size + + '&pageIndex=' + + (index - 1) + + '&name=' + + name ); } //璇锋眰绔欏満鐐规暟閲� @@ -426,11 +426,11 @@ export function queryStationSeries(size, index, name) { return service.get( '/LFServer/StationSeries/Query?pageSize=' + - size + - '&pageIndex=' + - (index - 1) + - '&name=' + - name + size + + '&pageIndex=' + + (index - 1) + + '&name=' + + name ); } //璇锋眰绠¢亾涓績绾挎暟閲� @@ -442,11 +442,11 @@ export function queryMarker(size, index, name) { return service.get( '/LFServer/Marker/Query?pageSize=' + - size + - '&pageIndex=' + - (index - 1) + - '&name=' + - name + size + + '&pageIndex=' + + (index - 1) + + '&name=' + + name ); } //璇锋眰鏍囨々鏁伴噺 @@ -499,3 +499,8 @@ { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 } ).toString(); } + +// 鏌ヨ褰撳墠鐢ㄦ埛鐨勬潈闄愭巿鏉冨疄浣撻泦鍚� +export function getPerms() { + return request.get('perms/selectPermsEntity'); +} diff --git a/src/components/navMenu.vue b/src/components/navMenu.vue index d0bceb6..e502d4d 100644 --- a/src/components/navMenu.vue +++ b/src/components/navMenu.vue @@ -34,13 +34,13 @@ </template> <script> -import { logout } from '@/api/api'; -import { removeToken, getToken } from '@/utils/auth'; -import customElMenu from '../components/customElMenu.vue'; -import { queryMenuTree, updateMenuTree, queryMaxId } from '../api/api'; +import { logout } from "@/api/api"; +import { removeToken, getToken } from "@/utils/auth"; +import customElMenu from "../components/customElMenu.vue"; +import { queryMenuTree, getPerms } from "../api/api"; export default { - name: 'navMenu', + name: "navMenu", //import寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢� components: { customElMenu, @@ -50,10 +50,10 @@ oriData: [], //鍘熷鏍戞暟鎹� dirData: [], //el鏍戞暟鎹� newData: [], //鎷栧姩鍚庢暟鎹� - lang: 'zh', - activeIndex: '/', + lang: "zh", + activeIndex: "/", menuList: [], - editTitle: '', + editTitle: "", showPopover: false, showEditInfoWrapper: false, showEdit: false, @@ -61,11 +61,12 @@ editCatalogue: false, editUnit: false, itemdetail: {}, - formLabelWidth: '70px', + formLabelWidth: "70px", }; }, mounted() { this.getMenuTree(); + this.getUserPerms(); }, computed: { // 鎴戜滑浣跨敤璁$畻灞炴�ф潵鑾峰彇鍒板綋鍓嶇偣鍑荤殑鑿滃崟鐨勮矾鐢辫矾寰勶紝鐒跺悗璁剧疆default-active涓殑鍊� @@ -96,10 +97,10 @@ }); this.menuList = this.treeData(menuLists); } else { - alert('鏆傛棤鑿滃崟鏍忔暟鎹�'); + alert("鏆傛棤鑿滃崟鏍忔暟鎹�"); } } else { - console.log('鎺ュ彛鎶ラ敊'); + console.log("鎺ュ彛鎶ラ敊"); } }); }, @@ -110,86 +111,91 @@ return cloneData.filter((father) => { // 寰幆鎵�鏈夐」 let branchArr = cloneData.filter((child) => father.id == child.pid); // 瀵规瘮ID锛屽垎鍒笂涓嬬骇鑿滃崟锛屽苟杩斿洖鏁版嵁 - branchArr.length > 0 ? (father.children = branchArr) : ''; // 缁欑埗绾ф坊鍔犱竴涓猚hildren灞炴�э紝骞惰祴鍊� + branchArr.length > 0 ? (father.children = branchArr) : ""; // 缁欑埗绾ф坊鍔犱竴涓猚hildren灞炴�э紝骞惰祴鍊� // 灞炰簬鍚屼竴瀵硅薄闂锛屼緥濡傦細浠� a=b銆乧=1 锛岀劧鍚庡啀浠� b.c=c 锛� 閭d箞 a.c=b.c=c=1 锛涘悓鐞嗭紝鍚庣画浠� c.d=2 ,閭d箞 a.c.d 涔熸槸=2锛� // 鐢辨寰幆澶氭鍚庯紝灏辫兘褰㈡垚鐩稿簲鐨勬爲褰㈡暟鎹粨鏋� return father.pid == 1; // 杩斿洖涓�绾ц彍鍗� }); } else { - alert('鏆傛棤鑿滃崟鏍忔暟鎹�'); + alert("鏆傛棤鑿滃崟鏍忔暟鎹�"); } }, logOut() { - this.$confirm('纭鏄惁閫�鍑虹櫥褰�?', '鎻愮ず', { - confirmButtonText: '纭畾', - cancelButtonText: '鍙栨秷', - type: 'warning', + this.$confirm("纭鏄惁閫�鍑虹櫥褰�?", "鎻愮ず", { + confirmButtonText: "纭畾", + cancelButtonText: "鍙栨秷", + type: "warning", }) .then(async () => { const data = await logout({ token: getToken() }); console.log(data); if (data.code != 200) { - return this.$message.error('閫�鍑虹櫥褰曞け璐�'); + return this.$message.error("閫�鍑虹櫥褰曞け璐�"); } removeToken(); - this.$router.push('/login'); + this.$router.push("/login"); this.$message({ - message: '閫�鍑虹櫥褰曟垚鍔�', - type: 'success', + message: "閫�鍑虹櫥褰曟垚鍔�", + type: "success", }); }) .catch(() => { this.$message({ - type: 'info', - message: '宸插彇娑�', + type: "info", + message: "宸插彇娑�", }); }); }, switchLang() { //褰撳墠en - if (this.lang == 'en') { + if (this.lang == "en") { //璇█鎹㈡垚zh - this.lang = 'zh'; + this.lang = "zh"; //鑿滃崟鎹负zh - this.$store.commit('changeLang', 'zh'); + this.$store.commit("changeLang", "zh"); //i18鎹㈡垚zh this.$i18n.locale = this.lang; } //褰撳墠zh else { - this.lang = 'en'; + this.lang = "en"; this.$i18n.locale = this.lang; - this.$store.commit('changeLang', 'en'); //浼犻�掔偣鍑荤殑鑺傜偣 + this.$store.commit("changeLang", "en"); //浼犻�掔偣鍑荤殑鑺傜偣 } }, handleselect(index, indexPath) { if (Window.ws != null) { Window.ws.close(); Window.ws.onclose = () => { - console.log('鏈嶅姟鍣ㄥ叧闂�'); + console.log("鏈嶅姟鍣ㄥ叧闂�"); }; Window.ws = null; } - if (index.indexOf('http') != -1) { - this.$router.push('/databaseMonitoring'); - this.$store.commit('getIframe', index); + if (index.indexOf("http") != -1) { + this.$router.push("/databaseMonitoring"); + this.$store.commit("getIframe", index); } else if (isNaN(Number(index))) { this.$router.push(index); } + }, + getUserPerms() { + getPerms().then((res) => { + this.$commit("getPermsEntity", res.result); + }); }, }, watch: { $route() { let str = this.$route.path; - if (str[0] == '/') { + if (str[0] == "/") { this.activeIndex = str.slice(1); } }, }, created() { let str = this.$route.path; - if (str[0] == '/') { + if (str[0] == "/") { this.activeIndex = str.slice(1); } }, diff --git a/src/store/index.js b/src/store/index.js index 047c4f4..c5603c5 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -26,8 +26,14 @@ key: null, //绯荤粺鐩戞帶WebSocket ws: null, + //鏉冮檺鍚堥泦 + permsEntity: [], }, mutations: { + //鑾峰彇鏉冮檺鍚堥泦 + getPermsEntity() { + state.permsEntity = msg + }, // 鑾峰彇瀹屾暣闈㈠寘灞戣矾寰� changeCata(state, msg) { state.catalogueName = msg; diff --git a/src/views/datamanage/metadataManage.vue b/src/views/datamanage/metadataManage.vue index b9e51d7..717c031 100644 --- a/src/views/datamanage/metadataManage.vue +++ b/src/views/datamanage/metadataManage.vue @@ -264,7 +264,7 @@ <script> import { - queryMetaData, + select_meta_ByPageAndCount, // queryDataCount, updateMetaData, dltMetaDatas, @@ -361,13 +361,13 @@ pageIndex: num, pageSize: size, }; - queryMetaData(params).then((res) => { + select_meta_ByPageAndCount(params).then((res) => { // console.log(res); this.tableData = res.result; this.count = res.count; }); }, - + // 鍏抽敭瀛楁煡璇� submitForm(formName) { this.$refs[formName].validate((valid) => { -- Gitblit v1.9.3