From c498507ed3bc0bb6349ea2412771c23bfdd8d513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= Date: Sun, 8 Oct 2023 14:53:13 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/api_address_config.js | 2 + src/api/workCenter.js | 8 ++ src/common/lang/workCenter/zh.js | 7 + src/components/layouts/TabLayout.vue | 9 +- src/components/tools/setting.js | 2 +- src/permission.js | 3 +- .../processConfig/ProcessConfig.vue | 125 ++++++++++++++++++ 7 files changed, 152 insertions(+), 4 deletions(-) create mode 100644 src/api/workCenter.js create mode 100644 src/views/workCenter/processConfig/ProcessConfig.vue diff --git a/public/api_address_config.js b/public/api_address_config.js index b4344f0b..13d6d174 100644 --- a/public/api_address_config.js +++ b/public/api_address_config.js @@ -14,3 +14,5 @@ window._CONFIG.onlinePreviewDomainURL = 'http://127.0.0.1:8012/onlinePreview' window._CONFIG.onlyOfficeUrl = 'http://127.0.0.1:8080' // onlyOffice下载文件地址(暂时没用) window._CONFIG.onlyOfficeDownloadFileUrl = 'http://localhost:8184/sys/common/download' +// 流程图固定地址 +window._CONFIG.flowchartFixedAddress = 'http://localhost:3334/laws-sinotruk/modeler.html?modelId=' diff --git a/src/api/workCenter.js b/src/api/workCenter.js new file mode 100644 index 00000000..84d7ee97 --- /dev/null +++ b/src/api/workCenter.js @@ -0,0 +1,8 @@ +import { getAction } from './manage.js' + +// 流程配置-部署 +const deployWorkFlow = (params) => getAction('/activitiModel/deploy', params) + +export { + deployWorkFlow +} diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index 94e2c895..322b0c20 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -65,5 +65,12 @@ module.exports = { leadershipAndNecessity: '立项标准的领先性与必要性', initiatedProject: '立项目的及预期效果等', uploadAttachment: '上传附件' + }, + // 流程配置 + processConfig: { + processType: '流程类型', + editFlowchart: '编辑流程图', + editFlowNode: '编辑流程节点', + deploy: '部署' } } diff --git a/src/components/layouts/TabLayout.vue b/src/components/layouts/TabLayout.vue index 402c6031..024925d5 100644 --- a/src/components/layouts/TabLayout.vue +++ b/src/components/layouts/TabLayout.vue @@ -20,7 +20,7 @@ - +
@@ -45,6 +45,7 @@ import Vue from 'vue' import { CACHE_INCLUDED_ROUTES } from '@/store/mutation-types' import BlankLayout from './BlankLayout.vue' import Breadcrumb from '../tools/Breadcrumb.vue' +import { mapState } from 'vuex' const indexKey = '/' @@ -91,7 +92,11 @@ export default { // 是否外部打开 isInternalOrExternal () { return this.$route.meta.internalOrExternal - } + }, + ...mapState({ + // 是否嵌入在别的系统中 + isEmbedded: state => state.app.isEmbedded + }) }, created () { console.log(this.$route) diff --git a/src/components/tools/setting.js b/src/components/tools/setting.js index 412a7b25..16cff3b7 100644 --- a/src/components/tools/setting.js +++ b/src/components/tools/setting.js @@ -103,7 +103,7 @@ const updatePageHeight = () => { const isEmbedded = store.getters.isEmbedded const obj = { 'user-info-height': isEmbedded ? '0px' : '59px', // 用户信息的高度 - 'breadcrumb-height': '45px' // 面包屑的高度 + 'breadcrumb-height': isEmbedded ? '12px' : '45px' // 面包屑的高度 } for (const key in obj) { document diff --git a/src/permission.js b/src/permission.js index 0703af9d..39cd233d 100644 --- a/src/permission.js +++ b/src/permission.js @@ -14,7 +14,8 @@ whiteList.push(OAUTH2_LOGIN_PAGE_PATH) router.beforeEach((to, from, next) => { // 处理是否是嵌入其他系统,是需要隐藏左侧和上面,如果当前值是true,就不需要修改了 const isEmbedded = store.getters.isEmbedded - if (!isEmbedded && to.query.source === 'implant') { + // 用是否iframe嵌套判断 + if (!isEmbedded && top.frames.length > 0) { store.commit('SET_IS_EMBEDDED', true) } NProgress.start() // start progress bar diff --git a/src/views/workCenter/processConfig/ProcessConfig.vue b/src/views/workCenter/processConfig/ProcessConfig.vue new file mode 100644 index 00000000..f65b04e0 --- /dev/null +++ b/src/views/workCenter/processConfig/ProcessConfig.vue @@ -0,0 +1,125 @@ + + + + +