Merge branch 'master' of http://120.26.64.82:10880/BFFE/SZYGM1.0

public/baseConfig.js

@@ -23,7 +23,7 @@ switch (baseNewUrl ){
   break;
   case "120.26.64.82":
   case "localhost":
-  PLATFROM_CONFIG.baseNewUrl = "http://120.26.64.82:8083/"
+  PLATFROM_CONFIG.baseNewUrl = "http://120.26.64.82:8084/"
   break;
   default:
   PLATFROM_CONFIG.baseNewUrl = "http://172.23.61.1:8095/"

src/store/user.ts

@@ -6,7 +6,7 @@ import {
   setUserId,
   TokenKey,
 } from '@/utils/auth'
-import { Query } from '@/api/dataIntegration'
+import { Query } from '@/api/webApi'
 import { login, loginUp } from '@/api/newLogin'
 import { ObjTy } from '~/common'
 import router, { constantRoutes, asyncRoutes } from '@/router'
@@ -37,8 +37,11 @@ export const useUserStore = defineStore('user', {
         ? sessionStorage.getItem('User_Id')
         : '',
       userPoewrList: sessionStorage.getItem('userAuthList')
-        ? JSON.parse(sessionStorage.getItem('userAuthList'))
+        ? JSON.parse(sessionStorage.getItem('userAuthList')!)
         : [],
+      authMap: sessionStorage.getItem('authMap')
+        ? JSON.parse(sessionStorage.getItem('authMap')!)
+        : {},
       passwordDialogVisible: false
     }
   },
@@ -80,6 +83,13 @@ export const useUserStore = defineStore('user', {
     SET_UserPoewrList(userPoewrList: any) {
       this.$patch((state) => {
         state.userPoewrList = userPoewrList
+        sessionStorage.setItem('userAuthList', JSON.stringify(userPoewrList))
+      })
+    },
+    SET_AUTH_MAP(authMap: { [x: string]: number }) {
+      this.$patch((state) => {
+        state.authMap = authMap
+        sessionStorage.setItem('authMap', JSON.stringify(authMap))
       })
     },
 
@@ -115,13 +125,15 @@ export const useUserStore = defineStore('user', {
               const datas = listValues
               if (datas && datas.length) {
                 const arrs: any = []
+                const map: { [x: string]: number } = {}
                 for (const item of datas) {
                   if (item.ident) {
                     arrs.push(item.ident)
+                    map[item.ident] = item.authid
                   }
                 }
                 // arrs.push('transit');
-                sessionStorage.setItem('userAuthList', JSON.stringify(arrs))
+                // sessionStorage.setItem('userAuthList', JSON.stringify(arrs))
                 setTimeout(() => {
                   const data = {
                     roles: arrs,
@@ -136,11 +148,12 @@ export const useUserStore = defineStore('user', {
                   this.M_AVATAR(avatar)
                   this.M_roles(roles ? roles : ['admin'])
                   this.SET_UserPoewrList(roles ? roles : ['admin'])
+                  this.SET_AUTH_MAP(map)
                   resolve(data)
                 }, 100)
               } else {
-                const arr: any = []
-                sessionStorage.setItem('userAuthList', arr)
+                // const arr: any = []
+                // sessionStorage.setItem('userAuthList', arr)
                 setTimeout(() => {
                   const data = {
                     roles: this.userPoewrList,

src/utils/axiosReq.ts

@@ -12,6 +12,15 @@ const service: any = axios.create()
 // 请求拦截
 service.interceptors.request.use(
   (request: AxiosReqTy) => {
+    const route = router.currentRoute
+    const data = request.data!
+    const authMap = useUserStore().authMap
+    if (!data.id || data.id !== DATACONTENT_ID.loginId) {
+      const role = route.value.meta?.roles?.[0]
+      if (role && authMap[role]) {
+        request.headers['auth-id'] = authMap[role]
+      }
+    }
     // token setting
     request.headers['token'] = getToken()
     /* download file*/

src/views/BasicsData/airlineCompany/index.vue

@@ -68,43 +68,31 @@ import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
 import { Query, GeneralDataReception } from "@/api/webApi";
 import { ElMessage } from "element-plus";
+
 const formRules = useElement().formRules;
-const page = ref<number>(0); //分页参数
-const dataContent = ref<object>({});
-const noMore = ref<boolean>(false);
-const rowTitle = ref<string>("");
-const tableCols = ref<any>([]); //表头数据
-const serviceId = ref<any>("");
+const page = ref(0); //分页参数
+const dataContent = ref({});
+const noMore = ref(false);
+const rowTitle = ref("");
+const tableCols = ref<any[]>([]); //表头数据
+const serviceId = ref<number | null>(null);
 const tableObj = ref({}); //增删改数据缓存
-const flag = ref<boolean>(false); //弹窗开关
-const type = ref<string>(""); //判断是否删除
-const msgTitle = ref<string>("新增航司信息维护"); //弹窗标题
-const tableColsCopys = reactive<Object>({}); //弹窗
-const tableForm = reactive<any>({
+const flag = ref(false); //弹窗开关
+const type = ref(""); //判断是否删除
+const msgTitle = ref("新增航司信息维护"); //弹窗标题
+const tableForm = reactive({
   fullName: "",
   abbreviation: "",
   englishAbbreviation: "",
   ITATCode: "",
   ICAOCode: "",
   remarks: "",
-  event: "",
+  event: <number | string>"",
   airlineCompanyID: "",
   englishFullName: "",
 }); //弹窗内容
 //列表
-const tableData = ref<any>([]);
-//表头
-const state = reactive({
-  list: [
-    { label: "名称", key: "name" },
-    { label: "中文简称", key: "china" },
-    { label: "英文简称", key: "englin" },
-    { label: "航司二字码", key: "two" },
-    { label: "航司三字码", key: "three" },
-    { label: "备注", key: "text" },
-  ],
-  listLoading: true,
-});
+const tableData = ref<any[]>([]);
 const tableBtnGroup = ref([
   {
     name: "编辑",
@@ -211,7 +199,7 @@ const getQuery = async () => {
         //   element.width = "300px";
         // }
       });
-      serviceId.value = returnData.submitID;
+      serviceId.value = returnData.submitID!;
     } else {
       page.value--;
     }

src/views/statisticalanalysis/components/echart/statisticsHeader.vue

@@ -124,7 +124,7 @@
 </template>
 
 <script>
-import { Query } from "@/api/dataIntegration";
+import { Query } from "@/api/webApi";
 import { Format } from "@/utils/validate";
 export default {
   name: "StatisticsHeader",

src/views/userManagement/account/auth.vue

@@ -136,7 +136,7 @@
 
 <script setup lang="ts">
 import { ref, reactive, onBeforeMount } from "vue";
-import { GeneralDataReception, Query } from "@/api/dataIntegration";
+import { GeneralDataReception, Query } from "@/api/webApi";
 import { ElMessage } from "element-plus";
 import Dialog from "@/components/dialog/index.vue";
 const route = useRoute();

src/views/userManagement/account/index.vue

@@ -50,7 +50,7 @@ import Table from "@/components/tableTemp/index.vue";
 import Search from "@/components/search/index.vue";
 import Dialog from "@/components/dialog/index.vue";
 import { translateDataToTreeAll } from "@/utils/validate";
-import { GeneralDataReception, Query } from "@/api/dataIntegration";
+import { GeneralDataReception, Query } from "@/api/webApi";
 import * as _ from "lodash";
 import MD5 from "blueimp-md5";
 import table from "../hooks/useTable";

src/views/userManagement/hooks/useTable.ts

@@ -1,6 +1,6 @@
 import { ref } from 'vue'
 import { ElMessage } from 'element-plus'
-import { GeneralDataReception, Query } from '@/api/dataIntegration'
+import { GeneralDataReception, Query } from '@/api/webApi'
 import { IdType } from '../type'
 const tableHeader = ref<any>([])
 const tableData = ref<any>([])

src/views/userManagement/hooks/useTree.ts

@@ -1,4 +1,4 @@
-import { Query } from '@/api/dataIntegration'
+import { Query } from '@/api/webApi'
 import { translateDataToTreeAll } from '@/utils/validate'
 import { ref } from 'vue'
 import * as _ from 'lodash'

src/views/userManagement/permission/index.vue

@@ -108,7 +108,7 @@ import { ref, reactive, onBeforeMount } from "vue";
 import { CloseBold } from "@element-plus/icons-vue";
 import Dialog from "@/components/dialog/index.vue";
 import { ElMessage, FormInstance, FormRules } from "element-plus";
-import { GeneralDataReception } from "@/api/dataIntegration";
+import { GeneralDataReception } from "@/api/webApi";
 import * as _ from "lodash";
 import tree from "../hooks/useTree";
 //当前选中数据

src/views/userManagement/role/auth.vue

@@ -78,7 +78,7 @@
 
 <script setup lang="ts">
 import { ref, onBeforeMount, watch } from "vue";
-import { Query, GeneralDataReception } from "@/api/dataIntegration";
+import { Query, GeneralDataReception } from "@/api/webApi";
 import { translateDataToTreeAll } from "@/utils/validate";
 import { ElMessage, ElTree } from "element-plus";
 import tree from "../hooks/useTree";

src/views/userManagement/role/auth1.vue

@@ -78,7 +78,7 @@
 
 <script setup lang="ts">
 import { ref, onBeforeMount, watch } from "vue";
-import { Query, GeneralDataReception } from "@/api/dataIntegration";
+import { Query, GeneralDataReception } from "@/api/webApi";
 import { translateDataToTreeAll } from "@/utils/validate";
 import { ElMessage, ElTree } from "element-plus";
 import tree from "../hooks/useTree";