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 @@