81041
2018-11-03 bc9d72fa65b73e112a4648172b60c4e3941f5ec2
Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
1个文件已添加
1个文件已修改
126 ■■■■■ 已修改文件
gx_tieta/WebRoot/batt-fault-manage.jsp 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/iframe/batt-fault-manage-del.html 87 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/batt-fault-manage.jsp
@@ -102,6 +102,8 @@
    <div id="detailsOpts"></div>
    <!-- 存储显示图片详情的信息 -->
    <div id="detailImgs"></div>
    <!-- 存储解决方案的信息 -->
    <div id="subPlan"></div>
    <script type="text/javascript" src="jqueryui/jquery-ui.min.js"></script>
    <script type="text/javascript" src="js/equip-stats-change.jquery.ui.js"></script>
    <script type="text/javascript" src="js/eleHistWarn1-jquery.ui.js"></script>
@@ -131,6 +133,7 @@
                ,element = layui.element
                ,$=layui.jquery
                ,form = layui.form;
            var uploadIframe;        // 面板
            // 表格数据配置项
            var tOptions = {
                elem: '#eleInfoTbl'
@@ -160,6 +163,9 @@
                switch(ev) {
                    case 'details':
                        faultDetails(obj.data);
                        break;
                    case 'delError':
                        addSubPlan(obj.data);
                        break;
                    default:
                        layer.msg('功能开发中...');
@@ -211,9 +217,38 @@
                return rs;
            }
            
            // 添加解决方案
            function addSubPlan(data) {
                var subPlanData = setSubPlanData(data);
                $('#subPlan').data('data', subPlanData);
                uploadIframe = layer.open({
                    type: 2,
                    title: '<span style="font-weight:bold">>>故障排除方案</span>',
                    area: ['700px', '560px'],
                    fixed: false, //不固定
                    resize: false,
                    maxmin: false,
                    content: 'iframe/batt-fault-manage-del.html'
                });
            }
            // 构造解决方案的结果
            function setSubPlanData(data) {
                var rs = {
                    num: data.num,
                    error_en: 1,
                    error_dispose: ''
                };
                return rs;
            }
            function getData(a,b){
                var arr=[];
                for(i=0;i<a;i++){
                for(var i=0;i<a;i++){
                    arr.push({'station_name1':b,'city':b+i,'stationName3':b+i+1,'note':b+i+2,'question':'hahaha哈哈卡卡卡卡卡卡卡卡'+i});
                }
                   return arr;
@@ -222,7 +257,7 @@
            $(document).on('click','.addbtn',function(){
                searchStationHistRecord();
            });
            var uploadIframe;
            //  添加故障信息
            function searchStationHistRecord(){
                // 显示面板
                uploadIframe = layer.open({
gx_tieta/WebRoot/iframe/batt-fault-manage-del.html
New file
@@ -0,0 +1,87 @@
<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <meta http-equiv="X-UA-Compatible" content="ie=edge">
    <title>添加排除故障方案</title>
    <link rel="stylesheet" type="text/css" href="../pages/css/base.css">
    <link rel="stylesheet" type="text/css" href="../jqueryui/jquery-ui.css">
    <link rel="stylesheet" type="text/css" href="../src/css/layui.css">
    <link rel="stylesheet" type="text/css" href="../pages/css/mylayui.css">
    <style>
        html, body {
            min-width: 600px;
        }
        .bottom-btn {
            position: absolute;
            bottom: 10px;
            right: 20px;
        }
    </style>
</head>
<body>
    <div class="layui-page-container mrl8 mrr8">
        <div class="layui-form layui-form-pane" style="margin-bottom: 60px;">
             <label class="layui-form-label">故障排除方案</label>
               <div class="layui-form-item layui-form-text">
                <div class="layui-input-block">
                    <textarea placeholder="方案描述" class="layui-textarea" name="desc" id="desc" style="height:400px;"></textarea>
                </div>
            </div>
           </div>
           <div class="bottom-btn">
            <button type="button" class="layui-btn layui-btn-normal" id="subPlan">提交方案</button>
        </div>
    </div>
    <script type="text/javascript" src="../js/jquery-1.8.3.js"></script>
    <script type="text/javascript" src="../js/base.js"></script>
    <script type="text/javascript" src="../jqueryui/jquery-ui.min.js"></script>
    <script type="text/javascript" src="../src/layui.js"></script>
    <script type="text/javascript" src="../pages/js/mylayui.js"></script>
    <script type="text/javascript">
        layui.use(['form', 'layer'], function() {
            var layer = layui.layer;
            var subPlanData = parent.$('#subPlan').data('data');
            var closePage = parent.$('#closeUploadBtn');
            // 点击提交方案方案
            $('#subPlan').click(function() {
                subPlanData.error_dispose = $('#desc').val();
                subPlan(subPlanData);
            });
            function subPlan(data) {
                if(data.error_dispose.trim()) {
                    var load = layer.load(1);
                    // 添加解决方案
                    $.ajax({
                        type: 'post',
                        async: true,
                        url: 'Deverror_recordAction!update',
                        data: 'json='+JSON.stringify(data),
                        dataType: 'json',
                        success:function() {
                            layer.close(load);
                            layer.closeAll();
                            layer.msg('添加成功!3秒后自动关闭')    ;
                            setTimeout(function() {
                                closePage.click();
                            }, 3000);
                        },
                        error:function() {
                            layer.close(load);
                            layer.msg('添加失败!')    ;
                        }
                    });
                }else {
                    layer.msg('请输入排除的方案!');
                }
            }
            console.log(subPlanData);
        });
    </script>
</body>
</html>