Merge remote-tracking branch 'origin/master'

master
面包骑士 2024-09-03 19:10:39 +08:00
commit f53f9db031
9 changed files with 531 additions and 169 deletions

View File

@ -32,6 +32,14 @@ export function addRule(data) {
data: data
})
}
// 生成引擎版本类
export function addGenerate(data) {
return request({
url: '/rule/ruleEdition/addGenerate',
method: 'post',
data: data
})
}
// 修改规则
export function updateRule(data) {

View File

@ -0,0 +1,78 @@
import request from '@/utils/request'
/**
* 查询资产赋权用户信息
* @param data 参数信息
* @returns {*} 响应结果
*/
export function findUserIdList(data) {
return request({
url: '/source/asset/findUserIdList',
method: 'POST',
data
})
}
/**
* 添加用户资产权限
* @param data 参数信息
* @returns {*} 响应结果
*/
export function addUserAssetImPower(data) {
return request({
url: '/source/asset/addUserAssetAccredit',
method: 'POST',
data
})
}
/**
* 删除用户资产权限
* @param data 参数信息
* @returns {*} 响应结果
*/
export function delUserAssetImPower(data) {
return request({
url: '/source/asset/delUserAssetAccredit',
method: 'POST',
data
})
}
/**
* 查询资产赋权部门信息
* @param data 参数信息
* @returns {*} 响应结果
*/
export function findDeptIdList(data) {
return request({
url: '/source/asset/findDeptIdList',
method: 'POST',
data
})
}
/**
* 添加部门资产权限
* @param data 参数信息
* @returns {*} 响应结果
*/
export function addDeptAssetImpower(data) {
return request({
url: '/source/asset/addDeptAssetAccredit',
method: 'POST',
data
})
}
/**
* 删除部门资产权限
* @param data 参数信息
* @returns {*} 响应结果
*/
export function delDeptAssetImpower(data) {
return request({
url: '/source/asset/delDeptAssetAccredit',
method: 'POST',
data
})
}

View File

@ -78,3 +78,5 @@ export function findTableValueList(basicId,tableName) {
method: 'post',
})
}

View File

@ -57,24 +57,28 @@ export function selectTableData(id) {
method: 'get'
})
}
/**
* 过滤级联查询方法资产授权获取当前用户的信息
* 资产展示的调用方法
* @returns {*} 返回集合
*/
export function findTableInfo() {
return request({
url: '/source/tableInfo/findAssetByTableName',
method: 'get'
})
}
/**
* 查询数据库/ 级联查询用于数据资产授权
* 资产结构 资产授权 自己授权用
* @returns {AxiosPromise} 返回集合
*/
export function findTableInfoList() {
return request({
url: '/source/tableInfo/findAsset',
method: 'get',
})
}
export function selectColumn() {
return request({
url: '/source/tableInfo/selectColumn',
method: 'get',
})
}
export function findTableName(id) {
return request({
url: '/source/tableInfo/findTableName',

View File

@ -1,123 +1,361 @@
<template>
<div>
<el-container>
<el-aside width="30%">
<el-tree :data="dataList" :props="defaultProps" @node-click="handleNodeClick">
</el-tree>
<el-aside width="400px">
<el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
</el-aside>
<el-main>
<el-tabs type="border-card" v-model="idType">
<el-tab-pane label="部门授权" name="dept">
<el-form :inline="true" :model="tableBasic" class="demo-form-inline">
<el-form-item label="数据库名称">
<el-input v-model="tableBasic.tableName" placeholder="数据库/表名称" disabled></el-input>
</el-form-item>
<el-form-item label="中文名称">
<el-input v-model="tableBasic.tableRemark" placeholder="中文名称" disabled></el-input>
</el-form-item>
<el-form-item label="数据量">
<el-input v-model="tableBasic.dataNum" placeholder="数据量" disabled></el-input>
</el-form-item>
</el-form>
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>卡片名称</span>
</div>
<template>
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<el-tab-pane label="部门授权" name="first">
<el-table
ref="deptTable"
v-if="refreshTable"
v-loading="loading"
:data="deptList"
:default-expand-all="true"
:default-expand-all="isExpandAll"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
row-key="deptId"
>
<el-table-column label="部门名称" prop="deptName"></el-table-column>
<el-table-column label="部门负责人" prop="leader"></el-table-column>
<el-table-column label="邮箱" prop="email"></el-table-column>
<el-table-column align="center" label="创建时间" prop="createTime">
row-key="deptId">
<el-table-column label="部门名称" prop="deptName" width="260"></el-table-column>
<el-table-column label="部门负责人" prop="leader" width="260"></el-table-column>
<el-table-column label="邮箱" prop="email" width="260"></el-table-column>
<el-table-column align="center" label="创建时间" prop="createTime" width="200">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="操作" prop="createTime">
<el-table-column align="center" class-name="small-padding fixed-width" label="操作(授权)">
<template slot-scope="scope">
<el-switch
style="display: block"
v-model="scope.row.isAuth"
@change="(val)=>accreditChange(val,scope.row,scope.row.deptId)"
:value="isDeptAccredited(scope.row.deptId)"
@change="handleDeptAccreditChange(scope.row.deptId,$event)"
active-color="#13ce66"
inactive-color="#ff4949"
active-text="已授权"
inactive-text="未授权">
inactive-color="#ff4949">
</el-switch>
</template>
</el-table-column>
</el-table>
<pagination v-show="total> 0" :limit.sync="pageSize" :page.sync="pageNum" :total="total"/>
</el-tab-pane>
<el-tab-pane label="用户授权" name="user">
<el-table ref="table" v-loading="loading" :data="userList">
<el-table-column align="center" label="用户名称" prop="userName"/>
<el-table-column align="center" label="用户昵称" prop="nickName"/>
<el-table-column align="center" label="用户部门" prop="dept.deptName"/>
<el-table-column align="center" label="用户邮箱" prop="email"/>
<el-table-column align="center" label="用户手机号" prop="phonenumber"/>
<el-table-column align="center" label="创建时间" prop="createTime"/>
<el-table-column align="center" label="操作" prop="createTime">
<el-tab-pane label="用户授权" name="second">
<el-table v-loading="loading" :data="userList">
<el-table-column v-if="columns[0].visible" key="userId" align="center" label="用户编号" prop="userId"/>
<el-table-column v-if="columns[1].visible" key="userName" :show-overflow-tooltip="true" align="center" label="用户名称"
prop="userName"/>
<el-table-column v-if="columns[2].visible" key="nickName" :show-overflow-tooltip="true" align="center" label="用户昵称"
prop="nickName"/>
<el-table-column v-if="columns[3].visible" key="deptName" :show-overflow-tooltip="true" align="center" label="部门"
prop="dept.deptName"/>
<el-table-column v-if="columns[4].visible" key="phonenumber" align="center" label="手机号码"
prop="phonenumber" width="120"/>
<el-table-column v-if="columns[7].visible" key="email" align="center" label="邮箱"
prop="email" width="120"/>
<el-table-column v-if="columns[6].visible" align="center" label="创建时间" prop="createTime" width="160">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作(授权)" width="160">
<template slot-scope="scope">
<el-switch
style="display: block"
v-model="scope.row.isAuth"
@change="(val)=>accreditChange(val,scope.row,scope.row.userId)"
:value="isAccredited(scope.row.userId)"
@change="handleAccreditChange(scope.row.userId,$event)"
active-color="#13ce66"
inactive-color="#ff4949"
active-text="已授权"
inactive-text="未授权">
inactive-color="#ff4949">
</el-switch>
</template>
</el-table-column>
</el-table>
<pagination v-show="total> 0" :limit.sync="pageSize" :page.sync="pageNum" :total="total"/>
</el-tab-pane>
</el-tabs>
</template>
</el-card>
</el-main>
</el-container>
</div>
</template>
<script setup>
import { listUser } from '@/api/system/user'
import { listDept } from '@/api/system/dept'
import {
addDeptAssetImpower,
addUserAssetImPower,
delDeptAssetImpower,
delUserAssetImPower,
findDeptIdList,
findUserIdList
} from "@/api/source/asset";
import {findTableInfoList} from "@/api/tableData/data";
import {listDept} from "@/api/system/dept";
import {listUser} from "@/api/system/user";
export default {
name:'Accredit',
data() {
return {
//
deptList: [],
//
AccreditValue:false,
//
userList:[],
deptData:[],
dataList:[
{
children:[],
}
//
columns: [
{key: 0, label: `用户编号`, visible: false},
{key: 1, label: `用户名称`, visible: true},
{key: 2, label: `用户昵称`, visible: true},
{key: 3, label: `部门`, visible: true},
{key: 4, label: `手机号码`, visible: true},
{key: 5, label: `状态`, visible: false},
{key: 6, label: `创建时间`, visible: true},
{key: 7, label: `邮箱`, visible: true}
],
//
loading: true,
//
showSearch: true,
//
deptList: [],
//
deptOptions: [],
//
title: "",
//
open: false,
//
isExpandAll: true,
//
refreshTable: true,
//
queryParams: {
deptName: undefined,
status: undefined
},
data:[],
defaultProps: {
children: 'children',
label: 'tableName'
},
tableBasic:{},
tableStructure:[],
valueList:[],
activeName: 'first',
AssetImPowerListReq:{
basicId:null,
tableId:null,
deptId:null,
userId:null
},
userIdList:[],
deptIdList:[],
};
},
created() {
this.findTableInfoList();
this.init();
//
this.findByTableName();
//;
this.getList();
//
this.getUserList();
},
methods: {
findTableInfoList(){
findTableInfoList().then(res=>{
this.dataList=res.data
//switch
handleDeptAccreditChange(deptId, value) {
this.AssetImPowerListReq.basicId = this.tableBasic.basicId
this.AssetImPowerListReq.tableId = this.tableBasic.id
this.AssetImPowerListReq.deptId = deptId
if (this.tableBasic.children != null) {
this.AssetImPowerListReq.tableId = null;
} else {
this.AssetImPowerListReq.basicId = null;
}
if (value === true) {
//
addDeptAssetImpower(this.AssetImPowerListReq).then((res) => {
if (res.code === 200) {
this.$modal.msgSuccess("授权成功");
} else {
this.$modal.msgError("授权失败");
}
this.findDeptIdList();
this.isDeptAccredited()
})
} else {
//
delDeptAssetImpower(this.AssetImPowerListReq).then((res) => {
if (res.code === 200) {
this.$modal.msgSuccess("权限删除成功");
} else {
this.$modal.msgError("权限删除失败");
}
this.findDeptIdList();
this.isDeptAccredited()
})
}
},
//switch,
handleAccreditChange(userId, value) {
console.log("userId的值:" + userId);
console.log("value的值" + value)
this.AssetImPowerListReq.basicId = this.tableBasic.basicId
this.AssetImPowerListReq.tableId = this.tableBasic.id
this.AssetImPowerListReq.userId = userId
if (this.tableBasic.children != null) {
this.AssetImPowerListReq.tableId = null;
} else {
this.AssetImPowerListReq.basicId = null;
}
if (value === true) {
//
addUserAssetImPower(this.AssetImPowerListReq).then((res) => {
if (res.code === 200) {
this.$message.success("授权成功")
} else {
this.$message.error("授权失败");
}
this.findUserIdList()
this.isAccredited()
})
} else {
//
delUserAssetImPower(this.AssetImPowerListReq).then((res) => {
if (res.code === 200) {
this.$message.success("取消授权成功");
} else {
this.$message.error("取消授权失败");
}
this.findUserIdList()
this.isAccredited()
})
}
},
// ID
isAccredited(userId) {
return this.userIdList.includes(userId);
},
//ID
isDeptAccredited(deptId) {
return this.deptIdList.includes(deptId);
},
/**
* 查询用户列表
*/
getUserList() {
this.loading = false;
listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.userList = response.data.rows;
this.total = response.data.total;
this.loading = false;
console.log(response.data.rows)
}
);
},
/**
* 查询部门列表
*/
getList() {
this.loading = false;
listDept(this.queryParams).then(response => {
this.deptList = this.handleTree(response.data, "deptId");
this.loading = false;
});
},
/**
* 部门授权卡片
* @param tab
* @param event
*/
handleClick(tab, event) {
// console.log(tab, event);
},
/**
* 查询数据库和相关联表
* @returns {AxiosPromise} 返回集合
*/
findByTableName() {
findTableInfoList().then((res) => {
this.data = res.data
})
},
init() {
listDept().then(res => {
this.deptData = res.data
this.deptList = this.handleTree(res.data, "deptId");
/**
* 查询资产赋权用户信息
* @param data 参数信息
* @returns {*} 响应结果
*/
findUserIdList(){
findUserIdList(this.AssetImPowerListReq).then((res) => {
this.userIdList = res.data
})
listUser().then(res => {
console.log(res)
this.userList = res.data.rows
})
// setTimeout(() => {
// this.setAuth();
// }, 600);
},
/**
* 查询资产赋权部门信息
* @param data 参数信息
* @returns {*} 响应结果
*/
findDeptIdList(){
findDeptIdList(this.AssetImPowerListReq).then((res) => {
this.deptIdList = res.data
})
},
/**\
* 树形结构
* @param data
*/
handleNodeClick(data) {
this.tableBasic = data
this.AssetImPowerListReq.tableId = this.tableBasic.id
this.AssetImPowerListReq.basicId = this.tableBasic.basicId
this.AssetImPowerListReq.deptId = this.tableBasic.deptId
if (this.tableBasic.children != null) {
this.AssetImPowerListReq.tableId = null;
} else {
this.AssetImPowerListReq.basicId = null;
}
/**
* 查询资产赋权用户信息
* @param data 参数信息
* @returns {*} 响应结果
*/
findUserIdList(this.AssetImPowerListReq).then((res) => {
this.userIdList = res.data
})
/**
* 查询资产赋权部门信息
* @param data 参数信息
* @returns {*} 响应结果
*/
findDeptIdList(this.AssetImPowerListReq).then((res) => {
this.deptIdList = res.data
})
},
},
}
</script>

View File

@ -17,6 +17,8 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="规则代码" prop="ruleCode">
<el-input
v-model="queryParams.ruleCode"

View File

@ -129,6 +129,11 @@
>规格详情
</el-button>
</el-dropdown-item>
<el-dropdown-item>
<el-button @click="drawers(customer.id)" type="text" style="margin-left: 16px;">
规则测试
</el-button>
</el-dropdown-item>
<el-dropdown-item>
<el-switch
@ -203,20 +208,6 @@
</el-descriptions>
</div>
<!-- <el-popconfirm-->
<!-- confirm-button-text='好的'-->
<!-- cancel-button-text='不用了'-->
<!-- icon="el-icon-info"-->
<!-- icon-color="red"-->
<!-- title="这是一段内容确定删除吗?"-->
<!-- @confirm="handleDelete(ruleAndVersion.id)"-->
<!-- >-->
<!-- <el-button style="float: right; padding: 5px ;margin: 0 5px" slot="reference" type="danger"-->
<!-- icon="el-icon-delete" circle></el-button>-->
<!-- </el-popconfirm>-->
<!-- <el-button style="float: right; padding: 5px ;margin: 0 5px" type="primary" icon="el-icon-edit"-->
<!-- @click="handleUpdate(ruleAndVersion.id)" circle></el-button>-->
</div>
</el-card>
</el-col>
@ -227,7 +218,7 @@
<el-button type="primary" @click="generate" style="margin-bottom:20px;">生成版本类</el-button>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="版本类" prop="ruleKind">
<el-input v-model="form.ruleKind" placeholder="请输入版本类"/>
<el-input v-model="form.ruleKind" disabled/>
</el-form-item>
<el-form-item label="版本名称" prop="name">
<el-input v-model="form.name" placeholder="请输入版本名称"/>
@ -241,8 +232,12 @@
<el-radio label="N"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-input v-model="form.status" placeholder="请输入状态"/>
<el-form-item label="状态" prop="ruleActivate">
<el-radio-group v-model="form.status" placeholder="请输入状态">
<el-radio label="初始化"></el-radio>
<el-radio label="正常"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="内容" prop="ruleContent">
<el-input v-model="form.ruleContent" placeholder="请输入内容"/>
@ -251,8 +246,10 @@
<el-input v-model="form.ruleId" disabled placeholder="请输入版本"/>
</el-form-item>
<!-- 前台web编写代码-->
<codemirror ref="mycode" :value="curCode" :options="cmOptions" class="code">
<el-form-item label="引擎编码" prop="ruleCoding">
<codemirror ref="ruleEngine" :value="form.ruleEngine" :options="cmOptions" class="code" v-show="showCode">
</codemirror>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
@ -260,52 +257,75 @@
</div>
</el-dialog>
<!-- 添加或修改规则对话框 -->
<!-- <el-dialog :title="title" :visible.sync="opens" width="80%" append-to-body>-->
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">-->
<!-- <el-form-item label="版本主键" prop="id">-->
<!-- <el-input v-model="form.id" placeholder="请输入版本类"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="版本类" prop="ruleKind">-->
<!-- <el-input v-model="form.ruleKind" placeholder="请输入版本名称"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="版本名称" prop="name">-->
<!-- <el-input v-model="form.name" type="textarea" placeholder="请输入编码"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="编码" prop="ruleCoding">-->
<!-- <el-radio-group v-model="form.ruleCoding" placeholder="请输入是否激活">-->
<!-- <el-radio label="Y"></el-radio>-->
<!-- <el-radio label="N"></el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="是否激活" prop="ruleActivate">-->
<!-- <el-input v-model="form.ruleActivate" placeholder="请输入状态"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="状态" prop="status">-->
<!-- <el-input v-model="form.status" placeholder="请输入内容"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="内容" prop="ruleContent">-->
<!-- <el-input v-model="form.ruleContent" disabled placeholder="请输入版本"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="规则ID" prop="ruleId">-->
<!-- <el-input v-model="form.ruleId" disabled placeholder="请输入版本"/>-->
<!-- </el-form-item>-->
<!--规则测试-->
<el-drawer
title="我是标题"
:visible.sync="drawer"
:with-header="false" size="70%">
<span>
<el-button type="primary" @click="generate" style="margin-bottom:70px;">生成版本类</el-button>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="版本类" prop="ruleKind">
<el-input v-model="form.ruleKind" disabled/>
</el-form-item>
<el-form-item label="版本名称" prop="name">
<el-input v-model="form.name" placeholder="请输入版本名称"/>
</el-form-item>
<el-form-item label="编码" prop="ruleCoding">
<el-input v-model="form.ruleCoding" type="textarea" placeholder="请输入编码"/>
</el-form-item>
<el-form-item label="是否激活" prop="ruleActivate">
<el-radio-group v-model="form.ruleActivate" placeholder="请输入是否激活">
<el-radio label="Y"></el-radio>
<el-radio label="N"></el-radio>
</el-radio-group>
</el-form-item>
<!-- </el-form>-->
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button type="primary" @click="submitForm"> </el-button>-->
<!-- <el-button @click="cancel"> </el-button>-->
<!-- </div>-->
<!-- </el-dialog>-->
<el-form-item label="状态" prop="ruleActivate">
<el-radio-group v-model="form.status" placeholder="请输入状态">
<el-radio label="初始化"></el-radio>
<el-radio label="正常"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="内容" prop="ruleContent">
<el-input v-model="form.ruleContent" placeholder="请输入内容"/>
</el-form-item>
<el-form-item label="版本" prop="ruleId">
<el-input v-model="form.ruleId" disabled placeholder="请输入版本"/>
</el-form-item>
<!-- 前台web编写代码-->
<el-form-item label="引擎编码" prop="ruleCoding">
<codemirror ref="ruleEngine" :value="form.ruleEngine" :options="cmOptions" class="code" v-show="showCode">
</codemirror>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</span>
<br>
<span>
11111
</span>
</el-drawer>
</div>
</template>
<script>
import {getRule, delRule} from "/src/api/rule/rule";
import {getEditionList, addRule, enable, disable, updateRule, getFindByEditionId} from "@/api/rule/ruleEdition";
import {delRule, getRule} from "/src/api/rule/rule";
import {
addGenerate,
addRule,
disable,
enable,
getEditionList,
getFindByEditionId,
updateRule
} from "@/api/rule/ruleEdition";
import {codemirror} from 'vue-codemirror'
@ -317,7 +337,7 @@ export default {
data() {
return {
curCode: '测23456789asdad试',
drawer: false,
cmOptions: {
lineNumbers: true, //
mode: 'text/x-yaml', // model
@ -371,20 +391,24 @@ export default {
//
form: {
id: '',
ruleKind: '',
ruleKind: 'null',
name: '',
ruleCoding: '',
ruleActivate: '',
status: '',
ruleContent: '',
ruleId: '',
ruleEngine: '',
},
showCode: false,
//
rules: {
isActivate: [
{required: true, message: "是否激活;是否激活不能为空", trigger: "blur"}
],
}
};
},
created() {
@ -397,9 +421,23 @@ export default {
this.findById();
},
methods: {
//
drawers(id) {
getFindByEditionId(id).then(res => {
this.form = res.data[0]
this.drawer = true
console.log(this.form)
})
},
//
generate() {
addGenerate(this.form).then(res => {
this.form.ruleKind = res.data.ruleKind
this.form.ruleEngine = res.data.ruleEngine
alert(this.form.ruleKind)
this.showCode = true
debugger
})
},
//card
findList() {
@ -411,7 +449,6 @@ export default {
findById() {
getRule(this.ruleAndVersion.id).then(res => {
this.rule = res.data[0]
console.log(this.rule)
})
},
//ID
@ -419,14 +456,12 @@ export default {
getFindByEditionId(id).then(res => {
this.form = res.data[0]
this.open = true;
console.log(this.form)
})
},
/** 客户状态更改触发 */
handleStatusChange(row) {
console.log(row)
if (row.ruleActivate === "Y") {
enable(row.id).then((res) => {
this.$modal.msgSuccess("启用成功")

View File

@ -112,12 +112,6 @@ export default {
console.log(res.data);
})
},
findTableInfoList(){
findTableInfoList().then(res=>{
this.data=res.data
console.log(res.data);
})
},
handleNodeClick(data) {
this.tableBasic = data
if (data.children == null) {

View File

@ -64,7 +64,8 @@
</div>
</template>
<script setup>
import {findTableInfoList, selectColumn, selectTableData} from "@/api/tableData/data";
import { selectTableData} from "@/api/tableData/data";
import {findByTableName} from "@/api/source/source";
export default {
name: 'Type',
@ -93,7 +94,7 @@ export default {
},
methods: {
findTableInfoList(){
findTableInfoList().then(res=>{
findByTableName().then(res=>{
this.dataList=res.data
})
},