From 864c5e6a0daf12229220975b7f35fe54ce6f729d Mon Sep 17 00:00:00 2001 From: TiaStars Date: Fri, 26 Jul 2024 15:20:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=B5=81=E7=A8=8B=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=EF=BC=88=E6=9A=82=E6=9C=AA=E5=AE=8C=E5=96=84=EF=BC=89?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E4=B8=BA=E5=BC=B9=E6=A1=86=E3=80=81=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=8F=B0=E6=A0=B7=E5=BC=8F=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- .env.production | 4 +- package.json | 10 +- src/api/jin_ji_hu/dataCloudMap/index.js | 9 + src/assets/styles/index.scss | 21 + src/assets/styles/public.scss | 26 +- src/components/ProcessDesigner/index.vue | 128 ++ src/components/ProcessViewer/index.vue | 259 ++++ src/layout/components/AppMain.vue | 29 +- src/permission.js | 8 +- .../package/designer/ProcessDesigner.vue | 465 ++++++ src/plugins/package/designer/index.js | 7 + .../plugins/content-pad/contentPadProvider.js | 390 +++++ .../designer/plugins/content-pad/index.js | 6 + .../package/designer/plugins/defaultEmpty.js | 27 + .../descriptor/activitiDescriptor.json | 1283 ++++++++++++++++ .../plugins/descriptor/camundaDescriptor.json | 1092 ++++++++++++++ .../descriptor/flowableDescriptor.json | 1295 +++++++++++++++++ .../activiti/activitiExtension.js | 74 + .../extension-moddle/activiti/index.js | 9 + .../extension-moddle/camunda/extension.js | 148 ++ .../plugins/extension-moddle/camunda/index.js | 6 + .../flowable/flowableExtension.js | 74 + .../extension-moddle/flowable/index.js | 9 + .../package/designer/plugins/palette/index.js | 15 + .../plugins/palette/paletteProvider.js | 160 ++ .../plugins/translate/customTranslate.js | 41 + .../package/designer/plugins/translate/zh.js | 238 +++ src/plugins/package/highlight/index.js | 5 + src/plugins/package/index.js | 7 + src/plugins/package/penal/PropertiesPanel.vue | 193 +++ .../package/penal/base/ElementBaseInfo.vue | 76 + .../penal/flow-condition/FlowCondition.vue | 142 ++ .../package/penal/form/ElementForm.vue | 390 +++++ src/plugins/package/penal/index.js | 7 + .../penal/listeners/ElementListeners.vue | 296 ++++ .../penal/listeners/UserTaskListeners.vue | 319 ++++ .../package/penal/listeners/template.js | 178 +++ .../package/penal/listeners/utilSelf.js | 62 + .../multi-instance/ElementMultiInstance.vue | 192 +++ .../penal/other/ElementOtherConfig.vue | 59 + .../penal/properties/ElementProperties.vue | 134 ++ .../penal/signal-message/SignalAndMessage.vue | 104 ++ .../package/theme/flow-element-variables.scss | 63 + src/plugins/package/theme/index.scss | 171 +++ .../package/theme/process-designer.scss | 153 ++ src/plugins/package/theme/process-panel.scss | 110 ++ src/plugins/package/utils.js | 69 + .../dataCloudMap/components/collectDialog.vue | 106 +- src/views/dataCloudMap/index.vue | 22 +- .../onlineDeclaration/template/index.vue | 137 +- src/views/tool/build/index.vue | 63 +- src/views/workbench/index.vue | 163 ++- vue.config.js | 2 +- 54 files changed, 8840 insertions(+), 220 deletions(-) create mode 100644 src/components/ProcessDesigner/index.vue create mode 100644 src/components/ProcessViewer/index.vue create mode 100644 src/plugins/package/designer/ProcessDesigner.vue create mode 100644 src/plugins/package/designer/index.js create mode 100644 src/plugins/package/designer/plugins/content-pad/contentPadProvider.js create mode 100644 src/plugins/package/designer/plugins/content-pad/index.js create mode 100644 src/plugins/package/designer/plugins/defaultEmpty.js create mode 100644 src/plugins/package/designer/plugins/descriptor/activitiDescriptor.json create mode 100644 src/plugins/package/designer/plugins/descriptor/camundaDescriptor.json create mode 100644 src/plugins/package/designer/plugins/descriptor/flowableDescriptor.json create mode 100644 src/plugins/package/designer/plugins/extension-moddle/activiti/activitiExtension.js create mode 100644 src/plugins/package/designer/plugins/extension-moddle/activiti/index.js create mode 100644 src/plugins/package/designer/plugins/extension-moddle/camunda/extension.js create mode 100644 src/plugins/package/designer/plugins/extension-moddle/camunda/index.js create mode 100644 src/plugins/package/designer/plugins/extension-moddle/flowable/flowableExtension.js create mode 100644 src/plugins/package/designer/plugins/extension-moddle/flowable/index.js create mode 100644 src/plugins/package/designer/plugins/palette/index.js create mode 100644 src/plugins/package/designer/plugins/palette/paletteProvider.js create mode 100644 src/plugins/package/designer/plugins/translate/customTranslate.js create mode 100644 src/plugins/package/designer/plugins/translate/zh.js create mode 100644 src/plugins/package/highlight/index.js create mode 100644 src/plugins/package/index.js create mode 100644 src/plugins/package/penal/PropertiesPanel.vue create mode 100644 src/plugins/package/penal/base/ElementBaseInfo.vue create mode 100644 src/plugins/package/penal/flow-condition/FlowCondition.vue create mode 100644 src/plugins/package/penal/form/ElementForm.vue create mode 100644 src/plugins/package/penal/index.js create mode 100644 src/plugins/package/penal/listeners/ElementListeners.vue create mode 100644 src/plugins/package/penal/listeners/UserTaskListeners.vue create mode 100644 src/plugins/package/penal/listeners/template.js create mode 100644 src/plugins/package/penal/listeners/utilSelf.js create mode 100644 src/plugins/package/penal/multi-instance/ElementMultiInstance.vue create mode 100644 src/plugins/package/penal/other/ElementOtherConfig.vue create mode 100644 src/plugins/package/penal/properties/ElementProperties.vue create mode 100644 src/plugins/package/penal/signal-message/SignalAndMessage.vue create mode 100644 src/plugins/package/theme/flow-element-variables.scss create mode 100644 src/plugins/package/theme/index.scss create mode 100644 src/plugins/package/theme/process-designer.scss create mode 100644 src/plugins/package/theme/process-panel.scss create mode 100644 src/plugins/package/utils.js diff --git a/.env.development b/.env.development index 321b6f9..3becbe6 100644 --- a/.env.development +++ b/.env.development @@ -5,8 +5,8 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统 ENV = 'development' # 金鸡湖现代服务业品牌管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.0.108:9040' -# VUE_APP_BASE_API = 'http://39.101.188.84:9040' +# VUE_APP_BASE_API = 'http://192.168.0.108:9040' +VUE_APP_BASE_API = 'http://39.101.188.84:9040' # VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api' # 路由懒加载 diff --git a/.env.production b/.env.production index b1a6f2b..928897b 100644 --- a/.env.production +++ b/.env.production @@ -6,7 +6,7 @@ ENV = 'production' # 金鸡湖现代服务业品牌管理系统/生产环境 # VUE_APP_BASE_API = '/prod-api' -VUE_APP_BASE_API = 'http://39.101.188.84:9040' +# VUE_APP_BASE_API = 'http://39.101.188.84:9040' # VUE_APP_BASE_API = 'http://192.114.0.197/api' -# VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api' +VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api' diff --git a/package.json b/package.json index 2663894..e4dac7f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "1.0.202407251452", + "version": "1.0.202407261413", "description": "金鸡湖现代服务业品牌管理系统", "author": "若依", "license": "MIT", @@ -47,7 +47,7 @@ "element-ui": "2.15.14", "file-saver": "2.0.5", "fuse.js": "6.4.3", - "highlight.js": "9.18.5", + "highlight.js": "10.5.0", "html2canvas": "^1.4.1", "js-beautify": "1.13.0", "js-cookie": "3.0.1", @@ -65,7 +65,9 @@ "vue-router": "3.4.9", "vuedraggable": "2.24.3", "vuex": "3.6.0", - "xlsx": "^0.18.5" + "xlsx": "^0.18.5", + "xml-js": "1.6.11", + "bpmn-js-token-simulation": "0.10.0" }, "devDependencies": { "@vue/cli-plugin-babel": "4.4.6", @@ -73,6 +75,8 @@ "@vue/cli-service": "4.4.6", "babel-eslint": "10.1.0", "babel-plugin-dynamic-import-node": "2.3.3", + "bpmn-js": "7.5.0", + "bpmn-js-properties-panel": "0.37.2", "chalk": "4.1.0", "compression-webpack-plugin": "5.0.2", "connect": "3.6.6", diff --git a/src/api/jin_ji_hu/dataCloudMap/index.js b/src/api/jin_ji_hu/dataCloudMap/index.js index 6228463..d56d3e7 100644 --- a/src/api/jin_ji_hu/dataCloudMap/index.js +++ b/src/api/jin_ji_hu/dataCloudMap/index.js @@ -18,6 +18,15 @@ export function getIndustryDepth(params) { }) } +// 数据云图行业纵深情况 +export function getAllIndustry(params) { + return request({ + url: "/jjh/dataScreen/getAllIndustry", + method: "get", + params + }) +} + // 数据云图荣誉情况 export function honor(params) { return request({ diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 851a0b2..ff8ce58 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -201,6 +201,18 @@ div::-webkit-scrollbar { section::-webkit-scrollbar { display: none; } +html::-webkit-scrollbar { + display: none; +} +body::-webkit-scrollbar { + display: none; +} +#app::-webkit-scrollbar { + display: none; +} +.scale-box::-webkit-scrollbar { + display: none; +} // 荣誉情况弹窗样式 .honor-dialog,.collectDialog-dialog,.headquarterEnterprise-dialog,.serviceIndustry-dialog { section { @@ -223,6 +235,15 @@ section::-webkit-scrollbar { } } } +.process-dialog { + height: 90vh; +} +.process-dialog { + height: 90vh; + .el-dialog__body { + height: calc(100% - 30px); + } +} #detail_content_two { width: 100%; #reportId { diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss index 1305593..54ff900 100644 --- a/src/assets/styles/public.scss +++ b/src/assets/styles/public.scss @@ -1038,8 +1038,9 @@ // 工作台 .workbench-box { height: 100%; + overflow-y: scroll; header { - height: 32%; + height: 32vh; background: url("../images/workbench.png"); background-size: 100% 100%; display: flex; @@ -1092,11 +1093,12 @@ // 工作台 .home-main { padding: 10px; - height: calc(100% - 32%); + // height: calc(100% - 32%); // height: 100%; - overflow-y: scroll; + // overflow-y: scroll; .main-row { - height: 100%; + // height: 100%; + height: 540px; display: flex; background-color: #f6f7f9; .work-main-left { @@ -1111,7 +1113,7 @@ // display: flex; // justify-content: space-between; // align-items: center; - padding: 10px 0; + padding: 5px 0 10px; margin-bottom: 15px; .left-header-title { // font-family: PingFang-SC, PingFang-SC; @@ -1129,7 +1131,7 @@ .el-card { background-color: #F5F8FA; border: none; - height: 120px; + height: 90px; margin-bottom: 10px; } .el-card-border { @@ -1282,6 +1284,12 @@ } } } + .main-two-row { + height: 100%; + flex-direction: column; + // align-content: space-between; + justify-content: space-between; + } } // 企业端首页 .home-index-main { @@ -1352,6 +1360,7 @@ display: grid; grid-template-columns: auto auto; /* 自动列宽 */ align-items: end; /* 垂直对齐方式:底部对齐 */ + margin-top: -10px; .L-title-left { display: flex; align-items: center; @@ -1669,7 +1678,8 @@ // padding: 0.7vh 1vw 1.2vh 1vw; } .card-items { - margin-bottom: 0.5vw; + // margin-bottom: 0.5vw; + margin-bottom: 10px; padding: 7px 10px; // padding: 0.7vh 10px; background-color: #F6F9FD; @@ -1742,7 +1752,7 @@ } } .dataCloudMap-statistics { - margin-top: 15px; + margin-top: 12px; // margin-top: 1.5vh; display: grid; grid-template-columns: 1fr 1fr 1fr 1fr; diff --git a/src/components/ProcessDesigner/index.vue b/src/components/ProcessDesigner/index.vue new file mode 100644 index 0000000..0eadee9 --- /dev/null +++ b/src/components/ProcessDesigner/index.vue @@ -0,0 +1,128 @@ + + + + + diff --git a/src/components/ProcessViewer/index.vue b/src/components/ProcessViewer/index.vue new file mode 100644 index 0000000..3bc6594 --- /dev/null +++ b/src/components/ProcessViewer/index.vue @@ -0,0 +1,259 @@ + + + + + diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 53624a5..0d0e678 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -1,5 +1,5 @@