Преглед изворни кода

修正配置不美观。
修正告警时间为告警事件发生时间。
修正忽略告警的时间为忽略告警时间。
修正同一分支全选生成工单时提示选择同一分支结构的工单进行批量操作。
修正notices类中返回信息code的默认值。
修正统计报表为30天以及低于三个月自定义时间的报表错误。

gzjzss пре 7 година
родитељ
комит
b2ab0e7cca

+ 54 - 7
application/controllers/Report.php

@@ -179,15 +179,28 @@ class Report extends MY_Controller
             }
         }
 
-        $datediff = $end_date_time->diff($begin_date_time);
+        $datediff = $begin_date_time->diff($end_date_time);
         /*图表4数据封装 工单总数趋势图*/
         $data4x = array();
         $data4y = array();
         if($sign==1 || $sign ==2 || ($datediff->m<3 && $datediff->y==0)) {
             $start_date_time = new DateTime($begin_date_time->format("Y-m-d"));
-            for($i = 0;$i<=$datediff->d;$i++){
-                $data4x[] = $start_date_time->format("Y-m-d");
-                $start_date_time->modify("+1 day");
+            if($sign == 1) {
+                for ($i = 0; $i <= $datediff->d; $i++) {
+                    $data4x[] = $start_date_time->format("Y-m-d");
+                    $start_date_time->modify("+1 day");
+                }
+            }elseif($sign==2){
+                for ($i = 0; $i < 30; $i++) {
+                    $data4x[] = $start_date_time->format("Y-m-d");
+                    $start_date_time->modify("+1 day");
+                }
+            }else{
+                $diff = $this->diffBetweenTwoDays($begin_date_time,$end_date_time);
+                for ($i = 0; $i < $diff; $i++) {
+                    $data4x[] = $start_date_time->format("Y-m-d");
+                    $start_date_time->modify("+1 day");
+                }
             }
             $group4 = array(
                 "_id" => array("\$dateToString" => array("format" => "%Y-%m-%d", "date" => array("\$add" => ["\$create_time", 28800000]))),
@@ -229,9 +242,22 @@ class Report extends MY_Controller
         $data5y = array();
         if($sign==1 || $sign ==2 || ($datediff->m<3 && $datediff->y==0)) {
             $start_date_time = new DateTime($begin_date_time->format("Y-m-d"));
-            for($i = 0;$i<=$datediff->d;$i++){
-                $data5x[] = $start_date_time->format("Y-m-d");
-                $start_date_time->modify("+1 day");
+            if($sign == 1) {
+                for ($i = 0; $i <= $datediff->d; $i++) {
+                    $data5x[] = $start_date_time->format("Y-m-d");
+                    $start_date_time->modify("+1 day");
+                }
+            }elseif($sign==2){
+                for ($i = 0; $i < 30; $i++) {
+                    $data5x[] = $start_date_time->format("Y-m-d");
+                    $start_date_time->modify("+1 day");
+                }
+            }else{
+                $diff = $this->diffBetweenTwoDays($begin_date_time,$end_date_time);
+                for ($i = 0; $i <= $diff; $i++) {
+                    $data5x[] = $start_date_time->format("Y-m-d");
+                    $start_date_time->modify("+1 day");
+                }
             }
             $group5 = array(
                 "_id" => array("\$dateToString" => array("format" => "%Y-%m-%d", "date" => array("\$add" => ["\$end_time", 28800000]))),
@@ -286,6 +312,27 @@ class Report extends MY_Controller
     }
 
     /**
+     * 求两个日期之间相差的天数
+     * (针对1970年1月1日之后,求之前可以采用泰勒公式)
+     * @param DateTime $day1
+     * @param DateTime $day2
+     * @return number
+     */
+    public function diffBetweenTwoDays ($day1, $day2)
+    {
+
+        $second1 = $day1->getTimestamp();
+        $second2 = $day2->getTimestamp();
+
+        if ($second1 < $second2) {
+            $tmp = $second2;
+            $second2 = $second1;
+            $second1 = $tmp;
+        }
+        return ($second1 - $second2) / 86400;
+    }
+
+    /**
      * 导出统计报表
      */
     public function export(){

+ 2 - 0
application/controllers/Warning.php

@@ -159,6 +159,7 @@ class Warning extends MY_Controller{
         $warning_info = $this->warning_model->get_warning_with_id($warning_id);
         if($warning_info){
             $warning_info['status'] = "20";
+            $warning_info['ignore_time'] = new MongoDB\BSON\UTCDateTime(time()*1000);
             $this->warning_model->update_warning($warning_info);
             $msg['msg'] = "忽略告警信息成功!";
             $msg['icon'] = 1;
@@ -182,6 +183,7 @@ class Warning extends MY_Controller{
                 $warning_info = $this->warning_model->get_warning_with_objectid($val);
                 if($warning_info){
                     $warning_info['status'] = "20";
+                    $warning_info['ignore_time'] = new MongoDB\BSON\UTCDateTime(time()*1000);
                     $this->warning_model->update_warning($warning_info);
                 }
             }

+ 35 - 35
application/libraries/Notices.php

@@ -47,8 +47,8 @@ class Notices{
      */
     public function create_workorder($workorder){
         $info = array();
-        $info['sms_code'] = "FAILED";
-        $info['email_code'] = "FAILED";
+        $info['sms_code'] = "OK";
+        $info['email_code'] = "OK";
         if(count($workorder['remark_list'])<1) {
             $workorder['remark_list'][0]=array("remark_content"=>"");
         }
@@ -63,9 +63,9 @@ class Notices{
             if($this->setting['sms_type'] == '10' ){
                 if(send_by_modem($this->setting,$receive_user['mobile'],$sms_content)){
                     $notices_log['status'] = "1";
-                    $info['sms_code'] = "OK";
                 }else{
                     $notices_log['status'] = "0";
+                    $info['sms_code'] = "FAILED";
                     $info['sms_msg'] = "短信发送失败!端口被占用或者配置错误!";
                 }
             }elseif($this->setting['sms_type'] == '20' ){
@@ -78,9 +78,9 @@ class Notices{
                 $resp = $this->Aliyunsms->sendSms($receive_user['mobile'],$this->setting['template_codes'][0],$sms_content);
                 if($resp['Code'] == 'OK'){
                     $notices_log['status'] = "1";
-                    $info['sms_code'] = "OK";
                 }else{
                     $notices_log['status'] = "0";
+                    $info['sms_code'] = "FAILED";
                     $info['sms_msg'] = $resp['Message'];
                 }
             }
@@ -132,9 +132,9 @@ class Notices{
             $resp = $this->CI->mailer->send_email($receive_user['email'],$notices_log['subject'],$notices_log['content']);
             if($resp['code'] == 'OK'){
                 $notices_log['status'] = "1";
-                $info['email_code'] = "OK";
             }else{
                 $notices_log['status'] = "0";
+                $info['email_code'] = "FAILED";
                 $info['email_msg'] = $resp['msg'];
             }
             $notices_log['create_time'] = new MongoDB\BSON\UTCDateTime(time()*1000);
@@ -150,8 +150,8 @@ class Notices{
      */
     public function sign_workorder($workorder,$remark){
         $info = array();
-        $info['sms_code'] = "FAILED";
-        $info['email_code'] = "FAILED";
+        $info['sms_code'] = "OK";
+        $info['email_code'] = "OK";
         $receive_user = $this->CI->user_model->get_user_with_user_id($workorder['receive_user_id']);
         $admin_list = $this->CI->user_model->select_users("1");
         $sso_admin_list = $this->CI->user_model->set_collection_name("sso_users")->select_users("1");
@@ -176,10 +176,10 @@ class Notices{
                 if($this->setting['sms_type'] == '10' ){
                     if(send_by_modem($this->setting, $notices_log['mobile'], $sms_content)){
                         $notices_log['status'] = "1";
-                        $info['sms_code'] = "OK";
                     }else{
                         $notices_log['status'] = "0";
-                        $info['sms_msg'] = "短信发送失败!端口被占用或者配置错误!";
+                        $info['sms_code'] = "FAILED";
+                    $info['sms_msg'] = "短信发送失败!端口被占用或者配置错误!";
                     }
                 }elseif($this->setting['sms_type'] == '20' ){
                     $sms_content = array(
@@ -192,10 +192,10 @@ class Notices{
                     $resp = $this->Aliyunsms->sendSms($notices_log['mobile'],$this->setting['template_codes'][1],$sms_content);
                     if($resp['Code'] == 'OK'){
                         $notices_log['status'] = "1";
-                        $info['sms_code'] = "OK";
                     }else{
                         $notices_log['status'] = "0";
-                        $info['sms_msg'] = $resp['Message'];
+                        $info['sms_code'] = "FAILED";
+                    $info['sms_msg'] = $resp['Message'];
                     }
                 }
                 $notices_log['create_time'] = new MongoDB\BSON\UTCDateTime(time()*1000);
@@ -246,9 +246,9 @@ class Notices{
             $resp = $this->CI->mailer->send_email("", $notices_log['subject'], $notices_log['content']);
             if($resp['code'] == 'OK'){
                 $notices_log['status'] = "1";
-                $info['email_code'] = "OK";
             }else{
                 $notices_log['status'] = "0";
+                $info['email_code'] = "FAILED";
                 $info['email_msg'] = $resp['msg'];
             }
             $notices_log['create_time'] = new MongoDB\BSON\UTCDateTime(time()*1000);
@@ -264,8 +264,8 @@ class Notices{
      */
     public function check_workorder($workorder,$remark){
         $info = array();
-        $info['sms_code'] = "FAILED";
-        $info['email_code'] = "FAILED";
+        $info['sms_code'] = "OK";
+        $info['email_code'] = "OK";
         $receive_user = $this->CI->user_model->get_user_with_user_id($workorder['receive_user_id']);
         $admin_list = $this->CI->user_model->select_users("1");
         $sso_admin_list = $this->CI->user_model->set_collection_name("sso_users")->select_users("1");
@@ -290,10 +290,10 @@ class Notices{
                 if($this->setting['sms_type'] == '10' ){
                     if(send_by_modem($this->setting, $notices_log['mobile'], $sms_content)){
                         $notices_log['status'] = "1";
-                        $info['sms_code'] = "OK";
                     }else{
                         $notices_log['status'] = "0";
-                        $info['sms_msg'] = "短信发送失败!端口被占用或者配置错误!";
+                        $info['sms_code'] = "FAILED";
+                    $info['sms_msg'] = "短信发送失败!端口被占用或者配置错误!";
                     }
                 }elseif($this->setting['sms_type'] == '20' ){
                     $sms_content = array(
@@ -306,10 +306,10 @@ class Notices{
                     $resp = $this->Aliyunsms->sendSms($notices_log['mobile'],$this->setting['template_codes'][2],$sms_content);
                     if($resp['Code'] == 'OK'){
                         $notices_log['status'] = "1";
-                        $info['sms_code'] = "OK";
                     }else{
                         $notices_log['status'] = "0";
-                        $info['sms_msg'] = $resp['Message'];
+                        $info['sms_code'] = "FAILED";
+                    $info['sms_msg'] = $resp['Message'];
                     }
                 }
                 $notices_log['create_time'] = new MongoDB\BSON\UTCDateTime(time()*1000);
@@ -365,9 +365,9 @@ class Notices{
             $resp = $this->CI->mailer->send_email("", $notices_log['subject'], $notices_log['content'],$attachments);
             if($resp['code'] == 'OK'){
                 $notices_log['status'] = "1";
-                $info['email_code'] = "OK";
             }else{
                 $notices_log['status'] = "0";
+                $info['email_code'] = "FAILED";
                 $info['email_msg'] = $resp['msg'];
             }
             $notices_log['create_time'] = new MongoDB\BSON\UTCDateTime(time()*1000);
@@ -383,8 +383,8 @@ class Notices{
      */
     public function doit_workorder($workorder,$remark){
         $info = array();
-        $info['sms_code'] = "FAILED";
-        $info['email_code'] = "FAILED";
+        $info['sms_code'] = "OK";
+        $info['email_code'] = "OK";
         $receive_user = $this->CI->user_model->get_user_with_user_id($workorder['receive_user_id']);
         $admin_list = $this->CI->user_model->select_users("1");
         $sso_admin_list = $this->CI->user_model->set_collection_name("sso_users")->select_users("1");
@@ -409,10 +409,10 @@ class Notices{
                 if($this->setting['sms_type'] == '10' ){
                     if(send_by_modem($this->setting, $notices_log['mobile'], $sms_content)){
                         $notices_log['status'] = "1";
-                        $info['sms_code'] = "OK";
                     }else{
                         $notices_log['status'] = "0";
-                        $info['sms_msg'] = "短信发送失败!端口被占用或者配置错误!";
+                        $info['sms_code'] = "FAILED";
+                    $info['sms_msg'] = "短信发送失败!端口被占用或者配置错误!";
                     }
                 }elseif($this->setting['sms_type'] == '20' ){
                     $sms_content = array(
@@ -425,9 +425,9 @@ class Notices{
                     $resp = $this->Aliyunsms->sendSms($notices_log['mobile'],$this->setting['template_codes'][3],$sms_content);
                     if($resp['Code'] == 'OK'){
                         $notices_log['status'] = "1";
-                        $info['sms_code'] = "OK";
                     }else{
                         $notices_log['status'] = "0";
+                        $info['sms_code'] = "FAILED";
                         $info['sms_msg'] = $resp['Message'];
                     }
                 }
@@ -484,9 +484,9 @@ class Notices{
             $resp = $this->CI->mailer->send_email("", $notices_log['subject'], $notices_log['content'],$attachments);
             if($resp['code'] == 'OK'){
                 $notices_log['status'] = "1";
-                $info['email_code'] = "OK";
             }else{
                 $notices_log['status'] = "0";
+                $info['email_code'] = "FAILED";
                 $info['email_msg'] = $resp['msg'];
             }
             $notices_log['create_time'] = new MongoDB\BSON\UTCDateTime(time()*1000);
@@ -502,8 +502,8 @@ class Notices{
      */
     public function reject_workorder($workorder,$remark){
         $info = array();
-        $info['sms_code'] = "FAILED";
-        $info['email_code'] = "FAILED";
+        $info['sms_code'] = "OK";
+        $info['email_code'] = "OK";
         $receive_user = $this->CI->user_model->get_user_with_user_id($workorder['receive_user_id']);
         if($this->setting['is_sms'] && in_array("10",$workorder['send_type'])){
             $sms_content = '你的工单已由管理员驳回,请重新处理。工单ID:'.$workorder['workorder_id'].',工单名称:'.$workorder['workorder_name'].',类型:'.$workorder['type'].',备注:'.$remark['remark_content'];
@@ -515,9 +515,9 @@ class Notices{
             if($this->setting['sms_type'] == '10' ){
                 if(send_by_modem($this->setting, $receive_user['mobile'], $sms_content)){
                     $notices_log['status'] = "1";
-                    $info['sms_code'] = "OK";
                 }else{
                     $notices_log['status'] = "0";
+                    $info['sms_code'] = "FAILED";
                     $info['sms_msg'] = "短信发送失败!端口被占用或者配置错误!";
                 }
             }elseif($this->setting['sms_type'] == '20' ){
@@ -530,9 +530,9 @@ class Notices{
                 $resp = $this->Aliyunsms->sendSms($receive_user['mobile'],$this->setting['template_codes'][4],$sms_content);
                 if($resp['Code'] == 'OK'){
                     $notices_log['status'] = "1";
-                    $info['sms_code'] = "OK";
                 }else{
                     $notices_log['status'] = "0";
+                    $info['sms_code'] = "FAILED";
                     $info['sms_msg'] = $resp['Message'];
                 }
             }
@@ -580,9 +580,9 @@ class Notices{
             $resp = $this->CI->mailer->send_email($receive_user['email'],$notices_log['subject'],$notices_log['content']);
             if($resp['code'] == 'OK'){
                 $notices_log['status'] = "1";
-                $info['email_code'] = "OK";
             }else{
                 $notices_log['status'] = "0";
+                $info['email_code'] = "FAILED";
                 $info['email_msg'] = $resp['msg'];
             }
             $notices_log['create_time'] = new MongoDB\BSON\UTCDateTime(time()*1000);
@@ -597,8 +597,8 @@ class Notices{
      */
     public function finish_workorder($workorder){
         $info = array();
-        $info['sms_code'] = "FAILED";
-        $info['email_code'] = "FAILED";
+        $info['sms_code'] = "OK";
+        $info['email_code'] = "OK";
         $receive_user = $this->CI->user_model->get_user_with_user_id($workorder['receive_user_id']);
         if($this->setting['is_sms'] && in_array("10",$workorder['send_type'])){
             $sms_content = '你的工单已由管理员结束,工单ID:'.$workorder['workorder_id'].',工单名称:'.$workorder['workorder_name'].',类型:'.$workorder['type'];
@@ -610,9 +610,9 @@ class Notices{
             if($this->setting['sms_type'] == '10' ){
                 if(send_by_modem($this->setting, $receive_user['mobile'], $sms_content)){
                     $notices_log['status'] = "1";
-                    $info['sms_code'] = "OK";
                 }else{
                     $notices_log['status'] = "0";
+                    $info['sms_code'] = "FAILED";
                     $info['sms_msg'] = "短信发送失败!端口被占用或者配置错误!";
                 }
             }elseif($this->setting['sms_type'] == '20' ){
@@ -624,9 +624,9 @@ class Notices{
                 $resp = $this->Aliyunsms->sendSms($receive_user['mobile'],$this->setting['template_codes'][5],$sms_content);
                 if($resp['Code'] == 'OK'){
                     $notices_log['status'] = "1";
-                    $info['sms_code'] = "OK";
                 }else{
                     $notices_log['status'] = "0";
+                    $info['sms_code'] = "FAILED";
                     $info['sms_msg'] = $resp['Message'];
                 }
             }
@@ -671,9 +671,9 @@ class Notices{
             $resp = $this->CI->mailer->send_email($receive_user['email'],$notices_log['subject'],$notices_log['content']);
             if($resp['code'] == 'OK'){
                 $notices_log['status'] = "1";
-                $info['email_code'] = "OK";
             }else{
                 $notices_log['status'] = "0";
+                $info['email_code'] = "FAILED";
                 $info['email_msg'] = $resp['msg'];
             }
             $notices_log['create_time'] = new MongoDB\BSON\UTCDateTime(time()*1000);

+ 1 - 1
application/views/templates/appauth/index.html

@@ -18,7 +18,7 @@
     <script src="http://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
 </head>
-<body style="background: #fff;">
+<body style="background: #fff;min-width: 1150px;">
 <div style="padding:10px;">
     <div class="panel panel-default grid">
         <div class="panel-body">

+ 1 - 1
application/views/templates/report/index.html

@@ -15,7 +15,7 @@
     <script src="http://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
 </head>
-<body style="background: #fff; min-width: auto;">
+<body style="background: #fff; min-width: 1150px;">
     <div style="padding:10px;">
         <div class="panel panel-default grid">
             <div class="panel-body bottom_line">

+ 1 - 1
application/views/templates/setting/setting.html

@@ -17,7 +17,7 @@
     <script src="http://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
 </head>
-<body style="background: #fff; min-width: auto;">
+<body style="background: #fff; min-width: 1150px;">
 <form class="form-horizontal bv-form" role="form" id="validateform" name="validateform" action="" method="post"
       novalidate="novalidate">
     <input type="hidden" name="setting_id" value="{$setting['setting_id']}">

+ 1 - 1
application/views/templates/template/report.html

@@ -17,7 +17,7 @@
     <script src="http://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
 </head>
-<body style="background: #fff; min-width: auto;">
+<body style="background: #fff; min-width: 1150px;">
 <div style="padding:10px">
     <div class="panel panel-default grid">
         <div class="panel-body">

+ 1 - 1
application/views/templates/template/workorder.html

@@ -17,7 +17,7 @@
     <script src="http://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
 </head>
-<body style="background: #fff; min-width: auto;">
+<body style="background: #fff; min-width: 1150px;">
 <div style="padding:10px">
     <div class="panel panel-default grid">
         <div class="panel-body">

+ 1 - 1
application/views/templates/user/index.html

@@ -18,7 +18,7 @@
     <script src="http://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
 </head>
-<body style="background: #fff;">
+<body style="background: #fff;min-width: 1150px;">
 <div style="padding:10px;">
     <div class="panel panel-default grid">
         <div class="panel-body">

+ 3 - 3
application/views/templates/warning/ignoreindex.html

@@ -17,7 +17,7 @@
     <script src="http://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
 </head>
-<body style="background: #fff;">
+<body style="background: #fff;min-width: 1150px;">
 <div style="padding: 10px;">
     <div class="panel panel-default grid">
         <div class="panel-body">
@@ -54,7 +54,7 @@
                 <th class="text-center">主机等级</th>
                 <th class="text-center">所属分支</th>
                 <th class="text-center col-sm-2">内容</th>
-                <th class="text-center" style="width: 180px;">时间</th>
+                <th class="text-center" style="width: 180px;">忽略时间</th>
                 <th class="text-center">状态</th>
                 <th class="text-center" style="width: 100px">操作</th>
             </tr>
@@ -67,7 +67,7 @@
                 <td class="text-center"><span class="level level{{$val['level']}}">{$warning_level[$val['level']]}</span></td> <!--已失陷、高可疑、高危、中危、低危-->
                 <td data-searchable="true">{if array_key_exists($val['branch']['branch_id'],$branch)}{$branch[$val['branch']['branch_id']]['branch_name']}{else}未配置分支{/if}</td>
                 <td class="col-xs-2"><div class="text_over" style="width: 260px;">{$val['content']}</div></td>
-                <td class="text-center">{if array_key_exists('record_time',$val)}{$val['record_time']|date_format:'%Y-%m-%d %H:%M:%S'}{/if}</td>
+                <td class="text-center">{if array_key_exists('ignore_time',$val)}{$val['ignore_time']->toDatetime()|date_format:'%Y-%m-%d %H:%M:%S'}{/if}</td>
                 <td class="text-center"><span class="w_status{$val['status']}">{$warning_status[$val['status']]}</span></td> <!--待审核下发、已忽略-->
                 <td class="text-center">
                     <a href="javascript:;" data-id="{$val['warning_id']}" class="view_info">

+ 2 - 2
application/views/templates/warning/index.html

@@ -18,7 +18,7 @@
     <script src="http://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
 </head>
-<body style="background: #fff;">
+<body style="background: #fff;min-width: 1150px;">
     <div style="padding:10px;">
         <div class="panel panel-default grid">
             <div class="panel-body">
@@ -83,7 +83,7 @@
                         <th class="text-center">主机等级</th>
                         <th class="text-center">所属分支</th>
                         <th class="text-center col-xs-2">内容</th>
-                        <th class="text-center" style="width: 180px;">时间</th>
+                        <th class="text-center" style="width: 180px;">事件发生时间</th>
                         <th class="text-center">状态</th>
                         <th class="text-center" style="width: 230px">操作</th>
                     </tr>

+ 3 - 3
application/views/templates/warning/view.html

@@ -54,19 +54,19 @@
                 <div class="form-group">
                     <label class="col-xs-2 control-label">设备ID:</label>
                     <div class="col-xs-9">
-                        {if array_key_exists('device_id',$warning['device'])}{$warning['device']['device_id']}{/if}
+                        {if array_key_exists('id',$warning['device'])}{$warning['device']['id']}{/if}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-xs-2 control-label">设备类型:</label>
                     <div class="col-xs-9">
-                        {if array_key_exists('device_type',$warning['device'])}{$warning['device']['device_type']}{/if}
+                        {if array_key_exists('type',$warning['device'])}{$warning['device']['type']}{/if}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-xs-2 control-label">创建时间:</label>
                     <div class="col-xs-9">
-                        {$warning['create_time']->toDateTime()|date_format:'%Y-%m-%d %H:%M:%S'}
+                        {if array_key_exists('record_time',$warning)}{$warning['record_time']|date_format:'%Y-%m-%d %H:%M:%S'}{/if}
                     </div>
                 </div>
                 <div class="form-group">

+ 1 - 1
application/views/templates/workorder/finished.html

@@ -17,7 +17,7 @@
     <script src="http://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
 </head>
-<body style="background: #fff;">
+<body style="background: #fff;min-width: 1150px;">
 <div style="padding:10px;">
     <div class="panel panel-default grid">
         <div class="panel-body">

+ 1 - 1
application/views/templates/workorder/index.html

@@ -17,7 +17,7 @@
     <script src="http://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
 </head>
-<body style="background: #fff;">
+<body style="background: #fff;min-width: 1150px;">
 <div style="padding:10px;">
     <div class="panel panel-default grid">
         <div class="panel-body">

+ 0 - 1
static/css/style.css

@@ -9,7 +9,6 @@ body{
     font-size: 12px;
     line-height: 1.4;
     background: #e9ecef;
-    min-width: 1150px;
     overflow-x: hidden;
 }
 h1{font-size: 40px;}