diff --git a/report-core/src/main/resources/bootstrap.yml b/report-core/src/main/resources/bootstrap.yml index 095bc014..c1b88b31 100644 --- a/report-core/src/main/resources/bootstrap.yml +++ b/report-core/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ spring: profiles: - active: @spring.profiles.active@ + active: dev logging: config: classpath:logback.xml diff --git a/report-ui/package.json b/report-ui/package.json index 6f803ba1..5fdd0db1 100644 --- a/report-ui/package.json +++ b/report-ui/package.json @@ -34,6 +34,7 @@ "vue-color": "^2.8.1", "vue-drag-resize": "^1.5.4", "vue-echarts": "^5.0.0-beta.0", + "vue-json-editor": "^1.4.3", "vue-router": "3.0.1", "vue-ruler-tool": "^1.2.4", "vuedraggable": "^2.24.1", diff --git a/report-ui/src/api/report.js b/report-ui/src/api/report.js index 8314d5bd..e78747df 100644 --- a/report-ui/src/api/report.js +++ b/report-ui/src/api/report.js @@ -163,4 +163,12 @@ export function editReportExcel (data) { method: 'put', data, }) +} +// /dataSet/pageList +export function dataSetPageList (data) { + return request({ + url: '/dataSet/pageList', + method: 'GET', + data, + }) } \ No newline at end of file diff --git a/report-ui/src/assets/styles/index.scss b/report-ui/src/assets/styles/index.scss index 526a10b9..9fa399b3 100644 --- a/report-ui/src/assets/styles/index.scss +++ b/report-ui/src/assets/styles/index.scss @@ -280,4 +280,4 @@ a:hover { color: #bfcbd9!important; font-weight: normal !important; } -} +} \ No newline at end of file diff --git a/report-ui/src/assets/styles/sidebar.scss b/report-ui/src/assets/styles/sidebar.scss index d94399d1..9649af9c 100644 --- a/report-ui/src/assets/styles/sidebar.scss +++ b/report-ui/src/assets/styles/sidebar.scss @@ -55,10 +55,14 @@ } .hideSidebar { .sidebar-container { - width: 36px !important; + width: 56px !important; + .iconfont { + font-size: 24px; + margin-left: 5px; + } } .main-container { - margin-left: 36px; + margin-left:56px; } .submenu-title-noDropdown { padding-left: 10px !important; diff --git a/report-ui/src/views/layout/components/AppMain.vue b/report-ui/src/views/layout/components/AppMain.vue index 747bea23..c026476f 100644 --- a/report-ui/src/views/layout/components/AppMain.vue +++ b/report-ui/src/views/layout/components/AppMain.vue @@ -29,5 +29,6 @@ export default { height: calc(100vh - 50px); position: relative; overflow: auto; + background: #f5f8fa; } </style> diff --git a/report-ui/src/views/layout/components/Sidebar/index.vue b/report-ui/src/views/layout/components/Sidebar/index.vue index f3980554..cb569253 100644 --- a/report-ui/src/views/layout/components/Sidebar/index.vue +++ b/report-ui/src/views/layout/components/Sidebar/index.vue @@ -2,7 +2,9 @@ <el-scrollbar wrap-class="scrollbar-wrapper"> <div class="admin-title" @click="goBigScreen"> - <b>在线大屏</b> + <img src="../../../../../static/logo-dp.png" + width="50" + class="mt10" /> </div> <el-menu :show-timeout="200" :default-active="$route.path" diff --git a/report-ui/src/views/login.vue b/report-ui/src/views/login.vue index 2aae5f88..f7d58bcd 100644 --- a/report-ui/src/views/login.vue +++ b/report-ui/src/views/login.vue @@ -72,7 +72,7 @@ @keyup.native="checkCapslock" /> <span class="show_pwd" @click="showPwd"> - 查看 + <i class="el-icon-view" /> </span> </el-form-item> </el-tooltip> diff --git a/report-ui/src/views/report/datasource/index.vue b/report-ui/src/views/report/datasource/index.vue index b393f5b3..15395aef 100644 --- a/report-ui/src/views/report/datasource/index.vue +++ b/report-ui/src/views/report/datasource/index.vue @@ -77,7 +77,7 @@ <!--表格渲染--> <el-table v-loading="listLoading" border - :data="list" + :data="list" class="mt10" element-loading-text="Loading" style="width: 100%"> <el-table-column align="center" @@ -366,7 +366,12 @@ export default { this.dialogForm.sourceConfig = JSON.stringify(newList) testConnection(this.dialogForm).then((data) => { if (data.code == '200') { - this.testReplyCode = data.code + this.testReplyCode = data.code; + this.$message({ + message: '测试成功!', + type: 'success' + }); + } else { this.testReplyCode = null } diff --git a/report-ui/src/views/report/report/index.vue b/report-ui/src/views/report/report/index.vue index e91eff4d..6394cfc4 100644 --- a/report-ui/src/views/report/report/index.vue +++ b/report-ui/src/views/report/report/index.vue @@ -77,6 +77,7 @@ border :data="list" element-loading-text="Loading" + class="mt10" style="width: 100%"> <el-table-column align="center" label="序号" @@ -149,7 +150,7 @@ :md="6" :lg="6" :xl="6"> - <el-form-item label="报表类型"> + <!-- <el-form-item label="报表类型"> <el-select v-model="dialogForm.reportType" placeholder="报表类型" clearable> @@ -158,7 +159,7 @@ :label="item.text" :value="item.id" /> </el-select> - </el-form-item> + </el-form-item> --> </el-col> <el-col :xs="24" :sm="20" @@ -187,7 +188,7 @@ :md="6" :lg="6" :xl="6"> - <el-form-item label="分组"> + <!-- <el-form-item label="分组"> <el-select v-model="dialogForm.reportGroup" placeholder="请选择" clearable> @@ -196,7 +197,7 @@ :label="item.text" :value="item.id" /> </el-select> - </el-form-item> + </el-form-item> --> </el-col> </el-row> <el-col :span="24"> @@ -247,7 +248,7 @@ export default { params: { reportCode: '', reportName: '', - reportType: '', + // reportType: '', pageNumber: 1, pageSize: 10, order: 'DESC', @@ -256,8 +257,8 @@ export default { dialogForm: { reportName: '', reportCode: '', - reportType: '', - reportGroup: '', + // reportType: '', + // reportGroup: '', reportDesc: '', }, basicDialog: false, @@ -302,7 +303,7 @@ export default { this.$refs[formName].resetFields() this.params.reportName = '' this.params.reportCode = '' - this.params.reportType = '' + // this.params.reportType = '' this.params.pageNumber = 1 this.queryByPage() }, @@ -326,7 +327,7 @@ export default { this.dialogForm = { reportName: '', reportCode: '', - reportType: '', + // reportType: '', reportDesc: '', } } else { @@ -335,25 +336,25 @@ export default { }, // 预览 preview (val) { - if (val.reportType === 'report_excel') { - var routeUrl = this.$router.resolve({ path: '/report/excelreport/viewer', query: { reportCode: val.reportCode } }) - window.open(routeUrl.href, '_blank') - } else { - // eslint-disable-next-line no-redeclare - var routeUrl = this.$router.resolve({ path: '/bigscreen/viewer', query: { reportCode: val.reportCode } }) - window.open(routeUrl.href, '_blank') - } + // if (val.reportType === 'report_excel') { + // var routeUrl = this.$router.resolve({ path: '/report/excelreport/viewer', query: { reportCode: val.reportCode } }) + // window.open(routeUrl.href, '_blank') + // } else { + // eslint-disable-next-line no-redeclare + var routeUrl = this.$router.resolve({ path: '/bigscreen/viewer', query: { reportCode: val.reportCode } }) + window.open(routeUrl.href, '_blank') + // } }, // 设计 design (val) { - if (val.reportType === 'report_excel') { - var routeUrl = this.$router.resolve({ path: '/report/excelreport/designer', query: { reportCode: val.reportCode, reportId: val.id, accessKey: val.accessKey } }) - window.open(routeUrl.href, '_blank') - } else { - // eslint-disable-next-line no-redeclare - var routeUrl = this.$router.resolve({ path: '/bigscreen/designer', query: { reportCode: val.reportCode, reportId: val.id, accessKey: val.accessKey } }) - window.open(routeUrl.href, '_blank') - } + // if (val.reportType === 'report_excel') { + // var routeUrl = this.$router.resolve({ path: '/report/excelreport/designer', query: { reportCode: val.reportCode, reportId: val.id, accessKey: val.accessKey } }) + // window.open(routeUrl.href, '_blank') + // } else { + // eslint-disable-next-line no-redeclare + var routeUrl = this.$router.resolve({ path: '/bigscreen/designer', query: { reportCode: val.reportCode, reportId: val.id, accessKey: val.accessKey } }) + window.open(routeUrl.href, '_blank') + // } }, // 删除 async delReport (val) { diff --git a/report-ui/src/views/report/resultset/index.vue b/report-ui/src/views/report/resultset/index.vue index 340acee6..af1c5907 100644 --- a/report-ui/src/views/report/resultset/index.vue +++ b/report-ui/src/views/report/resultset/index.vue @@ -260,7 +260,7 @@ <!-- //自定义高级规则? --> <codemirror v-model.trim="transformScript" :options="optionsJavascript" - style="height:290px" /> + style="height:190px" /> </div> </div> <div v-else> @@ -390,15 +390,15 @@ </template> <script> -import { queryAllDataSourceSet, verificationSet, testTransformSet, dataSetPreview, addDataSet, editDataSet, deleteDataSet } from '@/api/report' +import { queryAllDataSourceSet, verificationSet, testTransformSet, dataSetPreview, addDataSet, editDataSet, deleteDataSet, dataSetPageList } from '@/api/report' import Dictionary from '@/components/Dictionary/index' import { codemirror } from 'vue-codemirror' // 引入codeMirror全局实例 import 'codemirror/lib/codemirror.css' // 核心样式 import 'codemirror/theme/cobalt.css' // 引入主题后还需要在 options 中指定主题才会生效 - +import vueJsonEditor from 'vue-json-editor' export default { name: 'Support', - components: { Dictionary, codemirror }, + components: { Dictionary, codemirror, vueJsonEditor }, dicts: ['pricing_method'], @@ -512,7 +512,9 @@ export default { watch: {}, // 在生命周期 beforeCreate里面改变this指向 beforeCreate: function () { }, - mounted () { }, + mounted () { + this.queryByPage() + }, created () { this.getAllDataSourceSet() }, @@ -531,7 +533,15 @@ export default { this.queryByPage() }, async queryByPage () { - const res = await pageList(this.params) + let params = { + page: 0, + size: 10, + sort: "update_time", + order: "DESC", + pageNumber: 1, + pageSize: 10 + } + const res = await dataSetPageList(params) if (res.code != '200') return this.listLoading = true this.data = res.data.records @@ -879,12 +889,6 @@ export default { height: 400px !important; } } -.codemirror { - width: 100%; - height: 200px; - margin: 0; - overflow: auto; -} .title { width: 100%; display: inline-block; diff --git a/report-ui/static/logo-dp.png b/report-ui/static/logo-dp.png index 90788c4b..5ecbca8f 100644 Binary files a/report-ui/static/logo-dp.png and b/report-ui/static/logo-dp.png differ