请求携带页面权限id

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

@@ -124,73 +124,61 @@
   </div>
 </template>
 <script setup lang="ts">
-import DataTable from "@/components/tableTemp/index.vue";
-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([]); //表头数据
-const serviceId = ref<String>("");
-const tableObj = ref({}); //增删改数据缓存
-const flag = ref<Boolean>(false); //弹窗开关
-const type = ref<String>(""); //判断是否删除
-const msgTitle = ref<String>("新增航司信息维护"); //弹窗标题
-const tableColsCopys = reactive<Object>({}); //弹窗
+import DataTable from '@/components/tableTemp/index.vue'
+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(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(false) //弹窗开关
+const type = ref('') //判断是否删除
+const msgTitle = ref('新增航司信息维护') //弹窗标题
 const tableForm = reactive({
-  fullName: "",
-  abbreviation: "",
-  englishAbbreviation: "",
-  ITATCode: "",
-  ICAOCode: "",
-  remarks: "",
-  event: "",
-  airlineCompanyID: "",
-  englishFullName: "",
-}); //弹窗内容
+  fullName: '',
+  abbreviation: '',
+  englishAbbreviation: '',
+  ITATCode: '',
+  ICAOCode: '',
+  remarks: '',
+  event: <number | string>'',
+  airlineCompanyID: '',
+  englishFullName: '',
+}) //弹窗内容
 //列表
-const tableData = ref([]);
-//表头
-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: "编辑",
-    className: "editBtn",
+    name: '编辑',
+    className: 'editBtn',
     param: 2,
-    is: "airline_editor_button",
+    is: 'airline_editor_button',
   },
   {
-    name: "删除",
-    className: "delBtn",
+    name: '删除',
+    className: 'delBtn',
     param: 3,
-    is: "airlines_delete_button",
+    is: 'airlines_delete_button',
   },
-]);
+])
 //新增
 const addForm = () => {
-  msgTitle.value = "新增航司信息维护";
-  tableForm.event = 1;
-  flag.value = true;
-  type.value = "";
-};
+  msgTitle.value = '新增航司信息维护'
+  tableForm.event = 1
+  flag.value = true
+  type.value = ''
+}
 //取消
 const resetForm = () => {
   airlineCompanyForm.value?.resetFields()
-  flag.value = false;
+  flag.value = false
   // tableForm.fullName = "";
   // tableForm.abbreviation = "";
   // tableForm.englishAbbreviation = "";
@@ -199,51 +187,51 @@ const resetForm = () => {
   // tableForm.remarks = "";
   // tableForm.airlineCompanyID = "";
   // tableForm.englishFullName = "";
-};
+}
 //编辑-删除
 const btnClick = (row, index, param) => {
   if (param === 2) {
-    msgTitle.value = "编辑航司信息维护";
-    flag.value = true;
-    type.value = "";
-    tableForm.event = 2;
-    tableForm.fullName = index.fullName;
-    tableForm.abbreviation = index.abbreviation;
-    tableForm.englishAbbreviation = index.englishAbbreviation;
-    tableForm.ITATCode = index.ITATCode;
-    tableForm.ICAOCode = index.ICAOCode;
-    tableForm.remarks = index.remarks;
-    tableForm.airlineCompanyID = index.airlineCompanyID;
-    tableForm.englishFullName = index.englishFullName;
+    msgTitle.value = '编辑航司信息维护'
+    flag.value = true
+    type.value = ''
+    tableForm.event = 2
+    tableForm.fullName = index.fullName
+    tableForm.abbreviation = index.abbreviation
+    tableForm.englishAbbreviation = index.englishAbbreviation
+    tableForm.ITATCode = index.ITATCode
+    tableForm.ICAOCode = index.ICAOCode
+    tableForm.remarks = index.remarks
+    tableForm.airlineCompanyID = index.airlineCompanyID
+    tableForm.englishFullName = index.englishFullName
   } else if (param === 3) {
-    msgTitle.value = "删除航司信息维护";
-    flag.value = true;
-    type.value = "del";
-    tableForm.event = 3;
-    tableForm.fullName = index.fullName;
-    tableForm.abbreviation = index.abbreviation;
-    tableForm.englishAbbreviation = index.englishAbbreviation;
-    tableForm.ITATCode = index.ITATCode;
-    tableForm.ICAOCode = index.ICAOCode;
-    tableForm.remarks = index.remarks;
-    tableForm.airlineCompanyID = index.airlineCompanyID;
+    msgTitle.value = '删除航司信息维护'
+    flag.value = true
+    type.value = 'del'
+    tableForm.event = 3
+    tableForm.fullName = index.fullName
+    tableForm.abbreviation = index.abbreviation
+    tableForm.englishAbbreviation = index.englishAbbreviation
+    tableForm.ITATCode = index.ITATCode
+    tableForm.ICAOCode = index.ICAOCode
+    tableForm.remarks = index.remarks
+    tableForm.airlineCompanyID = index.airlineCompanyID
   } else if (param === 4) {
   }
-};
+}
 //删除
 const eleDialog = () => {
-  msgTitle.value = "删除航司信息维护";
-  flag.value = true;
-  type.value = "del";
-};
+  msgTitle.value = '删除航司信息维护'
+  flag.value = true
+  type.value = 'del'
+}
 const delRemove = () => {
-  tableForm.event = 3;
-  generalDataReception(tableForm);
-};
+  tableForm.event = 3
+  generalDataReception(tableForm)
+}
 //删除
 const delRest = () => {
-  flag.value = false;
-};
+  flag.value = false
+}
 //获取表格数据
 const getQuery = async () => {
   try {
@@ -251,89 +239,87 @@ const getQuery = async () => {
       id: DATACONTENT_ID.airlineTableId,
       needPage: ++page.value,
       dataContent: Object.values(dataContent.value),
-    });
-    if (code === "0") {
+    })
+    if (code === '0') {
       if (returnData.listValues.length === 0) {
-        page.value--;
-        noMore.value = true;
+        page.value--
+        noMore.value = true
       }
-      const titleColumn = returnData.columnSet.find(
-        (item) => item.needShow === 1
-      );
+      const titleColumn = returnData.columnSet.find(item => item.needShow === 1)
       if (titleColumn) {
-        rowTitle.value = titleColumn.columnName;
+        rowTitle.value = titleColumn.columnName
       }
-      tableData.value.push(...returnData.listValues);
-      tableCols.value = returnData.columnSet;
-      tableCols.value.forEach((element) => {
-        element.label = element.columnLabel;
-        element.key = element.columnName;
+      tableData.value.push(...returnData.listValues)
+      tableCols.value = returnData.columnSet
+      tableCols.value.forEach(element => {
+        element.label = element.columnLabel
+        element.key = element.columnName
         // if (element.columnName === "queryTemplate") {
         //   element.width = "300px";
         // }
-      });
-      serviceId.value = returnData.submitID;
+      })
+      serviceId.value = returnData.submitID!
     } else {
-      page.value--;
+      page.value--
     }
   } catch (error) {
-    page.value--;
+    page.value--
   }
-};
+}
 //确认提交
-const airlineCompanyForm: any = ref(null);
+const airlineCompanyForm: any = ref(null)
 const submitForm = () => {
   airlineCompanyForm.value.validate((valid: any) => {
     if (valid) {
-      generalDataReception(tableForm);
+      generalDataReception(tableForm)
     } else {
-      return false;
+      return false
     }
-  });
-};
+  })
+}
 const resetTable = () => {
-  page.value = 0;
-  noMore.value = false;
-  tableData.value = [];
-};
+  page.value = 0
+  noMore.value = false
+  tableData.value = []
+}
 //新增-编辑-删除
-const generalDataReception = async (data) => {
+const generalDataReception = async data => {
   try {
     data = {
       ...data,
-    };
+    }
     const { code } = await GeneralDataReception({
       serviceId: serviceId.value,
       dataContent: JSON.stringify(data),
-    });
+    })
     if (code == 0) {
-      ElMessage.success(`操作成功`);
+      ElMessage.success(`操作成功`)
       // this.$message.success("操作成功");
-      resetTable();
-      getQuery();
-      resetForm();
-      flag.value = false;
+      resetTable()
+      getQuery()
+      resetForm()
+      flag.value = false
       // rmFlag.value = false;
-      tableObj.value = {};
+      tableObj.value = {}
       // this.$router.go(0);
     } else {
-      ElMessage.error(`操作失败`);
+      ElMessage.error(`操作失败`)
       // this.$message.error("操作失败");
       // this.flag = false;
       // this.rmFlag = false;
-      tableObj.value = {};
-      resetForm();
+      tableObj.value = {}
+      resetForm()
     }
   } catch (error) {
-    flag.value = false;
+    flag.value = false
     //  rmFlag.value = false;
-    tableObj.value = {};
-    resetForm();
+    tableObj.value = {}
+    resetForm()
   }
-};
+}
 onMounted(() => {
-  getQuery();
-});
+  getQuery()
+})
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {

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";