Merge branch 'master-mj-yjp' into 'master-mj'

fix:备份相关页面优化调整



See merge request !1189

@@ -11,8 +11,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions','soulTable
     var soulTable = layui.soulTable;
     //对外暴露的接口
     exports("backDetailList", function (d) {
-        var accessToken = localStorage.getItem("accessToken");
-
+        var accessToken = common.getMjToken();
         createFailTable()
         function dateForm(time) {
             var unixTimestamp = new Date(time);
@@ -44,14 +43,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions','soulTable
                 even: true,
                 cols: [[
                     {
-                        field: 'policyName', title: '策略类型', align: 'center', sort: true, width: 250, drag: false
+                        field: 'policyName', title: '策略类型', align: 'center', sort: true, drag: false
                     }, {
                         field: 'agentType',
                         title: '代理类型',
                         align: 'center',
                         sort: true,
                         drag: false,
-                        width: 200,
                         templet: `
                                 <div>
                                     {{#
@@ -82,7 +80,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions','soulTable
                         align: 'center',
                         sort: true,
                         drag: false,
-                        width: 200,
                         templet: `
                                 <div>
                                     {{#
@@ -103,15 +100,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions','soulTable
                                 </div>
                             `
                     }, {
-                        field: 'client', title: '客户端', align: 'center', drag: false, width: 200, sort: true
+                        field: 'client', title: '客户端', align: 'center', drag: false,  sort: true
                     }, {
-                        field: 'stroge', title: '存储池', align: 'center', drag: false, width: 200, sort: true
+                        field: 'stroge', title: '存储池', align: 'center', drag: false,  sort: true
                     }, {
                         field: 'jobStatus',
                         title: '备份状态',
                         align: 'center',
                         drag: false,
-                        width: 160,
                         sort: true,
                         templet: `
                                 <div>
@@ -133,19 +129,19 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions','soulTable
                                 </div>
                             `
                     }, {
-                        field: 'startTime', title: '开始时间', align: 'center', drag: false, sort: true, width: 160
+                        field: 'startTime', title: '开始时间', align: 'center', drag: false, sort: true
                     }, {
-                        field: 'endTime', title: '结束时间', align: 'center', drag: false, sort: true, width: 160
+                        field: 'endTime', title: '结束时间', align: 'center', drag: false, sort: true
                     }, {
-                        field: 'useTime', title: '运行时间', align: 'center', drag: false, sort: true, width: 130
+                        field: 'useTime', title: '运行时间', align: 'center', drag: false, sort: true
                     }, {
-                        field: 'speed', title: '速度', align: 'center', drag: false, sort: true, width: 110
+                        field: 'speed', title: '速度', align: 'center', drag: false, sort: true
                     }, {
-                        field: 'jobFiles', title: '文件数', align: 'center', drag: false, sort: true, width: 110
+                        field: 'jobFiles', title: '文件数', align: 'center', drag: false, sort: true
                     }, {
-                        field: 'jobBytesMb', title: '数据量', align: 'center', drag: false, sort: true, width: 170
+                        field: 'jobBytesMb', title: '数据量', align: 'center', drag: false, sort: true
                     }, {
-                        field: 'storgeType', title: '存储类型', align: 'center', drag: false, sort: true, width: 110
+                        field: 'storgeType', title: '存储类型', align: 'center', drag: false, sort: true
                     }
                 ]],
                 done: function () {

@@ -8,7 +8,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'soulTabl
     var session = layui.sessions
     //对外暴露的接口
     exports("backDingjiaList", function (d) {
-        var accessToken = localStorage.getItem("accessToken");
+        var accessToken = common.getMjToken();
         var busId = d.busId === null ? '' : d.busId;
         var flag = d.flag === null ? '' : d.flag;
         createFailTable();

@@ -11,8 +11,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
 
     //对外暴露的接口
     exports("backFailList", function (d) {
-        var accessToken = localStorage.getItem("accessToken");
-
+        var accessToken = common.getMjToken();
         createFailTable()
         function dateForm(time) {
             var unixTimestamp = new Date(time);

@@ -10,8 +10,7 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd
     //对外暴露的接口
     var accessToken;
     exports('backupCount', function () {
-        var sessions = layui.sessions;
-        var accessToken = localStorage.getItem("accessToken");
+        var accessToken = common.getMjToken();
         var period = 'thisMonth';
         initTable();
         initStatusTable()
@@ -84,7 +83,9 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd
                     var data = res.data;
                     var tr = '<div style="line-height: 26px;padding: 15px;text-align:center;color: #999;">暂无数据</div>';
                     if(data.length==0){
+/*
                         $(".backupCountStatus-table").append(tr);
+*/
                     }else {
                         $("#status_table").find("thead").empty();
                         $("#status_table").find("tbody").empty();
@@ -98,10 +99,18 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd
                         htr += "</tr>"
                         $("#status_table").find("thead").append(htr);
                         $.each(data, function (i, e) {
+                            var evaluationLevel = '';
                             var tr = '';
                             var str = '';
+                            if(e.businfo.evaluationLevel == 'one-level'){
+                                evaluationLevel = '一级';
+                            }else if(e.businfo.evaluationLevel == 'two-level'){
+                                evaluationLevel = '二级';
+                            }else if(e.businfo.evaluationLevel == 'three-level'){
+                                evaluationLevel = '三级';
+                            }
                             if (e.rowspan == 0) {
-                                str = '<td rowspan=1>' + e.businfo.busTypeName + '</td><td rowspan=1>' + e.businfo.evaluationLevel + '</td>'
+                                str = '<td rowspan=1>' + e.businfo.busTypeName + '</td><td rowspan=1>' + evaluationLevel + '</td>'
                                 tr += '<tr data-id="' + e.businfo.busId + '">' +
                                     '<td>' + (i + 1) + '</td>' +
                                     str +
@@ -125,7 +134,7 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd
                                     '<td></td>' +
                                     '</tr>'
                             } else {
-                                str = '<td rowspan="' + e.rowspan + '">' + (i + 1) + '</td><td rowspan="' + e.rowspan + '">' + e.businfo.busTypeName + '</td><td rowspan="' + e.rowspan + '">' + e.businfo.evaluationLevel + '</td>'
+                                str = '<td rowspan="' + e.rowspan + '">' + (i + 1) + '</td><td rowspan="' + e.rowspan + '">' + e.businfo.busTypeName + '</td><td rowspan="' + e.rowspan + '">' + evaluationLevel + '</td>'
                                 tr += '<tr data-id="' + e.businfo.busId + '">' + str
                                 $.each(e.backlist, function (j, f) {
                                     $.each(e.backlist[j], function (h, n) {

@@ -5,8 +5,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view',
     var common = layui.common;
     //对外暴露的接口
     exports('backupDingjia', function () {
-        var sessions = layui.sessions;
-        var accessToken = localStorage.getItem("accessToken");
+        var accessToken = common.getMjToken();
         //加载业务
         loadConditionSelect();
         //加载表格数据

@@ -9,7 +9,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view',
     var admin = layui.admin;
     //对外暴露的接口
     exports('backupmain', function () {
-        var accessToken = localStorage.getItem("accessToken");
+        var accessToken = common.getMjToken();
         var today = new Date()
         today = today.getFullYear() + "-" + (today.getMonth() >= 9 ? (today.getMonth() + 1) : "0" + (today.getMonth() + 1)) + "-" + (today.getDate() > 9 ? (today.getDate()) : "0" + (today.getDate()));
         var backTime = today;
@@ -129,15 +129,25 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view',
                     var data = res.data;
                     var tr = '<div style="line-height: 26px;padding: 15px;text-align:center;color: #999;">暂无数据</div>';
                     if(data.length==0){
-                        $(".layui-tab-item").append(tr);
+                        /*$(".layui-show").append(tr);
+                        $("#inspectioncount_table_id").find("tbody").empty();
+                        $("#inspectioncount_table_id").append(tr);*/
                     }else {
                         $("#inspectioncount_table_id").find("tbody").empty();
                     }
                     $.each(data, function (i, e) {
+                        var evaluationLevel = '';
                         var tr = '';
                         var str = '';
+                        if(e.businfo.evaluationLevel == 'one-level'){
+                            evaluationLevel = '一级';
+                        }else if(e.businfo.evaluationLevel == 'two-level'){
+                            evaluationLevel = '二级';
+                        }else if(e.businfo.evaluationLevel == 'three-level'){
+                            evaluationLevel = '三级';
+                        }
                         if (e.rowspan == 0) {
-                            str = '<td rowspan=1>' + e.businfo.busTypeName + '</td><td rowspan=1>' + e.businfo.evaluationLevel + '</td>'
+                            str = '<td rowspan=1>' + e.businfo.busTypeName + '</td><td rowspan=1>' + evaluationLevel + '</td>'
                             tr += '<tr data-id="' + e.businfo.busId + '">' +
                                 '<td>' + (i + 1) + '</td>' +
                                 str +
@@ -156,7 +166,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view',
                                 '<td></td>' +
                                 '</tr>'
                         } else {
-                            str = '<td rowspan="' + e.rowspan + '">' + (i + 1) + '</td><td rowspan="' + e.rowspan + '">' + e.businfo.busTypeName + '</td><td rowspan="' + e.rowspan + '">' + e.businfo.evaluationLevel + '</td>'
+                            str = '<td rowspan="' + e.rowspan + '">' + (i + 1) + '</td><td rowspan="' + e.rowspan + '">' + e.businfo.busTypeName + '</td><td rowspan="' + e.rowspan + '">' + evaluationLevel + '</td>'
                             tr += '<tr data-id="' + e.businfo.busId + '">' + str
                             $.each(e.backlist, function (j, f) {
                                 var platform = '';

@@ -112,7 +112,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                 cols: [[ {
                     type: 'numbers', title: '序号'
                 }, {
-                    field: 'title', title: '维修单编号', align: 'center',width:100,
+                    field: 'title', title: '维修单编号', align: 'center',
                     templet: '<div><span data-id="{{d.id}}"  class="layui-table-link view-devicehitch-title" >{{d.title}}</span></div>'
                 }, {
                     field: 'machineRoomName', title: '机房', align: 'center',templet: function (d) {
@@ -138,28 +138,28 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                         return machineRoomName;
                     }
                 }, {
-                    field: 'deviceTypeName', title: '设备类型', align: 'center',width:88
+                    field: 'deviceTypeName', title: '设备类型', align: 'center'
                 }, {
-                    field: 'deviceInfo', title: '设备名称', align: 'center',width:88
+                    field: 'deviceInfo', title: '设备名称', align: 'center'
                 },{
-                    field: 'hitchDiscover', title: '故障发现人', align: 'center',width:100
+                    field: 'hitchDiscover', title: '故障发现人', align: 'center'
                 },{
-                    field: 'hitchTime', title: '故障时间', align: 'center',width:88
+                    field: 'hitchTime', title: '故障时间', align: 'center'
                 } ,{
-                    field: 'hitchDesc', title: '故障描述', align: 'center',width:150
+                    field: 'hitchDesc', title: '故障描述', align: 'center'
                 },{
-                    field: 'projectLeader', title: '设备负责人', align: 'center',width:100
+                    field: 'projectLeader', title: '设备负责人', align: 'center'
                 }, {
-                    field: 'phone', title: '联系方式', align: 'center',width:88
+                    field: 'phone', title: '联系方式', align: 'center'
                 }, {
-                    field: 'repairer', title: '维修人', align: 'center',width:80
+                    field: 'repairer', title: '维修人', align: 'center'
                 }, {
-                    field: 'attachmentList', title: '附件', align: 'center',width:60,
+                    field: 'attachmentList', title: '附件', align: 'center',
                     templet: '<div><span data-id="{{d.id}}" class="layui-table-link view-devicehitch-attachment">{{d.attachmentList.length}}</span></div>'
                 },{
                     field: 'repairPlan', title: '计划维修时间', align: 'center'
                 }, {
-                    field: 'repairStatus', title: '维修状态', align: 'center',width:88,
+                    field: 'repairStatus', title: '维修状态', align: 'center',
                     templet:function (d) {
                         if(d.repairStatus=="0"){
                             return "未维修"
@@ -168,7 +168,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                         }
                     }
                 }, {
-                    field: 'applyTime', title: '记录时间', align: 'center',width:95
+                    field: 'applyTime', title: '记录时间', align: 'center'
                 }
                 ]],
                 done: function () {

@@ -271,6 +271,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                             var url = domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId=' + objectId + '&id=' + d.machineRoomId + '&accessToken=' + accessToken
                             $.ajax({
                                 url: url,
+                                async: false,
                                 success: function (res) {
                                     $.each(res.data, function (i, v) {
                                         machineRoomName = v.shortName;
@@ -296,6 +297,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                                 var url = domainName + '/cmdb-CI/supplier/find/' + d.manufacturerId + '?accessToken=' + accessToken
                                 $.ajax({
                                     url: url,
+                                    async: false,
                                     success: function (res) {
                                         if (res.data.cmdbSupplier) {
                                             manufacturerName = res.data.cmdbSupplier.shortName;

@@ -78,9 +78,17 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                     var data = res.data;
                     $("#recoverycount-table").find("tbody").empty();
                     $.each(data, function (i, e) {
+                        var evaluationLevel = '';
                         var tr = '';
+                        if(e.evaluationLevel == 'one-level'){
+                            evaluationLevel = '一级';
+                        }else if(e.evaluationLevel == 'two-level'){
+                            evaluationLevel = '二级';
+                        }else if(e.evaluationLevel == 'three-level'){
+                            evaluationLevel = '三级';
+                        }
                         var rowspan =e.children!=null && e.children.length > 1 ? e.children.length : 1;
-                        var str = '<td rowspan="' + rowspan + '">' + (i + 1) + '</td><td rowspan="' + rowspan + '">' + e.busTypeName + '</td><td rowspan="' + rowspan + '">'+ e.evaluationLevel + '</td>'
+                        var str = '<td rowspan="' + rowspan + '">' + (i + 1) + '</td><td rowspan="' + rowspan + '">' + e.busTypeName + '</td><td rowspan="' + rowspan + '">'+evaluationLevel + '</td>'
                         tr += '<tr data-id="' + e.busId + '">' + str
                         if (e.children!=null && e.children.length > 0){
                             $.each(e.children, function (j, f) {

@@ -139,6 +139,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                                     var url = domainName + '/cmdb-CI/supplier/find/'+d.omanufacturerId+'?accessToken='+accessToken
                                     $.ajax({
                                         url: url,
+                                        async: false,
                                         success: function(res){
                                             if(res.data.cmdbSupplier){
                                                 manufacturerName = res.data.cmdbSupplier.shortName;

@@ -43,17 +43,18 @@
                             </div>
                         </div>
                     </form>
+                    <button class="layui-btn layui-btn-sm layui-btn-normal tab-button"
+                            id="btn-dingjia-export-excel">
+                        <i class="layui-icon">&#xe60a;</i>导出到Excel
+                    </button>
                 </div>
             </div>
             <div class="layui-card" style="height: 100%">
                 <div class="layui-card-body">
                     <div class="layui-tab layui-tab-card" lay-filter="insp-tab">
-                        <ul class="layui-tab-title">
-                            <button class="layui-btn layui-btn-sm layui-btn-normal tab-button"
-                                    id="btn-dingjia-export-excel">
-                                <i class="layui-icon">&#xe60a;</i>导出到Excel
-                            </button>
-                        </ul>
+                       <!-- <ul class="layui-tab-title">
+
+                        </ul>-->
                         <div class="layui-tab-content">
                             <div class="layui-tab-item layui-show">
                                 <div id="dingjia-head-info" class="statistics-top-head"></div>

@@ -44,25 +44,28 @@
                                            class="layui-input" readonly placeholder="其他日期范围">
                                 </div>
                             </div>
+
                         </div>
                     </form>
+                    <button class="layui-btn layui-btn-sm layui-btn-normal tab-button"
+                            id="btn-inspStatistics-export-excel" style="float: right">
+                        <i class="layui-icon">&#xe60a;</i>导出到Excel
+                    </button>
                 </div>
+
             </div>
             <div class="layui-card" style="height: 100%">
                 <div class="layui-card-body">
-                    <div class="layui-tab layui-tab-card" lay-filter="insp-tab">
-                        <ul class="layui-tab-title">
-<!--
-                            <li class="layui-this">数据库备份</li>
--->
-<!--
-                            <li>虚拟机备份</li>
--->
-                            <button class="layui-btn layui-btn-sm layui-btn-normal tab-button"
-                                    id="btn-inspStatistics-export-excel">
-                                <i class="layui-icon">&#xe60a;</i>导出到Excel
-                            </button>
-                        </ul>
+              <div class="layui-tab layui-tab-card" lay-filter="insp-tab">
+                  <!--          <ul class="layui-tab-title">
+&lt;!&ndash;
+                          <li class="layui-this">数据库备份</li>
+&ndash;&gt;
+&lt;!&ndash;
+                          <li>虚拟机备份</li>
+&ndash;&gt;
+
+                      </ul>-->
                         <div class="layui-tab-content">
                             <div class="layui-tab-item layui-show">
                                 <div id="inspection-report-head-info" class="statistics-top-head"></div>