From 02f82cb286e0825e2ac9a661a91a91eaf7d0ada4 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期二, 14 六月 2022 10:53:02 +0800
Subject: [PATCH] #
---
src/main/webapp/static/css/common.css | 2 +-
/dev/null | 0
src/main/webapp/static/css/cool.css | 3 ---
version/doc/WCS与PLC通讯接口协议V1.docx | 0
src/main/webapp/static/js/common.js | 2 +-
pom.xml | 2 +-
src/main/resources/application.yml | 12 +++---------
7 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index ff7d6bb..3baad37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,7 @@
</dependencies>
<build>
- <finalName>jkwms</finalName>
+ <finalName>lywms</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 04bb47d..43082fc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,8 +10,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=jkasrs
-# url: jdbc:sqlserver://10.20.192.200:1433;databasename=jkasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=hylyasrs
username: sa
password: sa@123
mvc:
@@ -47,11 +46,6 @@
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16,17,20,21,24,25,28,29,32,33,36,37,40,41,44,45,48
+ doubleLocs: 1,4,5,8,9,12,13,16
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
-
-#鍏ュ簱鏆傚瓨鏁�
-store:
- bufferCount: 2
-
+ groupCount: 4
\ No newline at end of file
diff --git a/src/main/webapp/static/css/common.css b/src/main/webapp/static/css/common.css
index 8e4fab9..5562fb9 100644
--- a/src/main/webapp/static/css/common.css
+++ b/src/main/webapp/static/css/common.css
@@ -121,7 +121,7 @@
/*word-break: break-all;*/
/*}*/
/*.layui-table-grid-down {*/
- /*display: none;*/
+/* display: none;*/
/*}*/
/*璇︽儏*/
diff --git a/src/main/webapp/static/css/cool.css b/src/main/webapp/static/css/cool.css
index 51782aa..2e7d68b 100644
--- a/src/main/webapp/static/css/cool.css
+++ b/src/main/webapp/static/css/cool.css
@@ -43,6 +43,3 @@
color:#aaaaaa;
}
-.layui-table-grid-down {
- display: none;
-}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 8cbf20d..a395150 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/jkwms";
+var baseUrl = "/lywms";
// 璇︽儏绐楀彛-楂樺害
var detailHeight = '80%';
diff --git "a/version/doc/\346\235\260\345\205\213\347\274\235\347\272\253\346\234\272\357\274\210\344\270\200\346\234\237\357\274\211WCS\344\270\216PLC\351\200\232\350\256\257\346\216\245\345\217\243\345\215\217\350\256\256V1.docx" "b/version/doc/WCS\344\270\216PLC\351\200\232\350\256\257\346\216\245\345\217\243\345\215\217\350\256\256V1.docx"
similarity index 100%
rename from "version/doc/\346\235\260\345\205\213\347\274\235\347\272\253\346\234\272\357\274\210\344\270\200\346\234\237\357\274\211WCS\344\270\216PLC\351\200\232\350\256\257\346\216\245\345\217\243\345\215\217\350\256\256V1.docx"
rename to "version/doc/WCS\344\270\216PLC\351\200\232\350\256\257\346\216\245\345\217\243\345\215\217\350\256\256V1.docx"
Binary files differ
diff --git "a/version/doc/\344\270\255\346\211\254\347\253\213\344\275\223\345\272\223\346\223\215\344\275\234\346\265\201\347\250\213V2.0.pptx" "b/version/doc/\344\270\255\346\211\254\347\253\213\344\275\223\345\272\223\346\223\215\344\275\234\346\265\201\347\250\213V2.0.pptx"
deleted file mode 100644
index 5bf3688..0000000
--- "a/version/doc/\344\270\255\346\211\254\347\253\213\344\275\223\345\272\223\346\223\215\344\275\234\346\265\201\347\250\213V2.0.pptx"
+++ /dev/null
Binary files differ
diff --git "a/version/doc/\346\235\260\345\205\213\344\270\200\346\245\274\347\253\231\344\275\215\345\233\276.pdf" "b/version/doc/\346\235\260\345\205\213\344\270\200\346\245\274\347\253\231\344\275\215\345\233\276.pdf"
deleted file mode 100644
index 75eb8a6..0000000
--- "a/version/doc/\346\235\260\345\205\213\344\270\200\346\245\274\347\253\231\344\275\215\345\233\276.pdf"
+++ /dev/null
Binary files differ
diff --git "a/version/doc/\346\235\260\345\205\213\346\210\220\345\223\201\351\205\215\347\275\256\345\214\226\346\217\217\350\277\260\346\270\205\345\215\225.xlsx" "b/version/doc/\346\235\260\345\205\213\346\210\220\345\223\201\351\205\215\347\275\256\345\214\226\346\217\217\350\277\260\346\270\205\345\215\225.xlsx"
deleted file mode 100644
index 6ba77d5..0000000
--- "a/version/doc/\346\235\260\345\205\213\346\210\220\345\223\201\351\205\215\347\275\256\345\214\226\346\217\217\350\277\260\346\270\205\345\215\225.xlsx"
+++ /dev/null
Binary files differ
--
Gitblit v1.9.1