Merge branch 'dev'

src/components/app-rich-text-editor/app-rich-text-editor.vue

@@ -72,7 +72,7 @@ export default class AppRichTextEditor extends Vue {
      * @type {string}
      * @memberof AppRichTextEditor
      */
-    public uploadUrl = Environment.BaseUrl + Environment.UploadFile;
+    public uploadUrl = Environment.UploadFile;
 
     /**
      * 下载路径

src/components/app-user/app-user.vue

@@ -92,7 +92,7 @@ export default class AppUser extends Vue {
      * @memberof AppUser
      */
     public logout() {
-        const get: Promise<any> = this.$http.get('v7/logout');
+        const get: Promise<any> = this.$http.get('/v7/logout');
         get.then((response:any) =>{
             if (response && response.status === 200) {
                 localStorage.removeItem('user');

src/components/dropdown-list-mpicker/dropdown-list-mpicker.vue

@@ -185,7 +185,7 @@ export default class DropDownListMpicker extends Vue {
       if(this.tag && Object.is(this.codelistType,"STATIC")){
           const codelist = this.$store.getters.getCodeList(this.tag);
           if (codelist) {
-              this.items = [...JSON.parse(JSON.stringify(codelist.items))];
+            this.items = [...JSON.parse(JSON.stringify(codelist.items))];
           } else {
               console.log(`----${this.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
           }
@@ -197,7 +197,7 @@ export default class DropDownListMpicker extends Vue {
           let _context = data.context;
           let _param = data.param;
           this.codeListService.getItems(this.tag,_context,_param).then((res:any) => {
-              this.items = res;
+            this.items = res;
           }).catch((error:any) => {
               console.log(`----${this.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
           });
@@ -225,7 +225,6 @@ export default class DropDownListMpicker extends Vue {
             });
         }
     }
-
 }
 </script>
 

src/components/login/login.vue

@@ -175,7 +175,7 @@ export default class Login extends Vue {
 
         const loginname: any = this.form.loginname;
         const password: any = this.form.password;
-        const post: Promise<any> = this.$http.post('v7/login', this.form, true);
+        const post: Promise<any> = this.$http.post('/v7/login', this.form, true);
         post.then((response: any) => {
             if (response && response.status === 200) {
                 const data = response.data;

src/service/entity-service.ts

@@ -963,7 +963,7 @@ export default class EntityService {
      * @param isloading 
      */
     public async getAllApp(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        return Http.getInstance().get(`uaa/access-center/app-switcher/default`,data,isloading);
+        return Http.getInstance().get(`/uaa/access-center/app-switcher/default`,data,isloading);
     }
 
     /**
@@ -974,7 +974,7 @@ export default class EntityService {
      * @param isloading 
      */
     public async updateChooseApp(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        return Http.getInstance().put(`uaa/access-center/app-switcher/default`,data,isloading);
+        return Http.getInstance().put(`/uaa/access-center/app-switcher/default`,data,isloading);
     }
 
     /**
@@ -985,7 +985,7 @@ export default class EntityService {
      * @param isloading 
      */
     public async changPassword(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        return Http.getInstance().post(`v7/changepwd`,data,isloading);
+        return Http.getInstance().post(`/v7/changepwd`,data,isloading);
     }
 
 }
\ No newline at end of file

src/store/getters.ts

@@ -77,19 +77,6 @@ export const getViewSplit = (state: any) => (viewUID: string) => {
   return state.viewSplit[viewUID];
 }
 
-/**
- * 获取拷贝数据
- * 
- * @param state 
- */
-export const getCopyData = (state: any) => (srfkey: string) => {
-  let copyData = state.copyDataMap[srfkey];
-  if(copyData){
-      delete state.copyDataMap[srfkey];
-  }
-  return copyData;
-}
-
 /**
  * 获取单位数据
  * 

src/store/mutations.ts

@@ -255,18 +255,6 @@ export const setViewSplit = (state: any, args: {viewSplit: number,viewUID:string
   state.viewSplit[args.viewUID] = args.viewSplit;
 }
 
-/**
- * 添加拷贝数据
- * 
- * @param state 
- * @param localdata 
- */
-export const addCopyData = (state: any, args: {srfkey: string,copyData: any}) => {
-  if(args && args.srfkey && args.copyData){
-      state.copyDataMap[args.srfkey] = JSON.parse(JSON.stringify(args.copyData));
-  }
-}
-
 /**
  * 添加单位数据
  * 

src/store/state.ts

@@ -13,7 +13,6 @@ export const rootstate: any = {
     localdata: {},
     zIndex: 300,
     viewSplit: {},
-    copyDataMap:{},
     orgDataMap:{},
     depDataMap:{},
 }
\ No newline at end of file

src/utils/interceptor/interceptor.ts

@@ -2,8 +2,7 @@ import { Store } from 'vuex';
 import axios from 'axios';
 import Router from 'vue-router';
 import i18n from '@/locale';
-
-
+import { Environment } from '@/environments/environment';
 /**
  * 拦截器
  *
@@ -96,9 +95,9 @@ export class Interceptors {
                 config.headers['Authorization'] = `Bearer ${token}`;
             }
             config.headers['Accept-Language'] =  i18n.locale;
-            // if (!config.url.startsWith('https://') && !config.url.startsWith('http://')) {
-            //     config.url = Environment.BaseUrl + config.url;
-            // }
+            if (!Object.is(Environment.BaseUrl,"") && !config.url.startsWith('https://') && !config.url.startsWith('http://') && !config.url.startsWith('./assets')) {
+                config.url = Environment.BaseUrl + config.url;
+            }
             return config;
         }, (error: any) => {
             return Promise.reject(error);