From 30ba4268be031d4d958bfe250863e0b065821e8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Sun, 5 Nov 2023 01:55:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/workflow/process-definition.js | 62 ------------------------
src/api/workflow/process-file.js | 9 ----
src/api/workflow/process-instance.js | 53 --------------------
src/api/workflow/process-listen.js | 46 ------------------
src/api/workflow/process-task.js | 45 -----------------
src/api/workflow/process-user.js | 24 ---------
src/components/PopoverDelete.vue | 41 ++++++++++++++++
src/views/rapid/gen/index.vue | 2 +-
src/views/rapid/regular/index.vue | 2 +-
src/views/rapid/source/index.vue | 2 +-
src/views/system/config/index.vue | 2 +-
src/views/system/dept/index.vue | 2 +-
src/views/system/menu/DistributeRole.vue | 4 +-
src/views/system/menu/index.vue | 62 ++++++++++++------------
src/views/system/post/index.vue | 4 +-
src/views/system/role/index.vue | 4 +-
src/views/system/user/index.vue | 2 +-
src/views/tool/dict/index.vue | 2 +-
vite.config.js | 26 +++++-----
19 files changed, 98 insertions(+), 296 deletions(-)
delete mode 100644 src/api/workflow/process-definition.js
delete mode 100644 src/api/workflow/process-file.js
delete mode 100644 src/api/workflow/process-instance.js
delete mode 100644 src/api/workflow/process-listen.js
delete mode 100644 src/api/workflow/process-task.js
delete mode 100644 src/api/workflow/process-user.js
create mode 100644 src/components/PopoverDelete.vue
diff --git a/src/api/workflow/process-definition.js b/src/api/workflow/process-definition.js
deleted file mode 100644
index 98ca1bb..0000000
--- a/src/api/workflow/process-definition.js
+++ /dev/null
@@ -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
- })
-}
diff --git a/src/api/workflow/process-file.js b/src/api/workflow/process-file.js
deleted file mode 100644
index 55df86d..0000000
--- a/src/api/workflow/process-file.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import request from '@/utils/request.js'
-
-export function deleteFile(fileId) {
- // 删除文件
- return request({
- url: '/workflow/process/file/' + fileId,
- method: 'delete',
- })
-}
diff --git a/src/api/workflow/process-instance.js b/src/api/workflow/process-instance.js
deleted file mode 100644
index 6b9ea8f..0000000
--- a/src/api/workflow/process-instance.js
+++ /dev/null
@@ -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",
- })
-}
diff --git a/src/api/workflow/process-listen.js b/src/api/workflow/process-listen.js
deleted file mode 100644
index 35bfc50..0000000
--- a/src/api/workflow/process-listen.js
+++ /dev/null
@@ -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'
- })
-}
diff --git a/src/api/workflow/process-task.js b/src/api/workflow/process-task.js
deleted file mode 100644
index fafcf44..0000000
--- a/src/api/workflow/process-task.js
+++ /dev/null
@@ -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
- })
-}
diff --git a/src/api/workflow/process-user.js b/src/api/workflow/process-user.js
deleted file mode 100644
index abbb07d..0000000
--- a/src/api/workflow/process-user.js
+++ /dev/null
@@ -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'
- })
-}
diff --git a/src/components/PopoverDelete.vue b/src/components/PopoverDelete.vue
new file mode 100644
index 0000000..cdc5b31
--- /dev/null
+++ b/src/components/PopoverDelete.vue
@@ -0,0 +1,41 @@
+
+
+
+ 删除
+
+
+
+
+
+
+
diff --git a/src/views/rapid/gen/index.vue b/src/views/rapid/gen/index.vue
index 210f571..0898f59 100644
--- a/src/views/rapid/gen/index.vue
+++ b/src/views/rapid/gen/index.vue
@@ -46,7 +46,7 @@
:lazy="true"
v-loading="loading"
>
-
+
diff --git a/src/views/rapid/regular/index.vue b/src/views/rapid/regular/index.vue
index 8d26d71..ec8593f 100644
--- a/src/views/rapid/regular/index.vue
+++ b/src/views/rapid/regular/index.vue
@@ -43,7 +43,7 @@
@select="handleSelect"
>
-
+
diff --git a/src/views/rapid/source/index.vue b/src/views/rapid/source/index.vue
index 8e6a461..738485b 100644
--- a/src/views/rapid/source/index.vue
+++ b/src/views/rapid/source/index.vue
@@ -24,7 +24,7 @@
@select="handleSelect"
>
-
+
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 42e43b6..9dc777d 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -39,7 +39,7 @@
v-loading="loading"
@select="handleSelect">
-
+
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 0587072..3aa8177 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -34,7 +34,7 @@
@expand-change="expandChange"
>
-
+
diff --git a/src/views/system/menu/DistributeRole.vue b/src/views/system/menu/DistributeRole.vue
index 2b754ec..8b0d968 100644
--- a/src/views/system/menu/DistributeRole.vue
+++ b/src/views/system/menu/DistributeRole.vue
@@ -46,7 +46,7 @@
-
+
@@ -105,7 +105,7 @@
本部门及以下数据权限
-
+
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 0f1b63e..e6def9e 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -23,7 +23,7 @@
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }" row-key="menuId" :lazy="true"
v-loading="loading" v-tabh>
-
+
@@ -31,10 +31,10 @@
-
+
-
+
@@ -45,7 +45,7 @@
新增
修改
分配角色
- 删除
+
@@ -67,7 +67,7 @@
-
+
菜单图标
@@ -157,12 +157,12 @@
-
- 取消
-
- 确定
-
-
+
+ 取消
+
+ 确定
+
+
@@ -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)
+ }
})
}
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index cdfa4c3..44885a4 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -36,7 +36,7 @@
-
+
@@ -70,7 +70,7 @@
-
+
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 628a661..102079b 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -59,7 +59,7 @@
:lazy="true"
v-loading="loading"
>
-
+
@@ -71,7 +71,7 @@
本部门及以下数据权限
-
+
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index a37d2f3..af0caeb 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -74,7 +74,7 @@
v-loading="loading"
:header-cell-style="{'background':'#f5f5f8'}"
>
-
+
diff --git a/src/views/tool/dict/index.vue b/src/views/tool/dict/index.vue
index b0c3a8f..6378954 100644
--- a/src/views/tool/dict/index.vue
+++ b/src/views/tool/dict/index.vue
@@ -72,7 +72,7 @@
-
+
diff --git a/vite.config.js b/vite.config.js
index 9ecca59..bc9df94 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -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
- // }
}
}
})