caoyan/energy_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

项目启动，启动报错修改

Browse Source
This commit is contained in:
jiangyinzhi
2024-07-12 14:47:01 +08:00
parent 04f0606430
commit 92a8e9c5e7
9 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.development
+1 -1
View File
@@ -10,5 +10,5 @@ VUE_APP_CITY_TYPE = ''
# base api
# VUE_APP_API_PREFIX = '/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'
public/index.html
+2 -2
View File
@@ -18,12 +18,12 @@
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">
<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>
var vConsole = new window.VConsole();
</script>
</script> -->
<!-- unpkg -->
src/api/config.js
+2 -2
View File
@@ -3,9 +3,9 @@ let baseURL = ''
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.98.115:9012/' //南京国网测试后端ip和端口
baseURL = 'http://172.29.69.38:19012/' //南京国网测试后端ip和端口
// baseURL = 'https://portal.xt.nfjbill.ren:30004/proxy-ah/' //后端ip和端口
// baseURL = 'https://www.greensgcc.com/proxy-ah/effcicency/' //安徽本地测试
src/settings.js
+2 -2
View File
@@ -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 = {
title: '智慧能源云',
@@ -14,7 +14,7 @@ module.exports = {
// https://portal.xt.nfjbill.ren:30004
downloadUrl: `${process.env.VUE_APP_BASE_API}/proxy-nx/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/`,
statusCode: {
SUCCESS: 0
src/views/comment/components/energyReport-quota.vue
+4 -5
View File
@@ -119,8 +119,7 @@
</template>
<script>
// import * as echarts from 'echarts'
// import reportHeader from './report-header.vue'
import { mapState, mapMutations } from 'vuex'
import { setTitle } from '@/utils/dsbridge.js'
import { Notify } from 'vant'
@@ -490,7 +489,7 @@ export default {
createChart() {
// 柱状图配置
// 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
let BarData = []
JSON.parse(this.EnergyReportInfo.energySituation).series.map((v) => {
@@ -575,7 +574,7 @@ export default {
// 环形图
// 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.EnergyReportInfo.coalSituation
)
@@ -583,7 +582,7 @@ export default {
this.createPieChart()
}
// 扇形图
if (this.EnergyReportInfo?.EnergyConsumeSituation) {
if (this.EnergyReportInfo&&this.EnergyReportInfo.EnergyConsumeSituation) {
let val = {}
let data = []
// 扇形图1
src/views/comment/components/transform.vue
+5 -5
View File
@@ -205,27 +205,27 @@ export default {
multiCtrlModifyYear() {
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() {
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() {
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() {
if (!this.EnergyReportInfo.distributeMakeModifyYear) return false
return (
JSON.parse(this.EnergyReportInfo?.distributeMakeModifyYear).length > 0
JSON.parse(this.EnergyReportInfo&&this.EnergyReportInfo.distributeMakeModifyYear).length > 0
)
},
hotWaterCtrlModifyYear() {
if (!this.EnergyReportInfo.hotWaterCtrlModifyYear) return false
return (
JSON.parse(this.EnergyReportInfo?.hotWaterCtrlModifyYear).length > 0
JSON.parse(this.EnergyReportInfo&&this.EnergyReportInfo.hotWaterCtrlModifyYear).length > 0
)
}
},
src/views/enterprise/yearEnergyAddEdit.vue
+3 -3
View File
@@ -859,9 +859,9 @@ export default {
}
this.tabName = this.$route.query.tab
this.customerInfo = {
customerId: infoData.item?.customerId,
customerName: infoData.item?.consName,
customerType: infoData.item?.customerType,
customerId: infoData.item&&infoData.item.customerId,
customerName: infoData.item&&infoData.item.consName,
customerType: infoData.item&&infoData.item.customerType,
// creditCode: '33121'
}
// console.log(this.customerInfo, 'oooooooooo');
src/views/industrialReport/fullreport.vue
+3 -1
View File
@@ -436,7 +436,9 @@ export default {
},
// 右边锚点功能
mouse(v) {
this.$refs.anchorChild?.checkoutAnchor(v)
if(this.$refs.anchorChild){
this.$refs.anchorChild.checkoutAnchor(v)
}
},
// 获取元素距离顶部的距离
getHeight(dom) {
vue.config.js
+1 -1
View File
@@ -129,7 +129,7 @@ module.exports = {
open: true,
proxy: {
[process.env.VUE_APP_BASE_API]: {
target: `http://192.168.98.115:28083`,
target: `http://172.29.69.38:28083`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''