Merge branch 'master-mj-ztq' into 'master-mj'

feat:监控配置->资源管理（修改密码功能不能用页面报错



See merge request !1159

@@ -521,6 +521,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
                 $.each(data, function (k, v) {
                 $.each(data, function (k, v) {
                     var $dom = $($("#resManageAddProtocol").html());
                     var $dom = $($("#resManageAddProtocol").html());
                     $dom.find(".protocol-title span").text(k);
                     $dom.find(".protocol-title span").text(k);
+                    $dom.find(".protocol-title a.protocol-del").attr('data-protocol',k);
                     showPwdBtn(k, $dom, v);
                     showPwdBtn(k, $dom, v);
                     $.each(v, function (index, param) {
                     $.each(v, function (index, param) {
                         //是否必填 0必填，1非必填
                         //是否必填 0必填，1非必填
@@ -575,7 +576,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
                 }, function (layerIndex) {
                 }, function (layerIndex) {
                     loading = layer.load(2);
                     loading = layer.load(2);
                     admin.req({
                     admin.req({
-                        url: `${common.domainName}/api-web/res/pwd/log/change?resId=${resId}&collProtocol=${protocol}`,
+                        url: `${common.domainName}/api-web/res/pwd/log/change?resId=${id}&collProtocol=${protocol}`,
                         data: {},
                         data: {},
                         type: 'GET',
                         type: 'GET',
                         contentType: 'application/json;charset=UTF-8',
                         contentType: 'application/json;charset=UTF-8',