Przeglądaj źródła

Merge branch 'ctt_dev_new' into dev

dev
chutingting 1 rok temu
rodzic
commit
118fe07754
9 zmienionych plików z 26 dodań i 9 usunięć
  1. +2
    -2
      src/apis/apiManage.js
  2. +9
    -1
      src/apis/home.js
  3. +1
    -1
      src/layout/index.vue
  4. +0
    -1
      src/store/modules/user.ts
  5. +1
    -0
      src/types/components.d.ts
  6. +1
    -1
      src/views/apiManage/index.vue
  7. +2
    -1
      src/views/apiManage/model.vue
  8. +1
    -1
      src/views/login/index.vue
  9. +9
    -1
      src/views/privatization/index.vue

+ 2
- 2
src/apis/apiManage.js Wyświetl plik

@@ -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'
})
}


+ 9
- 1
src/apis/home.js Wyświetl plik

@@ -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',
})
}


+ 1
- 1
src/layout/index.vue Wyświetl plik

@@ -22,7 +22,7 @@
<span>首页</span>
</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>
<span>API接入方管理</span>
</el-menu-item>


+ 0
- 1
src/store/modules/user.ts Wyświetl plik

@@ -25,7 +25,6 @@ export const useUserStore = defineStore("user", () => {
* @returns
*/
function login(loginData: LoginData) {
debugger
return new Promise<void>((resolve, reject) => {
loginApi(loginData)
.then((response) => {


+ 1
- 0
src/types/components.d.ts Wyświetl plik

@@ -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']


+ 1
- 1
src/views/apiManage/index.vue Wyświetl plik

@@ -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("请完善信息!");


+ 2
- 1
src/views/apiManage/model.vue Wyświetl plik

@@ -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) => {


+ 1
- 1
src/views/login/index.vue Wyświetl plik

@@ -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);


+ 9
- 1
src/views/privatization/index.vue Wyświetl plik

@@ -51,7 +51,15 @@
{{ getDate(scope.row.createTime) }}
</template>
</el-table-column>

<el-table-column
prop="createTime"
label="时长(秒)"
align="center"
>
<template #default="scope">
{{ scope.row.remainingTimes }}
</template>
</el-table-column>
<el-table-column
fixed="right"
:label="$t('keyMangage.operations')"


Ładowanie…
Anuluj
Zapisz