- ![]()
+ ![]()
{
CMR-026CMR-027
![]()
{
CMR-026CMR-028
![]()
{
CMR-026CMR-029
![]()
{
CMR-026CMR-030
![]()
{
-
CMR-026CMR-031
![]()
{
-
+
+
设备列表
@@ -146,7 +152,7 @@ const selectDevice = (value, index) => {
+
设备ID
-{
设备名称
-
CMR-025
+{{ deviceInfo.name }}
设备S/N
@@ -183,11 +189,15 @@ const selectDevice = (value, index) => {
diff --git a/src/views/enterprise/index.vue b/src/views/enterprise/index.vue
index 30a0aa5..3ba3dd5 100644
--- a/src/views/enterprise/index.vue
+++ b/src/views/enterprise/index.vue
@@ -1,14 +1,15 @@
-
新建企业
@@ -149,24 +263,20 @@ const addAlgorithm = () => {
>
-
+
新建企业
-
企业管理
+企业管理
+
{
-
- 企业列表
+ 企业列表
+
+
+
{
@page-current-change="handleCurrentChange"
>
-
+
删除
@@ -307,7 +404,7 @@ const addAlgorithm = () => {
/>
-
+
diff --git a/src/views/myAlgorithm/index.vue b/src/views/myAlgorithm/index.vue
index d4f506d..06ba8d1 100644
--- a/src/views/myAlgorithm/index.vue
+++ b/src/views/myAlgorithm/index.vue
@@ -148,7 +148,7 @@ const addProject = product => {
- 企业详情
+ 企业详情
+
-
-
+
-
+
-
- - 企业全称：{{ "洛伦电子(南京)有限公司" }} -
-- 企业地址：{{ - "江苏省南京市雨花台区安德门大街259号" - }} -
-
-
- - ID：{{ "NJCJDQGZZ123456" }} -
-- 联系方式：{{ "13562563565" }} -
-
-
- - 企业联系人：{{ "李洛伦" }} -
-
- 平台服务：{{ "2024年12月21日" }}
-
+
+ + 企业全称：{{ enterpriseInfo.privateEnterprise }} +
++ 企业地址：{{ enterpriseInfo.address }} +
+
+
+ + ID：{{ enterpriseInfo.enterpriseId }} +
++ 联系方式：{{ enterpriseInfo.phone }} +
+
+
+
+ 企业联系人：{{ enterpriseInfo.contacts }} +
+
+ 平台服务：{{ enterpriseInfo.platformServices }}
+
企业算法库
-
-
我的算法库
+我的算法库
{
.msg-box-style {
// --el-messagebox-width: 580px;
// height: 184px;
- .btn-custom-cancel:hover {
- color: #fff;
- // color: skyblue;
- background-color: #1c0d82;
- opacity: 0.5;
- }
+ // .btn-custom-cancel:hover {
+ // color: #fff;
+ // // color: skyblue;
+ // background-color: #1c0d82;
+ // opacity: 0.5;
+ // }
.btn-custom-confirm {
color: #fff;
diff --git a/src/views/platformAlgorithm/index.vue b/src/views/platformAlgorithm/index.vue
index c58e58b..33f3d2c 100644
--- a/src/views/platformAlgorithm/index.vue
+++ b/src/views/platformAlgorithm/index.vue
@@ -33,7 +33,7 @@ const dataStaticList = ref([]);
const loading = ref(true);
const pagination = reactive({
total: 0,
- pageSize: 10,
+ pageSize: 15,
currentPage: 1,
background: false
});
@@ -149,7 +149,7 @@ function handleSelectionChange(val) {
console.log("handleSelectionChange", val);
}
-async function onSearch(page = 1, size = 10) {
+async function onSearch(page = 1, size = 15) {
loading.value = true;
const { data } = await getAlgorithmList();
console.log(data);
@@ -194,14 +194,58 @@ const options = [
{
value: "深度学习",
label: "深度学习算法"
+ }
+];
+const optionsB = [
+ {
+ value: "全部",
+ label: "全部"
},
{
value: "通用类",
label: "通用类"
},
{
- value: "OCR文字识别",
- label: "OCR文字识别"
+ value: "手机、电子、SMT",
+ label: "手机、电子、SMT"
+ },
+ {
+ value: "手机、液晶显示屏",
+ label: "手机、液晶显示屏"
+ },
+ {
+ value: "手机、电子、手机、工件装配、SMT",
+ label: "手机、电子、手机、工件装配、SMT"
+ }
+];
+const optionsC = [
+ {
+ value: "全部",
+ label: "全部"
+ },
+ {
+ value: "OCR识别",
+ label: "OCR识别"
+ },
+ {
+ value: "尺寸测量",
+ label: "尺寸测量"
+ },
+ {
+ value: "机器人定位引导",
+ label: "机器人定位引导"
+ },
+ {
+ value: "多目标定位",
+ label: "多目标定位"
+ },
+ {
+ value: "装配目标检测",
+ label: "装配目标检测"
+ },
+ {
+ value: "PCB板表面缺陷检测",
+ label: "PCB板表面缺陷检测"
}
];
onMounted(() => {
@@ -215,7 +259,7 @@ const formDialogVisible = ref(false);
重置
{{ row.name }}
{{ row.type }}
@@ -328,7 +372,7 @@ const formDialogVisible = ref(false);
删除
@@ -347,12 +391,12 @@ const formDialogVisible = ref(false);
.msg-box-style {
// --el-messagebox-width: 580px;
// height: 184px;
- .btn-custom-cancel:hover {
- color: #fff;
- // color: skyblue;
- background-color: #1c0d82;
- opacity: 0.5;
- }
+ // .btn-custom-cancel:hover {
+ // color: #fff;
+ // // color: skyblue;
+ // background-color: #1c0d82;
+ // opacity: 0.5;
+ // }
.btn-custom-confirm {
color: #fff;
@@ -367,4 +411,25 @@ const formDialogVisible = ref(false);
}
}
}
+
+.reset-margin {
+ // --el-button-text-color: #e80d0d;
+ color: #e80d0d !important;
+
+ &:hover {
+ opacity: 0.5;
+ }
+}
+
+.tagStyle {
+ color: rgb(68 174 245);
+ background: rgb(22 148 229 / 5%);
+ border: 1px solid rgb(22 148 229 / 60%);
+}
+
+.tagDeepStyle {
+ color: rgb(247 95 25);
+ background: rgb(247 95 25 / 10%);
+ border: 1px solid rgb(247 95 25 / 100%);
+}
diff --git a/src/views/project/details/components/Bar.vue b/src/views/project/details/components/Bar.vue
index 902f4f3..9463196 100644
--- a/src/views/project/details/components/Bar.vue
+++ b/src/views/project/details/components/Bar.vue
@@ -115,7 +115,7 @@ setOptions(
// data: [1600, 2460, 4500]
// },
{
- name: "star",
+ name: "已检出",
type: "bar",
barWidth: "20%",
itemStyle: {
@@ -134,7 +134,7 @@ setOptions(
},
{
//折线(右边数据)
- name: "总量",
+ name: "缺陷检出",
type: "line",
yAxisIndex: 1,
data: [160, 246, 450, 160, 246],
diff --git a/src/views/project/details/components/BarDetail.vue b/src/views/project/details/components/BarDetail.vue
index b74fa9f..af2acf3 100644
--- a/src/views/project/details/components/BarDetail.vue
+++ b/src/views/project/details/components/BarDetail.vue
@@ -19,6 +19,13 @@ const barChartRef = ref(null);
const { setOptions, resize } = useECharts(barChartRef as Ref, {
theme
});
+const props = defineProps({
+ barInfo: {
+ type: Object
+ }
+});
+
+const barData = ref({ ...props.barInfo });
setOptions(
{
@@ -37,7 +44,7 @@ setOptions(
}
},
grid: {
- bottom: "20px",
+ bottom: "30px",
right: "30px",
left: "40px"
},
@@ -54,7 +61,8 @@ setOptions(
alignWithLabel: true
},
axisLabel: {
- interval: 0
+ interval: 0,
+ color: "#333"
// width: "70",
// overflow: "truncate"
},
@@ -65,7 +73,11 @@ setOptions(
yAxis: [
{
type: "value",
- triggerEvent: true
+ triggerEvent: true,
+ axisLabel: {
+ //y轴字体
+ color: "#333"
+ }
},
{
type: "value",
@@ -74,7 +86,11 @@ setOptions(
//分割线配置
show: false
},
- triggerEvent: true
+ triggerEvent: true,
+ axisLabel: {
+ //y轴字体
+ color: "#333"
+ }
}
],
series: [
@@ -115,7 +131,7 @@ setOptions(
// data: [1600, 2460, 4500]
// },
{
- name: "star",
+ name: "已检出",
type: "bar",
barWidth: "20%",
itemStyle: {
@@ -130,14 +146,14 @@ setOptions(
}
])
},
- data: [3620, 7500, 1450, 3620, 7500]
+ data: barData.value.barList
},
{
//折线(右边数据)
- name: "总量",
+ name: "缺陷检出",
type: "line",
yAxisIndex: 1,
- data: [160, 246, 450, 160, 246],
+ data: barData.value.lineList,
itemStyle: {
//折线颜色
color: "#0246F6"
diff --git a/src/views/project/details/components/DialogForm.vue b/src/views/project/details/components/DialogForm.vue
index 4b80088..9d5415f 100644
--- a/src/views/project/details/components/DialogForm.vue
+++ b/src/views/project/details/components/DialogForm.vue
@@ -30,14 +30,13 @@ const props = defineProps({
}
}
});
-
const ruleFormRef = ref();
const formVisible = ref(false);
const formData = ref(props.data);
const title = ref("新建应用算法");
const customWidth = ref(560);
const customType = ref(props.type);
-console.log(customType, "customType");
+console.log(formData, "customType");
const pagination = ref({ current: 1, pageSize: 12, total: 48 });
const onPageSizeChange = (size: number) => {
pagination.value.pageSize = size;
@@ -112,9 +111,22 @@ const submitForm = async (formEl: FormInstance | undefined) => {
if (!formEl) return;
await formEl.validate(valid => {
if (valid) {
- message("提交成功", { type: "success" });
- formVisible.value = false;
- resetForm(formEl);
+ if (activeStep.value == 0 && customType.value == "newBuilt") {
+ activeStep.value++;
+ } else {
+ message("提交成功", { type: "success" });
+ // formVisible.value = false;
+ const data = formData.value;
+ console.log(data);
+ if (customType.value == "newBuilt") {
+ emit("submit-form", data);
+ }
+ formVisible.value = false;
+ formData.value = {};
+ activeStep.value = 0;
+ // closeDialog();
+ // resetForm(formEl);
+ }
}
});
};
@@ -127,20 +139,58 @@ const resetForm = (formEl: FormInstance | undefined) => {
const closeDialog = () => {
formVisible.value = false;
activeStep.value = 0;
+ phoneChecked.value = false;
+ httpFirst.value = false;
+ httpSecond.value = false;
+ httpThird.value = false;
+ formData.value.inputSource = "";
resetForm(ruleFormRef.value);
};
const nextStep = () => {
- if (activeStep.value++ > 2) activeStep.value = 0;
+ if (activeStep.value == 1) {
+ activeStep.value--;
+ } else {
+ activeStep.value++;
+ }
};
const phoneChecked = ref(false);
const httpFirst = ref(false);
const httpSecond = ref(false);
const httpThird = ref(false);
-const count = ref(3);
+const cardInfoData = ref([
+ {
+ typeId: 1,
+ isChecked: false
+ },
+ {
+ typeId: 2,
+ isChecked: false
+ },
+ {
+ typeId: 3,
+ isChecked: false
+ }
+]);
+
+const emit = defineEmits(["update:visible", "submit-form"]);
+function getMobileMsg() {
+ ruleFormRef.value.clearValidate();
+}
+
+function selectCard(cardInfo) {
+ cardInfoData.value.forEach(item => {
+ if (item.typeId == cardInfo.typeId) {
+ item.isChecked = cardInfo.isChecked;
+ } else {
+ item.isChecked = false;
+ }
+ });
+
+ console.log(cardInfo);
+}
-const emit = defineEmits(["update:visible"]);
watch(
() => formVisible.value,
val => {
@@ -153,16 +203,17 @@ watch(
val => {
if (val == "newBuilt") {
title.value = "新建应用算法";
- customWidth.value = 580;
+ customWidth.value = 620;
+ formData.value = props.data;
} else if (val == "history") {
title.value = "历史推理";
customWidth.value = 790;
} else if (val == "alarm") {
- title.value = "告警配置";
+ title.value = "告警设置";
customWidth.value = 580;
} else if (val == "algorithm") {
title.value = "算法配置";
- customWidth.value = 580;
+ customWidth.value = 620;
}
customType.value = val;
}
@@ -183,7 +234,20 @@ watch(
);
const rules = {
- name: [{ required: true, message: "请输入产品名称", trigger: "blur" }]
+ inputSource: [{ required: true, message: "请选择输入源", trigger: "blur" }],
+ platformWarn: [
+ { required: true, message: "请选择检测类型", trigger: "blur" }
+ ],
+ phone: [{ required: true, message: "请输入手机号", trigger: "blur" }],
+ httpAddressA: [
+ { required: true, message: "请输入HTTP调用地址", trigger: "blur" }
+ ],
+ httpAddressB: [
+ { required: true, message: "请输入HTTP调用地址", trigger: "blur" }
+ ],
+ httpAddressC: [
+ { required: true, message: "请输入HTTP调用地址", trigger: "blur" }
+ ]
};
@@ -211,16 +275,18 @@ const rules = {
:rules="rules"
label-position="top"
label-width="160px"
- v-if="
- (activeStep == 0 && customType == 'newBuilt') ||
- customType == 'algorithm'
- "
>
-
+
-
+
@@ -242,28 +308,120 @@ const rules = {
/>
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
@@ -274,48 +432,78 @@ const rules = {
-
+
-
+
-
+
-
-
+ -->
+
批量导出
@@ -334,7 +522,12 @@ const rules = {
-
+
{{ "导出" }}
@@ -362,8 +555,8 @@ const rules = {
下一步 {{ activeStep == 0 ? "下一步" : "上一步" }}
import { ref } from "vue";
-import { useRenderIcon } from "@/components/ReIcon/src/hooks";
import BarDetail from "./BarDetail.vue";
import Radar from "./Radar.vue";
-import AddFill from "@iconify-icons/ri/add-circle-line";
+import History from "@/assets/svg/history_icon.svg?component";
+import Algorithm from "@/assets/svg/algorithm_icon.svg?component";
+import Alarm from "@/assets/svg/alarm_icon.svg?component";
+import Model from "@/assets/svg/model_icon.svg?component";
defineOptions({
name: "ModelCard"
@@ -21,8 +23,9 @@ const props = defineProps({
type: Object
}
});
-console.log(props);
-
+// console.log(props);
+const modelData = ref({ ...props.modelInfo });
+console.log(modelData);
const loading = ref(true);
const emit = defineEmits(["btn-type"]);
const handleClickBtn = type => {
@@ -39,38 +42,42 @@ setTimeout(() => {
-
平台算法库
+平台算法库
+
+
+
{{ "苏胜天OCR文字识别模型" }}v1.6.25
+ >{{ modelData.modelName }}{{ modelData.version }}
-
-
-
@@ -283,7 +266,7 @@ setTimeout(() => {
display: flex;
flex-direction: column;
// height: 300px;
- padding: 10px;
+ padding: 10px 0;
margin-bottom: 10px;
// background: #fafafa;
}
@@ -400,6 +383,7 @@ setTimeout(() => {
height: 260px;
padding: 16px;
background: #f2f6ff;
+ border-radius: 4px;
}
.list-item .list-item-content .list-item-content-box:nth-of-type(2) {
diff --git a/src/views/project/details/components/Pie.vue b/src/views/project/details/components/Pie.vue
index 45b8e95..4146158 100644
--- a/src/views/project/details/components/Pie.vue
+++ b/src/views/project/details/components/Pie.vue
@@ -30,7 +30,11 @@ setOptions(
}
},
tooltip: {
- trigger: "item"
+ trigger: "item",
+ formatter: function (params) {
+ // 图例值格式化
+ return `${params.value}%`;
+ }
},
legend: {
icon: "rect",
@@ -58,9 +62,14 @@ setOptions(
borderWidth: 1
},
data: [
- { value: 1600, name: "已占用" },
- { value: 400, name: "未占用" }
- ]
+ { value: 80, name: "已占用" },
+ { value: 20, name: "未占用" }
+ ],
+ label: {
+ formatter: function (params) {
+ return params.value + "%";
+ }
+ }
// emphasis: {
// itemStyle: {
// shadowBlur: 10,
diff --git a/src/views/project/details/components/Radar.vue b/src/views/project/details/components/Radar.vue
index 913efe1..04aadc2 100644
--- a/src/views/project/details/components/Radar.vue
+++ b/src/views/project/details/components/Radar.vue
@@ -23,12 +23,22 @@ const { setOptions, resize } = useECharts(
}
);
const dataMax = ref([
- { name: "类型A", max: 15 },
- { name: "类型B", max: 15 },
- { name: "类型C", max: 15 },
- { name: "类型D", max: 15 },
- { name: "类型E", max: 15 }
+ { name: "类型A", max: 15, color: "#333" },
+ { name: "类型B", max: 15, color: "#333" },
+ { name: "类型C", max: 15, color: "#333" },
+ { name: "类型D", max: 15, color: "#333" },
+ { name: "类型E", max: 15, color: "#333" }
]);
+
+const props = defineProps({
+ radarInfo: {
+ type: Array
+ }
+});
+
+const radarData = ref([...props.radarInfo]);
+console.log(radarData);
+
setOptions(
{
title: {
@@ -94,16 +104,7 @@ setOptions(
},
symbolSize: 4, //圆点大小
symbol: "circle", //圆点样式
- data: [
- {
- name: "类型A",
- value: [5, 6, 7, 8, 9]
- },
- {
- name: "类型B",
- value: [9, 8, 7, 6, 5]
- }
- ]
+ data: radarData.value
}
]
},
diff --git a/src/views/project/details/components/algorithmCard.vue b/src/views/project/details/components/algorithmCard.vue
index 3413868..ed2d5bd 100644
--- a/src/views/project/details/components/algorithmCard.vue
+++ b/src/views/project/details/components/algorithmCard.vue
@@ -4,23 +4,28 @@ import { ref } from "vue";
// import BarDetail from "./BarDetail.vue";
// import Radar from "./Radar.vue";
// import AddFill from "@iconify-icons/ri/add-circle-line";
-import logon from "@/assets/static/logo_icon.png";
+import logon from "@/assets/svg/logo_icon.svg?component";
defineOptions({
name: "AlgorithmCard"
});
const props = defineProps({
- modelInfo: {
- type: Object
+ cardInfo: {
+ type: Object,
+ default: () => {
+ return {};
+ }
}
});
console.log(props);
const loading = ref(true);
-const checked = ref(false);
+const cardInfoData = ref(props.cardInfo);
+const emit = defineEmits(["select-card"]);
function selectCard() {
- checked.value = !checked.value;
+ cardInfoData.value.isChecked = !cardInfoData.value.isChecked;
+ emit("select-card", cardInfoData.value);
}
setTimeout(() => {
loading.value = !loading.value;
@@ -30,13 +35,15 @@ setTimeout(() => {
- ![]()
+ {
diff --git a/src/views/project/list/index.vue b/src/views/project/list/index.vue
index 6e1de8d..b1afc2e 100644
--- a/src/views/project/list/index.vue
+++ b/src/views/project/list/index.vue
@@ -36,7 +36,8 @@ const INITIAL_DATA = {
type: "",
mark: "",
leader: "",
- phone: ""
+ phone: "",
+ modelNum: ""
};
const pagination = ref({ current: 1, pageSize: 12, total: 0 });
@@ -148,7 +149,7 @@ const addProject = product => {
- {
>
diff --git a/src/views/screen/components/LongBoxGroup.vue b/src/views/screen/components/LongBoxGroup.vue
index f50858b..8fe4ca2 100644
--- a/src/views/screen/components/LongBoxGroup.vue
+++ b/src/views/screen/components/LongBoxGroup.vue
@@ -1,4 +1,6 @@
-
+
项目列表
+项目列表
@@ -17,22 +19,22 @@
diff --git a/src/views/screen/components/VueChart.vue b/src/views/screen/components/VueChart.vue
index a3fb75e..65b074a 100644
--- a/src/views/screen/components/VueChart.vue
+++ b/src/views/screen/components/VueChart.vue
@@ -21,9 +21,13 @@ function clear() {
}
function draw() {
- clear();
- chart = echarts.init(elChart.value);
- chart.setOption(props.option);
+ if (chart) {
+ chart.setOption(props.option);
+ } else {
+ clear();
+ chart = echarts.init(elChart.value);
+ chart.setOption(props.option);
+ }
}
onMounted(draw);
diff --git a/src/views/screen/components/charts/BarChart2.vue b/src/views/screen/components/charts/BarChart2.vue
index 444caa5..4835198 100644
--- a/src/views/screen/components/charts/BarChart2.vue
+++ b/src/views/screen/components/charts/BarChart2.vue
@@ -21,26 +21,26 @@ const props = defineProps({
default: () => []
},
data: {
- type: Array,
- default: () => []
+ type: Object,
+ default: () => {}
}
});
-
const name_list = computed(() => {
- return props.data.map((item: any) => {
+ return props.data.nameList.map((item: any) => {
return item.name;
});
});
-const value_list = computed(() => {
- return props.data.map((item: any) => {
- return item.value;
- });
-});
+// const value_list = computed(() => {
+// return props.data.map((item: any) => {
+// return item.value;
+// });
+// });
const value_100_minus_list = computed(() => {
- return props.data.map((item: any) => {
- return parseInt(100 - parseInt(item.value));
+ return props.data.valueList.map((item: any) => {
+ // return parseInt(100 - parseInt(item.value));
+ return parseInt(parseInt(item.value));
});
});
@@ -51,13 +51,14 @@ const chartOption = computed(() => {
},
legend: {
bottom: 0,
- data: ["总量", "占用"],
+ show: false,
+ data: ["占用"],
textStyle: {
color: "rgba(255, 255, 255, 0.40)"
}
},
grid: {
- top: "30px",
+ top: "50px",
left: "50px",
bottom: "50px",
right: "10px"
@@ -77,18 +78,23 @@ const chartOption = computed(() => {
show: true,
interval: "auto",
formatter: "{value} %"
- }
+ },
+ animationDuration: 300,
+ animationDurationUpdate: 300,
+ animationEasing: "linear",
+ animationEasingUpdate: "linear"
},
series: [
+ // {
+ // data: value_list.value,
+ // type: "bar",
+ // stack: "use",
+ // color: "#5BF6EF",
+ // name: "总量",
+ // barWidth: "24px"
+ // },
{
- data: value_list.value,
- type: "bar",
- stack: "use",
- color: "#5BF6EF",
- name: "总量",
- barWidth: "24px"
- },
- {
+ // realtimeSort: true,
data: value_100_minus_list.value,
type: "bar",
stack: "use",
@@ -97,6 +103,10 @@ const chartOption = computed(() => {
barWidth: "24px"
}
]
+ // animationDuration: 3000,
+ // animationDurationUpdate: 3000,
+ // animationEasing: "linear",
+ // animationEasingUpdate: "linear"
};
});
diff --git a/src/views/screen/components/charts/LineChart1.vue b/src/views/screen/components/charts/LineChart1.vue
index c44a0b0..01f9f87 100644
--- a/src/views/screen/components/charts/LineChart1.vue
+++ b/src/views/screen/components/charts/LineChart1.vue
@@ -43,7 +43,7 @@ const chartOption = computed(() => {
type: "category",
data: name_list.value,
axisLabel: {
- color: "rgba(255, 255, 255, 0.80)"
+ color: "rgba(255, 255, 255, 0.40)"
}
},
yAxis: [
@@ -65,14 +65,14 @@ const chartOption = computed(() => {
axisLabel: {
show: true,
formatter: "{value}", //右侧Y轴文字显示
- color: "rgba(255, 255, 255, 0.80)"
+ color: "rgba(255, 255, 255, 0.40)"
}
}
],
grid: {
top: "30px",
left: "40px",
- bottom: "20px",
+ bottom: "30px",
right: "10px"
},
series: [
@@ -81,7 +81,7 @@ const chartOption = computed(() => {
type: "line",
smooth: true,
symbol: "circle", //标记的图形为实心圆
- symbolSize: 15, //标记的大小
+ symbolSize: 6, //标记的大小
itemStyle: {
//折线拐点标志的样式
color: "#1FC6FF"
diff --git a/src/views/screen/components/charts/LineChart2.vue b/src/views/screen/components/charts/LineChart2.vue
index 6d3efe3..0fb1836 100644
--- a/src/views/screen/components/charts/LineChart2.vue
+++ b/src/views/screen/components/charts/LineChart2.vue
@@ -44,7 +44,7 @@ const chartOption = computed(() => {
type: "category",
data: name_list.value,
axisLabel: {
- color: "rgba(255, 255, 255, 0.60)"
+ color: "rgba(255, 255, 255, 0.40)"
}
},
yAxis: [
@@ -73,7 +73,7 @@ const chartOption = computed(() => {
grid: {
top: "30px",
left: "40px",
- bottom: "20px",
+ bottom: "30px",
right: "10px"
},
series: [
@@ -82,7 +82,7 @@ const chartOption = computed(() => {
type: "line",
smooth: true,
symbol: "circle", //标记的图形为实心圆
- symbolSize: 15, //标记的大小
+ symbolSize: 6, //标记的大小
itemStyle: {
//折线拐点标志的样式
color: "#1FC6FF"
diff --git a/src/views/screen/components/charts/Pie1.vue b/src/views/screen/components/charts/Pie1.vue
index 4d34484..2011ca8 100644
--- a/src/views/screen/components/charts/Pie1.vue
+++ b/src/views/screen/components/charts/Pie1.vue
@@ -74,18 +74,25 @@ const chartOption = computed(() => {
label: {
color: "rgba(255, 255, 255, 0.80)",
formatter: function (params) {
+ console.log(params);
return params.name + "{hr|" + params.value + "}";
},
rich: {
hr: {
align: "center",
color: "inherit",
+ fontWeight: "bold",
fontSize: 14
}
}
},
labelLine: {
- show: true
+ show: true,
+ length: 20,
+ length2: 20,
+ lineStyle: {
+ color: "#fff" // 设置标示线的颜色
+ }
},
data: props.data
},
diff --git a/src/views/screen/components/charts/Pie3D.vue b/src/views/screen/components/charts/Pie3D.vue
index 70fede5..872c065 100644
--- a/src/views/screen/components/charts/Pie3D.vue
+++ b/src/views/screen/components/charts/Pie3D.vue
@@ -3,7 +3,7 @@
style="display: flex; justify-content: center; width: 100%; height: 278px"
>
{{ name }}
- 
+ ![]()
+
-
+ ![]()
+
-
+ ![]()
+
-
+ ![]()
+
-
+ ![]()
+
-
+ ![]()
+
- 
+ ![]()
${option.series[params.seriesIndex].pieData?.value || ""}`;
}
- return "";
+ return "{value} %";
}
},
xAxis3D: {
diff --git a/src/views/screen/index.vue b/src/views/screen/index.vue
index bf89b5d..3e5930e 100644
--- a/src/views/screen/index.vue
+++ b/src/views/screen/index.vue
@@ -48,26 +48,30 @@ const randomIntFn = (min: number, max: number) => {
return Math.floor(Math.random() * (max - min + 1) + min);
};
-const randomFloatFn = (min: number, max: number) => {
- return (Math.random() * (max - min + 1) + min).toFixed(2);
+// const randomFloatFn = (min: number, max: number) => {
+// return (Math.random() * (max - min + 1) + min).toFixed(2);
+// };
+
+const randomRangeFn = (min: number, max: number) => {
+ return parseInt(Math.random() * (max - min) + min).toFixed(2);
};
setInterval(() => {
//card1
- setTimeout(() => {
- state.data.card1.data[0].value = randomIntFn(0, 1000);
- state.data.card1.data[1].value = randomIntFn(0, 1000);
- }, 100);
+ // setTimeout(() => {
+ // state.data.card1.data[0].value = randomIntFn(0, 1000);
+ // state.data.card1.data[1].value = randomIntFn(0, 1000);
+ // }, 100);
//card2
- setTimeout(() => {
- state.data.card2.data[0].value = randomIntFn(0, 1000);
- state.data.card2.data[1].value = randomIntFn(0, 1000);
- state.data.card2.data[2].value = randomIntFn(0, 1000);
- state.data.card2.data[3].value = randomIntFn(0, 1000);
- state.data.card2.data[4].value = randomIntFn(0, 1000);
- state.data.card2.data[5].value = randomIntFn(0, 1000);
- state.data.card2.data[6].value = randomIntFn(0, 1000);
- }, 200);
+ // setTimeout(() => {
+ // state.data.card2.data[0].value = randomIntFn(0, 1000);
+ // state.data.card2.data[1].value = randomIntFn(0, 1000);
+ // state.data.card2.data[2].value = randomIntFn(0, 1000);
+ // state.data.card2.data[3].value = randomIntFn(0, 1000);
+ // state.data.card2.data[4].value = randomIntFn(0, 1000);
+ // state.data.card2.data[5].value = randomIntFn(0, 1000);
+ // state.data.card2.data[6].value = randomIntFn(0, 1000);
+ // }, 200);
//card3
setTimeout(() => {
@@ -106,62 +110,101 @@ setInterval(() => {
}, 500);
//card7
- setTimeout(() => {
- state.data.card7.data[0].value = randomIntFn(0, 500);
- state.data.card7.data[1].value = randomIntFn(0, 500);
- }, 600);
+ // setTimeout(() => {
+ // state.data.card7.data[0].value = randomIntFn(0, 500);
+ // state.data.card7.data[1].value = randomIntFn(0, 500);
+ // }, 600);
//card8
setTimeout(() => {
- state.data.card8.data.cpu_used = randomFloatFn(0, 100);
- state.data.card8.data.memory_used = randomFloatFn(0, 100);
- state.data.card8.data.disk_used = randomFloatFn(0, 100);
- state.data.card8.data.image_server_used = randomFloatFn(0, 100);
+ // state.data.card8.data.cpu_used = randomFloatFn(0, 100);
+ // state.data.card8.data.memory_used = randomFloatFn(0, 100);
+ state.data.card8.data.cpu_used = randomRangeFn(90, 100);
+ state.data.card8.data.memory_used = randomRangeFn(90, 100);
+ // state.data.card8.data.disk_used = randomFloatFn(0, 100);
+ // state.data.card8.data.image_server_used = randomFloatFn(0, 100);
}, 700);
//card9
- setTimeout(() => {
- state.data.card9.data[0].value = randomIntFn(0, 100);
- state.data.card9.data[1].value = randomIntFn(0, 100);
- state.data.card9.data[2].value = randomIntFn(0, 100);
- state.data.card9.data[3].value = randomIntFn(0, 100);
- state.data.card9.data[4].value = randomIntFn(0, 100);
- state.data.card9.data[5].value = randomIntFn(0, 100);
- state.data.card9.data[6].value = randomIntFn(0, 100);
- state.data.card9.data[7].value = randomIntFn(0, 100);
- state.data.card9.data[8].value = randomIntFn(0, 100);
- state.data.card9.data[9].value = randomIntFn(0, 100);
- state.data.card9.data[10].value = randomIntFn(0, 100);
- state.data.card9.data[11].value = randomIntFn(0, 100);
- }, 800);
+ // setTimeout(() => {
+ // state.data.card9.data[0].value = randomIntFn(0, 100);
+ // state.data.card9.data[1].value = randomIntFn(0, 100);
+ // state.data.card9.data[2].value = randomIntFn(0, 100);
+ // state.data.card9.data[3].value = randomIntFn(0, 100);
+ // state.data.card9.data[4].value = randomIntFn(0, 100);
+ // state.data.card9.data[5].value = randomIntFn(0, 100);
+ // state.data.card9.data[6].value = randomIntFn(0, 100);
+ // state.data.card9.data[7].value = randomIntFn(0, 100);
+ // state.data.card9.data[8].value = randomIntFn(0, 100);
+ // state.data.card9.data[9].value = randomIntFn(0, 100);
+ // state.data.card9.data[10].value = randomIntFn(0, 100);
+ // state.data.card9.data[11].value = randomIntFn(0, 100);
+ // }, 800);
//card10
setTimeout(() => {
- state.data.card10.cloud_cpu_used_top5[0].value = randomFloatFn(0, 100);
- state.data.card10.cloud_cpu_used_top5[1].value = randomFloatFn(0, 100);
- state.data.card10.cloud_cpu_used_top5[2].value = randomFloatFn(0, 100);
- state.data.card10.cloud_cpu_used_top5[3].value = randomFloatFn(0, 100);
- state.data.card10.cloud_cpu_used_top5[4].value = randomFloatFn(0, 100);
+ state.data.card10.cloud_cpu_used_top5[0].value = randomRangeFn(95, 100);
+ state.data.card10.cloud_cpu_used_top5[1].value = randomRangeFn(90, 94);
+ state.data.card10.cloud_cpu_used_top5[2].value = randomRangeFn(85, 89);
+ state.data.card10.cloud_cpu_used_top5[3].value = randomRangeFn(80, 84);
+ state.data.card10.cloud_cpu_used_top5[4].value = randomRangeFn(75, 79);
- state.data.card10.cloud_memory_used_top5[0].value = randomFloatFn(0, 100);
- state.data.card10.cloud_memory_used_top5[1].value = randomFloatFn(0, 100);
- state.data.card10.cloud_memory_used_top5[2].value = randomFloatFn(0, 100);
- state.data.card10.cloud_memory_used_top5[3].value = randomFloatFn(0, 100);
- state.data.card10.cloud_memory_used_top5[4].value = randomFloatFn(0, 100);
+ state.data.card10.cloud_memory_used_top5[0].value = randomRangeFn(95, 100);
+ state.data.card10.cloud_memory_used_top5[1].value = randomRangeFn(90, 94);
+ state.data.card10.cloud_memory_used_top5[2].value = randomRangeFn(85, 89);
+ state.data.card10.cloud_memory_used_top5[3].value = randomRangeFn(80, 84);
+ state.data.card10.cloud_memory_used_top5[4].value = randomRangeFn(75, 79);
- state.data.card10.local_cpu_used_top5[0].value = randomFloatFn(0, 100);
- state.data.card10.local_cpu_used_top5[1].value = randomFloatFn(0, 100);
- state.data.card10.local_cpu_used_top5[2].value = randomFloatFn(0, 100);
- state.data.card10.local_cpu_used_top5[3].value = randomFloatFn(0, 100);
- state.data.card10.local_cpu_used_top5[4].value = randomFloatFn(0, 100);
+ state.data.card10.local_cpu_used_top5[0].value = randomRangeFn(95, 100);
+ state.data.card10.local_cpu_used_top5[1].value = randomRangeFn(90, 94);
+ state.data.card10.local_cpu_used_top5[2].value = randomRangeFn(85, 89);
+ state.data.card10.local_cpu_used_top5[3].value = randomRangeFn(80, 84);
+ state.data.card10.local_cpu_used_top5[4].value = randomRangeFn(75, 79);
- state.data.card10.local_memory_used_top5[0].value = randomFloatFn(0, 100);
- state.data.card10.local_memory_used_top5[1].value = randomFloatFn(0, 100);
- state.data.card10.local_memory_used_top5[2].value = randomFloatFn(0, 100);
- state.data.card10.local_memory_used_top5[3].value = randomFloatFn(0, 100);
- state.data.card10.local_memory_used_top5[4].value = randomFloatFn(0, 100);
+ state.data.card10.local_memory_used_top5[0].value = randomRangeFn(95, 100);
+ state.data.card10.local_memory_used_top5[1].value = randomRangeFn(90, 94);
+ state.data.card10.local_memory_used_top5[2].value = randomRangeFn(85, 89);
+ state.data.card10.local_memory_used_top5[3].value = randomRangeFn(80, 84);
+ state.data.card10.local_memory_used_top5[4].value = randomRangeFn(75, 79);
}, 900);
}, 10000);
+//card1
+// setTimeout(() => {
+// state.data.card1.data[0].value = randomIntFn(0, 1000);
+// state.data.card1.data[1].value = randomIntFn(0, 1000);
+// }, 100);
+//card2
+// setTimeout(() => {
+// state.data.card2.data[0].value = randomIntFn(0, 1000);
+// state.data.card2.data[1].value = randomIntFn(0, 1000);
+// state.data.card2.data[2].value = randomIntFn(0, 1000);
+// state.data.card2.data[3].value = randomIntFn(0, 1000);
+// state.data.card2.data[4].value = randomIntFn(0, 1000);
+// state.data.card2.data[5].value = randomIntFn(0, 1000);
+// state.data.card2.data[6].value = randomIntFn(0, 1000);
+// }, 200);
+setInterval(() => {
+ // for (let i = 0; i < state.data.card9.data.valueList.length; i++) {
+ // // if (state.data.card9.data.valueList[i] % 2 == 0) {
+ // // state.data.card9.data.valueList[i] -= Math.round(Math.random() * 10);
+ // // } else {
+ // // state.data.card9.data.valueList[i] += Math.round(Math.random() * 20);
+ // // }
+ // state.data.card9.data.valueList[i].value = randomIntFn(0, 100);
+ // }
+ state.data.card9.data.valueList[0].value = randomRangeFn(90, 100);
+ state.data.card9.data.valueList[1].value = randomRangeFn(90, 100);
+ state.data.card9.data.valueList[2].value = randomRangeFn(90, 100);
+ state.data.card9.data.valueList[3].value = randomRangeFn(80, 100);
+ state.data.card9.data.valueList[4].value = randomRangeFn(90, 100);
+ state.data.card9.data.valueList[5].value = randomRangeFn(70, 100);
+ state.data.card9.data.valueList[6].value = randomRangeFn(60, 100);
+ state.data.card9.data.valueList[7].value = randomRangeFn(50, 100);
+ state.data.card9.data.valueList[8].value = randomRangeFn(80, 100);
+ state.data.card9.data.valueList[9].value = randomRangeFn(60, 100);
+ state.data.card9.data.valueList[10].value = randomRangeFn(70, 100);
+ state.data.card9.data.valueList[11].value = randomRangeFn(30, 100);
+}, 2000);
diff --git a/src/views/screen/layouts/UsedStatus.vue b/src/views/screen/layouts/UsedStatus.vue
index 1505e52..a45fe2f 100644
--- a/src/views/screen/layouts/UsedStatus.vue
+++ b/src/views/screen/layouts/UsedStatus.vue
@@ -1,5 +1,9 @@
diff --git a/src/views/screen1/components/VueChart.vue b/src/views/screen1/components/VueChart.vue
index a3fb75e..65b074a 100644
--- a/src/views/screen1/components/VueChart.vue
+++ b/src/views/screen1/components/VueChart.vue
@@ -21,9 +21,13 @@ function clear() {
}
function draw() {
- clear();
- chart = echarts.init(elChart.value);
- chart.setOption(props.option);
+ if (chart) {
+ chart.setOption(props.option);
+ } else {
+ clear();
+ chart = echarts.init(elChart.value);
+ chart.setOption(props.option);
+ }
}
onMounted(draw);
diff --git a/src/views/screen1/components/charts/DeviceOnline.vue b/src/views/screen1/components/charts/DeviceOnline.vue
index 4cc5bd2..a0bea33 100644
--- a/src/views/screen1/components/charts/DeviceOnline.vue
+++ b/src/views/screen1/components/charts/DeviceOnline.vue
@@ -1,7 +1,8 @@
@@ -39,6 +40,7 @@ const getDeviceStatusClass = (status: string) => {
flex-shrink: 0;
gap: 10px;
align-items: center;
+ justify-content: space-between;
width: 428px;
height: 42px;
padding: 10px 20px;
diff --git a/src/views/screen1/components/charts/LineChart1.vue b/src/views/screen1/components/charts/LineChart1.vue
index 42d528b..8bcdffb 100644
--- a/src/views/screen1/components/charts/LineChart1.vue
+++ b/src/views/screen1/components/charts/LineChart1.vue
@@ -140,7 +140,7 @@ const chartOption = computed(() => {
// itemGap: 20, // 图例每项之间的间隔。
itemHeight: 10, // 图例标记的图形高度。
textStyle: {
- color: "rgba(255, 255, 255, 0.80)",
+ color: "rgba(255, 255, 255, 0.40)",
fontSize: 12,
padding: [0, 8, 0, 8]
}
@@ -163,7 +163,7 @@ const chartOption = computed(() => {
}
},
axisLabel: {
- color: "#rgba(255, 255, 255, 0.80)",
+ color: "#rgba(255, 255, 255, 0.40)",
fontSize: 12,
fontWeight: 400
//坐标轴刻度标签的相关设置
@@ -201,7 +201,7 @@ const chartOption = computed(() => {
},
axisLabel: {
show: true,
- color: "rgba(255, 255, 255, 0.80)",
+ color: "rgba(255, 255, 255, 0.40)",
fontSize: 14
},
axisTick: {
diff --git a/src/views/screen1/components/charts/LineChart2.vue b/src/views/screen1/components/charts/LineChart2.vue
index 9b3e8eb..394beb1 100644
--- a/src/views/screen1/components/charts/LineChart2.vue
+++ b/src/views/screen1/components/charts/LineChart2.vue
@@ -44,7 +44,7 @@ const chartOption = computed(() => {
type: "category",
data: name_list.value,
axisLabel: {
- color: "rgba(255, 255, 255, 0.60)"
+ color: "rgba(255, 255, 255, 0.40)"
}
},
yAxis: [
@@ -71,9 +71,9 @@ const chartOption = computed(() => {
}
],
grid: {
- top: "30px",
+ top: "25px",
left: "60px",
- bottom: "20px",
+ bottom: "25px",
right: "40px"
},
series: [
diff --git a/src/views/screen1/components/charts/LineChartAndBarChart.vue b/src/views/screen1/components/charts/LineChartAndBarChart.vue
index ca1a363..e6d4069 100644
--- a/src/views/screen1/components/charts/LineChartAndBarChart.vue
+++ b/src/views/screen1/components/charts/LineChartAndBarChart.vue
@@ -92,7 +92,7 @@ const chartOption = computed(() => {
type: "category",
data: name_list.value,
axisLabel: {
- color: "rgba(255, 255, 255, 0.60)"
+ color: "rgba(255, 255, 255, 0.40)"
}
},
yAxis: [
diff --git a/src/views/screen1/components/charts/Pie3D.vue b/src/views/screen1/components/charts/Pie3D.vue
index 3e09e3f..728a1e6 100644
--- a/src/views/screen1/components/charts/Pie3D.vue
+++ b/src/views/screen1/components/charts/Pie3D.vue
@@ -3,10 +3,10 @@
style="display: flex; justify-content: center; width: 100%; height: 180px"
>
@@ -16,6 +16,7 @@ import VueChart from "../../components/VueChart.vue";
// import * as echarts from "echarts";
import "echarts-gl";
import { computed } from "vue";
+import pieBg from "@/assets/screen/pie_bg.png";
const props = defineProps({
data: {
@@ -204,7 +205,7 @@ function getPie3D(pieData, internalDiameterRatio) {
color: "#fff",
fontWeight: 500,
formatter: function (params) {
- return params.name + " " + "{hr|" + params.value + "}";
+ return params.name + " " + "{hr|" + params.value + "}%";
},
rich: {
hr: {
@@ -217,7 +218,8 @@ function getPie3D(pieData, internalDiameterRatio) {
}
},
labelLine: {
- length: 14,
+ smooth: 0.2,
+ length: 10,
length2: 50,
lineStyle: {
color: "#fff" // 设置标示线的颜色
@@ -283,7 +285,7 @@ function getPie3D(pieData, internalDiameterRatio) {
zoomSensitivity: 0,
panSensitivity: 0,
// autoRotate: true,
- distance: 250
+ distance: 160
},
// 后处理特效可以为画面添加高光、景深、环境光遮蔽（SSAO）、调色等效果。可以让整个画面更富有质感。
postEffect: {
@@ -291,7 +293,7 @@ function getPie3D(pieData, internalDiameterRatio) {
enable: false,
bloom: {
enable: true,
- bloomIntensity: 0.1
+ bloomIntensity: 0
},
SSAO: {
enable: true,
diff --git a/src/views/screen1/index.vue b/src/views/screen1/index.vue
index cf8067e..97f797e 100644
--- a/src/views/screen1/index.vue
+++ b/src/views/screen1/index.vue
@@ -3,7 +3,7 @@
@@ -97,7 +97,7 @@
- 
+ ![]()
@@ -123,6 +123,8 @@ import LineChart2 from "@/views/screen1/components/charts/LineChart2.vue";
import DeviceOnline from "@/views/screen1/components/charts/DeviceOnline.vue";
import Pie3D from "@/views/screen1/components/charts/Pie3D.vue";
import LineChartAndBarChart from "@/views/screen1/components/charts/LineChartAndBarChart.vue";
+import bgCenter from "@/assets/screen/bg_center.png";
+import bg2 from "@/assets/screen/bg2.png";
const randomIntFn = (min: number, max: number) => {
return Math.floor(Math.random() * (max - min + 1) + min);
@@ -227,26 +229,30 @@ setInterval(() => {
//card6
setTimeout(() => {
- state.data.card6.data[0].value = randomIntFn(0, 500);
- state.data.card6.data[1].value = randomIntFn(0, 500);
+ state.data.card6.data[0].value = randomIntFn(0, 100);
+ // state.data.card6.data[1].value = randomIntFn(0, 500);
+ state.data.card6.data[1].value = 100 - state.data.card6.data[0].value;
}, 600);
//card7
setTimeout(() => {
- state.data.card7.data[0].value = randomIntFn(0, 500);
- state.data.card7.data[1].value = randomIntFn(0, 500);
+ state.data.card7.data[0].value = randomIntFn(0, 100);
+ // state.data.card7.data[1].value = randomIntFn(0, 500);
+ state.data.card7.data[1].value = 100 - state.data.card7.data[0].value;
}, 700);
//card8
setTimeout(() => {
- state.data.card8.data[0].value = randomIntFn(0, 500);
- state.data.card8.data[1].value = randomIntFn(0, 500);
+ state.data.card8.data[0].value = randomIntFn(0, 100);
+ // state.data.card8.data[1].value = randomIntFn(0, 500);
+ state.data.card8.data[1].value = 100 - state.data.card8.data[0].value;
}, 800);
//card9
setTimeout(() => {
- state.data.card9.data[0].value = randomIntFn(0, 500);
- state.data.card9.data[1].value = randomIntFn(0, 500);
+ state.data.card9.data[0].value = randomIntFn(0, 100);
+ // state.data.card9.data[1].value = randomIntFn(0, 500);
+ state.data.card9.data[1].value = 100 - state.data.card9.data[0].value;
}, 900);
//card10
diff --git a/src/views/screen1/mock.js b/src/views/screen1/mock.js
index 44fc9c9..672abda 100644
--- a/src/views/screen1/mock.js
+++ b/src/views/screen1/mock.js
@@ -120,6 +120,76 @@ export const card1_data = {
{ name: "30", value: 210 },
{ name: "31", value: 150 }
]
+ },
+ {
+ data: [
+ { name: "1", value: 10 },
+ { name: "2", value: 160 },
+ { name: "3", value: 10 },
+ { name: "4", value: 190 },
+ { name: "5", value: 20 },
+ { name: "6", value: 50 },
+ { name: "7", value: 160 },
+ { name: "8", value: 200 },
+ { name: "9", value: 90 },
+ { name: "10", value: 20 },
+ { name: "11", value: 50 },
+ { name: "12", value: 60 },
+ { name: "13", value: 100 },
+ { name: "14", value: 60 },
+ { name: "15", value: 120 },
+ { name: "16", value: 90 },
+ { name: "17", value: 210 },
+ { name: "18", value: 10 },
+ { name: "19", value: 60 },
+ { name: "20", value: 120 },
+ { name: "21", value: 150 },
+ { name: "22", value: 60 },
+ { name: "23", value: 120 },
+ { name: "24", value: 90 },
+ { name: "25", value: 20 },
+ { name: "26", value: 150 },
+ { name: "27", value: 60 },
+ { name: "28", value: 120 },
+ { name: "29", value: 90 },
+ { name: "30", value: 20 },
+ { name: "31", value: 150 }
+ ]
+ },
+ {
+ data: [
+ { name: "1", value: 150 },
+ { name: "2", value: 160 },
+ { name: "3", value: 20 },
+ { name: "4", value: 90 },
+ { name: "5", value: 20 },
+ { name: "6", value: 150 },
+ { name: "7", value: 260 },
+ { name: "8", value: 120 },
+ { name: "9", value: 190 },
+ { name: "10", value: 210 },
+ { name: "11", value: 150 },
+ { name: "12", value: 60 },
+ { name: "13", value: 150 },
+ { name: "14", value: 60 },
+ { name: "15", value: 10 },
+ { name: "16", value: 190 },
+ { name: "17", value: 210 },
+ { name: "18", value: 150 },
+ { name: "19", value: 60 },
+ { name: "20", value: 10 },
+ { name: "21", value: 150 },
+ { name: "22", value: 60 },
+ { name: "23", value: 120 },
+ { name: "24", value: 290 },
+ { name: "25", value: 210 },
+ { name: "26", value: 10 },
+ { name: "27", value: 60 },
+ { name: "28", value: 10 },
+ { name: "29", value: 90 },
+ { name: "30", value: 20 },
+ { name: "31", value: 150 }
+ ]
}
]
}
@@ -262,28 +332,28 @@ export const card5_data = {
export const card6_data = {
data: [
- { name: "已占用", value: 50 },
- { name: "未占用", value: 100 }
+ { name: "已占用", value: 60 },
+ { name: "未占用", value: 40 }
]
};
export const card7_data = {
data: [
{ name: "已占用", value: 50 },
- { name: "未占用", value: 80 }
+ { name: "未占用", value: 50 }
]
};
export const card8_data = {
data: [
- { name: "已占用", value: 50 },
- { name: "未占用", value: 60 }
+ { name: "已占用", value: 70 },
+ { name: "未占用", value: 30 }
]
};
export const card9_data = {
data: [
- { name: "已占用", value: 40 },
- { name: "未占用", value: 80 }
+ { name: "已占用", value: 80 },
+ { name: "未占用", value: 20 }
]
};
export const card10_data = {
+
-
最新入驻
+ 设备名称
+ 设备状态
-
+ ![]()
+
+