From 5de347e1a4dc3b32b230e092cd12cac9af75bda0 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.33>
Date: 星期四, 11 十月 2018 14:15:11 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ele-match-group.jsp | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/WebRoot/ele-match-group.jsp b/gx_tieta/WebRoot/ele-match-group.jsp
index 2a4e5a6..461c9c3 100644
--- a/gx_tieta/WebRoot/ele-match-group.jsp
+++ b/gx_tieta/WebRoot/ele-match-group.jsp
@@ -23,6 +23,7 @@
<link rel="stylesheet" type="text/css" href="css/basic.css" />
<link rel="stylesheet" href="css/common.css">
<link rel="stylesheet" href="pages/css/common.css">
+ <link rel="stylesheet" href="pages/css/mylayui.css">
<style type="text/css">
#main {
position: absolute;
@@ -37,9 +38,6 @@
}
.layui-form-radio {
margin-right: 10px !important;
- }
- .layui-table-view {
- margin: 0;
}
</style>
</head>
@@ -139,8 +137,7 @@
,defaultToolbar: ['exports', 'filter']
,cellMinWidth: 80
,cols: [[
- {type: 'radio', fixed: 'left'}
- ,{field:'stationname', title:'鏈烘埧鍚嶇О', align:'center', width: 380}
+ {field:'stationname', title:'鏈烘埧鍚嶇О', align:'center', width: 380}
,{field:'groupname', title:'鐢垫睜缁勫悕绉�', align:'center'}
,{field:'monnum', title:'鍗曚綋缂栧彿', align:'center'}
,{field:'brandname', title:'鍝佺墝鍚嶇О', align:'center'}
--
Gitblit v1.9.1