From 34b2641f4a039d4e1dcf8f4a93dd7928616c4b11 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 15 一月 2026 15:17:09 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/basMap/basMap.js |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/static/js/basMap/basMap.js b/src/main/webapp/static/js/basMap/basMap.js
index a21e47d..4843fed 100644
--- a/src/main/webapp/static/js/basMap/basMap.js
+++ b/src/main/webapp/static/js/basMap/basMap.js
@@ -30,10 +30,10 @@
             , {field: 'updateTime$', align: 'center', title: '鏇存柊鏃堕棿'}
             , {field: 'lastData', align: 'center', title: '鏈�杩戞暟鎹�'}
             , {field: 'originData', align: 'center', title: '鍘熷鍦板浘'}
-            , {field: 'baseRow', align: 'center', title: '鍩哄噯鎺�'}
-            , {field: 'baseRowCode', align: 'center', title: '鍩哄噯鎺�-code'}
-            , {field: 'baseBay', align: 'center', title: '鍩哄噯鍒�'}
-            , {field: 'baseBayCode', align: 'center', title: '鍩哄噯鍒�-code'}
+            // , {field: 'baseRow', align: 'center', title: '鍩哄噯鎺�'}
+            // , {field: 'baseRowCode', align: 'center', title: '鍩哄噯鎺�-code'}
+            // , {field: 'baseBay', align: 'center', title: '鍩哄噯鍒�'}
+            // , {field: 'baseBayCode', align: 'center', title: '鍩哄噯鍒�-code'}
 
             , {fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 120}
         ]],
@@ -62,17 +62,26 @@
     });
 
     // 娓叉煋
+    var loadIndex;
     upload.render({
         elem: '.demo-class-accept', // 缁戝畾澶氫釜鍏冪礌
-        url: baseUrl + "/basMap/upload", // 姝ゅ閰嶇疆浣犺嚜宸辩殑涓婁紶鎺ュ彛鍗冲彲
+        url: baseUrl + "/basMap/crn/upload", // 姝ゅ閰嶇疆浣犺嚜宸辩殑涓婁紶鎺ュ彛鍗冲彲
         accept: 'file', // 鏅�氭枃浠�
+        before: function (obj) {
+            loadIndex = layer.load(2);
+        },
         done: function (res) {
+            layer.close(loadIndex);
             if (res.code == 200) {
                 layer.msg('瀵煎叆鎴愬姛');
                 tableReload()
             }else {
                 layer.msg(res.msg, {icon: 2})
             }
+        },
+        error: function () {
+            layer.close(loadIndex);
+            layer.msg('涓婁紶澶辫触', {icon: 2});
         }
     });
 
@@ -164,19 +173,18 @@
     });
 
     function initLocMast() {
-        layer.confirm('纭畾鍒濆鍖栧簱浣嶆暟鎹悧锛�', {
-            skin: 'layui-layer-admin',
-            shade: .1
-        }, function (i) {
-            layer.close(i);
+        layer.prompt({title: '璇疯緭鍏ュ垵濮嬪寲搴撲綅灞傛暟', formType: 0,   shadeClose: true}, function(lev, idx){
             var loadIndex = layer.load(2);
             $.ajax({
                 url: baseUrl + "/locMast/init",
                 headers: {'token': localStorage.getItem('token')},
-                data: {},
+                data: {
+                    'lev': lev
+                },
                 method: 'POST',
                 success: function (res) {
                     layer.close(loadIndex);
+                    layer.close(idx);
                     if (res.code === 200) {
                         layer.msg(res.msg, {icon: 1});
                         tableReload();

--
Gitblit v1.9.1