From bcce41f0363a6d2b1bf3c2747e05cf95d18d24b9 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期二, 03 一月 2023 12:49:22 +0800
Subject: [PATCH] 1
---
src/api/api.js | 2
src/views/AuthorizationManagement/menuRoleAuthorization.vue | 2
public/config/config.js | 2 +
src/views/AuthorizationManagement/roleMenuAuthorization.vue | 2
src/views/maintenance/mochaitmo.vue | 3 +
src/views/maintenance/logLog.vue | 63 ++++++++++++++++++++++---------
6 files changed, 52 insertions(+), 22 deletions(-)
diff --git a/public/config/config.js b/public/config/config.js
index f6bf5a8..f816a36 100644
--- a/public/config/config.js
+++ b/public/config/config.js
@@ -1,5 +1,7 @@
var ipConfig = '192.168.20.39';
+var menuStartName = "绠￠亾鍩虹澶ф暟鎹钩鍙�";
+
var LFData = "http://" + ipConfig + "/LFData";
var BASE_URL = 'http://' + ipConfig + ':12316/server';
diff --git a/src/api/api.js b/src/api/api.js
index a6d29c3..69a498e 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -207,7 +207,7 @@
//鑿滃崟閫掑綊鏌ヨ鏁版嵁
export function selectMenuRecursive(params) {
- return request.get('/menu/selectMenuAll', { params: params });
+ return request.get('/menu/selectMenuRecursive', { params: params });
}
//鏂板鍗曟潯鑿滃崟
export function insertMenu(params) {
diff --git a/src/views/AuthorizationManagement/menuRoleAuthorization.vue b/src/views/AuthorizationManagement/menuRoleAuthorization.vue
index 663a27a..5acb3c8 100644
--- a/src/views/AuthorizationManagement/menuRoleAuthorization.vue
+++ b/src/views/AuthorizationManagement/menuRoleAuthorization.vue
@@ -268,7 +268,7 @@
// 閮ㄩ棬璇锋眰
async getMenuTree() {
//鑾峰彇鐩綍鏍戞渶澶D锛屾柊寤鸿妭鐐逛娇鐢�
- const data = await selectMenuRecursive({ name: '绠￠亾鍩虹澶ф暟鎹钩鍙�' });
+ const data = await selectMenuRecursive({ name: menuStartName });
if (data.code !== 200) {
return this.$message.error('璇锋眰鍗曚綅鎶ラ敊');
}
diff --git a/src/views/AuthorizationManagement/roleMenuAuthorization.vue b/src/views/AuthorizationManagement/roleMenuAuthorization.vue
index 3e59c8a..8014447 100644
--- a/src/views/AuthorizationManagement/roleMenuAuthorization.vue
+++ b/src/views/AuthorizationManagement/roleMenuAuthorization.vue
@@ -471,7 +471,7 @@
this.depList = this.treeData(data.result);
},
async getMenuTree() {
- const data = await selectMenuRecursive({ name: '绠￠亾鍩虹澶ф暟鎹钩鍙�' });
+ const data = await selectMenuRecursive({ name: menuStartName });
if (data.code !== 200) {
return this.$message.error('璇锋眰鍗曚綅鎶ラ敊');
}
diff --git a/src/views/maintenance/logLog.vue b/src/views/maintenance/logLog.vue
index 8a9e1d8..804264f 100644
--- a/src/views/maintenance/logLog.vue
+++ b/src/views/maintenance/logLog.vue
@@ -1,15 +1,17 @@
<template>
<div class="logLog_box">
- <My-bread
- :list="[
+ <My-bread :list="[
`${$t('operatManage.operatManage')}`,
`${$t('operatManage.logLog')}`,
- ]"
- ></My-bread>
+ ]"></My-bread>
<el-divider />
<div class="inquire">
-
- <el-form :inline="true" ref="sizeForm" :model="sizeForm" >
+
+ <el-form
+ :inline="true"
+ ref="sizeForm"
+ :model="sizeForm"
+ >
<el-form-item
prop="uname"
:label="$t('operatManage.operationLogObj.username')"
@@ -27,9 +29,18 @@
v-model="sizeForm.type"
:placeholder="$t('operatManage.operationLogObj.pleaseSelect')"
>
- <el-option :label="$t('loglog.login')" value="1" />
- <el-option :label="$t('loglog.checkout')" value="2" />
- <el-option :label="$t('loglog.logout')" value="3" />
+ <el-option
+ :label="$t('loglog.login')"
+ value="1"
+ />
+ <el-option
+ :label="$t('loglog.checkout')"
+ value="2"
+ />
+ <el-option
+ :label="$t('loglog.logout')"
+ value="3"
+ />
</el-select>
</el-form-item>
<el-form-item
@@ -65,33 +76,44 @@
@click="onSubmit"
icon="el-icon-search"
style="background: #409eff; border: 1px solid #409eff; color: white"
- >{{ $t("operatManage.operationLogObj.inquire") }}</el-button
- >
+ >{{ $t("operatManage.operationLogObj.inquire") }}</el-button>
<el-button
@click="onEmpty('sizeForm')"
icon="el-icon-delete"
type="info"
- >{{ $t("operatManage.operationLogObj.empty") }}</el-button
- >
+ >{{ $t("operatManage.operationLogObj.empty") }}</el-button>
</el-form-item>
</el-form>
</div>
<!-- 琛ㄦ牸鏄剧ず -->
<div class="table_box">
- <el-table :data="tableData" style="width: 100%" height="80%">
+ <el-table
+ :data="tableData"
+ style="width: 100%"
+ height="80%"
+ >
<el-table-column
width="150"
type="index"
:label="$t('loglog.serialnumber')"
/>
- <el-table-column prop="uname" :label="$t('loglog.username')" />
+ <el-table-column
+ prop="uname"
+ :label="$t('loglog.username')"
+ />
<el-table-column
prop="appid"
:label="$t('loglog.applicationProgram')"
:formatter="formatAppid"
/>
- <el-table-column prop="ip" :label="$t('loglog.ipadress')" />
- <el-table-column prop="descr" :label="$t('loglog.describe')" />
+ <el-table-column
+ prop="ip"
+ :label="$t('loglog.ipadress')"
+ />
+ <el-table-column
+ prop="descr"
+ :label="$t('loglog.describe')"
+ />
<el-table-column
prop="optime"
:formatter="formatData"
@@ -109,7 +131,10 @@
/>
</el-table>
<!-- 鍒嗛〉 -->
- <div style="margin-top: 40px" class="pagination_box">
+ <div
+ style="margin-top: 40px"
+ class="pagination_box"
+ >
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -184,7 +209,7 @@
let data;
switch (row[column.property]) {
case 1:
- data = "绠￠亾鍩虹澶ф暟鎹钩鍙�";
+ data = menuStartName;
break;
case 2:
data = "澶栭儴绯荤粺闆嗘垚";
diff --git a/src/views/maintenance/mochaitmo.vue b/src/views/maintenance/mochaitmo.vue
index b0b62a9..50b945f 100644
--- a/src/views/maintenance/mochaitmo.vue
+++ b/src/views/maintenance/mochaitmo.vue
@@ -141,10 +141,13 @@
//鑾峰彇鏍�
async getTreeData() {
const data = await queryMenuTree();
+
let menuLists = data.result.filter((value) => {
return value.url == '/mochaitmo';
});
+
const res = await selectMenuRecursive({ name: menuLists[0].cnName });
+ debugger
if (res.code == 200) {
if (res.result.length != 0) {
let menuList = res.result.filter((value) => {
--
Gitblit v1.9.3