shine 9 anos atrás
pai
commit
36b55890e2

+ 5 - 4
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/repeatDatacollectJs.jsp

@ -37,13 +37,13 @@
                selectRowButtonOnly:true,
                height:'100%',
                columns: [
                    {display:'任务名称',name:'jobId', width: '20%',dict:true,dictName:'RS_JOB_CONFIG'},
                    {display:'任务名称',name:'jobId', width: '15%',dict:true,dictName:'RS_JOB_CONFIG'},
                    {display:'数据集名称',name:'jobDatasetName', width: '15%'},
                    {display:'采集开始时间',name:'startTime', width: '15%'},
                    {display:'采集结束时间',name:'endTime', width: '15%'},
                    {display:'采集状态',name:'jobStatus', width: '15%',dict:true,dictName:'JOB_STATUS'},
                    {display:'采集状态',name:'jobStatus', width: '10%',dict:true,dictName:'JOB_STATUS'},
                    {
                        display:'操作',name:'id',width: '20%',render:function(row){
                        display:'操作',name:'id',width: '10%',render:function(row){
                            var html = '<div class="m-inline-buttons" style="width:40px;">';
                        if(row.jobStatus == '0'){
                                html += '<a href="javascript:void(0)" onclick="javascript:repeatDatacollect.repeat(\''+row.id+'\')">补采</a>';
@ -53,7 +53,8 @@
                            return html;
                        }
                    }
                    },
                    {display:'信息',name:'jobContent', width: '20%'},
                ]
            });

+ 10 - 9
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/trackJobJs.jsp

@ -41,18 +41,19 @@
                selectRowButtonOnly:true,
                delayLoad:true,//初始化不加载
                columns: [
                    {display:'采集开始时间',name:'jobStartTime', width: '12%'},
                    {display:'采集结束时间',name:'jobEndTime', width: '12%'},
                    {display:'采集数据集数',name:'jobDatasetCount', width: '12%'},
                    {display:'成功数据集数',name:'jobDatasetSuccess', width: '12%'},
                    {display:'数据总数',name:'count', width: '12%'},
                    {display:'成功数据',name:'success', width: '12%'},
                    {display:'补采数据',name:'repeatNum', width: '12%'},
                    {display:'采集开始时间',name:'jobStartTime', width: '10%'},
                    {display:'采集结束时间',name:'jobEndTime', width: '10%'},
                    {display:'采集数据集数',name:'jobDatasetCount', width: '10%'},
                    {display:'成功数据集数',name:'jobDatasetSuccess', width: '10%'},
                    {display:'数据总数',name:'count', width: '10%'},
                    {display:'成功数据',name:'success', width: '10%'},
                    {display:'补采数据',name:'repeatNum', width: '10%'},
                    {
                        display:'操作',name:'id',width: '16%',render:function(row){
                        display:'操作',name:'id',width: '12%',render:function(row){
                            return '<a href="javascript:void(0)" onclick="javascript:trackJob.repeat()">补采</a>';
                        }
                    }
                    },
                    {display:'信息',name:'jobContent', width: '18%'}
                ],
                onSuccess:function(data)
                {