zy-wcs.git - Gitblit

	src/main/java/com/zy/Boot.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/index.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/watch.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| 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/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

@@ -10,6 +10,10 @@
        <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 {

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

			@@ -10,6 +10,10 @@
			<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>