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

数据集

Browse Source
yanzili 3 years ago
parent 3ed6520ee7
commit 1a2aed407d
4 changed files with 50 additions and 30 deletions
Show Stats Download Patch File Download Diff File

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

@ -33,6 +33,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",

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

@ -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,
})
}

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

@ -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) {

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

@ -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

Write Preview
Loading…
Cancel
Save