From a96acfaa1c7209ecbacb0292152fd94d8ed56c77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 4 Jun 2021 10:54:45 +0800
Subject: [PATCH] commit

---
 src/api/index.js                                            | 2 +-
 src/common/axios/index.js                                   | 6 ++----
 src/pages/details/otherStandardDetails/index.vue            | 1 -
 src/pages/login/index.vue                                   | 4 ++--
 .../domesticStandardsAndRegulations/index.vue               | 6 ++++--
 src/sysConfig/index.js                                      | 4 ++--
 vue.config.js                                               | 2 +-
 7 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 2548daf6f..b55273416 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -36,4 +36,4 @@ export function getRoleAndUserByOrgIdPage (params) {
     method: 'get',
     params
   })
-}
\ No newline at end of file
+}
diff --git a/src/common/axios/index.js b/src/common/axios/index.js
index 7f9ac89d1..8c683defb 100644
--- a/src/common/axios/index.js
+++ b/src/common/axios/index.js
@@ -9,9 +9,7 @@ import store from '@/store'
 import {Message} from 'element-ui'
 export const CancelToken = axios.CancelToken
 // import 'element-ui/lib/theme-chalk/index.css'
-const _axios = axios.create({
-  baseURL: '/'
-})
+const _axios = axios.create()
 
 /**
  * @description: FormData
@@ -65,7 +63,7 @@ _axios.interceptors.response.use(
     }
   })
 function api () {
-  return store.getters.getTypeFlag === 'CloudRepository' ? '/busApi/' : '/api/'
+  return store.getters.getTypeFlag === 'CloudRepository' ? '/busApi/' : ''
 }
 export default {
   _axios,
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 504900654..a7714f971 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -2826,7 +2826,6 @@ export default {
       font-weight: bold;
       color: #e88218;
       margin-top: -80px;
-      background: #E5E5E5;
     }
     /deep/.details-content{
       /*padding: 0 67px;*/
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 33f6fd33f..53de8eff5 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -67,8 +67,8 @@ export default {
     loginUser (userName, PWD) {
       this.loading = true
       // 用户名密码加密
-      // userName = this.$base64(userName)
-      // PWD = this.$base64(PWD)
+      userName = this.$base64(userName)
+      PWD = this.$base64(PWD)
       this.$http.post('login',
         {
           username: userName,
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 5f408417b..cb12ad4c3 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -2493,7 +2493,8 @@ export default {
       formData.standType = 'INLAND'
       this.SarExportSearchEo = formData
       this.loading = true
-      this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', formData, {
+      console.log(2496)
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
         _this: this, loading: 'loading'
       }, res => {
         this.isAdvancedSearch = false
@@ -3612,7 +3613,8 @@ export default {
   },
   async mounted () {
     // 进入页面后查询树形结构目录
-    await this.selectMenu()
+    // await this.selectMenu()
+
     this.treeReload = true
     // 从数据库中查询各下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 52e126b69..f4040b04f 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -4,7 +4,7 @@
  * @date: 2018-09-04 17:47:46
  */
 // 后台地址
-const devIp = '192.168.10.186'
+const devIp = '192.168.10.145'
 const devInterfacePORT = '9999'
 // 服务器地址
 // const devIp = '39.98.140.126'
@@ -42,7 +42,7 @@ const CLOUD_RES_INTERFACE_PORT = process.env.NODE_ENV === 'production' ? DEV_CLO
 
 module.exports = {
     serverUrl: 'http://' + serverIP, // 服务器IP地址
-    interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,
+    interfaceUrl: 'http://' + serverIP + ':' + interfacePORT, // 服务器端接口访问地址,
     cloudResInterFaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/busApi/', // 云端资源库服务器端接口访问地址,
     simpleUploadPath: 'api/' + simpleFilePath, // 单文件上传地址
     multipleUploadPath: 'api/' + multipleFilePath, // 多文件上传地址
diff --git a/vue.config.js b/vue.config.js
index 40b40d896..84f1e541f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -82,7 +82,7 @@ module.exports = {
         target: interfaceUrl,
         changeOrigin: true,
         pathRewrite: {
-          '^/api': ''
+          '^/api': '/'
         }
       },
       '/onlyOffice': {