Merge branch 'test' of http://192.168.2.236:10080/zhouna/AIPlatform into test

src/css/assertType.less

@@ -368,18 +368,19 @@
 }
 .addTypeAssert {
     display: inline-block;
-    width: 100px;
-    height: 32px;
-    background: #00A1FF;
+    padding: 0 13px;
+    height: 34px;
+    box-sizing: border-box;
     border-radius: 4px;
-    color: #fff;
+    color: #00A1FF;
     text-align: center;
     line-height: 32px;
+    border: 1px solid #00A1FF;
     cursor: pointer;
-    float: left;
+    float: right;
     margin-left: 15px;
     a {
-        color: #fff;
+        color: #00A1FF;
     }
 }
 .assertTypeActive {

src/css/reset.less

@@ -122,6 +122,7 @@ textarea {
 @menuLiHt:40px;   /*菜单项高度*/
 @menuWt:205px;   /*菜单宽度*/
 @themeColor:#203463;    //主题背景色
+@titleColor: #51649C; //面包屑标题颜色
 @themeFontClr:#fff;   //主题字体色
 @greyColor:#A5ADBF;    //灰色二级
 @fstColor:#E9EBEF;    //重要一级，菜单
@@ -142,7 +143,7 @@ textarea {
   width: 100%;
   /*box-sizing: border-box;*/
   z-index: 20;
-  color: #51649C;
+  color: @titleColor;
   height: 44px;
   line-height: 44px;
   /*padding: 0 0 0 15px;*/
@@ -360,23 +361,23 @@ input:-ms-input-placeholder{  /* Internet Explorer 10-11 */
   z-index: 20;
   height: 44px;
   line-height: 44px;
-  padding-left: 15px;
+  padding-left: 20px;
   font-size: 14px;
   font-weight: normal;
   letter-spacing: 1px;
   min-width: 100px;
   p {
     display: inline-block;
-    color: @themeColor;
+    color: @titleColor;
     a {
-      color: @themeColor;
+      color: @titleColor;
       opacity: 70%;
     }
     span {
-      color: @themeColor;
+      color: @titleColor;
     }
     i {
-      color: @themeColor;
+      color: @titleColor;
     }
   }
   .dateDetail {

src/html/assertType.html

@@ -26,7 +26,7 @@
                 </span>
                 <span class="filter">查询</span>
                 <span class="filterclear abnormalClear">重置</span>
-                <span class="addTypeAssert"><a href="assertTypeDetail.html">添加质控类型</a></span>
+                <span class="addTypeAssert"><a href="assertTypeDetail.html">+添加质控类型</a></span>
             </div>
             <div>
                 <table>

src/js/assertType.js

@@ -272,11 +272,10 @@ function midifyMsgBox(item,type){
         msgBox = `<div class="midifyMsgBox">
             <div class="mask"></div>
             <div class="midifyMsgContent midifyMsgContentDel">
-                <p class="midifyMsgTitle">修改 <img class="iconClose" src=${require('./../images/icon_close_default.png')} alt="关闭" /></p>
+                <p class="midifyMsgTitle">删除记录 <img class="iconClose" src=${require('./../images/icon_close_default.png')} alt="关闭" /></p>
                 <p class="delTips">确认要删除该条异常记录？</p>
                 <div class="midifyMsgBtn midifyMsgBtnDel">
-                    <span class="midifyEdit midifyEditDel">删除</span>
-                    <span class="midifyEdit midifyEditQuit">取消</span>
+                    <span class="midifyEdit midifyEditDel">确定</span>
                 </div>
             </div>
         </div>`

src/js/assertTypeDetail.js

@@ -8,7 +8,7 @@ const iconUnCheck = require("./../images/icon_unchecked.png")
 const arrowUp = require("./../images/arrow_up22.png")
 const arrowDown = require("./../images/arrow_down22.png")
 
-let dataCopy,paramType,paramId,submitMsg="新增成功~"
+let dataCopy,paramType,paramId,submitMsg="新增成功"
 $(function(){
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     paramType = getUrlArgObject("type")||""
@@ -35,10 +35,10 @@ function getList(type){
     }else{
         if(type =='"edit"'){
             $('.partTitle p span').html('修改')
-            submitMsg="修改成功~"
+            submitMsg="修改成功"
         }else{
             $('.partTitle p span').html('复制')
-            submitMsg="复制成功~"
+            submitMsg="复制成功"
         }
         post(api.typeGetById,{id: paramId}).then(res =>{
             let result = res.data
@@ -117,7 +117,7 @@ function bindCheck(){
 $('.submit').click(function(){
     const qcName = $('.patientNumInp').val().trim();
     if(!qcName){
-        $.alerModal({"message":"质控类型不能为空~",type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+        $.alerModal({"message":"质控类型不能为空",type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
         return
     }
     let qcTypeCasesEntryVOList = []
@@ -133,9 +133,9 @@ $('.submit').click(function(){
         }
       
     }
-
+    const id = paramType == '"edit"' ? paramId:""
     const param = {
-        id:paramId,
+        id:id,
         name: qcName,
         qcTypeCasesEntryVOList
     }