+
![]()
-
@@ -14,81 +14,15 @@
+
-
@@ -99,35 +33,36 @@ import { useStore } from '@/store/index.ts';
import { CountUp } from 'countup.js';
import { formatAxis } from '@/common/utils/formatTime.ts';
import { indexApi } from './api';
-import { topCardItemList, environmentList, activitiesList } from './mock.ts';
+import { useRouter } from 'vue-router';
export default {
- name: 'Home',
+ name: 'HomePage',
setup() {
// const { proxy } = getCurrentInstance() as any;
+ const router = useRouter();
const store = useStore();
const state = reactive({
- topCardItemList,
- environmentList,
- activitiesList,
- tableData: {
- data: [
- {
- date: '2016-05-02',
- name: '1号实验室',
- address: '烟感2.1%OBS/M',
- },
- {
- date: '2016-05-04',
- name: '2号实验室',
- address: '温度30℃',
- },
- {
- date: '2016-05-01',
- name: '3号实验室',
- address: '湿度57%RH',
- },
- ],
- },
+ topCardItemList: [
+ {
+ title: '项目数',
+ id: 'projectNum',
+ color: '#FEBB50',
+ },
+ {
+ title: 'Linux机器数',
+ id: 'machineNum',
+ color: '#F95959',
+ },
+ {
+ title: '数据库总数',
+ id: 'dbNum',
+ color: '#8595F4',
+ },
+ {
+ title: 'redis总数',
+ id: 'redisNum',
+ color: '#1abc9c',
+ },
+ ],
});
// 当前时间提示语
@@ -137,7 +72,7 @@ export default {
// 初始化数字滚动
const initNumCountUp = async () => {
- const res: any = await indexApi.getIndexCount.request()
+ const res: any = await indexApi.getIndexCount.request();
nextTick(() => {
new CountUp('projectNum', res.projectNum).start();
new CountUp('machineNum', res.machineNum).start();
@@ -146,104 +81,31 @@ export default {
});
};
- // // 实验室使用情况
- // const initHomeLaboratory = () => {
- // const myChart = echarts.init(proxy.$refs.homeLaboratoryRef);
- // const option = {
- // grid: {
- // top: 50,
- // right: 20,
- // bottom: 30,
- // left: 30,
- // },
- // tooltip: {
- // trigger: 'axis',
- // },
- // legend: {
- // data: ['预购队列', '最新成交价'],
- // right: 13,
- // },
- // xAxis: {
- // data: ['衬衫', '羊毛衫', '雪纺衫', '裤子', '高跟鞋', '袜子'],
- // },
- // yAxis: [
- // {
- // type: 'value',
- // name: '价格',
- // },
- // ],
- // series: [
- // {
- // name: '预购队列',
- // type: 'bar',
- // data: [5, 20, 36, 10, 10, 20],
- // },
- // {
- // name: '最新成交价',
- // type: 'line',
- // data: [15, 20, 16, 20, 30, 8],
- // },
- // ],
- // };
- // myChart.setOption(option);
- // window.addEventListener('resize', () => {
- // myChart.resize();
- // });
- // };
- // // 履约超时预警
- // const initHomeOvertime = () => {
- // const myChart = echarts.init(proxy.$refs.homeOvertimeRef);
- // const option = {
- // grid: {
- // top: 50,
- // right: 20,
- // bottom: 30,
- // left: 30,
- // },
- // tooltip: {
- // trigger: 'axis',
- // },
- // legend: {
- // data: ['订单数量', '超时数量', '在线数量', '预警数量'],
- // right: 13,
- // },
- // xAxis: {
- // data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
- // },
- // yAxis: [
- // {
- // type: 'value',
- // name: '数量',
- // },
- // ],
- // series: [
- // {
- // name: '订单数量',
- // type: 'bar',
- // data: [5, 20, 36, 10, 10, 20, 11, 13, 10, 9, 17, 19],
- // },
- // {
- // name: '超时数量',
- // type: 'bar',
- // data: [15, 12, 26, 15, 11, 16, 31, 13, 5, 16, 13, 15],
- // },
- // {
- // name: '在线数量',
- // type: 'line',
- // data: [15, 20, 16, 20, 30, 8, 16, 19, 12, 18, 19, 14],
- // },
- // {
- // name: '预警数量',
- // type: 'line',
- // data: [10, 10, 13, 12, 15, 18, 19, 10, 12, 15, 11, 17],
- // },
- // ],
- // };
- // myChart.setOption(option);
- // window.addEventListener('resize', () => {
- // myChart.resize();
- // });
- // };
+ const toPage = (item: any) => {
+ switch (item.id) {
+ case 'personal': {
+ router.push('/personal');
+ break;
+ }
+ case 'projectNum': {
+ router.push('/ops/projects');
+ break;
+ }
+ case 'machineNum': {
+ router.push('/ops/machines');
+ break;
+ }
+ case 'dbNum': {
+ router.push('/ops/dbms/dbs');
+ break;
+ }
+ case 'redisNum': {
+ router.push('/ops/redis/manage');
+ break;
+ }
+ }
+ };
+
// 页面加载时
onMounted(() => {
initNumCountUp();
@@ -255,9 +117,11 @@ export default {
const getUserInfos = computed(() => {
return store.state.userInfos.userInfos;
});
+
return {
getUserInfos,
currentTime,
+ toPage,
...toRefs(state),
};
},
@@ -273,6 +137,7 @@ export default {
background: gray;
border-radius: 4px;
transition: all ease 0.3s;
+ cursor: pointer;
&:hover {
box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
transition: all ease 0.3s;
diff --git a/mayfly_go_web/src/views/home/mock.ts b/mayfly_go_web/src/views/home/mock.ts
deleted file mode 100644
index d8c45f71..00000000
--- a/mayfly_go_web/src/views/home/mock.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-// 最顶部 card
-export const topCardItemList = [
- {
- title: '项目数',
- id: 'projectNum',
- num: '123',
- tip: '通过人数',
- tipNum: '911',
- color: '#FEBB50',
- iconColor: '#FDC566',
- icon: 'el-icon-histogram',
- },
- {
- title: 'Linux机器数',
- id: 'machineNum',
- num: '123',
- tip: '在场人数',
- tipNum: '911',
- color: '#F95959',
- iconColor: '#F86C6B',
- icon: 'iconfont icon-jinridaiban',
- },
- {
- title: '数据库总数',
- id: "dbNum",
- num: '123',
- tip: '使用中',
- tipNum: '611',
- color: '#8595F4',
- iconColor: '#92A1F4',
- icon: 'iconfont icon-AIshiyanshi',
- },
- {
- title: 'redis总数',
- id: 'redisNum',
- num: '123',
- tip: '通过人数',
- tipNum: '911',
- color: '#1abc9c',
- iconColor: '#FDC566',
- icon: 'iconfont icon-shenqingkaiban',
- },
-];
-
-// 环境监测
-export const environmentList = [
- {
- icon: 'iconfont icon-yangan',
- label: '烟感',
- value: '2.1%OBS/M',
- iconColor: '#F72B3F',
- },
- {
- icon: 'iconfont icon-wendu',
- label: '温度',
- value: '30℃',
- iconColor: '#91BFF8',
- },
- {
- icon: 'iconfont icon-shidu',
- label: '湿度',
- value: '57%RH',
- iconColor: '#88D565',
- },
- {
- icon: 'iconfont icon-zaosheng',
- label: '噪声',
- value: '57DB',
- iconColor: '#FBD4A0',
- },
-];
-
-// 动态信息
-export const activitiesList = [
- {
- time1: '今天',
- time2: '12:20:30',
- title: '更名',
- label: '正式更名为 vue-next-admin',
- },
- {
- time1: '02-17',
- time2: '12:20:30',
- title: '页面',
- label: '完成对首页的开发',
- },
- {
- time1: '02-14',
- time2: '12:20:30',
- title: '页面',
- label: '新增个人中心',
- },
-];
diff --git a/mayfly_go_web/src/views/login/component/Account.vue b/mayfly_go_web/src/views/login/component/AccountLogin.vue
similarity index 99%
rename from mayfly_go_web/src/views/login/component/Account.vue
rename to mayfly_go_web/src/views/login/component/AccountLogin.vue
index 991a16bd..b17cdd7a 100644
--- a/mayfly_go_web/src/views/login/component/Account.vue
+++ b/mayfly_go_web/src/views/login/component/AccountLogin.vue
@@ -62,7 +62,7 @@ import { formatAxis } from '@/common/utils/formatTime.ts';
import openApi from '@/common/openApi';
import { letterAvatar } from '@/common/utils/string';
export default defineComponent({
- name: 'Account',
+ name: 'AccountLogin',
setup() {
const store = useStore();
const route = useRoute();
diff --git a/mayfly_go_web/src/views/login/component/mobile.vue b/mayfly_go_web/src/views/login/component/MobileLogin.vue
similarity index 98%
rename from mayfly_go_web/src/views/login/component/mobile.vue
rename to mayfly_go_web/src/views/login/component/MobileLogin.vue
index f105caf6..ff6285cb 100644
--- a/mayfly_go_web/src/views/login/component/mobile.vue
+++ b/mayfly_go_web/src/views/login/component/MobileLogin.vue
@@ -33,7 +33,7 @@
+
diff --git a/mayfly_go_web/src/views/ops/machine/Monitor.vue b/mayfly_go_web/src/views/ops/machine/Monitor.vue
deleted file mode 100755
index 086cd575..00000000
--- a/mayfly_go_web/src/views/ops/machine/Monitor.vue
+++ /dev/null
@@ -1,208 +0,0 @@
-
- {{ v.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mayfly_go_web/src/views/ops/machine/api.ts b/mayfly_go_web/src/views/ops/machine/api.ts
index 53792f45..2107d72e 100644
--- a/mayfly_go_web/src/views/ops/machine/api.ts
+++ b/mayfly_go_web/src/views/ops/machine/api.ts
@@ -11,6 +11,8 @@ export const machineApi = {
closeCli: Api.create("/machines/{id}/close-cli", 'delete'),
// 保存按钮
saveMachine: Api.create("/machines", 'post'),
+ // 调整状态
+ changeStatus: Api.create("/machines/{id}/{status}", 'put'),
// 删除机器
del: Api.create("/machines/{id}", 'delete'),
scripts: Api.create("/machines/{machineId}/scripts", 'get'),
diff --git a/mayfly_go_web/src/views/ops/redis/RedisEdit.vue b/mayfly_go_web/src/views/ops/redis/RedisEdit.vue
index 1859c9c5..b0b3edc1 100644
--- a/mayfly_go_web/src/views/ops/redis/RedisEdit.vue
+++ b/mayfly_go_web/src/views/ops/redis/RedisEdit.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/mayfly_go_web/src/views/system/role/RoleEdit.vue b/mayfly_go_web/src/views/system/role/RoleEdit.vue
index 0549ea52..9cebbc7a 100755
--- a/mayfly_go_web/src/views/system/role/RoleEdit.vue
+++ b/mayfly_go_web/src/views/system/role/RoleEdit.vue
@@ -1,6 +1,6 @@
-
+