提交修改table树导致不兼容问题修复

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/ajax/libs/bootstrap-treetable/bootstrap-table-tree.js

@@ -6,7 +6,6 @@
     "use strict";
 
     $.fn.bootstrapTreeTable = function(options, param) {
-        debugger
         var target = $(this).data('bootstrap.tree.table');
         target = target ? target : $(this);
         // 如果是调用方法
@@ -204,7 +203,6 @@
         };
         // 加载完数据后渲染表格
         var renderTable = function(data) {
-            debugger
             var list, totalPage = 0, currPage = 0;
             if (options.pagination) {
             	list = data.rows;  // 数据
@@ -684,7 +682,6 @@
         };
         // 注册小图标点击事件--展开缩起
         var registerExpanderEvent = function() {
-            debugger
             target.find("tbody").find("tr").find(".treetable-expander").unbind();
             target.find("tbody").find("tr").find(".treetable-expander").click(function() {
                 var _isExpanded = $(this).hasClass(options.expanderExpandedClass);

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/ruoyi/index.js

@@ -245,7 +245,7 @@ $(function() {
 
             $.modal.loading("数据加载中，请稍后...");
 
-            $('.mainContent iframe:visible').load(function () {
+            $('.mainContent iframe:visible').on("load",function () {
                 $.modal.closeLoading();
             });
 
@@ -764,7 +764,7 @@ var initUtil={
 
                 $.modal.loading("数据加载中，请稍后...");
 
-                $('.mainContent iframe:visible').load(function () {
+                $('.mainContent iframe:visible').on("load",function () {
                     $.modal.closeLoading();
                 });
 

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/ruoyi/js/common.js

@@ -264,6 +264,16 @@ var storage = {
     }
 };
 
+// 返回当前激活的Tab页面关联的iframe的Windows对象
+function activeWindow() {
+    var topWindow = $(window.parent.document);
+    var currentId = $('.page-tabs-content', topWindow).find('.active').attr('data-id');
+    if (!currentId) {
+        return window.parent;
+    }
+    return $('.RuoYi_iframe[data-id="' + currentId + '"]', topWindow)[0].contentWindow;
+}
+
 /** 设置全局ajax处理 */
 $.ajaxSetup({
     complete: function(XMLHttpRequest, textStatus) {

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/resetPwd.html

@@ -10,7 +10,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">登录名称：</label>
             <div class="col-sm-8">
-                <input class="form-control" type="text" readonly="true" name="secretName" th:value="${user.loginName}"/>
+                <input class="form-control" type="text" readonly="true" name="secretName" id="userName" th:value="${user.loginName}"/>
             </div>
         </div>
         <div class="form-group">
@@ -37,11 +37,13 @@
 
     function submitHandler() {
         var password = $("#password").val();
+        var userName = $("#userName").val();
 
         if(!checkPwd(password)){
             return;
         }
         $("#password").val(Encrypt(password));
+        $("#userName").val(Encrypt(userName));
         if ($.validate.form()) {
             $.operate.save(ctx + "system/user/resetPwd", $('#form-user-resetPwd').serialize());
         }