按钮部分公用样式提取及更新

src/common/components/CheckBox/index.less

@@ -1,6 +1,5 @@
 
 .cb-container{
-  // width: 277px;
   min-width: 216px;
   padding: 10px;
   position: absolute;
@@ -34,25 +33,15 @@
   margin-top: 10px;
 }
 .multiple-tab{
-  // width: 200px;
   vertical-align: top;
-  // p{
-  //   width: 200px;
-  //   height: 44px;
-  //   line-height: 44px;
-  //   cursor: pointer;
-  //   padding-left: 40px;
-  // }
 }
 .multiple-con{
-  // width: 440px;
   display: inline-block;
 }
 .btn{
 
 }
 .nospecial{
-  // width: 200px;
   height: 44px;
   line-height: 44px;
   cursor: pointer;

src/common/components/ComplexModal/index.less

@@ -7,9 +7,6 @@
     position: relative;
     height: 100%;
     padding-bottom: 30px;
-    // bottom: 70px;
-    // top: 70px;
-    // width: 820px;
   }
   .footer{
     // width: 820px;
@@ -19,14 +16,6 @@
     text-align: right;
     background-color: #fff;
   }
-  // @media print {
-  //   .close{
-  //     display: none;
-  //   }
-  //   .flg {
-  //     display: block !important;
-  //   }
-  // }
   .flg {
     display: none;
   }
@@ -69,24 +58,5 @@
       margin-top: -5px;
     }
   }
-  .button {
-    position: fixed;
-    bottom: 75px;
-    left: 50%;
-    margin-left: 280px;
-    span{
-      display: inline-block;
-      width: 80px;
-      height: 34px;
-      background: #3B9ED0;
-      font-size: 14px;
-      color: #FFFFFF;
-      font-size: 14px;
-      text-align: center;
-      line-height: 34px;
-      border-radius: 4px;
-      cursor: pointer;
-    }
-  }
 }
 

src/common/components/ConfirmModal/index.less

@@ -1,3 +1,4 @@
+@import "~@less/mixin.less";
 .modal {
     position: fixed;
     top: 50%;
@@ -46,16 +47,13 @@
 }
 
 .modal-operator-close, .modal-operator-confirm {
+    .btnCom;
     width: 100px;
-    border: none;
-    outline: none;
     margin: auto;
     height: 34px;
     line-height: 32px;
     opacity: 1;
     color: #fff;
-    cursor: pointer;
-    border-radius: 4px;
     border: 1px solid #78bddd;
 }
 .modal-operator-confirm {

src/common/less/variables.less

@@ -52,6 +52,13 @@
 @EMR-width: calc(~"100% - "@push-width);
 
 /*******下拉框公用样式**********/
+.btnCom{
+  border: none;
+  outline: none;
+  cursor: pointer;
+  border-radius: 4px;
+  text-align: center;
+}
 .pop{
   position: absolute;
   // top:40px;
@@ -91,12 +98,12 @@
   line-height: 44px;
   font-size: 12px;
   color:@red;
-  border: none;
+  // border: none;
   background: #fff;
   float: left;
-  outline: none;
-  text-align: center;
-  cursor: pointer;
+  // outline: none;
+  // text-align: center;
+  // cursor: pointer;
   margin-left: 22px;
   position: relative;
   bottom: -10px;
@@ -111,9 +118,9 @@
   background: #fff;
   margin-left: 20px;
   float: right;
-  outline: none;
+  // outline: none;
   text-align: right;
-  cursor: pointer;
+  // cursor: pointer;
   font-weight: bold;
   position: relative;
   bottom: -10px;

src/components/AssessResult/index.less

@@ -113,14 +113,10 @@
 }
 .footer{
   .print{
+    .btnCom;
     width: 111px;
     height: 34px;
     line-height: 34px;
-    outline: none;
-    border-radius: 4px;
-    /*color: #3B9ED0;*/
-    border: 0 none;
-    cursor: pointer;
     background: #fff;
     margin-right: 20px;
     img{
@@ -130,13 +126,10 @@
     }
   }
   .okBtn{
+    .btnCom;
     width: 80px;
     height: 34px;
     line-height: 32px;
-    text-align: center;
-    outline: none;
-    border-radius: 4px;
-    cursor: pointer;
     border: 1px solid #3B9ED0;
     box-sizing: border-box;
     margin-left: 20px;
@@ -147,16 +140,13 @@
   }
 }
 .forMulBtn{
+  .btnCom;
   height: 32px;
   line-height: 32px;
-  text-align: center;
   color: #fff;
-  // background: #DBDBDB;
   background: #3B9ED0;
-  border-radius: 4px;
   cursor: auto;
   margin-top: 15px;
-  cursor: pointer;
 }
 .textareaStatic {
   display: none;

src/components/Banner/index.less

@@ -93,19 +93,17 @@
           }
         }
         .btn {
+          .btnCom;
           width: 80px;
           height: 34px;
           background:#3B9ED0;
           color:#fff;
-          border-radius: 4px;
           font-size: 14px;
-          text-align: center;
           line-height: 34px;
           position: relative;
           left: 50%;
           margin-left: -40px;
           top: 30px;
-          cursor: pointer;
         }
       }
     }

src/components/ChronicInfo/index.less

@@ -1,3 +1,4 @@
+@import "~@less/mixin.less";
 .tips{
   border:1px solid #EAEDF1;
   .tips-title,h1{
@@ -33,19 +34,16 @@
       white-space: nowrap;
     }
     .tipsDetails {
+      .btnCom;
       display: inline-block;
       font-weight: normal;
       width: 42px;
       height: 20px;
       border: 1px solid #262626;
-      border-radius: 4px;
-      text-align: center;
       font-size: 12px;
-      // color: #3B9ED0;
       color: #262626;
       line-height: 18px;
       margin: 0 0 -2px 10px;
-      cursor: pointer;
       }
     }
     .chronic{
@@ -73,15 +71,13 @@
           width: 73%;
         }
         .listResult,.addResult{
+          .btnCom;
           float: right;
-          cursor: pointer;
           display: inline-block;
           width: 99px;
           height: 26px;
           line-height: 26px;
-          text-align: center;
           border: 1px solid #EAEDF1;
-          border-radius: 4px;
           font-size: 12px;
           img{
             vertical-align: middle;
@@ -107,13 +103,11 @@
             height: 40px;
             line-height: 40px;
             padding-left: 18px;
-            // border-bottom: 1px solid #EAEDF1;
             background: #DFEAFE;
             img{
               vertical-align: text-top;
             }
             .closeIcon{
-              // vertical-align: middle;
               float: right;
             }
           }
@@ -241,13 +235,10 @@
         }
       }
       .okBtn{
+        .btnCom;
         width: 80px;
         height: 34px;
         line-height: 32px;
-        text-align: center;
-        outline: none;
-        border-radius: 4px;
-        cursor: pointer;
         border: 1px solid #3B9ED0;
         box-sizing: border-box;
         margin-left: 20px;
@@ -262,14 +253,10 @@
     margin-right: 10px;
   }
   .forMulBtn{
+    .btnCom;
     height: 32px;
     line-height: 32px;
-    text-align: center;
     color: #fff;
-    // background: #DBDBDB;
     background: #3B9ED0;
-    border-radius: 4px;
-    cursor: auto;
     margin-top: 15px;
-    cursor: pointer;
   }

src/components/CommonSymptom/index.less

@@ -35,11 +35,13 @@
     // text-align: center;
   }
   .clear{
+    .btnCom;
     .clear;
     margin-left: 15px;
     bottom: 0;
   }
   .confirm{
+    .btnCom;
     .confirm;
     width: 75px;
     margin-left: 15px;

src/components/CopyRight/index.less

@@ -1,3 +1,4 @@
+@import "~@less/mixin.less";
 .container {
   position: absolute;
   bottom: 0px;      //页面布局
@@ -138,6 +139,7 @@
           background: #fff;
         }
         .btn{
+          .btnCom;
           position: relative;
           display: inline-block;
           width: 80px;
@@ -147,11 +149,11 @@
           margin-left: -40px;
           line-height: 34px;
           font-size: 14px;
-          border-radius: 4px;
+          // border-radius: 4px;
           background: #3B9ED0;
           color:#fff;
-          text-align: center;
-          cursor: pointer;
+          // text-align: center;
+          // cursor: pointer;
         }
       }
     }

src/components/DiagnosticList/index.less

@@ -1,3 +1,4 @@
+ @import "~@less/mixin.less";
 .diaglist-wrap{
     position: relative;
     padding: 0 10px;
@@ -62,27 +63,19 @@
     top: 5px;
     
 }
-// .diag-up {
-//     right: 166px;
-// }
-// .diag-down {
-//     right: 132px;
-// }
 
 .treat {
+    .btnCom;
     display: inline-block;
     width: 72px;
     height: 26px;
     line-height: 26px;
-    text-align: center;
     color: #3B9ED0;
     letter-spacing: 0;
     position: absolute;
     right: 40px;
     top: 11px;
     border: 1px solid #3B9ED0;
-    border-radius: 4px;
-    cursor: pointer;
 }
 
 .diag-del {
@@ -115,18 +108,15 @@
     position: relative;
 }
 .confirm-history-btn {
+    .btnCom;
     position: absolute;
     right: 15px;
-    // bottom: 10px;
     display: inline-block;
     width: 66px;
     height: 32px;
     line-height: 32px;
-    text-align: center;
     color: #3B9ED0;
     border: 1px solid #3B9ED0;
-    border-radius: 4px;
-    cursor: pointer;
 }
 .history-info {
     height: 185px;

src/components/Inspect/index.less

@@ -57,14 +57,15 @@
     text-align: center;
 }
 .confirmBtn {
+    .btnCom;
     width: 100px;
     height: 34px;
     line-height: 34px;
     margin: 10px auto;
     background-color: #78bddd;
-    border-radius: 5px;
-    text-align: center;
+    // border-radius: 5px;
+    // text-align: center;
     color: #fff;
-    cursor: pointer;
+    // cursor: pointer;
 }
 

src/components/MainSuit/index.less

@@ -23,36 +23,3 @@
         }
     }
 }
-.confirm-info {
-    height: 70px;
-    font-size: 16px;
-    line-height: 16px;
-    text-align: center;
-    padding: 10px 30px;
-}
-.history-info {
-    height: 185px;
-    overflow-y: auto;
-    padding: 15px;
-    >div{
-        line-height: 26px;
-        img{
-            vertical-align: middle;
-            margin-right: 5px;
-        }
-    }
-}
-.confirm-history-btn {
-    position: absolute;
-    right: 15px;
-    // bottom: 10px;
-    display: inline-block;
-    width: 66px;
-    height: 32px;
-    line-height: 32px;
-    text-align: center;
-    color: #3B9ED0;
-    border: 1px solid #3B9ED0;
-    border-radius: 4px;
-    cursor: pointer;
-}

src/components/PushItems/index.less

@@ -109,14 +109,12 @@
       }
       
       div{
+        .btnCom;
         float: right;
         width: 50px;
         border: 1px solid #3B9ED0;
-        text-align: center;
         padding:0px;
-        border-radius: 4px;
         margin-top: -3px;
-        cursor: pointer;
         font-weight: normal;
         height: 28px;
         line-height: 28px;
@@ -209,19 +207,17 @@
         white-space: nowrap;
       }
       .tipsDetails {
+        .btnCom;
         display: inline-block;
         font-weight: normal;
         width: 42px;
         height: 20px;
         border: 1px solid #262626;
-        border-radius: 4px;
-        text-align: center;
         font-size: 12px;
         // color: #3B9ED0;
         color: #262626;
         line-height: 18px;
         margin: 0 0 -2px 10px;
-        cursor: pointer;
       }
     }
     .chronic{
@@ -235,31 +231,25 @@
         line-height: 18px;
         margin-bottom:10px;
         a{
+          .btnCom;
           display: inline-block;
           font-size: 14px;
           color: #3B9ED0;
           width: 42px;
-          /*height: 20px;
-          line-height: 20px;*/
-          text-align: center;
           border: 1px solid #3B9ED0;
-          border-radius: 4px;
           margin-left: 10px;
-          cursor: pointer;
           text-decoration: none;
         }
         .tips-details {
+          .btnCom;
           display: inline-block;
           width: 42px;
           height: 20px;
           border: 1px solid #3B9ED0;
-          border-radius: 4px;
-          text-align: center;
           font-size: 14px;
           color: #3B9ED0;
           line-height: 18px;
           margin: 0 10px -2px;
-          cursor: pointer;
         }
       }
       .warn{
@@ -292,71 +282,8 @@
             vertical-align: middle;
           }
         }
-        .infoBox{
-          position: absolute;
-          top:27px;
-          width: 388px;
-          background: #fff;
-          z-index: 66;
-          border: 1px solid #EAEDF1;
-          box-shadow: 0 5px 10px 0 rgba(0,0,0,0.10);
-          .infoTitle{
-            height: 40px;
-            line-height: 40px;
-            padding-left: 18px;
-            // border-bottom: 1px solid #EAEDF1;
-            background: #DFEAFE;
-            img{
-              vertical-align: text-top;
-            }
-            .closeIcon{
-              // vertical-align: middle;
-              float: right;
-            }
-          }
-          .infoCon{
-            padding: 15px 26px 25px;
-          }
-        }
-      }
-      .mainList{
-        .listBtn{
-          display: inline-block;
-          width: 96px;
-          height: 26px;
-          line-height: 26px;
-          text-align: center;
-          border: 1px solid #EAEDF1;
-          border-radius: 4px;
-        }
-        .listResult{
-          line-height: 26px;
-          i{
-            cursor: pointer;
-          }
-        }
-        .mainBox{
-          top: 65px;
-          .infoOption{
-            padding: 20px 0;
-          }
-          .infoConBtn{
-            text-align: right;
-            border-top: 1px solid #EAEDF1;
-            padding-top: 10px;
-            span{
-              color:#3B9ED0;
-              display: inline-block;
-              width: 66px;
-              height: 32px;
-              line-height: 32px;
-              text-align: center;
-              border: 1px solid #3B9ED0;
-              border-radius: 4px;
-            }
-          }
-        }
       }
+      
       .list:last-child{
         border-bottom:none;
       }
@@ -507,14 +434,15 @@
 }
 .footer{
   .print{
+    .btnCom;
     width: 111px;
     height: 34px;
     line-height: 34px;
-    outline: none;
-    border-radius: 4px;
+    // outline: none;
+    // border-radius: 4px;
     /*color: #3B9ED0;*/
     border: 0 none;
-    cursor: pointer;
+    // cursor: pointer;
     background: #fff;
     margin-right: 20px;
     img{
@@ -524,13 +452,14 @@
     }
   }
   .okBtn{
+    .btnCom;
     width: 80px;
     height: 34px;
     line-height: 32px;
-    text-align: center;
-    outline: none;
-    border-radius: 4px;
-    cursor: pointer;
+    // text-align: center;
+    // outline: none;
+    // border-radius: 4px;
+    // cursor: pointer;
     border: 1px solid #3B9ED0;
     box-sizing: border-box;
     margin-left: 20px;

src/components/ScaleTable/index.jsx

@@ -227,11 +227,14 @@ class ScaleTable extends React.Component{
                 return <div className={style['group']}>
                   <p className={style['groupName']}>{v.groupName}</p>
                   {v.rows&&v.rows.map((it,ind)=>{
-                    return <div>
+                    return <div style={{borderBottom:'1px solid #EBEBEB'}}>
                       {it.row.map((item,index)=>{
                         if(item.controlType==0){
                           return <div className={style['block']} style={{border:it.required==1&&!item.isSelect&&start?'1px solid #f00':'none'}}>
-                              <p className={style['miniName']}>{item.name}</p>
+                              <p className={style['miniName']}> 
+                                <i>{index==0?it.indexId + '.':''}</i> 
+                                {item.name}
+                              </p>
                               {item.details&&item.details.map((vv,ii)=>{
                                 return <div className={style['item']}>
                                         <Radio label={vv.detailName+'('+vv.score+')'}

src/components/ScaleTable/index.less

@@ -1,3 +1,4 @@
+@import "~@less/mixin.less";
 .tableBox{
   // height: 690px;
   overflow-y: auto;
@@ -32,14 +33,20 @@ strong{
     }
     .block{
       margin-top: 20px;
-      padding-top: 5px;
+      padding: 5px 0 0 30px;
     }
     .redBorder{
       border: 1px solid #f00;
     }
-    // .miniName{
-    //   margin-top: 25px;
-    // }
+    .miniName{
+      margin-left: -30px;
+      i{
+        display: inline-block;
+        width: 25px;
+        text-align: right;
+        margin-right: 5px;
+      }
+    }
   }
   .groupName{
     font-size: 14px;
@@ -50,7 +57,7 @@ strong{
   .subTotal{
     height: 49px;
     line-height: 49px;
-    border-top: 1px solid #EBEBEB;
+    // border-top: 1px solid #EBEBEB;
     text-align: right;
     margin-top: 10px;
   }
@@ -60,16 +67,14 @@ strong{
     border-bottom: 10px solid #EBEBEB;
     text-align: right;
     .totalBtn{
+      .btnCom;
       display: inline-block;
       width: 64px;
       height: 32px;
       line-height: 32px;
       color:#3B9ED0;
       border: 1px solid #3B9ED0;
-      border-radius: 4px;
       margin-left: 40px;
-      text-align: center;
-      cursor: pointer;
     }
   }
 }

src/components/SpreadDrop/index.less

@@ -48,8 +48,10 @@
   line-height: 22px;
 }
 .clear{
+  .btnCom;
   .clear;
 }
 .confirm{
+  .btnCom;
   .confirm;
 }

src/components/Treat/index.less

@@ -5,13 +5,6 @@
     height: 100%;
     left: 0;
     top: 0;
-    // background: #fff;
-    // left: 50%;
-    // top: 25%;
-    // width: 680px;
-    // margin-left: -340px;
-    // margin-top: -340px;
-    // z-index: 301;
     z-index: 300;
 }
 .close {
@@ -86,14 +79,12 @@
     background: #fff;
 }
 .prescription-btn,.determine-btn {
+    .btnCom;
     position: absolute;
     display: block;
     width: 80px;
     height: 34px;
     line-height: 34px;
-    border-radius: 4px;
-    text-align: center;
-    cursor: pointer;
     top: 20px;
 }
 

src/utils/config.js

@@ -1,7 +1,7 @@
 // const host='http://192.168.3.1:5050';//赵
 // const host='http://192.168.3.100:5050';//王峰
-// const host='http://192.168.2.241:5050';//后端接口访问地址
-const host='http://192.168.2.236:5050';//后端接口访问地址
+const host='http://192.168.2.241:5050';//后端接口访问地址
+// const host='http://192.168.2.236:5050';//后端接口访问地址
 // const host='http://192.168.3.11:5050';//王宇
 //const host='http://192.168.2.164:8080';
 // const host='http://192.168.3.117:5050'; //周铁刚