lxm_front/AJ-Report
1
0
Fork 0
mirror of synced 2025-11-06 04:20:54 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/anji-plus/report

Browse Source
This commit is contained in:
qianlishi
2021-07-02 09:33:26 +08:00
parent 434002b0ec 90561cf735
commit 3a60083fa2
10 changed files with 2286 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.en.md
View File

@@ -1,6 +1,6 @@
## Online experience
####   Computer online experience: [https://report.anji-plus.com/](https://report.anji-plus.com/ "链接")  account：guest password：guest
#### &emsp; Online documents: [https://report.anji-plus.com/#/doc](https://report.anji-plus.com/#/doc "doc")<br>
#### &emsp; Online documents: [https://report.anji-plus.com/report-doc/](https://report.anji-plus.com/report-doc/ "doc")<br>
#### &emsp; issues: [https://gitee.com/anji-plus/report/issues](https://gitee.com/anji-plus/report/issues "issue")
## Function overview

4
README.md
View File

@@ -1,6 +1,6 @@
## 在线体验
#### &emsp; 电脑在线体验: [https://report.anji-plus.com/](https://report.anji-plus.com/ "链接") &emsp;体验账号：guest 密码：guest
#### &emsp; 在线文档: [https://report.anji-plus.com/#/doc](https://report.anji-plus.com/#/doc "doc")<br>
#### &emsp; 电脑在线体验: [https://report.anji-plus.com/index.html](https://report.anji-plus.com/index.html "链接") &emsp;体验账号：guest 密码：guest
#### &emsp; 在线文档: [https://report.anji-plus.com/report-doc/](https://report.anji-plus.com/report-doc/ "doc")<br>
#### &emsp; 在线提问: [https://gitee.com/anji-plus/report/issues](https://gitee.com/anji-plus/report/issues "issue")
## 功能概述

2
doc/docs/guide/README.md
View File

@@ -1,6 +1,6 @@
## 在线体验
#### &emsp; 电脑在线体验: [https://report.anji-plus.com/](https://report.anji-plus.com/ "链接") &emsp;体验账号：guest 密码：guest
#### &emsp; 在线文档: [https://report.anji-plus.com/#/doc](https://report.anji-plus.com/#/doc "doc")<br>
#### &emsp; 在线文档: [https://report.anji-plus.com/report-doc/](https://report.anji-plus.com/report-doc/ "doc")<br>
#### &emsp; 在线提问: [https://gitee.com/anji-plus/report/issues](https://gitee.com/anji-plus/report/issues "issue")
## 功能概述

11
report-core/pom.xml
View File

@@ -109,6 +109,17 @@
<includeSystemScope>true</includeSystemScope>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<nonFilteredFileExtensions>
<nonFilteredFileExtension>ttf</nonFilteredFileExtension>
<nonFilteredFileExtension>woff</nonFilteredFileExtension>
<nonFilteredFileExtension>woff2</nonFilteredFileExtension>
</nonFilteredFileExtensions>
</configuration>
</plugin>
</plugins>
</build>
</project>

2305
report-core/src/main/resources/db/migration/V1.0.1__create_tables.sql
View File

File diff suppressed because one or more lines are too long

4
report-ui/config/dev.env.js
View File

@@ -4,6 +4,6 @@ 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://127.0.0.1:9095"'
BASE_API: '"http://10.108.26.197:9095"'
})

2
report-ui/config/prod.env.js
View File

@@ -1,5 +1,5 @@
'use strict'
module.exports = {
NODE_ENV: '"production"',
BASE_API: '"http://127.0.0.1:9095"'
BASE_API: '"https://report.anji-plus.com/"'
}

4
report-ui/src/views/report/datasource/index.vue
View File

@@ -162,8 +162,8 @@
:xl="7">
<el-form-item label="数据源编码"
prop="sourceCode"
:disabled="updataDisabled">
<el-input v-model.trim="dialogForm.sourceCode" />
>
<el-input :disabled="updataDisabled" v-model.trim="dialogForm.sourceCode" />
</el-form-item>
</el-col>
<el-col :xs="24"

82
report-ui/src/views/report/report/index.vue
View File

@@ -176,7 +176,7 @@
:xl="12">
<el-form-item label="报表编码"
prop="reportCode">
<el-input v-model="dialogForm.reportCode" />
<el-input :disabled="reportCodeDisable" v-model="dialogForm.reportCode" />
</el-form-item>
</el-col>
</el-row>
@@ -206,6 +206,20 @@
show-word-limit />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="缩略图">
<el-upload
class="avatar-uploader"
:action="requestUrl"
:headers="headers"
:show-file-list="false"
:on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload">
<img v-if="dialogForm.reportImage" :src="dialogForm.reportImage == null ? require('../../../assets/images/charts.jpg') : dialogForm.reportImage " class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
</el-col>
</el-form>
<div slot="footer"
class="dialog-footer">
@@ -219,6 +233,7 @@
<script>
import { dataDictionary } from '@/api/common'
import { getToken } from "@/utils/auth";
import { reportPageList, addReport, editReport, delReport } from '@/api/report'
import Dictionary from '@/components/Dictionary/index'
var typeData
@@ -258,6 +273,7 @@ export default {
// reportType: '',
// reportGroup: '',
reportDesc: '',
reportImage: '',
},
basicDialog: false,
listLoading: true,
@@ -267,6 +283,11 @@ export default {
dictionaryTypeOptions: [], // 报表类型
dictionaryGroupOptions: [], // 报表分组
rules: {},
reportCodeDisable: false,
requestUrl: process.env.BASE_API + "/file/upload",
headers: {
Authorization: getToken()
},
}
},
@@ -277,16 +298,6 @@ export default {
typeData = this
},
created () {
// this.$nextTick(() => {
// dataDictionary('REPORT_GROUP').then((res) => {
// this.dictionaryGroupOptions = res.data
// this.dialogForm.reportGroup = this.dictionaryGroupOptions[0].text
// })
// dataDictionary('REPORT_TYPE').then((res) => {
// this.dictionaryTypeOptions = res.data;
// this.dialogForm.reportType = this.dictionaryTypeOptions[0].text
// })
// })
this.queryByPage()
},
@@ -318,38 +329,40 @@ export default {
this.listLoading = false
},
handleAvatarSuccess(res) {
this.dialogForm.reportImage = res.data.urlPath
},
beforeAvatarUpload(file) {
const isJPG = file.type === 'image/jpeg';
const isLt2M = file.size / 1024 / 1024 < 2;
return true;
},
// 打开模态框
showAddReportModel (val) {
this.basicDialog = true
if (val === undefined) {
this.reportCodeDisable = false
this.dialogForm = {
reportName: '',
reportCode: '',
// reportType: '',
reportDesc: '',
reportImage: ''
}
} else {
this.dialogForm = val
this.reportCodeDisable = true
}
},
// 预览
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')
// }
},
// 设计
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')
// }
@@ -392,6 +405,7 @@ export default {
},
// 提交
UserConfirm () {
debugger
this.$refs.form.validate(async (valid, obj) => {
if (valid) {
if (this.dialogForm.id == undefined) {
@@ -410,3 +424,29 @@ export default {
},
}
</script>
<style>
.avatar-uploader .el-upload {
/*border: 1px dashed #d9d9d9;*/
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409EFF;
}
.avatar-uploader-icon {
font-size: 28px;
color: #8c939d;
width: 178px;
height: 178px;
line-height: 178px;
text-align: center;
}
.avatar {
width: 30%;
height: 30%;
display: block;
}
</style>

2
report-ui/src/views/report/resultset/index.vue
View File

@@ -155,7 +155,7 @@
:xl="8">
<el-form-item label="数据集编码"
prop="setCode">
<el-input v-model.trim="formData.setCode"
<el-input :disabled="updataDisabled" v-model.trim="formData.setCode"
size="mini" />
</el-form-item>
</el-col>