diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md deleted file mode 100644 index f09d98dd..00000000 --- a/.gitee/ISSUE_TEMPLATE.zh-CN.md +++ /dev/null @@ -1,13 +0,0 @@ -### 该问题是怎么引起的？ - - - -### 重现步骤 - - - -### 报错信息 - - - - diff --git a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md deleted file mode 100644 index 66d43320..00000000 --- a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md +++ /dev/null @@ -1,14 +0,0 @@ -### 相关的Issue - - -### 原因（目的、解决的问题等） - - -### 描述（做了什么，变更了什么） - - -### 测试用例（新增、改动、可能影响的功能） - - - - diff --git a/build/index.js b/build/index.js deleted file mode 100644 index af5695c5..00000000 --- a/build/index.js +++ /dev/null @@ -1,86 +0,0 @@ -'use strict' -// Template version: 1.2.6 -// see http://vuejs-templates.github.io/webpack for documentation. - -const path = require('path') - -module.exports = { - dev: { - // Paths - assetsSubDirectory: 'static', - assetsPublicPath: '/', - proxyTable: {}, - - // Various Dev Server settings - host: 'localhost', // can be overwritten by process.env.HOST - port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined - autoOpenBrowser: true, - errorOverlay: true, - notifyOnErrors: false, - poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions- - - // Use Eslint Loader? - // If true, your code will be linted during bundling and - // linting errors and warnings will be shown in the console. - useEslint: true, - // If true, eslint errors and warnings will also be shown in the error overlay - // in the browser. - showEslintErrorsInOverlay: false, - - /** - * Source Maps - */ - - // https://webpack.js.org/configuration/devtool/#development - devtool: 'cheap-source-map', - - // CSS Sourcemaps off by default because relative paths are "buggy" - // with this option, according to the CSS-Loader README - // (https://github.com/webpack/css-loader#sourcemaps) - // In our experience, they generally work as expected, - // just be aware of this issue when enabling this option. - cssSourceMap: false - }, - - build: { - // Template for index.html - index: path.resolve(__dirname, '../dist/index.html'), - - // Paths - assetsRoot: path.resolve(__dirname, '../dist'), - assetsSubDirectory: 'static', - - /** - * You can set by youself according to actual condition - * You will need to set this if you plan to deploy your site under a sub path, - * for example GitHub pages. If you plan to deploy your site to https://foo.github.io/bar/, - * then assetsPublicPath should be set to "/bar/". - * In most cases please use '/' !!! - */ - assetsPublicPath: '/report/', - - /** - * Source Maps - */ - - productionSourceMap: false, - // https://webpack.js.org/configuration/devtool/#production - devtool: 'source-map', - - // Gzip off by default as many popular static hosts such as - // Surge or Netlify already gzip all static assets for you. - // Before setting to `true`, make sure to: - // npm install --save-dev compression-webpack-plugin - productionGzip: false, - productionGzipExtensions: ['js', 'css'], - - // Run the build command with an extra argument to - // View the bundle analyzer report after build finishes: - // `npm run build --report` - // Set to `true` or `false` to always turn it on or off - bundleAnalyzerReport: process.env.npm_config_report || false, - - // `npm run build:prod --generate_report` - generateAnalyzerReport: process.env.npm_config_generate_report || false - } -} diff --git a/build/pom.xml b/build/pom.xml deleted file mode 100644 index 5bcc2a97..00000000 --- a/build/pom.xml +++ /dev/null @@ -1,217 +0,0 @@ - - - - - org.springframework.boot - spring-boot-starter-parent - 2.3.5.RELEASE - - - - 4.0.0 - - com.anji-plus.otwb - product-report-starter - 1.2.0-SNAPSHOT - - - UTF-8 - -Xdoclint:none - 1.8 - 1.8 - true - - - - - - org.springframework.boot - spring-boot-starter-web - - - org.apache.logging.log4j - log4j-to-slf4j - - - - - - org.apache.logging.log4j - log4j-to-slf4j - 2.15.0 - - - - org.apache.logging.log4j - log4j-api - 2.15.0 - - - - - org.springframework.boot - spring-boot-starter-cache - - - - org.springframework.boot - spring-boot-starter-test - test - - - - org.springframework.cloud - spring-cloud-context - 2.2.6.RELEASE - - - - org.springframework.boot - spring-boot-configuration-processor - true - - - - com.anji-plus - spring-boot-gaea - 2.0.3.RELEASE - - - org.springframework.boot - spring-boot-starter-data-redis - - - - - - com.baomidou - mybatis-plus-boot-starter - 3.3.2 - - - - mysql - mysql-connector-java - - - com.alibaba - druid - 1.2.0 - - - org.flywaydb - flyway-core - 5.2.1 - - - - net.sf.ehcache - ehcache - 2.10.6 - - - - org.apache.httpcomponents - httpclient - 4.5.10 - - - - org.projectlombok - lombok - 1.18.10 - true - - - - com.itextpdf - itextpdf - 5.5.13.2 - - - com.itextpdf - itext-asian - 5.2.0 - - - - org.apache.poi - poi - 4.1.2 - - - org.apache.poi - poi-ooxml - 4.1.2 - - - org.apache.poi - poi-ooxml-schemas - 4.1.2 - - - - org.codehaus.groovy - groovy - 3.0.9 - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - 1.8 - 1.8 - UTF-8 - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4 - - UTF-8 - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.7 - - true - - - - - - - nexus-releases - http://10.108.10.53:8081/repository/maven-releases/ - - - nexus-snapshots - http://10.108.10.53:8081/repository/maven-snapshots/ - - - diff --git a/report-ui/config/dev.env.js b/report-ui/config/dev.env.js index 30f1e2a3..ee3d90dc 100644 --- a/report-ui/config/dev.env.js +++ b/report-ui/config/dev.env.js @@ -5,5 +5,5 @@ const prodEnv = require('./prod.env') module.exports = merge(prodEnv, { NODE_ENV: '"development"', BASE_API: '"http://127.0.0.1:9095"' - //BASE_API: '"http://10.108.26.197:9095"' + // BASE_API: '"http://10.108.26.197:9095"' }) diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-form-time.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-form-time.js new file mode 100644 index 00000000..79f32edc --- /dev/null +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-form-time.js @@ -0,0 +1,155 @@ +/* + * @Descripttion: 时间筛选器 + * @Author: qianlishi qianlishi@anji-plus.com + */ +export const widgetFormTime = { + code: 'widget-form-time', + type: 'form', + tabName: '表单', + label: '时间筛选器', + icon: 'iconchaolianjie', + options: { + setup: [ + { + type: 'el-input-text', + label: '图层名称', + name: 'layerName', + required: false, + placeholder: '', + value: '时间筛选器', + }, + { + type: 'el-input-text', + label: '字段属性值', + name: 'field', + required: false, + placeholder: '请输入', + value: '', + }, + { + type: 'vue-color', + label: '字体颜色', + name: 'select_color', + required: false, + placeholder: '', + value: '#FAD400', + }, + { + type: 'vue-color', + label: '字体背景', + name: 'select_fontSize', + required: false, + placeholder: '', + value: 'rgba(115,170,229,.5)', + }, + { + type: 'el-select', + label: '关联图表', + name: 'assChart', + required: false, + placeholder: '', + multiple: true, + selectOptions: [], + value: '', + }, + { + type: 'el-select', + label: '触发事件', + name: 'event', + required: false, + placeholder: '', + selectOptions: [ + { code: 'change', name: 'change' }, + { code: 'blur', name: 'blur' }, + { code: 'focus', name: 'focus' }, + ], + value: 'change', + } + ], + data: [ + { + type: 'el-radio-group', + label: '数据类型', + name: 'dataType', + require: false, + placeholder: '', + selectValue: true, + selectOptions: [ + { + code: 'staticData', + name: '静态数据', + }, + { + code: 'dynamicData', + name: '动态数据', + }, + ], + value: 'staticData', + }, + { + type: 'el-input-number', + label: '刷新时间(毫秒)', + name: 'refreshTime', + relactiveDom: 'dataType', + relactiveDomValue: 'dynamicData', + value: 5000 + }, + { + type: 'el-button', + label: '静态数据', + name: 'staticData', + required: false, + placeholder: '', + relactiveDom: 'dataType', + relactiveDomValue: 'staticData', + value: [], + }, + { + type: 'dycustComponents', + label: '', + name: 'dynamicData', + required: false, + placeholder: '', + relactiveDom: 'dataType', + relactiveDomValue: 'dynamicData', + chartType: 'widget-select', + dictKey: 'SELECT_PROPERTIES', + value: '', + }, + ], + position: [ + { + type: 'el-input-number', + label: '左边距', + name: 'left', + required: false, + placeholder: '', + value: 0, + }, + { + type: 'el-input-number', + label: '上边距', + name: 'top', + required: false, + placeholder: '', + value: 0, + }, + { + type: 'el-input-number', + label: '宽度', + name: 'width', + required: false, + placeholder: '该容器在1920px大屏中的宽度', + value: 200, + }, + { + type: 'el-input-number', + label: '高度', + name: 'height', + required: false, + placeholder: '该容器在1080px大屏中的高度', + value: 40, + }, + ], + } +} diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/index.js b/report-ui/src/views/bigscreenDesigner/designer/tools/index.js index 7a20a42d..3fc31c01 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/index.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/index.js @@ -3,8 +3,8 @@ * @version: * @Author: qianlishi * @Date: 2021-08-29 06:43:07 - * @LastEditors: chengsl - * @LastEditTime: 2023-02-24 10:29:26 + * @LastEditors: qianlishi qianlishi@anji-plus.com + * @LastEditTime: 2023-03-06 16:00:09 */ import { widgetTool } from "./main" const screenConfig = { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/main.js b/report-ui/src/views/bigscreenDesigner/designer/tools/main.js index e7159139..73d5f75f 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/main.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/main.js @@ -3,8 +3,8 @@ * @version: * @Author: qianlishi * @Date: 2021-08-29 07:46:46 - * @LastEditors: chengsl - * @LastEditTime: 2023-02-23 15:23:20 + * @LastEditors: qianlishi qianlishi@anji-plus.com + * @LastEditTime: 2023-03-06 16:03:17 */ import { widgetText } from "./configure/texts/widget-text" @@ -39,7 +39,8 @@ import { widgetHeatmap } from "./configure/heatmap/widget-heatmap"; import { widgetRadar } from "./configure/radarCharts/widget-radar"; import { widgetBarLineStack } from "./configure/barlineCharts/widget-bar-line-stack"; import { widgetSelect } from "./configure/form/widget-select"; -import {widgetInput} from "./configure/form/widget-input"; +import { widgetInput } from "./configure/form/widget-input"; +import { widgetFormTime } from "./configure/form/widget-form-time"; export const widgetTool = [ // type=html类型的组件 @@ -75,5 +76,6 @@ export const widgetTool = [ widgetRadar, widgetBarLineStack, widgetSelect, - widgetInput + widgetInput, + widgetFormTime ] diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetFormTime.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetFormTime.vue new file mode 100644 index 00000000..3a3cb933 --- /dev/null +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetFormTime.vue @@ -0,0 +1,124 @@ + + + + \ No newline at end of file diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/temp.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/temp.vue index 17a311eb..ce65716b 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/temp.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/temp.vue @@ -1,24 +1,23 @@ -