From dd0b01f3be85e9d8783e7266ffe6dee50dace7cd Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期一, 25 五月 2020 14:57:16 +0800
Subject: [PATCH] #
---
src/main/webapp/static/css/common.css | 9 ++++-----
src/main/webapp/static/js/operateLog/operateLog.js | 4 ++--
src/main/webapp/static/js/stkPlcm/stkPlcm.js | 2 +-
src/main/webapp/static/js/common.js | 4 ++--
src/main/webapp/static/js/user/user.js | 6 +++---
src/main/resources/application.yml | 4 ++--
6 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9f5f2ed..30e20ad 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -3,8 +3,8 @@
spring:
application:
- name: @pom.artifactId@
-# name:
+# name: @pom.artifactId@
+ name:
datasource:
# mysql
# driver-class-name: com.mysql.jdbc.Driver
diff --git a/src/main/webapp/static/css/common.css b/src/main/webapp/static/css/common.css
index d917abc..5c17576 100644
--- a/src/main/webapp/static/css/common.css
+++ b/src/main/webapp/static/css/common.css
@@ -79,6 +79,7 @@
.layui-table-tool {
/*background-color: #fff;*/
}
+/* table 锛堟崲琛�/璇︽儏锛夋樉绀烘帶鍒� */
.layui-table-cell {
font-size:14px;
padding:0 5px;
@@ -87,6 +88,9 @@
text-overflow:inherit;
white-space:normal;
word-break: break-all;
+}
+.layui-table-grid-down {
+ display: none;
}
/*璇︽儏*/
@@ -172,11 +176,6 @@
display: none;
}
#btn-into {
- display: none;
-}
-
-/*layui table 璇︽儏鎸夐挳*/
-.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 7f8a9b6..9907798 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,7 +1,7 @@
// 鐢熶骇
-var baseUrl = "/asrs";
+// var baseUrl = "/asrs";
// 娴嬭瘯
-// var baseUrl = "";
+var baseUrl = "";
// 璇︽儏绐楀彛-楂樺害
diff --git a/src/main/webapp/static/js/operateLog/operateLog.js b/src/main/webapp/static/js/operateLog/operateLog.js
index 14073f1..7bb667e 100644
--- a/src/main/webapp/static/js/operateLog/operateLog.js
+++ b/src/main/webapp/static/js/operateLog/operateLog.js
@@ -17,8 +17,8 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox', fixed: 'left'}
- ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
+ {type: 'checkbox'}
+ ,{field: 'id', title: 'ID', sort: true,align: 'center', width: 80}
,{field: 'action', align: 'center',title: '璁块棶鍦板潃'}
,{field: 'userId$', align: 'center',title: '鐢ㄦ埛',event: 'userId', style: 'text-decoration: underline;cursor:pointer'}
,{field: 'ip', edit:'text', align: 'center',title: '瀹㈡埛绔疘P'}
diff --git a/src/main/webapp/static/js/stkPlcm/stkPlcm.js b/src/main/webapp/static/js/stkPlcm/stkPlcm.js
index fac1023..8990b3b 100644
--- a/src/main/webapp/static/js/stkPlcm/stkPlcm.js
+++ b/src/main/webapp/static/js/stkPlcm/stkPlcm.js
@@ -21,7 +21,7 @@
,{field: 'ioTime$', align: 'center',title: '鏃ユ湡'}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�',event: 'locNo', style: 'cursor:pointer'}
- ,{field: 'crnError$', align: 'center',title: '寮傚父鐮�',event: 'crnError', style: 'cursor:pointer'}
+ ,{field: 'crnError$', align: 'center',title: '寮傚父鐮�'}
,{field: 'modiTime$', align: 'center',title: '寮傚父鏃堕棿'}
,{field: 'devNo$', align: 'center',title: '鍫嗗灈鏈哄彿',event: 'devNo', style: 'cursor:pointer'}
,{field: 'wrkTime$', align: 'center',title: '宸ヤ綔妗ｆ椂闂�'}
diff --git a/src/main/webapp/static/js/user/user.js b/src/main/webapp/static/js/user/user.js
index cd24082..bff9a99 100644
--- a/src/main/webapp/static/js/user/user.js
+++ b/src/main/webapp/static/js/user/user.js
@@ -18,12 +18,12 @@
cellMinWidth: 50,
cols: [[
{type: 'checkbox'}
- ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
- ,{field: 'hostName', align: 'center',title: '鎺堟潈鍟嗘埛',event: 'Host', style: 'text-decoration: underline;cursor:pointer'}
+ ,{field: 'id', title: 'ID', sort: true,align: 'center', width: 80}
+ ,{field: 'hostName', align: 'center',title: '鎺堟潈鍟嗘埛'}
,{field: 'username', align: 'center',title: '璐﹀彿'}
,{field: 'mobile', align: 'center',title: '鎵嬫満鍙�'}
,{field: 'password', align: 'center',title: '瀵嗙爜'}
- ,{field: 'roleName', align: 'center',title: '瑙掕壊',event: 'Role', style: 'text-decoration: underline;cursor:pointer'}
+ ,{field: 'roleName', align: 'center',title: '瑙掕壊'}
,{field: 'createTime$', align: 'center',title: '娉ㄥ唽鏃堕棿'}
,{field: 'status$', align: 'center',title: '鐘舵��'}
--
Gitblit v1.9.1