Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp
===================================================================
diff -u -r33301 -r33856
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp (.../tousseView.jsp) (revision 33301)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp (.../tousseView.jsp) (revision 33856)
@@ -53,6 +53,7 @@
var imageTypeToussePacking = '<%=ImageFile.IMAGE_TYPE_TOUSSEPACKING%>';
var imageTypeSpecification = '<%=ImageFile.IMAGE_TYPE_SPECIFICATION%>';
var imageTypeWashGuide = '<%=ImageFile.IMAGE_TYPE_TOUSSE_WASHGUIDE%>';
+var vidoeTypeTousseWashTeaching = '<%=VideoFile.VIDEO_TYPE_TOUSSE_WASH_TEACHING%>';
var isPriceReadOnly = <%=request.getAttribute("isPriceReadOnly")%>;
var userName = '${loginUserData.userFullName}';
var PACKAGE_TYPE_CUSTOM = '<%=TousseDefinition.PACKAGE_TYPE_CUSTOM%>';
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/watchVideoModel.jsp
===================================================================
diff -u -r31915 -r33856
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/watchVideoModel.jsp (.../watchVideoModel.jsp) (revision 31915)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/watchVideoModel.jsp (.../watchVideoModel.jsp) (revision 33856)
@@ -77,6 +77,7 @@
var WWWROOT = '${ctx}';
var objectId = '${param.objectId}';
var videoId = '${param.videoId}';
+ var videoType = '${param.videoType}';
@@ -113,7 +114,7 @@
dataType: 'json',
cache: false,
data: {
- videoType: "配包教学视频",
+ videoType: videoType,
objectId: objectId
},
success: function (result) {
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseUploadVideoManager.js
===================================================================
diff -u -r33518 -r33856
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseUploadVideoManager.js (.../tousseUploadVideoManager.js) (revision 33518)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseUploadVideoManager.js (.../tousseUploadVideoManager.js) (revision 33856)
@@ -48,7 +48,8 @@
if (objectId !== '') {
var params = {
objectId: objectId,
- videoId: videoId
+ videoId: videoId,
+ videoType:encodeURIComponent('配包教学视频')
}
openModalWindowForExt(WWWROOT + "/disinfectsystem/basedatamanager/tousse/watchVideoModel.jsp", params, "配包教学视频", "800", "390");
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r33570 -r33856
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js (.../washAndDisinfectForm.js) (revision 33570)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js (.../washAndDisinfectForm.js) (revision 33856)
@@ -419,7 +419,7 @@
number: 1
}
- openModalWindowForExt(WWWROOT + "/disinfectsystem/touchScreen/recycle/tousseImage.jsp", params, '器械包图片', 1110, 600);
+ openModalWindowForExt(WWWROOT + "/disinfectsystem/touchScreen/recycle/tousseImage.jsp", params, '器械包图片', 1110, 600,99999);
}
}
});
@@ -1799,7 +1799,6 @@
return false;
}
}
-
// 校验责任人
if (!personInChargeAllowBlank) {
if (isAnyBasketPersonInChargeBlank()) {
@@ -1893,31 +1892,6 @@
} else {
doSubmit();
}
- // var conCurrent = top.Ext.getCmp("conCurrent").getValue();
- // top.Ext.getCmp("disinfectProgram").setValue(top.Ext.getCmp("disinfectProgram").getRawValue());
- // formObj.form.submit({
- // url : WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!saveWashAndDisinfectRecord.do',
- // params : {conCurrent :conCurrent},
- // method : 'POST',
- // waitMsg : '正在保存数据，请稍候',
- // waitTitle : '提交表单',
- // success : function(form, action) {
- // var validate = Ext.decode(action.result.success);
- // if(validate){
- // showResult(action.result.message);
- // grid.dwrReload();
- // washAndDisinfectRecordWin.close();
- // }else{
- // showResult(action.result.message);
- // top.Ext.getCmp("saveBtn").enable();
- // }
- // },
- // failure : function(form, action) {
- // showResult(action.result.message);
- // top.Ext.getCmp("saveBtn").enable();
- // }
- // });
-
}
function doSubmit() {
var conCurrent = top.Ext.getCmp("conCurrent").getValue();
Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r33829 -r33856
--- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 33829)
+++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 33856)
@@ -426,13 +426,15 @@
}
}
-function openModalWindowForExt(pageUrl, varArgIn, title, width, height) {
+function openModalWindowForExt(pageUrl, varArgIn, title, width, height, zseed) {
width = parseInt(width, 10) || parseInt((window.screen.width - 250), 10);
height = parseInt(height, 10) || parseInt((window.screen.height - 200), 10);
var url = '';
var tab1GroupMgr = new Ext.WindowGroup();
- tab1GroupMgr.zseed = 999999;
-
+ var win;
+ tab1GroupMgr.zseed = zseed || 999900;
+ var pageSource = '';
+ var tousseDefinitionID = '';
if (typeof varArgIn == 'object') {
var html = '';
@@ -442,26 +444,47 @@
html = html.slice(0, html.length - 1);
url = pageUrl + '?' + html;
+ pageSource = varArgIn.pageSource;
+ tousseDefinitionID = varArgIn.tousseDefinitionID || '';
} else {
url = pageUrl;
}
- var win = new top.Ext.Window({
- title: title,
- id: 'extWindow',
- width: width + 50,
- height: height + 40,
- autoScroll: false,
- isTopContainer: true,
- modal: true,
- resizable: false,
- manager: tab1GroupMgr,
- items: [{
- xtype: "panel",
- id: "index",
- html: ""
- }]
- })
+ if (pageSource == 'recycleForTouchScreen') {
+ win = new Ext.Window({
+ title: title,
+ id: 'extWindow' + tousseDefinitionID,
+ width: width + 50,
+ height: height + 40,
+ autoScroll: false,
+ isTopContainer: true,
+ modal: true,
+ resizable: false,
+ manager: tab1GroupMgr,
+ items: [{
+ xtype: "panel",
+ id: "index",
+ html: ""
+ }]
+ })
+ } else {
+ win = new top.Ext.Window({
+ title: title,
+ id: 'extWindow' + tousseDefinitionID,
+ width: width + 50,
+ height: height + 40,
+ autoScroll: false,
+ isTopContainer: true,
+ modal: true,
+ resizable: false,
+ manager: tab1GroupMgr,
+ items: [{
+ xtype: "panel",
+ id: "index",
+ html: ""
+ }]
+ })
+ }
win.show();
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r33814 -r33856
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 33814)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 33856)
@@ -2868,7 +2868,7 @@
} else if (tousseType == '器械包') {
$.magnificPopup.open({
items: [{
- src: 'tousseImage.jsp?resolution=' + resolution + '&tousseDefinitionID=' + tousseDefinitionID + '&tousseName=' + encodeURIComponent(tousseName) + '&number=' + 1,
+ src: 'tousseImage.jsp?resolution=' + resolution + '&tousseDefinitionID=' + tousseDefinitionID + '&tousseName=' + encodeURIComponent(tousseName) + '&number=' + 1 + '&pageSource=recycleForTouchScreen',
type: 'iframe'
}, {
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
===================================================================
diff -u -r33571 -r33856
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 33571)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 33856)
@@ -4,6 +4,7 @@
<%@ include file="/common/taglibs.jsp"%>
<%@page import="com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods"%>
<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.videomanager.VideoFile"%>
<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplier.ExpensiveGoodsSupplier"%>
<%@ include file="/common/includeExtJsAndCss.jsp"%>
@@ -35,8 +36,13 @@
var parentPageName = '${param.parentPageName}';
var parentMaterialId = '${param.materialId}';
var parentImgName = '${param.imgName}';
+var pageSource = '${param.pageSource}';
parentImgName = decodeURI(parentImgName);
parentMaterialId = decodeURI(parentMaterialId);
+//清洗教学视频
+var vidoeTypeTousseWashTeaching = '<%=VideoFile.VIDEO_TYPE_TOUSSE_WASH_TEACHING%>';
+//配包教学视频
+var vidoeTypeTousse = '<%=VideoFile.VIDEO_TYPE_TOUSSE%>';
//加载原图
var originalImg = false;
//动态加载JS和CSS
@@ -162,11 +168,21 @@
//视频
function onTousseVideoClick(){
var params = {
- objectId:tousseDefinitionID
+ objectId:tousseDefinitionID,
+ videoType:encodeURIComponent(vidoeTypeTousse)
}
- openModalWindowForExt("${ctx}/disinfectsystem/basedatamanager/tousse/watchVideoModel.jsp",params, "配包教学视频", "800", "390");
+ openModalWindowForExt("${ctx}/disinfectsystem/basedatamanager/tousse/watchVideoModel.jsp",params, vidoeTypeTousse, "800", "390" ,999999);
}
+//清洗教学视频
+function onOperationGuideVideoClick(){
+ var params = {
+ objectId:tousseDefinitionID,
+ videoType:encodeURIComponent(vidoeTypeTousseWashTeaching),
+ pageSource:pageSource || ''
+ }
+ openModalWindowForExt("${ctx}/disinfectsystem/basedatamanager/tousse/watchVideoModel.jsp",params, vidoeTypeTousseWashTeaching, "800", "390" ,999999);
+}
var currentType = '';
var currentTypeMap = {};
var handleTyoe = '器械包';
@@ -759,14 +775,14 @@
}else {
height = bodyHeight;
}
- if(screenWidth == 1920){
- $('.btn-box a').css('font-size','20px');
- }else if(screenWidth == 1680 || screenWidth == 1600){
+ if(screenWidth >= 1920){
$('.btn-box a').css('font-size','18px');
- }else if(screenWidth == 1440 || screenWidth == 1400){
+ }else if(screenWidth >= 1600 && screenWidth < 1920){
$('.btn-box a').css('font-size','16px');
- }else {
+ }else if(screenWidth >= 1400 && screenWidth < 1600){
$('.btn-box a').css('font-size','14px');
+ }else {
+ $('.btn-box a').css('font-size','12px');
}
var imageAndMaterialID_Height = 0;
@@ -816,7 +832,6 @@
$('#tousseOrMaterialImageDiv').height(tousseOrMaterialImageDiv_Height+'px');
$('#MaterialID').height(MaterialID_Height+'px');
$('#materialDIV').height(materialDIV_Height+'px');
-
if(parentPageName == 'packingView'){
$(".packing-teach,.instruction-book").show();
}else if(parentPageName == 'toussePictures'){
@@ -953,10 +968,11 @@
全屏
上一张
下一张
- 清洗操作指引
+ 清洗指引图片
+ 清洗教学视频
说明书
- 教学图片
- 教学视频
+ 装配图片
+ 装配视频
查看包图片
查看原图
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r33814 -r33856
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 33814)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 33856)
@@ -237,7 +237,8 @@
function watchVideoModel(objectId) {
if (objectId !== '') {
var params = {
- objectId: objectId
+ objectId: objectId,
+ videoType:encodeURIComponent('配包教学视频')
}
openModalWindowForExt(WWWROOT + "/disinfectsystem/basedatamanager/tousse/watchVideoModel.jsp", params, "配包教学视频", "800", "390");
} else {
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
===================================================================
diff -u -r33855 -r33856
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 33855)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 33856)
@@ -2748,29 +2748,46 @@
uploadToussePackingImageFile(imageTypeSpecification, id, tousseName);
}
}, {
- text: '清洗操作指引图片',
- id: 'washGuideImageFile',
- hidden: id == 0 ? true : false,
- handler: function () {
- var tousseName = top.Ext.getCmp('name').getValue();
- uploadToussePackingImageFile(imageTypeWashGuide, id, tousseName);
- }
+ text: '清洗操作指引',
+ menu: new top.Ext.menu.Menu({
+ items: [{
+ text: '清洗指引图片',
+ id: 'washGuideImageFile',
+ hidden: id == 0 ? true : false,
+ handler: function () {
+ var tousseName = top.Ext.getCmp('name').getValue();
+ uploadToussePackingImageFile(imageTypeWashGuide, id, tousseName);
+ }
+ }, {
+ text: '清洗教学视频',
+ id: 'washGuideVedio',
+ handler: function () {
+ var tousseName = top.Ext.getCmp('name').getValue();
+ uploadToussePackingVideoFile(vidoeTypeTousseWashTeaching, id, tousseName);
+ }
+ }]
+ })
}, {
- text: '装配教学图片',
- id: 'uploadToussePackingImageFile',
- hidden: id == 0 ? true : false,
- handler: function () {
- var tousseName = top.Ext.getCmp('name').getValue();
- uploadToussePackingImageFile(imageTypeToussePacking, id, tousseName);
- }
+ text: '装配教学',
+ menu: new top.Ext.menu.Menu({
+ items: [{
+ text: '装配教学图片',
+ id: 'uploadToussePackingImageFile',
+ hidden: id == 0 ? true : false,
+ handler: function () {
+ var tousseName = top.Ext.getCmp('name').getValue();
+ uploadToussePackingImageFile(imageTypeToussePacking, id, tousseName);
+ }
+ }, {
+ text: '配包教学视频',
+ id: 'uploadVedio',
+ handler: function () {
+ var tousseName = top.Ext.getCmp('name').getValue();
+ uploadToussePackingVideoFile(videoType, id, tousseName);
+ }
+ }]
+ })
}, {
- text: '配包教学视频',
- id: 'uploadVedio',
- handler: function () {
- var tousseName = top.Ext.getCmp('name').getValue();
- uploadToussePackingVideoFile(videoType, id, tousseName);
- }
- }, {
text: '取消',
id: 'saveAndNewBtn',
handler: function () {