wms_saas.git - Gitblit

parent: b08464f7 | 补丁 | 提交 | ignore whitespace

whycq

2022-09-09 d113a9c68c36e9e54ffe56342e30d59e5ee0629d

5个文件已修改

1个文件已添加

	src/main/resources/application.yml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/css/style3.css	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/css/style4.css	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/js/changetime.js	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/index_datashow3.html	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/testview/testview.html	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/main/resources/application.yml

@@ -12,7 +12,7 @@
    #正式数据库
#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=zypms_pro
    #备份数据库
    url: jdbc:sqlserver://localhost:1433;databasename=zypms
    url: jdbc:sqlserver://192.168.4.15:1433;databasename=zypms
    username: sa
    password: sa@123
  mvc:

 src/main/webapp/static/css/style3.css

@@ -17,7 +17,7 @@
    width: 100%;
    /*margin: 0;*/
    /*background-color: !* #2C3E50 *! #2e4e7e;*/
    position: absolute;
    position: relative;
}

#top-tab {
@@ -115,7 +115,8 @@
/* 弹出层 */
#details {
    width: 98%;
    height: 90%;
    height: 170%;
    margin-bottom: 100px;
    background-color: #FFF;
    box-shadow: 0px 5px 20px #000;
    border-radius: 15px;
@@ -123,7 +124,6 @@
    top:2.5%;
    left:1%;
    display: none;
	
}
#tips {
    width: 30%;

 src/main/webapp/static/css/style4.css

@@ -10,6 +10,7 @@
    /*min-height: 1080px;*/
    /*height: auto !important;*/
    height: 1080px;
    margin-bottom: 100px;
}
.header {
    height: 8rem;
@@ -51,11 +52,16 @@
    left: 0;
    top: 50px;
    position: absolute;
    /*background-color: #fff;*/
    width: 92%;
    margin-left: 4%;
    min-height: 300px;
    height: auto !important;
    height: 300px;
    box-shadow: 0px 0px 20px #888888;
    background-color: #FFFFFF;
}
.colors {
    position: relative;
    /*width: 100%;*/
    background-color: #FFFFFF;
    /*box-shadow: 0px 0px 20px #888888;*/
}

 src/main/webapp/static/js/changetime.js

New file
@@ -0,0 +1 @@
$(document).onclick

 src/main/webapp/views/index_datashow3.html

@@ -11,6 +11,7 @@
<!--    <script src="../static/js/tableData2.js"></script>-->
    <script src="../static/js/tableData3.js"></script>
    <script src="../static/js/projectShow3.js"></script>
    <script src="../static/js/projectShow3.js"></script>
    <script src="../static/js/cols.js"></script>
</head>
<body>
@@ -38,19 +39,24 @@
            </table>
        </div>
    </div>

    <div id="details">
        <div class="head">
            <h2></h2>
            <button id="close" type="button" style="float: right;">关 闭</button>
        <div style="width: 98%;height: 110%;">
            <div class="head">
                <h2></h2>
                <button id="close" type="button" style="float: right;">关 闭</button>
            </div>
            <table id="details-tab-left" cellspacing="0" cellpadding="0"></table>
            <table id="details-tab" cellspacing="0" cellpadding="0">
                <thead>
                </thead>
                <tbody>
                </tbody>
            </table>
        </div>
        <table id="details-tab-left" cellspacing="0" cellpadding="0"></table>
        <table id="details-tab" cellspacing="0" cellpadding="0">
            <thead>
            </thead>
            <tbody>
            </tbody>
        </table>
    </div>


    <div id="tips">
        <h3>提示</h3>
        <div id="text">当前项目计划时间不完整；请补充完成后重试!</div>

 src/main/webapp/views/testview/testview.html

@@ -154,19 +154,22 @@
            </table>
        </div>
        <div class="float">
            <li style="height: 100px;background-color: #7a8191">1</li>
            <li style="height: 100px;background-color: #7a8191">1</li>
            <li style="height: 100px;background-color: #7a8191">1</li>
            <li style="height: 100px;background-color: #7a8191">1</li>
            <li style="height: 100px;background-color: #7a8191">1</li>
            <li style="height: 100px;background-color: #7a8191">1</li>
            <li style="height: 100px;background-color: #7a8191">1</li>
            <li style="height: 100px;background-color: #7a8191">1</li>
            <li style="height: 100px;background-color: #7a8191">1</li>
            <li style="height: 100px;background-color: #7a8191">1</li>
            <li style="height: 100px;background-color: #7a8191">1</li>
            <li style="height: 100px;background-color: #7a8191">1</li>
            <li style="height: 100px;background-color: #7a8191;margin-bottom: 100px">1</li>
            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
            <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
            <li style="height: 100px;background-color: #7a8191;;margin: 7px;">1</li>
            <div style="height: 100px;width: 100%;background-color: #2e4e7e">

            </div>
        </div>
    </div>

			@@ -12,7 +12,7 @@
			#正式数据库
			# url: jdbc:sqlserver://192.168.4.15:1433;databasename=zypms_pro
			#备份数据库
			url: jdbc:sqlserver://localhost:1433;databasename=zypms
			url: jdbc:sqlserver://192.168.4.15:1433;databasename=zypms
			username: sa
			password: sa@123
			mvc:

			@@ -17,7 +17,7 @@
			width: 100%;
			/margin: 0;/
			/background-color: ! #2C3E50 ! #2e4e7e;/
			position: absolute;
			position: relative;
			}

			#top-tab {
			@@ -115,7 +115,8 @@
			/* 弹出层 */
			#details {
			width: 98%;
			height: 90%;
			height: 170%;
			margin-bottom: 100px;
			background-color: #FFF;
			box-shadow: 0px 5px 20px #000;
			border-radius: 15px;
			@@ -123,7 +124,6 @@
			top:2.5%;
			left:1%;
			display: none;

			}
			#tips {
			width: 30%;

			@@ -10,6 +10,7 @@
			/min-height: 1080px;/
			/height: auto !important;/
			height: 1080px;
			margin-bottom: 100px;
			}
			.header {
			height: 8rem;
			@@ -51,11 +52,16 @@
			left: 0;
			top: 50px;
			position: absolute;
			/background-color: #fff;/
			width: 92%;
			margin-left: 4%;
			min-height: 300px;
			height: auto !important;
			height: 300px;
			box-shadow: 0px 0px 20px #888888;
			background-color: #FFFFFF;
			}
			.colors {
			position: relative;
			/width: 100%;/
			background-color: #FFFFFF;
			/box-shadow: 0px 0px 20px #888888;/
			}

			@@ -11,6 +11,7 @@
			<!-- <script src="../static/js/tableData2.js"></script>-->
			<script src="../static/js/tableData3.js"></script>
			<script src="../static/js/projectShow3.js"></script>
			<script src="../static/js/projectShow3.js"></script>
			<script src="../static/js/cols.js"></script>
			</head>
			<body>
			@@ -38,19 +39,24 @@
			</table>
			</div>
			</div>

			<div id="details">
			<div class="head">
			<h2></h2>
			<button id="close" type="button" style="float: right;">关闭</button>
			<div style="width: 98%;height: 110%;">
			<div class="head">
			<h2></h2>
			<button id="close" type="button" style="float: right;">关闭</button>
			</div>
			<table id="details-tab-left" cellspacing="0" cellpadding="0"></table>
			<table id="details-tab" cellspacing="0" cellpadding="0">
			<thead>
			</thead>
			<tbody>
			</tbody>
			</table>
			</div>
			<table id="details-tab-left" cellspacing="0" cellpadding="0"></table>
			<table id="details-tab" cellspacing="0" cellpadding="0">
			<thead>
			</thead>
			<tbody>
			</tbody>
			</table>
			</div>


			<div id="tips">
			<h3>提示</h3>
			<div id="text">当前项目计划时间不完整；请补充完成后重试!</div>

			@@ -154,19 +154,22 @@
			</table>
			</div>
			<div class="float">
			<li style="height: 100px;background-color: #7a8191">1</li>
			<li style="height: 100px;background-color: #7a8191">1</li>
			<li style="height: 100px;background-color: #7a8191">1</li>
			<li style="height: 100px;background-color: #7a8191">1</li>
			<li style="height: 100px;background-color: #7a8191">1</li>
			<li style="height: 100px;background-color: #7a8191">1</li>
			<li style="height: 100px;background-color: #7a8191">1</li>
			<li style="height: 100px;background-color: #7a8191">1</li>
			<li style="height: 100px;background-color: #7a8191">1</li>
			<li style="height: 100px;background-color: #7a8191">1</li>
			<li style="height: 100px;background-color: #7a8191">1</li>
			<li style="height: 100px;background-color: #7a8191">1</li>
			<li style="height: 100px;background-color: #7a8191;margin-bottom: 100px">1</li>
			<li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
			<li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
			<li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
			<li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
			<li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
			<li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
			<li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
			<li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
			<li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
			<li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
			<li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
			<li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
			<li style="height: 100px;background-color: #7a8191;;margin: 7px;">1</li>
			<div style="height: 100px;width: 100%;background-color: #2e4e7e">

			</div>
			</div>
			</div>