Merge remote-tracking branch 'origin/dev' into dev

侯瑞军

2020-04-07 21e0bc31710f67f9e383b2f379eb40ff0144e4f4

Merge remote-tracking branch 'origin/dev' into dev

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html

@@ -1,9 +1,9 @@
<div class="layui-card">
    <div class="layui-card-header">
        <h2 class="header-title">应用管理</h2>
        <h2 class="header-title">数据需求</h2>
        <span class="layui-breadcrumb pull-right">
            <a href="#!home_console">首页</a>
            <a><cite>应用管理</cite></a>
            <a><cite>数据需求</cite></a>
        </span>
    </div>
    <div class="layui-card-body">
@@ -23,56 +23,104 @@

<!-- 表格操作列 -->
<script type="text/html" id="app-table-bar">
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看详情</a>
</script>
<script type="text/html" id="app-table-bar1">

    {{# if (d.enabled ==0){}}
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="upload">待上传数据</a>
    {{#  } else { }}
    <p>已上传</p>
    {{#}}}
</script>

<!-- 表单弹窗 -->
<!-- <script type="text/html" id="app-model">
<script type="text/html" id="app-model">
    <form id="app-form" lay-filter="app-form" class="layui-form model-form">
        <input name="id" type="hidden"/>
        <div class="layui-form-item">
            <label class="layui-form-label">应用标识</label>
            <label class="layui-form-label">需求类型</label>
            <div class="layui-input-block">
                <input name="clientId" placeholder="请输入应用标识" type="text" class="layui-input" maxlength="20"
                <input name="needType" placeholder="请输入应用标识" type="text" class="layui-input" maxlength="20"
                       lay-verify="required" required/>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">应用名称</label>
            <label class="layui-form-label">医生姓名</label>
            <div class="layui-input-block">
                <input name="clientName" placeholder="请输入应用名称" type="text" class="layui-input" maxlength="20"/>
                <input name="doctorName" placeholder="请输入应用名称" type="text" class="layui-input" maxlength="20"/>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">应用密钥</label>
            <label class="layui-form-label">医院名称</label>
            <div class="layui-input-block">
                <input name="clientSecretStr" placeholder="请输入应用密钥" type="text" class="layui-input" maxlength="20"
                <input name="hospitalName" placeholder="请输入应用密钥" type="text" class="layui-input" maxlength="20"
                       lay-verify="required" required />
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">回调地址</label>
            <label class="layui-form-label">科室名称</label>
            <div class="layui-input-block">
                <input name="webServerRedirectUri" placeholder="请输入回调地址" type="text" class="layui-input" maxlength="20"/>
                <input name="departmentName" placeholder="请输入回调地址" type="text" class="layui-input" maxlength="20"/>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">医生联系方式</label>
            <div class="layui-input-block">
                <input name="doctorTel" placeholder="请输入回调地址" type="text" class="layui-input" maxlength="20"/>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">需求数据的开始时间</label>
            <div class="layui-input-block">
                <input name="needBegintime" placeholder="请输入回调地址" type="text" class="layui-input" maxlength="20"/>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">需求数据的结束时间</label>
            <div class="layui-input-block">
                <input name="needEndtime" placeholder="请输入回调地址" type="text" class="layui-input" maxlength="20"/>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">需求标签</label>
            <div class="layui-input-block">
                <input name="needTags" placeholder="请输入回调地址" type="text" class="layui-input" maxlength="20"/>
            </div>
        </div>
        <div class="layui-form-item model-form-footer">
            <button class="layui-btn layui-btn-primary" ew-event="closeDialog" type="button">取消</button>
            <button class="layui-btn" lay-filter="app-form-submit" lay-submit>保存</button>
            <button class="layui-btn layui-btn-primary" ew-event="closeDialog" type="button">确定</button>
        </div>
    </form>
</script>

<!-- <script type="text/html" id="app-upload">
    <form id="app-form-upload" lay-filter="app-form-upload" class="layui-form model-form">
        <input name="id" id="upload-id"  type="hidden"/>
        <div class="layui-form-item">
          
        </div>
      
    </form>
    <label class="layui-form-label">上传文件</label>
    <button type="button" class="layui-btn" id="uploads">
        <i class="layui-icon">&#xe67c;</i>上传文件
      </button>
</script> -->


<!-- <script type="text/javascript" src="../../assets/libs/layui/layui.js"></script> -->
<script>
    layui.use(['form', 'table', 'laydate', 'util', 'config', 'admin'], function () {
    layui.use(['form', 'table', 'laydate', 'util', 'upload', 'config', 'admin'], function () {
        var form = layui.form;
        var table = layui.table;
        var config = layui.config;
        var layer = layui.layer;
        var util = layui.util;
        var admin = layui.admin;
        var upload = layui.upload;



        //时间格式
        var laydate = layui.laydate;
@@ -98,8 +146,8 @@
                { field: 'hospitalName', width: 180, sort: true, title: '所在医院' },
                { field: 'needBegintime',width: 300, sort: true, title: '时间段', templet: "<div>{{layui.util.toDateString(d.needBegintime, 'yyyy年MM月dd日 HH:mm:ss')}}至{{layui.util.toDateString(d.needEndtime, 'yyyy年MM月dd日 HH:mm:ss')}}</div>" },
                { field: 'needType', width: 250, sort: true, title: '数据类型', templet: function (d) { if (d.needType == 1) { return '筛查' } else { return '就诊' } } },// 0就诊数据 1筛查
                { field: 'needTags', width: 250, sort: true, title: '需求标签' },
                { field: 'enabled', width: 250, sort: true, title: '处理状态', templet: function (d) { if (d.enabled == 1) { return '已上传' } else { return '未处理' } } },
                { field: 'needTags', width: 250, align: 'center', toolbar: '#app-table-bar', sort: true, title: '需求标签' },
                { field: 'enabled', width: 250, sort: true, toolbar: '#app-table-bar1', title: '处理状态', },
                { field: 'downTime', width: 250, sort: true, title: '时间', templet: "<div>{{layui.util.toDateString(d.downTime, 'yyyy年MM月dd日 HH:mm:ss')}}</div>" }
            ]]
        });
@@ -109,14 +157,44 @@
            var data = obj.data;
            var layEvent = obj.event;

            if (layEvent === 'del') { // 删除
                doDelete(obj);
            } else if (layEvent === 'edit') { //修改
            if (layEvent === 'detail') { // 显示详情
                showEditModel(data);
            } else if (layEvent === 'upload') { // 上传
                // console.log(12312312)
                // var upload = $("#app-upload");
                // console.log(123123123243)
                // console.log(upload)
                // upload.css('display', 'block')
                // layer.alert('');
                // showUpload(data)
                layer.open({
                    type: 1,
                    title:'上传图片',
                    area: ["500px", "360px"],
                   content:'<div style="" id="app-upload" class="text-center"><form id="app-form-upload" lay-filter="app-form-upload" class="layui-form model-form"><input name="id" id="upload-id" type="hidden" /> <div class="layui-form-item"> </div></form><label class="layui-form-label">上传文件</label> <button type="button" class="layui-btn" id="uploads"><i class="layui-icon">&#xe67c;</i>上传文件</button></div>'
                });                                                                                                                                                                  
            }
        });


        // var showUpload = function (data) {
        //     layer.open({
        //         type: 1,
        //         title: '上传文件',
        //         area: '450px',
        //         offset: '120px',
        //         content: $('#app-upload').html(),
        //         success: function () {
        //             $('#app-form-upload')[0].reset();
        //             $('#app-form-upload').attr('method', 'POST');
        //             if (data) {

        //                 form.val('#app-form-upload', data);
        //                 $('#app-form-upload').attr('method', 'POST');
        //             }
        //         }
        //     });
        // };
        // // 删除
        // var doDelete = function (obj) {
        //     layer.confirm('确定要删除吗？', function (i) {
@@ -188,49 +266,60 @@
            xhr.send();
        });

        // 添加按钮点击事件
        // $('#app-btn-add').click(function () {
        //     showEditModel();
        // 显示编辑弹窗
        var showEditModel = function (data) {
            layer.open({
                type: 1,
                title: '详情',
                area: '450px',
                offset: '120px',
                content: $('#app-model').html(),
                success: function () {
                    $('#app-form')[0].reset();
                    $('#app-form').attr('method', 'POST');
                    if (data) {
                        if (data.needBegintime) {
                            var needBegintime = layui.util.toDateString(data.needBegintime, 'yyyy年MM月dd日 HH:mm:ss');
                            data.needBegintime = needBegintime
                        }
                        if (data.needEndtime) {
                            var needEndtime = layui.util.toDateString(data.needEndtime, 'yyyy年MM月dd日 HH:mm:ss');
                            data.needEndtime = needEndtime
                        }
                        $("input[name='clientId']").attr('disabled', true);
                        $("input[name='clientId']").attr('class', "layui-input layui-disabled");
                        $("input[name='webServerRedirectUri']").attr('disabled', true);
                        $("input[name='webServerRedirectUri']").attr('class', "layui-input layui-disabled");
                        form.val('app-form', data);
                        $('#app-form').attr('method', 'POST');
                    }
                }
            });
        };
        //文件上传
        upload.render({
            elem: '#uploads',
            url: config.base_server + 'api-file/files-anon',
            accept: 'file',
            auto: true,
            headers: { "Authorization": "Bearer " + config.getToken().access_token },
            before: function (obj) {
                console.log(2132132132)
                // layer.load(); //上传loading
                //预读本地文件示例，不支持ie8
                // obj.preview(function (index, file, result) {
                //     $(".layui-upload-img").remove();
                //     $('#demo2').append('<img src="' + result + '" width="50px" height="50px" alt="' + file.name + '" class="layui-upload-img">')
        // });

        // // 显示编辑弹窗
        // var showEditModel = function (data) {
        //     layer.open({
        //         type: 1,
        //         title: data ? '修改应用' : '添加应用',
        //         area: '450px',
        //         offset: '120px',
        //         content: $('#app-model').html(),
        //         success: function () {
        //             $('#app-form')[0].reset();
        //             $('#app-form').attr('method', 'POST');
        //             if (data) {
        //                 $("input[name='clientId']").attr('disabled', true);
        //                 $("input[name='clientId']").attr('class', "layui-input layui-disabled");
        //                 $("input[name='webServerRedirectUri']").attr('disabled', true);
        //                 $("input[name='webServerRedirectUri']").attr('class', "layui-input layui-disabled");
        //                 form.val('app-form', data);
        //                 $('#app-form').attr('method', 'POST');
        //             }
        //         }
        //     });
        // };

        // // 表单提交事件
        // form.on('submit(app-form-submit)', function (data) {
        //     layer.load(2);
        //     admin.req('api-opration/dataneed/saveOrUpdate', JSON.stringify(data.field), function (data) {
        //         layer.closeAll('loading');
        //         console.log(data);
        //         if (data.code == 0) {
        //             layer.msg(data.msg, { icon: 1, time: 500 });
        //             table.reload('app-table');
        //             layer.closeAll('page');
        //         } else {
        //             layer.msg(data.msg, { icon: 2, time: 500 });
        //         }
        //     }, $('#app-form').attr('method'));
        //     return false;
        // });
            },
            done: function (data) {
                layer.closeAll('loading');
                console.log(data);
                $("[name=headImgUrl]").val(data.url);
            },
            error: function (data) {
                layer.closeAll('loading');
            }
        });
    });
</script>