From 67dc291b3ed8a7fc43519bb5df2620301269b72c Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期日, 15 六月 2025 13:28:26 +0800
Subject: [PATCH] 完成调试
---
src/main/webapp/views/crn.html | 9 ++++++++-
src/main/webapp/views/index.html | 2 +-
src/main/java/com/zy/Boot.java | 2 ++
src/main/webapp/views/watch.html | 16 ++++++++++------
4 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/Boot.java b/src/main/java/com/zy/Boot.java
index f25a356..a616580 100644
--- a/src/main/java/com/zy/Boot.java
+++ b/src/main/java/com/zy/Boot.java
@@ -5,8 +5,10 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
@EnableAsync
+@EnableScheduling
@SpringBootApplication
public class Boot extends SpringBootServletInitializer {
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index d76e511..d90d12f 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -211,7 +211,7 @@
<button class="item" onclick="taskClear()">娓呴櫎鑱旀満浠诲姟</button>
<!-- <button class="item" onclick="pause()">鏆傚仠</button>-->
<!-- <button class="item" onclick="boot()">鍚姩</button>-->
-<!-- <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>-->
+ <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>
<!-- <button class="item" onclick="handleReset()">澶嶄綅</button>-->
</div>
</fieldset>
@@ -460,6 +460,13 @@
});
}
+ // 浠诲姟瀹屾垚
+ function clearCommand() {
+ http.post(baseUrl+"/crn/operator/clearCommand", getReqParam(), function (res) {
+ layer.msg(res.msg);
+ });
+ }
+
// 鏆傚仠
function pause() {
http.post(baseUrl+"/crn/operator/pause", getReqParam(), function (res) {
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index b8b6a5c..2cf7c86 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -24,7 +24,7 @@
<li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">涓绘帶鍥�</a></li>
<li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">杈撻�佽澶�</a></li>
<li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">鍫嗗灈鏈�</a></li>
- <li><a id="devops" onclick="nav(this.id)" class="nav-unselect" href="#">鎵ц鐩戞祴</a></li>
+ <li><a id="watch" onclick="nav(this.id)" class="nav-unselect" href="#">绯荤粺鐩戞祴</a></li>
<!-- <li><a id="rgv" onclick="nav(this.id)" class="nav-unselect" href="#">RGV</a></li>-->
</ul>
diff --git a/src/main/webapp/views/watch.html b/src/main/webapp/views/watch.html
index 9fe40a2..ee374da 100644
--- a/src/main/webapp/views/watch.html
+++ b/src/main/webapp/views/watch.html
@@ -4,12 +4,16 @@
<head>
<meta charset="UTF-8">
<title>绯荤粺鐩戣</title>
- <link rel="stylesheet" href="../../static/wcs/css/element.css">
- <script type="text/javascript" src="../../static/wcs/js/jquery/jquery-3.3.1.min.js"></script>
- <script type="text/javascript" src="../../static/wcs/js/common.js"></script>
- <script type="text/javascript" src="../../static/wcs/js/vue.min.js"></script>
- <script type="text/javascript" src="../../static/wcs/js/element.js"></script>
+ <link rel="stylesheet" href="../static/css/element.css">
+ <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
+ <script type="text/javascript" src="../static/js/common.js"></script>
+ <script type="text/javascript" src="../static/js/vue.min.js"></script>
+ <script type="text/javascript" src="../static/js/element.js"></script>
<style>
+ body{
+ background-color: rgb(108,167,168);
+ }
+
.container {
display: flex;
flex-wrap: wrap;
@@ -24,7 +28,7 @@
</head>
<body>
- <div id="app">
+ <div id="app" style="width: 90%;float: right;">
<div class="container" v-if="watchData != undefined && watchData != null && watchData.length > 0">
<el-card class="box-card" v-for="item in watchData" :key="item">
<div>
--
Gitblit v1.9.1