zy-wcs.git - Gitblit

parent: 32b59311 | 补丁 | 提交 | ignore whitespace

2025-06-15 67dc291b3ed8a7fc43519bb5df2620301269b72c

完成调试

4个文件已修改

	src/main/java/com/zy/Boot.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/crn.html	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/index.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/watch.html	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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 {


 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) {

 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>

 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>

			@@ -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 {

			@@ -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) {

			@@ -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>

			@@ -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>