Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev-xwx

Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w…
…eb into master-500-dev-xwx
xwx
Commit 580cb2d9a7e07ffcdd50b2554991975f6a51c14b 2 parents 38a50a35 13c1e4ad
Showing 18 changed files with 245 additions and 136 deletions
hg-monitor-web-base/src/main/resources/static/src/controller/assetsRepairAdd.js
hg-monitor-web-base/src/main/resources/static/src/controller/assetsrepair.js
hg-monitor-web-base/src/main/resources/static/src/controller/deviceAdd.js
hg-monitor-web-base/src/main/resources/static/src/controller/mxgraphAdd.js
hg-monitor-web-base/src/main/resources/static/src/controller/reportConfigAdd.js
hg-monitor-web-base/src/main/resources/static/src/controller/routeAdjust.js
hg-monitor-web-base/src/main/resources/static/src/controller/routeAdjustAdd.js
hg-monitor-web-base/src/main/resources/static/src/controller/staffAdd.js
hg-monitor-web-base/src/main/resources/static/src/controller/workReportAdd.js
hg-monitor-web-base/src/main/resources/static/src/controller/workReportIndex.js
hg-monitor-web-base/src/main/resources/static/src/controller/workReportView.js
hg-monitor-web-base/src/main/resources/static/src/views/assets/add.html
hg-monitor-web-base/src/main/resources/static/src/views/assets/repair.html
hg-monitor-web-base/src/main/resources/static/src/views/layout-nx.html
hg-monitor-web-base/src/main/resources/static/src/views/machineroom/routeAdjust.html
hg-monitor-web-qh/src/main/resources/static/src/controller/userChange.js
hg-monitor-web-qh/src/main/resources/static/src/views/layout.html
hg-monitor-web-qh/src/main/resources/static/vue3/src/views/analysis/config/index.html
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/assetsRepairAdd.js
View file @580cb2d
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/assetsRepairAdd.js
View file @580cb2d
@@ -178,7 +178,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                 },
                 allDone: function (obj) {
                     //全部上传成功后
-                    //saveForm()
+                    saveForm()
                 },
                 error: function (index, upload) {
                     // 上传失败
@@ -192,13 +192,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
         // 初始化查看模式
         function initViewMode() {
-            $('form[lay-filter="add-workReport-form"]').find('input, textarea').attr('readonly', true);
-            $('form[lay-filter="add-workReport-form"]').find('select').attr('disabled', true);
+            $('form[lay-filter="add-repair-form"]').find('input, textarea').attr('readonly', true);
+            $('form[lay-filter="add-repair-form"]').find('select').attr('disabled', true);
             $.each(xmSelect.get(), function (i, v) {
                 v.update({disabled: true});
             });
             $('#attachmentInput').parent().parent().parent().addClass('hide');
-            $('#table-report-add-attachment').removeClass('hide');
+            $('#table-repair-add-attachment').removeClass('hide');
             $('#form-item-repTitle').removeClass('hide');
             //渲染附件表格
             var attachmentTable = table.render({
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/assetsrepair.js
View file @580cb2d
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/assetsrepair.js
View file @580cb2d
@@ -124,7 +124,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
                     field: 'attachmentList', title: '附件数量', align: 'center',
                     templet: '<div><span data-id="{{d.id}}" class="layui-table-link view-repair-attachment">{{d.attachmentList.length}}</span></div>'
                 },{
-                    field: 'groupName', title: '上报人', align: 'center',
+                    field: 'groupName', title: '汇报人', align: 'center',
                 }, {
                     field: 'manufacturerName', title: '厂商', align: 'center',
                 },{
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/deviceAdd.js
View file @580cb2d
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/deviceAdd.js
View file @580cb2d
@@ -73,7 +73,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
         form.on('submit(device-form-save-id)', function (res) {
             if (devicesBak.length == 0 && fittingsBak.length == 0) {
-                layer.msg("请先添加设备信息")
+                layer.msg('请添加设备信息或配件信息', {
+                    icon: 7, time: 3000
+                });
             } else {
                 saveForm()
             }
@@ -95,7 +97,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
                 contentType: "application/json; charset=utf-8",
                 done: function (res) {
                     if (res.success) {
-                        layer.msg(res.msg, {
+                        layer.msg("操作成功", {
                             offset: '15px',
                             icon: 1,
                             time: 1000,
@@ -144,7 +146,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
                     if (toEdit) {
                         this.innerHTML = this.firstChild.value.replace(/</g, '&lt;').replace(/>/g, '&gt;');
                         if (this.innerHTML == '' || this.innerHTML == undefined) {
-                            layer.msg("请注意填写完整")
+                            layer.msg('请填写完整', {
+                                icon: 7, time: 3000
+                            });
                             tdArr = [];
                             $(this).closest('tr').remove();
                             return;
@@ -195,7 +199,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
                     if (toEdit) {
                         this.innerHTML = this.firstChild.value.replace(/</g, '&lt;').replace(/>/g, '&gt;');
                         if (this.innerHTML == '' || this.innerHTML == undefined) {
-                            layer.msg("请注意填写完整")
+                            layer.msg('请填写完整', {
+                                icon: 7, time: 3000
+                            });
                             tdArr = [];
                             $(this).closest('tr').remove();
                             return;
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/mxgraphAdd.js
View file @580cb2d
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/mxgraphAdd.js
View file @580cb2d
@@ -112,7 +112,7 @@ layui.define(['form', 'admin', 'layer', 'common', 'sessions', 'xmSelect', 'resli
                 if (res && res.data.length > 0) {
                     var datas=[];
                     $.each(res.data,function (i,v) {
-                        datas.push({name: v.name, value: v.id});
+                        datas.push({name: `${v.name}(${v.code})` , value: v.id,code:v.code,roleName:v.name});
                     })
                     xmSelectRoles = xmSelect.render({
                         el: '#jgraph_roleIds',
@@ -173,12 +173,23 @@ layui.define(['form', 'admin', 'layer', 'common', 'sessions', 'xmSelect', 'resli
                 }
                 //获取Roles值
                 var topoRoles = [];
+                var isExistAdmin = false;
                 var selectedRoles = xmSelectRoles.getValue();
                 if (selectedRoles != null && selectedRoles.length > 0) {
                     $.each(selectedRoles , function (i, v) {
-                        topoRoles.push(v.value + "#" + v.name);
+                        topoRoles.push(v.value + "#" + v.roleName);
+                        if(v.code == 'ADMIN'){
+                            isExistAdmin = true;
+                        }
                     });
                 }
+                // 必须要选管理员
+                if(!isExistAdmin){
+                    layer.msg('保存失败,角色必须包含当管理员权限（ADMIN）!', {icon: 2, time: 3000});
+                    return false;
+                }
+
+
                 var targetId = '';
                 var topoType = $("#jgraph-topo_type").val();//拓扑类型
                 if (topoType && topoType === '1') {//业务拓扑
@@ -301,4 +312,4 @@ layui.define(['form', 'admin', 'layer', 'common', 'sessions', 'xmSelect', 'resli
             }
         }
     });
-});
+});
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/reportConfigAdd.js
View file @580cb2d
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/reportConfigAdd.js
View file @580cb2d
@@ -33,6 +33,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect']
         //保存
         form.on('submit(config-form-save-id)',function () {
+            layer.load(3);
+            $("#config-form-save-id").attr("disabled","disabled");
             var data = form.val('add-config-form')
             delete data['select']
             data.admin = adminSelect.getValue('valueStr')
@@ -58,9 +60,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect']
                                 name: '',
                                 userName: '',
                             })
+                            $("#config-form-save-id").removeAttr("disabled");
                             initGroupSelect()
                         })
                     } else {
+                        $("#config-form-save-id").removeAttr("disabled");
                         layer.msg(res.msg,{
                             offset: '15px',
                             icon: 7,
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/routeAdjust.js
View file @580cb2d
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/routeAdjust.js
View file @580cb2d
@@ -12,7 +12,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
         var sessions = layui.sessions;
         var accessToken = sessions.getToken().access_token;
         var domainName = common.domainName;
-        var companyChart = echarts.init(document.getElementById('chart-company-report'));
+        var orgChart = echarts.init(document.getElementById('chart-org-report'));
         var adjustTypeChart = echarts.init(document.getElementById('chart-adjustType-report'));
         var dateLimit = "";
         var  createTime = "";
@@ -425,7 +425,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                     }],
                     series: series
                 };
-                companyChart.setOption(option)
+                orgChart.setOption(option)
             });
         }
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/routeAdjustAdd.js
View file @580cb2d
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/routeAdjustAdd.js
View file @580cb2d
@@ -34,16 +34,21 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess
         form.on('submit(routeAdjust-form-save-id)', function (res) {
             var value = $('#attachmentInput').val();
             var adjustArr = adjustBak;
-            if (value != '') {
-                $('#upload_btn').click();
-            }
+
             if (adjustArr.length == 0) {
-                layer.msg("请先添加线路详细信息");
+                layer.msg('请添加链路信息', {
+                    icon: 7, time: 3000
+                });
                 return;
             } else {
-                saveForm()
+                if (value != '') {
+                    $('#upload_btn').click();
+                }else {
+                    saveForm()
+                }
             }
+
         })
         //保存
@@ -63,7 +68,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess
                 contentType: "application/json; charset=utf-8",
                 done: function (res) {
                     if (res.success) {
-                        layer.msg(res.msg, {
+                        layer.msg("操作成功", {
                             offset: '15px',
                             icon: 1,
                             time: 1000,
@@ -87,7 +92,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess
                     }
                 }
             })
-            return false
+            return false;
         }
         $("#routeAdjustDetail_create").on("click", function () {
@@ -105,7 +110,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess
                     if (toEdit) {
                         this.innerHTML = this.firstChild.value.replace(/</g, '&lt;').replace(/>/g, '&gt;');
                         if (this.innerHTML == '' || this.innerHTML == undefined) {
-                            layer.msg("请注意填写完整")
+                            layer.msg('请填写完整', {
+                                icon: 7, time: 3000
+                            });
                             tdArr = [];
                             $(this).closest('tr').remove();
                             return;
@@ -147,7 +154,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess
                         if (tdArr[4] != '' && tdArr[4] != undefined) {
                             var resdata = commonDetail.validatorPhone(tdArr[4]);
                             if (resdata.code == -1) {
-                                layer.msg(resdata.msg)
+                                layer.msg(resdata.msg, {
+                                    icon: 7, time: 3000
+                                });
                                 tdArr = [];
                                 $(this).closest('tr').remove();
                                 return;
@@ -158,7 +167,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess
                         if (tdArr[8] != '' && tdArr[8] != undefined) {
                             var resdata = commonDetail.validatorPhone(tdArr[8]);
                             if (resdata.code == -1) {
-                                layer.msg(resdata.msg)
+
+                                layer.msg(resdata.msg, {
+                                    icon: 7, time: 3000
+                                });
                                 tdArr = [];
                                 $(this).closest('tr').remove();
                                 return;
@@ -245,6 +257,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess
                 },
                 allDone: function (obj) {
                     //全部上传成功后
+                    saveForm();
                 },
                 error: function (index, upload) {
                     // 上传失败
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/staffAdd.js
View file @580cb2d
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/staffAdd.js
View file @580cb2d
@@ -29,7 +29,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
         form.on('submit(staff-form-save-id)', function (res) {
             var value = staffsBak
             if (value.length == 0) {
-             layer.msg("请先添加实名信息")
+                layer.msg('无有效实名认证信息', {
+                    icon: 7, time: 3000
+                });
             } else {
                 saveForm()
             }
@@ -49,7 +51,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
                 contentType: "application/json; charset=utf-8",
                 done: function (res) {
                     if (res.success) {
-                        layer.msg(res.msg, {
+                        layer.msg("操作成功", {
                             offset: '15px',
                             icon: 1,
                             time: 1000,
@@ -88,7 +90,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
                     if (toEdit) {
                         this.innerHTML = this.firstChild.value.replace(/</g, '&lt;').replace(/>/g, '&gt;');
                         if(this.innerHTML=='' || this.innerHTML == undefined){
-                            layer.msg("请注意填写完整")
+                            layer.msg('请填写完整', {
+                                icon: 7, time: 3000
+                            });
                             tdArr = [];
                             $(this).closest('tr').remove();
                             return;
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/workReportAdd.js
View file @580cb2d
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/workReportAdd.js
View file @580cb2d
@@ -40,6 +40,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
         //保存
         form.on('submit(workReport-form-save-id)', function (res) {
+            $("#workReport-form-save-id").attr("disabled","disabled");
             var value = $('#attachmentInput').val()
             if (value != '') {
                 $('#upload_btn').click()
@@ -83,7 +84,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
             layer.load(2)
             var data = form.val('add-workReport-form')
             var params = {}
-
             params.user = data.select
             params.attachmentIds = attachmentIds.toString()
             delete data['file']
@@ -111,8 +111,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                                     createTime: ''
                                 },
                             });
+                            $("#workReport-form-save-id").removeAttr("disabled");
                         })
                     } else {
+                        $("#workReport-form-save-id").removeAttr("disabled");
                         layer.msg(res.msg, {
                             offset: '15px',
                             icon: 7,
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/workReportIndex.js
View file @580cb2d
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/workReportIndex.js
View file @580cb2d
@@ -12,7 +12,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
     //对外暴露的接口
     exports("workReportIndex", function () {
         var accessToken = session.getToken()['access_token']
-        var createTime = ''
+        var createTime = 'today'
         var isRead = ''
         var repType = ''
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/workReportView.js
View file @580cb2d
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/workReportView.js
View file @580cb2d
 /** 工作汇报查看 */
-layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate','element'], function (exports) {
+layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydate', 'element'], function (exports) {
     var $ = layui.$;
     var form = layui.form;
     var table = layui.table;
@@ -15,48 +15,45 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
         var companyChart = echarts.init(document.getElementById('chart-company-report'));
         var noReadChart = echarts.init(document.getElementById('chart-noRead-report'));
         var dateLimit = ""
-        var createTime = ""
+        var createTime = "today"
         var type = ''
         var urlRepType = ''
         var manufacturerId = ''
         var reportDetailTable;
         getUrlType()
-        if (type != '1') {
-            createTime = 'thisWeek';
-        } else {
-            $.each($("button.date"),function (i,e) {
-                var $dom = $(e);
-                if($dom.hasClass("active")){
-                    $dom.removeClass("active")
-                }
-            })
-            $.each($("button.isRead"),function (i,e) {
-                var $dom = $(e);
-                if($dom.data("type") == '0'){
-                    $dom.addClass("active")
-                }
-            })
-            $.each($('input[name="repType"]'),function (i,e) {
-                var $dom = $(e);
-                if($dom.val() == urlRepType){
-                    $dom.attr('checked','checked');
-                }
-            })
-        }
+        $.each($("button.date"), function (i, e) {
+            var $dom = $(e);
+            if ($dom.hasClass("active")) {
+                $dom.removeClass("active")
+            }
+        })
+        $.each($("button.isRead"), function (i, e) {
+            var $dom = $(e);
+            if ($dom.data("type") == '0') {
+                $dom.addClass("active")
+            }
+        })
+        $.each($('input[name="repType"]'), function (i, e) {
+            var $dom = $(e);
+            if ($dom.val() == urlRepType) {
+                $dom.attr('checked', 'checked');
+            }
+        })
+
         //日期范围选择
         laydate.render({
             elem: '#dateLimit'
-            ,range: '~',
+            , range: '~',
             done: function (value) {
                 dateLimit = value
                 if (dateLimit == '') {
-                    $('[data-period="thisWeek"]').click()
+                    $('[data-period="today"]').click()
                 } else {
-                    $.each($("button.date"),function (i,e) {
+                    $.each($("button.date"), function (i, e) {
                         var $dom = $(e);
-                        if($dom.hasClass("active")){
+                        if ($dom.hasClass("active")) {
                             $dom.removeClass("active")
                         }
                     })
@@ -66,43 +63,43 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
         });
         form.render();
-       // loadDailyChart();
-       // loadReportableChart();
+        // loadDailyChart();
+        // loadReportableChart();
         loadCompanyReport();
         loadReadReport();
         loadWorkReportTable();
         loadConditionSelect();
         var url = domainName + '/api-web/workreport/chart/noRead';
-        loadNoReadChart(noReadChart,url,'未读');
+        loadNoReadChart(noReadChart, url, '未读');
         // tab页切换事件
         element.on('tab(report-tab)', function (data) {
-                var name = '';
-                if (data.index == 0) {
-                    url = domainName + '/api-web/workreport/chart/noRead'
-                    name = '未读';
-                    loadNoReadChart(noReadChart,url,name);
-                } else if (data.index == 1) {
-                    url = domainName + '/api-web/workreport/chart/noReport?createTime=' + createTime + '&dateLimit=' + dateLimit;
-                    name = '未报';
-                    var noReportChat = echarts.init(document.getElementById('chart-noReport-report'));
-                    loadNoReadChart(noReportChat,url,name);
-                } else if (data.index == 2) {
-                    url = domainName + '/api-web/workreport/chart/noHandlingAlarmsChart'
-                    name = '未处理';
-                    var noAlarmChart = echarts.init(document.getElementById('chart-noAlarm-report'));
-                    loadNoReadChart(noAlarmChart,url,name);
-                }
+            var name = '';
+            if (data.index == 0) {
+                url = domainName + '/api-web/workreport/chart/noRead'
+                name = '未读';
+                loadNoReadChart(noReadChart, url, name);
+            } else if (data.index == 1) {
+                url = domainName + '/api-web/workreport/chart/noReport?createTime=' + createTime + '&dateLimit=' + dateLimit;
+                name = '未报';
+                var noReportChat = echarts.init(document.getElementById('chart-noReport-report'));
+                loadNoReadChart(noReportChat, url, name);
+            } else if (data.index == 2) {
+                url = domainName + '/api-web/workreport/chart/noHandlingAlarmsChart'
+                name = '未处理';
+                var noAlarmChart = echarts.init(document.getElementById('chart-noAlarm-report'));
+                loadNoReadChart(noAlarmChart, url, name);
+            }
         });
         //监听Esc事件
-        $(document).keyup(function(event){
-            if(event.keyCode === 27 || event.keyCode === 96){
+        $(document).keyup(function (event) {
+            if (event.keyCode === 27 || event.keyCode === 96) {
                 layer.closeAll();
             }
         });
-        $("button.isRead").unbind().on("click",function () {
+        $("button.isRead").unbind().on("click", function () {
             var $dom = $(this);
             $("button.isRead").removeClass("active")
             $dom.addClass("active")
@@ -111,9 +108,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
         // 日期方式选择
         $('#btns-workreport-time button').click(function () {
-            $.each($("button.date"),function (i,e) {
+            $.each($("button.date"), function (i, e) {
                 var $dom = $(e);
-                if($dom.hasClass("active")){
+                if ($dom.hasClass("active")) {
                     $dom.removeClass("active")
                 }
             })
@@ -163,16 +160,21 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
         // 加载工作汇报表格
         function loadWorkReportTable() {
             var conditions = form.val('form-workreport-condition');
-            $.each($("button.isRead"),function (i,e) {
+            $.each($("button.isRead"), function (i, e) {
                 var $dom = $(e);
-                if($dom.hasClass("active")){
+                if ($dom.hasClass("active")) {
                     conditions["currIsRead"] = $dom.data("type")
                 }
             })
-            if(manufacturerId!=''){
+            if (manufacturerId != '') {
                 conditions.manufacturerName = manufacturerId;
             }
-            Object.assign(conditions, {access_token: accessToken, createTime: createTime, viewMode: 'true',dateLimit:dateLimit});
+            Object.assign(conditions, {
+                access_token: accessToken,
+                createTime: createTime,
+                viewMode: 'true',
+                dateLimit: dateLimit
+            });
             table.render({
                 elem: '#table-workreport-view',
                 url: domainName + '/api-web/workreport/page',
@@ -210,7 +212,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
                         return typeName
                     }
                 }, {
-                    field: 'repTitle', title: '标题', align: 'center', minWidth: 200,event: 'serRead',
+                    field: 'repTitle', title: '标题', align: 'center', minWidth: 200, event: 'serRead',
                     templet: '<div><span data-id="{{d.id}}" data-rep="{{d.repType}}" class="layui-table-link view-workReport-title" >{{d.repTitle}}</span></div>'
                 }, {
                     field: 'attachmentList', title: '附件数量', align: 'center',
@@ -225,7 +227,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
                         }
                     }
                 }, {
-                    field: 'reportUserList', title: '未读人员', align: 'center',minWidth:'200',
+                    field: 'reportUserList', title: '未读人员', align: 'center', minWidth: '200',
                     templet: function (d) {
                         var userName = [];
                         $.each(d.reportUserList, function (i, v) {
@@ -233,13 +235,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
                                 userName.push(v.nickName)
                             }
                         });
-                        if(userName.length === 0){
+                        if (userName.length === 0) {
                             userName = ['无']
                         }
                         return userName.toString();
                     }
                 }, {
-                    field: 'reportUserList', title: '已读人员', align: 'center',minWidth:'200',
+                    field: 'reportUserList', title: '已读人员', align: 'center', minWidth: '200',
                     templet: function (d) {
                         var userName = [];
                         $.each(d.reportUserList, function (i, v) {
@@ -247,13 +249,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
                                 userName.push(v.nickName)
                             }
                         });
-                        if(userName.length === 0){
+                        if (userName.length === 0) {
                             userName = ['无']
                         }
                         return userName.toString();
                     }
                 }, {
-                    field: 'createUserNickName', title: '上报人', align: 'center',
+                    field: 'createUserNickName', title: '汇报人', align: 'center',
                 }, {
                     field: 'manufacturerName', title: '厂商', align: 'center',
                 }, {
@@ -262,16 +264,19 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
                 done: function () {
                     //获取附件列表
                     $('.view-workReport-attachment').on('click', function () {
-                        common.openWin('workreport/list', '附件', {id: $(this).data('id'), type: 'attachment'}, ['确定', '取消']);
+                        common.openWin('workreport/list', '附件', {
+                            id: $(this).data('id'),
+                            type: 'attachment'
+                        }, ['确定', '取消']);
                     });
                 }
             });
         }
         //监听单元格事件
-        table.on('tool(table-workreport-view)', function(obj){
+        table.on('tool(table-workreport-view)', function (obj) {
             var data = obj.data;
-            if(obj.event === 'serRead'){
+            if (obj.event === 'serRead') {
                 var id = data['id'];
                 var repType = data['repType'];
@@ -286,7 +291,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
                         loadReadReport();
                     }
                 });
-                common.openWin('workreport/add', '查看', {id: id, repType: repType, viewType: 'view'}, ['关闭'], function f() {
+                common.openWin('workreport/add', '查看', {
+                    id: id,
+                    repType: repType,
+                    viewType: 'view'
+                }, ['关闭'], function f() {
                     return true;
                 }, null, null, {
                     success: function () {
@@ -306,7 +315,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
                     options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>"
                 });
                 $('#slt-workreport-group').html(options);
-                if(manufacturerId!=''){
+                if (manufacturerId != '') {
                     $('#slt-workreport-group').val(manufacturerId)
                 }
                 form.render();
@@ -331,7 +340,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
         // 加载最近日报汇报统计图表
         function loadDailyChart() {
             var conditions = form.val('form-workreport-condition');
-            Object.assign(conditions, {access_token: accessToken, createTime: createTime, viewMode: 'true',dateLimit:dateLimit});
+            Object.assign(conditions, {
+                access_token: accessToken,
+                createTime: createTime,
+                viewMode: 'true',
+                dateLimit: dateLimit
+            });
             admin.req({
                 url: domainName + '/api-web/workreport/chart/daily',
                 data: conditions
@@ -411,8 +425,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
                     }],
                     dataZoom: [
                         {
-                            type:"slider",
-                            realtime:true,
+                            type: "slider",
+                            realtime: true,
                             height: 25,
                             start: 5,
                             end: 55
@@ -427,7 +441,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
         // 日报/周报/月报 应报已报统计
         function loadReportableChart() {
             var conditions = form.val('form-workreport-condition');
-            Object.assign(conditions, {access_token: accessToken, createTime: createTime, viewMode: 'true',dateLimit:dateLimit});
+            Object.assign(conditions, {
+                access_token: accessToken,
+                createTime: createTime,
+                viewMode: 'true',
+                dateLimit: dateLimit
+            });
             admin.req({
                 url: domainName + '/api-web/workreport/chart/reptype',
                 data: conditions
@@ -514,7 +533,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
         // 各厂商应报已报情况
         function loadCompanyReport() {
             var conditions = form.val('form-workreport-condition');
-            Object.assign(conditions, {access_token: accessToken, createTime: createTime, viewMode: '',dateLimit:dateLimit});
+            Object.assign(conditions, {
+                access_token: accessToken,
+                createTime: createTime,
+                viewMode: '',
+                dateLimit: dateLimit
+            });
             admin.req({
                 url: domainName + '/api-web/workreport/chart/group',
                 data: conditions
@@ -544,8 +568,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
                         textStyle: {
                             color: '#555'
                         },
-                        formatter:function (data) {
-                            return reportedList[data.dataIndex] +'/'+ data.value
+                        formatter: function (data) {
+                            return reportedList[data.dataIndex] + '/' + data.value
                         }
                     },
                     itemStyle: {
@@ -645,8 +669,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
                         axisLabel: {
                             color: '#333',
                             show: true,
-                            interval:0,
-                            rotate:25
+                            interval: 0,
+                            rotate: 25
                         },
                         axisLine: {
                             lineStyle: {
@@ -707,8 +731,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
                     series: series,
                     dataZoom: [
                         {
-                            type:"slider",
-                            realtime:true,
+                            type: "slider",
+                            realtime: true,
                             height: 25,
                             start: 5,
                             end: 55
@@ -721,12 +745,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
         }
         //点击弹出详情
-        companyChart.on('click',function (params) {
+        companyChart.on('click', function (params) {
             reportDetails(params.name)
         })
         //未读人员
-        function loadNoReadChart(echartObject,url,name) {
+        function loadNoReadChart(echartObject, url, name) {
             var xData = ""
             var yData = ""
             echartObject.showLoading({
@@ -785,9 +809,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
                             axisLabel: {
                                 color: '#333',
                                 show: true,
-                                interval:0,
-                                rotate:19,
-                                fontSize : 10     //更改坐标轴文字大小
+                                interval: 0,
+                                rotate: 19,
+                                fontSize: 10     //更改坐标轴文字大小
                             },
                             axisLine: {
                                 lineStyle: {
@@ -838,7 +862,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
                 area: ['70%', '60%'],
                 content: '<div class="layui-card" style="margin-top: 30px;box-shadow:none"><div class="layui-card-body"><table id="reportDetails" lay-filter="reportDetails"></table></div></div>',
                 btn: ['关闭'],
-                success: function(index, layero) {
+                success: function (index, layero) {
                     reportDetailsTable(name)
                 },
                 yes: function (index, layero) {
@@ -846,14 +870,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
                 }
             });
         }
-        $("#notReportCountBtn").unbind().on("click",function () {
+
+        $("#notReportCountBtn").unbind().on("click", function () {
             layer.open({
                 title: ['汇报详细', 'font-size:18px;'],
                 type: 1,
                 area: ['70%', '60%'],
                 content: '<div class="layui-card" style="margin-top: 30px;box-shadow:none"><div class="layui-card-body"><table id="reportDetails" lay-filter="reportDetails"></table></div></div>',
                 btn: ['关闭'],
-                success: function(index, layero) {
+                success: function (index, layero) {
                     reportDetailsTable();
                 },
                 yes: function (index, layero) {
@@ -861,6 +886,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
                 }
             });
         })
+
         function reportDetailsTable(name) {
             var conditions = form.val('form-workreport-condition');
             if (name) conditions["name"] = name
@@ -887,15 +913,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
                 }, {
                     field: 'readCount', title: '已报数量', align: 'center'
                 }, {
-                    field: 'needReport', title: '未报数量', align: 'center',style:'color:red',templet:function (d) {
-                        return d.needReport-d.readCount
+                    field: 'needReport', title: '未报数量', align: 'center', style: 'color:red', templet: function (d) {
+                        return d.needReport - d.readCount
                     }
                 }]],
             })
         }
         //未读统计报表导出
-        $('#notReportExportBtn').unbind().on('click',function () {
+        $('#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;
             window.open(url)
@@ -904,7 +930,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
         // 已读未读报表
         function loadReadReport() {
             var conditions = form.val('form-workreport-condition');
-            Object.assign(conditions, {access_token: accessToken, createTime: createTime, viewMode: 'true',dateLimit:dateLimit});
+            Object.assign(conditions, {
+                access_token: accessToken,
+                createTime: createTime,
+                viewMode: 'true',
+                dateLimit: dateLimit
+            });
             admin.req({
                 url: domainName + '/api-web/workreport/chart/read',
                 data: conditions
@@ -1024,7 +1055,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
         //获取url中的type值
         function getUrlType() {
             var href = window.location.href;
-            href = href.substr(href.indexOf("#"),href.length);
+            href = href.substr(href.indexOf("#"), href.length);
             var url = href.split("/");
             if (url.length <= 1) {
                 return "";
@@ -1045,15 +1076,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate
         // 图表，表格重新加载
         function reloadAllChange() {
             loadWorkReportTable();
-           // loadDailyChart();
+            // loadDailyChart();
             loadCompanyReport();
             loadReadReport();
             var url = domainName + '/api-web/workreport/chart/noReport?createTime=' + createTime + '&dateLimit=' + dateLimit;
             var name = '未报';
             var noReportChat = echarts.init(document.getElementById('chart-noReport-report'));
-            loadNoReadChart(noReportChat,url,name);
+            loadNoReadChart(noReportChat, url, name);
             // loadNoReadChart()
-          //  loadReportableChart();
+            //  loadReportableChart();
         }
     });
 });
--- a/hg-monitor-web-base/src/main/resources/static/src/views/assets/add.html
View file @580cb2d
+++ b/hg-monitor-web-base/src/main/resources/static/src/views/assets/add.html
View file @580cb2d
@@ -20,7 +20,7 @@
                 <div class="layui-inline inline-half">
                     <label class="layui-form-label">设备序列号</label>
                     <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="resourceSN" id="resourceSN" lay-verify="required">
+                        <input type="text" class="layui-input" name="resourceSN" maxlength="25" id="resourceSN" lay-verify="required">
                     </div>
                 </div>
             </div>
--- a/hg-monitor-web-base/src/main/resources/static/src/views/assets/repair.html
View file @580cb2d
+++ b/hg-monitor-web-base/src/main/resources/static/src/views/assets/repair.html
View file @580cb2d
@@ -45,13 +45,13 @@
                                 </div>
                                 <div class="layui-btn-group time-group" id="btns-repair-time" style="padding: 0">
-                                    <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date"
+                                    <button type="button" class="layui-btn layui-btn-primary layui-btn-xs  active date"
                                             data-period="today">今天
                                     </button>
                                     <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date"
                                             data-period="lastWeek">上周
                                     </button>
-                                    <button type="button" class="layui-btn layui-btn-primary layui-btn-xs active date"
+                                    <button type="button" class="layui-btn layui-btn-primary layui-btn-xs  date"
                                             data-period="thisWeek">本周
                                     </button>
                                     <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date"
--- a/hg-monitor-web-base/src/main/resources/static/src/views/layout-nx.html
View file @580cb2d
+++ b/hg-monitor-web-base/src/main/resources/static/src/views/layout-nx.html
View file @580cb2d
@@ -30,16 +30,27 @@
         <!--资源类型页签-->
         <div class="nxIndex_top_restype_nav">
+            <!--//start lsq 侧边伸缩功能打开 2022-03-12-->
+            <ul class="layui-nav layui-layout-left" style="left:0;">
+                <li class="layui-nav-item layadmin-flexible" lay-unselect>
+                    <a href="javascript:;" layadmin-event="flexible" title="侧边伸缩">
+                        <i class="layui-icon layui-icon-shrink-right" id="LAY_app_flexible"></i>
+                    </a>
+                </li>
+            </ul>
+            <!--//end lsq 2022-03-12-->
+
             <!--资源类型-->
             <script type="text/html" template lay-url="{{sessionStorage.getItem('domainName')}}/api-web/home/restype/getResTypeHealthResult"
                     lay-done="layui.element.render('nav', 'layadmin-app');">
-                <ul class="layui-nav layui-layout-left">
+                <ul class="layui-nav layui-layout-left" style="left:50px;"><!--//lsq 由于增加侧边伸缩按钮，左边距从0更改为50 2022-03-13-->
+
                     <li class="layui-nav-item active" data-restype="biz">
                         <a href="javascript:;" lay-href="/">应用</a>
                     </li>
                 </ul>
-                <div class="vline"></div>
-                <ul class="layui-nav layui-layout-left" style="left: 70px">
+                <div class="vline" style="left: 130px;"></div> <!--//lsq 由于增加侧边伸缩按钮，左边距从80更改为130 2022-03-13-->
+                <ul class="layui-nav layui-layout-left" style="left: 120px"><!--//lsq 左边距70改为120 2022-0312-->
                     {{#  var arr = d.data.sort(function (a, b) { return a.resNum < b.resNum ? 1 : -1; }) }}
                     {{# layui.each(arr, function(index, item){ }}
--- a/hg-monitor-web-base/src/main/resources/static/src/views/machineroom/routeAdjust.html
View file @580cb2d
+++ b/hg-monitor-web-base/src/main/resources/static/src/views/machineroom/routeAdjust.html
View file @580cb2d
@@ -20,7 +20,7 @@
                 <div style="display: flex" class="layui-card-echart">
                     <div style="flex-grow: 3;width: 65%!important;">
                         <h5 class="lay-row-title">按城市A统计</h5>
-                        <div class="pie-chart" id="chart-company-report" style="min-height: 240px"></div>
+                        <div class="pie-chart" id="chart-org-report" style="min-height: 240px"></div>
                     </div>
                     <div style="flex-grow: 3;width: 35%!important;">
                         <h5 class="lay-row-title">按调整要求统计</h5>
--- a/hg-monitor-web-qh/src/main/resources/static/src/controller/userChange.js
View file @580cb2d
+++ b/hg-monitor-web-qh/src/main/resources/static/src/controller/userChange.js
View file @580cb2d
@@ -246,6 +246,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                     //     propertyList.push(vl);
                     // });
                     propertyList = res.data
+                    console.log("propertyList",propertyList)
+
                 }
             });
         }
@@ -256,12 +258,35 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
             var rowTail = '</div>';
             var content = '';
             $.each(propertyList, function (i, v) {
+                // start lsq 个人信息修改 扩展中的登录皮肤输入框改为下拉选择 2022-03-12
+                let str='';
+                if(v.ddicCode=="loginSkin"){
+                    var selectOption='    <option value="default">默认布局</option>'+
+                                '   <option value="skin1">skin1</option>'+
+                                '   <option value="skin2">skin2</option>';
+
+                    str='<select data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="select layui-select select-input-my" name="' + v.ddicCode + '" autocomplete="off">'+
+                        '    <option value="" style="display:none;"></option>'+ selectOption +
+                        '</select>';
+                }else if(v.ddicCode=="userLayout"){
+                    var selectOption='    <option value="layout">默认布局</option>'+
+                        '   <option value="layout-nx">layout-nx</option>';
+
+                    str='<select data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="select layui-select select-input-my" name="' + v.ddicCode + '" autocomplete="off">'+
+                        '    <option value="" style="display:none;"></option>'+ selectOption +
+                        '</select>';
+                }else{
+                    str='<input type="text" data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="layui-input" name="' + v.ddicCode + '" autocomplete="off">';
+
+                }
+
                 var property = '        <div class="layui-inline ">' +
                     '            <label class="layui-form-label">' + v.ddicName + '</label>' +
                     '            <div class="layui-input-inline">' +
-                    '                <input type="text" data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="layui-input" name="' + v.ddicCode + '" autocomplete="off">' +
+                    str+
                     '            </div>' +
                     '        </div>';
+                //end lsq 2022-03-12
                 if (i % 2 == 0 && i != 0) {
                     content += rowTail;
                 }
--- a/hg-monitor-web-qh/src/main/resources/static/src/views/layout.html
View file @580cb2d
+++ b/hg-monitor-web-qh/src/main/resources/static/src/views/layout.html
View file @580cb2d
@@ -86,11 +86,13 @@
             <li class="layui-nav-item layui-show-xs-inline-block layui-hide-sm" lay-unselect>
                 <a href="javascript:;" layadmin-event="more"><i class="layui-icon layui-icon-more-vertical"></i></a>
             </li>
-           <!-- <li class="layui-nav-item layui-hide-xs" lay-unselect>
+            <!--//start  lsq 开启主题配色功能 2022-03-13-->
+            <li class="layui-nav-item layui-hide-xs" lay-unselect>
                 <a href="javascript:;" layadmin-event="theme">
                     <i class="layui-icon layui-icon-theme"></i>
                 </a>
-            </li>-->
+            </li>
+            <!--//end lsq 2022-03-13-->
             <li class="layui-nav-item" lay-unselect id="systems-select">
                 <script type="text/html" template lay-url="{{sessionStorage.getItem('domainName')}}/api-web/manage/ddic/list?ddicCategory=systems"
                         lay-done="layui.element.render('nav', 'layadmin-systems');">
@@ -765,10 +767,10 @@
                 linkStateTips += `<ul class='ul-link-state-tips'>`;
                 layui.each(d.linkStateList, function(index, value) {
                     if(value.state.indexOf('成功') !== -1) {
-                        linkStateTips += `<li class='li-link-state-tips-green'>${value.protocol=='SSH'?value.protocol:'自动发现'}: ${value.state}</li>`;
+                        linkStateTips += `<li class='li-link-state-tips-green'>${value.protocol}: ${value.state}</li>`;
                         linkStateHtml += '<span class="layui-badge-dot layui-bg-green"></span>';
                     } else {
-                        linkStateTips += `<li class='li-link-state-tips-red'>${value.protocol=='SSH'?value.protocol:'自动发现'}: ${value.state}</li>`;
+                        linkStateTips += `<li class='li-link-state-tips-red'>${value.protocol}: ${value.state}</li>`;
                         linkStateHtml += '<span class="layui-badge-dot layui-bg-red"></span>';
                     }
                 });
--- a/hg-monitor-web-qh/src/main/resources/static/vue3/src/views/analysis/config/index.html
View file @580cb2d
+++ b/hg-monitor-web-qh/src/main/resources/static/vue3/src/views/analysis/config/index.html
View file @580cb2d
@@ -176,7 +176,7 @@
                 <el-input v-model="form.scene.desc" placeholder="请输入场景描述"/>
             </div>
             <div style="padding: 3px 10px;">
-                <el-input v-model="form.scene.sort" type="number" placeholder="请输入排序"/>
+                <el-input v-model="form.scene.sort" type="number" :maxlength="10" placeholder="请输入排序"/>
             </div>
         </template>
     </cm-dialog>