From 3125b112f7f1c4997943ebb896332589f2df7334 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 14 Sep 2023 14:51:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8home=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.ts       | 47 +++++++++++++++++++++++
 src/api/system/home.ts | 84 ------------------------------------------
 src/views/index.vue    |  2 +-
 3 files changed, 48 insertions(+), 85 deletions(-)
 create mode 100644 src/api/index.ts
 delete mode 100644 src/api/system/home.ts

diff --git a/src/api/index.ts b/src/api/index.ts
new file mode 100644
index 00000000..dc19f43a
--- /dev/null
+++ b/src/api/index.ts
@@ -0,0 +1,47 @@
+import { request } from '@/plugins/http-fetch';
+import { parseDateToStr } from '@/utils/date-utils';
+/**
+ * 查询公告列表
+ * @param query 查询参数
+ * @returns object
+ */
+export async function listMain() {
+  const result = await request({
+    url: 'systemManagement/v1/elementType/all/objectType/systemState',
+    method: 'get',
+  });
+  // console.log(result);
+  let realData = result.data.data;
+  const mergedData = realData.map((obj: any) => {
+    // console.log(obj);
+    const [key, value] = Object.entries(obj)[0];
+    const ipAddress = (value as any).ipAddress;
+    const systemState = (value as any).systemState;
+    const errCode = systemState && systemState['errorCode'];
+    var time = new Date();
+    // console.log(key, value);
+    let mergedObj;
+    if (errCode === undefined && systemState) {
+      mergedObj = {
+        ...systemState,
+        refresh: parseDateToStr(time),
+        ipAddress: ipAddress,
+        name: key,
+        status: '正常',
+      };
+    } else {
+      mergedObj = {
+        version: '-',
+        refresh: parseDateToStr(time),
+        ipAddress: ipAddress,
+        name: key,
+        status: '异常',
+      };
+    }
+    return mergedObj;
+  });
+
+  // console.log(mergedData);
+  //  console.log(rowArr)
+  return mergedData;
+}
diff --git a/src/api/system/home.ts b/src/api/system/home.ts
deleted file mode 100644
index 65530a8b..00000000
--- a/src/api/system/home.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { request } from '@/plugins/http-fetch';
-//import  * as apple  from '@/utils/date-utils';
-import  {parseDateToStr} from '@/utils/date-utils';
-/**
- * 查询公告列表
- * @param query 查询参数
- * @returns object
- */
-export async function listMain() {
-  var allStatus= await request({
-    url: 'systemManagement/v1/elementType/all/objectType/systemState',
-    method: 'get',
-  });
-  console.log(allStatus)
-  let realData=allStatus.data.data;
-  const mergedData = realData.map(obj => {
-    const [key, value] = Object.entries(obj)[0];
-    var time=new Date();
-    //console.log([key, value])
-    let mergedObj;
-    if (typeof (value.systemState.errorCode) === 'undefined'&&Object.keys(value.systemState).length !== 0){
-       mergedObj = { ...value.systemState, refresh:parseDateToStr(time),ipAddress: value.ipAddress, name: key,status:"正常" };
-
-    }else {
-       mergedObj = {version:"-",refresh:parseDateToStr(time),ipAddress: value.ipAddress, name: key,status:"异常" };
-
-    }
-    return mergedObj;
-  });
-
-  console.log(mergedData);
-//  console.log(rowArr)
-return mergedData;
-}
-
-/**
- * 查询公告详细
- * @param menuId 公告ID
- * @returns object
- */
-export function getNotice(noticeId: string | number) {
-  return request({
-    url: `/system/notice/${noticeId}`,
-    method: 'get',
-  });
-}
-
-/**
- * 新增公告
- * @param data 公告对象
- * @returns object
- */
-export function addNotice(data: Record<string, any>) {
-  return request({
-    url: '/system/notice',
-    method: 'post',
-    data: data,
-  });
-}
-
-/**
- * 修改公告
- * @param data 公告对象
- * @returns object
- */
-export function updateNotice(data: Record<string, any>) {
-  return request({
-    url: '/system/notice',
-    method: 'put',
-    data: data,
-  });
-}
-
-/**
- * 删除公告
- * @param noticeId 公告ID
- * @returns object
- */
-export function delNotice(noticeId: string | number) {
-  return request({
-    url: `/system/notice/${noticeId}`,
-    method: 'delete',
-  });
-}
diff --git a/src/views/index.vue b/src/views/index.vue
index e21829c8..cc12ae9b 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -3,7 +3,7 @@ import { PageContainer } from '@ant-design-vue/pro-layout';
 import { onMounted } from 'vue';
 import { ColumnsType } from 'ant-design-vue/lib/table';
 import { reactive, toRaw } from 'vue';
-import { listMain } from '@/api/system/home';
+import { listMain } from '@/api/index';
 import { TooltipComponent } from 'echarts/components';
 import { GaugeChart } from 'echarts/charts';
 import { CanvasRenderer } from 'echarts/renderers';