功能修改！

application/controllers/Index.php

@@ -67,7 +67,7 @@ class Index extends Public_Controller {
      */
     public function logout(){
         if($this->session->user_id){
-            $this->session->unset_userdata(array("user_id","current_key","username","user_type"));
+            $this->session->unset_userdata(array("user_id","current_key","username","user_type","from"));
         }
         redirect("login");
     }

application/controllers/Workorder.php

@@ -263,9 +263,17 @@ class Workorder extends MY_Controller
         $index = 0;
         foreach ($warning_type as $key => $val) {
             if ($index < count($warning_type) - 1) {
-                $workorder_warning_type .= $this->warning_type[$val] . "、";
+                if(array_key_exists($val,$this->warning_type)) {
+                    $workorder_warning_type .= $this->warning_type[$val] . "、";
+                }else{
+                    $workorder_warning_type .= $val."、";
+                }
             } else {
-                $workorder_warning_type .= $this->warning_type[$val];
+                if(array_key_exists($val,$this->warning_type)) {
+                    $workorder_warning_type .= $this->warning_type[$val];
+                }else{
+                    $workorder_warning_type .= $val;
+                }
             }
             $index++;
         }

application/core/MY_Controller.php

@@ -8,9 +8,9 @@ class Public_Controller extends CI_Controller
 
     //告警类型
     public $warning_type = array(
-        "10" => "失陷事件",
-        "20" => "脆弱性",
-        "30" => "残余攻击"
+        "10" => "安全事件",
+        //"20" => "脆弱性",
+        //"30" => "残余攻击"
     );
 
     //告警级别

application/views/templates/main.html

@@ -62,7 +62,7 @@
                             <span class="pull-right fa fa-angle-down"></span>
                         </a>
                         <ul id="warnning" class="nav nav-list secondmenu">
-                            <li mid="tab1" funurl="warning/index"><a href="javascript:;" class="active">告警列表</a></li>
+                            <li mid="tab1" funurl="warning/index"><a href="javascript:;">告警列表</a></li>
                             <li mid="tab2" funurl="warning/ignoreindex"><a href="javascript:;">已忽略告警列表</a></li>
                         </ul>
                     </li>
@@ -116,16 +116,17 @@
                     <!-- Nav tabs -->
                     <ul class="nav nav-tabs" role="tablist">
                         <!-- 设置默认的首页标签页，设置noclose样式，则不会被关闭 -->
-                        {if $user_type == "1"}
-                        <li role="presentation" class="active noclose"><a href="#bTabs_tab1" data-toggle="tab">告警列表</a></li>
+                        <!-- {if $user_type == "1"}
+                        <li role="presentation" class="active"><a href="#bTabs_tab1" data-toggle="tab">告警列表</a></li>
                         {else}
-                        <li role="presentation" class="active noclose"><a href="#bTabs_tab3" data-toggle="tab">待处理工单列表</a></li>
-                        {/if}
+                        <li role="presentation" class="active"><a href="#bTabs_tab3" data-toggle="tab">待处理工单列表</a></li>
+                        {/if}-->
+                        <li role="presentation" class="active noclose"><a href="#bTabs_tab0" data-toggle="tab">首页</a></li>
                     </ul>
                     <!-- Tab panes -->
                     <div class="tab-content">
                         <!-- 默认标签页（首页）的内容区域 -->
-                        {if $user_type == "1"}
+                        <!--{if $user_type == "1"}
                         <div class="tab-pane active" id="bTabs_tab1">
                             <iframe frameborder="0" scrolling="yes" style="width:100%;height:100%;border:0px;" src="warning/index"></iframe>
                         </div>
@@ -133,7 +134,14 @@
                         <div class="tab-pane active" id="bTabs_tab3">
                             <iframe frameborder="0" scrolling="yes" style="width:100%;height:100%;border:0px;" src="workorder/index"></iframe>
                         </div>
-                        {/if}
+                        {/if}-->
+                        <div class="tab-pane active" id="bTabs_tab0">
+                            <p>&nbsp;</p>
+                            <p>&nbsp;</p>
+                            <p>
+                            <h2 class="text-center">欢迎使用{$sys_name}</h2>
+                            </p>
+                        </div>
                     </div>
                 </div>
             </div>

application/views/templates/warning/ignoreindex.html

@@ -63,7 +63,7 @@
             {foreach $warning_list as $k=>$val}
             <tr>
                 <td data-searchable="true">{$val['warning_name']}</td>
-                <td class="text-center" data-searchable="true"><span class="level warning_type{$val['type']}">{$warning_type[$val['type']]}</span></td>  <!--失陷事件、脆弱性、残余攻击-->
+                <td class="text-center" data-searchable="true">{if array_key_exists($val['type'],$warning_type)}<span class="level warning_type{$val['type']}">{$warning_type[$val['type']]}</span>{else}未知类型{/if}</td>  <!--失陷事件、脆弱性、残余攻击-->
                 <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="text_over col-sm-2">{$val['content']}</td>

application/views/templates/warning/index.html

@@ -93,7 +93,7 @@
                     <tr>
                         <td class="text-center"><input name="ids[]" value="{$val['warning_id']}" data-branch_id="{$val['branch']['branch_id']}" type="checkbox" {if intval($val['status']) >= 20}disabled{/if}></td>
                         <td data-searchable="true">{$val['warning_name']}</td>
-                        <td class="text-center" data-searchable="true"><span class="level warning_type{$val['type']}">{$warning_type[$val['type']]}</span></td>  <!--失陷事件、脆弱性、残余攻击-->
+                        <td class="text-center" data-searchable="true">{if array_key_exists($val['type'],$warning_type)}<span class="level warning_type{$val['type']}">{$warning_type[$val['type']]}</span>{else}未知类型{/if}</td>  <!--失陷事件、脆弱性、残余攻击-->
                         <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="text_over col-sm-2">{$val['content']}</td>

application/views/templates/workorder/create.html

@@ -32,7 +32,7 @@
                 <div class="form-group">
                     <label class="col-sm-2 control-label"><span>*</span>工单名称：</label>
                     <div class="col-sm-4">
-                        <input name="workorder_name" class="form-control" id="workorder_name" placeholder="" datatype="s" nullmsg="工单名称不能为空！" value="{$workorder_name}" size="45" type="text">
+                        <input name="workorder_name" class="form-control" id="workorder_name" placeholder="" datatype="*" nullmsg="工单名称不能为空！" value="{$workorder_name}" size="45" type="text">
                     </div>
                 </div>
                 <div class="form-group">
@@ -51,7 +51,7 @@
                             {foreach $warning_list as $k=>$val}
                             <tr>
                                 <td><input type="text" class="form-control" name="warning_name[{$val['warning_id']}]" datatype="s" nullmsg="告警名称不能为空！" value="{$val['warning_name']}"></td>
-                                <td class="text-center">{$warning_type[$val['type']]}</td>  <!--失陷事件、脆弱性、残余攻击-->
+                                <td class="text-center">{if array_key_exists($val['type'],$warning_type)}<span class="level warning_type{$val['type']}">{$warning_type[$val['type']]}</span>{else}未知类型{/if}</td>  <!--失陷事件、脆弱性、残余攻击-->
                                 <td class="text-center">{$warning_level[$val['level']]}</td> <!--已失陷、高可疑、高危、中危、低危-->
                                 <td>{$val['create_time']->toDateTime()|date_format:'%Y-%m-%d %H:%M:%S'}</td>
                                 <td><textarea class="form-control" rows="2" name="content[{$val['warning_id']}]" datatype="*" nullmsg="告警内容不能为空！">{$val['content']}</textarea></td>

static/css/style.css

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

static/js/b.tabs.js

@@ -145,7 +145,7 @@
 		openTabs.push(tabId);
 		
 		var openIframe = function(){
-			$(content).append('<iframe frameborder="0" scrolling="yes" style="width:100%;height:100%;border:0px;" src="'+url+'"></iframe>');
+			$(content).append('<iframe frameborder="0" scrolling="yes" style="width:100%;height:100%;min-width:1150px;border:0px;" src="'+url+'"></iframe>');
 		};
 		//进行登录验证
 		if(loginCheck && $.isFunction(loginCheck)){