From dcc68662113ff0d9e44da9d77d63a581d1767aa6 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Thu, 9 May 2024 17:16:39 +0800 Subject: [PATCH 01/52] =?UTF-8?q?feat=20:=20=E6=96=B0=E5=A2=9E=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/index.scss | 28 +- src/assets/svg/home1.svg | 6 + src/assets/svg/home2.svg | 6 + src/assets/svg/home3.svg | 6 + src/assets/svg/home4.svg | 6 + src/views/home/index.vue | 481 +++++++++++++++++++---------------- 6 files changed, 301 insertions(+), 232 deletions(-) create mode 100644 src/assets/svg/home1.svg create mode 100644 src/assets/svg/home2.svg create mode 100644 src/assets/svg/home3.svg create mode 100644 src/assets/svg/home4.svg diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 5c1a3c7..2231156 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -19,7 +19,7 @@ html, body, #app, .el-container, .el-aside, .el-main { } .el-main { - background: #F4F6F8; + background: #EFEFEF; padding: 0 0 0 18px; position: fixed; left: 200px; @@ -27,6 +27,7 @@ html, body, #app, .el-container, .el-aside, .el-main { margin-left: 0; transition: margin-left .15s; width: calc(100vw - 200px); + &::-webkit-scrollbar { width: 6px; } @@ -83,9 +84,11 @@ html, body, #app, .el-container, .el-aside, .el-main { align-items: center; margin-bottom: 10px; } -.el-dialog__body{ + +.el-dialog__body { padding: 10px 20px; } + .stateIcon { margin-top: 9px; margin-right: 7px; @@ -248,7 +251,8 @@ html, body, #app, .el-container, .el-aside, .el-main { justify-content: center; z-index: 0; position: relative; - .el-icon{ + + .el-icon { width: 1.4em; height: 1.4em; } @@ -287,9 +291,10 @@ html, body, #app, .el-container, .el-aside, .el-main { .layout { display: flex; justify-content: space-around; + .scrollbar-user { - height: calc(100vh - 250px)!important; - overflow: auto!important; + height: calc(100vh - 250px) !important; + overflow: auto !important; } .scrollbar-dict { @@ -401,6 +406,15 @@ html, body, #app, .el-container, .el-aside, .el-main { } //SvgIcon组件的样式 +.home-icon { + width: 4em; + height: 4em; + vertical-align: -0.15em; + fill: currentColor; + overflow: hidden; + margin-right: 5px; +} + .svg-icon { width: 1.2em; height: 1.2em; @@ -445,10 +459,12 @@ html, body, #app, .el-container, .el-aside, .el-main { overflow: hidden; margin-right: 5px; } -.fen-icon{ + +.fen-icon { width: 1.8em; height: 1.7em; } + .middle-icon { width: 1.4em; height: 1.4em; diff --git a/src/assets/svg/home1.svg b/src/assets/svg/home1.svg new file mode 100644 index 0000000..0a99452 --- /dev/null +++ b/src/assets/svg/home1.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/svg/home2.svg b/src/assets/svg/home2.svg new file mode 100644 index 0000000..a71b307 --- /dev/null +++ b/src/assets/svg/home2.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/svg/home3.svg b/src/assets/svg/home3.svg new file mode 100644 index 0000000..98d2c13 --- /dev/null +++ b/src/assets/svg/home3.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/svg/home4.svg b/src/assets/svg/home4.svg new file mode 100644 index 0000000..d9206cd --- /dev/null +++ b/src/assets/svg/home4.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/views/home/index.vue b/src/views/home/index.vue index cea4307..695f767 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -1,266 +1,295 @@ - From 6557b5d2c80cb182e9ef1e355254cd075b4bac59 Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Thu, 9 May 2024 17:32:21 +0800 Subject: [PATCH 02/52] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/fvcomponents/fvSearchForm/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fvcomponents/fvSearchForm/index.vue b/src/fvcomponents/fvSearchForm/index.vue index 0994c8c..b4c6534 100644 --- a/src/fvcomponents/fvSearchForm/index.vue +++ b/src/fvcomponents/fvSearchForm/index.vue @@ -68,7 +68,7 @@ const filterConfig = computed(()=>{ // 搜索功能表单元素默认值 const setDefaultFormValues = () => { filterConfig.value.forEach(item=>{ - form.value[item.prop] = item.props.defaultValue || null + form.value[item.prop] = item.props?.defaultValue || null }) } From 639caadc46f0ecd99d65df0319045dfbe1e3e4d2 Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Thu, 9 May 2024 17:32:36 +0800 Subject: [PATCH 03/52] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/stores/permisstion.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/stores/permisstion.js b/src/stores/permisstion.js index 2a90914..e1864fe 100644 --- a/src/stores/permisstion.js +++ b/src/stores/permisstion.js @@ -107,7 +107,17 @@ export const usePermisstionStroe = defineStore('permisstion', () => { } const removeMenu = () => { - menuList.value.length = 0 + menuList.value = [ + { + name: 'home', + path: '/home', + icon: 'home', + title: '首页', + meta: { + breadcrumb: true + } + } + ] asyncRouters.value.length = 0 } From 28b4637e01c907798f15ba851cd21e68a18e27a7 Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Thu, 9 May 2024 17:33:01 +0800 Subject: [PATCH 04/52] =?UTF-8?q?feat:=20=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=B1=87=E6=80=BB=E4=B8=BB=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectdemand/demandsummary/index.vue | 122 +++++++++++++++++- 1 file changed, 119 insertions(+), 3 deletions(-) diff --git a/src/views/projectdemand/demandsummary/index.vue b/src/views/projectdemand/demandsummary/index.vue index 18fde93..f43b74c 100644 --- a/src/views/projectdemand/demandsummary/index.vue +++ b/src/views/projectdemand/demandsummary/index.vue @@ -1,11 +1,127 @@ \ No newline at end of file + From bf6a68326154a8f5952b6678c122ac11ff5eb4c0 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Thu, 9 May 2024 18:26:40 +0800 Subject: [PATCH 06/52] =?UTF-8?q?fix=20=EF=BC=9A=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/navbar/BellSocket.vue | 62 ++++++++++++++++---------------- src/layout/navbar/index.vue | 4 +-- src/views/home/index.vue | 57 ++++++++++++++++------------- 3 files changed, 66 insertions(+), 57 deletions(-) diff --git a/src/layout/navbar/BellSocket.vue b/src/layout/navbar/BellSocket.vue index ba6aac4..b0877d1 100644 --- a/src/layout/navbar/BellSocket.vue +++ b/src/layout/navbar/BellSocket.vue @@ -1,37 +1,37 @@ diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue index 685272f..e6153d3 100644 --- a/src/views/projectdemand/demandcollection/detail.vue +++ b/src/views/projectdemand/demandcollection/detail.vue @@ -44,7 +44,6 @@
-
-
diff --git a/src/views/projectdemand/demandcollection/index.vue b/src/views/projectdemand/demandcollection/index.vue index 0fa62b4..a4bfb44 100644 --- a/src/views/projectdemand/demandcollection/index.vue +++ b/src/views/projectdemand/demandcollection/index.vue @@ -116,7 +116,7 @@ const handleEdit = (row) => { router.push({ path: '/projectdemand/demandedit', query: { - id: row.roleId + id: row.requirementId } }) } From 48e5d82acb57d5b12dec7730facfd84cb353821a Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Sun, 12 May 2024 13:05:52 +0800 Subject: [PATCH 29/52] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=BB=86?= =?UTF-8?q?=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/project-demand/index.js | 6 ++++ src/components/FileUpload.vue | 61 ++++++++++++++++++++++++++++----- src/views/home/index.vue | 2 +- vite.config.js | 2 +- 4 files changed, 60 insertions(+), 11 deletions(-) diff --git a/src/api/project-demand/index.js b/src/api/project-demand/index.js index 043e7fc..0113419 100644 --- a/src/api/project-demand/index.js +++ b/src/api/project-demand/index.js @@ -34,3 +34,9 @@ export const addRequirement = (data) => { data: data }); }; +export const deleteFile = (path) => { + return request({ + url: '/process/file/delete/'+ path, + method: "delete" + }); +}; diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue index e4e2774..53f05a1 100644 --- a/src/components/FileUpload.vue +++ b/src/components/FileUpload.vue @@ -9,6 +9,9 @@ :auto-upload="true" :before-upload="beforeUpload" :on-success="handleUploadSuccess" + :before-remove="beforeRemove" + :on-remove="handleRemoveAttachment" + @handleRemove="handleRemove1" > 上传文件 @@ -16,10 +19,12 @@ diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 1f9f023..5675428 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -119,7 +119,7 @@ const tableConfig = reactive({ label: '类型', align: 'center', showOverflowTooltip: false, - currentRender: ({row, index}) => () + currentRender: ({row, index}) => () }, { prop: 'submitTime', diff --git a/vite.config.js b/vite.config.js index 92e2a1e..da93391 100644 --- a/vite.config.js +++ b/vite.config.js @@ -18,7 +18,6 @@ export default defineConfig({ AutoImport({ //自动导入vue相关函数 imports: ['vue','vue-router'], - resolvers: [ ElementPlusResolver(), //自动导入图标组件 @@ -70,6 +69,7 @@ export default defineConfig({ open: true, proxy: { '/api/workflow': { + // target: 'http://frp.feashow.cn:31800/', target: 'http://clay.frp.feashow.cn/', // target: 'http://192.168.31.175:8000', changeOrigin: true, From 6fbcdc82cafedce0ce662cec9796104785bb39d2 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Sun, 12 May 2024 13:59:50 +0800 Subject: [PATCH 30/52] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=BB=86?= =?UTF-8?q?=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FileUpload.vue | 72 ++++++++++++++++++++++++----------- 1 file changed, 50 insertions(+), 22 deletions(-) diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue index 53f05a1..5398ed1 100644 --- a/src/components/FileUpload.vue +++ b/src/components/FileUpload.vue @@ -6,15 +6,37 @@ with-credentials :multiple="maxSize > 0" :data="uploadParams" + :show-file-list="false" :auto-upload="true" :before-upload="beforeUpload" :on-success="handleUploadSuccess" - :before-remove="beforeRemove" - :on-remove="handleRemoveAttachment" - @handleRemove="handleRemove1" > + + + 上传文件 +
+ + + + + + + + + + +
+ From 416fa2ed53d78088ad7099e10ea6b9c233cf28e3 Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Sun, 12 May 2024 14:23:34 +0800 Subject: [PATCH 31/52] =?UTF-8?q?build=20:=20=E6=B5=81=E7=A8=8B=E6=BC=94?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/project-demand/index.js | 7 ++++++ .../projectdemand/demandcollection/add.vue | 2 +- .../projectdemand/demandcollection/detail.vue | 17 ++++++++++---- .../workflow/common/ProcessDiagramViewer.vue | 8 ++++++- .../process/common/AvatarEllipsis.vue | 4 ++++ src/views/workflow/process/nodes/Node.vue | 22 +++++++++++-------- 6 files changed, 45 insertions(+), 15 deletions(-) diff --git a/src/api/project-demand/index.js b/src/api/project-demand/index.js index 0113419..24ee479 100644 --- a/src/api/project-demand/index.js +++ b/src/api/project-demand/index.js @@ -26,6 +26,13 @@ export const agreeTask = (data) => { data: data }); }; +export const rejectTask = (data) => { + return request({ + url: `/workflow/mosr/process/task/reject`, + method: "post", + data: data + }); +}; export const addRequirement = (data) => { return request({ diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue index b5119c3..0c54103 100644 --- a/src/views/projectdemand/demandcollection/add.vue +++ b/src/views/projectdemand/demandcollection/add.vue @@ -44,7 +44,7 @@
- + diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue index e6153d3..eb0781f 100644 --- a/src/views/projectdemand/demandcollection/detail.vue +++ b/src/views/projectdemand/demandcollection/detail.vue @@ -60,16 +60,16 @@
- - +
- 驳回 + 驳回 同意
@@ -79,7 +79,7 @@ import OperationRender from '@/views/workflow/common/OperationRender.vue' import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue' import {useProcessStore} from '@/stores/processStore.js'; -import {getInfo, agreeTask} from "@/api/project-demand/index.js"; +import {getInfo, agreeTask, rejectTask} from "@/api/project-demand/index.js"; const route = useRoute() const form = ref(); @@ -130,6 +130,15 @@ const handleSubmit = () => { console.log(res) }) } +const handleReject = () => { + let approve = { + taskId: processInstanceData.value.taskId, + auditOpinion : auditOpinion.value, + } + rejectTask(approve).then(res => { + console.log(res) + }) +} const init = async () => { getInfo(route.query.id).then(res => { diff --git a/src/views/workflow/common/ProcessDiagramViewer.vue b/src/views/workflow/common/ProcessDiagramViewer.vue index 1050a29..595e0c3 100644 --- a/src/views/workflow/common/ProcessDiagramViewer.vue +++ b/src/views/workflow/common/ProcessDiagramViewer.vue @@ -9,7 +9,7 @@
- +
@@ -20,6 +20,12 @@ import ProcessTree from '@/views/workflow/process/ProcessTree.vue' const processTreePreview = ref() const scale = ref(100) +const props = defineProps({ + mode: { + type: String, + default: 'preview' + } +}) nextTick(()=>{ processTreePreview.value.init() diff --git a/src/views/workflow/process/common/AvatarEllipsis.vue b/src/views/workflow/process/common/AvatarEllipsis.vue index 883f400..2665f58 100644 --- a/src/views/workflow/process/common/AvatarEllipsis.vue +++ b/src/views/workflow/process/common/AvatarEllipsis.vue @@ -38,6 +38,10 @@ const props = defineProps({ userInfo: { type: Array, default: [] + }, + mode: { + type: String, + default: 'design' } }) diff --git a/src/views/workflow/process/nodes/Node.vue b/src/views/workflow/process/nodes/Node.vue index b02ee1e..36acd65 100644 --- a/src/views/workflow/process/nodes/Node.vue +++ b/src/views/workflow/process/nodes/Node.vue @@ -17,24 +17,28 @@
From eeab66d8fb1c28f99441a8096f0a213e02c975bb Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Sun, 12 May 2024 14:44:04 +0800 Subject: [PATCH 32/52] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=BB=86?= =?UTF-8?q?=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/project-demand/index.js | 4 +- src/components/FileUpload.vue | 16 ++++---- src/views/home/index.vue | 1 - .../projectdemand/demandcollection/index.vue | 10 +++-- .../process/common/AvatarEllipsis.vue | 39 ++++++++++++++----- src/views/workflow/process/nodes/Node.vue | 35 +---------------- 6 files changed, 48 insertions(+), 57 deletions(-) diff --git a/src/api/project-demand/index.js b/src/api/project-demand/index.js index 24ee479..9ec21ce 100644 --- a/src/api/project-demand/index.js +++ b/src/api/project-demand/index.js @@ -41,9 +41,9 @@ export const addRequirement = (data) => { data: data }); }; -export const deleteFile = (path) => { +export const deleteFile = (id) => { return request({ - url: '/process/file/delete/'+ path, + url: `/process/file/delete/${id}`, method: "delete" }); }; diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue index 5398ed1..6f09d10 100644 --- a/src/components/FileUpload.vue +++ b/src/components/FileUpload.vue @@ -91,6 +91,8 @@ const beforeUpload = (file) => { const handleUploadSuccess = (res, file) => { if (res.code !== 1000) { ElMessage.error("上传失败") + }else { + ElMessage.success("上传成功") } showTable.value=true let data = res.data @@ -116,14 +118,12 @@ const handleRemoveAttachment = (file) => { } const handleRemove = (row) => { console.log('fil对对对e',row,fileList.value) - // "http://43.138.199.198:8888//group1/M00/00/00/CgAICGY_pZKAFiruAAAAAAAAAAA88.docx" - - // deleteFile(file.id).then(res => { - // if (res.code === 1000) { - // ElMessage.success("删除成功"); - // fileList.value.splice(fileList.value.findIndex((item) => item.id === file.id), 1); - // } - // }); + deleteFile(row.id).then(res => { + if (res.code === 1000) { + ElMessage.success("删除成功"); + // fileList.value.splice(fileList.value.findIndex((item) => item.id === file.id), 1); + } + }); }; const handleRemove1=()=>{ console.log('handleRemove1vdvd') diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 5675428..0bbfa5d 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -46,7 +46,6 @@ 常用网站
- diff --git a/src/views/projectdemand/demandcollection/index.vue b/src/views/projectdemand/demandcollection/index.vue index a4bfb44..f67c2dc 100644 --- a/src/views/projectdemand/demandcollection/index.vue +++ b/src/views/projectdemand/demandcollection/index.vue @@ -4,9 +4,7 @@ - From 324cc268b5a509c1e71ebdd83ca82437de38f50e Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Sun, 12 May 2024 17:03:12 +0800 Subject: [PATCH 39/52] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FileUpload.vue | 29 ++++++----- .../projectdemand/demandcollection/detail.vue | 52 +++++++------------ 2 files changed, 34 insertions(+), 47 deletions(-) diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue index 9533118..d90202e 100644 --- a/src/components/FileUpload.vue +++ b/src/components/FileUpload.vue @@ -15,20 +15,24 @@
- - - + + + - - + + + + - - - diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue index 67f6906..651bb42 100644 --- a/src/views/projectdemand/demandcollection/add.vue +++ b/src/views/projectdemand/demandcollection/add.vue @@ -39,9 +39,27 @@
+ + + + + + + + + + + +
@@ -76,6 +94,7 @@ const formData = ref({ deadline: '', collectExplain: '' }) +const showTable = ref(false) const processDiagramViewer = ref(false) const typeOption = ref([ @@ -109,7 +128,16 @@ const processStore = useProcessStore() const processInstanceData = ref() const getFile = (val) => { - console.log('val', val) + console.log('val', val, route.query.isAdd) + if(route.query.isAdd==undefined){ + showTable.value=true + val.forEach(item => { + + formData.value.fileList.push(item) + }) + fileList.value=formData.value.fileList + console.log('fileList.value',fileList.value) + } let fileObj = {} let newFileArray = [] val.forEach(item => { @@ -139,7 +167,6 @@ const init = async () => { } const handleSubmit = () => { - console.log(formData.value, "formData.value") addRequirement({ ...formData.value, requirementId: 0, @@ -161,6 +188,9 @@ const getDetailInfo = async () => { if (res.code === 1000) { ElMessage.success(res.msg) formData.value = res.data.formData + if(route.query.isAdd==undefined){ + showTable.value=true + } } else { ElMessage.error(res.msg) } @@ -187,12 +217,17 @@ onMounted(async () => {