From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

---
 src/main/webapp/static/js/staDesc/staDesc.js |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/static/js/staDesc/staDesc.js b/src/main/webapp/static/js/staDesc/staDesc.js
index 5b259e0..7905eeb 100644
--- a/src/main/webapp/static/js/staDesc/staDesc.js
+++ b/src/main/webapp/static/js/staDesc/staDesc.js
@@ -25,11 +25,11 @@
             // ,{field: 'typeDesc', align: 'center',title: '浣滀笟绫诲瀷'}
             ,{field: 'stnNo$', align: 'center',title: '浣滀笟绔欑偣'}
             ,{field: 'stnDesc', align: 'center',title: '绔欑偣鍚嶇О', edit:'text'}
-            ,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈哄彿'}
-            ,{field: 'crnStn$', align: 'center',title: '鍫嗗灈鏈虹珯鐐�'}
+            ,{field: 'crnNo', align: 'center',title: '鎻愬崌鏈哄彿'}
+            ,{field: 'crnStn$', align: 'center',title: '绔欑偣'}
             ,{field: 'memo', align: 'center',title: '澶囨敞'}
-            // ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser', style: 'cursor:pointer'}
-            // ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+            ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
             // ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'}
             // ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
 
@@ -83,7 +83,7 @@
                 success: function (res) {
                     layer.closeAll();
                     if (res.code === 200){
-                        tableReload(false);
+                        $(".layui-laypage-btn")[0].click();
                     } else if (res.code === 403){
                         top.location.href = baseUrl+"/";
                     }else {
@@ -126,7 +126,7 @@
                     type: 2,
                     title: '鏂板',
                     maxmin: true,
-                    area: [top.detailWidth, top.detailHeight],
+                    area: ['40%', top.detailHeight],
                     shadeClose: false,
                     content: 'staDesc_detail.html',
                     success: function(layero, index){
@@ -240,7 +240,7 @@
                     type: 2,
                     title: '淇敼',
                     maxmin: true,
-                    area: [top.detailWidth, top.detailHeight],
+                    area: ['40%', top.detailHeight],
                     shadeClose: false,
                     content: 'staDesc_detail.html',
                     success: function(layero, index){

--
Gitblit v1.9.1