parent: bf082384 | 补丁 | 提交 | show whitespace
18516761980
2022-02-15 2c288fc04cbb697ec065a578edf8ca816287cdfd 
Merge branch 'zypms' of http://47.97.1.152:5880/r/wms_saas into zypms
3个文件已修改
130 ■■■■■ 已修改文件
src/main/webapp/static/js/hostTable.js 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/projectPlan/projectPlan.js 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/projectPlan/projectPlan.html 111 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 src/main/webapp/static/js/hostTable.js


@@ -12,7 +12,7 @@




    var insTb = table.render({


        elem: '#originTable',


        url: baseUrl + '/host/list/auth',


        url: baseUrl + '/item/list/auth',


        height: 'full-100',


        headers: {token: localStorage.getItem('token')},


        request: {


@@ -30,11 +30,11 @@


        response: {


            statusCode: 200


        },


        toolbar: ['<p>',


        /*toolbar: ['<p>',


            '<button lay-event="add" class="layui-btn layui-btn-sm icon-btn"><i class="layui-icon">&#xe654;</i>添加</button>&nbsp;',


            '<button lay-event="edit" class="layui-btn layui-btn-sm layui-btn-warm icon-btn"><i class="layui-icon">&#xe642;</i>修改</button>&nbsp;',


            '<button lay-event="del" class="layui-btn layui-btn-sm layui-btn-danger icon-btn"><i class="layui-icon">&#xe640;</i>删除</button>',


            '</p>'].join(''),


            '</p>'].join(''),*/


        defaultToolbar: [],


        cols: [[


            {field: 'id', title: '编号', width: 70, align: 'center'},


@@ -54,7 +54,7 @@


    /* 表格搜索 */


    form.on('submit(originTbReset)', function (data) {


        insTb.reload();


        insTb2.reload({where: {host_id: null}, page: {curr: 1}});


        insTb2.reload({where: {item_id: null}, page: {curr: 1}});


        return false;


    });




@@ -80,7 +80,7 @@


    table.on('row(originTable)', function (obj) {


        selObj = obj;


        obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');


        insTb2.reload({where: {host_id: obj.data.id}, page: {curr: 1}});


        insTb2.reload({where: {item_id: obj.data.id}, page: {curr: 1}});


    });




    /* 显示表单弹窗 */




 src/main/webapp/static/js/projectPlan/projectPlan.js


@@ -1,5 +1,6 @@


var pageCurr;


var items;


var insTb2;


getItems();






@@ -15,7 +16,7 @@


    var admin = layui.admin;




    // 数据渲染


    tableIns = table.render({


    insTb2 = table.render({


        elem: '#projectPlan',


        headers: {token: localStorage.getItem('token')},


        url: baseUrl+'/projectPlan/list/auth',


@@ -27,7 +28,7 @@


        where: {


            items: items


        },




        height: 'full-100',


        cols: [[


            {type: 'checkbox', hide:true}


            // ,{field: 'id', align: 'center',title: '唯一ID'}


@@ -79,7 +80,7 @@


        });


        searchData['orderByField'] = obj.field;


        searchData['orderByType'] = obj.type;


        tableIns.reload({


        insTb2.reload({


            where: searchData,


            page: {curr: 1}


        });


@@ -295,7 +296,7 @@


    $.each($('#search-box [name]').serializeArray(), function() {


        searchData[this.name] = this.value;


    });


    tableIns.reload({


    insTb2.reload({


        where: searchData,


        page: {curr: pageCurr}


     });




 src/main/webapp/views/projectPlan/projectPlan.html


@@ -9,36 +9,110 @@


    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">


    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">


    <link rel="stylesheet" href="../../static/css/cool.css" media="all">


    <link rel="stylesheet" href="../../static/css/common.css" media="all">


<!--    <link rel="stylesheet" href="../../static/css/common.css" media="all">-->


    <link rel="stylesheet" href="../../static/css/originTable.css" media="all">


    <style>


        body {


            color: #595959;


            background-color: #f5f7f9;


        }




        .admin-form {


            padding: 25px 30px 0 0 !important;


            margin: 0 !important;


        }




        .alarm-dialog .layui-form-label {


            width: 180px;


        }


        .alarm-dialog .layui-input-block {


            margin-left: 210px;


        }




    </style>


</head>


<body>




<!-- 搜索栏 -->


<div id="search-box" class="layui-form layui-card-header">


    <div class="layui-inline">


        <label class="layui-form-label">当前项目: </label>


        <div class="layui-input-inline">


            <select id="items" name="items" lay-search="" lay-filter="items">


            </select>


        </div>


<!--&lt;!&ndash; 搜索栏 &ndash;&gt;-->


<!--<div id="search-box" class="layui-form layui-card-header">-->


<!--    <div class="layui-inline">-->


<!--        <label class="layui-form-label">当前项目: </label>-->


<!--        <div class="layui-input-inline">-->


<!--            <select id="items" name="items" lay-search="" lay-filter="items">-->


<!--            </select>-->


<!--        </div>-->


<!--    </div>-->


<!--        <div class="layui-inline">-->


<!--            <div class="layui-input-inline">-->


<!--                <input class="layui-input" id="mysearch" type="text" name="id" placeholder="编号" autocomplete="off">-->


<!--            </div>-->


<!--        </div>-->


<!--        &lt;!&ndash; 待添加 &ndash;&gt;-->


<!--        <div id="data-search-btn" class="layui-btn-container layui-form-item">-->


<!--            <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>-->


<!--            <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">重置</button>-->


<!--        </div>-->


<!--</div>-->




<!--&lt;!&ndash; 表格 &ndash;&gt;-->


<!--<div class="layui-form">-->


<!--    <table class="layui-hide" id="projectPlan" lay-filter="projectPlan"></table>-->


<!--</div>-->






<!-- 正文开始 -->


<div class="layui-fluid" style="padding-bottom: 0;">


    <div class="layui-row layui-col-space15">


        <!-- 左 -->


        <div class="layui-col-md3" id="left-table">


            <div class="layui-card">


                <div class="layui-card-body" style="padding: 10px;">


                    <form class="layui-form toolbar">


                        <div class="layui-form-item">


                            <div class="layui-inline" style="max-width: 140px;">


                                <input name="name" class="layui-input" placeholder="输入项目名称"/>


    </div>


        <div class="layui-inline">


                                <button class="layui-btn icon-btn" lay-filter="originTableSearch" lay-submit>


                                    <i class="layui-icon">&#xe615;</i>搜索


                                </button>


                                <button class="layui-btn icon-btn" lay-filter="originTbReset" lay-submit>


                                    <i class="layui-icon">&#xe666;</i>重置


                                </button>


                            </div>


                        </div>


                    </form>


                    <table id="originTable" lay-filter="originTable"></table>


                </div>


            </div>


        </div>


        <!-- 右 -->


        <div class="layui-col-md9">


            <div class="layui-card">


                <div class="layui-card-body" style="padding: 10px;">


                    <form class="layui-form toolbar">


                        <div class="layui-form-item">


                            <div class="layui-inline">


                                <label class="layui-form-label">编号:</label>


            <div class="layui-input-inline">


                <input class="layui-input" id="mysearch" type="text" name="id" placeholder="编号" autocomplete="off">


                                    <input name="uuid" class="layui-input" placeholder="编号"/>


            </div>


        </div>


        <!-- 待添加 -->


        <div id="data-search-btn" class="layui-btn-container layui-form-item">


            <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>


            <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">重置</button>


                            <div class="layui-inline">&emsp;


                                <button class="layui-btn icon-btn" lay-filter="sensorTbSearch" lay-submit>


                                    <i class="layui-icon">&#xe615;</i>搜索


                                </button>


                            </div>


                        </div>


                    </form>


                        <table class="layui-hide" id="projectPlan" lay-filter="projectPlan"></table>


                </div>


            </div>


        </div>


        </div>


</div>




<!-- 表格 -->


<div class="layui-form">


    <table class="layui-hide" id="projectPlan" lay-filter="projectPlan"></table>


</div>




<script type="text/html" id="toolbar">


    <div class="layui-btn-container">


<!--        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>-->


@@ -56,6 +130,7 @@


<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>


<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>


<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>


<script type="text/javascript" src="../../static/js/hostTable.js" charset="utf-8"></script>


<script type="text/javascript" src="../../static/js/projectPlan/projectPlan.js" charset="utf-8"></script>


<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js" charset="utf-8"></script>


</body>