diff --git a/src/apis/apiManage.js b/src/apis/apiManage.js index d697a63..8a00ac9 100644 --- a/src/apis/apiManage.js +++ b/src/apis/apiManage.js @@ -92,9 +92,9 @@ export function modelAllList(pageNum, pageSize) { * @param {*} * @returns data */ -export function personMouldIdList() { +export function personMouldIdList(id) { return request({ - url: `/serviceInfo/personMouldIdList`, + url: `/serviceInfo/personMouldIdList?serviceId=${id || ''}`, method: 'get' }) } diff --git a/src/apis/home.js b/src/apis/home.js index f6f31b2..0dca0f7 100644 --- a/src/apis/home.js +++ b/src/apis/home.js @@ -1,3 +1,10 @@ +/* + * @Autor: Chutingting + * @Date: 2023-11-11 19:15:01 + * @LastEditors: Chutingting + * @LastEditTime: 2023-11-13 10:28:20 + * @Description: + */ import request from "@/utils/request.js"; /** * @description:用户角色 @@ -54,8 +61,9 @@ export function privateDeployAdminCurrent() { * @return: */ export function videoListApi(pageNum, pageSize) { + let api = localStorage.getItem("isAdmin") === '0' ? '/serviceInfo/currentVideoRecords' : '/serviceInfo/privateDeployAdminCurrentVideoRecords' return request({ - url: `/serviceInfo/privateDeployAdminCurrentVideoRecords?pageNum=${pageNum}&pageSize=${pageSize}`, + url: `${api}?pageNum=${pageNum}&pageSize=${pageSize}`, method: 'get', }) } diff --git a/src/layout/index.vue b/src/layout/index.vue index c740a7e..135a808 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -22,7 +22,7 @@ 首页 - + API接入方管理 diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 438210f..72d806d 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -25,7 +25,6 @@ export const useUserStore = defineStore("user", () => { * @returns */ function login(loginData: LoginData) { - debugger return new Promise((resolve, reject) => { loginApi(loginData) .then((response) => { diff --git a/src/types/components.d.ts b/src/types/components.d.ts index 9e33598..869d3c2 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -8,6 +8,7 @@ export {} declare module '@vue/runtime-core' { export interface GlobalComponents { Breadcrumb: typeof import('./../components/Breadcrumb/index.vue')['default'] + copy: typeof import('./../components/EditPosition copy.vue')['default'] CutImg: typeof import('./../components/cutImg.vue')['default'] CutImg1: typeof import('./../components/cutImg1.vue')['default'] EditPosition: typeof import('./../components/EditPosition.vue')['default'] diff --git a/src/views/apiManage/index.vue b/src/views/apiManage/index.vue index 4bd4b74..2e395a8 100644 --- a/src/views/apiManage/index.vue +++ b/src/views/apiManage/index.vue @@ -465,7 +465,7 @@ const addAccount = async (refForm) => { pageSize.value = 10; } catch (error) { console.log(error, "err"); - ElMessage.error(error.message); + ElMessage.error(error); } } else { ElMessage.error("请完善信息!"); diff --git a/src/views/apiManage/model.vue b/src/views/apiManage/model.vue index 1b28ee6..556f43d 100644 --- a/src/views/apiManage/model.vue +++ b/src/views/apiManage/model.vue @@ -97,7 +97,8 @@ const handleCurrentChange = (val) => { const modelAllListFunc = async (PageNum, PageSize) => { try { const res = await modelAllList(PageNum, PageSize); - const modelIds = await personMouldIdList(); + debugger + const modelIds = await personMouldIdList(props.serviceId); let idIndx = [] if(modelIds.data && modelIds.data.length > 0) { res.data.list.forEach((ele, idx) => { diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 23aff32..a5b6ce1 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1224,7 +1224,7 @@ async function doLogin(data: any) { console.log(err, "err"); // 登录失败刷新验证码 getCode(); - ElMessage.error(err.message); + ElMessage.error(err); isLogining.value = false; if (err.code == 2112) { reSendEmail(data.email); diff --git a/src/views/privatization/index.vue b/src/views/privatization/index.vue index 112f287..37f6ceb 100644 --- a/src/views/privatization/index.vue +++ b/src/views/privatization/index.vue @@ -51,7 +51,15 @@ {{ getDate(scope.row.createTime) }} - + + +