ehs_tanghHe
/
tanghe-report
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
qianlishi 3 years ago
parent 044c5b6fa1 4480f7d244
commit 4cbc0a1d57
12 changed files with 71 additions and 45 deletions
Show Stats Download Patch File Download Diff File

2
report-core/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -1,6 +1,6 @@
spring: spring:
profiles: profiles:
active: @spring.profiles.active@ active: dev
logging: logging:
config: classpath:logback.xml config: classpath:logback.xml

1
report-ui/package.json
Unescape Escape View File

@ -34,6 +34,7 @@
"vue-color": "^2.8.1", "vue-color": "^2.8.1",
"vue-drag-resize": "^1.5.4", "vue-drag-resize": "^1.5.4",
"vue-echarts": "^5.0.0-beta.0", "vue-echarts": "^5.0.0-beta.0",
"vue-json-editor": "^1.4.3",
"vue-router": "3.0.1", "vue-router": "3.0.1",
"vue-ruler-tool": "^1.2.4", "vue-ruler-tool": "^1.2.4",
"vuedraggable": "^2.24.1", "vuedraggable": "^2.24.1",

8
report-ui/src/api/report.js
Unescape Escape View File

@ -164,3 +164,11 @@ export function editReportExcel (data) {
data, data,
}) })
} }
// /dataSet/pageList
export function dataSetPageList (data) {
return request({
url: '/dataSet/pageList',
method: 'GET',
data,
})
}

8
report-ui/src/assets/styles/sidebar.scss
Unescape Escape View File

@ -55,10 +55,14 @@
} }
.hideSidebar { .hideSidebar {
.sidebar-container { .sidebar-container {
width: 36px !important; width: 56px !important;
.iconfont {
font-size: 24px;
margin-left: 5px;
}
} }
.main-container { .main-container {
margin-left: 36px; margin-left:56px;
} }
.submenu-title-noDropdown { .submenu-title-noDropdown {
padding-left: 10px !important; padding-left: 10px !important;

1
report-ui/src/views/layout/components/AppMain.vue
Unescape Escape View File

@ -29,5 +29,6 @@ export default {
height: calc(100vh - 50px); height: calc(100vh - 50px);
position: relative; position: relative;
overflow: auto; overflow: auto;
background: #f5f8fa;
} }
</style> </style>

4
report-ui/src/views/layout/components/Sidebar/index.vue
Unescape Escape View File

@ -2,7 +2,9 @@
<el-scrollbar wrap-class="scrollbar-wrapper"> <el-scrollbar wrap-class="scrollbar-wrapper">
<div class="admin-title" <div class="admin-title"
@click="goBigScreen"> @click="goBigScreen">
<b>在线大屏</b> <img src="../../../../../static/logo-dp.png"
width="50"
class="mt10" />
</div> </div>
<el-menu :show-timeout="200" <el-menu :show-timeout="200"
:default-active="$route.path" :default-active="$route.path"

2
report-ui/src/views/login.vue
Unescape Escape View File

@ -72,7 +72,7 @@
@keyup.native="checkCapslock" /> @keyup.native="checkCapslock" />
<span class="show_pwd" <span class="show_pwd"
@click="showPwd"> @click="showPwd">
查看 <i class="el-icon-view" />
</span> </span>
</el-form-item> </el-form-item>
</el-tooltip> </el-tooltip>

9
report-ui/src/views/report/datasource/index.vue
Unescape Escape View File

@ -77,7 +77,7 @@
<!--表格渲染--> <!--表格渲染-->
<el-table v-loading="listLoading" <el-table v-loading="listLoading"
border border
:data="list" :data="list" class="mt10"
element-loading-text="Loading" element-loading-text="Loading"
style="width: 100%"> style="width: 100%">
<el-table-column align="center" <el-table-column align="center"
@ -366,7 +366,12 @@ export default {
this.dialogForm.sourceConfig = JSON.stringify(newList) this.dialogForm.sourceConfig = JSON.stringify(newList)
testConnection(this.dialogForm).then((data) => { testConnection(this.dialogForm).then((data) => {
if (data.code == '200') { if (data.code == '200') {
this.testReplyCode = data.code this.testReplyCode = data.code;
this.$message({
message: '测试成功！',
type: 'success'
});
} else { } else {
this.testReplyCode = null this.testReplyCode = null
} }

39
report-ui/src/views/report/report/index.vue
Unescape Escape View File

@ -77,6 +77,7 @@
border border
:data="list" :data="list"
element-loading-text="Loading" element-loading-text="Loading"
class="mt10"
style="width: 100%"> style="width: 100%">
<el-table-column align="center" <el-table-column align="center"
label="序号" label="序号"
@ -149,7 +150,7 @@
:md="6" :md="6"
:lg="6" :lg="6"
:xl="6"> :xl="6">
<el-form-item label="报表类型"> <!-- <el-form-item label="报表类型">
<el-select v-model="dialogForm.reportType" <el-select v-model="dialogForm.reportType"
placeholder="报表类型" placeholder="报表类型"
clearable> clearable>
@ -158,7 +159,7 @@
:label="item.text" :label="item.text"
:value="item.id" /> :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
</el-col> </el-col>
<el-col :xs="24" <el-col :xs="24"
:sm="20" :sm="20"
@ -187,7 +188,7 @@
:md="6" :md="6"
:lg="6" :lg="6"
:xl="6"> :xl="6">
<el-form-item label="分组"> <!-- <el-form-item label="分组">
<el-select v-model="dialogForm.reportGroup" <el-select v-model="dialogForm.reportGroup"
placeholder="请选择" placeholder="请选择"
clearable> clearable>
@ -196,7 +197,7 @@
:label="item.text" :label="item.text"
:value="item.id" /> :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
</el-col> </el-col>
</el-row> </el-row>
<el-col :span="24"> <el-col :span="24">
@ -247,7 +248,7 @@ export default {
params: { params: {
reportCode: '', reportCode: '',
reportName: '', reportName: '',
reportType: '', // reportType: '',
pageNumber: 1, pageNumber: 1,
pageSize: 10, pageSize: 10,
order: 'DESC', order: 'DESC',
@ -256,8 +257,8 @@ export default {
dialogForm: { dialogForm: {
reportName: '', reportName: '',
reportCode: '', reportCode: '',
reportType: '', // reportType: '',
reportGroup: '', // reportGroup: '',
reportDesc: '', reportDesc: '',
}, },
basicDialog: false, basicDialog: false,
@ -302,7 +303,7 @@ export default {
this.$refs[formName].resetFields() this.$refs[formName].resetFields()
this.params.reportName = '' this.params.reportName = ''
this.params.reportCode = '' this.params.reportCode = ''
this.params.reportType = '' // this.params.reportType = ''
this.params.pageNumber = 1 this.params.pageNumber = 1
this.queryByPage() this.queryByPage()
}, },
@ -326,7 +327,7 @@ export default {
this.dialogForm = { this.dialogForm = {
reportName: '', reportName: '',
reportCode: '', reportCode: '',
reportType: '', // reportType: '',
reportDesc: '', reportDesc: '',
} }
} else { } else {
@ -335,25 +336,25 @@ export default {
}, },
// 预览 // 预览
preview (val) { preview (val) {
if (val.reportType === 'report_excel') { // if (val.reportType === 'report_excel') {
var routeUrl = this.$router.resolve({ path: '/report/excelreport/viewer', query: { reportCode: val.reportCode } }) // var routeUrl = this.$router.resolve({ path: '/report/excelreport/viewer', query: { reportCode: val.reportCode } })
window.open(routeUrl.href, '_blank') // window.open(routeUrl.href, '_blank')
} else { // } else {
// eslint-disable-next-line no-redeclare // eslint-disable-next-line no-redeclare
var routeUrl = this.$router.resolve({ path: '/bigscreen/viewer', query: { reportCode: val.reportCode } }) var routeUrl = this.$router.resolve({ path: '/bigscreen/viewer', query: { reportCode: val.reportCode } })
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, '_blank')
} // }
}, },
// 设计 // 设计
design (val) { design (val) {
if (val.reportType === 'report_excel') { // if (val.reportType === 'report_excel') {
var routeUrl = this.$router.resolve({ path: '/report/excelreport/designer', query: { reportCode: val.reportCode, reportId: val.id, accessKey: val.accessKey } }) // var routeUrl = this.$router.resolve({ path: '/report/excelreport/designer', query: { reportCode: val.reportCode, reportId: val.id, accessKey: val.accessKey } })
window.open(routeUrl.href, '_blank') // window.open(routeUrl.href, '_blank')
} else { // } else {
// eslint-disable-next-line no-redeclare // eslint-disable-next-line no-redeclare
var routeUrl = this.$router.resolve({ path: '/bigscreen/designer', query: { reportCode: val.reportCode, reportId: val.id, accessKey: val.accessKey } }) var routeUrl = this.$router.resolve({ path: '/bigscreen/designer', query: { reportCode: val.reportCode, reportId: val.id, accessKey: val.accessKey } })
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, '_blank')
} // }
}, },
// 删除 // 删除
async delReport (val) { async delReport (val) {

28
report-ui/src/views/report/resultset/index.vue
Unescape Escape View File

@ -260,7 +260,7 @@
<!-- //自定义高级规则？ --> <!-- //自定义高级规则？ -->
<codemirror v-model.trim="transformScript" <codemirror v-model.trim="transformScript"
:options="optionsJavascript" :options="optionsJavascript"
style="height:290px" /> style="height:190px" />
</div> </div>
</div> </div>
<div v-else> <div v-else>
@ -390,15 +390,15 @@
</template> </template>
<script> <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 Dictionary from '@/components/Dictionary/index'
import { codemirror } from 'vue-codemirror' // 引入codeMirror全局实例 import { codemirror } from 'vue-codemirror' // 引入codeMirror全局实例
import 'codemirror/lib/codemirror.css' // 核心样式 import 'codemirror/lib/codemirror.css' // 核心样式
import 'codemirror/theme/cobalt.css' // 引入主题后还需要在 options 中指定主题才会生效 import 'codemirror/theme/cobalt.css' // 引入主题后还需要在 options 中指定主题才会生效
import vueJsonEditor from 'vue-json-editor'
export default { export default {
name: 'Support', name: 'Support',
components: { Dictionary, codemirror }, components: { Dictionary, codemirror, vueJsonEditor },
dicts: ['pricing_method'], dicts: ['pricing_method'],
@ -512,7 +512,9 @@ export default {
watch: {}, watch: {},
// 在生命周期 beforeCreate里面改变this指向 // 在生命周期 beforeCreate里面改变this指向
beforeCreate: function () { }, beforeCreate: function () { },
mounted () { }, mounted () {
this.queryByPage()
},
created () { created () {
this.getAllDataSourceSet() this.getAllDataSourceSet()
}, },
@ -531,7 +533,15 @@ export default {
this.queryByPage() this.queryByPage()
}, },
async 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 if (res.code != '200') return
this.listLoading = true this.listLoading = true
this.data = res.data.records this.data = res.data.records
@ -879,12 +889,6 @@ export default {
height: 400px !important; height: 400px !important;
} }
} }
.codemirror {
width: 100%;
height: 200px;
margin: 0;
overflow: auto;
}
.title { .title {
width: 100%; width: 100%;
display: inline-block; display: inline-block;

BIN
report-ui/static/logo-dp.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 150 KiB

Write Preview
Loading…
Cancel
Save