odjbin/tunnel-cloud-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

邓洁 : 修改页面细节

Browse Source
This commit is contained in:
邓洁
2023-11-05 01:55:02 +08:00
parent d11d398b53
commit 30ba4268be
19 changed files with 98 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/api/workflow/process-definition.js
View File

@@ -1,62 +0,0 @@
import request from '@/utils/request.js'
export function getProcessDefinitionList(param) {
return request({
url: "/workflow/process/definition",
method: "get",
params: param
})
}
export function getProcessDefinitionInfo(deploymentId) {
return request({
url: "/workflow/process/definition/" + deploymentId,
method: "get",
})
}
export function getInitiateInfo(processDefinitionKey) {
return request({
url: "/workflow/process/definition/key/" + processDefinitionKey,
method: "get",
})
}
export function getHistoryVersion(processDefinitionKey) {
return request({
url: "/workflow/process/definition/history/" + processDefinitionKey,
method: "get",
})
}
export function deleteHistoryVersion(deploymentId) {
return request({
url: "/workflow/process/definition/" + deploymentId,
method: "delete",
})
}
export function suspendProcessDefinition(processDefinitionId) {
return request({
url: "/workflow/process/definition/suspend",
method: "put",
data: processDefinitionId
})
}
export function activateProcessDefinition(processDefinitionId) {
return request({
url: "/workflow/process/definition/activate",
method: "put",
data: processDefinitionId
})
}
export function addProcessDefinition(param) {
return request({
url: "/workflow/process/definition",
method: "post",
data: param
})
}

9
src/api/workflow/process-file.js
View File

@@ -1,9 +0,0 @@
import request from '@/utils/request.js'
export function deleteFile(fileId) {
// 删除文件
return request({
url: '/workflow/process/file/' + fileId,
method: 'delete',
})
}

53
src/api/workflow/process-instance.js
View File

@@ -1,53 +0,0 @@
import request from '@/utils/request.js'
/**
* 开始实例流程
* @param param
* @returns {*}
*/
export function startProcessInstance(param) {
return request({
url: "/workflow/process/instance/start",
method: "post",
data: param
})
}
export function restartProcessInstance(param) {
return request({
url: "/workflow/process/instance/restart",
method: "post",
data: param
})
}
export function getAboutInstanceList(param) {
return request({
url: "/workflow/process/instance/about",
method: "get",
params: param
})
}
export function getInitiatedInstanceList(param) {
return request({
url: "/workflow/process/instance/self",
method: "get",
params: param
})
}
export function getInitiatedInstanceInfo(processInstanceId) {
return request({
url: "/workflow/process/instance/info/"+processInstanceId,
method: "get",
})
}
export function getInitiatedInstanceReInfo(instanceId) {
return request({
url: "/workflow/process/instance/re/info/"+instanceId,
method: "get",
})
}

46
src/api/workflow/process-listen.js
View File

@@ -1,46 +0,0 @@
import request from '@/utils/request.js'
// 请求系统内置监听器list
export const getProcessListenerList = (params) => {
return request({
url: '/workflow/process/listener',
method: 'get',
params
})
}
//获取到option列表
// 获取系统内置监听器详情
export const getProcessListenerDetails = (processListenerId) => {
return request({
url: '/workflow/process/listener/' + processListenerId,
method: 'get'
})
}
// 新增系统内置监听器
export const addProcessListener = (data) => {
return request({
url: '/workflow/process/listener',
method: 'post',
data
})
}
// 修改系统内置监听器
export const editProcessListener = (data) => {
return request({
url: '/workflow/process/listener',
method: 'put',
data
})
}
// 删除系统内置监听器
export const delProcessListener =(processListenerId) => {
return request({
url: '/workflow/process/listener/' + processListenerId,
method: 'delete'
})
}

45
src/api/workflow/process-task.js
View File

@@ -1,45 +0,0 @@
import request from '@/utils/request.js'
export function getTaskList() {
return request({
url: "/workflow/process/task",
method: "get",
})
}
export function getTaskInfo(taskId) {
return request({
url: "/workflow/process/task/"+taskId,
method: "get",
})
}
export function completeTask(params) {
return request({
url: "/workflow/process/task/complete",
method: "put",
data: params
})
}
export function refuseTask(params) {
return request({
url: "/workflow/process/task/refuse",
method: "put",
data: params
})
}
export function rollBackTask(params) {
return request({
url: "/workflow/process/task/rollback",
method: "put",
data: params
})
}
export function addComment(params) {
return request({
url: "/workflow/process/task/comment",
method: "post",
data: params
})
}

24
src/api/workflow/process-user.js
View File

@@ -1,24 +0,0 @@
import request from '@/utils/request.js'
//根据角色或者部门获取到对应的数据
export function getUserTree(type,chooseId){
return request({
url:`/admin/user/choose/${type}/${chooseId}`,
method:'get'
})
}
// 查询系统角色
export function getRole() {
return request({
url: 'admin/role/option',
method: 'get'
})
}
//获取采取树形控件的部门option
export function getDepartmentTree() {
return request({
url: 'admin/dept/option',
method: 'get'
})
}

41
src/components/PopoverDelete.vue Normal file
View File

@@ -0,0 +1,41 @@
<template>
<el-popconfirm
confirm-button-text="确认"
cancel-button-text="取消"
icon="WarningFilled"
icon-color="#E6A23C"
:title="title"
@confirm="handleDelete"
@cancel="handleCancel"
>
<template #reference>
<el-button type="text" size="mini">删除</el-button>
</template>
</el-popconfirm>
</template>
<script setup>
const props = defineProps({
name: {
type: String,
default: ''
},
type: {
type: String,
default: ''
}
})
const emit = defineEmits()
const title = ref(`确认删除名称为 "${props.name}" 的${props.type}吗!`)
const visible = ref(false)
const handleCancel = () => {
visible.value = false
}
const handleDelete = () => {
emit("delete")
}
</script>
<style scoped lang="scss">
</style>

2
src/views/rapid/gen/index.vue
View File

@@ -46,7 +46,7 @@
:lazy="true"
v-loading="loading"
>
<el-table-column label="序号" type="index" align="center" width="55"/>
<el-table-column label="序号" type="index" align="center" width="60"/>
<el-table-column prop="tableName" label="表名称" align="center"/>
<el-table-column prop="tableComment" label="表描述" sortable align="center"/>
<el-table-column prop="className" label="实体类" align="center"/>

2
src/views/rapid/regular/index.vue
View File

@@ -43,7 +43,7 @@
@select="handleSelect"
>
<el-table-column type="selection" width="55"/>
<el-table-column label="序号" type="index" align="center" width="55"/>
<el-table-column label="序号" type="index" align="center" width="60"/>
<el-table-column prop="name" label="正则名称" align="center"/>
<el-table-column prop="regular" label="正则内容" align="center"/>
<el-table-column prop="enable" label="是否启用" align="center">

2
src/views/rapid/source/index.vue
View File

@@ -24,7 +24,7 @@
@select="handleSelect"
>
<el-table-column type="selection" width="55" />
<el-table-column label="序号" type="index" width="55" align="center"/>
<el-table-column label="序号" type="index" width="60" align="center"/>
<el-table-column prop="dsName" label="数据源名称" align="center"/>
<el-table-column prop="dbName" label="数据库名称" align="center"/>
<el-table-column prop="username" label="用户名称" sortable align="center"/>

2
src/views/system/config/index.vue
View File

@@ -39,7 +39,7 @@
v-loading="loading"
@select="handleSelect">
<el-table-column type="selection" width="55"/>
<el-table-column label="序号" type="index" class-name="allowDrag"/>
<el-table-column label="序号" type="index" width="60" />
<el-table-column prop="configName" label="参数名称" align="center"/>
<el-table-column prop="configKey" label="参数键名" align="center"/>
<el-table-column prop="configValue" label="参数键值" align="center"/>

2
src/views/system/dept/index.vue
View File

@@ -34,7 +34,7 @@
@expand-change="expandChange"
>
<el-table-column prop="deptName" label="部门名称"/>
<el-table-column prop="orderNum" label="排序"/>
<el-table-column prop="orderNum" label="排序" width="60px"/>
<el-table-column prop="state" label="状态">
<template #default="scope">
<tag dict-type="normal_disable" :value="scope.row.state"/>

4
src/views/system/menu/DistributeRole.vue
View File

@@ -46,7 +46,7 @@
</template>
</el-table-column>
<el-table-column prop="roleSort" label="显示顺序" align="center"/>
<el-table-column prop="roleSort" label="显示顺序" align="center" width="100px"/>
<el-table-column prop="state" label="状态" align="center">
<template #default="scope">
<tag dict-type="normal_disable" :value="scope.row.state"/>
@@ -105,7 +105,7 @@
<el-text v-if="scope.row.dataScope == '4'">本部门及以下数据权限</el-text>
</template>
</el-table-column>
<el-table-column prop="roleSort" label="显示顺序" align="center"/>
<el-table-column prop="roleSort" label="显示顺序" align="center" width="100px"/>
<el-table-column prop="state" label="状态" align="center">
<template #default="scope">
<tag dict-type="normal_disable" :value="scope.row.state"/>

62
src/views/system/menu/index.vue
View File

@@ -23,7 +23,7 @@
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }" row-key="menuId" :lazy="true"
v-loading="loading" v-tabh>
<el-table-column prop="menuName" label="菜单名称"/>
<el-table-column prop="icon" label="图标">
<el-table-column prop="icon" label="图标" width="60px">
<template #default="scope">
<!-- <el-icon>-->
<!-- <component :is="scope.row.icon" />-->
@@ -31,10 +31,10 @@
<svg-icon :name="scope.row.icon"/>
</template>
</el-table-column>
<el-table-column prop="orderNum" label="排序"/>
<el-table-column prop="orderNum" label="排序" width="60px"/>
<el-table-column prop="perms" label="权限标识"/>
<el-table-column prop="component" label="组件路径"/>
<el-table-column prop="state" label="状态">
<el-table-column prop="state" label="状态" width="80px">
<template #default="scope">
<tag dict-type="normal_disable" :value="scope.row.state"/>
</template>
@@ -45,7 +45,7 @@
<el-button type="text" size="mini" @click="handleAdd(scope.row)">新增</el-button>
<el-button type="text" size="mini" @click="handleEdit(scope.row.menuId)">修改</el-button>
<el-button type="text" size="mini" @click="handleAssignRoles(scope.row)">分配角色</el-button>
<el-button type="text" size="mini" @click="handleDel(scope.row.menuId, scope.row.menuName)">删除</el-button>
<popover-delete :name="scope.row.menuName" :type="'菜单'" @delete="handleDel(scope.row.menuId)"/>
</template>
</el-table-column>
</el-table>
@@ -67,7 +67,7 @@
</el-form-item>
<el-form-item label="菜单图标">
<template #label>
<div style="display: flex;align-items: center">
<div style="display: flex;align-items: center">
<span style="margin-right: 5px">菜单图标</span>
<svg-icon v-if="form.icon" :name="form.icon" :class-name="'middle-icon'"/>
</div>
@@ -157,12 +157,12 @@
</el-row>
</el-form>
<template #footer>
<span>
<el-button @click="handleCancel">取消</el-button>
<el-button type="primary" @click="handleSubmit(formInstance)">
确定
</el-button>
</span>
<!-- <span>-->
<el-button @click="handleCancel">取消</el-button>
<el-button type="primary" @click="handleSubmit(formInstance)">
确定
</el-button>
<!-- </span>-->
</template>
</el-dialog>
</div>
@@ -176,6 +176,8 @@ import {useCacheStore} from '@/stores/cache.js'
import Tag from '@/components/Tag.vue'
import SvgIcon from '@/components/svgIcon/index.vue'
import IconSelect from '@/components/iconSelect/index.vue'
import PopoverDelete from "@/components/PopoverDelete.vue";
const cacheStore = useCacheStore()
const queryParams = reactive({
menuName: undefined,
@@ -186,6 +188,7 @@ const loading = ref(true)
const list = ref([])
const tableTree = ref()
const isExpand = ref(true)
const deleteVisible = ref(false)
const isVisited = ref(false)
const title = ref('')
const form = ref({
@@ -212,9 +215,9 @@ const formRules = ref({
})
const formInstance = ref()
const menuOpt = ref([])
const router =useRouter()
const getSelectIcon=(val)=>{
form.value.icon=val
const router = useRouter()
const getSelectIcon = (val) => {
form.value.icon = val
}
const getList = async () => {
@@ -249,7 +252,7 @@ const restFrom = () => {
const handleAdd = async (row) => {
title.value = '新增菜单'
restFrom()
if(row.menuId!==undefined){
if (row.menuId !== undefined) {
await getMenuInfo(row.menuId).then(res => {
form.value.parentId = res.data.parentId
})
@@ -262,7 +265,7 @@ const handleAdd = async (row) => {
}]
})
isVisited.value = true
nextTick(()=>{
nextTick(() => {
// 清空校验
formInstance.value.clearValidate()
})
@@ -282,7 +285,7 @@ const expandChange = (data, isExpansion) => {
}
}
//分配角色
const handleAssignRoles=(row)=>{
const handleAssignRoles = (row) => {
router.push('/menu-auth/role/' + row.menuId)
}
const handleEdit = async (menuId) => {
@@ -299,26 +302,21 @@ const handleEdit = async (menuId) => {
}]
})
isVisited.value = true
nextTick(()=>{
nextTick(() => {
// 清空校验
formInstance.value.clearValidate()
})
}
const handleDel = (menuId, menuName) => {
ElMessageBox.confirm(`确认删除名称为${menuName}的菜单吗?`, '系统提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
delMenu(menuId).then(res => {
if (res.code === 1000) {
ElMessage.success(res.msg)
getList()
} else {
ElMessage.error(res.msg)
}
})
const handleDel = (menuId) => {
delMenu(menuId).then(res => {
if (res.code === 1000) {
ElMessage.success(res.msg)
getList()
deleteVisible.value = false
} else {
ElMessage.error(res.msg)
}
})
}

4
src/views/system/post/index.vue
View File

@@ -36,7 +36,7 @@
<el-table-column label="序号" type="index" align="center" width="60"/>
<el-table-column prop="postName" label="岗位名称"/>
<el-table-column prop="postCode" label="岗位编码"/>
<el-table-column prop="postSort" label="排序"/>
<el-table-column prop="postSort" label="排序" width="60px"/>
<el-table-column prop="state" label="状态">
<template #default="scope">
<tag dict-type="normal_disable" :value="scope.row.state"/>
@@ -70,7 +70,7 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="显示顺序" prop="postSort">
<el-form-item label="显示顺序" prop="postSort" >
<el-input-number v-model="form.postSort"></el-input-number>
</el-form-item>
</el-col>

4
src/views/system/role/index.vue
View File

@@ -59,7 +59,7 @@
:lazy="true"
v-loading="loading"
>
<el-table-column label="序号" type="index" align="center" width="55"/>
<el-table-column label="序号" type="index" align="center" width="60"/>
<!-- <el-table-column prop="roleId" label="角色编号" align="center"/>-->
<el-table-column prop="roleName" label="角色名称" align="center"/>
<el-table-column prop="roleKey" label="角色权限" align="center"/>
@@ -71,7 +71,7 @@
<el-text v-if="scope.row.dataScope == '4'">本部门及以下数据权限</el-text>
</template>
</el-table-column>
<el-table-column prop="roleSort" label="显示顺序" align="center"/>
<el-table-column prop="roleSort" label="显示顺序" align="center" width="100px"/>
<el-table-column prop="state" label="状态" align="center">
<template #default="scope">
<tag dict-type="normal_disable" :value="scope.row.state"/>

2
src/views/system/user/index.vue
View File

@@ -74,7 +74,7 @@
v-loading="loading"
:header-cell-style="{'background':'#f5f5f8'}"
>
<el-table-column label="序号" type="index" align="center" width="55"/>
<el-table-column label="序号" type="index" align="center" width="60"/>
<!-- <el-table-column prop="userId" label="用户编号" align="center"/>-->
<el-table-column prop="userName" label="用户名称" align="center"/>
<el-table-column prop="nickName" label="用户昵称" align="center"/>

2
src/views/tool/dict/index.vue
View File

@@ -72,7 +72,7 @@
</template>
</el-table-column>
<el-table-column prop="dictValue" label="字典键值" align="center"/>
<el-table-column prop="dictSort" label="排序" align="center"/>
<el-table-column prop="dictSort" label="排序" align="center" width="60px"/>
<el-table-column prop="state" label="状态" align="center">
<template #default="scope">
<tag dict-type="normal_disable" v-if="loadTag" :value="scope.row.state"/>

26
vite.config.js
View File

@@ -70,43 +70,45 @@ export default defineConfig({
open: true,
proxy: {
// '/api/custom': {
// // target: 'http://gateway.feashow.cn',
// // target: 'http://web-tunnel.feashow.com/api',
// target: 'http://192.168.31.175:8000',
// changeOrigin: true,
// rewrite: (path) => path.replace(/^\/api/, ''),
// },
// '/api/admin': {
// target: 'http://gateway.feashow.cn',
// target: 'http://web-tunnel.feashow.com/api',
// // target: 'http://192.168.31.175:8000',
// changeOrigin: true,
// rewrite: (path) => path.replace(/^\/api/, ''),
// },
// '/api/auth': {
// target: 'http://gateway.feashow.cn',
// target: 'http://web-tunnel.feashow.com/api',
// // target: 'http://192.168.31.175:8000',
// changeOrigin: true,
// rewrite: (path) => path.replace(/^\/api/, ''),
// },
// '/api/log': {
// // target: 'http://web-tunnel.feashow.com/api',
// target: 'http://192.168.31.175:8000',
// changeOrigin: true,
// rewrite: (path) => path.replace(/^\/api/, ''),
// },
// '/api/code-gen': {
// target: 'http://gateway.feashow.cn',
// // target: 'http://192.168.31.175:8000',
// // target: 'http://web-tunnel.feashow.com/api',
// target: 'http://192.168.31.175:8000',
// changeOrigin: true,
// rewrite: (path) => path.replace(/^\/api/, ''),
// },
'/api': {
// target: 'http://gateway.feashow.cn',
target: 'http://192.168.31.175:8000',
target: 'http://web-tunnel.feashow.com/api',
// target: 'http://192.168.31.175:8000',
changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, ''),
},
'/socket': {
target: 'ws://gateway.feashow.cn/notice-ws/notice',
target: 'ws://web-tunnel.feashow.com/api/notice-ws/notice',
ws: true
}
// '/socket': {
// target: 'ws://gateway.feashow.cn/notice-ws/notice',
// ws: true
// }
}
}
})