From 60e78c332cd5597f955e150e1a5f239db8facc59 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 15 十月 2021 15:41:47 +0800
Subject: [PATCH] 题库规则和测试结论

---
 zhengcaioa/DTO/ExpertTestResultDTO.cs                                     |    4 
 zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Edit.cshtml                   |  265 +++++++-----
 zhengcaioa/IServices/IExpertTestTopicService.cs                           |    2 
 zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml                  |   10 
 zhengcaioa/DTO/ExpertTestTopicpeizhiDTO.cs                                |   19 
 zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs |  218 ++++++++++
 zhengcaioa/zhengcaioa/Views/ExpertTestTopic/EditPeizhi.cshtml             |  369 +++++++++++++++++
 zhengcaioa/Services/ExpertTestTopicService.cs                             |   60 ++
 zhengcaioa/DTO/ExpertTestTopicDTO.cs                                      |    3 
 zhengcaioa/zhengcaioa/Views/ExpertTestTopic/EditResult.cshtml             |  300 ++++++++++++++
 10 files changed, 1,126 insertions(+), 124 deletions(-)

diff --git a/zhengcaioa/DTO/ExpertTestResultDTO.cs b/zhengcaioa/DTO/ExpertTestResultDTO.cs
index 9cbd230..7ae1967 100644
--- a/zhengcaioa/DTO/ExpertTestResultDTO.cs
+++ b/zhengcaioa/DTO/ExpertTestResultDTO.cs
@@ -15,5 +15,9 @@
         public DateTime Createtime { get; set; }
         public string Modifier { get; set; }
         public DateTime Modifytime { get; set; }
+
+
+        public string[] Resulttypes { get; set; }
+        public string[] Results { get; set; }
     }
 }
diff --git a/zhengcaioa/DTO/ExpertTestTopicDTO.cs b/zhengcaioa/DTO/ExpertTestTopicDTO.cs
index 2790a72..f053da0 100644
--- a/zhengcaioa/DTO/ExpertTestTopicDTO.cs
+++ b/zhengcaioa/DTO/ExpertTestTopicDTO.cs
@@ -48,6 +48,9 @@
 
         public string[] Flag { get; set; }
 
+        public string[] Fatiaomingxi { get; set; }
+        
+
     }
 
 
diff --git a/zhengcaioa/DTO/ExpertTestTopicpeizhiDTO.cs b/zhengcaioa/DTO/ExpertTestTopicpeizhiDTO.cs
index 92df839..aa82214 100644
--- a/zhengcaioa/DTO/ExpertTestTopicpeizhiDTO.cs
+++ b/zhengcaioa/DTO/ExpertTestTopicpeizhiDTO.cs
@@ -21,5 +21,24 @@
         public DateTime Createtime { get; set; }
         public string Modifier { get; set; }
         public DateTime Modifytime { get; set; }
+
+
+        public string[] Topictypes { get; set; }
+
+        public string[] Zhishitypes { get; set; }
+
+        public decimal?[] Fenshus { get; set; }
+
+        public decimal?[] Fenzhis { get; set; }
+
+        public string[] ShijianIds { get; set; }
+
+        public decimal?[] Fenshuszong { get; set; }
+        public decimal?[] Fenzhizong { get; set; }
+        public string[] Topictypeszong { get; set; }
+
+
+        public string zongFenshu { get; set; }
+        public string zongFenzhi { get; set; }
     }
 }
diff --git a/zhengcaioa/IServices/IExpertTestTopicService.cs b/zhengcaioa/IServices/IExpertTestTopicService.cs
index 5244a77..eda9fbd 100644
--- a/zhengcaioa/IServices/IExpertTestTopicService.cs
+++ b/zhengcaioa/IServices/IExpertTestTopicService.cs
@@ -36,9 +36,11 @@
 
         List<ExpertTestResultDTO> GetListResult();
         ResultEntity saveResult(ExpertTestResultDTO dto);
+        ExpertTestResultDTO GetResult(string Resulttype);
 
         List<ExpertTestTopicpeizhiDTO> GetListpeizhi();
         ResultEntity savepeizhi(ExpertTestTopicpeizhiDTO dto);
+        ExpertTestTopicpeizhiDTO Getpeizhi(string Topictype,string Zhishitype);
 
     }
 }
diff --git a/zhengcaioa/Services/ExpertTestTopicService.cs b/zhengcaioa/Services/ExpertTestTopicService.cs
index fda7dfc..57fa6ea 100644
--- a/zhengcaioa/Services/ExpertTestTopicService.cs
+++ b/zhengcaioa/Services/ExpertTestTopicService.cs
@@ -132,6 +132,7 @@
                             expertTestTopicjiexi.Falv = dto.Falv[i];
                             expertTestTopicjiexi.Fatiao = dto.Fatiao[i];
                             expertTestTopicjiexi.Flag = dto.Flag[i];
+                            expertTestTopicjiexi.Jiexi = dto.Fatiaomingxi[i];  
                             expertTestTopicjiexi.Creater = dto.Modifier;
                             expertTestTopicjiexi.Createtime = DateTime.Now;
                             expertTestTopicjiexi.Modifier = dto.Modifier;
@@ -330,6 +331,21 @@
                 }
             }
 
+
+            var queryjiexis = (from aaa in _context.ExpertTestTopicjiexis.Where(x => x.RecStatus == "A" && lianlist11.Contains(x.Topic)) select aaa).ToList();
+            var falvs = listCode.Where(x => x.CodeTable == "expert_test_topicjiexi" && x.CodeField == "falv").ToList();
+            foreach (var lian in lianlist)
+            {
+                var queryjiexi = queryjiexis.Where(x => x.Topic == lian.Id).OrderBy(x => x.Flag).ToList();
+                var jiexi = "";
+                foreach (var quer in queryjiexi)
+                {
+                 var falv = falvs.Where(x => x.CodeSn == quer.Falv).FirstOrDefault();
+
+                    jiexi +=(falv!=null? "銆�" + falv.Comments + "銆�" : "") + " " + quer.Fatiao + " " + quer.Jiexi + " </br>" ;
+                }
+                lian.Jiexi = jiexi + lian.Jiexi + " </br>";
+            }
 
             data.LoadData(searchEntity, lianlist);
             return data;
@@ -760,7 +776,7 @@
                                 Modifytime = a.Modifytime,
 
                             }
-                ).OrderBy(x => x).ToList();
+                ).OrderBy(x => x.Resulttype).ToList();
 
             return listRole;
         }
@@ -813,9 +829,10 @@
                                 TopictypeName = eee.Comments,
                                 Zhishitype = a.Zhishitype,
                                 ZhishitypeName = fff.Comments,
-                                Fenshu = a.Fenshu,
-                                Fenzhi = a.Fenzhi,
-
+                                Fenshu = a.Fenshu ?? 0,
+                                Fenzhi = a.Fenzhi??0,
+                                FenshuName = (a.Fenshu ?? 0).ToString("0.##"),
+                                FenzhiName = (a.Fenzhi ?? 0).ToString("0.##"),
                                 Creater = a.Creater,
                                 Createtime = a.Createtime,
 
@@ -927,5 +944,40 @@
             return resultEntity;
         }
 
+
+
+        public ExpertTestResultDTO GetResult(string Resulttype)
+        {
+
+            var entity = _context.ExpertTestResults.Where(x=>x.RecStatus =="A" && x.Resulttype == Resulttype).FirstOrDefault();
+
+            if (entity==null)
+            {
+                entity = new ExpertTestResult();
+            }
+
+            var result = _mapper.Map<ExpertTestResultDTO>(entity);
+
+
+            return result;
+        }
+
+
+        public ExpertTestTopicpeizhiDTO Getpeizhi(string Topictype, string Zhishitype)
+        {
+
+            var entity = _context.ExpertTestTopicpeizhis.Where(x => x.RecStatus == "A" && x.Topictype == Topictype && x.Zhishitype == Zhishitype).FirstOrDefault();
+
+            if (entity == null)
+            {
+                entity = new ExpertTestTopicpeizhi();
+            }
+
+            var result = _mapper.Map<ExpertTestTopicpeizhiDTO>(entity);
+
+
+            return result;
+        }
+
     }
 }
diff --git a/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs b/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
index 66ac251..12a24d0 100644
--- a/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
@@ -134,7 +134,12 @@
             if (!String.IsNullOrEmpty(id))
             {
                 dto = _expertTestTopicService.Get(id);
+               
                 expertTestTopicanwserDTOs = _expertTestTopicService.GetListanwser(id);
+                if (dto.Topictype=="03")
+                {
+                    expertTestTopicanwserDTOs = expertTestTopicanwserDTOs.OrderByDescending(x=>x.Anwserno).ToList();
+                }
                 if (expertTestTopicanwserDTOs.Count == 0)
                 {
                     expertTestTopicanwserDTOs.Add(new ExpertTestTopicanwserDTO());
@@ -631,5 +636,218 @@
 
             return View();
         }
+
+
+
+        public IActionResult EditResult()
+        {
+            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+            ViewData["curentuser"] = curentuser;
+            var resultDTOs = _expertTestTopicService.GetListResult();
+            var sysCodeDtls = _liaotianService.GetSYScode("expert_test_result", "resulttype");
+
+            if (resultDTOs==null || resultDTOs.Count == 0)
+            {
+                resultDTOs = new List<ExpertTestResultDTO>();
+                foreach (var sysCodeDtl in sysCodeDtls)
+                {
+                    ExpertTestResultDTO expertTestResultDTO = new ExpertTestResultDTO();
+                    expertTestResultDTO.Resulttype = sysCodeDtl.CodeSn;
+                    expertTestResultDTO.ResulttypeName = sysCodeDtl.Comments;
+                    expertTestResultDTO.Result = "";
+                    resultDTOs.Add(expertTestResultDTO);
+                }
+            }
+
+
+
+
+            ViewBag.resultDTOs = resultDTOs;
+
+
+            ViewBag.resulttype = sysCodeDtls;
+
+            return View();
+        }
+
+
+        /// <summary>
+        /// 淇濆瓨
+        /// </summary>
+        /// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
+        /// <returns></returns>
+        /// 
+        [HttpPost]
+        public  IActionResult SaveResult(ExpertTestResultDTO data)
+        {
+
+            ResultEntity resultEntity = new ResultEntity();
+
+          
+
+            using (TransactionScope scope = new TransactionScope())
+            {
+                var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+                ViewData["curentuser"] = curentuser;
+                data.RecStatus = "A";
+                if(data.Resulttypes!=null&& data.Resulttypes.Length > 0)
+                {
+                   for(int i=0;i< data.Resulttypes.Length; i++)
+                    {
+                      var resultDTO = _expertTestTopicService.GetResult(data.Resulttypes[i]);
+                        if (string.IsNullOrEmpty(resultDTO.Id))
+                        {
+                            resultDTO = new ExpertTestResultDTO();
+                            resultDTO.Resulttype = data.Resulttypes[i];
+                            resultDTO.Result = data.Results[i];
+                            resultDTO.Creater = curentuser.Id;
+                            resultDTO.Createtime = DateTime.Now;
+                        }
+                        else
+                        {
+                            resultDTO.Resulttype = data.Resulttypes[i];
+                            resultDTO.Result = data.Results[i];
+                        }
+                        resultDTO.Modifier = curentuser.Id;
+                        resultDTO.Modifytime = DateTime.Now;
+
+                        resultEntity = _expertTestTopicService.saveResult(resultDTO);
+                    }
+                }
+                scope.Complete();
+            }
+
+
+            return new JsonResult(resultEntity);
+        }
+
+
+        public IActionResult EditPeizhi()
+        {
+            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+            ViewData["curentuser"] = curentuser;
+            var expertTestTopicpeizhiDTOs = _expertTestTopicService.GetListpeizhi();
+            var topictypes = _liaotianService.GetSYScode("expert_test_topic", "topictype");
+            var zhishitypes = _liaotianService.GetSYScode("expert_test_topic", "zhishitype");
+
+            if (expertTestTopicpeizhiDTOs == null || expertTestTopicpeizhiDTOs.Count == 0)
+            {
+                expertTestTopicpeizhiDTOs = new List<ExpertTestTopicpeizhiDTO>();
+                foreach (var topictype in topictypes)
+                {
+                    foreach (var zhishitype in zhishitypes)
+                    {
+                        ExpertTestTopicpeizhiDTO expertTestTopicpeizhiDTO = new ExpertTestTopicpeizhiDTO();
+                        expertTestTopicpeizhiDTO.ShijianId = "01";
+                        expertTestTopicpeizhiDTO.Topictype = topictype.CodeSn;
+                        expertTestTopicpeizhiDTO.TopictypeName = topictype.Comments;
+
+                        expertTestTopicpeizhiDTO.Zhishitype = zhishitype.CodeSn;
+                        expertTestTopicpeizhiDTO.ZhishitypeName = zhishitype.Comments;
+
+                        expertTestTopicpeizhiDTO.Fenshu = 0;
+                        expertTestTopicpeizhiDTO.Fenzhi = 0;
+                        expertTestTopicpeizhiDTO.FenshuName = "0";
+                        expertTestTopicpeizhiDTO.FenzhiName = "0";
+                        expertTestTopicpeizhiDTO.zongFenshu = "0";
+                        expertTestTopicpeizhiDTO.zongFenzhi = "0";
+                        expertTestTopicpeizhiDTOs.Add(expertTestTopicpeizhiDTO);
+                    }
+                }
+
+            }
+            else
+            {
+                foreach (var expertTestTopicpeizhiDTO in expertTestTopicpeizhiDTOs)
+                {
+                    var aaaa  = expertTestTopicpeizhiDTOs.Where(x => x.Topictype == expertTestTopicpeizhiDTO.Topictype).Sum(x => x.Fenshu);
+                    expertTestTopicpeizhiDTO.zongFenshu = aaaa.HasValue? aaaa.Value.ToString("0.##"):"";
+                    expertTestTopicpeizhiDTO.zongFenzhi = expertTestTopicpeizhiDTO.Fenzhi.HasValue ? expertTestTopicpeizhiDTO.Fenzhi.Value.ToString("0.##") : "";
+                }
+            }
+
+             
+
+
+            ViewBag.expertTestTopicpeizhiDTOs = expertTestTopicpeizhiDTOs;
+
+
+            ViewBag.topictype = topictypes;
+            ViewBag.zhishitype = zhishitypes;
+
+            return View();
+        }
+
+
+        /// <summary>
+        /// 淇濆瓨
+        /// </summary>
+        /// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
+        /// <returns></returns>
+        /// 
+        [HttpPost]
+        public IActionResult SavePeizhi(ExpertTestTopicpeizhiDTO data)
+        {
+
+            ResultEntity resultEntity = new ResultEntity();
+
+
+
+            using (TransactionScope scope = new TransactionScope())
+            {
+                var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+                ViewData["curentuser"] = curentuser;
+                data.RecStatus = "A";
+                if (data.Zhishitypes != null && data.Zhishitypes.Length > 0)
+                {
+                    for (int i = 0; i < data.Zhishitypes.Length; i++)
+                    {
+                        var resultDTO = _expertTestTopicService.Getpeizhi(data.Topictypes[i],data.Zhishitypes[i]);
+                        if (string.IsNullOrEmpty(resultDTO.Id))
+                        {
+                            resultDTO = new ExpertTestTopicpeizhiDTO();
+                            resultDTO.ShijianId = data.ShijianIds[i];
+                            resultDTO.Topictype = data.Topictypes[i];
+                            resultDTO.Zhishitype = data.Zhishitypes[i];
+                            resultDTO.Fenshu = data.Fenshus[i];
+                            for (int j = 0; j < data.Topictypeszong.Length; j++)
+                            {
+                                if(data.Topictypeszong[j]== resultDTO.Topictype)
+                                {
+                                    resultDTO.Fenzhi = data.Fenzhizong[j];
+                                }
+                            }
+                              
+                            resultDTO.Creater = curentuser.Id;
+                            resultDTO.Createtime = DateTime.Now;
+                        }
+                        else
+                        {
+                            resultDTO.ShijianId = data.ShijianIds[i];
+                            resultDTO.Topictype = data.Topictypes[i];
+                            resultDTO.Zhishitype = data.Zhishitypes[i];
+                            resultDTO.Fenshu = data.Fenshus[i];
+                            for (int j = 0; j < data.Topictypeszong.Length; j++)
+                            {
+                                if (data.Topictypeszong[j] == resultDTO.Topictype)
+                                {
+                                    resultDTO.Fenzhi = data.Fenzhizong[j];
+                                }
+                            }
+                        }
+                        resultDTO.Modifier = curentuser.Id;
+                        resultDTO.Modifytime = DateTime.Now;
+
+                        resultEntity = _expertTestTopicService.savepeizhi(resultDTO);
+                    }
+                }
+                scope.Complete();
+            }
+
+
+            return new JsonResult(resultEntity);
+        }
+
+
     }
 }
diff --git a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Edit.cshtml
index 828458a..1b2af21 100644
--- a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Edit.cshtml
@@ -251,8 +251,8 @@
                                     {
                                     <div class="clearfix layer-area" style="padding-bottom:15px;">
                                         <label class="text-right col-sm-1 col-md-1 control-label"></label>
-                                        <div class="col-sm-2 col-md-2" style="width:5%;">
-                                            <input class="form-control" label="绛旀缂栧彿" name="anwserno" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="@expertTestTopicanwserDTOs[i].Anwserno" readonly="readonly">
+                                        <div class="col-sm-2 col-md-2" style="width:4%;">
+                                            <input class="form-control" style="text-align:left;border:none;" label="绛旀缂栧彿" name="anwserno" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="@expertTestTopicanwserDTOs[i].Anwserno" readonly="readonly">
                                         </div>
                                         <label class="text-right col-sm-1 col-md-1 control-label" style="width:10px;" name="Anwser1">銆�</label>
                                         <div class="col-sm-6 col-md-6" name="Anwser2">
@@ -316,7 +316,7 @@
                                     @for (int i = 0; i < expertTestTopicanwserDTOs.Count; i++)
                                     {
 
-                                    <div class="col-sm-1 col-md-1" grouptype="Vdata" style="width:5%;">
+                                    <div class="col-sm-1 col-md-1" grouptype="Vdata" style="width:3%;text-align:left;padding-left:15px;">
                                         @if ("A" == expertTestTopicanwserDTOs[i].Shifouzhengqu)
                                         {
                                         <input type="checkbox" checked="checked" name="ShifouzhengquName" value="A" onclick="checkShifouzhengqu(this)" />
@@ -331,7 +331,7 @@
                                     </div>
 
                                     <div class="col-sm-2 col-md-2" style="width:5%;">
-                                        <input class="form-control" label="绛旀缂栧彿" name="anwserno" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="@expertTestTopicanwserDTOs[i].Anwserno" readonly="readonly">
+                                        <input class="form-control" style="border:none;" label="绛旀缂栧彿" name="anwserno" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="@expertTestTopicanwserDTOs[i].Anwserno" readonly="readonly">
                                     </div>
 
                                     <div class="col-sm-6 col-md-6" name="Anwser2" style="display:none;">
@@ -371,113 +371,112 @@
 
                                 <div id="addlist_2">
                                     @for (int i = 0; i < expertTestTopicjiexiDTOs.Count; i++)
-                                {
-                                    <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">
-                                            娉曞緥
-                                        </label>
+                                    {
+                                    <div class="fatiaomeirong">
+                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">
+                                                娉曞緥
+                                            </label>
 
 
-                                        <div class="col-sm-5 col-md-5" grouptype="Vdata">
-                                            <select class="form-control" name="Falv" data-placeholder="閫夋嫨 搴忓垪 ...">
-                                                <option value="" hassubinfo="true">璇烽�夋嫨</option>
-                                                @foreach (var item in falv)
-                                            {
-                                                @if (!item.CodeSn.Equals(expertTestTopicjiexiDTOs[i].Falv))
+                                            <div class="col-sm-5 col-md-5" grouptype="Vdata">
+                                                <select class="form-control" name="Falv" data-placeholder="閫夋嫨 搴忓垪 ...">
+                                                    <option value="" hassubinfo="true">璇烽�夋嫨</option>
+                                                    @foreach (var item in falv)
+                                                    {
+                                                        @if (!item.CodeSn.Equals(expertTestTopicjiexiDTOs[i].Falv))
+                                                        {
+                                                            <option value="@item.CodeSn" hassubinfo="true">
+                                                                @item.Comments
+                                                            </option>
+                                                        }
+                                                        else
+                                                        {
+                                                            <option value="@item.CodeSn" hassubinfo="true" selected="selected">
+                                                                @item.Comments
+                                                            </option>
+                                                        }
+
+                                                    }
+
+                                                </select>
+
+                                            </div>
+
+
+                                            <label class="text-right col-sm-1 col-md-1 control-label" style="width:30px;">娉曟潯</label>
+                                            <div class="col-sm-2 col-md-2">
+                                                <input class="form-control" label="娉曟潯" name="Fatiao" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="flase" type="text" value="@expertTestTopicjiexiDTOs[i].Fatiao">
+
+                                            </div>
+
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">
+                                                涓昏В鏋�
+                                            </label>
+
+
+                                            <div class="col-sm-1 col-md-1" grouptype="Vdata" style="width:5%;">
+
+                                                @if ("A" == expertTestTopicjiexiDTOs[i].Flag)
                                                 {
-                                                <option value="@item.CodeSn" hassubinfo="true">
-                                                    @item.Comments
-                                                </option>
+                                                    <input type="checkbox" checked="checked" name="FlagName" value="A" onclick="checkFlag(this)" />
                                                 }
                                                 else
                                                 {
-                                                <option value="@item.CodeSn" hassubinfo="true" selected="selected">
-                                                    @item.Comments
-                                                </option>
+                                                    <input type="checkbox" name="FlagName" value="D" onclick="checkFlag(this)" />
                                                 }
+                                                <input type="hidden" name="Flag" value="" />
 
+
+
+                                            </div>
+
+
+
+                                            @if (i == 0)
+                                            {
+                                                <div class="col-sm-1 col-md-1" style="width:80px;">
+                                                    <button type="button" class="addBtn" onclick="addBtn(this)" data-type="2" style="width:32px">+</button>
+                                                    <button type="button" class="delBtn" onclick="delBtn(this)" data-type="2" style="width:32px">-</button>
+                                                </div>
                                             }
 
-                                            </select>
 
                                         </div>
 
+                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <label class="text-right col-sm-1 col-md-1 control-label">娉曟潯鍐呭</label>
+                                            <div class="col-sm-11 col-md-11">
+                                                <textarea class="form-control bt" name="Fatiaomingxi" title="娉曟潯鍐呭" isempty="" maxlength="4000" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'">@expertTestTopicjiexiDTOs[i].Jiexi</textarea>
 
-                                        <label class="text-right col-sm-1 col-md-1 control-label" style="width:30px;">娉曟潯</label>
-                                        <div class="col-sm-2 col-md-2">
-                                            <input class="form-control" label="娉曟潯" name="Fatiao" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="flase" type="text" value="@expertTestTopicjiexiDTOs[i].Fatiao">
+                                            </div>
 
                                         </div>
-
-                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">
-                                            涓昏В鏋�
-                                        </label>
-
-
-                                        <div class="col-sm-1 col-md-1" grouptype="Vdata" style="width:5%;">
-
-                                            @if ("A" == expertTestTopicjiexiDTOs[i].Flag)
-                                        {
-                                            <input type="checkbox" checked="checked" name="FlagName" value="A" onclick="checkFlag(this)" />
-                                        }
-                                        else
-                                        {
-                                            <input type="checkbox" name="FlagName" value="D" onclick="checkFlag(this)" />
-                                        }
-                                            <input type="hidden" name="Flag" value="" />
-
-                                            @*<select class="form-control" name="Flag" data-placeholder="閫夋嫨 搴忓垪 ...">
-
-            @foreach (var item in Flag)
-        {
-            @if (!item.CodeSn.Equals(expertTestTopicjiexiDTOs[i].Flag))
-            {
-            <option value="@item.CodeSn" hassubinfo="true">
-                @item.Comments
-            </option>
-            }
-            else
-            {
-            <option value="@item.CodeSn" hassubinfo="true" selected="selected">
-                @item.Comments
-            </option>
-            }
-
-        }
-
-        </select>*@
-
-                                        </div>
-
-
-
-                                        @if (i == 0)
-                                    {
-                                        <div class="col-sm-1 col-md-1" style="width:80px;">
-                                            <button type="button" class="addBtn" onclick="addBtn(this)" data-type="2" style="width:32px">+</button>
-                                            <button type="button" class="delBtn" onclick="delBtn(this)" data-type="2" style="width:32px">-</button>
-                                        </div>
-                                    }
-                                    </div>
-                                }
-                                </div>
-
-
-                                <div class="clearfix layer-area" style="padding-bottom:15px;">
-
-
-
-
-                                    <label class="text-right col-sm-1 col-md-1 control-label">瑙f瀽</label>
-                                    <div class="col-sm-11 col-md-11">
-                                        <textarea class="form-control bt" id="Jiexi" name="Jiexi" title="瑙f瀽" isempty="" maxlength="4000" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'">@Model.Jiexi</textarea>
 
                                     </div>
 
 
-                                </div>
 
-                            </div>
+
+                                            }
+                                        </div>
+
+
+                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+
+
+
+
+                                            <label class="text-right col-sm-1 col-md-1 control-label">瑙f瀽</label>
+                                            <div class="col-sm-11 col-md-11">
+                                                <textarea class="form-control bt" id="Jiexi" name="Jiexi" title="瑙f瀽" isempty="" maxlength="4000" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'">@Model.Jiexi</textarea>
+
+                                            </div>
+
+
+                                        </div>
+
+                                    </div>
 
 
 
@@ -516,6 +515,15 @@
         var Jiexi = document.getElementById("Jiexi");
 
         Jiexi.style.height = Jiexi.scrollHeight + 'px';
+
+        var Fatiaomingxi = document.getElementsByName("Fatiaomingxi");
+        for (var a = 0; a < Fatiaomingxi.length; a++) {
+
+            Fatiaomingxi[a].style.height = Fatiaomingxi[a].scrollHeight + 'px';
+        }
+
+
+
         var Topictype11 = $("#Topictype").val();
         if (Topictype11 == "03") {
             var sss = $("div[name='Anwser2']");
@@ -524,6 +532,19 @@
             ssss.hide();
 
         }
+
+        Jiexi.style.height = Jiexi.scrollHeight + 'px';
+        var Topictype11 = $("#Topictype").val();
+        if (Topictype11 == "03") {
+            var sss = $("div[name='Anwser2']");
+            sss.hide();
+            var ssss = $("label[name='Anwser1']");
+            ssss.hide();
+
+        }
+
+
+
 
         var hh = document.body.clientHeight - $('.ibox-title').height() - $("#top").height() * 2;
         $("#div_content").height(hh);
@@ -894,8 +915,8 @@
                 $('#addlist_3').append(oTr);
                 $(oTr).html(` <div class="clearfix layer-area" style="padding-bottom:15px;">
                                                              <label class="text-right col-sm-1 col-md-1 control-label">绛旀缂栧彿</label>
-                                                            <div class="col-sm-2 col-md-2" style="width:5%;">
-                                            <input class="form-control" label="绛旀缂栧彿" name="anwserno" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="">
+                                                             <div class="col-sm-2 col-md-2" style="width:4%;">
+                                            <input class="form-control" style="text-align:left;border:none;"  label="绛旀缂栧彿" name="anwserno" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="">
                                         </div>
                                                             <label class="text-right col-sm-1 col-md-1 control-label" style="width:10px;" name="Anwser1" >銆�</label>
                                         <div class="col-sm-6 col-md-6" name="Anwser2" >
@@ -929,7 +950,8 @@
                                                         </div>`);
               } else  if (num == 2) {
                 $('#addlist_2').append(oTr);
-                $(oTr).html(` <div class="clearfix layer-area" style="padding-bottom:15px;">
+                  $(oTr).html(` <div class="fatiaomeirong" > 
+<div class="clearfix layer-area" style="padding-bottom:15px;">
 
  <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">
                                             娉曞緥
@@ -981,7 +1003,20 @@
                                     </div>
 
 
-                                                        </div>`);
+
+
+                                                        </div>
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <label class="text-right col-sm-1 col-md-1 control-label">娉曟潯鍐呭</label>
+                                            <div class="col-sm-11 col-md-11">
+                                                <textarea class="form-control bt" name="Fatiaomingxi" title="娉曟潯鍐呭" isempty="" maxlength="4000" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'"></textarea>
+
+                                            </div>
+
+                                        </div>
+ </div>
+
+`);
             }
         }
 
@@ -995,8 +1030,8 @@
                 }
 
             } else if (num == 2) {
-                if ($('#addlist_2').find('.clearfix').length > 1) {
-                    $('#addlist_2').find('.clearfix:last').remove();
+                if ($('#addlist_2').find('.fatiaomeirong').length > 1) {
+                    $('#addlist_2').find('.fatiaomeirong:last').remove();
                 }
 
             }
@@ -1013,7 +1048,7 @@
                                     <label class="text-right col-sm-1 col-md-1 control-label"></label>
 
 
-                                    <div class="col-sm-1 col-md-1" grouptype="Vdata" style="width:5%;">
+                                    <div class="col-sm-1 col-md-1" grouptype="Vdata" style="width:3%;">
 
                                         <input type="checkbox" name="ShifouzhengquName" value="A" onclick="checkShifouzhengqu(this)" />
 
@@ -1023,7 +1058,7 @@
                                     </div>
 
                                     <div class="col-sm-2 col-md-2" style="width:5%;">
-                                        <input class="form-control" label="绛旀缂栧彿" name="anwserno" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="脳" readonly="readonly">
+                                        <input class="form-control" style="border:none;" label="绛旀缂栧彿" name="anwserno" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="鈭�" readonly="readonly">
                                     </div>
 
                                     <div class="col-sm-6 col-md-6" name="Anwser2" style="display:none;">
@@ -1041,7 +1076,7 @@
                                     </div>
 
                                     <div class="col-sm-2 col-md-2" style="width:5%;">
-                                        <input class="form-control" label="绛旀缂栧彿" name="anwserno" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="鈭�" readonly="readonly">
+                                        <input class="form-control" style="border:none;" label="绛旀缂栧彿" name="anwserno" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="脳" readonly="readonly">
                                     </div>
 
                                     <div class="col-sm-6 col-md-6" name="Anwser2" style="display:none;">
@@ -1069,8 +1104,8 @@
                 $('#addlist_3').html(`
 <div class="clearfix layer-area" style="padding-bottom:15px;">
                                         <label class="text-right col-sm-1 col-md-1 control-label"></label>
-                                        <div class="col-sm-2 col-md-2" style="width:5%;">
-                                            <input class="form-control" label="绛旀缂栧彿" name="anwserno" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="A" readonly="readonly">
+                                        <div class="col-sm-2 col-md-2" style="width:4%;">
+                                            <input class="form-control" style="text-align:left;border:none;"  label="绛旀缂栧彿" name="anwserno" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="A" readonly="readonly">
                                         </div>
                                         <label class="text-right col-sm-1 col-md-1 control-label" style="width:10px;" name="Anwser1">銆�</label>
                                         <div class="col-sm-6 col-md-6" name="Anwser2">
@@ -1084,17 +1119,17 @@
 
 
                                         <div class="col-sm-1 col-md-1" grouptype="Vdata" style="width:5%;">
-                                             
+
                                             <input type="checkbox" name="ShifouzhengquName" value="D" onclick="checkShifouzhengqu(this)" />
-                                       
+
                                             <input type="hidden" name="Shifouzhengqu" value="" />
                                         </div>
                                     </div>
 
 <div class="clearfix layer-area" style="padding-bottom:15px;">
                                         <label class="text-right col-sm-1 col-md-1 control-label"></label>
-                                        <div class="col-sm-2 col-md-2" style="width:5%;">
-                                            <input class="form-control" label="绛旀缂栧彿" name="anwserno" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="B" readonly="readonly">
+                                        <div class="col-sm-2 col-md-2" style="width:4%;">
+                                            <input class="form-control" style="text-align:left;border:none;"  label="绛旀缂栧彿" name="anwserno" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="B" readonly="readonly">
                                         </div>
                                         <label class="text-right col-sm-1 col-md-1 control-label" style="width:10px;" name="Anwser1">銆�</label>
                                         <div class="col-sm-6 col-md-6" name="Anwser2">
@@ -1108,17 +1143,17 @@
 
 
                                         <div class="col-sm-1 col-md-1" grouptype="Vdata" style="width:5%;">
-                                             
+
                                             <input type="checkbox" name="ShifouzhengquName" value="D" onclick="checkShifouzhengqu(this)" />
-                                       
+
                                             <input type="hidden" name="Shifouzhengqu" value="" />
                                         </div>
                                     </div>
 
 <div class="clearfix layer-area" style="padding-bottom:15px;">
                                         <label class="text-right col-sm-1 col-md-1 control-label"></label>
-                                        <div class="col-sm-2 col-md-2" style="width:5%;">
-                                            <input class="form-control" label="绛旀缂栧彿" name="anwserno" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="C" readonly="readonly">
+                                         <div class="col-sm-2 col-md-2" style="width:4%;">
+                                            <input class="form-control" style="text-align:left;border:none;"  label="绛旀缂栧彿" name="anwserno" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="C" readonly="readonly">
                                         </div>
                                         <label class="text-right col-sm-1 col-md-1 control-label" style="width:10px;" name="Anwser1">銆�</label>
                                         <div class="col-sm-6 col-md-6" name="Anwser2">
@@ -1132,17 +1167,17 @@
 
 
                                         <div class="col-sm-1 col-md-1" grouptype="Vdata" style="width:5%;">
-                                             
+
                                             <input type="checkbox" name="ShifouzhengquName" value="D" onclick="checkShifouzhengqu(this)" />
-                                       
+
                                             <input type="hidden" name="Shifouzhengqu" value="" />
                                         </div>
                                     </div>
 
 <div class="clearfix layer-area" style="padding-bottom:15px;">
                                         <label class="text-right col-sm-1 col-md-1 control-label"></label>
-                                        <div class="col-sm-2 col-md-2" style="width:5%;">
-                                            <input class="form-control" label="绛旀缂栧彿" name="anwserno" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="D" readonly="readonly">
+                                         <div class="col-sm-2 col-md-2" style="width:4%;">
+                                            <input class="form-control" style="text-align:left;border:none;"  label="绛旀缂栧彿" name="anwserno" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="D" readonly="readonly">
                                         </div>
                                         <label class="text-right col-sm-1 col-md-1 control-label" style="width:10px;" name="Anwser1">銆�</label>
                                         <div class="col-sm-6 col-md-6" name="Anwser2">
@@ -1156,9 +1191,9 @@
 
 
                                         <div class="col-sm-1 col-md-1" grouptype="Vdata" style="width:5%;">
-                                             
+
                                             <input type="checkbox" name="ShifouzhengquName" value="D" onclick="checkShifouzhengqu(this)" />
-                                       
+
                                             <input type="hidden" name="Shifouzhengqu" value="" />
                                         </div>
                                     </div>
diff --git a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/EditPeizhi.cshtml b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/EditPeizhi.cshtml
new file mode 100644
index 0000000..314f739
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/EditPeizhi.cshtml
@@ -0,0 +1,369 @@
+锘緻model DTO.ExpertTestTopicpeizhiDTO
+@using DTO;
+@using zhengcaioa.Models;
+@{
+
+
+    List<SysCodeDtl> topictype = ViewData["topictype"] as List<SysCodeDtl>; //缁撹绫诲瀷
+
+    List<SysCodeDtl> zhishitype = ViewData["zhishitype"] as List<SysCodeDtl>; //缁撹绫诲瀷
+
+    List<ExpertTestTopicpeizhiDTO> expertTestTopicpeizhiDTOs = ViewBag.expertTestTopicpeizhiDTOs as List<ExpertTestTopicpeizhiDTO>; //鏁版嵁
+
+
+
+
+}
+@{
+    Layout = null;
+}
+
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <meta name="description" content="">
+    <meta name="author" content="ThemeBucket">
+    <title>@(SiteConfig.SiteName)</title>
+    <link href="~/css/bootstrap.min.css" rel="stylesheet">
+    <link href="~/css/font-awesome.min.css" rel="stylesheet">
+    <link href="~/css/animate.min.css" rel="stylesheet">
+
+    @*<link href="~/css/plugins/iCheck/custom.css" rel="stylesheet">*@
+    <link href="~/css/style.min.css" rel="stylesheet">
+    <link href="~/css/plugins/chosen/chosen.css" rel="stylesheet">
+    @*<link href="~/js/plugins/layer/skin/layer.css" rel="stylesheet">*@
+    @*<link href="~/css/plugins/datapicker/datepicker3.css" rel="stylesheet">*@
+    <link href="~/css/style.min.css" rel="stylesheet">
+    <link href="~/css/plugins/toastr/toastr.min.css" rel="stylesheet" />
+    <link href="~/css/plugins/webuploader/webuploader.css" rel="stylesheet" />
+
+    <style type="text/css">
+        .webuploader-pick {
+            position: relative;
+            display: inline-block;
+            cursor: pointer;
+            background: #00b7ee;
+            padding: 8px 14px 7px 14px;
+            color: #fff;
+            text-align: center;
+            border-radius: 3px;
+            overflow: hidden;
+        }
+
+        div.clearfix > label {
+            padding-top: 8px;
+        }
+
+        .chosen-container {
+            border-radius: 1px;
+            border: 1px solid #e5e6e7;
+        }
+
+        .col-md-1.control-label {
+            padding-right: 0px;
+            font-weight: 400;
+        }
+    </style>
+
+    <!-- jqgrid-->
+    @*<link href="~/css/plugins/jqgrid/ui.jqgrid.css" rel="stylesheet">*@
+    <script language="javascript" src="~/js/jquery.min.js" type="text/javascript"></script>
+    <script src="~/js/bootstrap.min.js"></script>
+    @*<script src="~/js/plugins/bootstro/bootstro.js"></script>*@
+
+    <!--瀹瑰櫒-->
+    @*<script language="javascript" src="~/js/datehelper.js" type="text/javascript"></script>*@
+    @*<script language="javascript" src="~/js/plugins/query/jquery.query-object.js" type="text/javascript"></script>*@
+    @*<script language="javascript" src="~/js/plugins/iCheck/icheck.min.js" type="text/javascript"></script>*@
+    <script language="javascript" src="~/js/plugins/chosen/chosen.jquery.js" type="text/javascript"></script>
+    @*<script language="javascript" src="~/js/plugins/datapicker/bootstrap-datepicker.js" type="text/javascript"></script>*@
+    <script language="javascript" src="~/js/plugins/layer/layer.js" type="text/javascript"></script>
+    @*<script src="~/js/plugins/jqgrid/jquery.jqGrid.min.js" type="text/javascript"></script>*@
+    @*<script src="~/js/plugins/jqgrid/i18n/grid.locale-cn.js" type="text/javascript"></script>*@
+    <script src="~/js/plugins/toastr/toastr.min.js" type="text/javascript"></script>
+    <script src="~/js/plugins/webuploader/webuploader.min.js"></script>
+
+    <script language="javascript" src="~/js/common-layout.js" type="text/javascript"></script>
+    <script src="~/js/plugins/layer/laydate/laydate.js" type="text/javascript"></script>
+    @*<script src="~/js/plugins/iTexbox/itextbox.js" type="text/javascript"></script>*@
+    @*<script src="~/js/plugins/iuploader/iuploader.js"></script>*@
+    <script src="~/js/TUJS.js"></script>
+</head>
+<body class="gray-bg" style="overflow:auto">
+    <form id="formtest">
+        <div class="wrapper wrapper-content" id="ibox-content" style="padding:15px;">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="ibox float-e-margins">
+                        <div class="ibox-title">
+                            <h5>                            <i class="fa fa-list"></i>&nbsp;鍩烘湰淇℃伅</h5>
+                        </div>
+                        <div id="div_content" class="ibox-content" style="background-color:white;">
+                            <div class="row">
+                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+
+
+
+
+
+
+
+
+
+
+
+                                    @for (int i = 0; i < expertTestTopicpeizhiDTOs.Count; i++)
+                                    {
+
+                                        if (i == 0 || expertTestTopicpeizhiDTOs[i].Topictype != expertTestTopicpeizhiDTOs[i - 1].Topictype)
+                                        {
+                                    <h5>
+
+                                        <div class="clearfix layer-area" style="padding-top:15px;">
+                                            <label class="text-right col-sm-1 col-md-1 control-label" style="font-weight:bold;">@expertTestTopicpeizhiDTOs[i].Topictype @expertTestTopicpeizhiDTOs[i].TopictypeName</label>
+                                            <label class="text-right col-sm-1 col-md-1 control-label" style="font-weight:bold;">
+                                                锛堟暟閲忥細
+                                            </label>
+                                            <div class="col-sm-2 col-md-2" style="width:5%;">
+                                                <input class="form-control" style="border:none;" label="鏁伴噺" name="Fenshuszong" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="@expertTestTopicpeizhiDTOs[i].zongFenshu" readonly="readonly">
+                                            </div>
+                                            <label class="text-left col-sm-1 col-md-1 control-label" style="font-weight:bold;">棰�</label>
+                                            <label class="text-right col-sm-1 col-md-1 control-label" style="font-weight:bold;">鍒嗗�硷細</label>
+                                            <div class="col-sm-2 col-md-2" style="width:5%;">
+                                                <input class="form-control" label="缁撹绫诲瀷" name="Fenzhizong" 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,'')">
+                                            </div>
+                                            <label class="text-left col-sm-1 col-md-1 control-label" style="font-weight:bold;">鍒嗭級</label>
+                                            <input type="hidden" name="Topictypeszong" value="@expertTestTopicpeizhiDTOs[i].Topictype" />
+                                        </div>
+                                    </h5>
+                                        }
+
+
+                                        @if (i == 0 || (i + 1) % 4 == 0)
+                                        {
+                                            @Html.Raw("<div class=\"clearfix layer - area\" >")
+                                        }
+
+
+                                        <label class="text-right col-sm-1 col-md-1 control-label">@expertTestTopicpeizhiDTOs[i].ZhishitypeName</label>
+                                        <div class="col-sm-2 col-md-2">
+                                            <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');">
+
+                                            <input type="hidden" name="Topictypes" value="@expertTestTopicpeizhiDTOs[i].Topictype" />
+                                            <input type="hidden" name="Zhishitypes" value="@expertTestTopicpeizhiDTOs[i].Zhishitype" />
+                                            <input type="hidden" name="ShijianIds" value="@expertTestTopicpeizhiDTOs[i].ShijianId" />
+                                            <input type="hidden" name="Fenzhis" value="@expertTestTopicpeizhiDTOs[i].Fenzhi" />
+                                        </div>
+
+
+
+
+
+                                        @if (i != 0 && ( i == (expertTestTopicpeizhiDTOs.Count - 1) || expertTestTopicpeizhiDTOs[i].Topictype != expertTestTopicpeizhiDTOs[i + 1].Topictype))
+                                        {
+                                      
+                                            @Html.Raw("</div>")
+                                        }
+
+
+
+                                    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+                                </div>
+
+
+
+                                        </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="wrapper wrapper-content" style="margin-top:0px"></div>
+        <div class="ibox-content" id="top" style="z-index:100; position:fixed; height:50px; width:100%;bottom:0; text-align: right; padding-top:8px ">
+            <div class="" style="float:right;" data-bootstro-width="500px" data-bootstro-content="鍔熻兘鎸夐挳锛氣�滀繚瀛樷�濓紝鈥滃垹闄も��">
+
+
+                <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+                    <i class="glyphicon glyphicon-ok"></i>&nbsp;&nbsp;<span class="bold">鎻愪氦</span>
+                </a>
+
+
+            </div>
+        </div>
+
+    </form>
+
+    <script type="text/javascript">
+
+
+        var hh = document.body.clientHeight - $('.ibox-title').height() - $("#top").height() * 2;
+        $("#div_content").height(hh);
+
+        toastr.options = {
+            "closeButton": true,
+            "debug": false,
+            "progressBar": true,
+            "positionClass": "toast-bottom-right",
+            "onclick": null,
+            "showDuration": "300",
+            "hideDuration": "600",
+            "timeOut": "4500",
+            "extendedTimeOut": "600",
+            "showEasing": "swing",
+            "hideEasing": "linear",
+            "showMethod": "fadeIn",
+            "hideMethod": "fadeOut"
+        };
+
+
+
+
+
+
+        @*var id = '@Model.Id';*@
+
+
+
+        var checknum = function (Topictype) {
+
+            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 == Topictype) {
+                 
+                    if (Fenshus[j].value != "") {
+                        Fenshuszong += parseInt(Fenshus[j].value);
+                    }
+                  
+                }
+            }
+         
+
+
+            for (var a = 0; a < Topictypeszong.length; a++) {
+                
+                if (Topictype == Topictypeszong[a].value) {
+                    Fenshuszongs[a].value = Fenshuszong;
+                        }
+
+            }
+           
+           
+        }
+
+
+
+
+
+        // 淇濆瓨宀椾綅淇℃伅
+        var savePosition = function () {
+
+
+
+
+
+            var sss = document.getElementsByName("Fenshus");
+
+            for (var j = 0; j < sss.length; j++) {
+
+                if ($.trim(sss[j].value)=="") {
+                    toastr.warning("鏁伴噺涓嶈兘涓虹┖");
+                    return;
+                }
+            }
+            var sss = document.getElementsByName("Fenzhizong");
+
+            for (var j = 0; j < sss.length; j++) {
+
+                if ($.trim(sss[j].value) == "") {
+                    toastr.warning("鍒嗗�间笉鑳戒负绌�");
+                    return;
+                }
+            }
+            
+
+
+
+           // 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",
+                url: "/ExpertTestTopic/SavePeizhi",
+                dataType: "json",
+                global: false,
+                data: $('form').serializeArray(),
+                success: function (data) {
+
+
+
+                        if (data.Result) {
+                            //  parent._afterSave(true);
+                            parent.layer.msg('鎴愬姛淇濆瓨', { icon: 6 });
+                            var Topictype = $("#Topictype").val();
+                            var Zhishitype = $("#Zhishitype").val();
+                            var Area = $("#Area").val();
+
+                            window.location = "/ExpertTestTopic/EditPeizhi";
+
+                            //try {
+                            //    _pageAutoClose();//鑷姩鍏抽棴椤甸潰鏂规硶
+                            //}
+                            //catch (err) {
+                            //    parent._CloseTab1("/ExpertTestTopic/Edit/");
+                            //}
+
+                        }
+                        else {
+                            // toastr.error("澶辫触");
+                            parent.layer.msg(data.Message, { icon: 5 });
+                        }
+
+                },
+                error: function () {
+
+
+                    parent.layer.msg('澶辫触', { icon: 5 });
+                }
+            });
+        }
+
+
+
+
+        function _pageAutoClose() {
+            parent.window._reloadPageData();
+            var index = parent.layer.getFrameIndex(window.name);
+            parent.layer.isRefresh = true;
+            parent.layer.closeAll('loading');
+            parent.layer.close(index);
+            return false;
+        }
+
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/EditResult.cshtml b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/EditResult.cshtml
new file mode 100644
index 0000000..dda16be
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/EditResult.cshtml
@@ -0,0 +1,300 @@
+锘緻model DTO.ExpertTestResultDTO
+@using DTO;
+@using zhengcaioa.Models;
+@{
+
+
+    List<SysCodeDtl> resulttype = ViewData["resulttype"] as List<SysCodeDtl>; //缁撹绫诲瀷
+
+
+
+    List<ExpertTestResultDTO> resultDTOs = ViewBag.resultDTOs as List<ExpertTestResultDTO>; //鏁版嵁
+
+
+
+
+}
+@{
+    Layout = null;
+}
+
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <meta name="description" content="">
+    <meta name="author" content="ThemeBucket">
+    <title>@(SiteConfig.SiteName)</title>
+    <link href="~/css/bootstrap.min.css" rel="stylesheet">
+    <link href="~/css/font-awesome.min.css" rel="stylesheet">
+    <link href="~/css/animate.min.css" rel="stylesheet">
+
+    @*<link href="~/css/plugins/iCheck/custom.css" rel="stylesheet">*@
+    <link href="~/css/style.min.css" rel="stylesheet">
+    <link href="~/css/plugins/chosen/chosen.css" rel="stylesheet">
+    @*<link href="~/js/plugins/layer/skin/layer.css" rel="stylesheet">*@
+    @*<link href="~/css/plugins/datapicker/datepicker3.css" rel="stylesheet">*@
+    <link href="~/css/style.min.css" rel="stylesheet">
+    <link href="~/css/plugins/toastr/toastr.min.css" rel="stylesheet" />
+    <link href="~/css/plugins/webuploader/webuploader.css" rel="stylesheet" />
+
+    <style type="text/css">
+        .webuploader-pick {
+            position: relative;
+            display: inline-block;
+            cursor: pointer;
+            background: #00b7ee;
+            padding: 8px 14px 7px 14px;
+            color: #fff;
+            text-align: center;
+            border-radius: 3px;
+            overflow: hidden;
+        }
+
+        div.clearfix > label {
+            padding-top: 8px;
+        }
+
+        .chosen-container {
+            border-radius: 1px;
+            border: 1px solid #e5e6e7;
+        }
+
+        .col-md-1.control-label {
+            padding-right: 0px;
+            font-weight: 400;
+        }
+    </style>
+
+    <!-- jqgrid-->
+    @*<link href="~/css/plugins/jqgrid/ui.jqgrid.css" rel="stylesheet">*@
+    <script language="javascript" src="~/js/jquery.min.js" type="text/javascript"></script>
+    <script src="~/js/bootstrap.min.js"></script>
+    @*<script src="~/js/plugins/bootstro/bootstro.js"></script>*@
+
+    <!--瀹瑰櫒-->
+    @*<script language="javascript" src="~/js/datehelper.js" type="text/javascript"></script>*@
+    @*<script language="javascript" src="~/js/plugins/query/jquery.query-object.js" type="text/javascript"></script>*@
+    @*<script language="javascript" src="~/js/plugins/iCheck/icheck.min.js" type="text/javascript"></script>*@
+    <script language="javascript" src="~/js/plugins/chosen/chosen.jquery.js" type="text/javascript"></script>
+    @*<script language="javascript" src="~/js/plugins/datapicker/bootstrap-datepicker.js" type="text/javascript"></script>*@
+    <script language="javascript" src="~/js/plugins/layer/layer.js" type="text/javascript"></script>
+    @*<script src="~/js/plugins/jqgrid/jquery.jqGrid.min.js" type="text/javascript"></script>*@
+    @*<script src="~/js/plugins/jqgrid/i18n/grid.locale-cn.js" type="text/javascript"></script>*@
+    <script src="~/js/plugins/toastr/toastr.min.js" type="text/javascript"></script>
+    <script src="~/js/plugins/webuploader/webuploader.min.js"></script>
+
+    <script language="javascript" src="~/js/common-layout.js" type="text/javascript"></script>
+    <script src="~/js/plugins/layer/laydate/laydate.js" type="text/javascript"></script>
+    @*<script src="~/js/plugins/iTexbox/itextbox.js" type="text/javascript"></script>*@
+    @*<script src="~/js/plugins/iuploader/iuploader.js"></script>*@
+    <script src="~/js/TUJS.js"></script>
+</head>
+<body class="gray-bg" style="overflow:auto">
+    <form id="formtest">
+        <div class="wrapper wrapper-content" id="ibox-content" style="padding:15px;">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="ibox float-e-margins">
+                        <div class="ibox-title">
+                            <h5>                            <i class="fa fa-list"></i>&nbsp;鍩烘湰淇℃伅</h5>
+                        </div>
+                        <div id="div_content" class="ibox-content" style="background-color:white;">
+                            <div class="row">
+                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                     
+                                 
+                            
+                               
+
+
+                                
+
+                                
+                                   
+
+                                        @for (int i = 0; i < resultDTOs.Count; i++)
+                                        {
+                                            <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                <label class="text-right col-sm-1 col-md-1 control-label">缁撹绫诲瀷</label>
+                                                <div class="col-sm-2 col-md-2">
+                                                    <input class="form-control" label="缁撹绫诲瀷" name="ResulttypeName" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="@resultDTOs[i].ResulttypeName" readonly="readonly">
+
+                                                    <input type="hidden" name="Resulttypes" value="@resultDTOs[i].Resulttype" />
+                                                </div>
+                                                <label class="text-right col-sm-1 col-md-1 control-label"  >娴嬭瘯缁撹</label>
+                                                <div class="col-sm-6 col-md-6"  >
+                                                    <input class="form-control" label="娴嬭瘯缁撹" name="Results" labtype="txt" addvisible="true" editvisible="true" maxlength="100" reg="" ismust="flase" type="text" value="@resultDTOs[i].Result">
+
+                                                </div>
+
+                                                
+
+
+                                                
+
+
+                                              
+                                            </div>
+
+                                        }
+                                   
+                               
+
+
+
+
+
+
+
+
+
+
+
+                         
+
+
+                         
+
+                            </div>
+
+
+
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        </div>
+        <div class="wrapper wrapper-content" style="margin-top:0px"></div>
+        <div class="ibox-content" id="top" style="z-index:100; position:fixed; height:50px; width:100%;bottom:0; text-align: right; padding-top:8px ">
+            <div class="" style="float:right;" data-bootstro-width="500px" data-bootstro-content="鍔熻兘鎸夐挳锛氣�滀繚瀛樷�濓紝鈥滃垹闄も��">
+
+
+                <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+                    <i class="glyphicon glyphicon-ok"></i>&nbsp;&nbsp;<span class="bold">鎻愪氦</span>
+                </a>
+
+               
+            </div>
+        </div>
+
+    </form>
+
+    <script type="text/javascript">
+        
+
+        var hh = document.body.clientHeight - $('.ibox-title').height() - $("#top").height() * 2;
+        $("#div_content").height(hh);
+
+        toastr.options = {
+            "closeButton": true,
+            "debug": false,
+            "progressBar": true,
+            "positionClass": "toast-bottom-right",
+            "onclick": null,
+            "showDuration": "300",
+            "hideDuration": "600",
+            "timeOut": "4500",
+            "extendedTimeOut": "600",
+            "showEasing": "swing",
+            "hideEasing": "linear",
+            "showMethod": "fadeIn",
+            "hideMethod": "fadeOut"
+        };
+
+       
+
+
+
+
+        @*var id = '@Model.Id';*@
+         
+
+
+        
+
+
+        
+
+
+        // 淇濆瓨宀椾綅淇℃伅
+        var savePosition = function () {
+
+
+
+             
+
+            var sss = document.getElementsByName("Results");
+          
+            for (var j = 0; j < sss.length; j++) {
+
+                if ($.trim(sss[j].value)=="") {
+                    toastr.warning("娴嬭瘯缁撹涓嶈兘涓虹┖");
+                    return;
+                } 
+            }
+
+           
+
+
+
+           // 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",
+                url: "/ExpertTestTopic/SaveResult",
+                dataType: "json",
+                global: false,
+                data: $('form').serializeArray(),
+                success: function (data) {
+
+
+
+                        if (data.Result) {
+                            //  parent._afterSave(true);
+                            parent.layer.msg('鎴愬姛淇濆瓨', { icon: 6 });
+                            var Topictype = $("#Topictype").val();
+                            var Zhishitype = $("#Zhishitype").val();
+                            var Area = $("#Area").val();
+
+                            window.location = "/ExpertTestTopic/EditResult";
+
+                            //try {
+                            //    _pageAutoClose();//鑷姩鍏抽棴椤甸潰鏂规硶
+                            //}
+                            //catch (err) {
+                            //    parent._CloseTab1("/ExpertTestTopic/Edit/");
+                            //}
+
+                        }
+                        else {
+                            // toastr.error("澶辫触");
+                            parent.layer.msg(data.Message, { icon: 5 });
+                        }
+
+                },
+                error: function () {
+
+
+                    parent.layer.msg('澶辫触', { icon: 5 });
+                }
+            });
+        }
+
+
+
+
+        function _pageAutoClose() {
+            parent.window._reloadPageData();
+            var index = parent.layer.getFrameIndex(window.name);
+            parent.layer.isRefresh = true;
+            parent.layer.closeAll('loading');
+            parent.layer.close(index);
+            return false;
+        }
+
+         
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml
index 11cb849..df52f34 100644
--- a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml
@@ -16,16 +16,16 @@
         dataCol = [
             { label: 'id', name: 'Id', labtype: 'txt', hidden: true },
             {
-                label: '棰樺瀷', name: 'TopictypeName', labtype: 'txt', hidden: false, width: 70
+                label: '棰樺瀷', name: 'TopictypeName', labtype: 'txt', hidden: false, width: 50
             },
 
             {
-                label: '鐭ヨ瘑鐐�', name: 'ZhishitypeName', labtype: 'txt', hidden: false, width: 70
+                label: '鐭ヨ瘑鐐�', name: 'ZhishitypeName', labtype: 'txt', hidden: false, width: 50
             },
-            { label: '鍖哄煙', name: 'AreaName', labtype: 'txt', hidden: false, width: 70 },
+            { label: '鍖哄煙', name: 'AreaName', labtype: 'txt', hidden: false, width: 50 },
             { label: '璇曢', name: 'Topic', labtype: 'txt', hidden: false, width: 300 },
-            { label: '閲嶇偣鏍囨敞', name: 'ZhongdianName', labtype: 'txt', hidden: false, width: 70 },
-            { label: '瀹℃牳', name: 'ShenpiStatusName', labtype: 'txt', hidden: false, width: 70 },
+            { label: '閲嶇偣鏍囨敞', name: 'ZhongdianName', labtype: 'txt', hidden: false, width: 50 },
+            { label: '瀹℃牳', name: 'ShenpiStatusName', labtype: 'txt', hidden: false, width: 50 },
             { label: '瑙f瀽', name: 'Jiexi', labtype: 'txt', hidden: false, width: 300 },
 
 

--
Gitblit v1.9.1