更改实名制-施工人员管理页面代码

czl-web/index.html

@@ -28,8 +28,8 @@
 	<div class="layui-header header header-demo">
 		<div class="layui-main">
 			<div class="admin-login-box">
-				<a class="logo" style="left: 0;" href="/">
+				<a class="logo" style="left: 0;" href="#">
-					<span style="font-size: 22px;">后台管理系统</span>
+					<span style="font-size: 20px;color:#ffffff;">后台管理系统</span>
 				</a>
 				<div class="admin-side-toggle">
 					<i class="fa fa-bars" aria-hidden="true"></i>

czl-web/login.html

@@ -95,7 +95,6 @@
 <script src="js/layui2.7.6/layui.js"></script>
 <script src="js/aes.js"></script>
 <script type="text/javascript" src="../public/public.js"></script>
-<script src="js/publicJs.js"></script>
 <script type="text/javascript">
     layui.use('layer', function () {
         var layer = layui.layer;

czl-web/pages/home.html

@@ -90,7 +90,7 @@
             <div id="u456_text" class="text ">
                 <p>
                     <span style="font-family:'Font Awesome 5 Pro Solid', 'Font Awesome 5 Pro Regular', 'Font Awesome 5 Pro', sans-serif;font-weight:900;" id="cache3"></span>
-                    <span style="font-family:'微软雅黑', sans-serif;font-weight:400;"> 大屏看板</span>
+                    <span style="font-family:'微软雅黑', sans-serif;font-weight:400;">大屏看板</span>
                 </p>
             </div>
         </div>

public/html/userForm.html

@@ -6,13 +6,13 @@
     <link rel="stylesheet" type="text/css" media="screen" href="../../smz-web/layui/css/layui.css">
     <link rel="stylesheet" href="../../smz-web/css/ztree/zTreeStyle/zTreeStyle.css" type="text/css">
     <style>
-        #orgContent {
+        #orgContent, #orgContentldlz, #orgContentCzl {
             z-index: 99;
             background-color: #fff;
             box-shadow: 1px 1px 5px #888888;
         }
 
-        #orgName {
+        #orgName, #departmentldlz, #department {
             border: 0;
             margin-top: 1%;
             width: 100%;
@@ -135,7 +135,7 @@
                             <input id="orgName" type="text" placeholder="请选择分公司" jyValidate="required"
                                    readonly
                                    value="" class="FormElement ui-widget-content ui-corner-all"
-                                   />
+                            />
                             <input type="hidden" id="orgId" name="orgId" value="">
                             <input type="hidden" id="companyId" name="companyId" value="">
                             <a href="#" title="清空" onclick="emptyRole(); return false;" class="lrspace3 aBtnNoTD"
@@ -203,11 +203,12 @@
                     <div class="layui-input-inline" style="width: 100%;">
                         <div style="border: 0.5px solid #E6E6E6;height: 37px;text-indent: 10px;">
                             <input class="FormElement ui-widget-content ui-corner-all" id="departmentldlz"
-                                   readonly="readonly" value="点击进行部门选择" jyValidate="required" type="text"
+                                   readonly="readonly" value="请选择部门" jyValidate="required" type="text"
 
-                                   style="border: 0; margin-top: 1%;width: 100%; color: #757575;"/>
+                                   style="border: 0; margin-top: 1%;width: 100%; "/>
-                            <input type="hidden" id="departmentIdldlz" name="departmentIdldlz">
+                            <input type="hidden" id="departmentIdldlz" name="departmentIdldlz" value="">
-                            <div id='orgContentldlz' class="menuContent ztreeMC">
+                            <div id='orgContentldlz' class="menuContent ztreeMC"
+                                 style="display: none;position: absolute;width: 99%;">
                                 <ul id="departmentTreeldlz" class="ztree accountOrgTree"></ul>
                             </div>
                         </div>
@@ -220,7 +221,7 @@
                 <label class="layui-form-label"><i class="tip-required"
                                                    style="color: red;font-size: 20px">*</i>角色：</label>
                 <div class="layui-input-block">
-                    <select id="roleIdLdlz" class="layui-select" name="roleIdLdlz" lay-verify="required"></select>
+                    <select id="roleIdldlz" class="layui-select" name="roleIdldlz" lay-verify="required"></select>
                 </div>
             </div>
         </div>
@@ -236,9 +237,10 @@
                             <input class="FormElement ui-widget-content ui-corner-all" id="department"
                                    readonly="readonly" value="点击进行部门选择" jyValidate="required" type="text"
 
-                                   style="border: 0; margin-top: 1%;width: 100%; color: #757575;"/>
+                                   style="border: 0; margin-top: 1%;width: 100%; "/>
                             <input type="hidden" id="departmentId" name="departmentId">
-                            <div id='orgContentCzl' class="menuContent ztreeMC" style="display: none;position: absolute;width: 99%;">
+                            <div id='orgContentCzl' class="menuContent ztreeMC"
+                                 style="display: none;position: absolute;width: 99%;">
                                 <ul id="departmentTree" class="ztree accountOrgTree"></ul>
                             </div>
                         </div>
@@ -305,6 +307,8 @@
                 }
             },
         });
+        initRolesCzl();
+        initRolesLdlz();
 
         // initTree();
 
@@ -354,213 +358,150 @@
         });
 
         form.on('submit(formDemo)', function (data) {
-            clearErrors(); // 先清除所有错误样式
+            clearErrors(); // 清除所有错误
-            var dataType = data.field.permissionType;
-            if (dataType) {
-                if ($('#smz_1').is(':checked') || $('#smz_2').is(':checked')) {
-                    var hasError = false;
-                    if (!$('#userName').val()) {
-                        showError($('#userName'), '请输入用户名！');
-                        hasError = true;
-                    } else if (!/^1\d{10}$/.test($('#phone').val())) {
-                        showError($('#phone'), '手机号格式不正确！');
-                        hasError = true;
-                    } else if (!$('#orgId').val()) {
-                        showError($('#orgName'), '请选择分公司！');
-                        hasError = true;
-                    } else if (!$('#roles').val()) {
-                        showError($('#roles'), '请选择角色！');
-                        hasError = true;
-                    } else if (!$('#proId').val() && $('#idNumber').val()) {
-                        showError($('#proId'), '请选择工程名称！');
-                        hasError = true;
-                    } else if (!$('#subId').val() && $('#idNumber').val()) {
-                        showError($('#subId'), '请选择分包商！');
-                        hasError = true;
-                    } else if (!$('#teamId').val() && $('#idNumber').val()) {
-                        showError($('#teamId'), '请选择班组！');
-                        hasError = true;
-                    }
-                    if (hasError) {
-                        return false; // 阻止提交
-                    }
-                }
 
-                if ($('#czl_1').is(':checked') || $('#czl_2').is(':checked')) {
+            var fieldData = data.field || {};
-                    var hasError = false;
+            var addType = [];
-                    if (!$('#departmentId').val()) {
+            if ($('#smz_1').is(':checked') || $('#smz_2').is(':checked')) addType.push("1");
-                        showError($('#department'), '请选择部门！');
+            if ($('#czl_1').is(':checked') || $('#czl_2').is(':checked')) addType.push("2");
-                        hasError = true;
+            if ($('#ldlz').is(':checked')) addType.push("3");
-                    }else if (!$('#roleIdCzl').val()) {
-                        showError($('#roleIdCzl'), '请选择角色！');
-                        hasError = true;
-                    }
-                    if (hasError) {
-                        return false; // 阻止提交
-                    }
-                }
-                if ($('#ldlz').is(':checked')){
-                    var hasError = false;
-                    if (!$('#departmentIdldlz').val()) {
-                        showError($('#departmentldlz'), '请选择部门！');
-                        hasError = true;
-                    }else if (!$('#roleIdLdlz').val()) {
-                        showError($('#roleIdLdlz'), '请选择角色！');
-                        hasError = true;
-                    }
-                    if (hasError) {
-                        return false; // 阻止提交
-                    }
-                }
 
-               if ($('#czl_1').is(':checked') || $('#czl_2').is(':checked')) {
+            if (addType.length === 0) {
-                   addCzl(data); // 触发你的提交函数
-               }
-               if ($('#ldlz').is(':checked')) {
-                   addLdlz(data); // 触发你的提交函数
-                   if ($('#smz_1').is(':checked') || $('#smz_2').is(':checked')) {
-                       add(data); // 触发你的提交函数
-                   }
-               }
-            } else {
                 layer.msg('请选择系统类型！', {icon: 5});
+                return false;
             }
-            return false; // 阻止默认跳转
+
+            // 先校验必填项
+            var hasError = false;
+            if (!$('#userName').val()) { showError($('#userName'), '请输入用户名！'); hasError = true; }
+            if (!/^1\d{10}$/.test($('#phone').val())) { showError($('#phone'), '手机号格式不正确！'); hasError = true; }
+            if ($('#smz_1').is(':checked') || $('#smz_2').is(':checked')) {
+                if (!$('#orgId').val()) { showError($('#orgName'), '请选择分公司！'); hasError = true; }
+                if (!$('#roles').val()) { showError($('#roles'), '请选择角色！'); hasError = true; }
+            }
+            if ($('#czl_1').is(':checked') || $('#czl_2').is(':checked')) {
+                if (!$('#departmentId').val()) { showError($('#department'), '请选择部门！'); hasError = true; }
+                if (!$('#roleIdCzl').val()) { showError($('#roleIdCzl'), '请选择角色！'); hasError = true; }
+            }
+            if ($('#ldlz').is(':checked')) {
+                if (!$('#departmentIdldlz').val()) { showError($('#departmentldlz'), '请选择部门！'); hasError = true; }
+                if (!$('#roleIdldlz').val()) { showError($('#roleIdldlz'), '请选择角色！'); hasError = true; }
+            }
+            if (hasError) return false;
+
+            var loadIndex = layer.msg('加载中', {icon: 16, shade: 0.01});
+
+            var selectedTypes = [];
+            $('input[name="permissionType"]:checked').each(function() {
+                selectedTypes.push($(this).val());
+            });
+            var dataTypeStr = selectedTypes.join(',');
+
+            // 构建 JSON 数据
+            var smzJson = {
+                userName: fieldData.userName || null,
+                loginName: fieldData.loginName || null,
+                userPhone: fieldData.phone || null,
+                orgId: fieldData.orgId || null,
+                proId: fieldData.proId || null,
+                subId: fieldData.subId || null,
+                roleId: fieldData.roleId || null,
+                type: roleType || null,
+                dataType: dataTypeStr || null,
+                sex: fieldData.sex || null,
+                teamId: fieldData.teamId || null,
+                idCard: fieldData.idNumber || null,
+                isAdmin: fieldData.isAdmin || null
+            };
+
+            var czlJson = {
+                userName: fieldData.userName || null,
+                loginName: fieldData.loginName || null,
+                userPhone: fieldData.phone || null,
+                orgId: fieldData.departmentId || null,
+                roleId: fieldData.roleIdCzl || null
+            };
+
+            var ldlzJson = {
+                userName: fieldData.userName || null,
+                loginName: fieldData.loginName || null,
+                userPhone: fieldData.phone || null,
+                orgId: fieldData.departmentIdldlz || null,
+                roleId: fieldData.roleIdldlz || null
+            };
+
+            var jsonData = { smz: smzJson, czl: czlJson, ldlz: ldlzJson };
+
+
+            smzJson.jsonData = JSON.stringify(jsonData);
+            console.log(smzJson)
+            // Promise 封装
+            function addSmz() {
+                return $.ajax({
+                    type: 'post',
+                    url: request_url + '/realname/publicLogin/addUserData',
+                    contentType: "application/json; charset=utf-8",
+                    data: JSON.stringify(smzJson)
+                });
+            }
+
+            function addCzl() {
+                return $.ajax({
+                    type: 'post',
+                    url: czl_ht_url + '/publicLogin/addUser',
+                    contentType: "application/json; charset=utf-8",
+                    data: JSON.stringify(czlJson)
+                });
+            }
+
+            function addLdlz() {
+                return $.ajax({
+                    type: 'post',
+                    url: request_url + '/ldlz/publicLogin/addUser',
+                    contentType: "application/json; charset=utf-8",
+                    data: JSON.stringify(ldlzJson)
+                });
+            }
+
+            // 先执行必走 addSmz
+            addSmz().done(function (data) {
+                if (data.code !== 200) {
+                    layer.close(loadIndex);
+                    layer.msg(data.msg, {icon: 5});
+                    return;
+                }
+
+                // 构建后续请求数组
+                var requests = [];
+                if ($('#czl_1').is(':checked') || $('#czl_2').is(':checked')) requests.push(addCzl());
+                if ($('#ldlz').is(':checked')) requests.push(addLdlz());
+
+                if (requests.length > 0) {
+                    $.when.apply($, requests).done(function () {
+                        layer.close(loadIndex);
+                        layer.msg('新增成功', {icon: 1});
+                        setTimeout("reloading()", 2100);
+                    }).fail(function () {
+                        layer.close(loadIndex);
+                        layer.msg('新增失败，请检查！', {icon: 5});
+                    });
+                } else {
+                    layer.close(loadIndex);
+                    layer.msg('新增成功', {icon: 1});
+                    setTimeout("reloading()", 2100);
+                }
+
+            }).fail(function () {
+                layer.close(loadIndex);
+                layer.msg('新增失败，请检查！', {icon: 5});
+            });
+
+            return false;
         });
+
+
     });
 
-    function add(data) {
-        var fieldData = data.field || {};
-
-        //构建实名制json数据
-        var smzJson = {
-            userName: fieldData.userName || null,
-            loginName: fieldData.loginName || null,
-            userPhone: fieldData.phone || null,
-            orgId: fieldData.orgId || null,
-            proId: fieldData.proId || null,
-            subId: fieldData.subId || null,
-            roleId: fieldData.roleId || null,
-            type: roleType || null, // 注意：后端可能期望 "type" 而不是 "permissionType"
-            dataType: fieldData.permissionType || null, // 注意：后端可能期望 "type" 而不是 "permissionType"
-            sex: fieldData.sex || null,
-            teamId: fieldData.teamId || null,
-            idCard: fieldData.idNumber || null,
-            isAdmin: fieldData.isAdmin || null
-        };
-        // 构建承载力json数据
-        var ldlzJson = {
-            userName: fieldData.userName || null,
-            loginName: fieldData.loginName || null,
-            userPhone: fieldData.phone || null,
-            orgId: fieldData.departmentIdldlz || null,
-            roleId: fieldData.roleIdLdlz || null
-        };
-        // 承载力
-        var czlJson = {
-            userName: fieldData.userName || null,
-            loginName: fieldData.loginName || null,
-            userPhone: fieldData.phone || null,
-            orgId: fieldData.departmentId || null,
-            roleId: fieldData.roleIdCzl || null
-        };
-
-        var jsonData = {
-            smz: smzJson,
-            ldlz: ldlzJson,
-            czl: czlJson
-        }
-
-        // 构建请求参数
-        var requestData = {
-            userName: fieldData.userName || null,
-            loginName: fieldData.loginName || null,
-            userPhone: fieldData.phone || null,
-            orgId: fieldData.orgId || null,
-            proId: fieldData.proId || null,
-            subId: fieldData.subId || null,
-            roleId: fieldData.roleId || null,
-            type: roleType || null, // 注意：后端可能期望 "type" 而不是 "permissionType"
-            dataType: fieldData.permissionType || null, // 注意：后端可能期望 "type" 而不是 "permissionType"
-            sex: fieldData.sex || null,
-            teamId: fieldData.teamId || null,
-            idCard: fieldData.idNumber || null,
-            isAdmin: fieldData.isAdmin || null,
-            jsonData: JSON.stringify(jsonData)
-        };
-        $.ajax({
-            type: 'post',
-            url: request_url + '/realname/publicLogin/addUserData',
-            contentType: "application/json; charset=utf-8",
-            data: JSON.stringify(requestData),
-            success: function (data) {
-                if (data.code != 200) {
-                    layer.msg(data.msg);
-                    return;
-                } else {
-                    layer.msg(data.msg);
-                    parent.layer.close();
-                }
-            }
-        });
-    }
-
-    // 承载力添加用户
-    function addCzl(data) {
-        var fieldData = data.field || {};
-        // 构建请求参数
-        var requestData = {
-            userName: fieldData.userName || null,
-            loginName: fieldData.loginName || null,
-            userPhone: fieldData.phone || null,
-            orgId: fieldData.departmentId || null,
-            roleId: fieldData.roleIdCzl || null
-        };
-        $.ajax({
-            type: 'post',
-            url: czl_ht_url + '/publicLogin/addUser',
-            contentType: "application/json; charset=utf-8",
-            data: JSON.stringify(requestData),
-            success: function (data) {
-                if (data.code != 200) {
-                    layer.msg(data.msg);
-                    return;
-                } else {
-                    layer.msg(data.msg);
-                    parent.layer.close();
-                }
-            }
-        });
-    }
-
-    // 领导履职添加用户
-    function addLdlz(data) {
-        var fieldData = data.field || {};
-        // 构建请求参数
-        var requestData = {
-            userName: fieldData.userName || null,
-            loginName: fieldData.loginName || null,
-            userPhone: fieldData.phone || null,
-            orgId: fieldData.departmentIdldlz || null,
-            roleId: fieldData.roleIdLdlz || null
-        };
-        $.ajax({
-            type: 'post',
-            url: request_url + '/realname/publicLogin/addUserData',
-            contentType: "application/json; charset=utf-8",
-            data: JSON.stringify(requestData),
-            success: function (data) {
-                if (data.code != 200) {
-                    layer.msg(data.msg);
-                    return;
-                } else {
-                    layer.msg(data.msg);
-                    parent.layer.close();
-                }
-            }
-        });
-    }
-
 
     // 获取工程列表
     function getProInfo(companyId, proId) {
@@ -900,6 +841,12 @@
             }
         }, 150);
     }
+
+    function reloading() {
+        var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
+        parent.layer.close(index); //再执行关闭
+        window.parent.location.reload();
+    }
 </script>
 
 </body>

public/login/js/companyTreeCzl.js

@@ -10,3 +10,27 @@ bindTreeSelector({
         typeId = node.type;
     }
 });
+
+function initRolesCzl(orgId){
+    var select = $('#roleIdCzl');
+    select.empty();
+    select.append('<option value="">请选择角色</option>');
+    $.ajax({
+        type: 'post',
+        url: request_url + '/czl/publicLogin/getRoleList',
+        data: {},
+        async: false,
+        success: function (data) {
+            var data = data.obj;
+            if (data.length > 0) {
+                data.forEach(function (d) {
+                    select.append('<option value="' + d.key + '">' + d.value + '</option>');
+                });
+                layui.form.render('select');
+            } else {
+                select.append('<option value="">暂无数据</option>');
+                layui.form.render('select');
+            }
+        }
+    });
+}

public/login/js/companyTreeLdlz.js

@@ -1,7 +1,7 @@
 bindTreeSelector({
     inputTextId: "departmentldlz",
     inputValueId: "departmentIdldlz",
-    panelId: "orgContentLdlz",
+    panelId: "orgContentldlz",
     treeId: "departmentTreeldlz",
     ajaxUrl: request_url + "/ldlz/publicLogin/getDeptTree",
     extraSet: function (node) {
@@ -10,3 +10,29 @@ bindTreeSelector({
         typeIdLdlz = node.type;
     }
 });
+
+
+// 初始化角色列表
+function initRolesLdlz(orgId) {
+    var select = $('#roleIdldlz');
+    select.empty();
+    select.append('<option value="">请选择角色</option>');
+    $.ajax({
+        type: 'post',
+        url: request_url + '/ldlz/publicLogin/getRoleList',
+        data: {},
+        async: false,
+        success: function (data) {
+            var data = data.data;
+            if (data.length > 0) {
+                data.forEach(function (d) {
+                    select.append('<option value="' + d.roleId + '">' + d.roleName + '</option>');
+                });
+                layui.form.render('select');
+            } else {
+                select.append('<option value="">暂无数据</option>');
+                layui.form.render('select');
+            }
+        }
+    });
+}

public/login/js/treeBind.js

@@ -21,6 +21,7 @@ function bindTreeSelector(options) {
                 Authorization: "Bearer " + localStorage.getItem("public_token"),
             },
             success: function (res) {
+                console.log("树加载成功：" ,treeId);
                 $.fn.zTree.init($("#" + treeId), {
                     view: { dblClickExpand: false, selectedMulti: false, nameIsHTML: true },
                     data: { simpleData: { enable: true } },

public/login/js/user.js

@@ -1,7 +1,7 @@
 var example = null;
-var layer ,form;
+var layer, form;
 $(function () {
-    layui.use([ 'form','layer' ], function() {
+    layui.use(['form', 'layer'], function () {
         layer = layui.layer;
         form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功
         // 修复1：重新配置 layer，避免对话框出现在可视区域外
@@ -13,31 +13,31 @@ $(function () {
         });
     });
     init();
-    $("#searchBt").click(function(){
+    $("#searchBt").click(function () {
         example.ajax.reload();
     });
 })
 
-function init(){
+function init() {
     example =
         $('#dt-table').DataTable({
             "searching": false,
             "processing": true, //加载数据时显示进度状态
-            "serverSide" : true,
+            "serverSide": true,
             "pagingType": "full_numbers", //首页|尾页
             "language": {
-                "url": contentPath + "/public/login/js/plugin/datatables/Chinese.lang"
+                "url": "../login/js/plugin/datatables/Chinese.lang"
             },
             "ajax": {
-                "url" : request_url + "/realname/publicLogin/getUserList",
+                "url": request_url + "/realname/publicLogin/getUserList",
-                "type":"POST",
+                "type": "POST",
                 "headers": {
                     "Authorization": "Bearer " + localStorage.getItem("public_token"),
                 },
-                "data":function(d){
+                "data": function (d) {
                     d.keyWord = $("#keyWord").val();
                 },
-                "error":function(xhr, textStatus, errorThrown){
+                "error": function (xhr, textStatus, errorThrown) {
                     var msg = xhr.responseText;
                     console.log(msg);
                     var response = JSON.parse(msg);
@@ -47,7 +47,7 @@ function init(){
                         layer.msg(message);
                     } else if (code == 401) {
                         localStorage.removeItem("public_token");
-                        layer.msg("token过期，请先登录", {shift: -1, time: 1000}, function(){
+                        layer.msg("token过期，请先登录", {shift: -1, time: 1000}, function () {
                             top.location.href = window.location.origin + contentPath + '/login.html';
                         });
                     } else if (code == 403) {
@@ -58,8 +58,8 @@ function init(){
                     }
                 }
             },
-            "lengthMenu": [ [10, 20, 50], [10, 20, 50] ], // 设置每页显示数据量选项
+            "lengthMenu": [[10, 20, 50], [10, 20, 50]], // 设置每页显示数据量选项
-            "drawCallback": function() {
+            "drawCallback": function () {
                 // alert( '表格重绘了' );
                 var thisDataTable = $('#dt-table').DataTable();
                 $(".pagination").append("<li>" +
@@ -72,53 +72,59 @@ function init(){
                     } else {
                         var redirectpage = 0;
                     }
-                    thisDataTable.page(redirectpage).draw( 'page' );
+                    thisDataTable.page(redirectpage).draw('page');
                 });
                 //敲击回车键跳转指定页数
                 $("#changePage").keypress(function (e) {
-                    if(event.keyCode==13){
+                    if (event.keyCode == 13) {
                         if ($("#changePage").val() && $("#changePage").val() > 0) {
                             var redirectpage = $("#changePage").val() - 1;
                         } else {
                             var redirectpage = 0;
                         }
-                        thisDataTable.page(redirectpage).draw( 'page' );
+                        thisDataTable.page(redirectpage).draw('page');
                     }
                 });
             },
             "dom": "<'dt-toolbar'r>t<'dt-toolbar-footer'<'col-sm-4 col-xs-4 hidden-xs'i><'col-xs-8 col-sm-8' p v>><'dt-table-length'l>",
             "columns": [
                 {
-                    width : '40px',
+                    width: '40px',
                     "orderable": false,
-                    data : function(row, type, set, meta) {
+                    data: function (row, type, set, meta) {
                         var c = meta.settings._iDisplayStart + meta.row + 1;
                         return c;
                     }
                 },
-                { "data": "userName", "defaultContent": ""},
+                {"data": "userName", "defaultContent": ""},
-                { "data": "loginName", "defaultContent": ""},
+                {"data": "loginName", "defaultContent": ""},
-                { "data": "", "defaultContent": "", "render":function(data, type, row){
+                {
+                    "data": "", "defaultContent": "", "render": function (data, type, row) {
                         var dataType = row['dataType'];
-                        var html = '';
+                        // 如果 data 是空或 undefined，返回空
-                        if(dataType == 1){
+                        if (!dataType) return '';
-                            html += '<span class="label label-success">承载力后台</span>';
+
-                        }else if(dataType == 2){
+                        // 定义映射关系
-                            html += '<span class="label label-success">承载力大屏</span>';
+                        const labelMap = {
-                        }else if(dataType == 3){
+                            '1': '承载力后台',
-                            html += '<span class="label label-success">领导履职</span>';
+                            '2': '承载力大屏',
-                        }else if(dataType == 4){
+                            '3': '领导履职',
-                            html += '<span class="label label-success">自有人员</span>';
+                            '4': '自有人员',
-                        }else if(dataType == 5){
+                            '5': '自有人员大屏'
-                            html += '<span class="label label-success">自有人员大屏</span>';
+                        };
-                        }
+
-                        return html;
+                        // 分割字符串为数组，去空格并过滤无效值
+                        const types = String(dataType).split(',').map(item => item.trim()).filter(item => item in labelMap);
+                        // 转换为对应的中文标签
+                        const labels = types.map(type => `<span>${labelMap[type]}</span>`);
+                        // 用空格、逗号或其他方式拼接（这里用空格）
+                        return labels.join(', ');
                     }
-                    },
+                },
-                { "data": "userPhone", "defaultContent": ""},
+                {"data": "userPhone", "defaultContent": ""},
-                { "data": "idCard", "defaultContent": ""},
+                {"data": "idCard", "defaultContent": ""},
-                { "data": "createTime", "defaultContent": ""},
+                {"data": "createTime", "defaultContent": ""},
-                { "data": "updateTime", "defaultContent": ""},
+                {"data": "updateTime", "defaultContent": ""},
                 {
                     "data": "",
                     "defaultContent": "",
@@ -127,14 +133,14 @@ function init(){
                         var id = row['id'];
                         var html = '';
                         html += buttonEdits(id,);
-                        html+= buttonDel(id);
+                        html += buttonDel(id);
                         return html;
                     }
                 },
 
             ],
-            "order": [[1, "desc"],[2, "desc"],[3, "desc"],[4, "desc"],[5, "desc"],[6, "desc"]]  //在栏目列上显示排序功能
+            "order": [[1, "desc"], [2, "desc"], [3, "desc"], [4, "desc"], [5, "desc"], [6, "desc"]]  //在栏目列上显示排序功能
-        } );
+        });
 }
 
 /**
@@ -149,21 +155,21 @@ function insertTeamManager() {
         content: 'userForm.html',
         area: [width, height],
         maxmin: false,
-        btn:['确定','关闭'],
+        btn: ['确定', '关闭'],
         offset: '80px', // 固定偏移量，避免太靠下
         fixed: true, // 固定定位
         scrollbar: false, // 不锁定滚动条
         success: function (layero, index) {
             var myIframe = window[layero.find('iframe')[0]['name']];
         },
-        yes:function(index,layero){
+        yes: function (index, layero) {
             // 获取弹出层中的form表单元素
-            var formSubmit=layer.getChildFrame('form', index);
+            var formSubmit = layer.getChildFrame('form', index);
             var submited = formSubmit.find('button')[0];
             // 触发点击事件，会对表单进行验证，验证成功则提交表单，失败则返回错误信息
             submited.click();
         },
-        btn2:function(index,layero){
+        btn2: function (index, layero) {
         }
     });
 }
@@ -172,8 +178,8 @@ function insertTeamManager() {
  * 删除班组
  * */
 function del(id) {
-    var data = {"id":id};
+    var data = {"id": id};
-    layer.confirm("确定删除吗？",{
+    layer.confirm("确定删除吗？", {
         title: '删除确认',
         btn: ['确定', '取消'],
         // 关键：固定位置在屏幕中央
@@ -185,7 +191,7 @@ function del(id) {
         // 或者自动计算
         // offset: 'auto',
         // 或者限制在可视区域内
-        success: function(layero) {
+        success: function (layero) {
             // 对话框创建后的回调，确保在可视区域内
             var $layer = $(layero);
             var top = $layer.css('top');
@@ -193,7 +199,7 @@ function del(id) {
 
             // 如果 top 值太大，调整到合理位置
             if (topNum > 500) {
-                $layer.css('top', '200px');
+                $layer.css('top', '100px');
             }
 
             // 确保对话框可见
@@ -202,16 +208,16 @@ function del(id) {
                 'visibility': 'visible'
             });
         }
-    },function(index) {
+    }, function (index) {
         layer.close(index);
         $.ajax({
             type: 'post',
             contentType: "application/json; charset=utf-8",
-            url: ctxPath + '/TeamManager/deleteSubTeam',
+            url: request_url + '/realname/publicLogin/delUserData',
             data: JSON.stringify(data),
             dataType: 'json',
             success: function (data) {
-                if (data.resMsg == "删除成功") {
+                if (data.code == 200) {
                     layer.alert('删除成功', {icon: 1});
                     example.ajax.reload(null, false); // 刷新页面
                 } else {
@@ -222,9 +228,10 @@ function del(id) {
         })
     })
 }
+
 // 删除按钮
-function buttonDel(id){
+function buttonDel(id) {
-    var btn = $("<button class='layui-btn layui-btn-xs' title='删除' onclick='del(\"" + id +"\")' style='background-color: transparent;color: #ff4d4f;'>删除</button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='删除' onclick='del(\"" + id + "\")' style='background-color: transparent;color: #ff4d4f;'>删除</button>");
     return btn.prop("outerHTML");
 }
 

public/public.js

@@ -1,7 +1,7 @@
-let web_url="http://20.56.230.91:10080"
+let web_url="http://localhost:18080"
 
 let contentPath="/bonus_cloud_web";
-let request_url="http://20.56.230.91:10080/bnscloud"
+let request_url="http://localhost:18080/bnscloud"
 //承载力大屏
 let czl_url= request_url+"/czldp";
 //承载力后台