From 7944db95773546135775d78e33ccbf22189b50cb Mon Sep 17 00:00:00 2001 From: zkh <1650697374@qq.com> Date: Sat, 14 Dec 2024 11:06:39 +0800 Subject: [PATCH 01/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 3 - .../src/main/resources/application-dev.yml | 8 +- .../src/main/resources/application-prod.yml | 58 +++--- ruoyi-ui/.gitignore | 1 + ruoyi-ui/package.json | 10 +- script/docker/docker-compose.yml | 178 +++++++++--------- 6 files changed, 126 insertions(+), 132 deletions(-) delete mode 100644 package-lock.json diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index 48e341a..0000000 --- a/package-lock.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "lockfileVersion": 1 -} diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 6eec92c..4d80ff6 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -49,9 +49,9 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://192.168.124.52:3308/ry-vue-flowable-xg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://127.0.0.1:3307/ry-vue-flowable-xg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true username: root - password: 123456 + password: root # 从库数据源 slave: lazy: true @@ -104,11 +104,11 @@ spring: # 地址 host: 127.0.0.1 # 端口，默认为6379 - port: 6379 + port: 6380 # 数据库索引 database: 0 # 密码(如没有密码请注释掉) - # password: + password: ruoyi123 # 连接超时时间 timeout: 10s # 是否开启ssl diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 66336bf..b6d3de1 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -4,7 +4,7 @@ spring.servlet.multipart.location: /javaroot/ruoyi/server/temp --- # 监控中心配置 spring.boot.admin.client: # 增加客户端开关 - enabled: true + enabled: false url: http://localhost:9090/admin instance: service-host-type: IP @@ -52,37 +52,37 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://localhost:3306/ry-vue-flowable-xg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true - username: root - password: 123456 + url: jdbc:mysql://localhost:3306/ry-flowable-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true + username: ry-flowable-plus + password: t4CfTHGYchM27X2e # 从库数据源 slave: lazy: true type: ${spring.datasource.type} driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/qhaoda-flowable?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true - username: root - password: 123456 -# oracle: -# type: ${spring.datasource.type} -# driverClassName: oracle.jdbc.OracleDriver -# url: jdbc:oracle:thin:@//localhost:1521/XE -# username: ROOT -# password: root -# hikari: -# connectionTestQuery: SELECT 1 FROM DUAL -# postgres: -# type: ${spring.datasource.type} -# driverClassName: org.postgresql.Driver -# url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true -# username: root -# password: root -# sqlserver: -# type: ${spring.datasource.type} -# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver -# url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true -# username: SA -# password: root + url: jdbc:mysql://localhost:3306/ry-flowable-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true + username: ry-flowable-plus + password: t4CfTHGYchM27X2e + # oracle: + # type: ${spring.datasource.type} + # driverClassName: oracle.jdbc.OracleDriver + # url: jdbc:oracle:thin:@//localhost:1521/XE + # username: ROOT + # password: root + # hikari: + # connectionTestQuery: SELECT 1 FROM DUAL + # postgres: + # type: ${spring.datasource.type} + # driverClassName: org.postgresql.Driver + # url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true + # username: root + # password: root + # sqlserver: + # type: ${spring.datasource.type} + # driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver + # url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true + # username: SA + # password: root hikari: # 最大连接池数量 maxPoolSize: 20 @@ -109,9 +109,9 @@ spring: # 端口，默认为6379 port: 6379 # 数据库索引 - database: 0 + database: 15 # 密码(如没有密码请注释掉) - password: ruoyi@123 + password: wqredis # 连接超时时间 timeout: 10s # 是否开启ssl diff --git a/ruoyi-ui/.gitignore b/ruoyi-ui/.gitignore index 78a752d..39bfc2f 100644 --- a/ruoyi-ui/.gitignore +++ b/ruoyi-ui/.gitignore @@ -21,3 +21,4 @@ selenium-debug.log package-lock.json yarn.lock +*.gz diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 8af995d..300d187 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -40,7 +40,7 @@ "axios": "0.24.0", "bpmn-js-token-simulation": "0.10.0", "clipboard": "2.0.8", - "core-js": "3.25.3", + "core-js": "^3.39.0", "echarts": "5.4.0", "element-ui": "2.15.12", "file-saver": "2.0.5", @@ -69,6 +69,9 @@ "@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", + "camunda-bpmn-moddle": "4.4.1", "chalk": "4.1.0", "compression-webpack-plugin": "5.0.2", "connect": "3.6.6", @@ -80,10 +83,7 @@ "sass-loader": "10.1.1", "script-ext-html-webpack-plugin": "2.1.5", "svg-sprite-loader": "5.1.1", - "vue-template-compiler": "2.6.12", - "bpmn-js": "7.5.0", - "bpmn-js-properties-panel": "0.37.2", - "camunda-bpmn-moddle": "4.4.1" + "vue-template-compiler": "2.6.12" }, "engines": { "node": ">=8.9", diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index 97cd210..749d9aa 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -1,9 +1,10 @@ version: '3' services: + mysql: - image: mysql:8.0.31 - container_name: mysql + image: mysql:8 + container_name: ruoyi-flowable-plus-mysql environment: # 时区上海 TZ: Asia/Shanghai @@ -12,63 +13,59 @@ services: # 初始化数据库(后续的初始化sql会在这个库执行) MYSQL_DATABASE: ry-vue ports: - - "3306:3306" + - "3307:3306" volumes: # 数据挂载 - - /docker/mysql/data/:/var/lib/mysql/ + - /home/zkh/volumes/ruoyi-flowable-plus/mysql/data/:/var/lib/mysql/ # 配置挂载 - - /docker/mysql/conf/:/etc/mysql/conf.d/ + - /home/zkh/volumes/ruoyi-flowable-plus/mysql/conf/:/etc/mysql/conf.d/ command: # 将mysql8.0默认密码策略 修改为 原先 策略 (mysql8.0对其默认策略做了更改 会导致密码无法匹配) - --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci - --explicit_defaults_for_timestamp=true --lower_case_table_names=1 privileged: true - network_mode: "host" - nginx-web: - image: nginx:1.22.1 - container_name: nginx-web - environment: - # 时区上海 - TZ: Asia/Shanghai - ports: - - "80:80" - - "443:443" - volumes: - # 证书映射 - - /docker/nginx/cert:/etc/nginx/cert - # 配置文件映射 - - /docker/nginx/conf/nginx.conf:/etc/nginx/nginx.conf - # 页面目录 - - /docker/nginx/html:/usr/share/nginx/html - # 日志目录 - - /docker/nginx/log:/var/log/nginx - privileged: true - network_mode: "host" +# nginx-web: +# image: nginx:1.22.1 +# container_name: nginx-web +# environment: +# # 时区上海 +# TZ: Asia/Shanghai +# ports: +# - "80:80" +# - "443:443" +# volumes: +# # 证书映射 +# - /docker/nginx/cert:/etc/nginx/cert +# # 配置文件映射 +# - /docker/nginx/conf/nginx.conf:/etc/nginx/nginx.conf +# # 页面目录 +# - /docker/nginx/html:/usr/share/nginx/html +# # 日志目录 +# - /docker/nginx/log:/var/log/nginx +# privileged: true +# network_mode: "host" redis: - image: redis:6.2.7 - container_name: redis + image: redis + container_name: ruoyi-flowable-plus-redis ports: - - "6379:6379" + - "6380:6379" environment: # 时区上海 TZ: Asia/Shanghai volumes: # 配置文件 - - /docker/redis/conf:/redis/config:rw + - /home/zkh/volumes/ruoyi-flowable-plus/redis/conf/:/redis/config/:rw # 数据文件 - - /docker/redis/data/:/redis/data/:rw + - /home/zkh/volumes/ruoyi-flowable-plus/redis/data/:/redis/data/:rw command: "redis-server /redis/config/redis.conf" privileged: true - network_mode: "host" minio: image: minio/minio:RELEASE.2023-03-24T21-41-23Z - container_name: minio + container_name: ruoyi-flowable-plus-minio ports: # api 端口 - "9000:9000" @@ -92,63 +89,62 @@ services: MINIO_COMPRESS_MIME_TYPES: "" volumes: # 映射当前目录下的data目录至容器内/data目录 - - /docker/minio/data:/data + - /home/zkh/volumes/ruoyi-flowable-plus/minio/data:/data # 映射配置目录 - - /docker/minio/config:/root/.minio/ + - /home/zkh/volumes/ruoyi-flowable-plus/minio/config:/root/.minio/ command: server --address ':9000' --console-address ':9001' /data # 指定容器中的目录 /data privileged: true - network_mode: "host" - - ruoyi-server1: - image: ruoyi/ruoyi-server:0.8.3 - container_name: ruoyi-server1 - environment: - # 时区上海 - TZ: Asia/Shanghai - SERVER_PORT: 8080 - volumes: - # 配置文件 - - /docker/server1/logs/:/ruoyi/server/logs/ - # skywalking 探针 -# - /docker/skywalking/agent/:/ruoyi/skywalking/agent - privileged: true - network_mode: "host" - - ruoyi-server2: - image: "ruoyi/ruoyi-server:0.8.3" - container_name: ruoyi-server2 - environment: - # 时区上海 - TZ: Asia/Shanghai - SERVER_PORT: 8081 - volumes: - # 配置文件 - - /docker/server2/logs/:/ruoyi/server/logs/ - # skywalking 探针 -# - /docker/skywalking/agent/:/ruoyi/skywalking/agent - privileged: true - network_mode: "host" - ruoyi-monitor-admin: - image: ruoyi/ruoyi-monitor-admin:0.8.3 - container_name: ruoyi-monitor-admin - environment: - # 时区上海 - TZ: Asia/Shanghai - volumes: - # 配置文件 - - /docker/monitor/logs/:/ruoyi/monitor/logs - privileged: true - network_mode: "host" - - ruoyi-xxl-job-admin: - image: ruoyi/ruoyi-xxl-job-admin:0.8.3 - container_name: ruoyi-xxl-job-admin - environment: - # 时区上海 - TZ: Asia/Shanghai - volumes: - # 配置文件 - - /docker/xxljob/logs/:/ruoyi/xxljob/logs - privileged: true - network_mode: "host" +# ruoyi-server1: +# image: ruoyi/ruoyi-server:0.8.3 +# container_name: ruoyi-server1 +# environment: +# # 时区上海 +# TZ: Asia/Shanghai +# SERVER_PORT: 8080 +# volumes: +# # 配置文件 +# - /docker/server1/logs/:/ruoyi/server/logs/ +# # skywalking 探针 +## - /docker/skywalking/agent/:/ruoyi/skywalking/agent +# privileged: true +# network_mode: "host" +# +# ruoyi-server2: +# image: "ruoyi/ruoyi-server:0.8.3" +# container_name: ruoyi-server2 +# environment: +# # 时区上海 +# TZ: Asia/Shanghai +# SERVER_PORT: 8081 +# volumes: +# # 配置文件 +# - /docker/server2/logs/:/ruoyi/server/logs/ +# # skywalking 探针 +## - /docker/skywalking/agent/:/ruoyi/skywalking/agent +# privileged: true +# network_mode: "host" +# +# ruoyi-monitor-admin: +# image: ruoyi/ruoyi-monitor-admin:0.8.3 +# container_name: ruoyi-monitor-admin +# environment: +# # 时区上海 +# TZ: Asia/Shanghai +# volumes: +# # 配置文件 +# - /docker/monitor/logs/:/ruoyi/monitor/logs +# privileged: true +# network_mode: "host" +# +# ruoyi-xxl-job-admin: +# image: ruoyi/ruoyi-xxl-job-admin:0.8.3 +# container_name: ruoyi-xxl-job-admin +# environment: +# # 时区上海 +# TZ: Asia/Shanghai +# volumes: +# # 配置文件 +# - /docker/xxljob/logs/:/ruoyi/xxljob/logs +# privileged: true +# network_mode: "host" -- Gitee From d96d94c450325c0646f7b89bf4f5b913296d15a9 Mon Sep 17 00:00:00 2001 From: zkh <1650697374@qq.com> Date: Mon, 16 Dec 2024 17:04:39 +0800 Subject: [PATCH 02/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20oss=20=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prod.yml | 4 +- .../service/impl/SysOssServiceImpl.java | 14 +- ruoyi-ui/.env.development | 2 +- ruoyi-ui/jsconfig.json | 9 + ruoyi-ui/package.json | 1 + ruoyi-ui/src/views/oa/oaBid/index.vue | 332 +++++++----------- ruoyi-ui/src/views/oa/purpose/index.vue | 2 +- 7 files changed, 144 insertions(+), 220 deletions(-) create mode 100644 ruoyi-ui/jsconfig.json diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index b6d3de1..6598112 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -52,7 +52,7 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://localhost:3306/ry-flowable-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://localhost:3308/ry-flowable-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true username: ry-flowable-plus password: t4CfTHGYchM27X2e # 从库数据源 @@ -60,7 +60,7 @@ spring: lazy: true type: ${spring.datasource.type} driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/ry-flowable-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://localhost:3308/ry-flowable-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true username: ry-flowable-plus password: t4CfTHGYchM27X2e # oracle: diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java index d125e0c..e2a0920 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java @@ -33,8 +33,10 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; -import java.util.*; -import java.util.stream.Collectors; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; /** * 文件上传 服务层实现 @@ -51,8 +53,8 @@ public class SysOssServiceImpl implements ISysOssService, OssService { public TableDataInfo queryPageList(SysOssBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - List filterResult = result.getRecords().stream().map(this::matchingUrl).collect(Collectors.toList()); - result.setRecords(filterResult); +// List filterResult = result.getRecords().stream().map(this::matchingUrl).collect(Collectors.toList()); +// result.setRecords(filterResult); return TableDataInfo.build(result); } @@ -88,7 +90,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService { lqw.eq(StringUtils.isNotBlank(bo.getFileSuffix()), SysOss::getFileSuffix, bo.getFileSuffix()); lqw.eq(StringUtils.isNotBlank(bo.getUrl()), SysOss::getUrl, bo.getUrl()); lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, - SysOss::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime")); + SysOss::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime")); lqw.eq(StringUtils.isNotBlank(bo.getCreateBy()), SysOss::getCreateBy, bo.getCreateBy()); lqw.eq(StringUtils.isNotBlank(bo.getService()), SysOss::getService, bo.getService()); lqw.orderByDesc(SysOss::getCreateTime); @@ -110,7 +112,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService { FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName()); response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8"); OssClient storage = OssFactory.instance(); - try(InputStream inputStream = storage.getObjectContent(sysOss.getUrl())) { + try (InputStream inputStream = storage.getObjectContent(sysOss.getUrl())) { int available = inputStream.available(); IoUtil.copy(inputStream, response.getOutputStream(), available); response.setContentLength(available); diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development index 7a09b37..072459b 100644 --- a/ruoyi-ui/.env.development +++ b/ruoyi-ui/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = 工程项目进度及成本控制管理系统 ENV = 'development' # 若依管理系统/开发环境 -VUE_APP_BASE_API = '/dev-api' +VUE_APP_BASE_API = '/prod-api' # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/' diff --git a/ruoyi-ui/jsconfig.json b/ruoyi-ui/jsconfig.json new file mode 100644 index 0000000..234d9d6 --- /dev/null +++ b/ruoyi-ui/jsconfig.json @@ -0,0 +1,9 @@ +{ + "compilerOptions": { + "paths": { + "@/*": ["./src/*"] + }, + }, + "exclude": ["node_modules", "dist"], + "include": ["src/**/*.vue", "src/**/*.js"] +} \ No newline at end of file diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 300d187..c911349 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -67,6 +67,7 @@ "@vue/cli-plugin-babel": "4.4.6", "@vue/cli-plugin-eslint": "4.4.6", "@vue/cli-service": "4.4.6", + "@vue/runtime-dom": "^3.5.13", "babel-eslint": "10.1.0", "babel-plugin-dynamic-import-node": "2.3.3", "bpmn-js": "7.5.0", diff --git a/ruoyi-ui/src/views/oa/oaBid/index.vue b/ruoyi-ui/src/views/oa/oaBid/index.vue index 9e9bc9a..294e032 100644 --- a/ruoyi-ui/src/views/oa/oaBid/index.vue +++ b/ruoyi-ui/src/views/oa/oaBid/index.vue @@ -2,40 +2,22 @@
- + - + - + - @@ -48,41 +30,21 @@ - 新增 + 新增 - 修改 + 修改 - 删除 + 删除 - - - - - - + + + + + + + - + - - + + - - + + - + @@ -207,29 +144,21 @@ - +
- +
@@ -250,7 +179,7 @@ {{ documents.comeMoney == '' ? '未填写' : documents.comeMoney }} - {{ documents.comeTime == '' ? '未填写' : parseTime(documents.comeTime , '{y}-{m}-{d}') }} + {{ documents.comeTime == '' ? '未填写' : parseTime(documents.comeTime, '{y}-{m}-{d}') }}
@@ -259,31 +188,22 @@ - +
- +
@@ -327,28 +247,28 @@ 报名方式 - + - + - {{form.noticeTime}} + {{ form.noticeTime }} - {{form.expirationTime}} + {{ form.expirationTime }} - +