Merge branch 'main' of http://192.168.0.56:3000/haozq/jjsp_web

bns/html/notice/notice.html

@@ -18,7 +18,7 @@
    
     <script src="../../js/layui-v2.6.8/layui.js"></script>
     <script src="../../js/public/public.js"></script>
-    <script src="../../js/system/htmlpermission.js"></script>
+    <!-- <script src="../../js/system/htmlpermission.js"></script> -->
     <script src="../../js/public/sm3.js"></script>
     <script src="../../js/public/permission.js" type="text/javascript"></script>
     <script src="../../js/public/sm3.js" type="text/javascript"></script>

bns/js/home/home.js

@@ -367,7 +367,7 @@ function getWzXx(orgId) {
 
 function getMarqueeData() {
     $.ajax({
-        url: dataUrl + 'proteam/pot/badWeather/getBadWeatherData'  ,
+        url: dataUrl + 'proteam/pot/home/getBadWeatherData'  ,
         headers: {
             "encrypt": sm3(JSON.stringify({ orgId: '1' })),
             'Authorization': localStorage.getItem("tokens")

bns/js/supplement/team_manage.js

@@ -103,8 +103,10 @@ layui.use(['form', 'layer', 'table', 'laydate'], function () {
     laydate = layui.laydate;
 
     function initData() {
+        let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0,});
         let url = dataUrl + "proteam/pot/teamManage/getList";
         ajaxRequest(url, "POST", null, true, () => {}, (result) => {
+            layer.close(loadingMsg);
             if (result.code === 200) {
                 const tables = ['lowerData', 'noData', 'blackData', 'minData', 'newData', 'maxData'];
                 tables.forEach((tableId) => {

bns/js/teamInformation/child/teamEvaluate.js

@@ -151,7 +151,7 @@ function initTable(dataList, limit, page) {
                     minWidth: 200,
                     align: "center",
                     templet: function (d) {
-                        return "<span>" + d.fzrName + "</span><br><span>" + d.phone + "</span>";
+                        return "<span>" + d.fzrName + "</span><br><span>" + phoneHide(d.phone) + "</span>";
                     },
                 },
                 {

bns/js/teamInformation/child/teamPersonnel.js

@@ -150,7 +150,10 @@ function initTable(dataList, limit, page) {
                     unresize: true,
                     sort: true,
                     minWidth: 200,
-                    align: "center"
+                    align: "center",
+                    templet: function (d) {
+                        return desensitizeIDCard(d.card)
+                    }
                 },
 
                 {