From 05ebcccc2c8099c0252501fea0e1797e5a1361d2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 15 七月 2020 10:59:46 +0800
Subject: [PATCH] Merge branches 'master' and 'xtyasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xtyasrs
---
src/main/webapp/static/js/matCode/matCode.js | 17 +----------------
1 files changed, 1 insertions(+), 16 deletions(-)
diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index 8de1dd2..1d2861f 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -60,8 +60,7 @@
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
// ,{field: 'status', align: 'center',title: ''}
-
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
request: {
pageName: 'curr',
@@ -218,20 +217,6 @@
}
});
}
- break;
- // 鐢熸垚鎵樼洏鐮�
- case "btnTray":
- layer.open({
- type: 2,
- title: '鐢熸垚鎵樼洏鐮�',
- area: ['500px'],
- shadeClose: true,
- content: 'tray.html',
- success: function(layero, index){
- },
- end: function () {
- }
- });
break;
}
});
--
Gitblit v1.9.1