Forráskód Böngészése

页面补采按钮去除

huangzhiyong 7 éve
szülő
commit
7d8cd412fb

+ 2 - 2
src/main/webapp/WEB-INF/ehr/jsp/common/indexJs.jsp

@ -88,7 +88,7 @@
                {id: 6, text: '数据采集', icon: '${staticRoot}/images/index/menu02.png'},
                {id: 6, text: '数据采集', icon: '${staticRoot}/images/index/menu02.png'},
                {id: 60, pid: 6, text: '任务配置', url: '${contextRoot}/datacollect/configJob', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 60, pid: 6, text: '任务配置', url: '${contextRoot}/datacollect/configJob', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 61, pid: 6, text: '任务跟踪', url: '${contextRoot}/datacollect/trackJob', targetType: '1', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 61, pid: 6, text: '任务跟踪', url: '${contextRoot}/datacollect/trackJob', targetType: '1', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 62, pid: 6, text: '任务补采', url: '${contextRoot}/datacollect/repeatDatacollect', icon: '${staticRoot}/images/index/Ins_icon.png'},
                <%--{id: 62, pid: 6, text: '任务补采', url: '${contextRoot}/datacollect/repeatDatacollect', icon: '${staticRoot}/images/index/Ins_icon.png'},--%>
                //运行监控中心
                //运行监控中心
                {id: 5, text: '运行监控', icon: '${staticRoot}/images/index/menu04.png'},
                {id: 5, text: '运行监控', icon: '${staticRoot}/images/index/menu04.png'},
                {id: 51, pid: 5, text: '系统监控', url: '${contextRoot}/monitor/server/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 51, pid: 5, text: '系统监控', url: '${contextRoot}/monitor/server/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
@ -432,7 +432,7 @@
                    me.localRender();
                    me.localRender();
                    me.clickHomeBtn(false);
                    me.clickHomeBtn(false);
                    //打开页面
                    //打开页面
                    debugger
                    me.loadPage(url, params);
                    me.loadPage(url, params);
                }
                }
                else {
                else {

+ 13 - 5
src/main/webapp/WEB-INF/ehr/jsp/datacollect/repeatDatacollect.jsp

@ -10,6 +10,13 @@
<!-- ####### 页面部分 ####### -->
<!-- ####### 页面部分 ####### -->
<div class="m-content">
<div class="m-content">
    <!-- ####### 查询条件部分 ####### -->
    <!-- ####### 查询条件部分 ####### -->
    <div class="m-form-group">
        <div class="m-form-control">
            <div id="div_back" class="l-button">
                <span>返回</span>
            </div>
        </div>
    </div>
    <form id="dataForm" class="m-form-inline">
    <form id="dataForm" class="m-form-inline">
        <div class="m-form-group">
        <div class="m-form-group">
            <label>任务名称:</label>
            <label>任务名称:</label>
@ -39,11 +46,12 @@
                    <span>搜索</span>
                    <span>搜索</span>
                </div>
                </div>
            </div>
            </div>
            <div class="m-form-control right">
                <div id="btnRepeat" class="l-button" >
                    <span>补采</span>
                </div>
            </div>
            <%--<div class="m-form-control right">--%>
                <%--<div id="btnRepeat" class="l-button" >--%>
                    <%--<span>补采</span>--%>
                <%--</div>--%>
            <%--</div>--%>
        </div>
        </div>
    </form>
    </form>
    <!--######数据源信息表######-->
    <!--######数据源信息表######-->

+ 14 - 4
src/main/webapp/WEB-INF/ehr/jsp/datacollect/repeatDatacollectJs.jsp

@ -78,6 +78,9 @@
            $('#btnSearch').click(function () {
            $('#btnSearch').click(function () {
                me.search();
                me.search();
            });
            });
            $('#div_back').click(function () {
                me.returnTrackJobManage();
            });
            $('#btnRepeat').click(function () {
            $('#btnRepeat').click(function () {
                debugger
                debugger
                var selected = me.grid.getSelectedRows();
                var selected = me.grid.getSelectedRows();
@ -86,10 +89,14 @@
                    var ids ="";
                    var ids ="";
                    for(var i=0;i<selected.length;i++)
                    for(var i=0;i<selected.length;i++)
                    {
                    {
                        if(selected[i]["jobStatus"] == "0")
                        {
                            ids += selected[i]["id"]+",";
                        }
//                        if(selected[i]["jobStatus"] == "1")
//                        {
//                            $.ligerDialog.warn("采集成功记录,无需重采");
//                        }else if(selected[i]["jobStatus"] == "0")
//                        {
//                            ids += selected[i]["id"]+",";
//                        }
                        ids += selected[i]["id"]+",";
                    }
                    }
                    if(ids.length>0)
                    if(ids.length>0)
                    {
                    {
@ -112,6 +119,9 @@
            });
            });
            me.grid.reload();
            me.grid.reload();
        },
        },
        returnTrackJobManage: function () {
            indexPage.loadPage('${contextRoot}/datacollect/trackJob'),"","";
        },
        //补采数据
        //补采数据
        repeat:function(ids){
        repeat:function(ids){
            var me = this;
            var me = this;

+ 1 - 1
src/main/webapp/WEB-INF/ehr/jsp/datacollect/trackJob.jsp

@ -29,7 +29,7 @@
            </div>
            </div>
            <div class="m-form-control right">
            <div class="m-form-control right">
                <div id="btnRepeatJob" class="l-button" >
                <div id="btnRepeatJob" class="l-button" >
                    <span>任务补采</span>
                    <span>采集详情</span>
                </div>
                </div>
            </div>
            </div>

+ 2 - 2
src/main/webapp/WEB-INF/ehr/jsp/datacollect/trackJobJs.jsp

@ -79,9 +79,9 @@
            //任务补采
            //任务补采
            $('#btnRepeatJob').click(function () {
            $('#btnRepeatJob').click(function () {
                parent.indexPage.openMenuByText("任务补采", {
                parent.indexPage.loadPage("${contextRoot}/datacollect/repeatDatacollect", {
                    jobId: $("#selJob").ligerComboBox("getValue")
                    jobId: $("#selJob").ligerComboBox("getValue")
                }, false);
                });
            });
            });
            //任务编辑
            //任务编辑
            $('#btnEditJob').click(function(){
            $('#btnEditJob').click(function(){