| @@ -20,7 +20,7 @@ export function keyListApi(pageNum, pageSize) { | |||||
| */ | */ | ||||
| export function getKeyByIdApi(id) { | export function getKeyByIdApi(id) { | ||||
| return request({ | return request({ | ||||
| url: `/thirdPartyApi/get?id=${id}`, | |||||
| url: `/thirdPartyApi/getByServiceId?serviceId=${id}`, | |||||
| method: 'get' | method: 'get' | ||||
| }) | }) | ||||
| } | } | ||||
| @@ -8,7 +8,6 @@ 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'] | ||||
| @@ -51,6 +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" | ||||
| @@ -74,6 +83,7 @@ | |||||
| <el-dialog | <el-dialog | ||||
| v-model="dialogVisible" | v-model="dialogVisible" | ||||
| v-if="dialogVisible" | |||||
| :title="$t('businessMangage.addNew')" | :title="$t('businessMangage.addNew')" | ||||
| width="35%" | width="35%" | ||||
| :before-close="handleClose" | :before-close="handleClose" | ||||
| @@ -99,14 +99,15 @@ const modelAllListFunc = async (PageNum, PageSize) => { | |||||
| const res = await modelAllList(PageNum, PageSize); | const res = await modelAllList(PageNum, PageSize); | ||||
| const modelIds = await personMouldIdList(); | const modelIds = await personMouldIdList(); | ||||
| let idIndx = [] | let idIndx = [] | ||||
| res.data.list.forEach((ele, idx) => { | |||||
| modelIds.data.forEach((item) => { | |||||
| if (ele.id === item.personMouldId) { | |||||
| idIndx.push(idx) | |||||
| } | |||||
| if(modelIds.data && modelIds.data.length > 0) { | |||||
| res.data.list.forEach((ele, idx) => { | |||||
| modelIds.data.forEach((item) => { | |||||
| if (ele.id === item.personMouldId) { | |||||
| idIndx.push(idx) | |||||
| } | |||||
| }) | |||||
| }) | }) | ||||
| }) | |||||
| console.log(res, "res"); | |||||
| } | |||||
| tableData.value = res.data.list; | tableData.value = res.data.list; | ||||
| total.value = res.data.total * 1; | total.value = res.data.total * 1; | ||||
| // 选中关联模版 | // 选中关联模版 | ||||