Index: ssts-web/src/main/webapp/disinfectsystem/instrumentInstanceManager/instrumentInstanceForm.js
===================================================================
diff -u -r34609 -r34710
--- ssts-web/src/main/webapp/disinfectsystem/instrumentInstanceManager/instrumentInstanceForm.js (.../instrumentInstanceForm.js) (revision 34609)
+++ ssts-web/src/main/webapp/disinfectsystem/instrumentInstanceManager/instrumentInstanceForm.js (.../instrumentInstanceForm.js) (revision 34710)
@@ -304,7 +304,7 @@
width: 100,
menuDisabled: true
}, {
- header: "使用医生",
+ header: "手术医生",
dataIndex: 'doctorName',
width: 100,
menuDisabled: true
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
===================================================================
diff -u -r33856 -r34710
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 33856)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 34710)
@@ -39,6 +39,7 @@
var pageSource = '${param.pageSource}';
parentImgName = decodeURI(parentImgName);
parentMaterialId = decodeURI(parentMaterialId);
+materialName = decodeURI(materialName);
//清洗教学视频
var vidoeTypeTousseWashTeaching = '<%=VideoFile.VIDEO_TYPE_TOUSSE_WASH_TEACHING%>';
//配包教学视频
@@ -119,11 +120,17 @@
var insertText = document.createTextNode(materialName);
BElement.appendChild(insertText);
document.getElementById("tousseNameID").appendChild(BElement);
- jQuery('#tousseOrMaterialImageDiv').css('width','800px');
- jQuery('#MaterialID').remove();
- jQuery('.btn-box').remove();
- jQuery('.remark-box').remove();
- jQuery('#ImageID').removeClass("left");
+ $('#tousseOrMaterialImageDiv').css('width','800px');
+ $('#ImageID').css('width','100%');
+ $('#MaterialID').remove();
+ $('.btn-box .operationGuide-book').remove();
+ $('.btn-box .instruction-book').remove();
+ $('.btn-box .packing-teach').remove();
+ $('.btn-box .tousse-video').remove();
+ $('.btn-box .tousse-book').remove();
+ $('.btn-box .tousseOriginalImage-video').remove();
+ $('.remark-box').remove();
+ $('#ImageID').removeClass("left");
}
/**
* 材料被点击时触发
@@ -957,8 +964,8 @@