修改bug

VisualInspection/fis-conf.js

@@ -1,7 +1,7 @@
 // default settings. fis3 release
 
 // Global start
-fis.match('*.{js,css}', {
+fis.match('!js/lib/**.{js,css}', {
     useHash: true
 });
 
@@ -11,7 +11,7 @@ fis.match('*.html', {
 })
 
 fis.match('::image', {
-    useHash: true
+    useHash: false
 });
 
 fis.match('*.js', {
@@ -35,4 +35,6 @@ fis.media('dev')
     });
 
 // extends GLOBAL config
-fis.media('prod');
+fis.media('prod').match('*', {
+        optimizer: null
+    });

VisualInspection/js/appeal_management/appeal_checked.js

@@ -19,8 +19,8 @@ function queryCheckedAppealTask(){
     var cols = [
                 {width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center',field: 'num'},
                 {width: 160, text: '任务名称', type: 'string', flex: true, sort: 'down',field: 'name'},
-                {width: 80, text: '考核人员', type: 'string', flex: true, colClass: '',field: 'checked_person_name'},
-                {width: 160, text: '考核部门', type: 'string', flex: true, sort: 'down',field: 'checked_dept_name'},
+                {width: 80, text: '申诉人员', type: 'string', flex: true, colClass: '',field: 'checked_person_name'},
+                {width: 160, text: '申诉部门', type: 'string', flex: true, sort: 'down',field: 'checked_dept_name'},
                 {width: 80, text: '稽查人员', type: 'string', flex: true, hide: hide,field: 'checkman_name'},
                 {width: 80, text: '复核人员', type: 'string', flex: true, hide: hide,field: 'recheckman_name'},
                 {width: 160, text: '稽查时间段', type: 'string', flex: true, sort: 'down',field: 'check_period'},

VisualInspection/js/config.js

@@ -16,6 +16,7 @@ function getserveraddr(){
     }
     else if(base_ui_url.indexOf("localhost")!=-1){
         return "http://localhost:8089/"
+        // return "http://100.0.0.6:8089/"
     }
     else if(base_ui_url.indexOf("192.168.8.236")!=-1){
         return "http://192.168.8.236:8089/"
@@ -26,10 +27,10 @@ function getserveraddr(){
 }
 function getImageaddr(){
     if(base_ui_url.indexOf("topm.win")!=-1){
-        return "http://file_yanhai.git.topm.win:8080/";
+        return "http://file_yanhai.jsxt.jsjtyxt.com/";
     }
     else if(base_ui_url.indexOf("localhost")!=-1){
-        return "http://file_yanhai.git.topm.win:8080/"
+        return "http://file_yanhai.jsxt.jsjtyxt.com/"
         // return "http://localhost:9080/"
     }else{
         return "http://10.112.0.199/"

VisualInspection/js/lib/kkpager.js

@@ -0,0 +1,333 @@
+/*
+  kkpager V1.3
+  https://github.com/pgkk/kkpager
+
+  Copyright (c) 2013 cqzhangkang@163.com
+  Licensed under the GNU GENERAL PUBLIC LICENSE
+*/
+var kkpager = {
+		pagerid 			: 'kkpager', //divID
+		mode				: 'link', //模式(link 或者 click)
+		pno					: 1, //当前页码
+		total				: 1, //总页码
+		totalRecords		: 0, //总数据条数
+		isShowFirstPageBtn	: true, //是否显示首页按钮
+		isShowLastPageBtn	: true, //是否显示尾页按钮
+		isShowPrePageBtn	: true, //是否显示上一页按钮
+		isShowNextPageBtn	: true, //是否显示下一页按钮
+		isShowTotalPage 	: true, //是否显示总页数
+		isShowCurrPage		: true,//是否显示当前页
+		isShowTotalRecords 	: true, //是否显示总记录数
+		isGoPage 			: true,	//是否显示页码跳转输入框
+		isWrapedPageBtns	: true,	//是否用span包裹住页码按钮
+		isWrapedInfoTextAndGoPageBtn : true, //是否用span包裹住分页信息和跳转按钮
+		hrefFormer			: '', //链接前部
+		hrefLatter			: '', //链接尾部
+		gopageWrapId		: 'kkpager_gopage_wrap',
+		gopageButtonId		: 'kkpager_btn_go',
+		gopageTextboxId		: 'kkpager_btn_go_input',
+		lang				: {
+			firstPageText			: '首页',
+			firstPageTipText		: '首页',
+			lastPageText			: '尾页',
+			lastPageTipText			: '尾页',
+			prePageText				: '上一页',
+			prePageTipText			: '上一页',
+			nextPageText			: '下一页',
+			nextPageTipText			: '下一页',
+			totalPageBeforeText		: '共',
+			totalPageAfterText		: '页',
+			currPageBeforeText		: '当前第',
+			currPageAfterText		: '页',
+			totalInfoSplitStr		: '/',
+			totalRecordsBeforeText	: '共',
+			totalRecordsAfterText	: '条数据',
+			gopageBeforeText		: ' 转到',
+			gopageButtonOkText		: '确定',
+			gopageAfterText			: '页',
+			buttonTipBeforeText		: '第',
+			buttonTipAfterText		: '页'
+		},
+		//链接算法（当处于link模式）,参数n为页码
+		getLink	: function(n){
+			//这里的算法适用于比如：
+			//hrefFormer=http://www.xx.com/news/20131212
+			//hrefLatter=.html
+			//那么首页（第1页）就是http://www.xx.com/news/20131212.html
+			//第2页就是http://www.xx.com/news/20131212_2.html
+			//第n页就是http://www.xx.com/news/20131212_n.html
+			if(n == 1){
+				return this.hrefFormer + this.hrefLatter;
+			}
+			return this.hrefFormer + '_' + n + this.hrefLatter;
+		},
+		//页码单击事件处理函数（当处于mode模式）,参数n为页码
+		click	: function(n){
+			//这里自己实现
+			//这里可以用this或者kkpager访问kkpager对象
+			return false;
+		},
+		//获取href的值（当处于mode模式）,参数n为页码
+		getHref	: function(n){
+			//默认返回'#'
+			return '#';
+		},
+		//跳转框得到输入焦点时
+		focus_gopage : function (){
+			var btnGo = $('#'+this.gopageButtonId);
+			$('#'+this.gopageTextboxId).attr('hideFocus',true);
+			btnGo.show();
+			btnGo.css('left','10px');
+			$('#'+this.gopageTextboxId).addClass('focus');
+			btnGo.animate({left: '+=30'}, 50);
+		},
+		//跳转框失去输入焦点时
+		blur_gopage : function(){
+			var _this = this;
+			setTimeout(function(){
+				var btnGo = $('#'+_this.gopageButtonId);
+				btnGo.animate({
+				    left: '-=25'
+				  }, 100, function(){
+					  btnGo.hide();
+					  $('#'+_this.gopageTextboxId).removeClass('focus');
+				  });
+			},400);
+		},
+		//跳转输入框按键操作
+		keypress_gopage : function(){
+			var event = arguments[0] || window.event;
+			var code = event.keyCode || event.charCode;
+			//delete key
+			if(code == 8) return true;
+			//enter key
+			if(code == 13){
+				kkpager.gopage();
+				return false;
+			}
+			//copy and paste
+			if(event.ctrlKey && (code == 99 || code == 118)) return true;
+			//only number key
+			if(code<48 || code>57)return false;
+			return true;
+		},
+		//跳转框页面跳转
+		gopage : function(){
+			var str_page = $('#'+this.gopageTextboxId).val();
+			if(isNaN(str_page)){
+				$('#'+this.gopageTextboxId).val(this.next);
+				return;
+			}
+			var n = parseInt(str_page);
+			if(n < 1) n = 1;
+			if(n > this.total) n = this.total;
+			if(this.mode == 'click'){
+				this._clickHandler(n);
+			}else{
+				window.location = this.getLink(n);
+			}
+		},
+		//不刷新页面直接手动调用选中某一页码
+		selectPage : function(n){
+			this._config['pno'] = n;
+			this.generPageHtml(this._config,true);
+		},
+		//生成控件代码
+		generPageHtml : function(config,enforceInit){
+			if(enforceInit || !this.inited){
+				this.init(config);
+			}
+			
+			var str_first='',str_prv='',str_next='',str_last='';
+			if(this.isShowFirstPageBtn){
+				if(this.hasPrv){
+					str_first = '<a '+this._getHandlerStr(1)+' title="'
+						+(this.lang.firstPageTipText || this.lang.firstPageText)+'">'+this.lang.firstPageText+'</a>';
+				}else{
+					str_first = '<span class="disabled">'+this.lang.firstPageText+'</span>';
+				}
+			}
+			if(this.isShowPrePageBtn){
+				if(this.hasPrv){
+					str_prv = '<a '+this._getHandlerStr(this.prv)+' title="'
+						+(this.lang.prePageTipText || this.lang.prePageText)+'">'+this.lang.prePageText+'</a>';
+				}else{
+					str_prv = '<span class="disabled">'+this.lang.prePageText+'</span>';
+				}
+			}
+			if(this.isShowNextPageBtn){
+				if(this.hasNext){
+					str_next = '<a '+this._getHandlerStr(this.next)+' title="'
+						+(this.lang.nextPageTipText || this.lang.nextPageText)+'">'+this.lang.nextPageText+'</a>';
+				}else{
+					str_next = '<span class="disabled">'+this.lang.nextPageText+'</span>';
+				}
+			}
+			if(this.isShowLastPageBtn){
+				if(this.hasNext){
+					str_last = '<a '+this._getHandlerStr(this.total)+' title="'
+						+(this.lang.lastPageTipText || this.lang.lastPageText)+'">'+this.lang.lastPageText+'</a>';
+				}else{
+					str_last = '<span class="disabled">'+this.lang.lastPageText+'</span>';
+				}
+			}
+			var str = '';
+			var dot = '<span class="spanDot">...</span>';
+			var total_info='<span class="totalText">';
+			if(this.isShowTotalRecords){
+				total_info += this.lang.totalRecordsBeforeText + '<span class="totalRecordNum">'+this.totalRecords + '</span>' + this.lang.totalRecordsAfterText+',';
+			}
+			var total_info_splitstr = '<span class="totalInfoSplitStr">'+this.lang.totalInfoSplitStr+'</span>';
+			if(this.isShowCurrPage){
+				total_info += this.lang.currPageBeforeText + '<span class="currPageNum">' + this.pno + '</span>' + this.lang.currPageAfterText;
+				if(this.isShowTotalPage){
+					total_info += total_info_splitstr;
+					total_info += this.lang.totalPageBeforeText + '<span class="totalPageNum">'+this.total + '</span>' + this.lang.totalPageAfterText;
+				}else if(this.isShowTotalRecords){
+					total_info += total_info_splitstr;
+					total_info += this.lang.totalRecordsBeforeText + '<span class="totalRecordNum">'+this.totalRecords + '</span>' + this.lang.totalRecordsAfterText;
+				}
+			}else if(this.isShowTotalPage){
+				total_info += this.lang.totalPageBeforeText + '<span class="totalPageNum">'+this.total + '</span>' + this.lang.totalPageAfterText;;
+				if(this.isShowTotalRecords){
+					total_info += total_info_splitstr;
+					total_info += this.lang.totalRecordsBeforeText + '<span class="totalRecordNum">'+this.totalRecords + '</span>' + this.lang.totalRecordsAfterText;
+				}
+			}else if(this.isShowTotalRecords){
+				total_info += this.lang.totalRecordsBeforeText + '<span class="totalRecordNum">'+this.totalRecords + '</span>' + this.lang.totalRecordsAfterText;
+			}
+			total_info += '</span>';
+			
+			var gopage_info = '';
+			if(this.isGoPage){
+				gopage_info = '<span class="goPageBox">'+this.lang.gopageBeforeText+'<span id="'+this.gopageWrapId+'">'+
+					'<input type="button" id="'+this.gopageButtonId+'" onclick="kkpager.gopage()" value="'
+						+this.lang.gopageButtonOkText+'" />'+
+					'<input type="text" id="'+this.gopageTextboxId+'" onfocus="kkpager.focus_gopage()"  onkeypress="return kkpager.keypress_gopage(event);"   onblur="kkpager.blur_gopage()" value="'+this.next+'" /></span>'+this.lang.gopageAfterText+'</span>';
+			}
+			
+			//分页处理
+			if(this.total <= 8){
+				for(var i=1;i<=this.total;i++){
+					if(this.pno == i){
+						str += '<span class="curr">'+i+'</span>';
+					}else{
+						str += '<a '+this._getHandlerStr(i)+' title="'
+							+this.lang.buttonTipBeforeText + i + this.lang.buttonTipAfterText+'">'+i+'</a>';
+					}
+				}
+			}else{
+				if(this.pno <= 5){
+					for(var i=1;i<=7;i++){
+						if(this.pno == i){
+							str += '<span class="curr">'+i+'</span>';
+						}else{
+							str += '<a '+this._getHandlerStr(i)+' title="'+
+								this.lang.buttonTipBeforeText + i + this.lang.buttonTipAfterText+'">'+i+'</a>';
+						}
+					}
+					str += dot;
+				}else{
+					str += '<a '+this._getHandlerStr(1)+' title="'
+						+this.lang.buttonTipBeforeText + '1' + this.lang.buttonTipAfterText+'">1</a>';
+					str += '<a '+this._getHandlerStr(2)+' title="'
+						+this.lang.buttonTipBeforeText + '2' + this.lang.buttonTipAfterText +'">2</a>';
+					str += dot;
+					
+					var begin = this.pno - 2;
+					var end = this.pno + 2;
+					if(end > this.total){
+						end = this.total;
+						begin = end - 4;
+						if(this.pno - begin < 2){
+							begin = begin-1;
+						}
+					}else if(end + 1 == this.total){
+						end = this.total;
+					}
+					for(var i=begin;i<=end;i++){
+						if(this.pno == i){
+							str += '<span class="curr">'+i+'</span>';
+						}else{
+							str += '<a '+this._getHandlerStr(i)+' title="'
+								+this.lang.buttonTipBeforeText + i + this.lang.buttonTipAfterText+'">'+i+'</a>';
+						}
+					}
+					if(end != this.total){
+						str += dot;
+					}
+				}
+			}
+			var pagerHtml = '<div>';
+			if(this.isWrapedPageBtns){
+				pagerHtml += '<span class="pageBtnWrap">' + str_first + str_prv + str + str_next + str_last + '</span>'
+			}else{
+				pagerHtml += str_first + str_prv + str + str_next + str_last;
+			}
+			if(this.isWrapedInfoTextAndGoPageBtn){
+				pagerHtml += '<span class="infoTextAndGoPageBtnWrap">' + total_info + gopage_info + '</span>';
+			}else{
+				pagerHtml += total_info + gopage_info;
+			}
+			pagerHtml += '</div><div style="clear:both;"></div>';
+			$("#"+this.pagerid).html(pagerHtml);
+		},
+		//分页按钮控件初始化
+		init : function(config){
+			this.pno = isNaN(config.pno) ? 1 : parseInt(config.pno);
+			this.total = isNaN(config.total) ? 1 : parseInt(config.total);
+			this.totalRecords = isNaN(config.totalRecords) ? 0 : parseInt(config.totalRecords);
+			if(config.pagerid){this.pagerid = config.pagerid;}
+			if(config.mode){this.mode = config.mode;}
+			if(config.gopageWrapId){this.gopageWrapId = config.gopageWrapId;}
+			if(config.gopageButtonId){this.gopageButtonId = config.gopageButtonId;}
+			if(config.gopageTextboxId){this.gopageTextboxId = config.gopageTextboxId;}
+			if(config.isShowFirstPageBtn != undefined){this.isShowFirstPageBtn=config.isShowFirstPageBtn;}
+			if(config.isShowLastPageBtn != undefined){this.isShowLastPageBtn=config.isShowLastPageBtn;}
+			if(config.isShowPrePageBtn != undefined){this.isShowPrePageBtn=config.isShowPrePageBtn;}
+			if(config.isShowNextPageBtn != undefined){this.isShowNextPageBtn=config.isShowNextPageBtn;}
+			if(config.isShowTotalPage != undefined){this.isShowTotalPage=config.isShowTotalPage;}
+			if(config.isShowCurrPage != undefined){this.isShowCurrPage=config.isShowCurrPage;}
+			if(config.isShowTotalRecords != undefined){this.isShowTotalRecords=config.isShowTotalRecords;}
+			if(config.isWrapedPageBtns){this.isWrapedPageBtns=config.isWrapedPageBtns;}
+			if(config.isWrapedInfoTextAndGoPageBtn){this.isWrapedInfoTextAndGoPageBtn=config.isWrapedInfoTextAndGoPageBtn;}
+			if(config.isGoPage != undefined){this.isGoPage=config.isGoPage;}
+			if(config.lang){
+				for(var key in config.lang){
+					this.lang[key] = config.lang[key];
+				}
+			}
+			this.hrefFormer = config.hrefFormer || '';
+			this.hrefLatter = config.hrefLatter || '';
+			if(config.getLink && typeof(config.getLink) == 'function'){this.getLink = config.getLink;}
+			if(config.click && typeof(config.click) == 'function'){this.click = config.click;}
+			if(config.getHref && typeof(config.getHref) == 'function'){this.getHref = config.getHref;}
+			if(!this._config){
+				this._config = config;
+			}
+			//validate
+			if(this.pno < 1) this.pno = 1;
+			this.total = (this.total <= 1) ? 1: this.total;
+			if(this.pno > this.total) this.pno = this.total;
+			this.prv = (this.pno<=2) ? 1 : (this.pno-1);
+			this.next = (this.pno >= this.total-1) ? this.total : (this.pno + 1);
+			this.hasPrv = (this.pno > 1);
+			this.hasNext = (this.pno < this.total);
+			
+			this.inited = true;
+		},
+		_getHandlerStr : function(n){
+			if(this.mode == 'click'){
+				return 'href="'+this.getHref(n)+'" onclick="return kkpager._clickHandler('+n+')"';
+			}
+			//link模式，也是默认的
+			return 'href="'+this.getLink(n)+'"';
+		},
+		_clickHandler	: function(n){
+			var res = false;
+			if(this.click && typeof this.click == 'function'){
+				res = this.click.call(this,n) || false;
+			}
+			return res;
+		}
+};

VisualInspection/js/lib/mytable.js

@@ -141,7 +141,7 @@
                         var oper = cols[i].oper;
                         var operStr="";
                         for(var j=0;j<oper.length;j++){
-                            operStr+='<a href="#" onclick="'+oper[j].func+'('+obj[cols[i].field]+','+obj[cols[i].field_other]+')"><i class="icon '+oper[j].icon_class+'"></i>&nbsp;'+oper[j].text+' </a>&nbsp;';
+                            operStr+='<a href="javascript:void(0)" onclick="'+oper[j].func+'('+obj[cols[i].field]+','+obj[cols[i].field_other]+')"><i class="icon '+oper[j].icon_class+'"></i>&nbsp;'+oper[j].text+' </a>&nbsp;';
                         }
                         dArr.push(operStr);
                     }else{
@@ -199,6 +199,7 @@
                 pno : p_cur,
                 total : p_pages,
                 totalRecords : p_totalRecords,
+                isShowTotalRecords:true,
                 mode : 'click',
                 click : function(n){
                     obj.options.pager.p_cur = n;

VisualInspection/js/main.js

@@ -163,10 +163,12 @@ function changePage(url) {
             // $("#breadcrumb_menu").html('<li murl="'+url+'" mname="'+name+'"><a href="#" onclick="changePage('+url+')">'+name+'</a></li>');
             addBreadMenu(url, name, true);
         }
-        event = document.createEvent('MessageEvent');
-        var origin = window.location.protocol + '//' + window.location.host;
-        event.initMessageEvent('changepage', true, true, CURRENT_PAGE_URL, origin, 1234, window, null);
-        document.dispatchEvent(event);
+        if(ISCLIENT) {
+            event = document.createEvent('MessageEvent');
+            var origin = window.location.protocol + '//' + window.location.host;
+            event.initMessageEvent('changepage', true, true, CURRENT_PAGE_URL, origin, 1234, window, null);
+            document.dispatchEvent(event);
+        }
     }
 }
 

VisualInspection/js/mytask/check.js

@@ -9,13 +9,12 @@ function initCheck() {
 
     $("#tabcontent").css("height", ($("#video_content").height() - 80) + "px");
 
-
-
-    event = document.createEvent('MessageEvent');
-    var origin = window.location.protocol + '//' + window.location.host;
-    event.initMessageEvent('setvideoposition', true, true, getVideoPosition(null), origin, 1234, window, null);
-    document.dispatchEvent(event);
-
+    if(ISCLIENT) {
+        event = document.createEvent('MessageEvent');
+        var origin = window.location.protocol + '//' + window.location.host;
+        event.initMessageEvent('setvideoposition', true, true, getVideoPosition(null), origin, 1234, window, null);
+        document.dispatchEvent(event);
+    }
 
 
 
@@ -46,6 +45,7 @@ function initCheck() {
     if ($.checkTask) {
         initCheckAppealBtns();
         setFeSelect("#fsList", $.checkTask.checked_dept);
+        // setFeeUserSelect("#check_checked_person_select", $.checkTask.checked_person);
         // $("#fsList").on("change",function(){
         //     $.checkTask.checked_dept = this.value;
         // })
@@ -239,7 +239,7 @@ function queryCheckScores() {
     }
     );
 }
-function showEditPic(){
+function showEditPic(id){
     var rowData = getItemByIdFromArr(id, $('#score_datatable').mytable('getTableData'));
     showPics(rowData.pics);
     $("#saveEditBtn").show();
@@ -250,29 +250,40 @@ function showEditCheckScore(id) {
     var rowData = getItemByIdFromArr(id, $('#score_datatable').mytable('getTableData'));
     scoreDetailLayer = showPopup4Common('修改考核项',function(data){
        saveScoreEdit();
-    },['350px','400px'],'#score-detail-div','r');
+    },['350px','500px'],'#score-detail-div','r');
     
     $("#score_id_text").val(rowData.id);
     $("#check_item_text").val(rowData.content);
     $("#check_score_text").val(rowData.check_item_score);
     $("#check_remark_text").val(rowData.remark);
+    setFeeUserSelect("#check_checked_person_select",rowData.checked_person);
+    // $("#check_checked_person_select").val(rowData.checked_person);
+}
+function setFeeUserSelect(div,selectId){
     var param = {
         'organid': $.checkTask.checked_dept
     };
-    post_common_service("/user/getUserList/", param, function (data) {
-        setFeeUserSelect("#check_checked_person_select",rowData.checked_person,data);
+    post_common_service("/user/getUserList/", param, function (userList) {
+        // setFeeUserSelect("#check_checked_person_select",rowData.checked_person,data);
+        var optStr = '';
+        for(var i in userList) {
+            if(userList[i].id==selectId)
+                optStr += '<option value="'+userList[i].id+'" selected="selected">'+userList[i].truename+'</option>';
+            else
+                optStr += '<option value="'+userList[i].id+'">'+userList[i].truename+'</option>';
+        }
+        $(div).html('');
+        $(div).html(optStr);
+        alert("fff");
+        $('#check_checked_person_select').chosen({
+            // width:'200px',
+            height:'100px',
+            no_results_text: '没有找到',    // 当检索时没有找到匹配项时显示的提示文本
+            disable_search_threshold: 10, // 10 个以下的选择项则不显示检索框
+            search_contains: true         // 从任意位置开始检索
+        });
     });
-}
-function setFeeUserSelect(div,selectId,userList){
-    var optStr = '';
-    for(var i in userList) {
-        if(userList[i].deptid==selectId)
-            optStr += '<option value="'+userList[i].id+'" selected="selected">'+userList[i].truename+'</option>';
-        else
-            optStr += '<option value="'+userList[i].id+'">'+userList[i].truename+'</option>';
-    }
-    $(div).html('');
-    $(div).html(optStr);
+
 }
 function saveScoreEdit(){
     var param = {

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -206,6 +206,7 @@
         $("#save_user_class").click(function(){
 
             var now_date = new Date();
+            now_date.setDate(now_date.getDate()-1);
             if(now_date.Format('yyyy-MM-dd') > $("#save_user_class").data("work_date") ){
                 tip("不能生成过期的排班");
                 return ;
@@ -229,7 +230,7 @@
                             var end_time =  $("#save_user_class").data("work_date")+classCode[j].end_time+":00";
 
                             // 这边需要
-                            // console.log($(".tr-"+j+" td select").eq(i).data("data"));
+                            // console.log("放辣椒"+$(".tr-"+j+" td select").eq(i).data("data"));
                             var list = $(".tr-"+j+" td select").eq(i).data("data");
                             var obj = {"list":list , "work_date":work_date,"dept_id":cache.dept_id,"user_id": $(".tr-"+j+" td select").eq(i).val() , "class_type":j,"team_id":cache.team_id,"start_time":start_time, "end_time":end_time,"lane":$(".tr-"+j+" td select").eq(i).parent().attr('tag') };
                             dutyList.push(obj);
@@ -420,7 +421,7 @@
                                     selectv += ("<option value='"+data[i].users[j].id+"'>"+ data[i].users[j].truename  +"</option>");
                             }
                             selectv += "</select> <i title='顶班详情' alt='顶班详情' class='icon icon-tags i-self' style='float:right;margin-top:7px;'></i>";
-                            selectv += "<label>"+ct+"</label>"
+                            // selectv += "<label>"+ct+"</label>"
                             $(".tr-"+ct).append("<td style='vertical-align:middle;width:107px;padding:2px;' class='c-"+ct+"-0' tag='0'>"+ selectv +"</td>")
                             for(var z=0;z<entrance_number;z++){
                                 $(".tr-"+ct).append("<td style='vertical-align:middle;width:107px;padding:2px;' class='c-"+ct+"-"+(z+1)+"' tag='"+(z+1)+"'>"+ selectv +"</td>")

VisualInspection/view/appeal_management/appeal_checked.html

@@ -1,4 +1,4 @@
-<script src="/js/appeal_management/appeal_checked.js"></script> 
+<script src="/js/appeal_management/appeal_checked.js?__inline"></script> 
 <div class="container-fluid ">
     <div class="row">
         <form  class="form-horizontal">

VisualInspection/view/appeal_management/appeal_submited.html

@@ -1,4 +1,4 @@
-<script src="/js/appeal_management/appeal_submited.js"></script> 
+<script src="/js/appeal_management/appeal_submited.js?__inline"></script> 
 <div class="container-fluid ">
     <div class="row">
         <form  class="form-horizontal">

VisualInspection/view/assess_management/assess_item.html

@@ -1,5 +1,5 @@
 <link rel="stylesheet" type="text/css" href="/css/user/userManager.css?__inline">
-<script type="text/javascript" src="/node_modules/zui/dist/lib/dashboard/zui.dashboard.min.js?__inline"></script>
+<script type="text/javascript" src="/node_modules/zui/dist/lib/dashboard/zui.dashboard.min.js"></script>
 <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/dashboard/zui.dashboard.min.css">
 <script type="text/javascript" src="/js/assess_management/assess_item.js?__inline"></script>
 <div class="container-fluid ">

VisualInspection/view/assess_management/assess_way.html

@@ -72,7 +72,7 @@
         </div>
 
 <script src="/js/assess_management/assess_way.js?_inline"></script>
-<script type="text/javascript" src="/node_modules/zui/dist/lib/dashboard/zui.dashboard.min.js?__inline"></script>
+<script type="text/javascript" src="/node_modules/zui/dist/lib/dashboard/zui.dashboard.min.js"></script>
 <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/dashboard/zui.dashboard.min.css">
 <style type="text/css">
     td.modity-flag{

VisualInspection/view/common/commoncsslink.html

@@ -9,3 +9,4 @@
 <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/calendar/zui.calendar.css">
 <link rel="stylesheet" type="text/css" href="/js/lib/webuploader/webuploader.css">  
 <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/uploader/zui.uploader.min.css">
+<link href="/node_modules/zui/dist/lib/chosen/chosen.min.css" rel="stylesheet">

VisualInspection/view/common/commonscriptlink.html

@@ -6,6 +6,7 @@
 <script src="/node_modules/zui/dist/lib/datatable/zui.datatable.min.js"></script>
 <script src="/node_modules/zui/dist/lib/calendar/zui.calendar.js"></script>
 <script src="/node_modules/zui/dist/lib/uploader/zui.uploader.min.js"></script>
+<script src="/node_modules/zui/dist/lib/chosen/chosen.min.js"></script>
 <!--<script src="/node_modules/zui/dist/lib/mytable/mytable.js"></script>  -->
 <script src="/js/lib/mytable.js"></script>
 <script src="/node_modules/moment/min/moment.min.js"></script>
@@ -15,7 +16,7 @@
 <script src="/js/lib/layer/layer.js"></script>
 <script src="/node_modules/ztree/js/jquery.ztree.all.min.js"></script>
 <script src="/js/lib/treeSelect.js"></script>
-<script src="/js/lib/kkpager.min.js"></script>
+<script src="/js/lib/kkpager.js"></script>
 <script src="/js/lib/slide/js/bootstrap-slider.min.js"></script>
 <script src="/js/lib/webuploader/webuploader.js"></script>
 <script src="/js/util/util.js"></script>

VisualInspection/view/menu/menu.html

@@ -1,8 +1,8 @@
  
 <!--<link rel="stylesheet" type="text/css" href="/css/user/userManager.css?__inline">-->
-<script type="text/javascript" src="/node_modules/zui/dist/lib/dashboard/zui.dashboard.min.js?__inline"></script>
+<script type="text/javascript" src="/node_modules/zui/dist/lib/dashboard/zui.dashboard.min.js"></script>
 <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/dashboard/zui.dashboard.min.css">
-<script src="/js/menu/menu.js"></script>
+<script src="/js/menu/menu.js?__inline"></script>
 <div class="container-fluid ">
     <div id="dashboard" class="dashboard dashboard-draggable" data-height="500">
         <div class="row">

VisualInspection/view/mum.html

@@ -1,4 +1,4 @@
-<link rel="stylesheet" type="text/css" href="/css/mum.css">
+<link rel="stylesheet" type="text/css" href="/css/mum.css?__inline">
 <nav class="menu" data-ride="menu">
     <ul id="treeMenu" class="tree tree-menu" data-ride="tree">
     </ul>

VisualInspection/view/mytask/apply_task.html

@@ -1,4 +1,4 @@
-<script src="/js/mytask/apply_task.js"></script>
+<script src="/js/mytask/apply_task.js?__inline"></script>
 <div class="container-fluid ">
     <div class="row">
         <form  class="form-horizontal">

VisualInspection/view/mytask/checked.html

@@ -1,4 +1,4 @@
-<script src="/js/mytask/checked.js"></script> 
+<script src="/js/mytask/checked.js?__inline"></script> 
 <div class="container-fluid ">
     <div class="row">
         <form  class="form-horizontal">

VisualInspection/view/mytask/scoreDetail.html

@@ -10,13 +10,13 @@
         <div class="form-group">
             <label for="exampleInputAccount1" class="col-md-3">分数</label>
             <div class="col-md-9">
-                <input type="text" class="form-control" id="check_score_text"  placeholder="">
+                <input type="text" class="form-control" id="check_score_text" placeholder="">
             </div>
         </div>
         <div class="form-group">
             <label class="col-md-3">考核人</label>
             <div class="col-md-9">
-                <select class="form-control" id="check_checked_person_select">
+                <select  class="chosen-select form-control col-md-12" id="check_checked_person_select">
                 </select>
             </div>
         </div>

VisualInspection/view/mytask/task_list.html

@@ -1,4 +1,4 @@
-<script src="/js/mytask/task_list.js"></script> 
+<script src="/js/mytask/task_list.js?__inline"></script> 
 <div class="container-fluid ">
     <div class="row">
         <form  class="form-horizontal" style="margin:0px;">

VisualInspection/view/statistics/assess_situation.html

@@ -1,4 +1,4 @@
-<script src="/js/statistics/assess_situation.js"></script>
+<script src="/js/statistics/assess_situation.js?__inline"></script>
 <link rel="stylesheet" type="text/css" href="/css/statistics/assess_situation.css">
 <div class="container-fluid ">
     <div class="form-div">

VisualInspection/view/statistics/emp_ranking.html

@@ -1,4 +1,4 @@
-<script src="/js/statistics/assess_ranking.js"></script>
+<script src="/js/statistics/assess_ranking.js?__inline"></script>
 <link rel="stylesheet" type="text/css" href="/css/statistics/assess_situation.css">
 <div class="container-fluid ">
     <div class="form-div">

VisualInspection/view/term_management/charge_stuff_schedule.html

@@ -151,7 +151,7 @@
 
 <!--<link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/calendar/zui.calendar.css">   
 <script src="/node_modules/zui/dist/lib/calendar/zui.calendar.js"></script>
-<script src="/js/teamClass/charge_team_schedule.js"></script>-->
+<script src="/js/teamClass/charge_team_schedule.js?__inline"></script>-->
 
 <style type="text/css" >
     span.time{
@@ -179,8 +179,8 @@
     $(document).ready(function() {
         initChargeTeamSchedule();
 
-        jeDate({ dateCell:"#start_time", format:"hh:mm:00", isTime:true,festival: true,isinitVal: true,zIndex:99999999});
-        jeDate({ dateCell:"#end_time", format:"hh:mm:00", isTime:true,festival: true,isinitVal: true,zIndex:99999999 });
+        jeDate({ dateCell:"#start_time", format:"YYYY-MM-DD hh:mm", isTime:true,festival: true,isinitVal: true,zIndex:99999999});
+        jeDate({ dateCell:"#end_time", format:"YYYY-MM-DD hh:mm", isTime:true,festival: true,isinitVal: true,zIndex:99999999 });
   
     })
 </script>

VisualInspection/view/term_management/check_stuff_schedule.html

@@ -59,7 +59,7 @@
 <script type="text/javascript" src="/js/lib/combotree/comboTreePlugin.js?__inline"></script>
 <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/calendar/zui.calendar.css">   
 <script src="/node_modules/zui/dist/lib/calendar/zui.calendar.js"></script>
-<script src="/js/teamClass/check_team_schedule.js"></script>
+<script src="/js/teamClass/check_team_schedule.js?__inline"></script>
 <style type="text/css" >
     span.time{
         display: none !important ;

VisualInspection/view/user/login.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <title>登录</title>
     <link rel="import" href="/view/common/commoncsslink.html?__inline">
-    <link rel="stylesheet" type="text/css" href="/css/user/login.css">
+    <link rel="stylesheet" type="text/css" href="/css/user/login.css?__inline">
 </head>
 
 <body>