From 92a8e9c5e723ac2a3974371453cadaa11269a29a Mon Sep 17 00:00:00 2001
From: jiangyinzhi <4617248933@YFZMY.COM>
Date: Fri, 12 Jul 2024 14:47:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=AF=E5=8A=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                    |  2 +-
 public/index.html                                   |  4 ++--
 src/api/config.js                                   |  4 ++--
 src/settings.js                                     |  4 ++--
 src/views/comment/components/energyReport-quota.vue |  9 ++++-----
 src/views/comment/components/transform.vue          | 10 +++++-----
 src/views/enterprise/yearEnergyAddEdit.vue          |  6 +++---
 src/views/industrialReport/fullreport.vue           |  4 +++-
 vue.config.js                                       |  2 +-
 9 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/.env.development b/.env.development
index b040716..a2b6e98 100644
--- a/.env.development
+++ b/.env.development
@@ -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'
diff --git a/public/index.html b/public/index.html
index 2c59fe3..0ce3ad7 100644
--- a/public/index.html
+++ b/public/index.html
@@ -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 -->
diff --git a/src/api/config.js b/src/api/config.js
index 770f6ea..e4e666c 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -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/' //安徽本地测试
diff --git a/src/settings.js b/src/settings.js
index f6e2b4a..dcdbca2 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -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
diff --git a/src/views/comment/components/energyReport-quota.vue b/src/views/comment/components/energyReport-quota.vue
index 71fd72f..0700135 100644
--- a/src/views/comment/components/energyReport-quota.vue
+++ b/src/views/comment/components/energyReport-quota.vue
@@ -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
diff --git a/src/views/comment/components/transform.vue b/src/views/comment/components/transform.vue
index cabfab9..cb81e22 100644
--- a/src/views/comment/components/transform.vue
+++ b/src/views/comment/components/transform.vue
@@ -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
       )
     }
   },
diff --git a/src/views/enterprise/yearEnergyAddEdit.vue b/src/views/enterprise/yearEnergyAddEdit.vue
index 4a68bdf..c77976a 100644
--- a/src/views/enterprise/yearEnergyAddEdit.vue
+++ b/src/views/enterprise/yearEnergyAddEdit.vue
@@ -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');
diff --git a/src/views/industrialReport/fullreport.vue b/src/views/industrialReport/fullreport.vue
index 7679c68..8c3acf3 100644
--- a/src/views/industrialReport/fullreport.vue
+++ b/src/views/industrialReport/fullreport.vue
@@ -436,7 +436,9 @@ export default {
     },
     // 右边锚点功能
     mouse(v) {
-      this.$refs.anchorChild?.checkoutAnchor(v)
+      if(this.$refs.anchorChild){
+        this.$refs.anchorChild.checkoutAnchor(v)
+      }
     },
     // 获取元素距离顶部的距离
     getHeight(dom) {
diff --git a/vue.config.js b/vue.config.js
index aed2358..13c8a6f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -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]: ''