Merge branch 'master-mj-yjpnew' into 'master-mj'

fix:基础功能弹框自动伸缩统一优化



See merge request !1209

@@ -90,10 +90,10 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd
                         $("#status_table").find("thead").empty();
                         $("#status_table").find("tbody").empty();
 
-                        var htr = "<tr><th>序号</th><th width='200'>系统名称</th><th>等保等级</th><th width='200'>数据库名称</th><th>IP地址</th>"
+                        var htr = "<tr><th style='color: #151b26;font-weight: bold!important;'>序号</th><th width='200' style='color: #151b26;font-weight: bold!important;'>系统名称</th><th style='color: #151b26;font-weight: bold!important;'>等保等级</th><th width='200' style='color: #151b26;font-weight: bold!important;'>数据库名称</th><th style='color: #151b26;font-weight: bold!important;'>IP地址</th>"
                         $.each(data[0].backlist[0], function (j, f) {
                             if (j != "resId" && j != "resName" && j != "ip") {
-                                htr += "<th>" + j + "</th>"
+                                htr += "<th style='color: #151b26;font-weight: bold!important;'>" + j + "</th>"
                             }
                         });
                         htr += "</tr>"

@@ -115,7 +115,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view',
                         common.openWin('backup/backDingjiaList', title, {
                             busId: busId,
                             flag: flag
-                        }, ['确定', '取消'],null,null,['1512px', '90%'])
+                        }, ['确定', '取消'],null,null,['90%', '90%'])
                     });
 
                 }

@@ -274,7 +274,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view',
                             startTime: startTime,
                             resId: resId,
                             resIp: ip
-                        }, ['确定', '取消'],null,null,['1512px', '90%'])
+                        }, ['确定', '取消'],null,null,['90%', '90%'])
                     });
                     $('#inspectioncount_table_id :button.edit').click(function () {
                         var toEdit = this.value == '编辑';

@@ -298,7 +298,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             common.openWin('machineroom/bizupgradeAdd', title, {id: id}, ['保存', '取消'], function f() {
                 $("#bizupgrade-form-save-id").trigger("click");
                 reloadAllChange();
-            },null,['1512px', '90%'],null,{end: function () {
+            },null,['90%', '90%'],null,{end: function () {
                     reloadAllChange();
                 }})
         }

@@ -207,7 +207,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             common.openWin('machineroom/devicehitchAdd', title, {id: id}, ['保存', '取消'], function f(){
                 $("#devicehitch-form-save-id").trigger("click");
                 reloadAllChange();
-            },null,['1512px', '90%'],null,{end: function () {
+            },null,['90%', '90%'],null,{end: function () {
                     reloadAllChange();
                 }})
         }

@@ -334,7 +334,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             common.openWin('emergency/add', title, {id: id}, ['保存', '取消'], function f() {
                 $("#emergency-form-save-id").trigger("click");
                 reloadAllChange();
-            },null,['1512px', '90%'],null,{end: function () {
+            },null,['90%', '90%'],null,{end: function () {
                     reloadAllChange();
                 }})
         }

@@ -375,7 +375,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             common.openWin('machineroom/deviceAdd', title, {id: id}, ['保存', '取消'], function f() {
                 $("#device-form-save-id").trigger("click");
                 reloadAllChange();
-            }, null, ['1512px', '90%'], null, {end: function () {
+            }, null, ['90%', '90%'], null, {end: function () {
                     reloadAllChange();
                 }})
         }

@@ -227,7 +227,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             var title = id ? '编辑' : '新增'
             common.openWin('machineroom/staffAdd', title, {id: id}, ['保存', '取消'], function f() {
                 $("#staff-form-save-id").trigger("click");
-            },null,['1512px', '90%'],null,{end: function () {
+            },null,['90%', '90%'],null,{end: function () {
                     reloadAllChange();
                 }})
         }

@@ -195,7 +195,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             common.openWin('machineroom/extraAdd', title, {id: id}, ['保存', '取消'], function f(){
                 $("#extra-form-save-id").trigger("click");
                 reloadAllChange();
-            },null,['1512px', '90%'],null,{end: function () {
+            },null,['90%', '90%'],null,{end: function () {
                     reloadAllChange();
                 }})
         }

@@ -161,7 +161,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             common.openWin('machineroom/meetingApplyAdd', title, {id: id}, ['保存', '取消'], function f(){
                 $("#meetingApply-form-save-id").trigger("click");
                 form.render();
-            },null,['1512px', '90%'],null,{end: function () {
+            },null,['90%', '90%'],null,{end: function () {
                     reloadAllChange();
                 }})
         }

@@ -139,7 +139,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
         function openmeetingsummaryForm(id) {
             var title = id ? '编辑' : '新增'
             common.openWin('machineroom/meetingsummaryAdd', title, {id: id}, ['确定', '取消'], function f(index,layero){
-            },null,['1512px', '90%'],null,{end: function () {
+            },null,['90%', '90%'],null,{end: function () {
                     reloadAllChange();
                 }})
         }

@@ -211,7 +211,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             common.openWin('recoveryverify/add', title, {id: id}, ['保存', '取消'], function f() {
                 $("#recoveryverify-form-save-id").trigger("click");
                 reloadAllChange();
-            },null,['1512px', '90%'],null,{end: function () {
+            },null,['90%', '90%'],null,{end: function () {
                     reloadAllChange();
                 }})
         }

@@ -166,7 +166,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             common.openWin('machineroom/routeAdjustAdd', title, {id: id}, ['保存', '取消'], function f() {
                 $("#routeAdjust-form-save-id").trigger("click");
                 reloadAllChange();
-            },null,['1512px', '90%'],null,{end: function () {
+            },null,['90%', '90%'],null,{end: function () {
                     reloadAllChange();
                 }})
         }

@@ -239,7 +239,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
             var title = id ? '编辑' : '新增'
             common.openWin('workreport/add', title, {id: id, repType: repType}, ['保存', '取消'], function f() {
                 $("#workReport-form-save-id").trigger("click");
-            },null,['1100px', '90%'],null,{end: function () {
+            },null,['80%', '90%'],null,{end: function () {
                     reloadWorkReportTable();
                 }})
         }

@@ -300,7 +300,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                 common.openWin('workreport/add', '查看', {id: id, repType: repType, viewType: 'view',datas:datas}, ['下一条','关闭'], function f() {
                     $("#workReport-form-next-id").trigger("click");
                     reloadAllChange();
-                },null,['1100px', '90%'],null,{end: function () {
+                },null,['80%', '90%'],null,{end: function () {
                         reloadAllChange();
                     }});
             }

@@ -47,3 +47,8 @@
         fn();
     });
 </script>
+<style type="text/css">
+    th {
+        color: #151b26;
+    }
+</style>
\ No newline at end of file