feat: 接口联调

dev-deviceSetting
JINGYJ 9 months ago
parent 91009b1ba9
commit 74f4604095

@ -0,0 +1,23 @@
import { http } from "@/utils/http";
import { baseUrlApi } from "./utils";
// type Result = {
// success: boolean;
// data?: Array<any>;
// };
type ResultList = {
success: boolean;
data?: {
count: number;
/** 列表数据 */
results: Array<any>;
};
};
/** 获取告警 */
export const getWarnList = (params?: object) => {
return http.request<ResultList>("get", baseUrlApi("warning_statistics/"), {
params
});
};

@ -0,0 +1,23 @@
import { http } from "@/utils/http";
import { baseUrlApi } from "./utils";
type Result = {
success: boolean;
data?: Array<any>;
};
// type ResultList = {
// success: boolean;
// data?: {
// count: number;
// /** 列表数据 */
// results: Array<any>;
// };
// };
/** 获取告警 */
export const getComputeConfig = (params?: object) => {
return http.request<Result>("get", baseUrlApi("compute_config/"), {
params
});
};

@ -27,3 +27,10 @@ export const getDeviceClassfication = (params?: object) => {
params
});
};
/** 获取设备 */
export const getDevices = (params?: object) => {
return http.request<ResultList>("get", baseUrlApi("devices/"), {
params
});
};

@ -22,7 +22,7 @@ export const getCardList = (data?: object) => {
};
export const getServerList = (data?: object) => {
return http.request<Result>("post", "/api/server/", { data });
return http.request<Result>("post", "/getServerList", { data });
};
export const getServerBoxList = (data?: object) => {

@ -0,0 +1,23 @@
import { http } from "@/utils/http";
import { baseUrlApi } from "./utils";
// type Result = {
// success: boolean;
// data?: Array<any>;
// };
type ResultList = {
success: boolean;
data?: {
count: number;
/** 列表数据 */
results: Array<any>;
};
};
/** 获取模型 */
export const getModelsList = (params?: object) => {
return http.request<ResultList>("get", baseUrlApi("models/"), {
params
});
};

@ -0,0 +1,26 @@
import { http } from "@/utils/http";
import { baseUrlApi } from "./utils";
type Result = {
success: boolean;
data?: Array<any>;
};
type ResultList = {
success: boolean;
all_count: number;
offline_count: number;
online_count: number;
data?: {
count: number;
/** 列表数据 */
results: Array<any>;
};
};
/** 服务器查询 */
export const getServerList = (params?: object) => {
return http.request<ResultList>("get", baseUrlApi("server/"), {
params
});
};

@ -1,8 +1,10 @@
<script setup lang="ts">
import { getAlarmList } from "@/api/list";
// import { getAlarmList } from "@/api/list";
import { getWarnList } from "@/api/alarm";
import { onMounted, ref, reactive, h } from "vue";
import { BaseTable } from "@/components/CustomTable";
// import { BaseTable } from "@/components/CustomTable";
import { getConfig } from "@/config";
import dayjs from "dayjs";
defineOptions({
name: "AlarmList"
@ -57,27 +59,32 @@ const alarmLevelStatusEnum: Record<string, any>[] = [
}
];
function handleDelete(row) {
console.log(row, "handleDelete_row");
}
// function handleDelete(row) {
// console.log(row, "handleDelete_row");
// }
const columns = [
{
type: "selection"
},
// {
// type: "selection"
// },
// {
// label: "",
// prop: "id"
// },
{
label: "告警名称",
property: "name"
property: "warning_name"
},
{
label: "告警代码",
property: "code"
property: "warning_code"
},
{
label: "告警等级",
property: "level",
property: "warning_level",
formatter: val => {
const currentLevelObj = alarmLevelStatusEnum[Number(val?.level) - 1];
const currentLevelObj =
alarmLevelStatusEnum[Number(val?.warning_level) - 1];
return h(
"div",
{
@ -106,8 +113,8 @@ const columns = [
}
},
{
label: "设备组",
property: "deviceGroup",
label: "节点",
property: "node_name",
formatter: val => {
return h(
"div",
@ -118,16 +125,16 @@ const columns = [
}
},
[
h("i", {
class: `iconfont icon-zishebeizu pr-[8px]`
}),
// h("i", {
// class: `iconfont icon-zishebeizu pr-[8px]`
// }),
h(
"span",
{
fontSize: "14px",
class: "pf-1"
},
val.deviceGroup
val.node_name
)
]
);
@ -135,13 +142,15 @@ const columns = [
},
{
label: "告警日期",
property: "createTime"
},
// TODO
{
slot: "operation",
label: "操作"
property: "trigger_time",
formatter: ({ trigger_time }) =>
dayjs(trigger_time).format("YYYY-MM-DD HH:mm:ss")
}
// TODO
// {
// slot: "operation",
// label: ""
// }
];
const svg = `
@ -162,20 +171,24 @@ const listData = ref([]);
// const searchValue = ref("");
const formData = reactive({
name: "",
level: ""
node_name: "",
warning_level: ""
});
const dataLoading = ref(true);
const getList = async () => {
const { currentPage, pageSize } = pagination.value;
const { data } = await getAlarmList({ page: currentPage, pageSize });
listData.value = data.list;
console.log(data.list);
const { data } = await getWarnList({
...formData,
page: currentPage,
pageSize
});
listData.value = data.results;
console.log(data.results);
pagination.value = {
...pagination.value,
total: data.total
total: data.count
};
dataLoading.value = false;
// try {
@ -188,20 +201,28 @@ const getList = async () => {
// }, 500);
// }
};
function handleTableChange(record) {
console.log("handleTableChange_record", record);
pagination.value = {
...pagination.value,
currentPage: record.page,
pageSize: record.pageSize
};
const onPageSizeChange = (size: number) => {
pagination.value.pageSize = size;
pagination.value.currentPage = 1;
getList();
}
};
const onCurrentChange = (current: number) => {
pagination.value.currentPage = current;
getList();
};
// function handleTableChange(record) {
// console.log("handleTableChange_record", record);
// pagination.value = {
// ...pagination.value,
// currentPage: record.page,
// pageSize: record.pageSize
// };
// getList();
// }
/**操作栏事件 */
function handleDel(row) {
console.log(row, "handleDel");
}
// function handleDel(row) {
// console.log(row, "handleDel");
// }
onMounted(() => {
getList();
@ -213,13 +234,26 @@ onMounted(() => {
<div class="alarm_header">告警管理</div>
<el-form :inline="true" :model="formData" class="demo-form-inline">
<el-form-item label="告警名称">
<el-select v-model="formData.name" placeholder="告警名称" clearable>
<el-option label="名称1" value="1" />
<el-option label="名称2" value="2" />
<el-select
v-model="formData.node_name"
placeholder="告警名称"
@change="getList"
clearable
>
<el-option label="表面裂纹" value="表面裂纹" />
<el-option label="外观缺损" value="外观缺损" />
<el-option label="表面划痕" value="表面划痕" />
<el-option label="白斑" value="白斑" />
<el-option label="毛刺" value="毛刺" />
</el-select>
</el-form-item>
<el-form-item label="告警等级">
<el-select v-model="formData.level" placeholder="告警等级" clearable>
<el-select
v-model="formData.warning_level"
placeholder="告警等级"
@change="getList"
clearable
>
<el-option
v-for="(v, k) in alarmLevelStatusEnum"
:key="k"
@ -235,6 +269,15 @@ onMounted(() => {
:element-loading-svg="svg"
element-loading-svg-view-box="-10, -10, 50, 50"
>
<el-empty
v-show="
listData.slice(
pagination.pageSize * (pagination.currentPage - 1),
pagination.pageSize * pagination.currentPage
).length === 0
"
:description="`暂无信息`"
/>
<template v-if="pagination.total > 0">
<pure-table
showOverflowTooltip
@ -247,9 +290,10 @@ onMounted(() => {
}"
adaptive
:pagination="pagination"
@page-current-change="handleTableChange"
@page-size-change="onPageSizeChange"
@page-current-change="onCurrentChange"
>
<template #operation="{ row }">
<!-- <template #operation="{ row }">
<ul class="table_action_box">
<li class="flex items-center" @click="handleDel(row)">
<el-button text>
@ -268,7 +312,7 @@ onMounted(() => {
</el-button>
</li>
</ul>
</template>
</template> -->
</pure-table>
<!-- <BaseTable
:total="pagination.total"

@ -37,6 +37,7 @@
background-color: rgba(256, 256, 256, 0.1);
box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.1);
border-radius: 8px 8px 8px 8px;
border: 1px solid #154ddd;
position: relative;
overflow: hidden;
.cp_bg_logo_icon {

@ -11,7 +11,8 @@ import { onMounted, ref } from "vue";
import ComputePowerCube from "./components/computePowerCube.vue";
import ComputePowerType from "./components/computePowerType.vue";
import { ComputePowerPoolItem } from "./typing";
import { getPowerPoolsList, getPowerGroupList } from "@/api/list";
import { getPowerGroupList } from "@/api/list";
import { getComputeConfig } from "@/api/computePower";
defineOptions({
name: "ComputePowerAllocation"
@ -22,7 +23,7 @@ const groupList = ref<Record<string, any>[]>([]); //获取dom;
const poolsData = ref<ComputePowerPoolItem[]>([]);
async function fetchPowerData() {
const res = await getPowerPoolsList();
const res = await getComputeConfig();
console.log("fetchPowerData_res", res);
poolsData.value = res.data;
}

@ -1,8 +1,8 @@
<script setup lang="ts">
import { computed, PropType } from "vue";
import control from "@/assets/svg/device/control.svg?component";
import monitor1 from "@/assets/svg/device/monitor1.svg?component";
import monitor2 from "@/assets/svg/device/monitor2.svg?component";
import { computed } from "vue";
// import control from "@/assets/svg/device/control.svg?component";
// import monitor1 from "@/assets/svg/device/monitor1.svg?component";
// import monitor2 from "@/assets/svg/device/monitor2.svg?component";
import { AnimationPic } from "@/components/AnimationCard";
//
import controlEquipmentMalfunction from "@/assets/animate/device/controlEquipmentMalfunction.json";
@ -10,54 +10,57 @@ import controlEquipmentOnline from "@/assets/animate/device/controlEquipmentOnli
//
import monitoringFaults from "@/assets/animate/device/monitoringFaults.json";
import monitoringOnline from "@/assets/animate/device/monitoringOnline.json";
// import dayjs from "dayjs";
defineOptions({
name: "DeviceCard"
});
interface CardProductType {
isEnabled: boolean;
state: string;
description: string;
deviceSort: string;
}
// interface CardProductType {
// isEnabled: boolean;
// state: string;
// description: string;
// deviceSort: string;
// }
const props = defineProps({
device: {
type: Object as PropType<CardProductType>
type: Object,
default() {
return {};
}
}
});
const cardClass = computed(() => [
"device-card",
{ "device-card_fault": props.device?.state === "故障" },
{ "device-card_offline": props.device?.state === "离线" }
{ "device-card_fault": props.device?.status === 1003 },
{ "device-card_offline": props.device?.status === 1002 }
]);
const stateClass = computed(() => [
"device-state",
{ "device-state_fault": props.device?.state === "故障" },
{ "device-state_offline": props.device?.state === "离线" }
{ "device-state_fault": props.device?.status === 1003 },
{ "device-state_offline": props.device?.status === 1002 }
]);
const isEnabledClass = computed(() => [
"device-tag",
{ "device-tag_off": !props.device?.isEnabled }
{ "device-tag_off": !props.device?.is_used }
]);
const deviceClassify = device => {
if (device?.deviceSort === "精密仪器设备") {
if (device?.state === "在线") {
if (!device?.is_cam) {
if (device?.state === 1001) {
return controlEquipmentOnline;
} else if (device?.state === "离线") {
} else if (device?.state === 1002) {
return "/src/assets/device/Camera_offline.png";
} else {
return controlEquipmentMalfunction;
}
} else {
if (device?.state === "在线") {
if (device?.status === 1001) {
return monitoringOnline;
} else if (device?.state === "离线") {
} else if (device?.status === 1002) {
return "/src/assets/device/Instrument_offline.png";
} else {
return monitoringFaults;
@ -65,32 +68,42 @@ const deviceClassify = device => {
}
};
const generateRandomNumber = () => {
// 0 99999
const randomNumber = Math.floor(Math.random() * 100000);
// 5
return randomNumber.toString().padStart(5, "0");
const deviceStatusName = device => {
if (device?.status === 1001) {
return "在线";
} else if (device?.status === 1002) {
return "离线";
} else {
return "故障";
}
};
const generateRandomDate = () => {
// 2023111231
const startDate = new Date("2024-01-01");
const endDate = new Date("2024-03-04");
const randomTimestamp =
startDate.getTime() +
Math.random() * (endDate.getTime() - startDate.getTime());
const randomDate = new Date(randomTimestamp);
// const generateRandomNumber = () => {
// // 0 99999
// const randomNumber = Math.floor(Math.random() * 100000);
//
const year = randomDate.getFullYear();
// 1 0 11
const month = (randomDate.getMonth() + 1).toString().padStart(2, "0");
const day = randomDate.getDate().toString().padStart(2, "0");
// // 5
// return randomNumber.toString().padStart(5, "0");
// };
// "YYYY-MM-DD"
return `${year}-${month}-${day}`;
};
// const generateRandomDate = () => {
// // 2023111231
// const startDate = new Date("2024-01-01");
// const endDate = new Date("2024-03-04");
// const randomTimestamp =
// startDate.getTime() +
// Math.random() * (endDate.getTime() - startDate.getTime());
// const randomDate = new Date(randomTimestamp);
// //
// const year = randomDate.getFullYear();
// // 1 0 11
// const month = (randomDate.getMonth() + 1).toString().padStart(2, "0");
// const day = randomDate.getDate().toString().padStart(2, "0");
// // "YYYY-MM-DD"
// return `${year}-${month}-${day}`;
// };
</script>
<template>
@ -104,7 +117,7 @@ const generateRandomDate = () => {
<div class="device-icon">
<div
class="w-[100px] h-[100px] flex items-center justify-center"
v-if="props.device?.state === '离线'"
v-if="props.device?.status === '1002'"
>
<img
class="w-[82px] h-[58px]"
@ -123,34 +136,39 @@ const generateRandomDate = () => {
v-else
/>
</div>
<div class="device-name">{{ device?.deviceSort }}</div>
<div class="device-name">{{ device?.name }}</div>
<!-- <div :class="stateClass">{{ device?.state }}</div> -->
</div>
<div class="device-content">
<div class="device-info">
<div>
设备代码<span> IVP04A_{{ generateRandomNumber() }}</span>
设备型号<span> {{ device?.device_model }}</span>
</div>
<div>
设备分类<span>DEVICETYPE_{{ generateRandomNumber() }}</span>
设备分类<span>{{ device?.classification }}</span>
</div>
<div>
创建时间<span>{{ generateRandomDate() }}</span>
设备位置<span>{{ device?.addr }}</span>
</div>
<!-- <div>
创建时间<span>{{
dayjs(device?.create_time).format("YYYY-MM-DD HH:mm:ss")
}}</span>
</div> -->
<div>
是否启用
<el-tag
:class="isEnabledClass"
:color="
device?.isEnabled
device?.is_used
? 'rgba(82, 196, 26, 0.1)'
: 'rgba(232, 13, 13, 0.1)'
"
>{{ device?.isEnabled ? "已启用" : "未启用" }}</el-tag
>{{ device?.is_used ? "已启用" : "未启用" }}</el-tag
>
</div>
</div>
<div :class="stateClass">{{ device?.state }}</div>
<div :class="stateClass">{{ deviceStatusName(device) }}</div>
</div>
</div>
</template>

@ -1,8 +1,7 @@
<script setup lang="ts">
import TreeCard from "./components/TreeCard.vue";
import DeviceCard from "./components/DeviceCard.vue";
import { getCardList } from "@/api/list";
import { getDeviceClassfication } from "@/api/device";
import { getDeviceClassfication, getDevices } from "@/api/device";
import { onMounted, ref, watch, onBeforeUnmount, nextTick } from "vue";
import { emitter } from "@/utils/mitt";
@ -28,10 +27,12 @@ const deviceList = ref([]);
const searchValue = ref("");
const formData = ref({
deviceSort: "",
state: "",
isEnabled: "",
node_id: ""
classification: "",
status: "",
is_used: "",
node_id: "",
page: pagination.value.current,
pageSize: pagination.value.pageSize
});
const dataLoading = ref(true);
@ -45,30 +46,32 @@ async function getDeviceTypeList() {
// console.log("submit!");
// };
const onPageSizeChange = (size: number) => {
pagination.value.pageSize = size;
pagination.value.current = 1;
formData.value.pageSize = size;
formData.value.page = 1;
// getCardListData();
};
const onCurrentChange = (current: number) => {
pagination.value.current = current;
formData.value.page = current;
// getCardListData();
};
const getCardListData = async () => {
try {
const { data } = await getCardList();
console.log(data.list);
let finalList = data.list;
if (formData.value.deviceSort) {
finalList = finalList.filter(
item => item.deviceSort === formData.value.deviceSort
);
}
if (formData.value.state) {
finalList = finalList.filter(item => item.state === formData.value.state);
}
if (formData.value.isEnabled) {
finalList = finalList.filter(
item => item.isEnabled + "" === formData.value.isEnabled
);
}
const { data } = await getDevices(formData.value);
console.log(data.results);
const finalList = data.results;
// if (formData.value.classification) {
// finalList = finalList.filter(
// item => item.classification === formData.value.classification
// );
// }
// if (formData.value.status) {
// finalList = finalList.filter(item => item.status === formData.value.status);
// }
// if (formData.value.is_used) {
// finalList = finalList.filter(
// item => item.is_used + "" === formData.value.is_used
// );
// }
deviceList.value = finalList;
pagination.value = {
@ -132,7 +135,7 @@ onMounted(() => {
>
<el-form-item label="设备分类">
<el-select
v-model="formData.deviceSort"
v-model="formData.classification"
placeholder="设备分类"
class="w-[145px]"
clearable
@ -147,7 +150,7 @@ onMounted(() => {
</el-form-item>
<el-form-item label="设备状态">
<el-select
v-model="formData.state"
v-model="formData.status"
placeholder="设备状态"
class="w-[145px]"
clearable
@ -159,7 +162,7 @@ onMounted(() => {
</el-form-item>
<el-form-item label="是否启用">
<el-select
v-model="formData.isEnabled"
v-model="formData.is_used"
placeholder="是否启用"
class="w-[145px]"
clearable
@ -178,14 +181,10 @@ onMounted(() => {
>
<el-empty
v-show="
deviceList
.slice(
pagination.pageSize * (pagination.current - 1),
pagination.pageSize * pagination.current
)
.filter(v =>
v.deviceSort.toLowerCase().includes(searchValue.toLowerCase())
).length === 0
deviceList.slice(
pagination.pageSize * (pagination.current - 1),
pagination.pageSize * pagination.current
).length === 0
"
:description="`${searchValue} 产品不存在`"
/>
@ -193,14 +192,10 @@ onMounted(() => {
<el-row :gutter="16">
<el-col
class="mb-4"
v-for="(device, index) in deviceList
.slice(
pagination.pageSize * (pagination.current - 1),
pagination.pageSize * pagination.current
)
.filter(v =>
v.deviceSort.toLowerCase().includes(searchValue.toLowerCase())
)"
v-for="(device, index) in deviceList.slice(
pagination.pageSize * (pagination.current - 1),
pagination.pageSize * pagination.current
)"
:key="index"
:xs="24"
:sm="24"

@ -8,23 +8,27 @@
-->
<script setup lang="ts">
import { onMounted, ref, reactive, h } from "vue";
import { getDeviceSceneList, getDeviceSceneItemsList } from "@/api/list";
import { getDeviceSceneList } from "@/api/list";
import type { FormInstance } from "element-plus";
import { fabric } from "fabric";
import { getWarnList } from "@/api/alarm";
import { getDeviceList } from "@/api/device";
// import { BaseTable } from "@/components/CustomTable";
import jiankongtu1 from "@/assets/device/jiankongtu1.png";
import historyAlarm from "@/assets/history_alarm.png";
import dayjs from "dayjs";
defineOptions({
name: "DeviceScene"
});
const formData = ref({
deviceSort: "",
node_id: "",
deviceSceneItem: ""
});
const nodeList = ref([]);
const dataLoading = ref<boolean>(true);
// alarmDataLoading
const alarmDataLoading = ref<boolean>(true);
@ -59,9 +63,18 @@ const pagination = ref({ currentPage: 1, pageSize: 8, total: 0 });
const formRef = ref<FormInstance>();
const alarmValidateForm = reactive({
defectType: "",
createTime: ""
warning_type: "",
start_time: ""
});
async function getNodeList() {
const { data } = await getDeviceList();
nodeList.value = data;
formData.value = {
...formData.value,
deviceSceneItem: data[0].name
};
console.log(data);
}
const isShowAlarmDatail = ref<boolean>(false);
const currRowData = ref<Record<string, any>>({});
@ -69,15 +82,15 @@ const currRowData = ref<Record<string, any>>({});
const columns = [
{
label: "序号",
property: "alarmNo"
property: "node_id"
},
{
label: "产品类型",
property: "productType"
property: "product_name"
},
{
label: "缺陷类型",
property: "defectType",
property: "warning_name",
formatter: val => {
return h(
"div",
@ -87,7 +100,7 @@ const columns = [
fontSize: "12px"
}
},
val.defectType
val.warning_name
);
}
},
@ -97,7 +110,9 @@ const columns = [
},
{
label: "生产日期",
property: "createTime"
property: "trigger_time",
formatter: ({ trigger_time }) =>
dayjs(trigger_time).format("YYYY-MM-DD HH:mm:ss")
}
];
@ -106,10 +121,10 @@ const getList = async () => {
const { data } = await getDeviceSceneList();
listData.value = data;
formData.value = {
...formData.value,
deviceSceneItem: data[0].name
...formData.value
// deviceSceneItem: data[0].name
};
currDeviceSceneItems.value = data[0].alarmList;
// currDeviceSceneItems.value = data[0].alarmList;
initCanvas();
dataLoading.value = false;
console.log(data, "getDeviceSceneList_data");
@ -151,37 +166,39 @@ function initCanvas() {
//
const getAlarmList = async () => {
const { currentPage, pageSize } = pagination.value;
const { data } = await getDeviceSceneItemsList({
const { data } = await getWarnList({
...formData.value,
...alarmValidateForm,
page: currentPage,
pageSize
});
// listData.value = data;
alarmListData.value = data.list;
alarmListData.value = data.results;
pagination.value = {
...pagination.value,
total: data.total
total: data.count
};
// formData.value = {
// ...formData.value,
// deviceSceneItem: data[0].name
// };
// currDeviceSceneItems.value = data[0].alarmList;
currDeviceSceneItems.value = data.results;
alarmDataLoading.value = false;
console.log(data, "getAlarmList_data");
};
const submitForm = (formEl: FormInstance | undefined) => {
if (!formEl) return;
formEl.validate(valid => {
if (valid) {
console.log("submit!");
} else {
console.log("error submit!");
return false;
}
});
};
// const submitForm = (formEl: FormInstance | undefined) => {
// if (!formEl) return;
// formEl.validate(valid => {
// if (valid) {
// console.log("submit!");
// } else {
// console.log("error submit!");
// return false;
// }
// });
// };
const resetForm = (formEl: FormInstance | undefined) => {
if (!formEl) return;
@ -190,7 +207,7 @@ const resetForm = (formEl: FormInstance | undefined) => {
function showFullAlert() {
isShowFull.value = true;
getAlarmList();
// getAlarmList();
}
function handleDetail(rowData) {
@ -201,6 +218,8 @@ function handleDetail(rowData) {
onMounted(() => {
getList();
getAlarmList();
getNodeList();
});
</script>
@ -211,12 +230,17 @@ onMounted(() => {
<el-form :inline="true" :model="formData" class="demo-form-inline">
<el-form-item label="车间">
<el-select
v-model="formData.deviceSort"
v-model="formData.node_id"
placeholder="车间"
@change="getAlarmList"
clearable
>
<el-option label="车间1" value="车间1" />
<el-option label="车间2" value="车间2" />
<el-option
v-for="(v, k) in nodeList"
:key="k"
:label="v.name"
:value="v.id"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="设备">
@ -261,24 +285,26 @@ onMounted(() => {
<ul class="alarm_body">
<li v-for="(v, k) in currDeviceSceneItems" :key="k">
<h5>
<span class="label">序号: </span><span>{{ v.alarmNo }}</span>
<span class="label">序号: </span><span>{{ v.node_id }}</span>
</h5>
<div class="alarm_info">
<p>
<span class="label">缺陷类型: </span
><span class="active_value">{{ v.defectType }}</span>
><span class="active_value">{{ v.warning_name }}</span>
</p>
<p>
<span class="label">检测时间: </span
><span>{{ v.createTime }}</span>
><span>{{
dayjs(v.trigger_time).format("YYYY-MM-DD HH:mm:ss")
}}</span>
</p>
<div>
<span class="label">产品类型: </span
><span class="pr-[16px]">{{ v.productType }}</span>
<span class="label">产品类型: {{ v.product_info }}</span>
<!-- <span class="pr-[16px]">{{ v.productType }}</span>
<span class="label">: </span
><span class="pr-[16px]">{{ v.productL }}</span>
<span class="label">: </span
><span class="pr-[16px]">{{ v.productW }}</span>
><span class="pr-[16px]">{{ v.productW }}</span> -->
</div>
</div>
</li>
@ -311,28 +337,30 @@ onMounted(() => {
>
<el-form-item label="缺陷类型">
<el-select
v-model="alarmValidateForm.defectType"
v-model="alarmValidateForm.warning_type"
placeholder="缺陷类型"
clearable
>
<el-option label="表面裂纹" value="表面裂纹" />
<el-option label="划痕" value="划痕" />
<el-option label="外观缺损" value="外观缺损" />
<el-option label="表面划痕" value="表面划痕" />
<el-option label="白斑" value="白斑" />
<el-option label="毛刺" value="毛刺" />
</el-select>
</el-form-item>
<el-form-item label="生产日期">
<el-form-item label="日期">
<el-date-picker
v-model="alarmValidateForm.createTime"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
v-model="alarmValidateForm.start_time"
placeholder="请选择日期"
type="date"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
/>
</el-form-item>
<el-form-item>
<el-button @click="resetForm(formRef)"></el-button>
<el-button type="primary" @click="submitForm(formRef)"
>查询</el-button
>
<el-button type="primary" @click="getAlarmList"></el-button>
</el-form-item>
</el-form>
</div>
@ -342,6 +370,15 @@ onMounted(() => {
:element-loading-svg="svg"
element-loading-svg-view-box="-10, -10, 50, 50"
>
<el-empty
v-show="
alarmListData.slice(
pagination.pageSize * (pagination.currentPage - 1),
pagination.pageSize * pagination.currentPage
).length === 0
"
:description="`暂无信息`"
/>
<template v-if="pagination.total > 0">
<pure-table
showOverflowTooltip
@ -358,8 +395,8 @@ onMounted(() => {
<el-image
preview-teleported
loading="lazy"
:src="row.image"
:preview-src-list="[jiankongtu1]"
:src="row.picture_path"
:preview-src-list="[row.picture_path]"
:initial-index="index"
fit="cover"
class="w-[96px] h-[56px]"
@ -403,11 +440,11 @@ onMounted(() => {
<div class="alarm_info">
<p>
<span class="label">缺陷类型: </span
><span class="active_value">{{ currRowData.defectType }}</span>
><span class="active_value">{{ currRowData.warning_type }}</span>
</p>
<p>
<span class="label">检测时间: </span
><span>{{ currRowData.createTime }}</span>
><span>{{ currRowData.start_time }}</span>
</p>
<p>
<span class="label">产品类型: </span

@ -1,24 +1,28 @@
<script setup lang="ts">
import { computed, PropType } from "vue";
import { computed } from "vue";
import { model_OCR, model_mark, model_colour } from "./static";
import dayjs from "dayjs";
defineOptions({
name: "ModelCard"
});
interface CardProductType {
isEnabled: boolean;
state: string;
description: string;
deviceSort: string;
updateTime: string;
type: string;
industry: string;
}
// interface CardProductType {
// isEnabled: boolean;
// state: string;
// description: string;
// deviceSort: string;
// updateTime: string;
// type: string;
// industry: string;
// }
const props = defineProps({
device: {
type: Object as PropType<CardProductType>
model: {
type: Object,
default() {
return {};
}
}
});
@ -65,12 +69,12 @@ function getModelIcon(params: string) {
const cardClass = computed(() => [
"model-card",
{ "model-card_offline": props.device?.state === "离线" }
{ "model-card_offline": props.model?.state === "离线" }
]);
const deepAlgorithm = computed(() => [
"model-type",
{ "model-type_deep": props.device?.type === "深度学习" }
{ "model-type_deep": props.model?.model_type === "深度学习" }
]);
// const stateClass = computed(() => [
@ -82,28 +86,33 @@ const deepAlgorithm = computed(() => [
<template>
<div :class="cardClass" class="model_card_box">
<div class="model-header">
<div class="model-name">{{ device?.deviceSort }}</div>
<div class="model-type" :class="deepAlgorithm">{{ device?.type }}</div>
<div class="model-name">{{ model?.name }}</div>
<div class="model-type" :class="deepAlgorithm">
{{ model?.model_type }}
</div>
<div class="model-icon">
<img :src="getModelIcon(device?.industry)" />
<img :src="getModelIcon(model?.classification_name)" />
</div>
</div>
<div class="model-content">
<div class="model-version">
<i class="iconfont icon-banben model-content-icon" />
版本: <span>{{ "V1.0.0" }}</span>
版本: <span>{{ model?.default_version }}</span>
</div>
<div class="model-provider">
<i class="iconfont icon-tigongfang model-content-icon" />
提供方: <span>{{ "苏胜天" }}</span>
提供方: <span>{{ model?.provider }}</span>
</div>
<div class="model-updateTime">
<i class="iconfont icon-shijian model-content-icon" />
更新时间: <span>{{ device?.updateTime }}</span>
更新时间:
<span>{{
dayjs(model?.update_time).format("YYYY-MM-DD HH:mm:ss")
}}</span>
</div>
<div class="model-introduction">
模型简介:
<span>{{ device?.description }}</span>
<span>{{ model?.comment }}</span>
</div>
</div>
<div class="bg_logo" />

@ -1,6 +1,7 @@
<script setup lang="ts">
import ModelCard from "./components/ModelCard.vue";
import { getModelList } from "@/api/list";
// import { getModelList } from "@/api/list";
import { getModelsList } from "@/api/model";
import { onMounted, ref } from "vue";
defineOptions({
name: "ServerList"
@ -23,24 +24,29 @@ const deviceList = ref([]);
const searchValue = ref("");
const dataLoading = ref(true);
const modelNum = ref(0);
// const onSubmit = () => {
// console.log("submit!");
// };
const onPageSizeChange = (size: number) => {
pagination.value.pageSize = size;
pagination.value.current = 1;
getCardListData();
};
const onCurrentChange = (current: number) => {
pagination.value.current = current;
getCardListData();
};
const getCardListData = async () => {
try {
const { data } = await getModelList({});
deviceList.value = data.list;
console.log(data, "resData", data.list);
// const { data } = await getModelList({});
const { data } = await getModelsList(pagination.value);
deviceList.value = data.results;
modelNum.value = data.count;
console.log(data, "resData", data.results);
pagination.value = {
...pagination.value,
total: data.list.length
total: data.count
};
} catch (e) {
console.log(e);
@ -58,7 +64,8 @@ onMounted(() => {
<template>
<div class="main modelList_wrap">
<div class="modelList_header">
苏胜天大模型衍生模型库 <span class="text-[24px] text-[#154DDD]">256</span>
苏胜天大模型衍生模型库
<span class="text-[24px] text-[#154DDD]">{{ modelNum }}</span>
</div>
<div
class="modelList_body"
@ -67,30 +74,14 @@ onMounted(() => {
element-loading-svg-view-box="-10, -10, 50, 50"
>
<el-empty
v-show="
deviceList
.slice(
pagination.pageSize * (pagination.current - 1),
pagination.pageSize * pagination.current
)
.filter(v =>
v.deviceSort.toLowerCase().includes(searchValue.toLowerCase())
).length === 0
"
v-show="deviceList.length === 0"
:description="`${searchValue} 产品不存在`"
/>
<template v-if="pagination.total > 0">
<el-row :gutter="16">
<el-col
class="mb-4 w-[100%]"
v-for="(device, index) in deviceList
.slice(
pagination.pageSize * (pagination.current - 1),
pagination.pageSize * pagination.current
)
.filter(v =>
v.deviceSort.toLowerCase().includes(searchValue.toLowerCase())
)"
v-for="(model, index) in deviceList"
:key="index"
:xs="24"
:sm="24"
@ -98,7 +89,7 @@ onMounted(() => {
:lg="8"
:xl="6"
>
<ModelCard :device="device" />
<ModelCard :model="model" />
</el-col>
</el-row>
<div class="pagination_wrap">

@ -15,27 +15,31 @@ interface CardProductType {
}
const props = defineProps({
device: {
type: Object as PropType<CardProductType>
server: {
type: Object,
default() {
return {};
}
}
});
const cardClass = computed(() => [
"server-card",
{ "server-card_offline": props.device?.state === "离线" }
{ "server-card_offline": props.server?.state === "离线" }
]);
const stateClass = computed(() => [
"server-state",
{ "server-state_offline": props.device?.state === "离线" }
{ "server-state_offline": props.server?.state === "离线" }
]);
const generateRandomTwoDecimal = () => {
const generateRandomTwoDecimal = value => {
// [0, 1)
const randomFraction = Math.random();
// const randomFraction = Math.random();
// 100
const multipliedValue = randomFraction * 100;
// const multipliedValue = randomFraction * 100;
const multipliedValue = value;
// 使 Math.round()
return Math.round(multipliedValue) / 100;
@ -44,22 +48,22 @@ const generateRandomTwoDecimal = () => {
const progressData = ref([
{
label: "CPU",
percent: generateRandomTwoDecimal(),
percent: generateRandomTwoDecimal(props.server?.cpu),
strokeColor: "rgb(243,48,5)"
},
{
label: "内存",
percent: generateRandomTwoDecimal(),
percent: generateRandomTwoDecimal(props.server?.mem),
strokeColor: "rgb(33,169,122)"
},
{
label: "存储",
percent: generateRandomTwoDecimal(),
percent: generateRandomTwoDecimal(props.server?.storage),
strokeColor: "rgb(33,169,122)"
},
{
label: "GPU",
percent: generateRandomTwoDecimal(),
percent: generateRandomTwoDecimal(props.server?.gpu),
strokeColor: "rgb(250,173,20)"
}
]);
@ -71,7 +75,7 @@ const progressData = ref([
<div class="server-content-left">
<div
class="w-[100px] h-[100px] flex items-center justify-center"
v-if="props.device?.state === '离线'"
v-if="props.server?.state === '离线'"
>
<img
class="w-[82px] h-[58px]"
@ -83,7 +87,7 @@ const progressData = ref([
<AnimationPic :value="serverIcon" v-else />
</div>
<!-- <div class="server-name">{{ device?.deviceSort }}</div> -->
<div :class="stateClass">{{ device?.state }}</div>
<div :class="stateClass">{{ server?.state }}</div>
</div>
<div class="server-content">
<div class="server-content-right">

@ -1,6 +1,7 @@
<script setup lang="ts">
import ServerCard from "./components/ServerCard.vue";
import { getServerList } from "@/api/list";
// import { getServerList } from "@/api/list";
import { getServerList } from "@/api/server";
import { onMounted, ref } from "vue";
defineOptions({
name: "ServerList"
@ -17,30 +18,46 @@ const svg = `
" style="stroke-width: 4px; fill: rgba(0, 0, 0, 0)"/>
`;
const pagination = ref({ current: 1, pageSize: 9, total: 0 });
const pagination = ref({ current: 1, pageSize: 10, total: 0 });
const deviceList = ref([]);
const serverList = ref([]);
const serverNum = ref({
all_count: 0,
offline_count: 0,
online_count: 0
});
const searchValue = ref("");
const formData = ref({
status: "",
page: pagination.value.current,
pageSize: pagination.value.pageSize
});
const dataLoading = ref(true);
// const onSubmit = () => {
// console.log("submit!");
// };
const onPageSizeChange = (size: number) => {
pagination.value.pageSize = size;
pagination.value.current = 1;
formData.value.pageSize = size;
formData.value.page = 1;
getCardListData();
};
const onCurrentChange = (current: number) => {
pagination.value.current = current;
formData.value.page = current;
getCardListData();
};
const getCardListData = async () => {
try {
const { data } = await getServerList();
deviceList.value = data.list;
console.log(data.list);
const { data, all_count, offline_count, online_count } =
await getServerList(formData.value);
serverList.value = data.results;
console.log(data.results);
serverNum.value.all_count = all_count;
serverNum.value.offline_count = offline_count;
serverNum.value.online_count = online_count;
pagination.value = {
...pagination.value,
total: data.list.length
total: data.count
};
} catch (e) {
console.log(e);
@ -50,6 +67,11 @@ const getCardListData = async () => {
}, 500);
}
};
const selectState = (state: any) => {
formData.value.status = state;
formData.value.page = 1;
getCardListData();
};
onMounted(() => {
getCardListData();
});
@ -58,9 +80,15 @@ onMounted(() => {
<template>
<div class="main serve_wrap h-full">
<div class="serve_wrap_header">
<el-button type="primary"> {{ `全部状态(${14})` }} </el-button>
<el-button> {{ `在线(${9})` }}</el-button>
<el-button>{{ `离线(${3})` }}</el-button>
<el-button type="primary" @click="selectState">
{{ `全部状态(${serverNum.all_count})` }}
</el-button>
<el-button @click="selectState(1001)">
{{ `在线(${serverNum.online_count})` }}</el-button
>
<el-button @click="selectState(1002)">{{
`离线(${serverNum.offline_count})`
}}</el-button>
</div>
<div
class="serve_body"
@ -69,30 +97,14 @@ onMounted(() => {
element-loading-svg-view-box="-10, -10, 50, 50"
>
<el-empty
v-show="
deviceList
.slice(
pagination.pageSize * (pagination.current - 1),
pagination.pageSize * pagination.current
)
.filter(v =>
v.deviceSort.toLowerCase().includes(searchValue.toLowerCase())
).length === 0
"
v-show="serverList.length === 0"
:description="`${searchValue} 产品不存在`"
/>
<template v-if="pagination.total > 0">
<el-row :gutter="16">
<el-col
class="mb-4 w-[100%]"
v-for="(device, index) in deviceList
.slice(
pagination.pageSize * (pagination.current - 1),
pagination.pageSize * pagination.current
)
.filter(v =>
v.deviceSort.toLowerCase().includes(searchValue.toLowerCase())
)"
v-for="(server, index) in serverList"
:key="index"
:xs="24"
:sm="24"
@ -100,7 +112,7 @@ onMounted(() => {
:lg="6"
:xl="4"
>
<ServerCard :device="device" />
<ServerCard :server="server" />
</el-col>
</el-row>
<div class="pagination_wrap">

Loading…
Cancel
Save