From 102c6b52a4291fee288fe34f790465bbc4274b88 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Thu, 25 Apr 2024 17:29:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=97=E7=BD=91=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/.env.production-nw               | 10 +++
 sgzb-ui/package.json                     |  5 +-
 sgzb-ui/src/layout/components/Navbar.vue | 77 ++++++++++++------------
 sgzb-ui/src/permission.js                | 14 +++--
 sgzb-ui/src/router/index.js              | 11 ++--
 sgzb-ui/src/utils/request.js             | 68 +++++++++++----------
 sgzb-ui/vue.config.js                    | 16 ++---
 7 files changed, 112 insertions(+), 89 deletions(-)
 create mode 100644 sgzb-ui/.env.production-nw

diff --git a/sgzb-ui/.env.production-nw b/sgzb-ui/.env.production-nw
new file mode 100644
index 00000000..b43eed8f
--- /dev/null
+++ b/sgzb-ui/.env.production-nw
@@ -0,0 +1,10 @@
+# 南网系统配置
+
+# 页面标题
+VUE_APP_TITLE = 施工装备管理系统
+
+# 生产环境配置
+ENV = 'production-nw'
+
+# 若依管理系统/生产环境
+VUE_APP_BASE_API = '/gl/dev-api'
diff --git a/sgzb-ui/package.json b/sgzb-ui/package.json
index 2a39c062..72002b96 100644
--- a/sgzb-ui/package.json
+++ b/sgzb-ui/package.json
@@ -5,9 +5,10 @@
   "author": "机具",
   "license": "MIT",
   "scripts": {
-    "dev": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
-    "build": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+    "dev": "vue-cli-service serve",
+    "build": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
+    "build:prod-nw": "vue-cli-service build --mode production-nw",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"
   },
diff --git a/sgzb-ui/src/layout/components/Navbar.vue b/sgzb-ui/src/layout/components/Navbar.vue
index 6ee018f6..08de724b 100644
--- a/sgzb-ui/src/layout/components/Navbar.vue
+++ b/sgzb-ui/src/layout/components/Navbar.vue
@@ -1,34 +1,37 @@
 <template>
   <div class="navbar">
-    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+    <hamburger
+      id="hamburger-container"
+      :is-active="sidebar.opened"
+      class="hamburger-container"
+      @toggleClick="toggleSideBar"
+    />
 
-    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
-    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
+    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav" />
+    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" />
 
     <div class="right-menu">
-      <template v-if="device!=='mobile'">
+      <template v-if="device !== 'mobile'">
         <search id="header-search" class="right-menu-item" />
 
+        <!--        <el-tooltip content="源码地址" effect="dark" placement="bottom">-->
+        <!--          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />-->
+        <!--        </el-tooltip>-->
 
-<!--        <el-tooltip content="源码地址" effect="dark" placement="bottom">-->
-<!--          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />-->
-<!--        </el-tooltip>-->
-
-<!--        <el-tooltip content="文档地址" effect="dark" placement="bottom">-->
-<!--          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />-->
-<!--        </el-tooltip>-->
+        <!--        <el-tooltip content="文档地址" effect="dark" placement="bottom">-->
+        <!--          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />-->
+        <!--        </el-tooltip>-->
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
         <el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip>
-
       </template>
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar">
+          <img :src="avatar" class="user-avatar" />
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
@@ -67,14 +70,10 @@ export default {
     SizeSelect,
     Search,
     RuoYiGit,
-    RuoYiDoc
+    RuoYiDoc,
   },
   computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar',
-      'device'
-    ]),
+    ...mapGetters(['sidebar', 'avatar', 'device']),
     setting: {
       get() {
         return this.$store.state.settings.showSettings
@@ -82,15 +81,15 @@ export default {
       set(val) {
         this.$store.dispatch('settings/changeSetting', {
           key: 'showSettings',
-          value: val
+          value: val,
         })
-      }
+      },
     },
     topNav: {
       get() {
         return this.$store.state.settings.topNav
-      }
-    }
+      },
+    },
   },
   methods: {
     toggleSideBar() {
@@ -100,15 +99,19 @@ export default {
       this.$confirm('确定注销并退出系统吗？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.$store.dispatch('LogOut').then(() => {
-          location.href = '/login';
-          // location.href = '/gl/login';
+        type: 'warning',
+      })
+        .then(() => {
+          this.$store.dispatch('LogOut').then(() => {
+            // location.href = '/login';
+            // location.href = '/gl/login';
+
+            location.href = process.env.NODE_ENV === 'production-nw' ? '/gl/login' : '/login'
+          })
         })
-      }).catch(() => {});
-    }
-  }
+        .catch(() => {})
+    },
+  },
 }
 </script>
 
@@ -118,18 +121,18 @@ export default {
   overflow: hidden;
   position: relative;
   background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+  box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
 
   .hamburger-container {
     line-height: 46px;
     height: 100%;
     float: left;
     cursor: pointer;
-    transition: background .3s;
-    -webkit-tap-highlight-color:transparent;
+    transition: background 0.3s;
+    -webkit-tap-highlight-color: transparent;
 
     &:hover {
-      background: rgba(0, 0, 0, .025)
+      background: rgba(0, 0, 0, 0.025);
     }
   }
 
@@ -166,10 +169,10 @@ export default {
 
       &.hover-effect {
         cursor: pointer;
-        transition: background .3s;
+        transition: background 0.3s;
 
         &:hover {
-          background: rgba(0, 0, 0, .025)
+          background: rgba(0, 0, 0, 0.025);
         }
       }
     }
diff --git a/sgzb-ui/src/permission.js b/sgzb-ui/src/permission.js
index cb27f303..ef95de94 100644
--- a/sgzb-ui/src/permission.js
+++ b/sgzb-ui/src/permission.js
@@ -8,7 +8,7 @@ import { isRelogin } from '@/utils/request'
 
 NProgress.configure({ showSpinner: false })
 
-const whiteList = ['/login', '/register','/auth/sendCode','/qrCode/qrCodePage']
+const whiteList = ['/login', '/register', '/auth/sendCode', '/qrCode/qrCodePage']
 
 router.beforeEach((to, from, next) => {
   NProgress.start()
@@ -30,12 +30,14 @@ router.beforeEach((to, from, next) => {
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
           })
         }).catch(err => {
-            store.dispatch('LogOut').then(() => {
-              Message.error(err)
-              next({ path: '/login' })
-              // next({ path: '/gl/login' })
-            })
+          store.dispatch('LogOut').then(() => {
+            Message.error(err)
+            // next({ path: '/login' })
+            // next({ path: '/gl/login' })
+
+            next({ path: process.env.NODE_ENV === 'production-nw' ? '/gl/login' : '/login' })
           })
+        })
       } else {
         next()
       }
diff --git a/sgzb-ui/src/router/index.js b/sgzb-ui/src/router/index.js
index 597d8409..47487f73 100644
--- a/sgzb-ui/src/router/index.js
+++ b/sgzb-ui/src/router/index.js
@@ -83,7 +83,7 @@ export const constantRoutes = [
         path: 'dashboard',
         component: () => import('@/views/dashboard'),
         name: 'Dashboard',
-        meta: { title: '数据大屏', icon: 'dashboard', breadcrumb: false}
+        meta: { title: '数据大屏', icon: 'dashboard', breadcrumb: false }
       }
     ]
   },
@@ -100,13 +100,13 @@ export const constantRoutes = [
         meta: { title: '个人中心', icon: 'user' }
       }
     ]
-  },  
+  },
   {
     path: '/qrCode/qrCodePage',
     component: () => import('@/views/qrCode/qrCode'),
     hidden: true
 
-    
+
   }
 ]
 
@@ -200,5 +200,8 @@ export default new Router({
   // base:'/gl/',
   mode: 'history', // 去掉url中的#
   scrollBehavior: () => ({ y: 0 }),
-  routes: constantRoutes
+  routes: constantRoutes,
+  base: process.env.NODE_ENV === 'production-nw' ? '/gl' : ''
+
 })
+
diff --git a/sgzb-ui/src/utils/request.js b/sgzb-ui/src/utils/request.js
index f0a9eb65..46989bb0 100644
--- a/sgzb-ui/src/utils/request.js
+++ b/sgzb-ui/src/utils/request.js
@@ -67,47 +67,49 @@ service.interceptors.request.use(config => {
   }
   return config
 }, error => {
-    console.log(error)
-    Promise.reject(error)
+  console.log(error)
+  Promise.reject(error)
 })
 
 // 响应拦截器
 service.interceptors.response.use(res => {
-    // 未设置状态码则默认成功状态
-    const code = res.data.code || 200;
-    // 获取错误信息
-    const msg = errorCode[code] || res.data.msg || errorCode['default']
-    // 二进制数据则直接返回
-    if (res.request.responseType ===  'blob' || res.request.responseType ===  'arraybuffer') {
-      return res.data
-    }
-    if (code === 401) {
-      if (!isRelogin.show) {
-        isRelogin.show = true;
-        MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
-          isRelogin.show = false;
-          store.dispatch('LogOut').then(() => {
-            location.href = '/login';
-            // location.href = '/gl/login';
-          })
+  // 未设置状态码则默认成功状态
+  const code = res.data.code || 200;
+  // 获取错误信息
+  const msg = errorCode[code] || res.data.msg || errorCode['default']
+  // 二进制数据则直接返回
+  if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
+    return res.data
+  }
+  if (code === 401) {
+    if (!isRelogin.show) {
+      isRelogin.show = true;
+      MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
+        isRelogin.show = false;
+        store.dispatch('LogOut').then(() => {
+          // location.href = '/login';
+          // location.href = '/gl/login';
+
+          location.href = process.env.NODE_ENV === 'production-nw' ? '/gl/login' : '/login'
+        })
       }).catch(() => {
         isRelogin.show = false;
       });
     }
-      return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
-    } else if (code === 500) {
-      Message({ message: msg, type: 'error' })
-      return Promise.reject(new Error(msg))
-    } else if (code === 601) {
-      Message({ message: msg, type: 'warning' })
-      return Promise.reject('error')
-    } else if (code !== 200) {
-      Notification.error({ title: msg })
-      return Promise.reject('error')
-    } else {
-      return res.data
-    }
-  },
+    return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
+  } else if (code === 500) {
+    Message({ message: msg, type: 'error' })
+    return Promise.reject(new Error(msg))
+  } else if (code === 601) {
+    Message({ message: msg, type: 'warning' })
+    return Promise.reject('error')
+  } else if (code !== 200) {
+    Notification.error({ title: msg })
+    return Promise.reject('error')
+  } else {
+    return res.data
+  }
+},
   error => {
     console.log('err' + error)
     let { message } = error;
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index 7bdc90ee..35919c2c 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -14,11 +14,13 @@ const port = process.env.port || process.env.npm_config_port || 80 // 端口
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
 // 这里只列一部分，具体配置参考文档
+
+
 module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === 'production' ? '/' : '/', ///gl/
+  publicPath: process.env.NODE_ENV === 'production-nw' ? '/gl' : '/', ///gl/
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
@@ -42,11 +44,11 @@ module.exports = {
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        target: `http://10.40.92.8:8080`, //超
+        // target: `http://10.40.92.8:8080`, //超
         // target: `http://10.40.92.81:8080`, //韩/
         // target: `http://10.40.92.74:8080`,//旭/
         // target: `http://10.40.92.153:8080`, //帅
-        // target: `http://10.40.92.14:8080`, //福
+        target: `http://10.40.92.14:28080`, //福
 
         //******** 注意事项  ********* */
         //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;
@@ -147,10 +149,10 @@ module.exports = {
       })
 
       config.optimization.runtimeChunk('single'),
-        {
-          from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
-          to: './', //到根目录下
-        }
+      {
+        from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
+        to: './', //到根目录下
+      }
     })
   },
 }