diff --git a/DataRoom/dataroom-server/src/main/resources/application.yml b/DataRoom/dataroom-server/src/main/resources/application.yml index 30a49ace..c2e05aa6 100644 --- a/DataRoom/dataroom-server/src/main/resources/application.yml +++ b/DataRoom/dataroom-server/src/main/resources/application.yml @@ -24,9 +24,6 @@ spring: throw-exception-if-no-handler-found: true # 静态资源访问接口前缀 static-path-pattern: /static/** - view: - prefix: classpath:/static/ - suffix: .html pathmatch: matching-strategy: ANT_PATH_MATCHER web: @@ -36,7 +33,7 @@ spring: mybatis-plus: # mybatis plus xml配置文件扫描,多个通过分号隔开 mapper-locations: classpath*:mapper/**/*.xml - # xml中别名文件扫描,多个通过分号隔开 + # typeHandler扫描路径,多个通过分号隔开 type-handlers-package: com.gccloud global-config: db-config: diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue index 21eac27a..adc0e9cb 100644 --- a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue +++ b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue @@ -93,10 +93,7 @@ v-model="config.dataHandler" type="textarea" :rows="5" - placeholder="示例: -data.forEach(item => { -// 数据处理 -})" + placeholder="示例:data.forEach(item => { // 数据处理 })" /> @@ -546,7 +543,7 @@ data.forEach(item => { -
{
- + --> { this.dataForm.config.paramsList.push({ name, @@ -765,6 +764,9 @@ export default { remark: '' }) }) + this.$nextTick(() => { + this.$refs.paramsSettingDialog.open() + }) }, // 执行事件 // toExecute () { diff --git a/data-room-ui/packages/js/utils/registerConfig.js b/data-room-ui/packages/js/utils/registerConfig.js index 09ad377f..4df144cf 100644 --- a/data-room-ui/packages/js/utils/registerConfig.js +++ b/data-room-ui/packages/js/utils/registerConfig.js @@ -51,7 +51,7 @@ function registerRouters (config, router) { }, { path: config?.routers?.templateListUrl || '/big-screen-template', - name: 'Template', + name: 'BigScreenTemplate', component: () => require.ensure([], () => require('data-room-ui/BigScreenTempMag')), meta: { @@ -97,13 +97,13 @@ function registerRouters (config, router) { }, { path: config?.routers?.designUrl || '/big-screen/design', - name: 'Design', + name: 'BigScreenDesign', component: () => require.ensure([], () => require('data-room-ui/BigScreenDesign')) }, { path: config?.routers?.previewUrl || '/big-screen/preview', - name: 'Preview', + name: 'BigScreenPreview', component: () => require.ensure([], () => require('data-room-ui/BigScreenRun')) },