pref:修改接口获取

base-manager-ui/admin/.env.development

 #开发环境
 NODE_ENV = "development"
-VUE_APP_API_BASE_URL=http://192.168.0.98:11078/base
+VUE_APP_API_BASE_URL=http://192.168.0.98:11078
 #VUE_APP_API_BASE_URL=http://192.168.0.98:11023
 #VUE_APP_API_BASE_URL=http://192.168.0.217:17311
\ No newline at end of file

base-manager-ui/admin/src/pages/basicset/appmarket/AppPreview.vue

 <template>
   <!-- 应用预览页面 -->
   <div class="app-preview">
-    <!-- <div class="header">
-      <span class="btn" @click="handleBack">
-        <a-icon type="left" class="mr10" />
-        <span>返回上一级</span>
-      </span>
-    </div> -->
-    <!-- <div class="main flex1">
-      <iframe
-        style="width: 100%; height: 100%"
-        :src="previewUrl"
-        frameborder="0"
-      ></iframe>
-    </div> -->
     <iframe
       name="myIframe"
       style="width: 100%; height: 100%"
@@ -28,7 +15,8 @@ export default {
   data() {
     return {
       previewInfo: this.$route.query,
-      previewUrl: "",
+      previewUrl: "http://192.168.0.192:8082",
+      loading: true,
     };
   },
   created() {
@@ -38,7 +26,8 @@ export default {
     sendInfo() {
       let siteId = this.previewInfo.siteId;
       let appId = this.previewInfo.appId;
-      this.previewUrl = `${this.previewInfo.previewUrl}?siteId=${siteId}&appId=${appId}`;
+      let baseUrl = process.env.VUE_APP_API_BASE_URL;
+      this.previewUrl = `${this.previewInfo.previewUrl}?siteId=${siteId}&appId=${appId}&baseUrl=${baseUrl}`;
       /* eslint-disable */
       // myIframe.window.postMessage(obj, "*");
     },
@@ -48,32 +37,8 @@ export default {
 
 <style lang="less" scoped>
 .app-preview {
-  width: 1920px;
-  height: 1080px;
-  // padding-bottom: 20px;
+  width: 100%;
+  height: 100vh;
   background-color: #f5f5f5;
-  // .header {
-  //   width: 100%;
-  //   height: 100px;
-  //   line-height: 100px;
-  //   height: 100px;
-  //   padding: 0px 40px;
-  //   margin-bottom: 10px;
-  //   background: url("../../../assets/img/title.jpg") no-repeat center;
-  //   background-size: 100% 100%;
-  //   box-shadow: 0px 2px 6px 6px #ccc;
-  //   .back-text {
-  //     font-size: 28px;
-  //     color: #ffffff;
-  //   }
-  //   .btn {
-  //     font-size: 28px;
-  //     color: #fff;
-  //     cursor: pointer;
-  //   }
-  // }
-  // .main {
-  //   width: 98%;
-  // }
 }
 </style>
\ No newline at end of file

base-manager-ui/admin/src/pages/basicset/appmarket/components/AppDetailsPage.vue

@@ -168,9 +168,7 @@ export default {
       },
     ];
     return {
-      api: process.env.VUE_APP_API_BASE_URL.includes("base")
-        ? process.env.VUE_APP_API_BASE_URL.replace("base", "")
-        : process.env.VUE_APP_API_BASE_URL,
+      api: process.env.VUE_APP_API_BASE_URL + "/",
       columns,
       appId: this.$route.query.id,
       appInfo: {}, // 应用信息

base-manager-ui/admin/src/pages/basicset/appmarket/components/TerminalApp.vue

@@ -171,9 +171,7 @@ export default {
   },
   data() {
     return {
-      api: process.env.VUE_APP_API_BASE_URL.includes("base")
-        ? process.env.VUE_APP_API_BASE_URL.replace("base", "")
-        : process.env.VUE_APP_API_BASE_URL,
+      api: process.env.VUE_APP_API_BASE_URL + "/",
       columns,
       siteId: local.getLocal("siteId"),
       tableData: [], // 表格数据

base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddApp.vue

@@ -34,7 +34,7 @@
               list-type="picture-card"
               class="avatar-uploader"
               :show-upload-list="false"
-              :action="api2 + 'file/commonupload'"
+              :action="api + 'base/file/commonupload'"
               :before-upload="iconBeforeUpload"
               @change="handleChangeIcon"
             >
@@ -91,7 +91,7 @@
           >
             <a-upload
               name="file"
-              :action="api2 + 'file/commonupload'"
+              :action="api + 'base/file/commonupload'"
               :multiple="false"
               :file-list="fileList"
               @change="handleChangeFile"
@@ -169,10 +169,7 @@ export default {
   },
   data() {
     return {
-      api: process.env.VUE_APP_API_BASE_URL.includes("base")
-        ? process.env.VUE_APP_API_BASE_URL.replace("base", "")
-        : process.env.VUE_APP_API_BASE_URL,
-      api2: process.env.VUE_APP_API_BASE_URL + "/",
+      api: process.env.VUE_APP_API_BASE_URL + "/",
       labelCol: {
         span: 3,
       },

base-manager-ui/admin/src/pages/basicset/deploy/deploy.vue

@@ -55,10 +55,10 @@
           <template slot="modelIcon" slot-scope="text">
             <div v-if="text.modelIcon">
               <div class="svg-box" v-if="isSvg(text.modelIcon)">
-                <img width="30" height="30" :src="api2 + text.modelIcon" />
+                <img width="30" height="30" :src="api + text.modelIcon" />
               </div>
               <div class="svg-box" v-else>
-                <img width="30" height="30" :src="api2 + text.modelIcon" />
+                <img width="30" height="30" :src="api + text.modelIcon" />
               </div>
             </div>
             <span v-else>--</span>
@@ -166,16 +166,16 @@
               <a-upload
                 name="file"
                 list-type="picture-card"
-                :action="api + 'file/commonupload'"
+                :action="api + 'base/file/commonupload'"
                 @change="handleUpload"
                 :before-upload="beforeUpload"
                 :show-upload-list="false"
               >
                 <div v-if="formData.modelIcon">
                   <div class="svg-box" v-if="isSvg(formData.modelIcon)">
-                    <img :src="api2 + formData.modelIcon" />
+                    <img :src="api + formData.modelIcon" />
                   </div>
-                  <img v-else :src="api2 + formData.modelIcon" />
+                  <img v-else :src="api + formData.modelIcon" />
                 </div>
                 <div v-else>
                   <a-icon :type="loading ? 'loading' : 'plus'" />
@@ -261,9 +261,6 @@ export default {
   data() {
     return {
       api: process.env.VUE_APP_API_BASE_URL + "/",
-      api2: process.env.VUE_APP_API_BASE_URL.includes("base")
-        ? process.env.VUE_APP_API_BASE_URL.replace("base", "")
-        : process.env.VUE_APP_API_BASE_URL,
       columns,
       loading: true,
       title: "新增模块",

base-manager-ui/admin/src/pages/basicset/site/components/addsite.vue

@@ -160,14 +160,14 @@
               list-type="picture-card"
               class="avatar-uploader"
               :show-upload-list="false"
-              :action="api + 'file/commonupload'"
+              :action="api + 'base/file/commonupload'"
               :before-upload="beforeUpload"
               @change="handleChange"
             >
               <img
                 class="logo"
                 v-if="formInfo.logoPath"
-                :src="api2 + formInfo.logoPath"
+                :src="api + formInfo.logoPath"
               />
               <div v-else>
                 <a-icon :type="loading ? 'loading' : 'plus'" />
@@ -307,9 +307,6 @@ export default {
     };
     return {
       api: process.env.VUE_APP_API_BASE_URL + "/",
-      api2: process.env.VUE_APP_API_BASE_URL.includes("base")
-        ? process.env.VUE_APP_API_BASE_URL.replace("base", "")
-        : process.env.VUE_APP_API_BASE_URL,
       loading: false,
       options: regionData, // 地区级联数据
       tablename: "", //接口名称

base-manager-ui/admin/src/pages/basicset/workman/components/EditPersonel.vue

@@ -180,7 +180,6 @@
                 list-type="picture-card"
                 class="avatar-uploader"
                 :show-upload-list="false"
-                :action="api + '/file/commonupload'"
                 :customRequest="uploadImg"
                 :before-upload="beforeUpload"
               >
@@ -322,9 +321,7 @@ export default {
       }
     };
     return {
-      api: process.env.VUE_APP_API_BASE_URL.includes("base")
-        ? process.env.VUE_APP_API_BASE_URL.replace("base", "")
-        : process.env.VUE_APP_API_BASE_URL,
+      api: process.env.VUE_APP_API_BASE_URL + "/",
       loading: false,
       imageUrl: "",
       labelCol: { span: 5 },

base-manager-ui/admin/src/pages/basicset/workman/components/addpersonnel.vue

@@ -185,7 +185,6 @@
                 list-type="picture-card"
                 class="avatar-uploader"
                 :show-upload-list="false"
-                :action="api + '/file/commonupload'"
                 :customRequest="uploadImg"
                 :before-upload="beforeUpload"
               >
@@ -384,9 +383,7 @@ export default {
       }
     };
     return {
-      api: process.env.VUE_APP_API_BASE_URL.includes("base")
-        ? process.env.VUE_APP_API_BASE_URL.replace("base", "")
-        : process.env.VUE_APP_API_BASE_URL,
+      api: process.env.VUE_APP_API_BASE_URL + "/",
       loading: false,
       imageUrl: "",
       labelCol: { span: 5 },

base-manager-ui/admin/src/pages/basicset/workman/personnel.vue

@@ -326,9 +326,7 @@ export default {
       loading: false,
       visibleEditPwd: false,
       editVisible: false,
-      api: process.env.VUE_APP_API_BASE_URL.includes("base")
-        ? process.env.VUE_APP_API_BASE_URL.replace("base", "")
-        : process.env.VUE_APP_API_BASE_URL,
+      api: process.env.VUE_APP_API_BASE_URL + "/",
       siteId: local.getLocal("siteId"),
       deptData: [], // 部门数据
       windowData: [], // 窗口数据

base-manager-ui/admin/src/utils/axios-interceptors.js

 // import Cookie from 'js-cookie'
-import local from '@/utils/local'
-import {message} from 'ant-design-vue'
+import local from "@/utils/local";
+import { message } from "ant-design-vue";
 
 // 401拦截
 // const resp401 = {
@@ -33,25 +33,24 @@ import {message} from 'ant-design-vue'
 //   }
 // }
 
-
 const resMsg = {
   onFulfilled(response) {
-   let {code,msg} = response.data
-   if(code === 9001 || code === 9002){
-    message.error({
-      content:msg,
-      maxCount:1,
-    })
-    setTimeout(()=>{
-      location.href = process.env.VUE_APP_API_portal_URL + "/#/"
-    },2000)
-   }else if(code === -1){
-    message.error({
-      content:msg,
-      maxCount:1,
-    })
-   }
-    return response
+    let { code, msg } = response.data;
+    if (code === 9001 || code === 9002) {
+      message.error({
+        content: msg,
+        maxCount: 1,
+      });
+      setTimeout(() => {
+        location.href = process.env.VUE_APP_API_portal_URL + "/#/";
+      }, 2000);
+    } else if (code === -1) {
+      message.error({
+        content: msg,
+        maxCount: 1,
+      });
+    }
+    return response;
   },
   onRejected(error) {
     // const {message} = options
@@ -59,9 +58,9 @@ const resMsg = {
     // if (response.code === 403) {
     //   message.error('请求被拒绝')
     // }
-    return Promise.reject(error)
-  }
-}
+    return Promise.reject(error);
+  },
+};
 
 const reqCommon = {
   /**
@@ -72,11 +71,11 @@ const reqCommon = {
    */
   onFulfilled(config) {
     // 携带token
-    let token = local.getLocal('token')
-    if(token){
-      config.headers.Authorization=token
+    let token = local.getLocal("token");
+    if (token) {
+      config.headers.Authorization = token;
     }
-    return config
+    return config;
   },
   /**
    * 请求出错时做点什么
@@ -87,12 +86,12 @@ const reqCommon = {
   onRejected(error) {
     // const {message} = options
     // message.error(error.message)
-    return Promise.reject(error)
-  }
-}
+    return Promise.reject(error);
+  },
+};
 
 export default {
   request: [reqCommon], // 请求拦截
   // response: [resp401, resp403] // 响应拦截
-  response: [resMsg] // 响应拦截
-}
+  response: [resMsg], // 响应拦截
+};