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

chore:1、迁移工作日志，禅道#2326；2、迁移工作日志查看，禅道#2327

chore:1、迁移工作日志，禅道#2326；2、迁移工作日志查看，禅道#2327

See merge request !1106

@@ -14,7 +14,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
 
     //对外暴露的接口
     exports('workReportAdd', function (data) {
-        var accessToken = session.getToken()['access_token']
+        // var accessToken = session.getToken()['access_token']
+        var accessToken = common.getMjToken();
         var userSelect = {}
         var currentDate = {}
         var uploadInst = {}
@@ -27,7 +28,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
         var historywarningTable = {}
 
         var viewType = data && data.viewType ? data.viewType : '';
-
         init()
         $('#workReport_type').val(data.repType)
 
@@ -90,7 +90,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
             delete data['select']
             params.workReport = JSON.stringify(data)
             admin.req({
-                url: domainName + '/api-web/workreport/save?access_token=' + accessToken,
+                url: domainName + '/api-web/workreport/save?accessToken=' + accessToken,
                 data: JSON.stringify(params),
                 type: 'post',
                 contentType: "application/json; charset=utf-8",
@@ -108,7 +108,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                                     repTitle: '',
                                     isRead: '',
                                     repType: '',
-                                    createTime: ''
+                                    createTime: 'today'
                                 },
                             });
                             $("#workReport-form-save-id").removeAttr("disabled");
@@ -186,7 +186,25 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
 
         url = domainName + '/api-web/home/alarm/getAlarm'
 
-        getAlarmInfo(where, cols, url)
+        getAlarmInfo(where,cols, url)
+
+
+        /**
+         * 非新增日报时，切换到日报时回填告警信息
+         * @author joke
+         * */
+        function getAlarmCount(url) {
+            admin.req({
+                url: url+'?page=1&limit=10&dateTime='+$('#add-workReport-form').find("input[name='createTime']").val(),
+                success: function (res) {
+                    if (res && res.map){
+                        var str = `共有${res.map.totalCount}条告警，手动处理${res.map.manualCount}条，自动处理${res.map.autoCount}条，` +
+                            `未处理${res.map.alarmCount}条`;
+                        $('#add-workReport-form').find("input[name='alarmStatic']").val(str);
+                    }
+                }
+            })
+        }
 
         //表单赋值
         function fromAssignment() {
@@ -283,6 +301,26 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                 , cols: [cols]
                 , done: function (res, curr, count) {
 
+                    //指标名称点击事件
+                    $('[data-warn-zbmc]').unbind("click").on('click', function () {
+                        var name = $(this).data("name");
+                        var params = {
+                            resId: $(this).data("resid"),
+                            kpiId: $(this).data("kpi"),
+                            flag: $(this).data("flag"),
+                            name: name,
+                            warning: $(this).data("warning"),
+                            ident: $(this).data("ident"),
+                            trend: $(this).data("trend")
+                        };
+                        let win = window.parent;
+                        if (win) {
+                            window.parent.postMessage({
+                                type: 'resKpiTrendChart',
+                                message: {'title':name,'params':params}
+                            }, '*')
+                        }
+                    });
                 }
             })
         }
@@ -315,7 +353,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
             var fileName = []
             uploadInst = upload.render({
                 elem: '#attachment', //绑定元素
-                url: common.domainName + '/api-web/workreport/upload',
+                url: common.domainName + '/api-web/workreport/upload?accessToken='+accessToken,
                 data: param,
                 multiple: true,
                 auto: false, //选择文件后不自动上传
@@ -350,7 +388,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
         //初始化用户下拉列表框
         function initUserSelect() {
             $.ajax({
-                url: domainName + '/api-user/users/getAll?access_token=' + accessToken,
+                url: domainName + '/mj/user/page?username=&nickname=&enabled=&perPage=10000&page=1&accessToken=' + common.getMjToken(),
+                // url: domainName + '/api-user/users/getAll?access_token=' + accessToken,
                 success: function (res) {
                     userSelect = xmSelect.render({
                         el: '.reportUser',
@@ -365,7 +404,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                         filterable: true,
                         layVerify: 'required',
                         layVerType: 'msg',
-                        data: res,
+                        data: res.data.rows,
                     })
                     initGroupUserDefault()
                     //赋值
@@ -376,8 +415,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
 
         //初始化组负责人对应的组员
         function initGroupUserDefault() {
-            $.ajax({
-                url: domainName + '/api-web/workreport/getUserByAdmin?theirType=1&access_token=' + accessToken,
+            admin.req({
+                url: domainName + '/api-web/workreport/getUserByAdmin?theirType=1',
                 success: function (res) {
                     if (!res.str) {
                         return;
@@ -395,29 +434,32 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
         function initFromType(repType) {
             switch (repType) {
                 case 'day':
-                    $('.work_finish').text('今日完成工作')
-                    $('.work_conclusion').text('未完成工作')
-                    $('.work_help').text('需要协调工作')
+                    $('.work_finish').html('<label>今日完成工作<span style="color: red">*</span></label>')
+                    $('.work_conclusion').html('<label>未完成工作<span style="color: red">*</span></label>')
+                    $('.work_help').html('<label>需要协调工作<span style="color: red">*</span></label>')
                     $('.plan').hide()
                     $('.reportAlarm').show()
                     $('.report_alarmStatic').show()
                     getAlarmInfo(where, cols, url)
+                    if (data.repType != 'day'){
+                        getAlarmCount(url)
+                    }
                     break
                 case 'week':
-                    $('.work_finish').text('本周完成工作')
-                    $('.work_conclusion').text('本周工作总结')
+                    $('.work_finish').html('<label>本周完成工作<span style="color: red">*</span></label>')
+                    $('.work_conclusion').html('<label>本周工作总结<span style="color: red">*</span></label>')
                     $('.plan').show()
-                    $('.work_plan').text('下周工作计划')
-                    $('.work_help').text('需要协调与帮助')
+                    $('.work_plan').html('<label>下周工作计划<span style="color: red">*</span></label>')
+                    $('.work_help').html('<label>需要协调与帮助<span style="color: red">*</span></label>')
                     $('.reportAlarm').hide()
                     $('.report_alarmStatic').hide()
                     break
                 case 'month':
-                    $('.work_finish').text('本月完成工作')
-                    $('.work_conclusion').text('本月工作总结')
+                    $('.work_finish').html('<label>本月完成工作<span style="color: red">*</span></label>')
+                    $('.work_conclusion').html('<label>本月工作总结<span style="color: red">*</span></label>')
                     $('.plan').show()
-                    $('.work_plan').text('下月工作计划')
-                    $('.work_help').text('需要协调与帮助')
+                    $('.work_plan').html('<label>下月工作计划<span style="color: red">*</span></label>')
+                    $('.work_help').html('<label>需要协调与帮助<span style="color: red">*</span></label>')
                     $('.reportAlarm').hide()
                     $('.report_alarmStatic').hide()
                     break

@@ -10,7 +10,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
 
     exports('workReportView', function () {
         var sessions = layui.sessions;
-        var accessToken = sessions.getToken().access_token;
+        var accessToken = common.getMjToken();
         var domainName = common.domainName;
         var companyChart = echarts.init(document.getElementById('chart-company-report'));
         var noReadChart = echarts.init(document.getElementById('chart-noRead-report'));
@@ -184,7 +184,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                 elem: '#table-workreport-view',
                 url: domainName + '/api-web/workreport/page',
                 where: conditions,
-                height: 'full-180',
+                height: 'full-400',
                 page: {
                     layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
                     theme: '#1E9FFF'
@@ -327,10 +327,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
 
             });
             $.ajax({
-                url: domainName + '/api-user/users/getAll',
-                data: {
-                    access_token: accessToken
-                },
+                url: domainName + '/mj/user/page?username=&nickname=&enabled=&perPage=10000&page=1&accessToken=' + common.getMjToken(),
                 success: function (response) {
                     var options = "<option value=''>=选择汇报人=</option>";
                     $.each(response, function (i, v) {
@@ -928,7 +925,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
         //未读统计报表导出
         $('#notReportExportBtn').unbind().on('click', function () {
             var conditions = form.val('form-workreport-condition');
-            var url = common.domainName + '/api-web/workreport/group/exportReportDetails?access_token=' + accessToken + '&createTime=' + createTime + '&viewMode=' + 'true' + '&dateLimit=' + dateLimit + '&repType=' + conditions.repType + '&createBy=' + conditions.createBy;
+            var url = common.domainName + '/api-web/workreport/group/exportReportDetails?accessToken=' + accessToken + '&createTime=' + createTime + '&viewMode=' + 'true' + '&dateLimit=' + dateLimit + '&repType=' + conditions.repType + '&createBy=' + conditions.createBy;
             window.open(url)
         })
 

@@ -19,9 +19,9 @@
                     </div>
                 </div>
                 <div class="layui-inline inline-half">
-                    <label class="layui-form-label">日期</label>
+                    <label class="layui-form-label">日期<span style="color: red">*</span></label>
                     <div class="layui-input-inline">
-                        <input class="layui-input" id="createTime" name="createTime" type="text">
+                        <input class="layui-input" lay-verify="required" id="createTime" name="createTime" type="text">
                     </div>
                 </div>
             </div>
@@ -121,13 +121,13 @@
 
 <style>
     #add-workReport-form .layui-form-label {
-        width: 120px;
+        width: 130px;
         /* padding: 8px 12px; */
         text-align: left !important;
     }
 
     #add-workReport-form .layui-input-block {
-        margin-left: 120px !important;
+        margin-left: 130px !important;
     }
 
     .tags {

-<title>工作汇报</title>
+<title>工作日志</title>
 <style type="text/css">
     .layui-card-header .layui-icon {
         position: relative;