提交

username@email.com

2021-10-25 cfc134f3f7d5734700f0246fdfc7a74a1b1c8b81

提交

 zhengcaioa/DTO/ExpertTestTopicDTO.cs

@@ -10,6 +10,7 @@
        public string Topictype { get; set; }
        public string Zhishitype { get; set; }
        public string Topic { get; set; }
        public string Anwsers { get; set; }
        public string Area { get; set; }
        public string Zhongdian { get; set; }
        public string JiexiStatus { get; set; }

 zhengcaioa/Services/ExpertTestTopicService.cs

@@ -327,8 +327,17 @@

                foreach (var quer in querydel)
                {
                    if (lian.Topictype != "03")
                    {
                    lian.Topic += quer.Anwserno + " " + quer.Anwser + " </br>";
                }
                 
                    if(quer.Shifouzhengqu == "A")
                    {
                        lian.Anwsers += quer.Anwserno ;
                    }
                    
                }
            }



 zhengcaioa/Services/SysBaimingdanService.cs

@@ -26,6 +26,14 @@
            ResultEntity resultEntity = new ResultEntity();
            try
            {
                var checkUserSn = _context.SysBaimingdans.Where(x =>x.PostType == SysBaimingdanDTO.PostType &&  x.BaimingdanName == SysBaimingdanDTO.BaimingdanName && x.RecStatus == "A" && x.Id != SysBaimingdanDTO.Id).FirstOrDefault();
                if (checkUserSn != null && (string.IsNullOrWhiteSpace(SysBaimingdanDTO.Id) || (!string.IsNullOrWhiteSpace(SysBaimingdanDTO.Id) && checkUserSn.Id != SysBaimingdanDTO.Id)))
                {
                    resultEntity.Result = false;
                    resultEntity.Message = "白名单重复";
                    return resultEntity;
                }

                var SysBaimingdan = _mapper.Map<SysBaimingdan>(SysBaimingdanDTO);
                if (String.IsNullOrEmpty(SysBaimingdan.Id))
                {

 zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs

@@ -122,7 +122,7 @@
            return new JsonResult(_expertTestTopicService.SearchByPaging(search));
        }

        public IActionResult Edit(string id = null, string Topictype = "", string Zhishitype = "", string Area = "")
        public IActionResult Edit(string id = null, string Topictype = "", string Zhishitype = "", string Area = "",string Falv ="")
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
@@ -191,12 +191,39 @@

                    dto.expertTestTopicanwserDTOs = expertTestTopicanwserDTOs;
                }
                if (!string.IsNullOrEmpty(Falv))
                {
                    string[] falvs = Falv.Split(',');
                    for(int i=0;i< falvs.Length; i++)
                    {
                        if (i == 0)
                        {
                            var ssssss = new ExpertTestTopicjiexiDTO();
                            ssssss.Flag = "A";
                            ssssss.Falv = falvs[i];
                            expertTestTopicjiexiDTOs.Add(ssssss);

                        }
                        else if(!string.IsNullOrEmpty(falvs[i]))
                        {
                            var ssssss = new ExpertTestTopicjiexiDTO();
                            ssssss.Flag = "D";
                            ssssss.Falv = falvs[i];
                            expertTestTopicjiexiDTOs.Add(ssssss);

                        }
                    }
                    dto.expertTestTopicjiexiDTOs = expertTestTopicjiexiDTOs;
                }
                else
                {
                var ssssss = new ExpertTestTopicjiexiDTO();
                ssssss.Flag = "A";
                expertTestTopicjiexiDTOs.Add(ssssss);
                dto.expertTestTopicjiexiDTOs = expertTestTopicjiexiDTOs;
                }

              

                if (string.IsNullOrEmpty(Topictype))
                {
@@ -223,6 +250,7 @@
                    dto.Area = Area;
                }
                
                
            }



 zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Edit.cshtml

@@ -261,11 +261,11 @@
                                        </div>

                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">
                                            是否答案
                                            是否答案&nbsp;&nbsp;&nbsp;
                                        </label>


                                        <div class="col-sm-1 col-md-1" grouptype="Vdata" style="width:5%;">
                                        <div class="text-left col-sm-1 col-md-1" grouptype="Vdata" style="width:5%;">
                                            @if ("A" == expertTestTopicanwserDTOs[i].Shifouzhengqu)
                                        {
                                            <input type="checkbox" checked="checked" name="ShifouzhengquName" value="A" onclick="checkShifouzhengqu(this)" />
@@ -741,7 +741,17 @@
                        var Zhishitype = $("#Zhishitype").val();
                        var Area = $("#Area").val();

                        window.location = "/ExpertTestTopic/Edit?Topictype=" + Topictype + "&Zhishitype=" + Zhishitype + "&Area=" + Area + ""
                        var falvs = document.getElementsByName("Falv");

                        var Falv = "";
                       
                        for (var i = 0; i < falvs.length; i++) {
                          
                            Falv += falvs[i].value + ",";
                        }


                        window.location = "/ExpertTestTopic/Edit?Topictype=" + Topictype + "&Zhishitype=" + Zhishitype + "&Area=" + Area + "&Falv=" + Falv + ""
                        if ($.isNumber(imgLoad)) {
                            parent.layer.close(imgLoad);
                        }
@@ -877,7 +887,17 @@
                            var Zhishitype = $("#Zhishitype").val();
                            var Area = $("#Area").val();

                            window.location = "/ExpertTestTopic/Edit?Topictype=" + Topictype + "&Zhishitype=" + Zhishitype + "&Area=" + Area +""
                            var falvs = document.getElementsByName("Falv");

                            var Falv = "";
                            
                            for (var i = 0; i < falvs.length; i++) {
                                
                                Falv += falvs[i].value + ",";
                            }


                            window.location = "/ExpertTestTopic/Edit?Topictype=" + Topictype + "&Zhishitype=" + Zhishitype + "&Area=" + Area + "&Falv=" + Falv + ""

                            //try {
                            //    _pageAutoClose();//自动关闭页面方法

 zhengcaioa/zhengcaioa/Views/ExpertTestTopic/EditPeizhi.cshtml

@@ -124,7 +124,7 @@
                                        <div class="clearfix layer-area" style="padding-top:15px;">
                                           
                                            <div class="col-sm-12 col-md-12" @*style="width:5%;"*@>
                                                <font>@expertTestTopicpeizhiDTOs[i].Topictype @expertTestTopicpeizhiDTOs[i].TopictypeName  （数量：</font>    <input  style="border:none;width:30px;height:30px;" label="数量" name="Fenshuszong" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="@expertTestTopicpeizhiDTOs[i].zongFenshu" readonly="readonly">
                                                <font>@expertTestTopicpeizhiDTOs[i].Topictype @expertTestTopicpeizhiDTOs[i].TopictypeName  （数量：</font>    <input  style="width:30px;height:30px;border:0.5px solid #ccc;" label="数量" name="Fenshuszong" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="@expertTestTopicpeizhiDTOs[i].zongFenshu"  onkeyup="this.value=this.value.replace(/[^0-9]/g,'')" onafterpaste="this.value=this.value.replace(/[^0-9]/g,'')" >
                                           
                                                <font> 题  分值： </font>  <input   label="结论类型" name="Fenzhizong"  style="width:30px;height:30px;border:0.5px solid #ccc;" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="@expertTestTopicpeizhiDTOs[i].zongFenzhi" onkeyup="this.value=this.value.replace(/[^0-9]/g,'')" onafterpaste="this.value=this.value.replace(/[^0-9]/g,'')">  <font>分） </font>
                                            </div>
@@ -142,8 +142,8 @@


                                        <label class="text-right col-sm-1 col-md-1 control-label">@expertTestTopicpeizhiDTOs[i].ZhishitypeName</label>
                                        <div class="col-sm-2 col-md-2" style="width:5%;">
                                            <input class="form-control" label="@expertTestTopicpeizhiDTOs[i].ZhishitypeName" name="Fenshus" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="@expertTestTopicpeizhiDTOs[i].FenshuName" onkeyup="this.value=this.value.replace(/[^0-9]/g,'')" onafterpaste="this.value=this.value.replace(/[^0-9]/g,'')"  onchange="checknum('@expertTestTopicpeizhiDTOs[i].Topictype');">
                                        <div class="col-sm-2 col-md-2" >
                                            <input  style="width:30px;height:30px;border:0.5px solid #ccc;" label="@expertTestTopicpeizhiDTOs[i].ZhishitypeName" name="Fenshus" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="@expertTestTopicpeizhiDTOs[i].FenshuName" onkeyup="this.value=this.value.replace(/[^0-9]/g,'')" onafterpaste="this.value=this.value.replace(/[^0-9]/g,'')"  onchange="checknum('@expertTestTopicpeizhiDTOs[i].Topictype',this);">

                                            <input type="hidden" name="Topictypes" value="@expertTestTopicpeizhiDTOs[i].Topictype" />
                                            <input type="hidden" name="Zhishitypes" value="@expertTestTopicpeizhiDTOs[i].Zhishitype" />
@@ -239,7 +239,7 @@



        var checknum = function (Topictype) {
        var checknum = function (Topictype,obj) {

            var Topictypeszong = document.getElementsByName("Topictypeszong");
            var Fenshuszongs = document.getElementsByName("Fenshuszong");
@@ -262,7 +262,16 @@
            for (var a = 0; a < Topictypeszong.length; a++) {
                
                if (Topictype == Topictypeszong[a].value) {
                    Fenshuszongs[a].value = Fenshuszong;
                    if (Fenshuszongs[a].value == "") {
                        Fenshuszongs[a].value = 0;
                    }
                    if (Fenshuszong > parseInt(Fenshuszongs[a].value))
                    {
                        obj.value = "0";
                        toastr.warning("知识点题目数量不能大于总题目数量");
                        return;
                    }
                    //Fenshuszongs[a].value = Fenshuszong;
                        }

            }
@@ -303,6 +312,102 @@



            var Topictypeszong = document.getElementsByName("Topictypeszong");
            var Fenshuszongs = document.getElementsByName("Fenshuszong");
            var Fenshus = document.getElementsByName("Fenshus");
            var Topictypes = document.getElementsByName("Topictypes");

            var Fenshuszong = 0;
            for (var j = 0; j < Topictypes.length; j++) {

                if (Topictypes[j].value == "01") {

                    if (Fenshus[j].value != "") {
                        Fenshuszong += parseInt(Fenshus[j].value);
                    }

                }
            }



            for (var a = 0; a < Topictypeszong.length; a++) {

                if ("01" == Topictypeszong[a].value) {
                    if (Fenshuszongs[a].value == ""  ) {
                        Fenshuszongs[a].value = 0;
                    }
                    if (Fenshuszong != parseInt(Fenshuszongs[a].value)) {
                       
                        toastr.warning("单选题知识点题目数量必须等于总题目数量");
                        return;
                    }
                    //Fenshuszongs[a].value = Fenshuszong;
                }

            }


            Fenshuszong = 0;
            for (var j = 0; j < Topictypes.length; j++) {

                if (Topictypes[j].value == "02") {

                    if (Fenshus[j].value != "") {
                        Fenshuszong += parseInt(Fenshus[j].value);
                    }

                }
            }



            for (var a = 0; a < Topictypeszong.length; a++) {

                if ("02" == Topictypeszong[a].value) {
                    if (Fenshuszongs[a].value == "") {
                        Fenshuszongs[a].value = 0;
                    }
                    if (Fenshuszong != parseInt(Fenshuszongs[a].value)) {
                      
                        toastr.warning("多选题知识点题目数量必须等于总题目数量");
                        return;
                    }
                    //Fenshuszongs[a].value = Fenshuszong;
                }

            }

            Fenshuszong = 0;
            for (var j = 0; j < Topictypes.length; j++) {

                if (Topictypes[j].value == "03") {

                    if (Fenshus[j].value != "") {
                        Fenshuszong += parseInt(Fenshus[j].value);
                    }

                }
            }



            for (var a = 0; a < Topictypeszong.length; a++) {

                if ("03" == Topictypeszong[a].value) {
                    if (Fenshuszongs[a].value == "") {
                        Fenshuszongs[a].value = 0;
                    }
                    if (Fenshuszong != parseInt(Fenshuszongs[a].value)) {
                      
                        toastr.warning("判断题知识点题目数量必须等于总题目数量");
                        return;
                    }
                    //Fenshuszongs[a].value = Fenshuszong;
                }

            }

           // var data = { id: $("#Id").val(), DocType: $("#DocType").val(), DocDept: $("#DocDept").val(), PublishTime: $("#PublishTime").val(), DocNo: $("#DocNo").val(), DocTitle: $("#DocTitle").val(), DocContent: ueue, DocZtc: $("#DocZtc").val(), Printtimes: $("#Printtimes").val(), DocCsdw: $("#DocCsdw").val(), PrintStatus: $("#PrintStatus").val()}
            $.ajax({
                type: "POST",

 zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml

@@ -16,17 +16,18 @@
        dataCol = [
            { label: 'id', name: 'Id', labtype: 'txt', hidden: true },
            {
                label: '题型', name: 'TopictypeName', labtype: 'txt', hidden: false, width: 50
                label: '题型', name: 'TopictypeName', labtype: 'txt', hidden: false, width: 40
            },

            {
                label: '知识点', name: 'ZhishitypeName', labtype: 'txt', hidden: false, width: 50
                label: '知识点', name: 'ZhishitypeName', labtype: 'txt', hidden: false, width: 40
            },
            { label: '区域', name: 'AreaName', labtype: 'txt', hidden: false, width: 50 },
            { label: '区域', name: 'AreaName', labtype: 'txt', hidden: false, width: 40 },
            { label: '试题', name: 'Topic', labtype: 'txt', hidden: false, width: 300 },
            { label: '重点标注', name: 'ZhongdianName', labtype: 'txt', hidden: false, width: 50 },
            { label: '审核', name: 'ShenpiStatusName', labtype: 'txt', hidden: false, width: 50 },
            { label: '解析', name: 'Jiexi', labtype: 'txt', hidden: false, width: 300 },
            { label: '答案', name: 'Anwsers', labtype: 'txt', hidden: false, width: 40 },
            { label: '重点标注', name: 'ZhongdianName', labtype: 'txt', hidden: false, width: 40 },
            { label: '审核', name: 'ShenpiStatusName', labtype: 'txt', hidden: false, width: 40 },
            { label: '答案对应的法条', name: 'Jiexi', labtype: 'txt', hidden: false, width: 300 },


            {

 zhengcaioa/zhengcaioa/Views/ExpertTestTopic/print.cshtml

@@ -63,9 +63,10 @@
                <td style="width:7%;"> 知识点</td>
                <td style="width:7%;"> 区域</td>
                <td style="width:30%;"> 试题</td>
                <td style="width:7%;"> 答案</td>
                <td style="width:7%;"> 重点标注</td>
                <td style="width:7%;"> 审核</td>
                <td style="width:30%;"> 解析</td>
                <td style="width:30%;"> 答案对应的法条</td>
            </tr>


@@ -82,6 +83,7 @@
            <td> @Html.Raw(ExpertTestTopicDTO.ZhishitypeName)</td>
            <td> @Html.Raw(ExpertTestTopicDTO.AreaName)</td>
            <td> @Html.Raw(ExpertTestTopicDTO.Topic)</td>
            <td> @Html.Raw(ExpertTestTopicDTO.Anwsers)</td>
            <td> @Html.Raw(ExpertTestTopicDTO.ZhongdianName)</td>
            <td> @Html.Raw(ExpertTestTopicDTO.ShenpiStatusName)</td>
            <td> @Html.Raw(ExpertTestTopicDTO.Jiexi)</td>

 zhengcaioa/zhengcaioa/Views/SysBaimingdan/Edit.cshtml

@@ -11,9 +11,10 @@
        {   label: '角色信息', name: 'data', labtype: 'panel',islist:'false', data: [

               {label:' 用户id ', name: 'Id', labtype: 'txt', addvisible: false, editvisible: false ,reg:''}
            , { label: ' 白名单名称 ', name: 'BaimingdanName', labtype: 'txt', addvisible: true, editvisible: true ,   reg:'',ismust:true }
            , { label: ' 白名单组 ', name: 'PostType', labtype: 'combox', addvisible: true, editvisible: true, reg: '', ismust: true, data: JSON.parse(PostType)}

            , { label: ' 白名单名称 ', name: 'BaimingdanName', labtype: 'txt', addvisible: true, editvisible: true ,   reg:'',ismust:true }
           
            , { label: ' 状态 ', name: 'RecStatus', labtype: 'txt', disabled:false, addvisible: false, editvisible: false ,reg:''}



 zhengcaioa/zhengcaioa/Views/SysBaimingdan/Index.cshtml

@@ -8,15 +8,16 @@
        dataCol = [
            { label: 'id', name: 'Id', labtype: 'txt', hidden: true },
            {
                label: '白名单组', name: 'PostTypeName', labtype: 'txt', hidden: false

            },
            {
                label: '白名单名称', name: 'BaimingdanName', labtype: 'txt', hidden: false,
                formatter: function (cellvalue, options, rowObject) {
                    return "<a onclick=\"OpenWindow('" + cellvalue + "','98%','100%', '/SysBaimingdan/Edit?id=" + rowObject.Id + "')\"  >" + cellvalue + "</a>";
                }
            },
            {
                label: '白名单组', name: 'PostTypeName', labtype: 'txt', hidden: false

            },
           
            { label: '创建人', name: 'Creater', labtype: 'txt', hidden: true },
            { label: '创建时间', name: 'Createtime', labtype: 'txt', hidden: true },