浏览代码

Merge remote-tracking branch 'origin/dev5.3.3' into dev5.3.3

zhouna 5 年之前
父节点
当前提交
f6eff2cc16
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. 1 0
      src/components/AddAssistCheck/Textarea/index.jsx
  2. 2 2
      src/components/Emergency/HisList/index.less

+ 1 - 0
src/components/AddAssistCheck/Textarea/index.jsx

@@ -35,6 +35,7 @@ class Textarea extends Component {
     }else{
     }else{
       e.target.nextSibling.innerText?(e.target.nextSibling.innerText = '报告描述或意见'):(e.target.nextSibling.innerHTML = '报告描述或意见')
       e.target.nextSibling.innerText?(e.target.nextSibling.innerText = '报告描述或意见'):(e.target.nextSibling.innerHTML = '报告描述或意见')
     }
     }
+    $(".TextareaRsize").css({marginTop:0});
     this.setState({
     this.setState({
       timer
       timer
     });
     });

+ 2 - 2
src/components/Emergency/HisList/index.less

@@ -114,13 +114,13 @@
       margin: 0 8px 0 0;
       margin: 0 8px 0 0;
     }
     }
     .export{
     .export{
-      color: #E2EFF6;
+      color: #a3c9de;
       display: inline-block;
       display: inline-block;
       width: 92px;
       width: 92px;
       height: 30px;
       height: 30px;
       line-height: 30px;
       line-height: 30px;
       text-align: center;
       text-align: center;
-      border: 1px solid #E2EFF6;
+      border: 1px solid #a3c9de;
       border-radius: 4px;
       border-radius: 4px;
       margin-left: 136px;
       margin-left: 136px;
       cursor: pointer;
       cursor: pointer;