Browse Source

Merge remote-tracking branch 'origin/master'

wushaodong 3 years ago
parent
commit
db4dec0915

+ 2 - 3
apps/examination/exampaper/models.py

@@ -131,10 +131,9 @@ class ExamPaper(models.Model):
         )
         questions_count = questions.count()
         if questions_count < count:
-            raise CustomError(u'[%s][%s]数量不足!' % (ExamQuestion.DIFFICULTY_CHOICES[difficulty-1][1], ExamQuestion.TYPE_JSON[type-1][1]))
+            raise CustomError(u'[%s][%s]数量不足!' % (ExamQuestion.DIFFICULTY_CHOICES[difficulty-1][1], ExamQuestion.TYPE_CHOICES[type-1][1]))
         question_ids = questions.values_list('id', flat=True)
-
-        rows = random.sample(question_ids, count)
+        rows = random.sample(list(question_ids), count)
         random.shuffle(rows)
 
         data = []

+ 10 - 0
apps/examination/exampaper/serializers.py

@@ -6,6 +6,8 @@ from utils.exceptions import CustomError
 
 class ExamPaperSerializer(serializers.ModelSerializer):
     subject_name = serializers.CharField(source='subject.name', read_only=True)
+    type_text = serializers.CharField(source='get_type_display', read_only=True)
+    create_user_text = serializers.CharField(source='create_user.username', read_only=True)
 
     class Meta:
         model = ExamPaper
@@ -20,6 +22,10 @@ class ExamPaperSerializer(serializers.ModelSerializer):
         validated_data['create_user'] = self.context['request'].user
         instance = super(ExamPaperSerializer, self).create(validated_data)
         instance.update_count()
+        if not instance.question_total_count:
+            raise CustomError(u'请选择试题!')
+        if instance.passline > instance.question_total_scores:
+           raise CustomError(u'及格线不能大于试题总分!')
         instance.save()
 
         instance.generate_detail()
@@ -44,6 +50,10 @@ class ExamPaperSerializer(serializers.ModelSerializer):
             raise CustomError(u'试卷[%s]已经被删除,禁止操作' % instance.name)
         instance = super(ExamPaperSerializer, self).update(instance, validated_data)
         instance.update_count()
+        if not instance.question_total_count:
+            raise CustomError(u'请选择试题!')
+        if instance.passline > instance.question_total_scores:
+           raise CustomError(u'及格线不能大于试题总分!')
         instance.save()
 
         new_count = []

+ 113 - 0
uis/admin/exampaper/details.html

@@ -0,0 +1,113 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>试题管理详情</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+    <style type="text/css">
+        .title {
+            width: 140px;
+            background: #efefef;
+        }
+    </style>
+</head>
+<body>
+
+<div class="layui-fluid">
+    <div class="layui-card">
+        <div class="layui-card-body" pad15>
+            <div class="layui-row layui-col-space15">
+                <div class="layui-col-md12">
+
+                    <div id="print_div">
+                        <table class="layui-table">
+
+                            <tr>
+                                <td class="title">名称:</td>
+                                <td id="name" class="cell"></td>
+                                <td class="title"></td>
+                                <td class="cell"></td>
+                            </tr>
+
+                            <tr>
+                                <td class="title">科目:</td>
+                                <td id="subject_name" class="cell"></td>
+                                <td class="title">类型:</td>
+                                <td id="type_text" class="cell"></td>
+                            </tr>
+                            <tr>
+                                <td class="title">总分:</td>
+                                <td id="question_total_scores" class="cell"></td>
+                                <td class="title">及格线:</td>
+                                <td id="passline" class="cell"></td>
+                            </tr>
+                            <tr>
+                                <td class="title">添加人:</td>
+                                <td id="create_user_text" class="cell"></td>
+                                <td class="title">添加时间:</td>
+                                <td id="create_time" class="cell"></td>
+                            </tr>
+                            <tr id="id_analysis">
+                                <td class="title">单选题:</td>
+                                <td colspan="3" id="single" class="cell"></td>
+                            </tr>
+                            <tr id="id_analysis">
+                                <td class="title">多选题:</td>
+                                <td colspan="3" id="multiple" class="cell"></td>
+                            </tr>
+                            <tr id="id_analysis">
+                                <td class="title">判断题:</td>
+                                <td colspan="3" id="judgment" class="cell"></td>
+                            </tr>
+                            <tr id="id_analysis">
+                                <td class="title">填空题:</td>
+                                <td colspan="3" id="fill" class="cell"></td>
+                            </tr>
+
+                            <tr id="id_analysis">
+                                <td class="title">备注:</td>
+                                <td colspan="3" id="desc" class="cell"></td>
+                            </tr>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script src="../../layuiadmin/layui/layui.js?t=1"></script>
+<script>
+    layui.config({
+        base: '../../../layuiadmin/' //静态资源所在路径
+    }).extend({
+        index: 'lib/index' //主入口模块
+    }).use(['index', 'table'], function () {
+        var $ = layui.$;
+        var editdata = JSON.parse(JSON.stringify(parent.layui.table.editdata)); // 框架有Bug所以这么转换
+        $('.cell').each(function (index, element) {
+            element.innerHTML += (editdata[element.id] || '')
+        });
+        var single = '共' + editdata.single_total_count + '题,每题' + editdata.single_scores + '分,简单' + editdata.single_simple_count + '题,' +
+            '中等' + editdata.single_mid_count + '题,困难' + editdata.single_hard_count + '题';
+        var multiple = '共' + editdata.multiple_total_count + '题,每题' + editdata.multiple_scores + '分,简单' + editdata.multiple_simple_count + '题,' +
+            '中等' + editdata.multiple_mid_count + '题,困难' + editdata.multiple_hard_count + '题';
+        var judgment = '共' + editdata.judgment_total_count + '题,每题' + editdata.judgment_scores + '分,简单' + editdata.judgment_simple_count + '题,' +
+            '中等' + editdata.judgment_mid_count + '题,困难' + editdata.judgment_hard_count + '题';
+        var fill = '共' + editdata.fill_total_count + '题,每题' + editdata.fill_scores + '分,简单' + editdata.fill_simple_count + '题,' +
+            '中等' + editdata.fill_mid_count + '题,困难' + editdata.fill_hard_count + '题';
+
+        $('#single').html(single);
+        $('#multiple').html(multiple);
+        $('#judgment').html(judgment);
+        $('#fill').html(fill);
+
+    });
+</script>
+</body>
+</html>

+ 302 - 0
uis/admin/exampaper/edit.html

@@ -0,0 +1,302 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>添加运维宝典</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+    <div class="layui-card">
+        <div class="layui-card-body">
+            <form class="layui-form" action="" lay-filter="component-form-element">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <label class="layui-form-label"><font color='red' size="4">*</font>名称:</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="name" class="layui-input" lay-verify="required">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label"><font color='red' size="4">*</font>科目:</label>
+                        <div class="layui-input-inline">
+                            <select name="subject" id="id_subject" lay-verify="required">
+                                <option value="">请选择科目</option>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label"><font color='red' size="4">*</font>类型:</label>
+                        <div class="layui-input-inline">
+                            <select name="type" lay-verify="required">
+                                <option value="">请选择类型</option>
+                                <option value="1">模拟试卷</option>
+                                <option value="2">正式试卷</option>
+                                <option value="3">随机试卷</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label"><font color='red' size="4">*</font>及格线:</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="passline" lay-verify="intGeZ" class="layui-input">
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <div class="layui-inline" style="width: 100%">
+                        <label class="layui-form-label">单选题:</label>
+                        <div class="layui-inline" style="width: 85%">
+                            每题
+                            <div class="layui-inline" style="width: 10%">
+                                <input type="text" lay-verify="intGtz" name="single_scores" autocomplete="off" class="layui-input">
+                              </div>
+                            分
+                            ,简单
+                            <div class="layui-inline" style="width: 10%">
+                                <input type="text" lay-verify="intGtz" name="single_simple_count" autocomplete="off" class="layui-input single">
+                              </div>
+
+                            ,中等
+                            <div class="layui-inline" style="width: 10%">
+                                <input type="text" lay-verify="intGtz" name="single_mid_count" autocomplete="off" class="layui-input single">
+                              </div>
+                            ,困难
+                            <div class="layui-inline" style="width: 10%">
+                                <input type="text" lay-verify="intGtz" name="single_hard_count" autocomplete="off" class="layui-input single">
+                              </div>
+                            <div class="layui-inline" style="width: 10%">
+                                <label id="id_single_total_count" class="layui-form-label">共&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;题</label>
+                              </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="layui-form-item">
+                    <div class="layui-inline" style="width: 100%">
+                        <label class="layui-form-label">多选题:</label>
+                        <div class="layui-inline" style="width: 85%">
+                            每题
+                            <div class="layui-inline" style="width: 10%">
+                                <input type="text" lay-verify="intGtz" name="multiple_scores" autocomplete="off" class="layui-input">
+                              </div>
+                            分
+                            ,简单
+                            <div class="layui-inline" style="width: 10%">
+                                <input type="text" lay-verify="intGtz" name="multiple_simple_count" autocomplete="off" class="layui-input multiple">
+                              </div>
+
+                            ,中等
+                            <div class="layui-inline" style="width: 10%">
+                                <input type="text" lay-verify="intGtz" name="multiple_mid_count" autocomplete="off" class="layui-input multiple">
+                              </div>
+                            ,困难
+                            <div class="layui-inline" style="width: 10%">
+                                <input type="text" lay-verify="intGtz" name="multiple_hard_count" autocomplete="off" class="layui-input multiple">
+                              </div>
+                            <div class="layui-inline" style="width: 10%">
+                                <label id="id_multiple_total_count" class="layui-form-label">共&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;题</label>
+                              </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="layui-form-item">
+                    <div class="layui-inline" style="width: 100%">
+                        <label class="layui-form-label">判断题:</label>
+                        <div class="layui-inline" style="width: 85%">
+                            每题
+                            <div class="layui-inline" style="width: 10%">
+                                <input type="text" lay-verify="intGtz" name="judgment_scores" autocomplete="off" class="layui-input">
+                              </div>
+                            分
+                            ,简单
+                            <div class="layui-inline" style="width: 10%">
+                                <input type="text" lay-verify="intGtz" name="judgment_simple_count" autocomplete="off" class="layui-input judgment">
+                              </div>
+
+                            ,中等
+                            <div class="layui-inline" style="width: 10%">
+                                <input type="text" lay-verify="intGtz" name="judgment_mid_count" autocomplete="off" class="layui-input judgment">
+                              </div>
+                            ,困难
+                            <div class="layui-inline" style="width: 10%">
+                                <input type="text" lay-verify="intGtz" name="judgment_hard_count" autocomplete="off" class="layui-input judgment">
+                              </div>
+                            <div class="layui-inline" style="width: 10%">
+                                <label id="id_judgment_total_count" class="layui-form-label">共&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;题</label>
+                              </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="layui-form-item">
+                    <div class="layui-inline" style="width: 100%">
+                        <label class="layui-form-label">填空题:</label>
+                        <div class="layui-inline" style="width: 85%">
+                            每题
+                            <div class="layui-inline" style="width: 10%">
+                                <input type="text" lay-verify="intGtz" name="fill_scores" autocomplete="off" class="layui-input">
+                              </div>
+                            分
+                            ,简单
+                            <div class="layui-inline" style="width: 10%">
+                                <input type="text" lay-verify="intGtz" name="fill_simple_count" autocomplete="off" class="layui-input fill">
+                              </div>
+
+                            ,中等
+                            <div class="layui-inline" style="width: 10%">
+                                <input type="text" lay-verify="intGtz" name="fill_mid_count" autocomplete="off" class="layui-input fill">
+                              </div>
+                            ,困难
+                            <div class="layui-inline" style="width: 10%">
+                                <input type="text" lay-verify="intGtz" name="fill_hard_count" autocomplete="off" class="layui-input fill">
+                              </div>
+                            <div class="layui-inline" style="width: 10%">
+                                <label id="id_fill_total_count" class="layui-form-label">共&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;题</label>
+                              </div>
+                        </div>
+                    </div>
+                </div>
+
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label">备注:</label>
+                    <div class="layui-input-block">
+                        <textarea class="layui-textarea" placeholder="请输内容" name="desc"></textarea>
+                    </div>
+                </div>
+
+                <button class="layui-btn" id="id_save" lay-submit lay-filter="component-form-element"
+                        style="display: none">保存
+                </button>
+            </form>
+        </div>
+    </div>
+</div>
+
+
+<script src="../../layuiadmin/layui/layui.js"></script>
+<script>
+    layui.config({
+        base: '../../../layuiadmin/' //静态资源所在路径
+    }).extend({
+        index: 'lib/index',
+    }).use(['index', 'form', 'utils',], function () {
+        var $ = layui.$
+            , admin = layui.admin
+            , form = layui.form;
+
+        var id = layui.view.getParameterByName('id');
+        admin.req({
+            url: '/admin/subject/dict/',
+            done: function (res) {
+                var subject = res.data.subject;
+                var subject_node = $('#id_subject');
+                for (var i in subject) {
+                    var pid = subject[i].id;
+                    var subject_value = subject[i].name;
+                    subject_node.append("<option value='" + pid + "'>" + subject_value + "</option>");
+                }
+                form.render();
+                loadData()
+            }
+        });
+        var loadData = function () {
+            if (id) {
+                var editdata = JSON.parse(JSON.stringify(parent.layui.table.editdata)); // 框架有Bug所以这么转换
+                form.val("component-form-element", editdata);
+                $('#id_fill_total_count').html('共&nbsp;&nbsp;&nbsp;&nbsp;' + editdata.fill_total_count + '&nbsp;&nbsp;&nbsp;&nbsp;题')
+                $('#id_judgment_total_count').html('共&nbsp;&nbsp;&nbsp;&nbsp;' + editdata.judgment_total_count + '&nbsp;&nbsp;&nbsp;&nbsp;题')
+                $('#id_multiple_total_count').html('共&nbsp;&nbsp;&nbsp;&nbsp;' + editdata.multiple_total_count + '&nbsp;&nbsp;&nbsp;&nbsp;题')
+                $('#id_single_total_count').html('共&nbsp;&nbsp;&nbsp;&nbsp;' + editdata.single_total_count + '&nbsp;&nbsp;&nbsp;&nbsp;题')
+            }
+        };
+
+        $('.single').on("input", function (e) {
+            var total = 0;
+            $('.single').each(function (i) {
+                var target =  $('.single')[i];
+                var val = parseInt(target.value);
+                // 是不是可以在这控制输入框的值 不能是负数之类的
+                if(!isNaN(val) && val){
+                    total += val
+                }
+            });
+             var txt = '共&nbsp;&nbsp;&nbsp;&nbsp;' + total + '&nbsp;&nbsp;&nbsp;&nbsp;题';
+            $('#id_single_total_count').html(txt);
+        });
+        $('.multiple').on("input", function (e) {
+            var total = 0;
+            $('.multiple').each(function (i) {
+                var target =  $('.multiple')[i];
+                var val = parseInt(target.value);
+                // 是不是可以在这控制输入框的值 不能是负数之类的
+                if(!isNaN(val) && val){
+                    total += val
+                }
+            });
+            var txt = '共&nbsp;&nbsp;&nbsp;&nbsp;' + total + '&nbsp;&nbsp;&nbsp;&nbsp;题';
+            $('#id_multiple_total_count').html(txt);
+        });
+        $('.fill').on("input", function (e) {
+            var total = 0;
+            $('.fill').each(function (i) {
+                var target =  $('.fill')[i];
+                var val = parseInt(target.value);
+                // 是不是可以在这控制输入框的值 不能是负数之类的
+                if(!isNaN(val) && val){
+                    total += val
+                }
+            });
+            var txt = '共&nbsp;&nbsp;&nbsp;&nbsp;' + total + '&nbsp;&nbsp;&nbsp;&nbsp;题';
+            $('#id_fill_total_count').html(txt);
+        });
+        $('.judgment').on("input", function (e) {
+            var total = 0;
+            $('.judgment').each(function (i) {
+                var target =  $('.judgment')[i];
+                var val = parseInt(target.value);
+                // 是不是可以在这控制输入框的值 不能是负数之类的
+                if(!isNaN(val) && val){
+                    total += val
+                }
+            });
+            var txt = '共&nbsp;&nbsp;&nbsp;&nbsp;' + total + '&nbsp;&nbsp;&nbsp;&nbsp;题';
+            $('#id_judgment_total_count').html(txt);
+        });
+
+
+        form.render(null, 'component-form-element');
+
+        var url = id ? '/admin/exampaper/' + id + "/" : '/admin/exampaper/',
+            method = id ? 'put' : 'post'
+
+        form.on('submit(component-form-element)', function(data){
+
+          admin.req({
+            url: url
+            , data: data.field
+            , type: method
+            ,done: function(res){
+                parent.layui.onSubmitChild(res.data);
+            }
+          });
+
+          return false;
+        });
+
+        parent.layui.submitChild = function () {
+            $("#id_save").click();
+        };
+    });
+</script>
+</body>
+</html>

+ 224 - 97
uis/admin/exampaper/index.html

@@ -1,118 +1,245 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <meta charset="utf-8">
-  <title>试卷管理</title>
-  <meta name="renderer" content="webkit">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-  <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
-  <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
-   <style type="text/css">
-        .input {
-            width: 70%;
-            border-radius: 2px;
-            height: 30px;
-            border-width: 1px;
-            border-color: lightgray;
-            border-style: solid;
-            background-color: white;
-            padding-left: 3px;
-            margin-top: 20px;
+    <meta charset="utf-8">
+    <title>试卷管理</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport"
+          content="width=agent-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+    <style type="text/css">
+        .seach_items {
+            float: right;
+            margin-left: 10px;
+        }
+    </style>
+    <style type="text/css">
+        .LAY-btns .layui-nav {
+            padding-left: 0;
+            padding-right: 10px;
+            top: -4px;
+            margin: 0 10px;
+            border: 0;
+            background-color: #009688;
+        }
+
+        .LAY-btns .layui-nav .layui-nav-item {
+            line-height: 40px;
+        }
+
+        .LAY-btns .layui-nav .layui-nav-child {
+            top: 34px;
+        }
+
+        .LAY-btns .layui-nav .layui-nav-bar {
+            display: none;
+        }
+
+        .LAY-btns .layui-nav .layui-nav-child dd.layui-this a {
+            color: #333;
+            background-color: #fff;
+        }
+
+        .LAY-btns .layui-nav .layui-nav-child dd.layui-this a:hover {
+            background-color: #f2f2f2;
+            color: #000;
+        }
+
+        .tableContent {
+            width: 100%;
+            display: flex;
+            justify-content: space-between;
+            flex-direction: row;
         }
     </style>
 </head>
 <body>
 
-  <div class="layui-fluid">
+<div class="layui-fluid">
     <div class="layui-card">
         <div class="layui-card-body" pad15>
-            <form class="layui-form" action="" lay-filter="component-form-element">
-              <div class="layui-row layui-col-space10 layui-form-item">
-                <div>
-                  <label><font color='red' size="4">*</font>商品提成比例:</label>
-                  <input type="text" name="package_percentage" lay-verify="required|numberGtZ" autocomplete="off" class="input">
-                  <label><font color='red' size="4" style="font-size: small;">佣金=商品优惠价*提成比例</font></label>
-                </div>
-                <div>
-                    <label ><font color='red' size="4">*</font>整车提成比例:</label>
-                    <input type="text" name="vehicle_percentage" lay-verify="required|numberGtZ" autocomplete="off" class="input">
-                    <label><font color='red' style="font-size: small;">佣金=车型定金*提成比例</font></label>
-                </div>
-              <div class="layui-form-item">
-                <div class="layui-input-block">
-                  <button class="layui-btn" lay-submit lay-filter="component-form-element">保存</button>
+            <div class="layui-row layui-col-space15">
+                <div class="layui-col-md12">
+                    <div class="LAY-btns" style="margin-bottom: 10px;">
+                        <div style="float: left">
+                            <button class="layui-btn layui-btn-sm" id="exampaper_add">
+                                <i class="layui-icon layui-icon-add-circle"></i>添加
+                            </button>
+                        </div>
+                        <form class="layui-form" lay-filter="query-form-element">
+                            <div class="seach_items">
+                                <button class="layui-btn" lay-submit lay-filter="query-form-element"><i
+                                        class="layui-icon layui-icon-search"></i>查询
+                                </button>
+                            </div>
+                            <div class="seach_items">
+                                <input type="text" name="name" autocomplete="off" class="layui-input" placeholder="名称关键字"/>
+                            </div>
+                            <div class="seach_items">
+                                <select name="type">
+                                    <option value="" selected>请选择类型</option>
+                                    <option value="1">模拟试卷</option>
+                                    <option value="2">正式试卷</option>
+                                    <option value="3">随机试卷</option>
+                                </select>
+                            </div>
+                            <div class="seach_items">
+                                <select id="id_subject" name="subject">
+                                    <option value="" selected>请选择科目</option>
+                                </select>
+                            </div>
+
+                        </form>
+                        <div style="clear: both;"></div>
+                    </div>
+                    <table class="layui-hide" id="exampaper_datagrid" lay-filter="exam_question-operate"></table>
+
+                    <script type="text/html" id="exam_question-operate-bar">
+                        <div class="layui-btn-group">
+                            <a class="layui-btn layui-btn-xs" lay-event="exampaper_detail"
+                            >查看</a>
+                        </div>
+                        <div class="layui-btn-group">
+                            <a class="layui-btn layui-btn-xs" lay-event="exampaper_edit"
+                            >修改</a>
+                        </div>
+                        <div class="layui-btn-group">
+                            <a class="layui-btn layui-btn-xs" lay-event="exampaper_delete"
+                            >删除</a>
+                        </div>
+                    </script>
                 </div>
-              </div>
-              </div>
-            </form>
-          </div>
+            </div>
         </div>
-      </div>
-
-
-  <script src="../../layuiadmin/layui/layui.js"></script>
-  <script>
-  layui.config({
-    base: '../../../layuiadmin/' //静态资源所在路径
-  }).extend({
-    index: 'lib/index' //主入口模块
-  }).use(['index', 'form', 'utils'], function(){
-    var $ = layui.$
-    ,admin = layui.admin
-    ,element = layui.element
-    ,form = layui.form;
-    form.render(null, 'component-form-element');
-    element.render('breadcrumb', 'breadcrumb');
-
-    admin.req({
-        url: '/tenant/config/',
-        done: function (res) {
-            var data = res.data;
-            var edit_data = {};
-            for(var i in data) {
-                if (data[i].property === 'package_percentage'){
-                    edit_data['package_percentage'] = data[i].value;
-                }else if (data[i].property === 'vehicle_percentage') {
-                    edit_data['vehicle_percentage'] = data[i].value;
+    </div>
+</div>
+
+<script src="../../layuiadmin/layui/layui.js"></script>
+<script>
+    layui.config({
+        base: '../../../layuiadmin/' //静态资源所在路径
+    }).extend({
+        index: 'lib/index' //主入口模块
+    }).use(['index', 'table', 'form', 'admin',], function () {
+        var $ = layui.$;
+        var table = layui.table
+            , admin = layui.admin
+            , form = layui.form;
+
+        admin.req({
+            url: '/admin/subject/dict/',
+            done: function (res) {
+                var subject = res.data.subject;
+                var subject_node = $('#id_subject');
+                for (var i in subject) {
+                    var pid = subject[i].id;
+                    var subject_value = subject[i].name;
+                    subject_node.append("<option value='" + pid + "'>" + subject_value + "</option>");
                 }
+                 form.render();
             }
-            form.val("component-form-element", edit_data);
-            form.render();
-        }
-    });
+        });
 
-    form.on('submit(component-form-element)', function(data){
-      var save_data = [];
-      if (data.field['package_percentage']){
-          save_data.push({key: 'package_percentage', value: data.field['package_percentage']})
-      }
-      if (data.field['vehicle_percentage']){
-          save_data.push({key: 'vehicle_percentage', value: data.field['vehicle_percentage']})
-      }
-      admin.req({
-        url: '/tenant/config/'
-        ,data: {data: JSON.stringify(save_data)}
-        ,type: 'post'
-        ,done: function(res){
-            layer.open({
-                 type: 1
-                ,content: '<div style="padding: 20px 100px;">保存成功</div>'
-                ,btn: '关闭'
-                ,btnAlign: 'c' //按钮居中
-                ,shade: 0 //不显示遮罩
-                ,yes: function(){
-                  layer.closeAll();
-                  //admin.exit();
-                }
+        table.render({
+            elem: '#exampaper_datagrid'
+            , url: '/admin/exampaper/'
+            , cols: [[
+                {title: '编号', type: 'numbers'}
+                , {field: 'name', title: '名称', width: 200}
+                , {field: 'type_text', title: '类型', width: 120}
+                , {field: 'subject_name', title: '科目', width: 120}
+                , {field: 'question_total_scores', title: '总分', width: 80}
+                , {field: 'passline', title: '及格线', width: 80}
+                , {field: 'create_user_text', title: '添加人', width: 100}
+                , {field: 'create_time', title: '添加时间', width: 180}
+                , {title: '操作', width: 180, align: 'center', fixed: 'right', toolbar: '#exam_question-operate-bar'}
+            ]]
+            , page: true
+            , height: 'full-108'
+        });
+
+        //监听工具条
+        table.on('tool(exam_question-operate)', function (obj) {
+            var data = obj.data;
+            table.editdata = data;
+            if (obj.event === 'exampaper_edit') {
+                layer.open({
+                    type: 2,
+                    title: '修改试卷',
+                    shadeClose: false,
+                    area: ['80%', '80%'],
+                    btn: ['保存', '取消'],
+                    yes: function (index, dom) {
+                        layui.onSubmitChild = function (res) {
+                            layer.close(index);
+                            table.reload('exampaper_datagrid', {});
+                        };
+                        layui.submitChild();
+                    },
+                    btn2: function (index, layero) {
+                        layer.close(index);//关闭当前按钮
+                    },
+                    content: 'edit.html?id=' + data.id
+                });
+            }
+            else if (obj.event === 'exampaper_delete') {
+                layer.confirm('确定要删除该试卷吗?', function (index) {
+                    layer.close(index);
+                    admin.req({
+                        url: '/admin/exampaper/' + data.id + '/'
+                        , type: 'delete'
+                        , done: function (res) {
+                            table.reload('exampaper_datagrid', {});
+                        }
+                    });
+                });
+            } else if (obj.event === 'exampaper_detail') {
+                layer.open({
+                    type: 2,
+                    title: '查看详情',
+                    shadeClose: false,
+                    area: ['70%', '65%'],
+                    btn: ['关闭'],
+                    yes: function (index, dom) {
+                        layer.close(index);//关闭当前按钮
+                    },
+                    content: 'details.html'
+                });
+            }
+        });
+
+        form.on('submit(query-form-element)', function (data) {
+            table.reload('exampaper_datagrid', {
+                where: data.field
+                , page: {curr: 1}
             });
-        }
-      });
+            layer.closeAll();
+            return false
+        });
 
-      return false;
+        $('#exampaper_add').on('click', function () {
+            layer.open({
+                type: 2,
+                title: '添加试卷',
+                area: ['90%', '80%'],
+                btn: ['保存', '取消'],
+                yes: function (index, dom) {
+                    layui.onSubmitChild = function (res) {
+                        layer.close(index);
+                        table.reload('exampaper_datagrid', {});
+                    };
+                    layui.submitChild();
+                },
+                btn2: function (index, layero) {
+                    layer.close(index);//关闭当前按钮
+                },
+                content: 'edit.html'
+            });
+        });
     });
 
-  });
-  </script>
+</script>
 </body>
 </html>

+ 1 - 1
uis/admin/index.html

@@ -96,7 +96,7 @@
               </a>
               <dl class="layui-nav-child">
                 <dd data-name="nav">
-                  <a lay-href="user/index.html">试卷管理</a>
+                  <a lay-href="exampaper/index.html">试卷管理</a>
                 </dd>
                 <dd data-name="nav">
                   <a lay-href="tenant/index.html">考试管理</a>