Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
===================================================================
diff -u -r32802 -r32829
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 32802)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 32829)
@@ -503,99 +503,6 @@
}
});
- /////////////////////////////////////////图片预览
- var page = 1;
- var totalPage = 0;
- var toolbarPage = new top.Ext.Toolbar.TextItem({
- text : '第1页'
- });
- var toolbarTotalPage = new top.Ext.Toolbar.TextItem({
- text : '共0页'
- });
-
- var imagePanel = new top.Ext.Panel({
- id : 'imagePanel',
- layout : 'fit',
- height : 270,
- items : [{
- xtype : 'box',
- id : 'browseImage',
- fieldLabel : "预览图片",
- autoEl : {
- id : 'imageBrowse',
- tag : 'img',
- autoHeight:true,
- src : Ext.BLANK_IMAGE_URL,
- style : 'filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale);',
- complete : 'off'
- }
- }]
- });
- var browseImage = imagePanel.findById('browseImage');
- var url = WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getToussePic.do?id=' + id + '&page=' + page +'&time='+new Date().getTime();
- browseImage.autoEl.src=url;
-
- var showTousseImage = new top.Ext.Panel({
- items : [{
- xtype : 'panel',
- id : 'pageToolbar',
- bbar : ['->',{
- xtype : 'button',
- text : '<<',
- tooltip :"上一页",
- handler : function(){
- if (page - 1 <= 0) {
- showResult('已是第一页');
- return;
- }
- page = page - 1;
- var url = WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getToussePic.do?id=' + id + '&page=' + page +'&time='+new Date().getTime();
- var imageBrowse = top.Ext.get('imageBrowse');
- var image = imageBrowse.dom;
- image.src = url;// 覆盖原来的图片
- var element = top.Ext.get(toolbarPage.el);
- element.update('第' + page + '页');
- }
- },
- toolbarPage,
- toolbarTotalPage,{
- xtype : 'button',
- text : '>>',
- tooltip :"下一页",
- handler : function() {
- if (page + 1 > totalPage) {
- showResult('已是最后一页');
- return;
- }
- page = page + 1;
- var url = WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getToussePic.do?id=' + id + '&page=' + page +'&time='+new Date().getTime();
- var imageBrowse = top.Ext.get('imageBrowse');
- var image = imageBrowse.dom;
- image.src = url;// 覆盖原来的图片
- var element = top.Ext.get(toolbarPage.el);
- element.update('第' + page + '页');
- }
- }]
- },imagePanel]
- });
-
- Ext.Ajax.request({
- url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getTousseUploadPicTotalPage.do',
- params : {
- id : id
- },
- success : function(result){
- var pageStr = result.responseText;
- totalPage = parseInt(pageStr);
- var element = top.Ext.get(toolbarTotalPage.el);
- element.update('共' + totalPage + '页');
- },
- failure : function(){
-
- }
- });
- /////////////////////////////////////////图片预览
-
//灭菌程序
var sterilisationStore = new Ext.data.SimpleStore({
fields : ['id', 'value' ],
@@ -2753,7 +2660,7 @@
height:300,
labelWidth : 60,
items : [
- showTousseImage
+ showImagePanel(id)
]
}]
}],
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp
===================================================================
diff -u -r29513 -r32829
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp (.../diposableGoodsView.jsp) (revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp (.../diposableGoodsView.jsp) (revision 32829)
@@ -9,7 +9,7 @@
<%@ include file="/common/includeExtJsAndCss.jsp"%>
-
+<%@ include file="/common/include_Ext425JsAndCss.jsp"%>
@@ -43,6 +44,9 @@
+
+
+
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
===================================================================
diff -u -r32234 -r32829
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 32234)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 32829)
@@ -101,7 +101,6 @@
data : [ ['否' ], ['是' ]]
});
-
var selectModel = new top.Ext.grid.CheckboxSelectionModel();
formObj = new top.Ext.FormPanel( {
id : 'diposableGoodsForm',
@@ -701,6 +700,14 @@
triggerAction : 'all',
anchor : '95%'
}]
+ }, {
+ columnWidth : 0.9,
+ layout : 'form',
+ bodyStyle : 'border:1px solid #afd7af',
+ labelWidth : 60,
+ items : [
+ showImagePanel(id,'一次性物品图片')
+ ]
}
]
},{
@@ -859,6 +866,14 @@
printFixedBarcodeByIds(id);
}
}
+ }, {
+ text : '图片管理',
+ id : 'uploadFile',
+ hidden:id == 0?true:false,
+ handler : function(){
+ var tousseName = top.Ext.getCmp('name').getValue();
+ uploadToussePackingImageFile(imageTypeTousse,id,tousseName);
+ }
}]
});
Index: ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js
===================================================================
diff -u -r32823 -r32829
--- ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js (.../ext4ShowTousseImage.js) (revision 32823)
+++ ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js (.../ext4ShowTousseImage.js) (revision 32829)
@@ -1,5 +1,16 @@
//展示器械包信息
-function getAndShowTousseInfoDiv(tousseName, tousseDefinitionId, imageType) {
+function getAndShowTousseInfoDiv(tousseName, tousseDefinitionId, imageType, page) {
+ console.log(imageType)
+ var hiddenGrid = false;
+ var winWidth = 800;
+ var winHeight = 380;
+ var title = tousseName + '信息';
+ if (imageType == '一次性物品图片') {
+ hiddenGrid = true;
+ winWidth = 800;
+ winHeight = 524;
+ title = '【' + tousseName + '】图片';
+ }
var objectId = tousseDefinitionId;
var objectName = tousseName;
var curPage = 0;
@@ -47,6 +58,15 @@
++curPage;
loadCurrentImage();
}
+ }, {
+ text: '全屏',
+ handler: function () {
+ if(tousseDefinitionId == '' || curPage == 0){
+ showResult('图片不存在');
+ return;
+ }
+ openFullSizeWindowWithName(WWWROOT + '/disinfectsystem/touchScreen/recycle/showFullImg.jsp?page=' + curPage + '&count=' + totalPage + '&objId=' + tousseDefinitionId + '&tousseName=' + encodeURIComponent(tousseName) + '&imageType=' + encodeURIComponent(imageType), true, '全屏显示图片');
+ }
}];
var imagePanel = new top.Ext4.Panel({
@@ -94,7 +114,7 @@
return '';
}
}
- function loadImageCount() {
+ function loadImageCount(page) {
clearImage();
Ext.Ajax.request({
url: WWWROOT + "/disinfectSystem/baseData/showImageAction!getToussePictureAmount.do",
@@ -109,7 +129,7 @@
totalPage = parseInt(pageJson.count);
curPage = 0;
if (totalPage > 0) {
- curPage = 1;
+ curPage = page || 1;
}
var element = top.Ext4.get(toolbarTotalPage.el);
element.update('共' + totalPage + '页');
@@ -187,9 +207,9 @@
var window = new top.Ext4.Window({
id: 'packageImg',
- title: tousseName + '信息',
- width: 800,
- height: 380,
+ title: title,
+ width: winWidth,
+ height: winHeight,
border: false,
autoScroll: true,
layout: 'border',
@@ -198,20 +218,23 @@
region: 'center',
layout: 'fit',
width: '30%',
+ hidden: hiddenGrid,
items: materialGrid
}, {
region: 'west',
layout: 'fit',
- width: '70%',
+ width: hiddenGrid ? '100%' : '70%',
items: imagePanel
}]
});
- //材料
- top.Ext4.getCmp('materialGrid').setTitle('[' + tousseName + '] 包含的材料');
- materialStore.on("beforeload", function (store, operation, eOpts) {
- store.proxy.extraParams["tousseName"] = tousseName;
- });
- materialStore.load();
+ if (!hiddenGrid) {
+ //材料
+ top.Ext4.getCmp('materialGrid').setTitle('[' + tousseName + '] 包含的材料');
+ materialStore.on("beforeload", function (store, operation, eOpts) {
+ store.proxy.extraParams["tousseName"] = tousseName;
+ });
+ materialStore.load();
+ }
window.show();
- loadImageCount();
+ loadImageCount(page);
}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js
===================================================================
diff -u -r32664 -r32829
--- ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js (.../videoAndImg.js) (revision 32664)
+++ ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js (.../videoAndImg.js) (revision 32829)
@@ -311,7 +311,10 @@
function imgAndVideoBtn(){
// 弹出窗口
- var pageUrl = WWWROOT + '/disinfectsystem/test/takeVideoAndImg.jsp';
+ var pageUrl = WWWROOT + '/disinfectsystem/test/takeVideoAndImg.jsp?showVideo=true';
+ if(imageType == '一次性物品图片'){
+ pageUrl = WWWROOT + '/disinfectsystem/test/takeVideoAndImg.jsp?showVideo=false';
+ }
popwin = openFullSizeWindowWithName(pageUrl,true,'拍摄视频图片');
if(popwin != null ){
popwin.focus();
@@ -329,8 +332,7 @@
}
$('.spotlight_parent').each(function(index,ele) {
$(this).children("a").attr("num",index);//前台删除blobs数组以后，对应的num值要重新赋值
- })
-
+ })
var size = "";
var fileTypes = "";
for (var i = 0; i < blobs.length; i++) {
Index: ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.jsp
===================================================================
diff -u -r29513 -r32829
--- ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.jsp (.../takeVideoAndImg.jsp) (revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.jsp (.../takeVideoAndImg.jsp) (revision 32829)
@@ -15,6 +15,7 @@
Index: ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.js
===================================================================
diff -u -r31701 -r32829
--- ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.js (.../takeVideoAndImg.js) (revision 31701)
+++ ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.js (.../takeVideoAndImg.js) (revision 32829)
@@ -191,6 +191,9 @@
$(".camera_wrapper").css({"height":cameraHeight+"px"});
var canvas = document.getElementById("canvas");
var context = canvas.getContext("2d");
+ if(showVideo == false || showVideo == 'false'){
+ $('.toggle_btn').hide();
+ }
/* 预览大图图片 */
var canvasBig = document.getElementById("canvasBig");
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseUploadImageManager.js
===================================================================
diff -u -r27796 -r32829
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseUploadImageManager.js (.../tousseUploadImageManager.js) (revision 27796)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseUploadImageManager.js (.../tousseUploadImageManager.js) (revision 32829)
@@ -1,223 +1,395 @@
-var toussePackingImageStore;
+var toussePackingImageStore;
-function moveUp2(id){
- ImageFileTableManager.moveUpImageFile(id, function(){
+function moveUp2(id) {
+ ImageFileTableManager.moveUpImageFile(id, function () {
toussePackingImageStore.reload();
});
}
-function moveDown2(id){
- ImageFileTableManager.moveDownImageFile(id, function(){
+function moveDown2(id) {
+ ImageFileTableManager.moveDownImageFile(id, function () {
toussePackingImageStore.reload();
});
}
-function moveUpDown(v, p, record){
+function moveUpDown(v, p, record) {
var html = '';
html += '
';
html += '';
html += '
';
return html;
}
-function deleteOrDownLoad(v, p, record){
- var html = '';
+function deleteOrDownLoad(v, p, record) {
+ var html = '';
html += '
';
html += '';
html += '';
return html;
}
-function downLoadImageFile(id){
- location.href = WWWROOT + "/disinfectsystem/basedatamanager/tousse/downloadImage.jsp?id="+id;
+function downLoadImageFile(id) {
+ location.href = WWWROOT + "/disinfectsystem/basedatamanager/tousse/downloadImage.jsp?id=" + id;
}
-function deleteImageFile(id, imageType, objectId){
- if(id != null && id != ""){
- top.Ext.MessageBox.confirm("请确认","是否确定要删除此图片？",
- function(button, text) {
- if ("yes" == button){
- Ext.Ajax.request({
- url : WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!deleteImageFile.do',
- params : {id : id},
- success : function(response, options) {
- var result = Ext.decode(response.responseText);
- if(result.success){
- toussePackingImageStore.reload();
- showResult("删除成功！");
- }else{
- showResult("删除失败！");
- }
- },
- failure : function(response, options) {
- var result = Ext.decode(response.responseText);
- showResult(result.cause);
- }
- });
- }
- });
+function deleteImageFile(id, imageType, objectId) {
+ if (id != null && id != "") {
+ top.Ext.MessageBox.confirm("请确认", "是否确定要删除此图片？",
+ function (button, text) {
+ if ("yes" == button) {
+ Ext.Ajax.request({
+ url: WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!deleteImageFile.do',
+ params: { id: id },
+ success: function (response, options) {
+ var result = Ext.decode(response.responseText);
+ if (result.success) {
+ toussePackingImageStore.reload();
+ showResult("删除成功！");
+ } else {
+ showResult("删除失败！");
+ }
+ },
+ failure: function (response, options) {
+ var result = Ext.decode(response.responseText);
+ showResult(result.cause);
+ }
+ });
+ }
+ });
}
}
-function uploadWindow(imageType,id){
- var dialog = new top.Ext.ux.UploadDialog.Dialog({
- title: "上传" + imageType,
- url:WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!uploadImage2.do?imageType='+encodeURI(imageType)+'&objectId='+id , //这里我用struts2做后台处理
- post_var_name:'uploadFiles',//这里是自己定义的，默认的名字叫file
- width : 450,
- height : 300,
- minWidth : 450,
- minHeight : 300,
- draggable : true ,
- resizable : true ,
- constraintoviewport: true ,
- permitted_extensions:['JPG','jpg','jpeg','JPEG','GIF','gif','png','PNG','pdf'],//上传图片/pdf转图片
- modal: true ,
- reset_on_hide: false ,
- allow_close_on_upload: false , //关闭上传窗口是否仍然上传文件
- upload_autostart: false
- });
-
- dialog.show();
- dialog.on('uploadsuccess',function(dialog){
- showResult("文件上传成功！");
- toussePackingImageStore.reload();
-
- Ext.Ajax.request({
- url : WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!updateImageUploadStatus.do',
- params : {id : id,imageType:imageType},
- success : function(response, options) {},
- failure : function(response, options) {}
- });
-
- dialog.hide();
- }); //定义上传完成回调函数
- dialog.on('uploadfailed',function(dialog){
- showResult("文件上传失败！");
- toussePackingImageStore.reload();
-
- Ext.Ajax.request({
- url : WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!updateImageUploadStatus.do',
- params : {id : id,imageType:imageType},
- success : function(response, options) {},
- failure : function(response, options) {}
- });
- dialog.hide();
- }); //定义上传完成回调函数
+function uploadWindow(imageType, id) {
+ var dialog = new top.Ext.ux.UploadDialog.Dialog({
+ title: "上传" + imageType,
+ url: WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!uploadImage2.do?imageType=' + encodeURI(imageType) + '&objectId=' + id, //这里我用struts2做后台处理
+ post_var_name: 'uploadFiles',//这里是自己定义的，默认的名字叫file
+ width: 450,
+ height: 300,
+ minWidth: 450,
+ minHeight: 300,
+ draggable: true,
+ resizable: true,
+ constraintoviewport: true,
+ permitted_extensions: ['JPG', 'jpg', 'jpeg', 'JPEG', 'GIF', 'gif', 'png', 'PNG', 'pdf'],//上传图片/pdf转图片
+ modal: true,
+ reset_on_hide: false,
+ allow_close_on_upload: false, //关闭上传窗口是否仍然上传文件
+ upload_autostart: false
+ });
+
+ dialog.show();
+ dialog.on('uploadsuccess', function (dialog) {
+ showResult("文件上传成功！");
+ toussePackingImageStore.reload();
+
+ Ext.Ajax.request({
+ url: WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!updateImageUploadStatus.do',
+ params: { id: id, imageType: imageType },
+ success: function (response, options) { },
+ failure: function (response, options) { }
+ });
+
+ dialog.hide();
+ }); //定义上传完成回调函数
+ dialog.on('uploadfailed', function (dialog) {
+ showResult("文件上传失败！");
+ toussePackingImageStore.reload();
+
+ Ext.Ajax.request({
+ url: WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!updateImageUploadStatus.do',
+ params: { id: id, imageType: imageType },
+ success: function (response, options) { },
+ failure: function (response, options) { }
+ });
+ dialog.hide();
+ }); //定义上传完成回调函数
}
-function uploadToussePackingImageFile(imageType,id,tousseName){
+function uploadToussePackingImageFile(imageType, id, tousseName) {
toussePackingImageStore = new top.Ext.data.Store({
- proxy : new Ext.data.HttpProxy({
- url:WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!loadTousseFileImage.do?imageType='+encodeURI(imageType)+'&objectId='+id ,
- method : 'POST'
- }),
- reader : new Ext.data.JsonReader({
- totalProperty : 'totalCount',
- root : 'data'
- }, [
- {name : 'id',mapping : 'id'},
- {name : 'imageName',mapping : 'imageName'}
- ]
- )
- });
- toussePackingImageStore.load();
-
- var cm = new top.Ext.grid.ColumnModel([
+ proxy: new Ext.data.HttpProxy({
+ url: WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!loadTousseFileImage.do?imageType=' + encodeURI(imageType) + '&objectId=' + id,
+ method: 'POST'
+ }),
+ reader: new Ext.data.JsonReader({
+ totalProperty: 'totalCount',
+ root: 'data'
+ }, [
+ { name: 'id', mapping: 'id' },
+ { name: 'serialNum', mapping: 'serialNum' },
+ { name: 'imageName', mapping: 'imageName' }
+ ]
+ )
+ });
+ toussePackingImageStore.load();
+
+ var cm = new top.Ext.grid.ColumnModel([
{
- name:'id',
- hidden :true,
- dataIndex : 'id'
- },{
- id:'imageName',
+ name: 'id',
+ hidden: true,
+ dataIndex: 'id'
+ }, {
+ id: 'imageName',
menuDisabled: true,
- header : "图片名称",
- width:330,
- dataIndex : 'imageName'
- },{
- id:'moveUpDown',
- menuDisabled: true,
- header:'排序操作',
- width:60,
- renderer: moveUpDown,
- dataIndex:'button'
- },{
- id:'deleteAction',
- menuDisabled: true,
- header:'删除 | 下载',
- width:60,
- renderer: deleteOrDownLoad,
- dataIndex:'button'
- },{
- id:'imageLook',
- menuDisabled: true,
- header:'图片预览',
- width:60,
- renderer: function(v, p, record){
- var html = '';
- html += '
';
- return html;
- },
- dataIndex:'imageLook'
+ header: "图片名称",
+ width: 330,
+ dataIndex: 'imageName'
+ }, {
+ id: 'moveUpDown',
+ menuDisabled: true,
+ header: '排序操作',
+ width: 60,
+ renderer: moveUpDown,
+ dataIndex: 'button'
+ }, {
+ id: 'deleteAction',
+ menuDisabled: true,
+ header: '删除 | 下载',
+ width: 60,
+ renderer: deleteOrDownLoad,
+ dataIndex: 'button'
+ }, {
+ id: 'imageLook',
+ menuDisabled: true,
+ header: '图片预览',
+ width: 60,
+ renderer: function (v, p, record) {
+ var serialNum = record.data.serialNum;
+ if (imageType == '一次性物品图片') {
+ var html = '';
+ html += '';
+ return html;
+ } else {
+ var html = '';
+ html += '';
+ return html;
+ }
+ },
+ dataIndex: 'imageLook'
}]);
-
- var tbar = [{
- text : '上传图片',
- handler:function(){
- uploadWindow(imageType,id);
+
+ var tbar = [{
+ text: '上传图片',
+ handler: function () {
+ uploadWindow(imageType, id);
+ }
+ }, {
+ text: '拍摄',
+ hidden: !(sstsConfig.showCameraPhoto && imageType == '一次性物品图片'),
+ handler: function () {
+ var params = {
+ tousseDefinitionId: id,
+ goodsName: tousseName,
+ isLook: false,
+ imageType: '一次性物品图片'
}
- }];
-
- var tousseImagePanel = new top.Ext.FormPanel({
- id : 'deviceMaintenanceForm',
- frame : true,
- labelAlign:'right',
- labelSeparator : '：',
- bodyStyle : 'padding:5px 5px 0px 5px',
- autoWidth : true,
- autoHeight : true,
- autoScroll : true,
- items:[{
- layout : 'column',
- items : [{
- columnWidth : 1,
- layout: 'form',
- items : [
- new top.Ext.grid.GridPanel({
- id : 'tousseImageGrid',
- store : toussePackingImageStore,
- tbar : tbar,
- cm : cm,
- height: 240,
- frame : false,
- autoExpandColumn : 'deleteAction',
- bodyStyle : 'border:1px solid #afd7af',
- anchor : '100%',
- selModel : new top.Ext.grid.RowSelectionModel({
- singleSelect : false
- })
+ top.Ext.getCmp('diposableGoodsForm').getUpdater().refresh();
+ openCameraPhotoWindow(params, function (value) {
+ toussePackingImageStore.load();
+ })
+ }
+ }];
+
+ var tousseImagePanel = new top.Ext.FormPanel({
+ id: 'deviceMaintenanceForm',
+ frame: true,
+ labelAlign: 'right',
+ labelSeparator: '：',
+ bodyStyle: 'padding:5px 5px 0px 5px',
+ autoWidth: true,
+ autoHeight: true,
+ autoScroll: true,
+ items: [{
+ layout: 'column',
+ items: [{
+ columnWidth: 1,
+ layout: 'form',
+ items: [
+ new top.Ext.grid.GridPanel({
+ id: 'tousseImageGrid',
+ store: toussePackingImageStore,
+ tbar: tbar,
+ cm: cm,
+ height: 240,
+ frame: false,
+ autoExpandColumn: 'deleteAction',
+ bodyStyle: 'border:1px solid #afd7af',
+ anchor: '100%',
+ selModel: new top.Ext.grid.RowSelectionModel({
+ singleSelect: false
})
- ]
- }]
- }],
- buttons : [{
- id : 'cancleBtn',
- text : '取消',
- handler : function() {
- formWindow.close();
- }
+ })
+ ]
}]
+ }],
+ buttons: [{
+ id: 'cancleBtn',
+ text: '取消',
+ handler: function () {
+ formWindow.close();
+ }
+ }]
+ });
+
+ var formWindow = new top.Ext.Window({
+ id: 'deviceMaintenanceWin',
+ layout: 'fit',
+ title: imageType + "管理",
+ width: 600,
+ modal: true,
+ autoHeight: true,
+ border: false,
+ plain: true,
+ items: [tousseImagePanel]
+ });
+ formWindow.show();
+}
+
+function showImagePanel(id, imageType) {
+ var viewPage = 1;
+ var viewTotalPage = 0;
+ var toolbarPage = new top.Ext.Toolbar.TextItem({
+ text: '第1页'
+ });
+ var toolbarTotalPage = new top.Ext.Toolbar.TextItem({
+ text: '共0页'
+ });
+
+ var imagePanel = new top.Ext.Panel({
+ id: 'imagePanel',
+ layout: 'fit',
+ autoHeight: true,
+ items: [{
+ xtype: 'box',
+ id: 'browseImage',
+ fieldLabel: "预览图片",
+ autoEl: {
+ id: 'imageBrowse',
+ tag: 'img',
+ autoHeight: true,
+ src: Ext.BLANK_IMAGE_URL,
+ style: 'filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale);',
+ complete: 'off'
+ }
+ }]
+ });
+
+ var browseImage = imagePanel.findById('browseImage');
+ var rootUrl = WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getToussePic.do?id=' + id;
+ if (imageType == '一次性物品图片') {
+ rootUrl = WWWROOT + '/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + id + '&imageType=' + encodeURIComponent(imageType);
+ }
+ var url = rootUrl + '&page=' + viewPage + '&time=' + new Date().getTime();
+ browseImage.autoEl.src = url;
+ var img = new Image();
+ img.src = url;
+ img.onload = function () {
+ var imageBrowse = top.Ext.get('imageBrowse');
+ var image = imageBrowse.dom;
+ if (img.width > img.height) {
+ image.style.height = 'auto';
+ image.style.width = '100%';
+ } else {
+ image.style.height = '100%';
+ image.style.width = 'auto';
+ }
+ };
+
+ var showTousseImage = new top.Ext.Panel({
+ items: [{
+ xtype: 'panel',
+ id: 'pageToolbar',
+ bbar: ['->', {
+ xtype: 'button',
+ text: '<<',
+ tooltip: "上一页",
+ handler: function () {
+ if (viewPage - 1 <= 0) {
+ showResult('已是第一页');
+ return;
+ }
+ viewPage = viewPage - 1;
+ var url = rootUrl + '&page=' + viewPage + '&time=' + new Date().getTime();
+ var imageBrowse = top.Ext.get('imageBrowse');
+ var image = imageBrowse.dom;
+ image.src = url;// 覆盖原来的图片
+ var img = new Image();
+ img.src = url;
+ img.onload = function () {
+ if (img.width > img.height) {
+ image.style.height = 'auto';
+ image.style.width = '100%';
+ } else {
+ image.style.height = '100%';
+ image.style.width = 'auto';
+ }
+ };
+ var element = top.Ext.get(toolbarPage.el);
+ element.update('第' + viewPage + '页');
+ }
+ },
+ toolbarPage,
+ toolbarTotalPage, {
+ xtype: 'button',
+ text: '>>',
+ tooltip: "下一页",
+ handler: function () {
+ if (viewPage + 1 > viewTotalPage) {
+ showResult('已是最后一页');
+ return;
+ }
+ viewPage = viewPage + 1;
+ var url = rootUrl + '&page=' + viewPage + '&time=' + new Date().getTime();
+ var imageBrowse = top.Ext.get('imageBrowse');
+ var image = imageBrowse.dom;
+ image.src = url;// 覆盖原来的图片
+ var img = new Image();
+ img.src = url;
+ img.onload = function () {
+ if (img.width > img.height) {
+ image.style.height = 'auto';
+ image.style.width = '100%';
+ } else {
+ image.style.height = '100%';
+ image.style.width = 'auto';
+ }
+ };
+ var element = top.Ext.get(toolbarPage.el);
+ element.update('第' + viewPage + '页');
+ }
+ }]
+ }, imagePanel]
+ });
+
+ if (imageType == '一次性物品图片') {
+ Ext.Ajax.request({
+ url: WWWROOT + "/disinfectSystem/baseData/showImageAction!getToussePictureAmount.do",
+ params: {
+ id: id,
+ name: '',
+ imageType: imageType
+ },
+ success: function (result) {
+ var pageJson = Ext.decode(result.responseText);
+ viewTotalPage = parseInt(pageJson.count);
+ var element = top.Ext4.get(toolbarTotalPage.el);
+ element.update('共' + viewTotalPage + '页');
+ }
});
-
- var formWindow = new top.Ext.Window( {
- id : 'deviceMaintenanceWin',
- layout : 'fit',
- title : imageType+"管理",
- width : 600,
- modal : true,
- autoHeight : true,
- border : false,
- plain : true,
- items : [tousseImagePanel]
+ } else {
+ Ext.Ajax.request({
+ url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getTousseUploadPicTotalPage.do',
+ params: {
+ id: id
+ },
+ success: function (result) {
+ var pageStr = result.responseText;
+ viewTotalPage = parseInt(pageStr);
+ var element = top.Ext.get(toolbarTotalPage.el);
+ element.update('共' + viewTotalPage + '页');
+ }
});
- formWindow.show();
+ }
+
+ return showTousseImage;
}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/showFullImg.jsp
===================================================================
diff -u -r31463 -r32829
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/showFullImg.jsp (.../showFullImg.jsp) (revision 31463)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/showFullImg.jsp (.../showFullImg.jsp) (revision 32829)
@@ -66,6 +66,10 @@
var img = this.default_params.WWWROOT+'/disinfectSystem/baseData/showImageAction!getImage.do?objectId=' + objId + '&page=' + page + '&imageType=' + encodeURIComponent(imageType) + '&rotateIndex='+rotateIndex+'&showSourceImg=true&time='+new Date().getTime();
+ if(imageType == '一次性物品图片'){
+ img = this.default_params.WWWROOT+'/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + objId + '&page=' + page + '&imageType=' + encodeURIComponent(imageType) + '&name=' + encodeURIComponent(tousseName) + '&rotateIndex='+rotateIndex+'&showSourceImg=true&time='+new Date().getTime();
+ }
+
return img;
},
setImgInitWH:function(){