Commit fcdd958a authored by 陈珠河's avatar 陈珠河

Fix: 修复图表入口文件引入的地址

parent 398525d0
<template> <template>
<div <div
v-if="reportDatas && !loading" v-if="reportDatas && !loading"
style="height:100%"> style="height:100%">
<smart-report <smart-report
ref="reporting" ref="reporting"
...@@ -20,7 +20,7 @@ export default { ...@@ -20,7 +20,7 @@ export default {
data() { data() {
return { return {
pageId: '', pageId: '',
baseUrl: baseUrl + '/charts', baseUrl: baseUrl + '/charts',
reportDatas: null, reportDatas: null,
loading: false loading: false
...@@ -49,7 +49,7 @@ export default { ...@@ -49,7 +49,7 @@ export default {
this.reportDatas = data; this.reportDatas = data;
return false; return false;
} else { } else {
this.$message.warning(res.message || '系统异常!'); this.$message.warning(res.message || '系统异常!');
} }
}).catch(err => { }).catch(err => {
this.loading = false; this.loading = false;
......
...@@ -8,7 +8,7 @@ const Api = { ...@@ -8,7 +8,7 @@ const Api = {
* @param {String} rid * @param {String} rid
*/ */
getChartViewById(rid) { getChartViewById(rid) {
return config.doGetPromise('/charts/chartsView/getChartViewById', {rid: rid}); return config.doGetPromise('/charts/chartsView/getChartViewById', {rid: rid});
} }
}; };
......
...@@ -103,7 +103,6 @@ const config = { ...@@ -103,7 +103,6 @@ const config = {
}); });
}); });
}, },
/** /**
* FormData数据上传,文件上传必用 * FormData数据上传,文件上传必用
* @param {String} url * @param {String} url
...@@ -181,7 +180,7 @@ const config = { ...@@ -181,7 +180,7 @@ const config = {
} }
}; };
// 切换页面强行中断请求 router.beforeEach中用到 // 切换页面强行中断请求 router.beforeEach中用到
Vue.prototype.$cancelAjax = function(msg) { Vue.prototype.$cancelAjax = function(msg) {
if (cancel) { if (cancel) {
cancel(msg || '手动中断请求'); cancel(msg || '手动中断请求');
......
...@@ -23,8 +23,8 @@ const pages = { ...@@ -23,8 +23,8 @@ const pages = {
chunks: ['chunk-vendors', 'chunk-commons', 'element-ui', 'smart-form', 'form'] chunks: ['chunk-vendors', 'chunk-commons', 'element-ui', 'smart-form', 'form']
}, },
charts: { charts: {
entry: 'Apps/charts/main.js', entry: 'charts/main.js',
template: 'Apps/charts/charts.html', template: 'charts/charts.html',
filename: 'charts.html', filename: 'charts.html',
chunks: ['chunk-vendors', 'element-ui', 'smart-charts', 'charts'] chunks: ['chunk-vendors', 'element-ui', 'smart-charts', 'charts']
} }
...@@ -86,6 +86,7 @@ module.exports = { ...@@ -86,6 +86,7 @@ module.exports = {
config.resolve.alias config.resolve.alias
.set('@', resolve('src')) .set('@', resolve('src'))
.set('@form', resolve('form')) .set('@form', resolve('form'))
.set('@charts', resolve('charts'))
.set('@config', resolve('config')); .set('@config', resolve('config'));
const arr = ['app', 'form']; const arr = ['app', 'form'];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment