| @@ -92,9 +92,9 @@ export function modelAllList(pageNum, pageSize) { | |||||
| * @param {*} | * @param {*} | ||||
| * @returns data | * @returns data | ||||
| */ | */ | ||||
| export function personMouldIdList() { | |||||
| export function personMouldIdList(id) { | |||||
| return request({ | return request({ | ||||
| url: `/serviceInfo/personMouldIdList`, | |||||
| url: `/serviceInfo/personMouldIdList?serviceId=${id || ''}`, | |||||
| method: 'get' | method: 'get' | ||||
| }) | }) | ||||
| } | } | ||||
| @@ -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"; | import request from "@/utils/request.js"; | ||||
| /** | /** | ||||
| * @description:用户角色 | * @description:用户角色 | ||||
| @@ -54,8 +61,9 @@ export function privateDeployAdminCurrent() { | |||||
| * @return: | * @return: | ||||
| */ | */ | ||||
| export function videoListApi(pageNum, pageSize) { | export function videoListApi(pageNum, pageSize) { | ||||
| let api = localStorage.getItem("isAdmin") === '0' ? '/serviceInfo/currentVideoRecords' : '/serviceInfo/privateDeployAdminCurrentVideoRecords' | |||||
| return request({ | return request({ | ||||
| url: `/serviceInfo/privateDeployAdminCurrentVideoRecords?pageNum=${pageNum}&pageSize=${pageSize}`, | |||||
| url: `${api}?pageNum=${pageNum}&pageSize=${pageSize}`, | |||||
| method: 'get', | method: 'get', | ||||
| }) | }) | ||||
| } | } | ||||
| @@ -22,7 +22,7 @@ | |||||
| <span>首页</span> | <span>首页</span> | ||||
| </el-menu-item> | </el-menu-item> | ||||
| <!-- 邃芒后台 --> | <!-- 邃芒后台 --> | ||||
| <el-menu-item v-if="isAdmin === '1'" index="2" @click="router.push('/apiManage')"> | |||||
| <el-menu-item v-if="isAdmin === '1' && localDeploy !== 'true' " index="2" @click="router.push('/apiManage')"> | |||||
| <el-icon><i-ep-link /></el-icon> | <el-icon><i-ep-link /></el-icon> | ||||
| <span>API接入方管理</span> | <span>API接入方管理</span> | ||||
| </el-menu-item> | </el-menu-item> | ||||
| @@ -25,7 +25,6 @@ export const useUserStore = defineStore("user", () => { | |||||
| * @returns | * @returns | ||||
| */ | */ | ||||
| function login(loginData: LoginData) { | function login(loginData: LoginData) { | ||||
| debugger | |||||
| return new Promise<void>((resolve, reject) => { | return new Promise<void>((resolve, reject) => { | ||||
| loginApi(loginData) | loginApi(loginData) | ||||
| .then((response) => { | .then((response) => { | ||||
| @@ -8,6 +8,7 @@ export {} | |||||
| declare module '@vue/runtime-core' { | declare module '@vue/runtime-core' { | ||||
| export interface GlobalComponents { | export interface GlobalComponents { | ||||
| Breadcrumb: typeof import('./../components/Breadcrumb/index.vue')['default'] | Breadcrumb: typeof import('./../components/Breadcrumb/index.vue')['default'] | ||||
| copy: typeof import('./../components/EditPosition copy.vue')['default'] | |||||
| CutImg: typeof import('./../components/cutImg.vue')['default'] | CutImg: typeof import('./../components/cutImg.vue')['default'] | ||||
| CutImg1: typeof import('./../components/cutImg1.vue')['default'] | CutImg1: typeof import('./../components/cutImg1.vue')['default'] | ||||
| EditPosition: typeof import('./../components/EditPosition.vue')['default'] | EditPosition: typeof import('./../components/EditPosition.vue')['default'] | ||||
| @@ -465,7 +465,7 @@ const addAccount = async (refForm) => { | |||||
| pageSize.value = 10; | pageSize.value = 10; | ||||
| } catch (error) { | } catch (error) { | ||||
| console.log(error, "err"); | console.log(error, "err"); | ||||
| ElMessage.error(error.message); | |||||
| ElMessage.error(error); | |||||
| } | } | ||||
| } else { | } else { | ||||
| ElMessage.error("请完善信息!"); | ElMessage.error("请完善信息!"); | ||||
| @@ -97,7 +97,8 @@ const handleCurrentChange = (val) => { | |||||
| const modelAllListFunc = async (PageNum, PageSize) => { | const modelAllListFunc = async (PageNum, PageSize) => { | ||||
| try { | try { | ||||
| const res = await modelAllList(PageNum, PageSize); | const res = await modelAllList(PageNum, PageSize); | ||||
| const modelIds = await personMouldIdList(); | |||||
| debugger | |||||
| const modelIds = await personMouldIdList(props.serviceId); | |||||
| let idIndx = [] | let idIndx = [] | ||||
| if(modelIds.data && modelIds.data.length > 0) { | if(modelIds.data && modelIds.data.length > 0) { | ||||
| res.data.list.forEach((ele, idx) => { | res.data.list.forEach((ele, idx) => { | ||||
| @@ -1224,7 +1224,7 @@ async function doLogin(data: any) { | |||||
| console.log(err, "err"); | console.log(err, "err"); | ||||
| // 登录失败刷新验证码 | // 登录失败刷新验证码 | ||||
| getCode(); | getCode(); | ||||
| ElMessage.error(err.message); | |||||
| ElMessage.error(err); | |||||
| isLogining.value = false; | isLogining.value = false; | ||||
| if (err.code == 2112) { | if (err.code == 2112) { | ||||
| reSendEmail(data.email); | reSendEmail(data.email); | ||||
| @@ -51,7 +51,15 @@ | |||||
| {{ getDate(scope.row.createTime) }} | {{ getDate(scope.row.createTime) }} | ||||
| </template> | </template> | ||||
| </el-table-column> | </el-table-column> | ||||
| <el-table-column | |||||
| prop="createTime" | |||||
| label="时长(秒)" | |||||
| align="center" | |||||
| > | |||||
| <template #default="scope"> | |||||
| {{ scope.row.remainingTimes }} | |||||
| </template> | |||||
| </el-table-column> | |||||
| <el-table-column | <el-table-column | ||||
| fixed="right" | fixed="right" | ||||
| :label="$t('keyMangage.operations')" | :label="$t('keyMangage.operations')" | ||||