Merge branch 'master-mj-joke' into 'master-mj'

fix:巡检结果通知人无法分页导致一页展示10条数据，无法选择其他用户

fix:巡检结果通知人无法分页导致一页展示10条数据，无法选择其他用户

See merge request !1169

@@ -399,8 +399,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                             if (res.data && res.data.length > 0) {
                             if (res.data && res.data.length > 0) {
                                 var trs = '';
                                 var trs = '';
                                 $.each(res.data, function (i, v) {
                                 $.each(res.data, function (i, v) {
-                                    trs += `<tr><td>${i + 1}</td><td>${v.username}</td><td>${v.nickname}</td><td>${v.email}</td>
-                                    <td>${v.phone}</td><td>${v.operator}</td><td>${v.resTotal}</td><td>${v.bizTotal}</td></tr>`;
+                                    trs += `<tr style="text-align: center"><td>${i + 1}</td><td>${v.username}</td><td>${v.nickname}</td><td>${v.email != 'undefined'?v.email:''}</td>
+                                    <td>${v.phone != 'undefined'?v.phone:''}</td><td>${v.operator != 'undefined'?v.operator:''}</td><td>${v.resTotal}</td><td>${v.bizTotal}</td></tr>`;
                                 });
                                 });
                                 var tb = `<div class="layui-form" style="padding: 0 10px;">
                                 var tb = `<div class="layui-form" style="padding: 0 10px;">
                                   <table class="layui-table">
                                   <table class="layui-table">

@@ -13,7 +13,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
 
 
     exports('dutyIndex', function () {
     exports('dutyIndex', function () {
         //var sessions = layui.sessions;
         //var sessions = layui.sessions;
-        var accessToken = localStorage.getItem("accessToken");
+        // var accessToken = localStorage.getItem("accessToken");
+        var accessToken = common.getMjToken();
         var domainName = common.domainName;
         var domainName = common.domainName;
         var user = localStorage.getItem("lgn");
         var user = localStorage.getItem("lgn");
         var roles = sessionStorage.getItem('roles');
         var roles = sessionStorage.getItem('roles');
@@ -585,7 +586,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
         function obtain() {
         function obtain() {
             //获取用户数据
             //获取用户数据
             $.ajax({
             $.ajax({
-                url: common.domainName + '/mj/user/getAll',
+                url: common.domainName + '/mj/user/getAll?accessToken='+accessToken,
                 async: false,
                 async: false,
                 data: {name: ''},
                 data: {name: ''},
                 success: function (data) {
                 success: function (data) {
@@ -645,7 +646,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
             if (arr && arr.length == 1) {
             if (arr && arr.length == 1) {
                 changeUserId = arr[0].value;
                 changeUserId = arr[0].value;
             }
             }
-            if (changeUserId == '') {d
+            if (changeUserId == '') {
                 return;
                 return;
             }
             }
             //获取时间段数据
             //获取时间段数据

@@ -97,7 +97,7 @@ layui.define(['table', 'layer', 'laytpl', 'common', 'sessions', 'admin'], functi
                 nickname: $('#userlist-condition-nickname').val()
                 nickname: $('#userlist-condition-nickname').val()
             }
             }
             , cols: tableCols
             , cols: tableCols
-            , limit: 300
+            , limit: 20
             , limits: [300, 600, 900]
             , limits: [300, 600, 900]
             , page: {
             , page: {
                 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
                 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],

@@ -419,6 +419,11 @@ export default {
             if (!isJPG) {
             if (!isJPG) {
                 proxy.$global.showMsg('您上传的不是图片文件，请选择图片！', 'error');
                 proxy.$global.showMsg('您上传的不是图片文件，请选择图片！', 'error');
             }
             }
+            const moreSize = Number(file.size / 1024 / 1024) <= 1;
+            if (!moreSize) {
+                proxy.$global.showMsg('上传头像需小于1MB！', 'error');
+                return moreSize;
+            }
             return isJPG
             return isJPG
         }
         }