1.0.1

src/apis/node.ts

@@ -4,6 +4,7 @@ import {INodeList, NodeAddParam, NodeinfoParam, NodeItme, NodeItmeData, TaskNode
 import {LoginRet} from "/@/model/login";
 import {PingConfig} from "/@/model/pingconfig";
 import {NodeConfigData, NodeData} from "/@/model/nodeconfig";
+import {TaskLogData} from "/@/model/tasklog";
 
 
 
@@ -89,4 +90,9 @@ export const nodeConfigEditALLReqUse = (params : any) => {
 //删除
 export const nodeConfigDeleteALLReqUse = (params : any) => {
     return httprequest.post<any>("api/v1/node/config/del",params)
+}
+
+//获取任务日志
+export const taskLogReqUse = (params : any) => {
+    return httprequest.get<TaskLogData>("api/v1/task/log/get",params)
 }

src/model/tasklog.ts

@@ -0,0 +1,11 @@
+export interface TaskLogData {
+    TaskLog: TaskLog[]
+}
+
+export interface TaskLog {
+    id: number
+    taskname: string
+    taskconet: string
+    updateAt: string
+    createAt: string
+}

src/view/node/nodeconfig.vue

@@ -115,7 +115,8 @@ import { ColumnProps } from "ant-design-vue/lib/table";
 import {it} from "node:test";
 import {message} from "ant-design-vue";
 import router from "/@/router";
-import NodeConfigInfo = namespace.NodeConfigInfo;
+import { NodeConfigInfo } from "/@/model/nodeconfig";
+
 type Key = ColumnProps['key'];
 export default defineComponent({
   name:"node",

src/view/syslog/index.vue

@@ -1,84 +1,64 @@
 <template>
-  <div style="margin-top: 10px">
-    <a-textarea v-model:value="msg" :disabled="true"  style="height: 500px" />
-  </div>
+  <a-table :columns="columns" :data-source="datalist" rowKey="id" :style="{ height: '100%', borderRight: 0 }">
+    <template v-slot:bodyCell="{column , record}">
+
+    </template>
+  </a-table>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import {defineComponent, onMounted, reactive, toRefs} from "vue";
+import {taskLogReqUse} from "/@/apis/node";
+import {TaskLog, TaskLogData} from "/@/model/tasklog";
 
-export default defineComponent({
-  setup(){
-
-    const status = reactive({
-      websocket : undefined,
-      msg: "",
-    })
-
-    const heartCheck = {
-      timeout: 360000, // 5分钟发一次心跳，比server端设置的连接时间稍微小一点，在接近断开的情况下以通信的方式去重置连接时间。
-      timeoutObj: null,
-      serverTimeoutObj: null,
-      reset: function () {
-        clearTimeout(this.timeoutObj)
-        clearTimeout(this.serverTimeoutObj)
-        return this
-      },
-      start: function () {
-        this.serverTimeoutObj = setInterval(function () {
-          if (status.websocket.readyState === 1) {
-            console.log('连接状态，发送消息保持连接')
-            status.websocket.send('{"e":"ping","d":""}}') // 连接成功将消息传给服务端
-            heartCheck.reset().start() // 如果获得消息 说明连接正常 重置心跳检测
-          } else {
-            console.log('断开连接， 尝试重连')
-            newWebsocket()
-          }
-        }, this.timeout)
-      }
-    }
-    const newWebsocket = ()=> {
-      status.websocket = new WebSocket("ws://api.163jsd.xyz/api/v1/ws/socket");
-      status.websocket.onopen = function() {
-        // webSocket 已连接上，使用 send() 方法发送数据
-        status.websocket.send("发送数据");
-        console.log("数据发送中...");
-      };
+const columns = [
+  {
+    title: 'Id',
+    name: 'id',
+    dataIndex: 'id',
+    key: 'id',
+  },
+  {
+    title: '服务器ID',
+    name: 'taskname',
+    dataIndex: 'taskconet',
+    key: 'taskconet',
+  },
+  {
+    title: '创建时间',
+    name: 'createAt',
+    dataIndex: 'createAt',
+    key: 'createAt',
+  },
+];
 
-      status.websocket.onmessage = function (evt) {
-        // 接收到的数据
-        let data = JSON.parse(evt.data)
-        if (data.e == "sys_log"){
-          status.msg = data.d["msg"];
-        } else if(data.e === "ping"){
-          status.msg = data.e;
-        } else if(data.e === "connected"){
-          status.msg = data.d["ID"];
-        }
-      };
+const status = reactive({
+  datalist : [] as TaskLog[],
 
-      status.websocket.onerror = function () {
-        // 连接报错
-        console.log('连接报错...');
-      }
+})
 
-      status.websocket.onclose = function() {
-        // 关闭 webSocket
-        console.log("连接已关闭...");
-      };
-   
-    }
+const taskLog = async  ()=>{
+   let data = await taskLogReqUse(null)
+   status.datalist = data.data.TaskLog
+}
 
-    onMounted(()=>{
-      heartCheck.reset().start()
-      newWebsocket()
-    })
+const { datalist } = toRefs(status)
 
-    return {
-      ...toRefs(status)
-    }
-  }
+onMounted(()=>{
+  taskLog()
 })
+// export default defineComponent({
+//   setup(){
+//
+
+//
+//
+//
+//     return {
+//       ...toRefs(status)
+//     }
+//   }
+// })
 
 
 </script>

src/view/syslog/web.vue

@@ -0,0 +1,81 @@
+<template>
+
+</template>
+
+<script>
+// const heartCheck = {
+//   timeout: 360000, // 5?????????server?????????????????????????????????????
+//   timeoutObj: null,
+//   serverTimeoutObj: null,
+//   reset: function () {
+//     clearTimeout(this.timeoutObj)
+//     clearTimeout(this.serverTimeoutObj)
+//     return this
+//   },
+//   start: function () {
+//     this.serverTimeoutObj = setInterval(function () {
+//       if (status.websocket.readyState === 1) {
+//         console.log('?????????????')
+//         status.websocket.send('{"e":"ping","d":""}') // ????????????
+//         heartCheck.reset().start() // ?????? ?????? ??????
+//       } else {
+//         console.log('????? ????')
+//         newWebsocket()
+//       }
+//     }, this.timeout)
+//   }
+// }
+// const newWebsocket = ()=> {
+//  // let url = "ws://api.163jsd.xyz/api/v1/ws/socket"
+//   let url = "ws://127.0.0.1:8080/api/v1/ws/socket"
+//
+//   status.websocket = new WebSocket(url);
+//   status.websocket.onopen = function() {
+//     // webSocket ??????? send() ??????
+//
+//     console.log("?????...");
+//   };
+//
+//   status.websocket.onmessage = function (evt) {
+//     // ??????
+//     let data = JSON.parse(evt.data)
+//     if (data.e == "sys_log"){
+//       status.msg = data.d["msg"];
+//     } else if(data.e === "ping"){
+//       status.msg = data.e;
+//     } else if(data.e === "syslog"){
+//       status.msg = data.d["msg"];
+//     }
+//     else if(data.e === "connected"){
+//       status.msg = "connected";
+//       const loginData = {
+//         "e": "login",
+//         "d": null
+//       }
+//       let s = JSON.stringify(loginData)
+//       console.log(s)
+//       status.websocket.send(s);
+//     }
+//   };
+//
+//   status.websocket.onerror = function () {
+//     // ????
+//     console.log('????...');
+//   }
+//
+//   status.websocket.onclose = function() {
+//     // ?? webSocket
+//     console.log("?????...");
+//   };
+//
+// }
+//
+// onMounted(()=>{
+//   heartCheck.reset().start()
+//   newWebsocket()
+// })
+</script>
+
+<style scoped>
+
+</style>