This commit is contained in:
clay
2022-01-11 17:23:14 +08:00
parent 5d30050152
commit da11bb6bad
8 changed files with 106 additions and 87 deletions

29
ebts-ui/public/test.html Normal file
View File

@@ -0,0 +1,29 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Document</title>
<!-- css样式-->
<style>
</style>
<!-- js块-->
<script>
</script>
<link>
</head>
<body>
</body>
</html>
<script>
import Link from "@/layout/components/Sidebar/Link";
export default {
components: {Link}
}
</script>

View File

@@ -94,8 +94,8 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="访问编号" align="center" prop="infoId" />
<el-table-column label="用户名称" align="center" prop="userName" />
<el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
<el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
<!-- <el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />-->
<!-- <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />-->
<el-table-column label="浏览器" align="center" prop="browser" />
<el-table-column label="操作系统" align="center" prop="os" />
<el-table-column label="登录状态" align="center" prop="status" :formatter="statusFormat" />

View File

@@ -38,8 +38,8 @@
<el-table-column label="会话编号" align="center" prop="tokenId" :show-overflow-tooltip="true" />
<el-table-column label="登录名称" align="center" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="部门名称" align="center" prop="deptName" />
<el-table-column label="主机" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
<el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
<!-- <el-table-column label="主机" align="center" prop="ipaddr" :show-overflow-tooltip="true" />-->
<!-- <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />-->
<el-table-column label="浏览器" align="center" prop="browser" />
<el-table-column label="操作系统" align="center" prop="os" />
<el-table-column label="登录时间" align="center" prop="loginTime" width="180">

View File

@@ -111,27 +111,27 @@
<el-table-column label="日志编号" align="center" prop="operId" />
<el-table-column label="系统模块" align="center" prop="title" />
<el-table-column label="操作类型" align="center" prop="businessType" :formatter="typeFormat" />
<el-table-column label="请求方式" align="center" prop="requestMethod" />
<el-table-column label="操作人员" align="center" prop="operName" />
<el-table-column label="主机" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />
<el-table-column label="操作地点" align="center" prop="operLocation" :show-overflow-tooltip="true" />
<!-- <el-table-column v-show="userId === 1" label="请求方式" align="center" prop="requestMethod" />-->
<el-table-column label="操作人员" align="center" :disabled="false" prop="operName" />
<!-- <el-table-column v-show="userId === 1" label="主机" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />-->
<!-- <el-table-column v-show="userId === 1" label="操作地点" align="center" prop="operLocation" :show-overflow-tooltip="true" />-->
<el-table-column label="操作状态" align="center" prop="status" :formatter="statusFormat" />
<el-table-column label="操作日期" align="center" prop="operTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.operTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-view"
@click="handleView(scope.row,scope.index)"
v-hasPermi="['monitor:operlog:query']"
>详细</el-button>
</template>
</el-table-column>
<!-- <el-table-column v-show="userId === 1" label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-view"-->
<!-- @click="handleView(scope.row,scope.index)"-->
<!-- v-hasPermi="['monitor:operlog:query']"-->
<!-- >详细</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
@@ -188,11 +188,13 @@
<script>
import { list, delOperlog, cleanOperlog, exportOperlog } from "@/api/monitor/operlog";
import store from "@/store";
export default {
name: "Operlog",
data() {
return {
userId: store.getters.userId,
// 遮罩层
loading: true,
// 选中数组

View File

@@ -11,8 +11,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="banner类型" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择banner类型" clearable size="small">
<el-form-item label="轮播类型" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择轮播类型" clearable size="small">
<el-option
v-for="dict in bannerStyleOptions"
:key="dict.dictValue"
@@ -21,15 +21,6 @@
/>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="delflag">
<el-input
v-model="queryParams.delflag"
placeholder="请输入状态"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -89,16 +80,14 @@
<span>{{ ((queryParams.pageInfo.pageNum - 1) * queryParams.pageInfo.pageSize + scope.$index + 1)}}</span>
</template>
</el-table-column>
<el-table-column label="标题" align="center" prop="title" />
<el-table-column label="标题" align="left" prop="center" />
<el-table-column label="站点类型" align="center" prop="sitetype" :formatter="sitetypeFormat"/>
<el-table-column label="banner类型" align="center" prop="type":formatter="bannerStyleFormat" />
<el-table-column label="轮播类型" align="center" prop="type":formatter="bannerStyleFormat" />
<el-table-column label="图表路径" align="center">
<template slot-scope="scope">
<img style="width: 100%;" :src="scope.row.imgurl" alt="">
</template>
</el-table-column>
<el-table-column label="排序" align="center" prop="sort" />
<el-table-column label="状态" align="center" prop="delflag" :formatter="delflagFormat" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -140,8 +129,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="banner类型" prop="type">
<el-select v-model="form.type" placeholder="请选择banner类型">
<el-form-item label="轮播类型" prop="type">
<el-select v-model="form.type" placeholder="请选择轮播类型">
<el-option
v-for="dict in bannerStyleOptions"
:key="dict.dictValue"
@@ -163,9 +152,6 @@
<el-form-item label="跳转链接">
<el-input v-model="form.link" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input v-model="form.sort" type="number" placeholder="请输入排序" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
@@ -207,9 +193,6 @@ export default {
// 站点类型 1 sist 2: lab 3: 双边都发字典
sitetypeOptions: [],
bannerStyleOptions: [],
// 1: 正常 0软删除字典
delflagOptions: [],
// 查询参数
queryParams: {
pageInfo:{
@@ -223,15 +206,13 @@ export default {
imgurl: null,
link: null,
sort: null,
delflag: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
type: [
{ required: true, message: "banner类型不能为空", trigger: "change" },
{ required: true, message: "轮播类型不能为空", trigger: "change" },
],
title: [
{ required: true, message: "标题不能为空", trigger: "blur" },
@@ -250,9 +231,6 @@ export default {
this.getDicts("banner_style").then(response => {
this.bannerStyleOptions = response.data;
});
this.getDicts("delflag").then(response => {
this.delflagOptions = response.data;
});
},
methods: {
/** 查询首页banner图列表 */
@@ -271,10 +249,6 @@ export default {
bannerStyleFormat(row, column) {
return this.selectDictLabel(this.bannerStyleOptions, row.type);
},
// 1: 正常 0软删除字典翻译
delflagFormat(row, column) {
return this.selectDictLabel(this.delflagOptions, row.delflag);
},
// 取消按钮
cancel() {
this.open = false;
@@ -290,7 +264,6 @@ export default {
imgurl: null,
link: null,
sort: null,
delflag: null,
};
this.resetForm("form");
},

View File

@@ -47,20 +47,26 @@
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
<el-table-column label="导航名称" align="center" prop="title"/>
<el-table-column label="导航名称" align="left" prop="title"/>
<el-table-column label="英语名称" align="center" prop="englishTitle"/>
<el-table-column label="导航类型" align="center" prop="type" :formatter="typeFormat"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
<el-button v-show="scope.row.type == '0'"
type="text"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd(scope.row)"
v-hasPermi="['sist:navigation:add']"
>新增下级
</el-button>
<el-button v-show="scope.row.type == '1'"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改详情
</el-button>
<el-button
size="mini"
type="text"
@@ -174,6 +180,7 @@ export default {
sistDireTypeOptions: [],
labDireTypeOptions: [],
navigationType: [],
navList:[],
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -228,8 +235,8 @@ export default {
getList() {
this.loading = true;
listNavigation(this.queryParams).then(response => {
this.navList = response.data;
this.navigationList = this.handleTree(response.data, "id", "pid");
console.log(this.navigationList)
this.loading = false;
});
},
@@ -292,11 +299,11 @@ export default {
this.form.ptitle = row.title
this.form.pid = row.id
this.form.sitetype = row.sitetype
this.form.type= '0'
this.title = "添加下级导航";
},
//导航类型变化
navigationTypeChang(type) {
console.log(type)
this.articleTypeOptions = []
this.direTypeOptions = []
if (type == 2) {
@@ -323,10 +330,6 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
// this.getTreeselect();
// if (row != null) {
// this.form.pid = row.id;
// }
if (row.sisttype == 1) {
this.articleTypeOptions = this.sistArticleTypeOption
} else if (row.sisttype == 2) {
@@ -334,6 +337,18 @@ export default {
}
getNavigation(row.id).then(response => {
this.form = response.data;
if (this.form.pid==0){
this.form.ptitle = "顶级节点"
}else {
for (let nav of this.navList) {
if (nav.id == this.form.pid){
this.form.ptitle = nav.title;
}
}
console.log(this.navigationList);
}
this.form.refId = parseInt(this.form.refId)
this.navigationTypeChang(this.form.type)
this.open = true;
this.title = "修改导航";
});

View File

@@ -92,16 +92,16 @@
v-hasPermi="['system:config:export']"
>导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-refresh"
size="mini"
@click="handleClearCache"
v-hasPermi="['system:config:remove']"
>清理缓存</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-refresh"-->
<!-- size="mini"-->
<!-- @click="handleClearCache"-->
<!-- v-hasPermi="['system:config:remove']"-->
<!-- >清理缓存</el-button>-->
<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>

View File

@@ -117,7 +117,7 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="角色编号" prop="roleId" width="120" />
<el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
<el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
<!-- <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />-->
<el-table-column label="显示顺序" prop="roleSort" width="100" />
<el-table-column label="状态" align="center" width="100">
<template slot-scope="scope">
@@ -143,13 +143,13 @@
@click="handleUpdate(scope.row)"
v-hasPermi="['system:role:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-circle-check"
@click="handleDataScope(scope.row)"
v-hasPermi="['system:role:edit']"
>数据权限</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-circle-check"-->
<!-- @click="handleDataScope(scope.row)"-->
<!-- v-hasPermi="['system:role:edit']"-->
<!-- >数据权限</el-button>-->
<el-button
size="mini"
type="text"
@@ -175,9 +175,9 @@
<el-form-item label="角色名称" prop="roleName">
<el-input v-model="form.roleName" placeholder="请输入角色名称" />
</el-form-item>
<el-form-item label="权限字符" prop="roleKey">
<el-input v-model="form.roleKey" placeholder="请输入权限字符" />
</el-form-item>
<!-- <el-form-item label="权限字符" prop="roleKey">-->
<!-- <el-input v-model="form.roleKey" placeholder="请输入权限字符" />-->
<!-- </el-form-item>-->
<el-form-item label="角色顺序" prop="roleSort">
<el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
</el-form-item>
@@ -343,9 +343,9 @@ export default {
roleName: [
{ required: true, message: "角色名称不能为空", trigger: "blur" }
],
roleKey: [
{ required: true, message: "权限字符不能为空", trigger: "blur" }
],
// roleKey: [
// { required: true, message: "权限字符不能为空", trigger: "blur" }
// ],
roleSort: [
{ required: true, message: "角色顺序不能为空", trigger: "blur" }
]