diff --git a/f/web-kboss/package.json b/f/web-kboss/package.json
index e41be6f..c8d672e 100644
--- a/f/web-kboss/package.json
+++ b/f/web-kboss/package.json
@@ -18,6 +18,7 @@
},
"dependencies": {
"@form-create/element-ui": "^2.5.30",
+ "@jiaminghi/data-view": "^2.10.0",
"@xterm/xterm": "^5.5.0",
"amfe-flexible": "^2.2.1",
"axios": "0.18.1",
@@ -29,7 +30,8 @@
"decimal.js": "^10.4.3",
"driver.js": "0.9.5",
"dropzone": "5.5.1",
- "echarts": "4.2.1",
+ "echarts": "^4.9.0",
+ "echarts-gl": "^1.1.2",
"element-ui": "^2.15.14",
"file-saver": "^2.0.1",
"fuse.js": "3.4.4",
@@ -75,7 +77,7 @@
"autoprefixer": "9.5.1",
"babel-eslint": "10.1.0",
"babel-jest": "23.6.0",
- "babel-loader": "^9.1.3",
+ "babel-loader": "^8.2.5",
"babel-plugin-dynamic-import-node": "2.3.3",
"bpmn-js": "^13.2.2",
"chalk": "2.4.2",
diff --git a/f/web-kboss/src/layout/components/Navbar.vue b/f/web-kboss/src/layout/components/Navbar.vue
index 1f27cb9..6b32943 100644
--- a/f/web-kboss/src/layout/components/Navbar.vue
+++ b/f/web-kboss/src/layout/components/Navbar.vue
@@ -509,7 +509,7 @@ export default {
this.searchDialogVisible = true
},
goScreen() {
- window.open('https://www.kaiyuancloud.cn/dev/#/screen/k8sRescource', '_blank');
+ window.open('https://www.opencomputing.cn/#/screen/k8sRescource', '_blank');
},
channelFirstBtn() {
reqApplyChannel({ user_id: this.userId }).then(res => {
diff --git a/f/web-kboss/src/main.js b/f/web-kboss/src/main.js
index 0abcb2e..9bfcc9e 100644
--- a/f/web-kboss/src/main.js
+++ b/f/web-kboss/src/main.js
@@ -64,9 +64,14 @@ sessionStorage.setItem('client_uuid', uuidv4())
// 引入form-create 表单生成器
import formCreate from "@form-create/element-ui"
-
Vue.use(formCreate);
+// ============ 引入 DataV 数据可视化库 (Vue 2.x 版本) ============
+import dataV from '@jiaminghi/data-view'
+// 使用 DataV
+Vue.use(dataV)
+// ============ DataV 引入完成 ============
+
import * as filters from './filters' // global filters
import HappyScroll from 'vue-happy-scroll'
diff --git a/f/web-kboss/src/router/index.js b/f/web-kboss/src/router/index.js
index 2023e94..631348c 100644
--- a/f/web-kboss/src/router/index.js
+++ b/f/web-kboss/src/router/index.js
@@ -181,7 +181,7 @@ export const constantRoutes = [
{
hidden: true, path: '/screen', name: 'screen', title: '可视化大屏', meta: {
title: "可视化大屏", fullPath: "/operation/analyze/screen",
- }, component: () => import('@/views/product/bigScreen/index.vue'), children: [{
+ }, component: () => import('@/views/product/bigScreen/Newscreen/index.vue'), children: [{
path: "index",
title: '可视化首页',
component: () => import('@/views/product/bigScreen/mainPage/index.vue'),
diff --git a/f/web-kboss/src/store/modules/permission.js b/f/web-kboss/src/store/modules/permission.js
index dfa8adf..7f338ab 100644
--- a/f/web-kboss/src/store/modules/permission.js
+++ b/f/web-kboss/src/store/modules/permission.js
@@ -264,7 +264,7 @@ const actions = {
// 如果权限列表包含空路径,认为用户有所有权限
accessedRoutes = asyncRoutes || [];
} else {
- // 使用修复后的过滤函数,传入用户角色和设备类型
+ // 传入用户角色和设备类型
accessedRoutes = filterAsyncRoutes(asyncRoutes, auths, userRoles, deviceType);
}
} else {
@@ -272,7 +272,7 @@ const actions = {
accessedRoutes = [];
}
- // 新增:为普通用户添加订单管理和资源管理路由以及新的五个客户菜单
+ // 为普通用户添加订单管理和资源管理路由以及新的五个客户菜单
console.log("为用户添加特定路由");
const userSpecificRoutes = addUserRoutes(asyncRoutes, userType, orgType, userRoles, deviceType);
diff --git a/f/web-kboss/src/views/customer/historyOrder/index.vue b/f/web-kboss/src/views/customer/historyOrder/index.vue
new file mode 100644
index 0000000..7f70345
--- /dev/null
+++ b/f/web-kboss/src/views/customer/historyOrder/index.vue
@@ -0,0 +1,15 @@
+
+
+ 历史订单
+
+
+
+
+
+
diff --git a/f/web-kboss/src/views/homePage/components/topBox/index.vue b/f/web-kboss/src/views/homePage/components/topBox/index.vue
index 81d61fc..a9956ac 100644
--- a/f/web-kboss/src/views/homePage/components/topBox/index.vue
+++ b/f/web-kboss/src/views/homePage/components/topBox/index.vue
@@ -77,7 +77,7 @@
diff --git a/f/web-kboss/src/views/login/indexNew.vue b/f/web-kboss/src/views/login/indexNew.vue
index 03c5881..b0f611d 100644
--- a/f/web-kboss/src/views/login/indexNew.vue
+++ b/f/web-kboss/src/views/login/indexNew.vue
@@ -7,7 +7,6 @@
-
@@ -373,7 +372,7 @@ export default {
methods: {
// 防抖函数
debounce(func, wait) {
- return function() {
+ return function () {
const context = this;
const args = arguments;
clearTimeout(this.debounceTimer);
@@ -384,7 +383,7 @@ export default {
},
// 防抖后的获取验证码方法
- debouncedGetCode: function() {
+ debouncedGetCode: function () {
if (this.isDisabled || this.isGettingCode) return;
this.isGettingCode = true;
@@ -400,7 +399,7 @@ export default {
},
// 防抖后的获取重置密码验证码方法
- debouncedGetCode1: function() {
+ debouncedGetCode1: function () {
if (this.isDisabled1 || this.isGettingCode1) return;
this.isGettingCode1 = true;
@@ -459,8 +458,7 @@ export default {
// 轮询获取微信登录授权码
pollWxCode() {
this.getCodeTimer = setInterval(async () => {
- try {
- // 请求微信授权码
+ try {x // 请求微信授权码x
const res = await reqGetCodeAPI({ state: this.wxState });
if (!res.status) return;
@@ -915,7 +913,7 @@ export default {
}
} else {
this.$router.push(getHomePath());
- }``
+ } ``
} else if (res.roles.includes('运营')) {
this.$router.push('/operation/supplierManagement');
} else if (res.roles.includes('销售')) {
diff --git a/f/web-kboss/src/views/product/bigScreen/Newscreen/ScreenCenter/Map.vue b/f/web-kboss/src/views/product/bigScreen/Newscreen/ScreenCenter/Map.vue
new file mode 100644
index 0000000..a66ae57
--- /dev/null
+++ b/f/web-kboss/src/views/product/bigScreen/Newscreen/ScreenCenter/Map.vue
@@ -0,0 +1,472 @@
+
+
+
+
+
+
+
+
+
+
+
+
{{ cluster.name }}
+
+
+ 点击下方进入地图
+
+ 查看集群详细信息
+
+
进入地图
+
+
+
+
+
+ 点击下方进入地图
+
+ 查看集群详细信息
+
+
进入地图
+
+
{{ cluster.name }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/f/web-kboss/src/views/product/bigScreen/Newscreen/ScreenCenter/index.vue b/f/web-kboss/src/views/product/bigScreen/Newscreen/ScreenCenter/index.vue
new file mode 100644
index 0000000..844c1f0
--- /dev/null
+++ b/f/web-kboss/src/views/product/bigScreen/Newscreen/ScreenCenter/index.vue
@@ -0,0 +1,424 @@
+
+
+
+
+
+
+
+
+
+ 35320P
+
+
+ 供给算力
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 供给概览
+
+
+
+ 需求概览
+
+
+
+
+
+
+
+ 2350
+ CPU
+
+
+

+
+
+
+
+ 5500
+ GPU
+
+
+

+
+
+
+
+ 0
+ 进程数量
+
+
+

+
+
+
+
+ 0
+ 资源统计
+
+
+

+
+
+
+
+ 30%
+ 运行中
+
+
+

+
+
+
+
+ 70%
+ 关机中
+
+
+

+
+
+
+
+ 0
+ 故障数量
+
+
+

+
+
+
+
+ 0
+ 在线数量
+
+
+

+
+
+
+
+
+
+
+
+ 0
+ CPU
+
+
+

+
+
+
+
+ 0
+ GPU
+
+
+

+
+
+
+
+ 0
+ 进程数量
+
+
+

+
+
+
+
+ 0
+ 资源统计
+
+
+

+
+
+
+
+ 0
+ 运行中
+
+
+

+
+
+
+
+ 0
+ 关机中
+
+
+

+
+
+
+
+ 0
+ 故障数量
+
+
+

+
+
+
+
+ 0
+ 在线数量
+
+
+

+
+
+
+
+
+
+
+
+
+
+
diff --git a/f/web-kboss/src/views/product/bigScreen/Newscreen/ScreenLeft/index.vue b/f/web-kboss/src/views/product/bigScreen/Newscreen/ScreenLeft/index.vue
new file mode 100644
index 0000000..49ec495
--- /dev/null
+++ b/f/web-kboss/src/views/product/bigScreen/Newscreen/ScreenLeft/index.vue
@@ -0,0 +1,642 @@
+
+
+
+
+
+
+
异构芯片规模
+
+
+
33000 /个
+
5000 /个
+
8000 /个
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/f/web-kboss/src/views/product/bigScreen/Newscreen/ScreenRight/index.vue b/f/web-kboss/src/views/product/bigScreen/Newscreen/ScreenRight/index.vue
new file mode 100644
index 0000000..e39a699
--- /dev/null
+++ b/f/web-kboss/src/views/product/bigScreen/Newscreen/ScreenRight/index.vue
@@ -0,0 +1,640 @@
+
+
+
+
+
+
+
+
+
+
用户种类
+
+

+
+ 金融
+ 医疗
+ 文创
+ 教育
+ 智能制造
+
+
+
+
+
+
+
+
+
+
用户数量
+
+

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/f/web-kboss/src/views/product/bigScreen/Newscreen/images/1.png b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/1.png
new file mode 100644
index 0000000..4898608
Binary files /dev/null and b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/1.png differ
diff --git a/f/web-kboss/src/views/product/bigScreen/Newscreen/images/2.png b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/2.png
new file mode 100644
index 0000000..a93fa08
Binary files /dev/null and b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/2.png differ
diff --git a/f/web-kboss/src/views/product/bigScreen/Newscreen/images/3.png b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/3.png
new file mode 100644
index 0000000..1d624a0
Binary files /dev/null and b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/3.png differ
diff --git a/f/web-kboss/src/views/product/bigScreen/Newscreen/images/3D.png b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/3D.png
new file mode 100644
index 0000000..2271d2c
Binary files /dev/null and b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/3D.png differ
diff --git a/f/web-kboss/src/views/product/bigScreen/Newscreen/images/4.png b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/4.png
new file mode 100644
index 0000000..1db60be
Binary files /dev/null and b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/4.png differ
diff --git a/f/web-kboss/src/views/product/bigScreen/Newscreen/images/5.png b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/5.png
new file mode 100644
index 0000000..425653d
Binary files /dev/null and b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/5.png differ
diff --git a/f/web-kboss/src/views/product/bigScreen/Newscreen/images/btm.png b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/btm.png
new file mode 100644
index 0000000..220368a
Binary files /dev/null and b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/btm.png differ
diff --git a/f/web-kboss/src/views/product/bigScreen/Newscreen/images/btmTab.png b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/btmTab.png
new file mode 100644
index 0000000..80483a2
Binary files /dev/null and b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/btmTab.png differ
diff --git a/f/web-kboss/src/views/product/bigScreen/Newscreen/images/left.png b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/left.png
new file mode 100644
index 0000000..3e2bfcf
Binary files /dev/null and b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/left.png differ
diff --git a/f/web-kboss/src/views/product/bigScreen/Newscreen/images/titleBg.png b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/titleBg.png
new file mode 100644
index 0000000..9c0efe3
Binary files /dev/null and b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/titleBg.png differ
diff --git a/f/web-kboss/src/views/product/bigScreen/Newscreen/images/topitem.png b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/topitem.png
new file mode 100644
index 0000000..3b72520
Binary files /dev/null and b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/topitem.png differ
diff --git a/f/web-kboss/src/views/product/bigScreen/Newscreen/images/use-num.png b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/use-num.png
new file mode 100644
index 0000000..541dd32
Binary files /dev/null and b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/use-num.png differ
diff --git a/f/web-kboss/src/views/product/bigScreen/Newscreen/images/userClass.png b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/userClass.png
new file mode 100644
index 0000000..1c04ac5
Binary files /dev/null and b/f/web-kboss/src/views/product/bigScreen/Newscreen/images/userClass.png differ
diff --git a/f/web-kboss/src/views/product/bigScreen/Newscreen/index.vue b/f/web-kboss/src/views/product/bigScreen/Newscreen/index.vue
new file mode 100644
index 0000000..6e65106
--- /dev/null
+++ b/f/web-kboss/src/views/product/bigScreen/Newscreen/index.vue
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/f/web-kboss/src/views/product/bigScreen/Newscreen/screenHeader/index.vue b/f/web-kboss/src/views/product/bigScreen/Newscreen/screenHeader/index.vue
new file mode 100644
index 0000000..0c364b5
--- /dev/null
+++ b/f/web-kboss/src/views/product/bigScreen/Newscreen/screenHeader/index.vue
@@ -0,0 +1,69 @@
+
+
+
+
+
+
diff --git a/f/web-kboss/src/views/product/bigScreen/components/VmCenter.vue b/f/web-kboss/src/views/product/bigScreen/components/VmCenter.vue
index 578c253..cecd00f 100644
--- a/f/web-kboss/src/views/product/bigScreen/components/VmCenter.vue
+++ b/f/web-kboss/src/views/product/bigScreen/components/VmCenter.vue
@@ -96,7 +96,7 @@
-