Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/common/common-tools.js =================================================================== diff -u --- ssts-web/src/main/webapp/dx-disinfectsystem/js/common/common-tools.js (revision 0) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/common/common-tools.js (revision 24437) @@ -0,0 +1,447 @@ + +(function() { + var Tools = Tools || {}; + + Tools.StringUtils = { + //为空 + isEmpty: function(input) { + return input == null || input == ''; + }, + //数字 + isNumeric: function(input) { + return /^(?:[1-9]\d*|0)(?:\.\d+)?$/.test(input); + } + } + + Tools.BrowserTypeUtils={ + + //判断当前浏览类型 + browserType:function(){ + var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串 + var isOpera = userAgent.indexOf("Opera") > -1; //判断是否Opera浏览器 + var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1 && !isOpera; //判断是否IE浏览器 + var isEdge = userAgent.indexOf("Windows NT 6.1; Trident/7.0;") > -1 && !isIE; //判断是否IE的Edge浏览器 + var isFF = userAgent.indexOf("Firefox") > -1; //判断是否Firefox浏览器 + var isSafari = userAgent.indexOf("Safari") > -1 && userAgent.indexOf("Chrome") == -1; //判断是否Safari浏览器 + var isChrome = userAgent.indexOf("Chrome") > -1 && userAgent.indexOf("Safari") > -1; //判断Chrome浏览器 + + if (isIE){ + var reIE = new RegExp("MSIE (\\d+\\.\\d+);"); + reIE.test(userAgent); + var fIEVersion = parseFloat(RegExp["$1"]); + if(fIEVersion == 7) + { return "IE7";} + else if(fIEVersion == 8) + { return "IE8";} + else if(fIEVersion == 9) + { return "IE9";} + else if(fIEVersion == 10) + { return "IE10";} + else if(fIEVersion == 11) + { return "IE11";} + else + { return "0"}//IE版本过低 + }//isIE end + + if (isFF) { return "FF";} + if (isOpera) { return "Opera";} + if (isSafari) { return "Safari";} + if (isChrome) { return "Chrome";} + if (isEdge) { return "Edge";} + },//myBrowser() end + + //判断是否是IE浏览器 + isIE:function(){ + var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串 + var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1 && !isOpera; //判断是否IE浏览器 + if(isIE) + { + return "1"; + } + else + { + return "-1"; + } + }, + //判断是否是IE浏览器，包括Edge浏览器 + IEVersion:function(){ + var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串 + var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1 && !isOpera; //判断是否IE浏览器 + var isEdge = userAgent.indexOf("Windows NT 6.1; Trident/7.0;") > -1 && !isIE; //判断是否IE的Edge浏览器 + if(isIE) + { + var reIE = new RegExp("MSIE (\\d+\\.\\d+);"); + reIE.test(userAgent); + var fIEVersion = parseFloat(RegExp["$1"]); + if(fIEVersion == 7) + { return "IE7";} + else if(fIEVersion == 8) + { return "IE8";} + else if(fIEVersion == 9) + { return "IE9";} + else if(fIEVersion == 10) + { return "IE10";} + else if(fIEVersion == 11) + { return "IE11";} + else + { return "0"}//IE版本过低 + } + else if(isEdge) + { + return "Edge"; + } + else + { + return "-1";//非IE + } + } + } + + + Tools.formVerifyUtils={ + /** + * 所有参数不能同时为空 + * 验证结对时间1.结对时间不能单独为空，2.结束时间必须大于开始时间：timeEleIdArray:[{startTimeEleId:'',endTimeEleId：''},{startTimeEleId1：'',endTimeEleId1：''}] + * 必须填写的元素:notAllowEmptyEleIdArray:["","",""] + * 验证字符串1.结对时间都为空时，字符串内容至少有一个不为空：otherEleIdArray otherEleIdArray:['str1','str2'] + */ + verifyTimeAndStr:function(timeEleIdArray,notAllowEmptyEleIdArray,otherEleIdArray){ + var result=true; //result:"false"不满足条件 + var isAllEmpty=true; + + if(!Tools.StringUtils.isEmpty(notAllowEmptyEleIdArray)){ +// isAllEmpty=false; + + } + + + if(!Tools.StringUtils.isEmpty(timeEleIdArray)){ + for(var i=0;itime2 return 1 + * time1 t2) { + return 1; + } + return -1; + }, + //是否闰年 + isLeapYear: function(year) { + return((year % 4 === 0 && year % 100 !== 0) || year % 400 === 0); + }, + + //获取某个月的天数，从0开始 + getDaysOfMonth: function(year, month) { + return [31, (this.isLeapYear(year) ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month]; + }, + + getDaysOfMonth2: function(year, month) { + // 将天置为0，会获取其上个月的最后一天 + month = parseInt(month) + 1; + var date = new Date(year, month, 0); + return date.getDate(); + }, + + /*距离现在几天的日期：负数表示今天之前的日期，0表示今天，整数表示未来的日期 + * 如-1表示昨天的日期，0表示今天，2表示后天 + */ + fromToday: function(days) { + var today = new Date(); + today.setDate(today.getDate() + days); + var date = today.getFullYear() + "-" + (today.getMonth() + 1) + "-" + today.getDate(); + return date; + }, + + /** + * 日期时间格式化 + * @param {Object} dateTime 需要格式化的日期时间 + * @param {String} pattern 格式化的模式，如yyyy-MM-dd hh(HH):mm:ss.S a k K E D F w W z Z + */ + formt: function(dateTime, pattern) { + var date = new Date(dateTime); + if(Tools.StringUtils.isBlank(pattern)) { + return date.toLocaleString(); + } + return pattern.replace(/([a-z])\1*/ig, function(matchStr, group1) { + var replacement = ""; + switch(group1) { + case Tools.DateUtils.patterns.PATTERN_ERA: //G + break; + case Tools.DateUtils.patterns.PATTERN_WEEK_YEAR: //Y + case Tools.DateUtils.patterns.PATTERN_YEAR: //y + replacement = date.getFullYear(); + break; + case Tools.DateUtils.patterns.PATTERN_MONTH: //M + var month = date.getMonth() + 1; + replacement = (month < 10 && matchStr.length >= 2) ? "0" + month : month; + break; + case Tools.DateUtils.patterns.PATTERN_DAY_OF_MONTH: //d + var days = date.getDate(); + replacement = (days < 10 && matchStr.length >= 2) ? "0" + days : days; + break; + case Tools.DateUtils.patterns.PATTERN_HOUR_OF_DAY1: //k(1~24) + var hours24 = date.getHours(); + replacement = hours24; + break; + case Tools.DateUtils.patterns.PATTERN_HOUR_OF_DAY0: //H(0~23) + var hours24 = date.getHours(); + replacement = (hours24 < 10 && matchStr.length >= 2) ? "0" + hours24 : hours24; + break; + case Tools.DateUtils.patterns.PATTERN_MINUTE: //m + var minutes = date.getMinutes(); + replacement = (minutes < 10 && matchStr.length >= 2) ? "0" + minutes : minutes; + break; + case Tools.DateUtils.patterns.PATTERN_SECOND: //s + var seconds = date.getSeconds(); + replacement = (seconds < 10 && matchStr.length >= 2) ? "0" + seconds : seconds; + break; + case Tools.DateUtils.patterns.PATTERN_MILLISECOND: //S + var milliSeconds = date.getMilliseconds(); + replacement = milliSeconds; + break; + case Tools.DateUtils.patterns.PATTERN_DAY_OF_WEEK: //E + var day = date.getDay(); + replacement = Tools.DateUtils.week['ch'][day]; + break; + case Tools.DateUtils.patterns.PATTERN_DAY_OF_YEAR: //D + replacement = Tools.DateUtils.dayOfTheYear(date); + break; + case Tools.DateUtils.patterns.PATTERN_DAY_OF_WEEK_IN_MONTH: //F + var days = date.getDate(); + replacement = Math.floor(days / 7); + break; + case Tools.DateUtils.patterns.PATTERN_WEEK_OF_YEAR: //w + var days = Tools.DateUtils.dayOfTheYear(date); + replacement = Math.ceil(days / 7); + break; + case Tools.DateUtils.patterns.PATTERN_WEEK_OF_MONTH: //W + var days = date.getDate(); + replacement = Math.ceil(days / 7); + break; + case Tools.DateUtils.patterns.PATTERN_AM_PM: //a + var hours24 = date.getHours(); + replacement = hours24 < 12 ? "\u4e0a\u5348" : "\u4e0b\u5348"; + break; + case Tools.DateUtils.patterns.PATTERN_HOUR1: //h(1~12) + var hours12 = date.getHours() % 12 || 12; //0转为12 + replacement = (hours12 < 10 && matchStr.length >= 2) ? "0" + hours12 : hours12; + break; + case Tools.DateUtils.patterns.PATTERN_HOUR0: //K(0~11) + var hours12 = date.getHours() % 12; + replacement = hours12; + break; + case Tools.DateUtils.patterns.PATTERN_ZONE_NAME: //z + replacement = Tools.DateUtils.getZoneNameValue(date)['name']; + break; + case Tools.DateUtils.patterns.PATTERN_ZONE_VALUE: //Z + replacement = Tools.DateUtils.getZoneNameValue(date)['value']; + break; + case Tools.DateUtils.patterns.PATTERN_ISO_DAY_OF_WEEK: //u + break; + case Tools.DateUtils.patterns.PATTERN_ISO_ZONE: //X + break; + default: + break; + } + return replacement; + }); + }, + + /** + * 计算一个日期是当年的第几天 + * @param {Object} date + */ + dayOfTheYear: function(date) { + var obj = new Date(date); + var year = obj.getFullYear(); + var month = obj.getMonth(); //从0开始 + var days = obj.getDate(); + var daysArr = [31, (this.isLeapYear(year) ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]; + for(var i = 0; i < month; i++) { + days += daysArr[i]; + } + return days; + }, + //获得时区名和值 + getZoneNameValue: function(dateObj) { + var date = new Date(dateObj); + date = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate())); + var arr = date.toString().match(/([A-Z]+)([-+]\d+:?\d+)/); + var obj = { + 'name': arr[1], + 'value': arr[2] + }; + return obj; + } + }; + + window['Tools'] = Tools; +})(); Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/common/dingxiang-common.css =================================================================== diff -u -r24187 -r24437 --- ssts-web/src/main/webapp/dx-disinfectsystem/css/common/dingxiang-common.css (.../dingxiang-common.css) (revision 24187) +++ ssts-web/src/main/webapp/dx-disinfectsystem/css/common/dingxiang-common.css (.../dingxiang-common.css) (revision 24437) @@ -26,9 +26,6 @@ } .dx-btn-primary { - /*color: #666;*/ - background-color: #73B043; - background-color: #73B043; border-color: #EEE; font-weight: 400; @@ -76,6 +73,56 @@ } +.dx-btn-default { + color: #333; + background-color: #fff; + border-color: #ccc; + + font-weight: 400; + font-size: 14px; + text-decoration: none; + text-align: center; + line-height: 26px; + height: 34px; + padding: 0 10px; + margin: 0; + margin-left: 10px; + display: inline-block; + appearance: none; + cursor: pointer; + border: none; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + -webkit-transition-property: all; + transition-property: all; + + -webkit-animation-duration: 3s; + animation-duration: 3s; + -webkit-animation-iteration-count: infinite; + animation-iteration-count: infinite; + -webkit-animation-name: glowing; + animation-name: glowing; + border-radius: 6px; + color: white; + border-width: 2px; + border-style: solid; + } + + +.dx-btn-default:hover{ + color: #333; + background-color: #e6e6e6; + border-color: #8c8c8c; +} + +.dx-btn-default:active{ + color: #333; + background-color: #e6e6e6; + border-color: #adadad; +} + + .dx-btn-lg{ height: 38px; } Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/recyclingApplication/recyclingApplication.css =================================================================== diff -u -r24187 -r24437 --- ssts-web/src/main/webapp/dx-disinfectsystem/css/recyclingApplication/recyclingApplication.css (.../recyclingApplication.css) (revision 24187) +++ ssts-web/src/main/webapp/dx-disinfectsystem/css/recyclingApplication/recyclingApplication.css (.../recyclingApplication.css) (revision 24437) @@ -59,9 +59,18 @@ margin-top: 10px; }*/ -.form-control{ - height:25px; +.form-input { + height:25px !important; + line-height:1 !important; } + +/*可编辑下拉框组合中input css*/ +.form-input2{ + height:21px !important; + line-height:1 !important; + width:calc(100% - 20px) !important; +} + .form-control:focus { /*border-color: #2BA245;*/ border-color: #73B043; @@ -115,17 +124,33 @@ } .content-table{ - /*overflow: scroll;*/ position: absolute; bottom: 50px; left: 0; right: 0; top: 148px; } +.content-modal-tousse-modal-footer{ + margin-top:15px; + margin-bottom:15px; +} + +.table_div{ + overflow: hidden; +} +/*搜索表单消除栅格系统padding-left属性*/ +.search-div-input{ + padding-left:0; +} + +/**更多查询*/ +.search-more-body-label{ + text-align:left; +} .fixed-table-pagination{ position: fixed; - bottom: 0; + bottom: 120px; left: 0; right: 0; /* top: 150px;*/ @@ -148,3 +173,39 @@ .content-toolbar-container{ background-color:#C6E3CA; } + +/* 解决引入select2后高度问题 */ +.select2-container .select2-selection--multiple{ + min-height:5px; +} + +.select2-container .select2-search--inline .select2-search__field{ + margin-top:0px; +} + +.select2-search__field{ + height:auto; +} + +.select2-container--default .select2-selection--multiple:focus { + border-color: #73B043; +} + +.editable-click{ + border-bottom: none !important; +} + +/*外来器械申请表单间距调整*/ +.form-group2{ + margin-bottom: 8px !important; +} +.content-modal-tousse-modal-footer{ + margin-top: 0 !important; +} +/*解决外来器械‘添加’按钮添加二字显示不出*/ +.foreignTousse-add{ + padding-left: 0 !important; +} + + + Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp =================================================================== diff -u -r24187 -r24437 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 24187) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 24437) @@ -5,7 +5,7 @@ -<%@ include file="../commons/tagLibsPath.jsp"%> +<%@ include file="/dx-disinfectsystem/pages/disinfectsystem/commons/tagLibsPath.jsp"%> JSP模板 @@ -16,6 +16,8 @@ + + <%-- bootstrap-datetimepicker --%> @@ -26,17 +28,16 @@ - - - - + - - -
@@ -55,59 +56,64 @@
-
+
- - + +
+ +
- - + +
+ +
- - + +
+ +
-
- - + +
+ +
+
+ +
+ +
- - + +
+ +
- - + + +
-
- - - -
-
+
- - +
-
-