From 72027678dda07d14465edde0da52bf22813697a4 Mon Sep 17 00:00:00 2001
From: fhysy <1149505133@qq.com>
Date: Tue, 27 Aug 2024 14:18:19 +0800
Subject: [PATCH] =?UTF-8?q?=20fix(=E8=87=AA=E5=AE=9A=E4=B9=89=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83):=20=E8=A7=A3=E5=86=B3=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=89=93=E5=8C=85=E6=96=87=E4=BB=B6=E8=BF=87?=
 =?UTF-8?q?=E5=A4=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.ccprod                                |  6 +++++-
 .env.drgyprod                              |  4 +++-
 .env.drprod                                |  3 ++-
 public/index.html                          |  2 +-
 src/config/env.js                          |  2 +-
 src/main.js                                |  6 +++---
 src/router/index.js                        |  1 -
 src/utils/hciot.js                         |  2 +-
 src/utils/request.js                       |  2 +-
 src/views/bigScreen/v3/profile/mapWrap.vue | 11 ++++++-----
 10 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/.env.ccprod b/.env.ccprod
index 4487c34f..01065ed9 100644
--- a/.env.ccprod
+++ b/.env.ccprod
@@ -1,6 +1,7 @@
 # 开发环境配置
 ENV = 'cc'
-NODE_ENV = 'ccprod'
+VUE_APP_ENV = 'ccprod'
+NODE_ENV = 'production'
 # logo
 VUE_APP_LGOG_URL = 'logo/cc/logo.png'
 /**
@@ -32,6 +33,9 @@ VUE_APP_THEME_CLASS = 'theme-grey-red'
 # 智慧用电管理系统/开发环境
 VUE_APP_BASE_API = '/prod-api'
 
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true
+
 # 前端端口
 port= 9988
 
diff --git a/.env.drgyprod b/.env.drgyprod
index ebf1fc8c..688cc476 100644
--- a/.env.drgyprod
+++ b/.env.drgyprod
@@ -1,6 +1,7 @@
 # 生产环境配置
 ENV = 'drgyprod'
-NODE_ENV = 'drgyprod'
+VUE_APP_ENV = 'drgyprod'
+NODE_ENV = 'production'
 # logo
 VUE_APP_LGOG_URL = 'logo/drgy/logo.png'
 /**
@@ -33,6 +34,7 @@ VUE_APP_THEME_CLASS = 'theme-green'
 VUE_APP_BASE_API = '/prod-api'
 
 
+
 # 前端端口
 port= 9988
 
diff --git a/.env.drprod b/.env.drprod
index f21715a6..47d23726 100644
--- a/.env.drprod
+++ b/.env.drprod
@@ -1,6 +1,7 @@
 # 开发环境配置
 ENV = 'drprod'
-NODE_ENV = 'drprod'
+VUE_APP_ENV = 'drprod'
+NODE_ENV = 'production'
 # logo
 VUE_APP_LGOG_URL = 'logo/dr/logo.png'
 /**
diff --git a/public/index.html b/public/index.html
index 3738c235..cc0765bd 100644
--- a/public/index.html
+++ b/public/index.html
@@ -226,7 +226,7 @@
 </body>
 <!-- 全局系统配置（区分系统） -->
 <script src="./systenConfig.js"></script>
-<% if (process.env.NODE_ENV === 'drprod' ) { %>
+<% if (process.env.VUE_APP_ENV === 'drprod' ) { %>
 <script>
   // 获取loader-wrapper元素
   var loaderWrapper = document.querySelector('#loader-wrapper');
diff --git a/src/config/env.js b/src/config/env.js
index 62666130..41a436b1 100644
--- a/src/config/env.js
+++ b/src/config/env.js
@@ -31,7 +31,7 @@ if (env.NODE_ENV == 'development') {
   flowIotUrl = 'http://127.0.0.1:1880/#flow/'
   // hrefHost = "power-tcore.histron.cn"
   hrefHost = "192.168.1.17"
-} else if(env.NODE_ENV == 'production' || env.NODE_ENV == 'drgyprod' || env.NODE_ENV == 'drprod' || env.NODE_ENV == 'ccprod') {
+} else if(env.NODE_ENV == 'production') {
   // if (hrefHost.indexOf('.gkiiot.com') >= 0) {
   //   iotHost = 'iot.gkiiot.com'
   // }
diff --git a/src/main.js b/src/main.js
index 46c0c96b..9bb9eba5 100644
--- a/src/main.js
+++ b/src/main.js
@@ -27,8 +27,8 @@ import dataV from '@jiaminghi/data-view'
 // import VueCron from 'vue-cron';
 // 自定义表格工具扩展
 import RightToolbar from "@/components/RightToolbar"
-import iView from 'iview'
-import 'iview/dist/styles/iview.css'
+// import iView from 'iview'
+// import 'iview/dist/styles/iview.css'
 
 import VueAMap from 'vue-amap';
 
@@ -61,7 +61,7 @@ Vue.prototype.msgInfo = function (msg) {
 // 全局组件挂载
 Vue.component('Pagination', Pagination)
 Vue.component('RightToolbar', RightToolbar)
-Vue.use(iView)
+// Vue.use(iView)
 Vue.use(dataV)
 Vue.use(VueClipboard)
 Vue.use(VueAMap);
diff --git a/src/router/index.js b/src/router/index.js
index 4958d607..06a6d701 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -28,7 +28,6 @@ import ParentView from '@/components/ParentView';
 // 根据环境变量动态导入组件
 function dynamicImportLoginPage(resolve) {
   const loginPagePath = process.env.VUE_APP_LOGIN_PAGE;
-  console.log("loginPagePath",loginPagePath)
   require([`@/views/${loginPagePath}`], resolve);
 }
 
diff --git a/src/utils/hciot.js b/src/utils/hciot.js
index 49d6fd6a..4012a09c 100644
--- a/src/utils/hciot.js
+++ b/src/utils/hciot.js
@@ -5,7 +5,7 @@
  */
 import { Loading } from 'element-ui';
 
-const baseHref = (process.env.NODE_ENV === "production" || process.env.NODE_ENV === "drgyprod" || process.env.NODE_ENV === "drprod") ?  `${window.dasConfig.protocol}${window.dasConfig.ip}${window.dasConfig.port ? ':'+window.dasConfig.port : ''}${window.dasConfig.prodApi ? window.dasConfig.prodApi : ''}` : process.env.VUE_APP_BASE_API
+const baseHref = (process.env.NODE_ENV === "production") ?  `${window.dasConfig.protocol}${window.dasConfig.ip}${window.dasConfig.port ? ':'+window.dasConfig.port : ''}${window.dasConfig.prodApi ? window.dasConfig.prodApi : ''}` : process.env.VUE_APP_BASE_API
 
 const baseURL = process.env.VUE_APP_BASE_API
 
diff --git a/src/utils/request.js b/src/utils/request.js
index 871dc18b..9e5b2121 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -9,7 +9,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
-  baseURL: (process.env.NODE_ENV === "production" || process.env.NODE_ENV === "drgyprod" || process.env.NODE_ENV === "drprod") ?  `${window.dasConfig.protocol}${window.dasConfig.ip}${window.dasConfig.port ? ':'+window.dasConfig.port : ''}${window.dasConfig.prodApi ? window.dasConfig.prodApi : ''}` : process.env.VUE_APP_BASE_API,
+  baseURL: (process.env.NODE_ENV === "production") ?  `${window.dasConfig.protocol}${window.dasConfig.ip}${window.dasConfig.port ? ':'+window.dasConfig.port : ''}${window.dasConfig.prodApi ? window.dasConfig.prodApi : ''}` : process.env.VUE_APP_BASE_API,
   // 超时
   timeout: 10000
 })
diff --git a/src/views/bigScreen/v3/profile/mapWrap.vue b/src/views/bigScreen/v3/profile/mapWrap.vue
index 8fdeb0be..19ec8ce9 100644
--- a/src/views/bigScreen/v3/profile/mapWrap.vue
+++ b/src/views/bigScreen/v3/profile/mapWrap.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="big-map-wrap">
     <nav-temp htmlType="t3" title="">
-      <div class="center-wrap" slot="mk-center">
+      <div slot="mk-center" class="center-wrap">
         <div class="alarm-census-wrap">
             <div class="census-block">
               <img src="@/assets/images/big/v3/iconG.png" />
@@ -15,15 +15,15 @@
             </div>
           </div>
         <amap-wrap
+          ref="bigscLocationMap"
           :mapCenter="{
             lng: 116.397428,
             lat: 39.90923,
             address: '',
           }"
-          style="position: relative;top: -45px;"
-          ref="bigscLocationMap"
           :projectList="projectList"
           :selectProjectId="selectProjectId"
+          style="position: relative;top: -45px;"
         ></amap-wrap>
       </div>
     </nav-temp>
@@ -215,13 +215,14 @@ export default {
     .alarm-census-wrap {
         display: flex;
         width: 100%;
-        color: #fff;
+        color: #000;
+        font-weight: bold;
         align-items: center;
         padding-left: 20px;
         z-index: 999;
         height: 46px;
         position: relative;
-        background: rgba(0,0,0,0.5000);
+        //background: rgba(0,0,0,0.5000);
         .census-block {
           // width: 50%;
           display: flex;