项目启动,启动报错修改
This commit is contained in:
+1
-1
@@ -10,5 +10,5 @@ VUE_APP_CITY_TYPE = ''
|
|||||||
# base api
|
# base api
|
||||||
# VUE_APP_API_PREFIX = '/portal'
|
# VUE_APP_API_PREFIX = '/portal'
|
||||||
# VUE_APP_BASE_API = '/portal'
|
# VUE_APP_BASE_API = '/portal'
|
||||||
VUE_APP_BASE_API = 'http://192.168.98.115:9012'
|
VUE_APP_BASE_API = 'http://172.29.69.38:19012'
|
||||||
# VUE_APP_GATEWAY = '/proxy-ah'
|
# VUE_APP_GATEWAY = '/proxy-ah'
|
||||||
|
|||||||
+2
-2
@@ -18,12 +18,12 @@
|
|||||||
content="width=device-width,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0,user-scalable=no">
|
content="width=device-width,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0,user-scalable=no">
|
||||||
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
|
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
|
||||||
<script src="static/lib/echarts.min.js"></script>
|
<script src="static/lib/echarts.min.js"></script>
|
||||||
<script src="https://cdn.bootcss.com/html2canvas/0.5.0-beta4/html2canvas.min.js"></script>
|
<!-- <script src="https://cdn.bootcss.com/html2canvas/0.5.0-beta4/html2canvas.min.js"></script>
|
||||||
|
|
||||||
<script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
|
<script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
|
||||||
<script>
|
<script>
|
||||||
var vConsole = new window.VConsole();
|
var vConsole = new window.VConsole();
|
||||||
</script>
|
</script> -->
|
||||||
|
|
||||||
|
|
||||||
<!-- unpkg -->
|
<!-- unpkg -->
|
||||||
|
|||||||
+2
-2
@@ -3,9 +3,9 @@ let baseURL = ''
|
|||||||
|
|
||||||
if (process.env.NODE_ENV === 'development') {
|
if (process.env.NODE_ENV === 'development') {
|
||||||
// 测试环境
|
// 测试环境
|
||||||
// baseURL = 'http://192.168.98.115:28083/' //后端ip和端口
|
// baseURL = 'http://172.29.69.38:28083/' //后端ip和端口
|
||||||
// baseURL = 'http://192.168.1.116:28083/' //南京国网测试后端ip和端口
|
// baseURL = 'http://192.168.1.116:28083/' //南京国网测试后端ip和端口
|
||||||
baseURL = 'http://192.168.98.115:9012/' //南京国网测试后端ip和端口
|
baseURL = 'http://172.29.69.38:19012/' //南京国网测试后端ip和端口
|
||||||
// baseURL = 'https://portal.xt.nfjbill.ren:30004/proxy-ah/' //后端ip和端口
|
// baseURL = 'https://portal.xt.nfjbill.ren:30004/proxy-ah/' //后端ip和端口
|
||||||
|
|
||||||
// baseURL = 'https://www.greensgcc.com/proxy-ah/effcicency/' //安徽本地测试
|
// baseURL = 'https://www.greensgcc.com/proxy-ah/effcicency/' //安徽本地测试
|
||||||
|
|||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
// const baseUrl = process.env.NODE_ENV == 'development' ? 'http://192.168.98.115:9012' : ''
|
// const baseUrl = process.env.NODE_ENV == 'development' ? 'http://172.29.69.38:19012' : ''
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
title: '智慧能源云',
|
title: '智慧能源云',
|
||||||
@@ -14,7 +14,7 @@ module.exports = {
|
|||||||
// https://portal.xt.nfjbill.ren:30004
|
// https://portal.xt.nfjbill.ren:30004
|
||||||
downloadUrl: `${process.env.VUE_APP_BASE_API}/proxy-nx/file/minio/download/`,
|
downloadUrl: `${process.env.VUE_APP_BASE_API}/proxy-nx/file/minio/download/`,
|
||||||
// downloadUrl: `https://www.greensgcc.com/proxy-xj/file/minio/download/`,
|
// downloadUrl: `https://www.greensgcc.com/proxy-xj/file/minio/download/`,
|
||||||
// downloadUrl: `http://192.168.98.115:9012/proxy-sx/file/minio/download/`,
|
// downloadUrl: `http://172.29.69.38:19012/proxy-sx/file/minio/download/`,
|
||||||
uploadUrl: `${process.env.VUE_APP_BASE_API}/file/minio/upload/`,
|
uploadUrl: `${process.env.VUE_APP_BASE_API}/file/minio/upload/`,
|
||||||
statusCode: {
|
statusCode: {
|
||||||
SUCCESS: 0
|
SUCCESS: 0
|
||||||
|
|||||||
@@ -119,8 +119,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
// import * as echarts from 'echarts'
|
|
||||||
// import reportHeader from './report-header.vue'
|
|
||||||
import { mapState, mapMutations } from 'vuex'
|
import { mapState, mapMutations } from 'vuex'
|
||||||
import { setTitle } from '@/utils/dsbridge.js'
|
import { setTitle } from '@/utils/dsbridge.js'
|
||||||
import { Notify } from 'vant'
|
import { Notify } from 'vant'
|
||||||
@@ -490,7 +489,7 @@ export default {
|
|||||||
createChart() {
|
createChart() {
|
||||||
// 柱状图配置
|
// 柱状图配置
|
||||||
// console.log(JSON.parse(res.data.energySituation));
|
// console.log(JSON.parse(res.data.energySituation));
|
||||||
if (this.EnergyReportInfo?.energySituation) {
|
if (this.EnergyReportInfo&&this.EnergyReportInfo.energySituation) {
|
||||||
this.barOption.xAxis.data = JSON.parse(this.EnergyReportInfo.energySituation).category
|
this.barOption.xAxis.data = JSON.parse(this.EnergyReportInfo.energySituation).category
|
||||||
let BarData = []
|
let BarData = []
|
||||||
JSON.parse(this.EnergyReportInfo.energySituation).series.map((v) => {
|
JSON.parse(this.EnergyReportInfo.energySituation).series.map((v) => {
|
||||||
@@ -575,7 +574,7 @@ export default {
|
|||||||
|
|
||||||
// 环形图
|
// 环形图
|
||||||
// console.log(JSON.parse(res.data.coalSituation));
|
// console.log(JSON.parse(res.data.coalSituation));
|
||||||
if (this.EnergyReportInfo?.coalSituation) {
|
if (this.EnergyReportInfo&&this.EnergyReportInfo.coalSituation) {
|
||||||
this.pieOption.series[0].data = JSON.parse(
|
this.pieOption.series[0].data = JSON.parse(
|
||||||
this.EnergyReportInfo.coalSituation
|
this.EnergyReportInfo.coalSituation
|
||||||
)
|
)
|
||||||
@@ -583,7 +582,7 @@ export default {
|
|||||||
this.createPieChart()
|
this.createPieChart()
|
||||||
}
|
}
|
||||||
// 扇形图
|
// 扇形图
|
||||||
if (this.EnergyReportInfo?.EnergyConsumeSituation) {
|
if (this.EnergyReportInfo&&this.EnergyReportInfo.EnergyConsumeSituation) {
|
||||||
let val = {}
|
let val = {}
|
||||||
let data = []
|
let data = []
|
||||||
// 扇形图1
|
// 扇形图1
|
||||||
|
|||||||
@@ -205,27 +205,27 @@ export default {
|
|||||||
multiCtrlModifyYear() {
|
multiCtrlModifyYear() {
|
||||||
if (!this.EnergyReportInfo.multiCtrlModifyYear) return false
|
if (!this.EnergyReportInfo.multiCtrlModifyYear) return false
|
||||||
if (!this.EnergyReportInfo.multiCtrlModifyYear) return false
|
if (!this.EnergyReportInfo.multiCtrlModifyYear) return false
|
||||||
return JSON.parse(this.EnergyReportInfo?.multiCtrlModifyYear).length > 0
|
return JSON.parse(this.EnergyReportInfo&&this.EnergyReportInfo.multiCtrlModifyYear).length > 0
|
||||||
},
|
},
|
||||||
heatDeviceModifyYear() {
|
heatDeviceModifyYear() {
|
||||||
if (!this.EnergyReportInfo.heatDeviceModifyYear) return false
|
if (!this.EnergyReportInfo.heatDeviceModifyYear) return false
|
||||||
if (!this.EnergyReportInfo.heatDeviceModifyYear) return false
|
if (!this.EnergyReportInfo.heatDeviceModifyYear) return false
|
||||||
return JSON.parse(this.EnergyReportInfo?.heatDeviceModifyYear).length > 0
|
return JSON.parse(this.EnergyReportInfo&&this.EnergyReportInfo.heatDeviceModifyYear).length > 0
|
||||||
},
|
},
|
||||||
ratioLedModifyYear() {
|
ratioLedModifyYear() {
|
||||||
if (!this.EnergyReportInfo.ratioLedModifyYear) return false
|
if (!this.EnergyReportInfo.ratioLedModifyYear) return false
|
||||||
return JSON.parse(this.EnergyReportInfo?.ratioLedModifyYear).length > 0
|
return JSON.parse(this.EnergyReportInfo&&this.EnergyReportInfo.ratioLedModifyYear).length > 0
|
||||||
},
|
},
|
||||||
distributeMakeModifyYear() {
|
distributeMakeModifyYear() {
|
||||||
if (!this.EnergyReportInfo.distributeMakeModifyYear) return false
|
if (!this.EnergyReportInfo.distributeMakeModifyYear) return false
|
||||||
return (
|
return (
|
||||||
JSON.parse(this.EnergyReportInfo?.distributeMakeModifyYear).length > 0
|
JSON.parse(this.EnergyReportInfo&&this.EnergyReportInfo.distributeMakeModifyYear).length > 0
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
hotWaterCtrlModifyYear() {
|
hotWaterCtrlModifyYear() {
|
||||||
if (!this.EnergyReportInfo.hotWaterCtrlModifyYear) return false
|
if (!this.EnergyReportInfo.hotWaterCtrlModifyYear) return false
|
||||||
return (
|
return (
|
||||||
JSON.parse(this.EnergyReportInfo?.hotWaterCtrlModifyYear).length > 0
|
JSON.parse(this.EnergyReportInfo&&this.EnergyReportInfo.hotWaterCtrlModifyYear).length > 0
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -859,9 +859,9 @@ export default {
|
|||||||
}
|
}
|
||||||
this.tabName = this.$route.query.tab
|
this.tabName = this.$route.query.tab
|
||||||
this.customerInfo = {
|
this.customerInfo = {
|
||||||
customerId: infoData.item?.customerId,
|
customerId: infoData.item&&infoData.item.customerId,
|
||||||
customerName: infoData.item?.consName,
|
customerName: infoData.item&&infoData.item.consName,
|
||||||
customerType: infoData.item?.customerType,
|
customerType: infoData.item&&infoData.item.customerType,
|
||||||
// creditCode: '33121'
|
// creditCode: '33121'
|
||||||
}
|
}
|
||||||
// console.log(this.customerInfo, 'oooooooooo');
|
// console.log(this.customerInfo, 'oooooooooo');
|
||||||
|
|||||||
@@ -436,7 +436,9 @@ export default {
|
|||||||
},
|
},
|
||||||
// 右边锚点功能
|
// 右边锚点功能
|
||||||
mouse(v) {
|
mouse(v) {
|
||||||
this.$refs.anchorChild?.checkoutAnchor(v)
|
if(this.$refs.anchorChild){
|
||||||
|
this.$refs.anchorChild.checkoutAnchor(v)
|
||||||
|
}
|
||||||
},
|
},
|
||||||
// 获取元素距离顶部的距离
|
// 获取元素距离顶部的距离
|
||||||
getHeight(dom) {
|
getHeight(dom) {
|
||||||
|
|||||||
+1
-1
@@ -129,7 +129,7 @@ module.exports = {
|
|||||||
open: true,
|
open: true,
|
||||||
proxy: {
|
proxy: {
|
||||||
[process.env.VUE_APP_BASE_API]: {
|
[process.env.VUE_APP_BASE_API]: {
|
||||||
target: `http://192.168.98.115:28083`,
|
target: `http://172.29.69.38:28083`,
|
||||||
changeOrigin: true,
|
changeOrigin: true,
|
||||||
pathRewrite: {
|
pathRewrite: {
|
||||||
['^' + process.env.VUE_APP_BASE_API]: ''
|
['^' + process.env.VUE_APP_BASE_API]: ''
|
||||||
|
|||||||
Reference in New Issue
Block a user