-
+
-
+
+ 算力配置 + +
+
+
{slots?.title ? (
slots.title()
) : (
diff --git a/src/layout/components/sidebar/breadCrumb.vue b/src/layout/components/sidebar/breadCrumb.vue
index def39a0..fa5a518 100644
--- a/src/layout/components/sidebar/breadCrumb.vue
+++ b/src/layout/components/sidebar/breadCrumb.vue
@@ -96,7 +96,7 @@ watch(
v-for="item in levelList"
:key="item.path"
>
- {{
+ {{
transformI18n(item.meta.title)
}}
diff --git a/src/router/modules/computePowerAllocation.ts b/src/router/modules/computePowerAllocation.ts
new file mode 100644
index 0000000..c83bb42
--- /dev/null
+++ b/src/router/modules/computePowerAllocation.ts
@@ -0,0 +1,14 @@
+import { $t } from "@/plugins/i18n";
+
+export default {
+ path: "/computePowerAllocation",
+ meta: {
+ title: $t("menus.hsComputePowerAllocation"),
+ icon: "icon-suanlipeizhi",
+ // showLink: false,
+ rank: 6,
+ roles: ["admin", "common"]
+ },
+ component: () => import("@/views/computePowerAllocation/index.vue"),
+ name: "computePowerAllocationIndex"
+} as RouteConfigsTable;
diff --git a/src/style/sidebar.scss b/src/style/sidebar.scss
index 0ae8588..b4e810c 100644
--- a/src/style/sidebar.scss
+++ b/src/style/sidebar.scss
@@ -599,7 +599,7 @@ body[layout="vertical"] {
}
.main-container {
- margin-left: 54px;
+ // margin-left: 54px;
}
/* 菜单折叠 */
diff --git a/src/style/vars.scss b/src/style/vars.scss
index f42c515..920b8aa 100644
--- a/src/style/vars.scss
+++ b/src/style/vars.scss
@@ -27,3 +27,7 @@ $--theme-color: #154ddd;
.theme-bg-color {
background-color: $--theme-color;
}
+
+.main_container {
+ margin-left: 16px;
+}
diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue
index d8b7dc2..50ba820 100644
--- a/src/views/alarm/index.vue
+++ b/src/views/alarm/index.vue
@@ -133,7 +133,7 @@ onMounted(() => {
-
+
+import { ref } from "vue"; //引入相关api/引入下载的动效json
+
+defineOptions({
+ name: "ComputePowerAllocation"
+});
+
+const animation1 = ref(null); //获取dom;
+
+
+
+
+ ![]()
+ {{ animation1 }}
+
+
+
+
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index c4d9aeb..cc7da89 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -63,7 +63,7 @@ onMounted(() => {
-
+
{
-
+
{
-
+
{{ `全部状态(${90})` }}
{{ `在线(${80})` }}
diff --git a/src/views/workbench/components/Notify.vue b/src/views/workbench/components/Notify.vue
index b5bf29f..b458e49 100644
--- a/src/views/workbench/components/Notify.vue
+++ b/src/views/workbench/components/Notify.vue
@@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-01-11 14:27:58
* @LastEditors: donghao donghao@supervision.ltd
- * @LastEditTime: 2024-01-12 17:44:57
+ * @LastEditTime: 2024-01-18 17:01:35
* @FilePath: \General-AI-Platform-Web-Client\src\views\workbench\components\Notify.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -39,7 +39,7 @@ const urgencyStatus = [
function fetchNoticeList(readStatus = 1) {
const arr = [];
- for (let i = 0; i < 3; i++) {
+ for (let i = 0; i < 2; i++) {
arr.push({
title: "系统消息" + (readStatus + i),
dateTime: "今天10:03:00",
@@ -65,7 +65,7 @@ const noticeData = ref[]>([
-
+
[]>([
:label="item.label"
:name="index + ''"
>
-
+
diff --git a/src/views/workbench/components/SwiperShow.vue b/src/views/workbench/components/SwiperShow.vue
index 49c055c..54ede9e 100644
--- a/src/views/workbench/components/SwiperShow.vue
+++ b/src/views/workbench/components/SwiperShow.vue
@@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-01-12 15:35:09
* @LastEditors: donghao donghao@supervision.ltd
- * @LastEditTime: 2024-01-17 11:31:24
+ * @LastEditTime: 2024-01-18 16:37:24
* @FilePath: \general-work-web\General-AI-Platform-Web-Client\src\views\workbench\components\SwiperShow.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -25,6 +25,9 @@ import "swiper/css/navigation";
import "swiper/css/pagination";
import "swiper/css/scrollbar";
+import pic1 from "@/assets/home/01.png";
+import pic2 from "@/assets/home/02.png";
+
// Import Swiper styles
const onSwiper = swiper => {
@@ -36,13 +39,10 @@ const onSlideChange = () => {
const swiperList = ref([
{
- url: "https://cdn.lifeofpix.com/368492/_w1800/368506/lifeofpix-368492368506.webp"
- },
- {
- url: "https://cdn.lifeofpix.com/359864/_AUTOxAUTO_crop_center-center_none/361816/lifeofpix-michaelmercer-361816.webp"
+ url: pic1
},
{
- url: "https://cdn.lifeofpix.com/368492/_AUTOxAUTO_crop_center-center_none/368497/lifeofpix-368492368497.webp"
+ url: pic2
}
]);
@@ -63,6 +63,8 @@ const modules = [Navigation, Pagination, Scrollbar, A11y, Autoplay];
@slideChange="onSlideChange"
>
+
+
![]()
@@ -73,6 +75,10 @@ const modules = [Navigation, Pagination, Scrollbar, A11y, Autoplay];
.swiper-scrollbar {
display: none;
}
+ img {
+ width: 100%;
+ height: auto;
+ }
.swiper-pagination-bullet {
width: 6px;
diff --git a/src/views/workbench/components/chart/bar.vue b/src/views/workbench/components/chart/bar.vue
index 08be8dc..3f8b773 100644
--- a/src/views/workbench/components/chart/bar.vue
+++ b/src/views/workbench/components/chart/bar.vue
@@ -23,21 +23,8 @@ const { setOptions } = useECharts(barChartRef, {
theme
});
-const name = [
- "1月",
- "2月",
- "3月",
- "4月",
- "5月",
- "6月",
- "7月",
- "8月",
- "9月",
- "10月",
- "11月",
- "12月"
-];
-const value = [100, 500, 400, 600, 700, 200, 450, 670, 900, 450, 670, 900];
+const name = ["1月", "2月", "3月", "4月", "5月", "6月"];
+const value = [100, 500, 400, 600, 700, 200];
// const toolTims = null;
const offsetX = 16;
const offsetY = 8;
@@ -197,6 +184,8 @@ watch(
type: "custom",
renderItem: (params, api) => {
const location = api.coord([api.value(0), api.value(1)]);
+ console.log("renderItem_api", location);
+
return {
type: "group",
children: [
diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue
index 1a4aed9..d5663a3 100644
--- a/src/views/workbench/index.vue
+++ b/src/views/workbench/index.vue
@@ -4,6 +4,8 @@ import { barChart, pieChart, pie3DChart } from "./components/chart";
import DeviceStatus from "./components/DeviceStatus.vue";
import Notify from "./components/Notify.vue";
import SwiperShow from "./components/SwiperShow.vue";
+// import dataViewIcon1 from "@/assets/svg/icons/dataViewIcon1.svg";
+// import dataViewIcon2 from "@/assets/svg/icons/dataViewIcon1.svg";
defineOptions({
name: "Workbench"
@@ -27,10 +29,43 @@ const pie3Ddata = {
{ name: "一般", value: 60 }
]
};
+
+// 数据预览
+// TODO 图标需要替换
+const dataViewList = [
+ {
+ label: "异常总量",
+ value: "110200",
+ color: "#FF861A",
+ bgColor: "#FFE9D6",
+ icon: "icon-suanlipeizhi"
+ },
+ {
+ label: "设备总量",
+ value: "46700",
+ color: "#5786FF",
+ bgColor: "#D6E0FF",
+ icon: "icon-suanlipeizhi"
+ },
+ {
+ label: "覆盖网点",
+ value: "304800",
+ color: "#5024FE",
+ bgColor: "#DDD5FD",
+ icon: "icon-suanlipeizhi"
+ },
+ {
+ label: "资源使用",
+ value: "89300",
+ color: "#14A1FF",
+ bgColor: "#D6EFFF",
+ icon: "icon-suanlipeizhi"
+ }
+];
-
-
+
-
{{ @@ -101,3 +101,10 @@ const noticeData = ref
+
+
+
+
- 违规总量
-
-
+ 数据总览
+
+
- 消息通知
-
-
+
- 设备状态
-
-
+
+
- 设备告警情况
-
-
-
- -
+
+
-
+
+ ++++ +++ {{ v.label }} ++{{ v.value }}
+
+
-
+ 设备状态
+
+
-
+
@@ -179,12 +251,66 @@ const pie3Ddata = {
}"
>
算力占用
-
-
+
+
+
+
+ 消息通知
+
+
+
+
+
+
+