Index: ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-acegi-security.xml
===================================================================
diff -u -r39876 -r40529
--- ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-acegi-security.xml	(.../applicationContext-acegi-security.xml)	(revision 39876)
+++ ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-acegi-security.xml	(.../applicationContext-acegi-security.xml)	(revision 40529)
@@ -129,6 +129,8 @@
 			<!-- GZSZYY-84： 数据实时看板-->
 			<intercept-url pattern="/disinfectsystem/realTimeDashboards/**" access="permitAll"></intercept-url>
 			<intercept-url pattern="/jasperreports/jasperreportsAction!getDataByDataSources.do" access="permitAll"></intercept-url>
+			<!-- ZSRY-126： 培训管理-->
+			<intercept-url pattern="/attachfiles/**" access="permitAll"></intercept-url>
 			<!--  user is not an anonymous or a remember-me user -->
 			<intercept-url pattern="/**" access="isFullyAuthenticated()"></intercept-url>
 			<form-login login-page="/logon.jsp" always-use-default-target="true" default-target-url="/openSystemMainPage.jsp" authentication-failure-url="/logon.jsp?login_error=1"></form-login>
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/config.js
===================================================================
diff -u -r40302 -r40529
--- ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/config.js	(.../config.js)	(revision 40302)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/config.js	(.../config.js)	(revision 40529)
@@ -331,6 +331,8 @@
 	  enableCustomReportModule:true,
 	  //申请单界面是否显示选择模板的下拉框
 	  isOpenLoadTemplateByUnit:true,
+    //启用培训管理功能的版权管理模式
+    enableCopyrightManagementModelOfTrainingManage:true,
 	    //启用发货管理的一次性物品树状结构模式
 	  enableTheDisposableGoodsTreeModeForiInvoiceView:true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/knowledge/viewExt.js
===================================================================
diff -u -r34874 -r40529
--- ssts-web/src/main/webapp/knowledge/viewExt.js	(.../viewExt.js)	(revision 34874)
+++ ssts-web/src/main/webapp/knowledge/viewExt.js	(.../viewExt.js)	(revision 40529)
@@ -6,6 +6,528 @@
 var trainingRecordStore;
 var formPanel;
 
+Ext.apply(Ext.form.VTypes, {
+    minLength: function (value, field) {
+        return value.length >= (field.minLength || 0);
+    },
+    minLengthText: '至少需要 {0} 个字符'
+});
+
+//ZSRY-126：加载下载密码
+function loadDownloadPassword(downType) {
+    Ext.Ajax.request({
+        url: WWWROOT + '/disinfectSystem/downloadPasswordController/loadDownloadPassword.mhtml',
+        success: function (response, options) {
+            var result = Ext.decode(response.responseText);
+            if (result.success) {
+                var downloadPassword = '';
+                if (result.data && result.data.downloadPassword) {
+                    downloadPassword = result.data.downloadPassword;
+                }
+                if (downType == 0) {
+                    if (downloadPassword == '') {
+                        Ext.MessageBox.confirm("请确认", "是否下载附件？", function (btn) {
+                            if (btn == 'yes') {
+                                showAllField();
+                            }
+                        });
+                    } else {
+                        showDownFieldWindow();
+                    }
+                } else {
+                    showPasswordDownWindow(downloadPassword);
+                }
+            } else {
+                showResult(result.message);
+            }
+        }
+    });
+}
+
+//ZSRY-126：设置下载密码
+function setDownloadPassword(downloadPassword) {
+    Ext.Ajax.request({
+        url: WWWROOT + '/disinfectSystem/downloadPasswordController/setDownloadPassword.mhtml',
+        params: {
+            downloadPassword: encryptText(downloadPassword, DEVICEINTERFACE_ENCRPT_DEPTH)
+        },
+        success: function (response, options) {
+            var result = Ext.decode(response.responseText);
+            showResult(result.message);
+            if (result.success) {
+                Ext.getCmp('passwordDownWindow').close();
+            }
+        }
+    });
+}
+
+//ZSRY-126：清除密码
+function clearDownloadPassword() {
+    Ext.Ajax.request({
+        url: WWWROOT + '/disinfectSystem/downloadPasswordController/clearDownloadPassword.mhtml',
+        success: function (response, options) {
+            var result = Ext.decode(response.responseText);
+            showResult(result.message);
+            if (result.success) {
+                Ext.getCmp('passwordDownWindow').close();
+            }
+        }
+    });
+}
+
+//ZSRY-126：校验下载密码
+function downloadPasswordVerification(downloadPassword, window) {
+    Ext.Ajax.request({
+        url: WWWROOT + '/disinfectSystem/downloadPasswordController/downloadPasswordVerification.mhtml',
+        params: {
+            downloadPassword: encryptText(downloadPassword, DEVICEINTERFACE_ENCRPT_DEPTH)
+        },
+        success: function (response, options) {
+            var result = Ext.decode(response.responseText);
+            if (result.success) {
+                window.close();
+                showAllField();
+            } else {
+                showResult(result.message);
+            }
+        }
+    });
+}
+
+//ZSRY-126：显示所有附件
+function showAllField() {
+    var row = grid.getSelectionModel().getSelections();
+    if (row.length == 0) {
+        showResult('请至少选择一条记录!');
+        return
+    }
+    var fkeyId = '';
+    for (var i = 0; i < row.length; i++) {
+        var id = row[i].data.id;
+        if (fkeyId == '') {
+            fkeyId = id;
+        } else {
+            fkeyId += ';' + id;
+        }
+    }
+    AttachFileManager.getAttachFilesIdAndFileName('KnowledgeFile1', fkeyId, function (attachFileList) {
+        if (attachFileList.length > 0) {
+            showFieldWindow(attachFileList);
+        }
+    });
+}
+
+//ZSRY-126：播放视频
+function playVideoForField(UUIDFileName, fileName) {
+    var url = Ext.urlEncode({
+        videoName: UUIDFileName, //视频播放文件名
+        fileName: fileName  //文件名
+    });
+    openModalWindowForExt(WWWROOT + "/knowledge/watchVideo.jsp?" + url, '', "观看视频", "930", "538");
+}
+
+//ZSRY-126：预览
+function prevewField(id, name, moduleId) {
+    moduleId = moduleId || 'trainingManage';
+    var originUrl = WWWROOT + "/attachfiles/fileDownLoad?loadType=open&moduleId=" + moduleId + "&id=" + id + '&fullfilename=' + name;
+    var url = 'http://127.0.0.1:8012/onlinePreview?url=' + encodeURIComponent(Base64.encode(originUrl));
+    var win = new top.Ext.Window({
+        title: '文件预览',
+        id: 'extWindow',
+        width: 980,
+        height: 600,
+        autoScroll: false,
+        isTopContainer: true,
+        modal: true,
+        resizable: false,
+        items: [{
+            xtype: 'panel',
+            html: "<iframe id='ifremeForField' src='" + url + "' scrolling='yes' frameborder=0 width=965 height=550></iframe>"
+        }],
+        listeners: {
+            render: function (win) {
+                var overlay = win.body.createChild({
+                    tag: 'div',
+                    style: 'position:absolute;top:0;left:0;width:97%;height:100%;z-index:9999;'
+                });
+                overlay.on('contextmenu', function (e) {
+                    e.preventDefault()
+                });
+            }
+        }
+    })
+    win.show();
+}
+
+//ZSRY-126：获取文件类型
+function getFileType(attachType) {
+    if (attachType == '.mp4' || attachType == '.avi' || attachType == '.wmv') {
+        return 'video'
+    } else {
+        return 'file'
+    }
+}
+
+//ZSRY-126：批量下载文件
+function batchDownField(index, ids) {
+    if (index < ids.length) {
+        location.href = WWWROOT + "/networkdisk/downloadAttachFile.mhtml?id=" + ids[index]
+        setTimeout(function () {
+            batchDownField(index + 1, ids)
+        }, 500);
+    }
+}
+
+//ZSRY-126：显示所有附件
+function showFieldWindow(attachFileList) {
+    var store = new top.Ext.data.Store({
+        data: attachFileList,
+        reader: new top.Ext.data.JsonReader({
+            fields: [
+                { name: 'id' },
+                { name: 'UUIDFileName' },
+                { name: 'attachFileName' },
+                { name: 'attachType' },
+                { name: 'contentType' }
+            ]
+        })
+    });
+    var selectModel = new top.Ext.grid.CheckboxSelectionModel();
+    var gridPanel = new top.Ext.grid.GridPanel({
+        store: store,
+        id: 'gridPanel',
+        autoScroll: true,
+        width: 480,
+        height: 220,
+        tbar: [{
+            text: '批量下载',
+            handler: function () {
+                var row = gridPanel.getSelectionModel().getSelections();
+                if (row.length > 0) {
+                    var ids = [];
+                    for (var i = 0; i < row.length; i++) {
+                        var id = row[i].data.id;
+                        ids.push(id);
+                    }
+                    batchDownField(0, ids);
+                }
+            }
+        }],
+        bodyStyle: 'border:1px solid #afd7af',
+        sm: selectModel,
+        cm: new top.Ext.grid.ColumnModel([selectModel,
+            { header: "名称", width: 380, dataIndex: 'attachFileName', menuDisabled: true },
+            {
+                header: "操作", width: 100, menuDisabled: true, renderer: function (v, p, record) {
+                    var str = "<a href='javascript:void(0)' onclick=\"getCurrentTab().prevewField('" + record.data.id + "','" + record.data.attachFileName + "') \" class='linkstyle' style='margin-right:10px'>预览</a>";
+                    if (getFileType(record.data.attachType) == 'video') {
+                        str = "<a href='javascript:void(0)' onclick=\"getCurrentTab().playVideoForField('" + record.data.UUIDFileName + "','" + record.data.attachFileName + "') \" class='linkstyle' style='margin-right:10px'>播放</a>";
+                    }
+                    str += "<a href='" + WWWROOT + "/networkdisk/downloadAttachFile.mhtml?id=" + record.data.id + "' class='linkstyle'>下载</a>";
+                    return str;
+                }
+            }
+        ]),
+        frame: false,
+        viewConfig: { forceFit: true }
+    })
+
+    var window = new top.Ext.Window({
+        id: 'fieldWindow',
+        title: '显示附件',
+        width: 500,
+        height: 250,
+        border: false,
+        modal: true,
+        closeAction: 'close',
+        items: [gridPanel]
+    });
+
+    window.show();
+}
+
+//ZSRY-126：修改密码
+function showPasswordDownWindow(downloadPassword) {
+    var formObj = new Ext.FormPanel({
+        frame: true,
+        labelSeparator: '：',
+        bodyStyle: 'padding:5px 5px 0px 25px',
+        width: 400,
+        labelWidth: 80,
+        labelAlign: 'right',
+        items: [{
+            layout: 'column',
+            items: [{
+                columnWidth: .5,
+                layout: 'form',
+                items: [{
+                    xtype: 'textfield',
+                    fieldLabel: '当前密码',
+                    inputType: downloadPassword == '' ? '' : 'password',
+                    name: 'oldPassword',
+                    id: 'oldPassword',
+                    width: 280,
+                    value: downloadPassword == '' ? '未设置' : downloadPassword,
+                    readOnly: true,
+                    cls: 'fieldReadOnlyNoRemove',
+                    allowBlank: true
+                }]
+            }, {
+                columnWidth: .5,
+                layout: 'form',
+                id: 'showPwdButton',
+                hidden: downloadPassword == '',
+                items: [{
+                    xtype: 'button',
+                    text: '显示密码',
+                    handler: function () {
+                        var downloadPasswordText = dencryptText(downloadPassword, DEVICEINTERFACE_ENCRPT_DEPTH);
+                        Ext.getCmp('oldPassword').setValue(downloadPasswordText);
+                        var textField = Ext.getCmp('oldPassword');
+                        var inputEl = textField.getEl().dom;
+                        inputEl.type = 'text'
+                        Ext.getCmp('showPwdButton').hide();
+                        Ext.getCmp('hiddenPwdButton').show();
+                    }
+                }]
+            }, {
+                columnWidth: .5,
+                layout: 'form',
+                id: 'hiddenPwdButton',
+                hidden: true,
+                items: [{
+                    xtype: 'button',
+                    text: '隐藏密码',
+                    handler: function () {
+                        Ext.getCmp('oldPassword').setValue(downloadPassword);
+                        var textField = Ext.getCmp('oldPassword');
+                        var inputEl = textField.getEl().dom;
+                        inputEl.type = 'password'
+                        Ext.getCmp('showPwdButton').show();
+                        Ext.getCmp('hiddenPwdButton').hide();
+                    }
+                }]
+            }, {
+                columnWidth: 1,
+                layout: 'form',
+                items: [{
+                    xtype: 'textfield',
+                    fieldLabel: '新密码',
+                    inputType: 'password',
+                    name: 'downloadPassword',
+                    id: 'downloadPassword',
+                    minLength: 6,
+                    width: 280,
+                    allowBlank: false,
+                    blankText: '请输入新密码！',
+                    msgTarget: 'side'
+                }]
+            }, {
+                columnWidth: 1,
+                layout: 'form',
+                items: [{
+                    xtype: 'textfield',
+                    fieldLabel: '确认新密码',
+                    inputType: 'password',
+                    name: 'confirmNewPassword',
+                    id: 'confirmNewPassword',
+                    minLength: 6,
+                    width: 280,
+                    allowBlank: false,
+                    blankText: '请输入确认新密码！',
+                    msgTarget: 'side'
+                }]
+            }]
+        }],
+
+        buttons: [{
+            text: '确认',
+            handler: save
+        }, {
+            text: '清除密码',
+            handler: function () {
+                Ext.MessageBox.confirm("请确认", "是否清除密码？", function (btn) {
+                    if (btn == 'yes') {
+                        clearDownloadPassword();
+                    }
+                });
+            }
+        }, {
+            text: '取消',
+            handler: function () {
+                Ext.getCmp('passwordDownWindow').close();
+            }
+        }]
+    });
+
+    function save() {
+        if (!formObj.form.isValid()) {
+            Ext.MessageBox.show({
+                title: '错误提示',
+                msg: '请正确填写表单各值。',
+                buttons: Ext.Msg.OK,
+                icon: Ext.Msg.ERROR
+            });
+            return false;
+        }
+        var downloadPassword = Ext.getCmp('downloadPassword').getValue();
+        var confirmNewPassword = Ext.getCmp('confirmNewPassword').getValue();
+        if (downloadPassword != confirmNewPassword) {
+            Ext.MessageBox.show({
+                title: '错误提示',
+                msg: '新密码与确认新密码不一致，请重新填写！',
+                buttons: Ext.Msg.OK,
+                icon: Ext.Msg.ERROR
+            });
+            return false;
+        }
+        Ext.MessageBox.confirm("请确认", "是否修改密码？", function (btn) {
+            if (btn == 'yes') {
+                setDownloadPassword(downloadPassword);
+            }
+        });
+    }
+
+    var window = new Ext.Window({
+        id: 'passwordDownWindow',
+        layout: 'fit',
+        title: '修改密码',
+        width: 440,
+        height: 185,
+        modal: true,
+        border: false,
+        plain: true,
+        modal: true,
+        closeAction: 'close',
+        items: [formObj]
+    });
+
+    window.show();
+}
+
+//ZSRY-126：下载附件
+function showDownFieldWindow() {
+    var window;
+    var formObj = new Ext.FormPanel({
+        frame: true,
+        labelSeparator: '：',
+        bodyStyle: 'padding:5px 5px 0px 25px',
+        width: 300,
+        labelWidth: 60,
+        labelAlign: 'right',
+        items: [{
+            layout: 'column',
+            items: [{
+                columnWidth: 1,
+                layout: 'form',
+                items: [{
+                    xtype: 'textfield',
+                    fieldLabel: '',
+                    labelSeparator: '',
+                    width: 280,
+                    value: '请输入下载密码：',
+                    readOnly: true,
+                    cls: 'fieldReadOnlyNoRemove',
+                    allowBlank: true
+                }]
+            }, {
+                columnWidth: 1,
+                layout: 'form',
+                items: [{
+                    xtype: 'textfield',
+                    fieldLabel: '密码',
+                    inputType: 'password',
+                    name: 'downloadPassword2',
+                    id: 'downloadPassword2',
+                    minLength: 6,
+                    allowBlank: false,
+                    blankText: '请输入密码！',
+                    msgTarget: 'side'
+                }]
+            }]
+        }],
+
+        buttons: [{
+            text: '保存',
+            handler: function () {
+                var downloadPassword = Ext.getCmp('downloadPassword2').getValue();
+                if (downloadPassword == '') {
+                    showResult('密码不能为空！');
+                    return
+                }
+                downloadPasswordVerification(downloadPassword, window);
+            }
+        }, {
+            text: '取消',
+            handler: function () {
+                window.close();
+            }
+        }]
+    });
+
+    window = new Ext.Window({
+        layout: 'fit',
+        title: '下载',
+        width: 340,
+        height: 150,
+        modal: true,
+        border: false,
+        plain: true,
+        modal: true,
+        closeAction: 'close',
+        items: [formObj]
+    });
+
+    window.show();
+}
+
+//DGKHYY-25：显示PDA安装包下载地址的二维码
+function showPDADownloadWindow() {
+    document.getElementById('downloadImage').innerHTML = '';
+    var imagePanel = new top.Ext.Panel({
+        id: 'downloadImagePanel',
+        layout: 'fit',
+        bbar: [{
+            xtype: 'button',
+            text: '请在PDA端使用浏览器或下载功能扫描二维码进行下载'
+        }],
+        items: [{
+            xtype: 'box',
+            id: 'browseImage',
+            fieldLabel: "二维码",
+            autoEl: {
+                id: 'downloadImageBrowse',
+                tag: 'div',
+                complete: 'off'
+            }
+        }]
+    });
+
+    var url = WWWROOT + '/mobileClient/mobileClientAction!downloadPdaInstallPackage.do';
+    var qrcode = new QRCode("downloadImage", url);
+    setTimeout(function () {
+        var imgHtml = document.getElementById('downloadImage').innerHTML;
+        var downloadImageBrowse = top.Ext.get('downloadImageBrowse');
+        var image = downloadImageBrowse.dom;
+        image.innerHTML = imgHtml;
+    }, 1000);
+    var window = new top.Ext.Window({
+        id: 'PDADownloadWindow',
+        layout: 'fit',
+        title: 'PDA客户端下载',
+        width: 308,
+        height: 350,
+        modal: true,
+        border: false,
+        plain: true,
+        modal: true,
+        closeAction: 'close',
+        items: [imagePanel]
+    });
+
+    window.show();
+}
+
 //删除
 function deleteFileAndFolder() {
     var moduleId = getModuleId();
@@ -37,7 +559,7 @@
                         videoName: params.videoName, //视频播放文件名
                         fileName: params.fileName  //文件名
                     });
-                    openModalWindowForExt(WWWROOT + "/knowledge/watchVideo.jsp?" + url, '', "观看视频", "565", "390");
+                    openModalWindowForExt(WWWROOT + "/knowledge/watchVideo.jsp?" + url, '', "观看视频", "930", "538");
                 } else if (type == 'image') {
                     document.getElementById('clickTab').click();
                 } else {
@@ -150,13 +672,6 @@
     accumulateReadRecord(id, 'video', params);
 }
 
-//打开图片
-function openImg(attachFileId, moduleId, id) {
-    var linkUrl = WWWROOT + "/attachfiles/fileDownLoad?loadType=open&id=" + attachFileId + "&moduleId=" + moduleId;
-    document.getElementById('clickTab').setAttribute('href', linkUrl);
-    accumulateReadRecord(id, 'image');
-}
-
 function openUrl(id, url) {
     var params = {
         url: url
@@ -169,12 +684,13 @@
     var linkUrl = record.data['linkUrl'];
     var attachFileType = record.data['attacnFileType'];
     var attachFileId = record.data['attachFileId'];
+    var attachFileName = record.data['attachFileName'];
     if (!isUndefinedOrNullOrEmpty(attachFileId) && attachFileId.indexOf(",") == -1) {
         //判断类型是否包含video包含为视频文件
         if (attachFileType.indexOf("video") >= 0) {
             v = '<img src="' + WWWROOT + '/images/' + record.data['imgName'] + '" >&nbsp;<a href="javascript:void(0);" onclick="playVideo(\'' + record.data['attachFileName'] + '\',\'' + record.data['name'] + '\',\'' + record.data['id'] + '\');return false;">' + v + '</a>';
         } else {
-            v = '<img src="' + WWWROOT + '/images/' + record.data['imgName'] + '" >&nbsp;<a href="javascript:void(0);" onclick="openImg(\'' + attachFileId + '\',\'' + moduleId + '\',\'' + record.data['id'] + '\');return false;">' + v + '</a>';
+            v = '<img src="' + WWWROOT + '/images/' + record.data['imgName'] + '" >&nbsp;<a href="javascript:void(0);" onclick="prevewField(\'' + attachFileId + '\',\'' + attachFileName + '\',\'' + moduleId + '\');return false;">' + v + '</a>';
         }
     } else {
         //如果不为空,则目前加载的文件,要重新设置对应文件的url,如果是目前加载目录,这个url是一个js的方法
@@ -578,22 +1094,36 @@
         items: [{
             text: '增加文件',
             iconCls: 'btn_ext_add',
-            hidden:SSTS_TrainingManage_Add,
+            hidden: SSTS_TrainingManage_Add,
             handler: function () { addFile(); }
         }, '-', {
             text: '增加文件夹',
             iconCls: 'btn_ext_add_folder',
-            hidden:SSTS_TrainingManage_Add,
+            hidden: SSTS_TrainingManage_Add,
             handler: function () { addFolder(); }
         }, '-', {
             text: '修改',
             iconCls: 'btn_ext_edit',
-            hidden:SSTS_TrainingManage_Update,
+            hidden: SSTS_TrainingManage_Update,
             handler: function () { updateFileAndFolder(); }
         }, '-', {
+            text: '下载',
+            iconCls: 'btn_ext_upload',
+            hidden: SSTS_TrainingManage_Download,
+            handler: function () {
+                loadDownloadPassword(0);
+            }
+        }, '-', {
+            text: '下载密码管理',
+            iconCls: 'btn_ext_application_todo',
+            hidden: SSTS_DownloadPassword_Manager,
+            handler: function () {
+                loadDownloadPassword(1);
+            }
+        }, '-', {
             text: '删除',
             iconCls: 'btn_remove',
-            hidden:SSTS_TrainingManage_Delete,
+            hidden: SSTS_TrainingManage_Delete,
             handler: function () { deleteFileAndFolder(); }
         }, '-', {
             text: '上一文件夹',
Index: ssts-web/src/main/webapp/knowledge/viewExt.jsp
===================================================================
diff -u -r34874 -r40529
--- ssts-web/src/main/webapp/knowledge/viewExt.jsp	(.../viewExt.jsp)	(revision 34874)
+++ ssts-web/src/main/webapp/knowledge/viewExt.jsp	(.../viewExt.jsp)	(revision 40529)
@@ -1,15 +1,29 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" %>
+<%@page import="com.forgon.tools.crypto.coder.CoderEncryption"%>
 <%@ include file="/common/taglibs.jsp"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title></title>
 <style type="text/css">
-img {
-    vertical-align: middle;
-}
+    img {
+        vertical-align: middle;
+    }
 </style>
+<%
+    request.setAttribute("userName",AcegiHelper.getLoginUser().getUserFullName());
+%>
+<%@ include file="/common/includeExtJsAndCss.jsp"%>
+<script type="text/javascript" src="${ctx }/dwr/interface/KnowledgeTableManager.js" ></script>
+<script type="text/javascript" src="${ctx }/dwr/interface/AttachFileManager.js" ></script>
+<script type="text/javascript" src="${ctx }/dwr/engine.js" ></script>
+<script type="text/javascript" src="${ctx }/dwr/util.js" ></script>
+<script type="text/javascript" src="${ctx }/ext/grid/ForgonGrid.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/js/json3.min.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/js/base64/base64Encrypt.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
 <script type="text/javascript">
     var moduleId = '${param.moduleId}';
     var columnsJson = <s:property value="columnsJson" escapeHtml="false"/>;
@@ -45,17 +59,27 @@
     <operation:authorize ifAnyGranted="SSTS_TrainingManage_Query">
         SSTS_TrainingManage_Query = false;
     </operation:authorize>
+    var DEVICEINTERFACE_ENCRPT_DEPTH = '<%=CoderEncryption.DOWNLOADPASSWORD_ENCRPT_DEPTH%>';
+    /**
+    * 《ZSRY-126：下载密码管理》
+    */
+    var SSTS_DownloadPassword_Manager = true;
+    <operation:authorize ifAnyGranted="SSTS_DownloadPassword_Manager">
+        SSTS_DownloadPassword_Manager = false;
+    </operation:authorize>
+    /**
+    * 《ZSRY-126：培训管理文件下载》
+    */
+    var SSTS_TrainingManage_Download = true;
+    <operation:authorize ifAnyGranted="SSTS_TrainingManage_Download">
+        SSTS_TrainingManage_Download = false;
+    </operation:authorize>
+
+    if(!sstsConfig.enableCopyrightManagementModelOfTrainingManage){
+        SSTS_DownloadPassword_Manager = true;
+        SSTS_TrainingManage_Download = true;
+    }
 </script>
-<%@ include file="/common/includeExtJsAndCss.jsp"%>
-<script type="text/javascript" src="${ctx }/dwr/interface/KnowledgeTableManager.js" ></script>
-<script type="text/javascript" src="${ctx }/dwr/engine.js" ></script>
-<script type="text/javascript" src="${ctx }/dwr/util.js" ></script>
-<script type="text/javascript" src="${ctx }/ext/grid/ForgonGrid.js?version=${svnRevision}"></script>
-<script type="text/javascript" src="${ctx}/js/json3.min.js?version=${svnRevision}"></script>
-<script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
-<%
-    request.setAttribute("userName",AcegiHelper.getLoginUser().getUserFullName());
-%>
 </head>
 <body>
 <form name="parametersFrm">
Index: ssts-web/src/main/webapp/js/uploadFiles.js
===================================================================
diff -u -r21267 -r40529
--- ssts-web/src/main/webapp/js/uploadFiles.js	(.../uploadFiles.js)	(revision 21267)
+++ ssts-web/src/main/webapp/js/uploadFiles.js	(.../uploadFiles.js)	(revision 40529)
@@ -30,14 +30,43 @@
 
 /**
  * 播放视频
- * @param me
- * @param moduleId 模块id
- * @param id 附件id
  */
-function playVideo(me, moduleId, id) {
-    me.href = webCtxRoot + '/attachfiles/fileDownLoad?loadType=play&id=' + id + '&moduleId=' + moduleId;
+function playVideo(videoName, fileName, id) {
+    var url = Ext.urlEncode({
+        videoName: videoName,
+        fileName: fileName
+    });
+    openModalWindowForExt(WWWROOT + "/knowledge/watchVideo.jsp?" + url, '', "观看视频", "930", "538");
 }
 
+function accumulateReadRecord(id, type, params) {
+    Ext.Ajax.request({
+        url: WWWROOT + '/disinfectSystem/baseData/readRecordAction!accumulateReadRecord.do?moduleId=trainingManage&id=' + id,
+        success: function (response, options) {
+            var result = Ext.decode(response.responseText);
+            if (result.success) {
+                if (type == 'video') {
+                    var url = Ext.urlEncode({
+                        videoName: params.videoName, //视频播放文件名
+                        fileName: params.fileName  //文件名
+                    });
+                    openModalWindowForExt(WWWROOT + "/knowledge/watchVideo.jsp?" + url, '', "观看视频", "930", "538");
+                } else if (type == 'image') {
+                    document.getElementById('clickTab').click();
+                } else {
+                    location.href = params.url
+                }
+            } else {
+                showResult(result.msg);
+            }
+        },
+        failure: function (response, options) {
+            var result = Ext.decode(response.responseText);
+            showResult(result.msg);
+        }
+    });
+}
+
 //调用DWR显示附件列表
 function displayAttachFiles(fObjName){
     if(fObjName==""){
@@ -56,28 +85,27 @@
         moduleId = '';
     }
 
-    var attachUrl = "<a target='_blank' href='"+webCtxRoot+"/attachfiles/fileDownLoad?loadType=open&moduleId=" + moduleId + "&id=" ;
-    var delAttachFileBeginStr = "&nbsp;&nbsp;<a href=\"javascript:void(0)\" onclick=\"deleteAttachFile(this,'";
-    var delAttachFileEndStr = "');\" ><img class='from_toolbar_image' src='"+webCtxRoot+"/images/btn_delete.gif' align='middle' border='0' >移除附件</a>";
-
-    var playAttachFileBtnBegin = "&nbsp;&nbsp;<a href=\"javascript:void(0)\" target='_blank' onclick=\"playVideo(this,'";
-    var playAttachFileBtnEnd = "');\"> <img class='from_toolbar_image' src='"+webCtxRoot+"/images/web/play.png' align='middle' border='0' >播放</a>";
-
     var attachFileTitleObject = document.getElementById("attachFileTitle");
     if(attachFileList.length == 0 && attachFileTitleObject != null && enableEditField==false){
         attachFileTitleObject.innerHTML = "";
     }
-
     for(var i=0; i<attachFileList.length; i++){
-        attachFileVO = attachFileList[i];
-        var strHtml = attachUrl + attachFileVO.id+"' >"+attachFileVO.attachFileName+"</a>"
+        var id = attachFileList[i].id;
+        var attachFileName = attachFileList[i].attachFileName;
+        var UUIDFileName = attachFileList[i].UUIDFileName;
+        var suffix = attachFileList[i].attachType;
+        var strHtml = "";
+        if(sstsConfig.enableCopyrightManagementModelOfTrainingManage){
+            strHtml += attachFileName + "&nbsp;&nbsp;";
+        }else {
+            strHtml += "<a target='_blank' href='"+webCtxRoot+"/attachfiles/fileDownLoad?loadType=open&moduleId=" + moduleId + "&id="+id+"' >"+attachFileName+"</a>&nbsp;&nbsp;";
+        }
+        
         if(enableEditField){
-            strHtml += delAttachFileBeginStr + attachFileVO.id + delAttachFileEndStr ;
-            var suffix = attachFileVO.attachType;
+            strHtml += "<a href='javascript:void(0)' onclick='deleteAttachFile(this,\""+id+"\");' ><img class='from_toolbar_image' src='"+webCtxRoot+"/images/btn_delete.gif' align='middle' border='0' >移除附件</a>&nbsp;&nbsp;";
             var type = judgeAttachTypeBySuffix(suffix.substr(1));
             if (type == AttachFileType.getVideo()){
-                //如果该附件是视频文件,则生成视频播放按钮
-                strHtml += playAttachFileBtnBegin + moduleId + "'" + ",'" + attachFileVO.id  + playAttachFileBtnEnd ;
+                strHtml += "<a href='javascript:void(0)' onclick='playVideo(\""+UUIDFileName+"\",\""+attachFileName+"\",\""+id+"\");'> <img class='from_toolbar_image' src='"+webCtxRoot+"/images/web/play.png' align='middle' border='0' >播放</a>";
             }
         }
         var fileName = document.createElement("span");
Index: ssts-web/src/main/webapp/knowledge/watchVideo.jsp
===================================================================
diff -u -r40302 -r40529
--- ssts-web/src/main/webapp/knowledge/watchVideo.jsp	(.../watchVideo.jsp)	(revision 40302)
+++ ssts-web/src/main/webapp/knowledge/watchVideo.jsp	(.../watchVideo.jsp)	(revision 40529)
@@ -34,7 +34,7 @@
 </head>
 
 <body>
-    <div id="video" style="width:600px;height:400px;">
+    <div id="video" style="width:960px;height:540px;">
 	    <div id="a1"></div>
 	</div>
 <script type="text/javascript" src="${pageContext.request.contextPath }/activeX/ckplayer/ckplayer.js" charset="utf-8"></script>
@@ -80,7 +80,7 @@
         var params={bgcolor:'#FFF',allowFullScreen:true,allowScriptAccess:'always'};//这里定义播放器的其它参数如背景色（跟flashvars中的b不同），是否支持全屏，是否支持交互
         var attributes={id:'ckplayer_a1',name:'ckplayer_a1',menu:'false'};
         //下面一行是调用播放器了，括号里的参数含义：（播放器文件，要显示在的div容器，宽，高，需要flash的版本，当用户没有该版本的提示，加载初始化参数，加载设置参数如背景，加载attributes参数，主要用来设置播放器的id）
-        CKobject.embedSWF(path,'a1','ckplayer_a1','600','400',flashvars,params);
+        CKobject.embedSWF(path,'a1','ckplayer_a1','960','540',flashvars,params);
           /*CKobject.embedSWF(播放器路径,容器id,播放器id/name,播放器宽,播放器高,flashvars的值,其它定义也可省略);
           此时可以删除ckplayer.js中的最后一行，交互的部分也要改成CKobject.getObjectById('ckplayer_a1')
         */
@@ -92,7 +92,7 @@
         */
         var video=['http://movie.ks.js.cn/flv/other/1_0.mp4->video/mp4','http://www.ckplayer.com/webm/0.webm->video/webm','http://www.ckplayer.com/webm/0.ogv->video/ogg'];
         var support=['iPad','iPhone','ios','android+false','msie10+false'];//默认的在ipad,iphone,ios设备中用html5播放,android,ie10上没有安装flash的也调用html5
-        CKobject.embedHTML5('video','ckplayer_a1',600,400,video,flashvars,support);
+        CKobject.embedHTML5('video','ckplayer_a1',960,540,video,flashvars,support);
         /*
         如果不想使用html5播放器，只要把上面三行去掉就可以了
         */
@@ -101,7 +101,7 @@
         watchForIE(name)
     }else {
         var videoUrl =  WWWROOT + '/disinfectSystem/packingAction!getVideo.do?name=' + encodeURI(name) + '&a=2';
-    	$('#video').html('<video id="myVideo"  src="'+videoUrl+'" controlslist="nodownload" controls width="600" height="400"></video>');
+    	$('#video').html('<video id="myVideo"  src="'+videoUrl+'" controlslist="nodownload" controls width="960" height="540"></video>');
         $("#video").bind('contextmenu', function () {
             return false;
         })
Index: ssts-web/src/main/webapp/common/includeUploadFilesJSAndCSS.jsp
===================================================================
diff -u -r29513 -r40529
--- ssts-web/src/main/webapp/common/includeUploadFilesJSAndCSS.jsp	(.../includeUploadFilesJSAndCSS.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/common/includeUploadFilesJSAndCSS.jsp	(.../includeUploadFilesJSAndCSS.jsp)	(revision 40529)
@@ -3,11 +3,14 @@
 <%@ page contentType="text/html; charset=UTF-8"%>
 <% request.setAttribute("attachFileFieldname", com.forgon.tools.AppKeys.Attach_File_Field_Prefix); %>
 <% request.setAttribute("attachFiLeMaxSize", AppKeys.ATTACH_FILE_MAX_SIZE); %>
+<%@ include file="/common/includeExtJsAndCss.jsp"%>
 <link rel="stylesheet" href="${ctx}/styles/uploadFiles.css" type="text/css" />
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
 <script type="text/javascript">var attachFileFieldname = "${attachFileFieldname}";</script>
 <script type="text/javascript" src="${ctx}/dwr/interface/AttachFileManager.js" ></script>
 <script type="text/javascript" src="${ctx}/dwr/engine.js" ></script>
 <script type="text/javascript" src="${ctx}/dwr/util.js" ></script>
+<script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/uploadFiles.js?version=${svnRevision}"></script>
 <script>
     //上传附件的最大容量