Yaxin
/
General-AI-Platform-Web-Client
31
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: mock相关调整补充提交

Browse Source
dev-deviceSetting
donghao 11 months ago
parent 1461d1b6e2
commit 002bf14a27
12 changed files with 73 additions and 48 deletions
Show Stats Download Patch File Download Diff File

4
index.html
Unescape Escape View File

@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-01-12 14:35:28
* @LastEditors: donghao donghao@supervision.ltd
* @LastEditTime: 2024-03-21 17:55:12
* @LastEditTime: 2024-03-25 11:16:58
* @FilePath: \General-AI-Platform-Web-Client\index.html
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@ -21,7 +21,7 @@
<!-- update 2024-01-21 16:41 -->
<link
rel="stylesheet"
href="//at.alicdn.com/t/c/font_4412653_eop55bznk7u.css"
href="//at.alicdn.com/t/c/font_4412653_qjjikxo6f6p.css"
/>
<script src="https://threejs.org/build/three.js"></script>

4
mock/alarm.ts
Unescape Escape View File

@ -2,9 +2,9 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-01-17 13:54:43
* @LastEditors: donghao donghao@supervision.ltd
* @LastEditTime: 2024-02-04 16:45:14
* @LastEditTime: 2024-04-16 09:29:01
* @FilePath: \General-AI-Platform-Web-Client\mock\alarm.ts
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @Description: mock的告警数据
*/
import { MockMethod } from "vite-plugin-mock";
import { alarmListData } from "./pools/alarmData";

32
mock/modelList.ts
Unescape Escape View File

@ -0,0 +1,32 @@
/*
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-01-17 13:54:43
* @LastEditors: donghao donghao@supervision.ltd
* @LastEditTime: 2024-04-16 09:31:07
* @FilePath: \General-AI-Platform-Web-Client\mock\alarm.ts
* @Description: mock的告警数据
*/
import { MockMethod } from "vite-plugin-mock";
import { modelListData } from "./pools/modelListData";
import { fetchCurrPageByList } from "./utils/apiMock";
export default [
{
url: "/model/list",
method: "post",
response: req => {
const { page, pageSize } = req.body;
// console.log(req);
return {
...fetchCurrPageByList({
...modelListData,
data: {
...modelListData.data,
page,
pageSize: pageSize || 10
}
})
};
}
}
] as MockMethod[];

2
mock/pools/deviceSceneData.ts
Unescape Escape View File

@ -42,7 +42,7 @@ function fetchList(): Record<string, any>[] {
createTime: generateRandomDateTimeByYear(2023),
updateTime: "2023-10-17T02:35:41.14308Z",
name: "GigEPRO_gmcam_01_00" + (i + 1),
alarmList: fetchSceneItemsList({ maxCount: 3 })
alarmList: fetchSceneItemsList({ maxCount: 4 })
});
}
return currList;

18
mock/screenData.ts
Unescape Escape View File

@ -74,23 +74,5 @@ export default [
// console.log(req);
return fetchMockSuccessFullByOther({ data: finalServerList });
}
},
{
url: "/getModelBoxList",
method: "post",
response: req => {
const { page, pageSize } = req.body;
// console.log(req);
return {
...fetchCurrPageByList({
...modelListData,
data: {
...modelListData.data,
page,
pageSize: pageSize || 10
}
})
};
}
}
] as MockMethod[];

3
package.json
Unescape Escape View File

@ -60,8 +60,7 @@
"vue-router": "^4.2.2",
"vue-types": "^5.1.0",
"vue-waterfall-plugin-next": "^2.2.1",
"vue3-scale-box": "^0.1.9",
"安装插件": "link://安装插件"
"vue3-scale-box": "^0.1.9"
},
"devDependencies": {
"@commitlint/cli": "^17.6.6",

11
src/api/list.ts
Unescape Escape View File

@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-01-15 14:45:56
* @LastEditors: donghao donghao@supervision.ltd
* @LastEditTime: 2024-03-20 14:26:49
* @LastEditTime: 2024-04-16 09:40:18
* @FilePath: \General-AI-Platform-Web-Client\src\api\list.ts
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@ -33,12 +33,11 @@ export const updateServerBoxList = (data?: object) => {
return http.request<Result>("post", "/updateServerBoxList", { data });
};
export const getModelList = (data?: object) => {
return http.request<Result>("post", "/getModelList", { data });
export const postModelList = (data?: object) => {
return http.request<Result>("post", "/model/list", { data });
};
export const getModelBoxList = (data?: object) => {
return http.request<Result>("post", "/getModelBoxList", { data });
export const getModelList = (data?: object) => {
return http.request<Result>("post", "getModelList", { data });
};
/** 告警列表 */

4
src/pages/dataScreen/views/modelList/modelList.scss
Unescape Escape View File

@ -1,5 +1,5 @@
.modelList {
padding: 32px;
.ds_modelList {
padding: 0 32px;
.banner_side {
width: 29px;
height: 870px;

32
src/pages/dataScreen/views/modelList/modelList.vue
Unescape Escape View File

@ -1,6 +1,6 @@
<script setup lang="ts">
// import { getList } from "@/api/list";
import { getModelBoxList } from "@/api/list";
import { postModelList } from "@/api/list";
import error from "@/assets/dataScreen/modelList/error.png";
import loading from "@/assets/dataScreen/modelList/loading.png";
import { ElLoading } from "element-plus";
@ -56,12 +56,13 @@ const options = reactive({
// 是否懒加载
lazyload: true
});
const pageTotal = ref(0);
const page = ref(1);
const list = ref([]);
const pageSize = ref(20);
const pageSize = ref(100);
const loadingInstance = ref();
const modelDialogVisible = ref(false);
const isFinish = ref(false);
const INITIAL_DATA = {
index: null,
industry: "",
@ -78,16 +79,27 @@ const modelInfo = ref({ ...INITIAL_DATA });
/** 加载更多 */
function handleLoadMore() {
console.log(list.value.length, "handleLoadMore", pageTotal.value);
isFinish.value = pageTotal.value <= list.value.length;
if (!isFinish.value) {
loadList();
} else {
console.log("加载完成");
}
}
function loadList() {
loadingInstance.value = ElLoading.service({
target: ".content",
background: "transparent",
text: "加载中"
});
getModelBoxList({
postModelList({
page: page.value,
pageSize: pageSize.value
}).then(res => {
console.log(res);
pageTotal.value = res.data?.total || 0;
setTimeout(() => {
list.value.push(...res.data.list);
page.value += 1;
@ -110,18 +122,18 @@ const handleBoxDetail = product => {
};
onMounted(() => {
handleLoadMore();
loadList();
});
</script>
<template>
<div class="flex justify-between modelList">
<div class="flex justify-between ds_modelList">
<div class="banner_side" />
<div class="model-list-mid">
<div class="model-list-title ff1">
苏胜天大模型衍生模型库<span>{{ 256 }}</span>
苏胜天大模型衍生模型库<span>{{ pageTotal }}</span>
</div>
<div class="model-list-box w-full">
<div class="w-full model-list-box">
<el-scrollbar height="810px" class="content">
<Waterfall :list="list" v-bind="options">
<template #item="{ item }">
@ -167,7 +179,7 @@ onMounted(() => {
模型版本:<span>{{ modelInfo.version }}</span
>适用行业:<span>{{ modelInfo.industry }}</span>
</div>
<div class="modelListDialogContent mb-3">
<div class="mb-3 modelListDialogContent">
模型状态:<span class="modelListState">{{
modelInfo.state === "在线" ? "使用中" : "未使用"
}}</span>
@ -181,6 +193,6 @@ onMounted(() => {
</div>
</template>
<style lang="scss" scoped>
<style lang="scss">
@import "./modelList.scss";
</style>

4
src/router/modules/deviceScene.ts
Unescape Escape View File

@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-03-19 15:44:27
* @LastEditors: donghao donghao@supervision.ltd
* @LastEditTime: 2024-03-20 15:50:20
* @LastEditTime: 2024-03-25 09:42:50
* @FilePath: \General-AI-Platform-Web-Client\src\router\modules\deviceScene.ts
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@ -12,7 +12,7 @@ export default {
path: "/deviceScene",
meta: {
title: $t("menus.hsdeviceScene"),
icon: "icon-shebeiliebiao-weixuan",
icon: "icon-shebeixianchangweixuanzhong",
// showLink: false,
bodyClass: "deviceScene_page",
rank: 7,

1
src/views/device/scene.scss
Unescape Escape View File

@ -5,6 +5,7 @@
background-color: white;
box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.1);
border-radius: 8px;
height: calc(100vh - 160px);
}
.left {
width: 65.52%;

6
src/views/modelList/index.vue
Unescape Escape View File

@ -5,7 +5,7 @@ import { onMounted, ref } from "vue";
defineOptions({
name: "ServerList"
});
// TODO 0416 卡片分页封装
const svg = `
<path class="path" d="
M 30 15
@ -35,9 +35,9 @@ const onCurrentChange = (current: number) => {
};
const getCardListData = async () => {
try {
const { data } = await getModelList();
const { data } = await getModelList({});
deviceList.value = data.list;
console.log(data.list);
console.log(data, "resData", data.list);
pagination.value = {
...pagination.value,
total: data.list.length

Write Preview
Loading…
Cancel
Save