Skip to content
This repository was archived by the owner on Nov 13, 2024. It is now read-only.

Commit ed3105d

Browse files
yumao233yumao233
committed
Automatic: Update code
1 parent 8ffa0b1 commit ed3105d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+6929
-4074
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ npm-debug.log*
55
yarn-debug.log*
66
yarn-error.log*
77
lerna-debug.log*
8+
bak/
89

910
*.bat
1011

‎package-lock.json‎

Lines changed: 3070 additions & 3070 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,19 @@
99
},
1010
"dependencies": {
1111
"axios": "^0.21.1",
12+
"codejar": "^3.5.0",
13+
"codemirror": "^5.62.2",
1214
"core-js": "^3.6.5",
15+
"echarts": "^5.1.2",
1316
"element-plus": "^1.0.2-beta.41",
17+
"monaco-editor": "^0.26.1",
1418
"prettier": "^2.2.1",
19+
"prismjs": "^1.24.1",
1520
"socket.io": "^4.1.2",
1621
"socket.io-client": "^4.1.2",
1722
"vue": "^3.0.0",
1823
"vue-router": "^4.0.0-0",
24+
"vuex": "^4.0.2",
1925
"xterm": "^4.12.0",
2026
"xterm-addon-fit": "^0.5.0",
2127
"xterm-addon-web-links": "^0.4.0"

‎public/index.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!--
22
* @Author: Copyright(c) 2020 Suwings
33
* @Date: 2021-05-08 10:07:55
4-
* @LastEditTime: 2021-05-08 10:56:20
4+
* @LastEditTime: 2021-08-01 09:36:43
55
* @Description:
66
-->
77
<!DOCTYPE html>
@@ -24,4 +24,6 @@
2424
<div id="app" class="app"></div>
2525
<!-- built files will be auto injected -->
2626
</body>
27+
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.15.2/codemirror.js"></script>
28+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.15.2/codemirror.css" /> -->
2729
</html>

‎src/app/App.vue‎

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
<!--
22
* @Author: Copyright(c) 2021 Suwings
33
* @Date: 2021-05-08 10:07:55
4-
* @LastEditTime: 2021-07-06 22:14:17
4+
* @LastEditTime: 2021-08-02 20:10:32
55
* @Description:
66
-->
77
<template>
8+
<!-- 普通用户 通用导航栏 -->
9+
<!-- <el-header style="padding:0px" v-if="!isTopPermission">
10+
<TopHeader />
11+
</el-header> -->
812
<el-container>
9-
<!-- 手机屏幕菜单栏 -->
13+
<!-- 管理用户 手机屏幕菜单栏 -->
1014
<el-drawer size="240" v-model="drawer" :with-header="false" direction="ltr">
1115
<el-aside width="240px" style="height: 100%">
1216
<Aside />
1317
</el-aside>
1418
</el-drawer>
15-
<!-- 电脑屏幕菜单栏 -->
19+
<!-- 管理用户 电脑屏幕菜单栏 -->
1620
<div id="app-menu" class="only-pc-display">
1721
<el-aside width="240px" style="height: 100%">
1822
<Aside />
@@ -34,7 +38,7 @@
3438
<script>
3539
import Aside from "../components/Aside";
3640
import Header from "../components/Header";
37-
41+
import { setupUserInfo } from "./service/protocol.js";
3842
import router from "./router";
3943
4044
export default {
@@ -50,9 +54,32 @@ export default {
5054
methods: {
5155
toAside() {
5256
this.drawer = !this.drawer;
57+
},
58+
nav() {
59+
// 若用户地址本身不为根目录，则不管
60+
console.log("路由地址:", this.$route.path);
61+
if (this.$route.path != "/") return;
62+
// 根据不同的用户类型进行跳转
63+
const userInfo = this.$store.state.userInfo;
64+
if (userInfo && userInfo.permission >= 10) {
65+
console.log("导航至管理界面");
66+
router.push({ path: "/overview" });
67+
} else {
68+
console.log("导航至普通界面");
69+
router.push({ path: "/home" });
70+
}
71+
}
72+
},
73+
async beforeCreate() {
74+
try {
75+
await setupUserInfo();
76+
this.nav();
77+
} catch (error) {
78+
console.log("App.vue setupUserInfo():", error);
79+
router.push({ path: "/login" });
5380
}
5481
},
55-
mounted() {
82+
async mounted() {
5683
router.beforeEach((to, from, next) => {
5784
console.log("Router:", to, "->", from);
5885
this["breadCrumbs"] = to.name;

‎src/app/index.js‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,34 @@
11
/*
22
* @Author: Copyright(c) 2021 Suwings
33
* @Date: 2021-05-08 10:07:55
4-
* @LastEditTime: 2021-07-06 21:23:14
4+
* @LastEditTime: 2021-07-19 16:43:20
55
* @Description: 入口文件
66
*/
77

88
import { createApp } from "vue";
9-
import App from "./App.vue";
10-
import installElementPlus from "../plugins/element";
11-
import "../assets/css/common.css";
12-
import "../assets/css/tools.css";
13-
import "../assets/css/responsive.css";
149

15-
// eslint-disable-next-line no-unused-vars
16-
import socket from "./service/socket";
10+
const app = createApp(App);
1711

18-
import router from "./router";
12+
// 装载 Vuex https://next.vuex.vuejs.org/zh/
13+
import store from "./store";
14+
app.use(store);
1915

20-
const app = createApp(App);
16+
// 装载 Vue-Router
17+
import router from "./router";
2118
app.use(router);
19+
20+
import installElementPlus from "../plugins/element";
2221
installElementPlus(app);
2322
app.mount("#app");
23+
24+
// 导入全局 CSS 文件
25+
import "../assets/css/common.css";
26+
import "../assets/css/tools.css";
27+
import "../assets/css/responsive.css";
28+
import "../assets/css/action.css";
29+
30+
// 初始化协议框架
31+
import "./service/protocol";
32+
33+
// 导入主应用组件
34+
import App from "./App.vue";

‎src/app/router.js‎

Lines changed: 47 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* @Author: Copyright(c) 2020 Suwings
33
* @Date: 2021-05-08 22:54:31
4-
* @LastEditTime: 2021-07-14 14:22:46
4+
* @LastEditTime: 2021-08-02 20:37:38
55
* @Description:
66
*/
77
import { createRouter, createWebHistory } from "vue-router";
@@ -10,7 +10,7 @@ import Overview from "./views/Overview";
1010
import Instances from "./views/Instances";
1111
// import About from "./views/About";
1212
import Services from "./views/Services";
13-
// import Users from "./views/Users";
13+
import Users from "./views/Users";
1414
import UserDetail from "./views/UserDetail";
1515

1616
import Analysis from "./views/Analysis";
@@ -23,18 +23,31 @@ import InstanceDetail from "./views/InstanceDetail";
2323
import NewInstance from "./views/NewInstance";
2424
import NewImage from "./views/NewImage";
2525
import FileManager from "./views/FileManager";
26+
import Home from "./views/Home";
27+
import Login from "./views/Login";
28+
import Trigger from "./views/Trigger";
29+
import Root from "./views/Root";
30+
import UserResources from "./views/UserResources";
31+
import ProcessConfig from "./views/ProcessConfig";
32+
import ProcessConfigFile from "./views/ProcessConfigFile";
33+
2634

2735
const routes = [
2836
{
2937
path: "/",
30-
name: "数据监控",
31-
component: Overview
38+
name: "加载中",
39+
component: Root
3240
},
3341
{
3442
path: "/overview",
3543
name: "数据监控 ",
3644
component: Overview
3745
},
46+
{
47+
path: "/home",
48+
name: "信息总览",
49+
component: Home
50+
},
3851
{
3952
path: "/instances",
4053
name: "应用实例",
@@ -50,6 +63,11 @@ const routes = [
5063
name: "个人信息",
5164
component: UserDetail
5265
},
66+
{
67+
path: "/users",
68+
name: "用户管理",
69+
component: Users
70+
},
5371
{
5472
path: "/analysis",
5573
name: "分析",
@@ -65,6 +83,11 @@ const routes = [
6583
name: "容器",
6684
component: Container
6785
},
86+
{
87+
path: "/trigger",
88+
name: "触发器",
89+
component: Trigger
90+
},
6891
{
6992
path: "/extension",
7093
name: "面板扩展",
@@ -85,6 +108,16 @@ const routes = [
85108
name: "终端",
86109
component: Terminal
87110
},
111+
{
112+
path: "/process_config_file/:serviceUuid/:instanceUuid/:configName",
113+
name: "实例配置文件",
114+
component: ProcessConfigFile
115+
},
116+
{
117+
path: "/process_config/:serviceUuid/:instanceUuid",
118+
name: "常用配置",
119+
component: ProcessConfig
120+
},
88121
{
89122
path: "/file/:serviceUuid/:instanceUuid",
90123
name: "文件管理",
@@ -95,10 +128,20 @@ const routes = [
95128
name: "实例详情",
96129
component: InstanceDetail
97130
},
131+
{
132+
path: "/user_resources/:userUuid",
133+
name: "用户资源",
134+
component: UserResources
135+
},
98136
{
99137
path: "/new_instace/",
100138
name: "新增实例",
101139
component: NewInstance
140+
},
141+
{
142+
path: "/login",
143+
name: "登录",
144+
component: Login
102145
}
103146
];
104147

‎src/app/service/chart_option.js‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
/*
2+
* @Author: Copyright 2021 Suwings
3+
* @Date: 2021-08-02 16:13:52
4+
* @LastEditTime: 2021-08-02 16:15:17
5+
* @Description:
6+
*/
7+
8+
export function getDefaultOption() {
9+
return {
10+
grid: {
11+
show: false,
12+
borderWidth: 0,
13+
top: 8,
14+
bottom: 30,
15+
left: 30,
16+
right: 8
17+
},
18+
xAxis: { type: "category", show: true },
19+
yAxis: { type: "value", min: 0, max: 100, show: true },
20+
series: [
21+
{
22+
type: "line",
23+
areaStyle: {},
24+
smooth: true,
25+
symbol: "none"
26+
}
27+
]
28+
};
29+
}
30+
31+
32+
export function getStatusChartOption1() {
33+
return {
34+
grid: {
35+
show: false,
36+
borderWidth: 0,
37+
top: 8,
38+
bottom: 30,
39+
left: 30,
40+
right: 8
41+
},
42+
xAxis: { type: "category", show: true },
43+
yAxis: { type: "value", show: true },
44+
series: [
45+
{
46+
type: "line",
47+
areaStyle: {},
48+
smooth: true,
49+
symbol: "none"
50+
}
51+
]
52+
}
53+
}
54+
55+
56+
export function getStatusChartOption2() {
57+
return {
58+
legend: {
59+
left: "center",
60+
data: ["总数", "运行数"]
61+
},
62+
grid: {
63+
show: false,
64+
borderWidth: 0,
65+
top: 8,
66+
bottom: 30,
67+
left: 30,
68+
right: 8
69+
},
70+
xAxis: { type: "category", show: true },
71+
yAxis: { type: "value", show: true },
72+
series: [
73+
{
74+
name: "总数",
75+
type: "line",
76+
areaStyle: {},
77+
smooth: true,
78+
symbol: "none"
79+
},
80+
{
81+
name: "运行数",
82+
type: "line",
83+
areaStyle: {},
84+
smooth: true,
85+
symbol: "none"
86+
}
87+
]
88+
}
89+
}

0 commit comments

Comments
 (0)