فهرست منبع

修改任务编排前端

llh 9 سال پیش
والد
کامیت
b4b940248a

+ 1 - 1
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/common/indexJs.jsp

@ -68,7 +68,7 @@
                {id: 11, pid: 1, text: '任务跟踪', url: '${contextRoot}/datacollect/trackJob',targetType:'1'},
                {id: 12, pid: 1, text: '任务补采', url: '${contextRoot}/datacollect/repeatDatacollect'},
                {id: 13, pid: 1, text: '任务配置', url: '${contextRoot}/datacollect/configJob'},
                {id: 14, pid: 1, text: '任务编排', url: '${contextRoot}/datacollect/jobLayout'},
                {id: 14, pid: 1, text: '任务编排', url: '${contextRoot}/crawler/jobLayout'},
                //标准管理
                //标准规范中心
                {id: 2, text: '标准管理',icon:'${staticRoot}/images/index/menu3_icon.png'},

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/dataMapping.jsp → Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/crawler/dataMapping.jsp


+ 1 - 0
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/dataMappingJs.jsp

@ -10,6 +10,7 @@
<script>
    (function(win,$) {
        //getMappingRelation
        $('#main').tableViewer(remoteData);
        $("#btn_close").click(function () {

+ 2 - 9
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/datasetDetail.jsp

@ -1,7 +1,7 @@
<%--
  Created by IntelliJ IDEA.
  User: llh
  Date: 2016/1/7
  Date: 2016/4/26
  Time: 14:06
  To change this template use File | Settings | File Templates.
--%>
@ -19,7 +19,7 @@
  <div class="m-form-group" style="margin-left: 10px;">
    <label style="text-align: left;width: 68px;">数据集:</label>
    <div class="l-text-wrapper m-form-control">
      <input type="text" class="f-w240 f-pl5" id="inp_datasetNm">
      <input type="text" class="f-w240 f-pl5" id="inp_datasetNm" placeholder="请输入数据集名称">
    </div>
  </div>
  <div style="margin: 0 15px;">
@ -39,11 +39,4 @@
    </div>
  </div>
  <input type="hidden" id="standardId" value=""/>
  <input type="hidden" id="type" value=""/>
  <input type="hidden" id="stdType" value=""/>
  <input type="hidden" id="typeFlg" value=""/>
  <input type="hidden" id="hd_url" value="${contextRoot}"/>
  <input type="hidden" id="hd_user" value="${User.id}"/>
</div>

+ 118 - 0
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/crawler/datasetDetailJs.jsp

@ -0,0 +1,118 @@
<%--
  Created by IntelliJ IDEA.
  User: llh
  Date: 2016/1/7
  Time: 14:06
  To change this template use File | Settings | File Templates.
--%>
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<script >
  (function ($, win) {
      var jobDataset = {};
      var Util = $.Util;
      debugger
      var schemeId = '${schemeId}';
      var checkedRowsIndex = '${checkedRowsIndex}'==""?[]:JSON.parse('${checkedRowsIndex}');
      //数据集处理
      jobDataset.attr = {
        grid:null,
        $searchNm: $('#inp_datasetNm'),
        init: function () {
            if(this.grid)
                return;
            this.$searchNm.ligerSearch({onClick: function (value) {
                alert(1)
                return false;
                var values = {
                    datasetId:parentId,
                    dictId:parentId,
                    stdVersion:$("#version").val(),
                    condition: JSON.stringify({"name":searchNmEntry})
                };
                this.grid.setOptions({parms: values});
                //重新查询
                this.grid.loadData(true);
            }});
            this.grid = $("#div_dataset_grid").ligerGrid({
                url: '${contextRoot}/crawler/getSchemeDataSets',
                parms:{versionId:"${version}"},
                checkbox: true,
                width:560,
                height:400,
                usePager: false,
                columns: [
                    { display: 'datasetId', name: 'datasetId', hide:true },
                    {display:'数据集编码',name:'datasetCode', width: '50%'},
                    {display:'数据集名称',name:'datasetName',width: '50%'}
                ],
                //默认选中
                isChecked:function(row){
                    debugger
                    if(checkedRowsIndex.length>0){
                        if(row.__index == checkedRowsIndex[row.__index].index){
                            return true;
                        }else{
                            return false;
                        }
                    }
                    if(checkedRowsIndex.length==0){
                        if(row.checked=="1")
                        {
                            return true;
                        }
                        else{
                            return false;
                        }
                    }
                },
                //选中修改值
                onCheckRow:function(checked,data,rowid,rowdata)
                {
                    //修改行checked值
                    if(checked)
                        data.checked ="1";
                    else
                        data.checked ="0";
                },
            });
          this.event();
        },
        event: function () {
          $("#btn_save").click(function () {
                var checkRowsList = jobDataset.attr.grid.getCheckedRows();
                var checkRowObjs = $(parent.jobLayout.grid.getCheckedRowObjs()).find(".sel-dataset-name");
                var datasetList = [];
                var datasetName = "";
                var  checkedRowsIndex = [];
                for(var  i=0;i<checkRowsList.length;i++){
                      datasetName += checkRowsList[i].datasetName+",";
                      var row =  {datasetId: checkRowsList[i].datasetId, datasetCode: checkRowsList[i].datasetCode, datasetName: checkRowsList[i].datasetName};
                      datasetList.push(row);
                    checkedRowsIndex.push({index:checkRowsList[i].__index});
                }
              checkRowObjs.val(datasetName.toString().substring(0,datasetName.length-1));
              window.top.jQuery.data( checkRowObjs[0], "dataSets", {"dataSets":datasetList});
              window.top.jQuery.data( checkRowObjs[0], "checkedRowsIndex", checkedRowsIndex);
              parent.jobLayout.dialog.close();
          });
          $("#btn_close").click(function () {
              parent.jobLayout.dialog.close();
          });
        }
      };
      $(function(){
          jobDataset.attr.init();
      })
  })(jQuery, window);
</script>

+ 1 - 1
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/jobLayout.jsp

@ -19,7 +19,7 @@
    </div>
    <!--######数据源信息表######-->
    <div id="div_grid" ></div>
    <div id="div_job_grid" ></div>
</div>

+ 71 - 83
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/jobLayoutJs.jsp

@ -18,36 +18,37 @@
            $('.m-retrieve-area').show();
            $.ajax({
                url: '${contextRoot}/datacollect/getLayout',
                dataType: "json",
                success: function (data) {
                    if(data.successFlg){
                        schemeVersionList = data.detailModelList || [];
                    }else{
                        $.ligerDialog.error(data.message);
                    }
                },
                error: function (jqXHR, textStatus, errorThrown) {
                    $.ligerDialog.error("获取适配方案版本列表失败!")
                }
            });
            me.grid = $("#div_grid").ligerGrid({
                url: '${contextRoot}/datacollect/getSchemeVersionList',
                usePager: false,
            <%--$.ajax({--%>
                <%--url: '${contextRoot}/crawler/getLayout',--%>
                <%--dataType: "json",--%>
                <%--success: function (data) {--%>
                    <%--if(data.successFlg){--%>
                        <%--schemeVersionList = data.detailModelList || [];--%>
                    <%--}else{--%>
                        <%--$.ligerDialog.error(data.message);--%>
                    <%--}--%>
                <%--},--%>
                <%--error: function (jqXHR, textStatus, errorThrown) {--%>
                    <%--$.ligerDialog.error("获取适配方案版本列表失败!")--%>
                <%--}--%>
            <%--});--%>
            me.grid = $("#div_job_grid").ligerGrid({
                url: '${contextRoot}/crawler/list',
                method: 'post',
                usePager: true,
                columns: [
                    { display: 'schemeId', name: 'schemeId', hide:true },
                    { display: 'id', name: 'id', hide:true },
                    { display: 'scheme_id', name: 'scheme_id', hide:true },
                    { display: 'datasetId', name: 'datasetId', hide:true },
                    {display:'适配方案',name:'', width: '20%',render: function (row, rowindex, value, column) {
                        var select= '<select class="sel-scheme-name form-control"  id="schemeNm'+rowindex+'" style="margin-top:3px;font-size:12px;">';
                        for(var i=0;i<schemeVersionList.length;i++){
                            select+='<option value="'+schemeVersionList[i].schemeId+'">'+schemeVersionList[i].name+'</option>';
                        }
                        select = $(select+"</select>");
                        $('option[value="'+row.schemeId+'"]',select).attr('selected',true);
                        $('option[value="'+row.scheme_id+'"]',select).attr('selected',true);
                        return  select.prop("outerHTML");
                    }},
@ -55,7 +56,7 @@
                        var select= '<select class="sel-version-name form-control"  id="versionNm'+rowindex+'" style="margin-top:3px;font-size:12px;">';
                        var versionList = [];
                        for(var i=0;i<schemeVersionList.length;i++){
                            if(schemeVersionList[i].schemeId == row.schemeId){
                            if(schemeVersionList[i].schemeId == row.scheme_id){
                                versionList = schemeVersionList[i].versionList;
                                for(var j=0;j<versionList.length;j++){
                                    select+='<option value="'+versionList[j].id+'">'+versionList[j].name+'</option>';
@ -63,19 +64,19 @@
                            }
                        }
                        select = $(select+"</select>");
                        $('option[value="'+row.id+'"]',select).attr('selected',true);
                        $('option[value="'+row.scheme_version_id+'"]',select).attr('selected',true);
                        return  select.prop("outerHTML");
                    }},
                    {display:'数据集名称',name:'dataSets', width: '40%',render: function (row, rowindex, value, column) {
                    {display:'数据集名称',name:'datasetName', width: '40%',render: function (row, rowindex, value, column) {
                        var dataSets = value.toString().substring(0,value.length-1);
                        var html = '<input style="margin-top:3px;font-size:12px;" data-rowindex="'+rowindex+'" class="sel-dataset-name form-control" value="'+(dataSets || "")+'" >' +
                                '<div style="display: none;" id="datasetId'+rowindex+'"></div>';
                        var html = '<input style="margin-top:3px;font-size:12px;" data-rowindex="'+rowindex+'" id="dataSets'+rowindex+'" class="sel-dataset-name form-control" value="'+(dataSets || "")+'" >' ;
                        return html;
                    }},
                    {display:'操作', name: 'operator', width: '20%', render: function (row) {
                        var html = '<div class="m-inline-buttons" style="width:55px;">';
                        html += '<a href="javascript:void(0)" onclick="javascript:jobLayout.mapping(\''+row.id+'\')">数据映射</a>';
                        var html = '<div class="m-inline-buttons" style="width:120px;">';
                        html += '<a href="javascript:void(0)" style="width: 80px;" onclick="javascript:jobLayout.mapping(\''+row.id+'\')">数据映射</a>';
                        html += '<a class="m-btn-delete" onclick="javascript:jobLayout.delete(\''+row.id+'\')"></a>';
                        return html;
                    }}
@ -84,8 +85,9 @@
                    //【适配方案】change事件
                    $(".sel-scheme-name").on("change", function() {
                        var rowIndex = $(this).attr("id").replace("schemeId","");
                        var rowIndex = $(this).attr("id").replace("schemeNm","");
                        var option = "";
                        var versionList = [];
                        for(var i=0;i<schemeVersionList.length;i++){
                            if(schemeVersionList[i].schemeId == $(this).val()){
                                versionList = schemeVersionList[i].versionList;
@ -94,8 +96,8 @@
                                }
                            }
                        }
                        $("#versionId"+rowIndex).html("");
                        $("#versionId"+rowIndex).append(option);
                        $("#versionNm"+rowIndex).html("");
                        $("#versionNm"+rowIndex).append(option);
                    });
                    //【数据集名称】focus事件
@ -103,12 +105,14 @@
                        var rowindex = $(this).attr("data-rowindex");
                        jobLayout.grid.select(rowindex);//选中行
                        var row = jobLayout.grid.getSelectedRow();
                        var  params = {schemeId:row.schemeId,version:row.id,schemeNm:$("#schemeNm"+rowindex).find("option:selected").text()};
                        var checkedRowsIndex =JSON.stringify(jQuery.data($("#dataSets"+rowindex)[0], "checkedRowsIndex"))  || "";//获取缓存勾选的数据集
                        var  params = {schemeId:row.scheme_id,version:row.scheme_version_id,schemeNm:$("#schemeNm"+rowindex).find("option:selected").text(),checkedRowsIndex:checkedRowsIndex};
                        debugger
                        me.dialog = $.ligerDialog.open({
                            height: 600,
                            width: 600,
                            title: "数据集选择器",
                            url: '${contextRoot}/datacollect/datasetDetail',
                            url: '${contextRoot}/crawler/datasetDetail',
                            //load: true,
                            urlParms: params
                        });
@ -124,57 +128,41 @@
        bindEvents: function () {
            var me = this;
            $('#btnAdd').click(function () {
                me.editor();
            });
            $('#btnSave').click(function(){
                //获取选择行
                debugger
                var row = me.grid.getSelectedRow();
                if(row!=null &&row.id!=undefined&&row.id.length>0)
                {
                    $.ligerDialog.success("已交由后台运行!");
                    var jobId = row.id;
                    $.ajax({ //ajax处理
                        type: "POST",
                        url : "${contextRoot}/datacollect/crawler/job",
                        dataType : "json",
                        data:{jobId:jobId},
                        cache:false,
                        success :function(data){
                            if(!data.successFlg) {
                                $.ligerDialog.error(data.message);
                            }
                        },
                        error :function(data){
                            $.ligerDialog.error("Status:"+data.status +"(" +data.statusText+")");
                        }
                    });
                }
                else{
                    $.ligerDialog.warn('请选择要执行任务!');
                me.gridScrollTop();//1、将滚动条滚动到底部
                var dataRow = {
                    schemeId:'',
                    id:'',
                    dataSets:''
                };
                var rowData = me.grid.getData();
                for (var i = 0; i < rowData.length; i++) {
                    me.grid.rows[i].schemeId = $("#schemeNm"+i).val();
                    me.grid.rows[i].id= $("#versionNm"+i).val();
                    me.grid.rows[i].dataSets= $("#dataSets"+i).val();
                }
                //将新添加的行插入到最后一列
                me.grid.addRow(dataRow);
                $(".sel-scheme-name#schemeNm"+rowData.length).trigger("change");
            });
            $('#btnSave').click(function(){
                //jQuery.data($("#dataSets0")[0], "checkedRowsIndex")
               // jQuery.data($("#dataSets0")[0], "dataSets")
            });
        },
        //编辑弹窗
        editor:function(id){
            var me = this;
            var title = "新增任务";
            var params = null;
            if(id!=undefined&&id!=null)
            {
                title = "编辑任务";
                params = {jobId:id};
        gridScrollTop:function(){
            var div = $('#div_job_grid')[0],
                    scrollHeight = div.scrollHeight;
    
            if( div.scrollTop + div.clientHeight >= div.scrollHeight ){//滚动条已滑动到底部
                return false;
            }
            me.dialog = $.ligerDialog.open({
                height: 556,
                width: 700,
                title: title,
                url: '${contextRoot}/datacollect/editorJob',
                //load: true,
                urlParms: params
            });
            var scrollTop = div.scrollTop;
            var timer= setInterval(function () {
                scrollTop += 150;
                div.scrollTop = scrollTop;
                if (scrollTop >= scrollHeight) clearInterval(timer);}, 100);//滚动到底部,释放计时器
        },
        //数据映射
        mapping:function(id){
@ -184,16 +172,16 @@
                height: 600,
                width: 800,
                title: "数据映射",
                url: '${contextRoot}/datacollect/jobDataMapping',
                url: '${contextRoot}/crawler/jobDataMapping',
                //load: true,
                urlParms: params
            });
        },
        //删除任务
        //删除数据映射
        delete:function(id)
        {
            $.ligerDialog.confirm("确定要删除该任务吗?", function (confirm) {
            $.ligerDialog.confirm("确定要删除该适配方案数据映射吗?", function (confirm) {
                if (confirm)
                {
                    $.ajax({ //ajax处理

+ 0 - 72
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/datasetDetailJs.jsp

@ -1,72 +0,0 @@
<%--
  Created by IntelliJ IDEA.
  User: llh
  Date: 2016/1/7
  Time: 14:06
  To change this template use File | Settings | File Templates.
--%>
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<script >
  (function ($, win) {
      var jobDataset = {};
      var Util = $.Util;
      var schemeId = "${schemeId}";
      //集成标准处理
      jobDataset.attr = {
        grid:null,
        $searchNm: $('#inp_datasetNm'),
        init: function () {
            if(this.grid)
                return;
            this.$searchNm.ligerSearch({onClick: function (value) {
            }});
            this.grid = $("#div_dataset_grid").ligerGrid({
                url: '${contextRoot}/datacollect/getSchemeDataSets',
                parms:{versionId:"${version}"},
                checkbox: true,
                width:560,
                height:400,
                usePager: false,
                columns: [
                    { display: 'datasetId', name: 'datasetId', hide:true },
                    {display:'数据集编码',name:'datasetCode', width: '50%'},
                    {display:'数据集名称',name:'datasetName',width: '50%'}
                ],
                //默认选中
                isChecked:function(row){
                    if(row.checked=="1")
                    {
                        return true;
                    }
                    else{
                        return false;
                    }
                },
            });
          this.event();
        },
        event: function () {
          $("#btn_save").click(function () {
          });
          $("#btn_close").click(function () {
              parent.jobLayout.dialog.close();
          });
        }
      };
      $(function(){
          jobDataset.attr.init();
      })
  })(jQuery, window);
</script>