Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/index.jsp
===================================================================
diff -u -r24445 -r24492
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/index.jsp	(.../index.jsp)	(revision 24445)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/index.jsp	(.../index.jsp)	(revision 24492)
@@ -1,6 +1,7 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
-<DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" " http://www.w3.org/TR/html4/strict.dtd">
+ <!DOCTYPE >
+<!-- <DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" " http://www.w3.org/TR/html4/strict.dtd"> -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -32,6 +33,7 @@
 <script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/ie-6/html5shiv-3.7.3/dist/html5shiv.min.js"></script>
 <script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/ie-6/Respond-master/dest/respond.min.js"></script>
 <style type="text/css">
+    
 	 body{ background-color: #337b47;}
 	*{padding: 0px;margin: 0px;}
 	.caret{border-top: 4px solid #fff !important;}
@@ -132,45 +134,11 @@
 	           </div>
 	           <div class="modal-body">     
 	               <table class="table table-bordered table-hover content-modal-system-warm-table">
-				        <tr>
+				        <tr id="systemWarningTable">
 				        	<th>告警类型</th>
 				        	<th>告警数量</th>
 				        	<th>操作</th>
 				        </tr>
-				        <tr>
-				        	<td>
-				        		<div class="text-center">
-				        	    	即将过期的器械包物品
-				        	    </div>
-				        	</td>
-				        	<td>
-				        		<div>
-				        	    	12316
-				        	    </div>
-				        	</td>
-				        	<td>
-				        		<div>
-				        			<a href="">查看详细</a>
-				        		</div>
-				        	</td>
-				        </tr>
-				        <tr>
-				        	<td>
-				        		<div>
-				        	    	已过期的器械包物品
-				        	    </div>
-				        	</td>
-				        	<td>
-				        		<div>
-				        	    	12316
-				        	    </div>
-				        	</td>
-				        	<td>
-				        		<div>
-				        			<a href="">查看详细</a>
-				        		</div>
-				        	</td>
-				        </tr>
 				    </table>
 	           </div>
 	       </div>
@@ -236,14 +204,10 @@
  <!--    右下角带表格的提示框 -->
  <div class="panel panel-default index-rightbottom-tips">
   	<div class="panel-heading">
-	  	<span class="pull-left">公告1</span>
+	  	<span class="pull-left index-rightbottom-title">公告1</span>
 	  	<span class="pull-right cor" id="closeIndexRightBottomTips">&times;</span>
   	</div>
-  	<div class="panel-body">
-  		Webpack 是当下最热门的前端资源模块化管理和打包工具。它可以将许多松散的模块按照依赖和规则打包成符合生产环境部署的前端资源。
-  		w3schools.com 是最受欢迎的前端技术教程网站，但是国内用户一直不能访问，并且国内的中文翻译版本十分陈旧。因此做了个镜像，希望英文好的同学直接去看原版教程吧！
-  		w3schools.com 是最受欢迎的前端技术教程网站，但是国内用户一直不能访问，并且国内的中文翻译版本十分陈旧。因此做了个镜像，希望英文好的同学直接去看原版教程吧！
-  		w3schools.com 是最受欢迎的前端技术教程网站，但是国内用户一直不能访问，并且国内的中文翻译版本十分陈旧。因此做了个镜像，希望英文好的同学直接去看原版教程吧！
+  	<div class="panel-body index-rightbottom-con">
  	</div>
 </div>
 <!-- jquery 1.9.1 -->
@@ -267,8 +231,8 @@
 <%-- bootstrap-datetimepicker --%>
 <script language="javascript" type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-datetimepicker/branch/js/bootstrap-datetimepicker.js"></script>
 	
-<%-- <!-- 引入mock -->
-<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/mock/mock-min.js"></script> --%>
+<!-- 引入mock -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/mock/mock-min.js"></script>
 
 <!-- 引入自身js -->
 <script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/index/index.js"></script>
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js
===================================================================
diff -u -r24445 -r24492
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js	(.../index.js)	(revision 24445)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js	(.../index.js)	(revision 24492)
@@ -18,7 +18,9 @@
             break;
         }
     }
-    
+    var h = $(window).height();
+    var con_h = h-87-35;
+ 
     if(!hasThisTab){//未添加
     	var tabIdSp = tabId.split("_");
         var modelData = {};
@@ -28,9 +30,14 @@
                break;
            }
         };
-       if (modelData.type == 4 && tabIdSp[1] == "xtgjid") {
-           $("#systemWarning").modal('show');
-           return;
+       if (modelData.type == 4 && tabIdSp[1] == "systemWarning") {
+    	   if(tabIdSp[1] == "systemWarning"){
+    		   $("#systemWarning").modal('show');
+               return;
+    	   }else if(tabIdSp[1] == "satisfactionSurveyTable"){
+    		   
+    	   }
+          
        };
     	
         $("#myTab>li").removeClass("active");
@@ -41,9 +48,11 @@
                         +  "<i onclick=\"closeTab(this,'" +tabId+"')\" class='close-tab'></i>"
                         +  "</a>"
                         +  "</li>";
-        var tabContentHtml = "<div class='tab-pane active' id='"+tabId+"' style='width:100%;height: 100%;'>"
-                           + "<iframe src= '"+url+"'' frameborder='0' scrolling='no' style='width:100%;height: 100%;'></iframe>"
-                           + "</div>";
+   
+        var tabContentHtml = "<div class='tab-pane other-tab active' id='"+tabId+"' style='width:100%;height: 100%;position:fixed; top:122px;'>"
+        + "<iframe src= '"+url+"'' frameborder='0' scrolling='no' style='width:100%;height:100% !important;'></iframe>"
+        + "</div>";
+
         $("#myTab").append(tabHeaderHtml);
         $("#myTabContent").append(tabContentHtml);
     }
@@ -67,17 +76,32 @@
  
    //首页切换屏幕按钮    
     $(".content-index-toggle-off").click(function(){
-        var headHeight = $(".head-index").height();
-        if(headHeight==87){
-        	$(".head-index").hide();
-           	$(".head-index").css({"height":"0"}) 
-            $(this).children("img").attr("src","/dx-disinfectsystem/img/ico4.gif");
-        }else{
-        	
-            $(".head-index").show();
-            $(".head-index").stop(true).animate({"height":"87px"},300);
-            $(this).children("img").attr("src","/dx-disinfectsystem/img/ico3.gif");
-        }
+    	if($("#myTabContent .tab-pane").hasClass("other-tab")){
+    		var headHeight = $(".head-index").height();
+            if(headHeight==87){
+            	$(".head-index").hide();
+               	$(".head-index").css({"height":"0"}) 
+                $(this).children("img").attr("src","/dx-disinfectsystem/img/ico4.gif");
+               	$(".other-tab").css({"top":"35px"});
+            }else{
+                $(".head-index").show();
+             	$(".head-index").css({"height":"87px"}); 
+                $(this).children("img").attr("src","/dx-disinfectsystem/img/ico3.gif");
+                $(".other-tab").css({"top":"122px"});
+            }
+    	}else{
+    		var headHeight = $(".head-index").height();
+            if(headHeight==87){
+            	$(".head-index").hide();
+               	$(".head-index").css({"height":"0"}) 
+                $(this).children("img").attr("src","/dx-disinfectsystem/img/ico4.gif");
+            }else{
+                $(".head-index").show();
+                $(".head-index").stop(true).animate({"height":"87px"},300);
+                $(this).children("img").attr("src","/dx-disinfectsystem/img/ico3.gif");
+            }
+    	}
+    	
     })
 
     //首页修改密码验证
@@ -344,8 +368,8 @@
 
     //获取告警数据
     $.ajax({
-       // url:"/system/systemWarningAction!getSystemWarning.do",
-        //url:"http://gjsj",
+        //url:"/system/systemWarningAction!getSystemWarning.do",
+        url:"http://gjsj",
         type: 'get',
         dataType:'JSON',
         async:false,
@@ -355,19 +379,24 @@
                 // console.log("result"+result);
                 //还有类型。名称
                 //是否有这个告警的每一个都有一个弹框
-                
+            	console.log("menuJsonRows",menuJsonRows);
                 for(var i = 0; i < menuJsonRows.length;i++){
                     var tabId = menuJsonRows[i].itemId;
                     //console.log("tabId数据..."+tabId);
                     //changeTab('menu_xtgjid','系统告警','html/xtgj.html')
                     //var myId = 
-                    if(menuJsonRows[i].type == 4 && tabId == "xtgjid"){
+                    if(menuJsonRows[i].type == 4 ){
+                    	if(tabId == "systemWarning"){
+                    		$("#systemWarningTtitle").text("系统告警");
+                    	}else if(tabId == "satisfactionSurveyTable"){
+                    		$("#systemWarningTtitle").text("满意度调查表");
+                    	}
                         if (result.total == undefined || result.total <= 0) {
 
                         } else if(result.total >= 1 && result.total <= 10) {
-                            $("#menu_" + tabId).append("<p class='content-index-tab-waring-tip'><img width='50'  style='padding-left:5px;' src='/new/xiaoduxt4mock/images/" + result.total + ".gif'></p>");
+                            $("#menu_" + tabId).append("<p class='content-index-tab-waring-tip'><img width='50'  style='padding-left:5px;' src='/dx-disinfectsystem/img/" + result.total + ".gif'></p>");
                             $("#systemWarning").modal('show');
-                            $("#systemWarningTtitle").text("系统告警");
+                           
                             for (var j=0;j<result.rows.length;j++){
                                 var trs="<tr>"
                                     +"<td>"
@@ -383,7 +412,7 @@
                                 $("#systemWarningTable").after(trs);                     
                             }
                         } else if(result.total >= 11) {
-                            $("#menu_" + tabId).append("<p class='content-index-tab-waring-tip'><img src='./images/10+.gif'></p>");
+                            $("#menu_" + tabId).append("<p class='content-index-tab-waring-tip'><img src='/dx-disinfectsystem/img/10+.gif'></p>");
                                 $("#systemWarning").modal('show');
                                 $("#systemWarningTtitle").text("系统告警");
                                 for (var k=0;k<result.rows.length;k++){
@@ -501,7 +530,25 @@
     $("#closeIndexRightBottomTips").click(function(){
     	$(this).parent().parent().fadeOut(200);
     })
-    
+    //右下角内容
+    $.ajax({
+    	url:"http://rightbottom",
+        type: 'post',
+       // data:{departCode}
+        dataType:'JSON',
+        success:function(result){
+        	//var result = JSON.parse(result);
+        	if(result.success == true ){
+        		for(var i=0;i<result.rows.length;i++){
+            		$(".index-rightbottom-title").text(result.rows[i].title);
+            		$(".index-rightbottom-con").text(result.rows[i].content);
+            	}
+        	}else{
+        		alert(result.message);
+        	}
+        	
+        }
+    })
     //退出系统
   /*  $.ajax({
         //url:"http://",
@@ -511,4 +558,7 @@
             window.location.href=""
         }
     })*/
+  /*  var h = $(window).height();
+    var con_h = h-87-35;
+    $(".content-index-tab-content").css({"min-height":con_h+"px","height":con_h+"px"});*/
 })
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js
===================================================================
diff -u -r24450 -r24492
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js	(.../assemblyManagement.js)	(revision 24450)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js	(.../assemblyManagement.js)	(revision 24492)
@@ -306,7 +306,6 @@
 	$('#sterilizationMode').val(sterilizationMode);
 });
 
-
 //灭菌炉
 $.ajax({
 	 url:"/disinfectSystem/baseData/sterilizerController/getAllSterilizer.mhtml",
@@ -371,7 +370,8 @@
 
 $(function(){
   //补充丢失器械按钮弹框
-  $("#addLose").click(function(){
+  $("#addLose").click(function(){ 
+	//$("#simon_test", window.parent.document).css({'background-color':'#000','filter':'alpha(opacity=50)'});
     $('.addLoseModel').modal('show');
     $(".addLoseModel .modal-title").text("器械补充");
     addPaddingBottom("addLoseModel");
