Merge branch 'master-500-dev-xwx' into 'master-500-dev'

告警处理消除原因添加长度限制



See merge request !545

@@ -137,8 +137,10 @@
 .detail_comments_title{
 .detail_comments_title{
     text-align: left;
     text-align: left;
     padding-bottom: 10px;
     padding-bottom: 10px;
-    width: 86%;
-    float: left;
+}
+.detail_comments_right{
+    width: calc(100% - 70px);
+    text-align: right;
 }
 }
 .update-icon,.more-style{
 .update-icon,.more-style{
     cursor: pointer;
     cursor: pointer;

@@ -76,7 +76,7 @@
     <div class="alarmsRadio" v-if="alarmInfo.alarmTypeCustom=='active'  || alarmInfo.alarmTypeCustom=='his' || status==0 || status==3">
     <div class="alarmsRadio" v-if="alarmInfo.alarmTypeCustom=='active'  || alarmInfo.alarmTypeCustom=='his' || status==0 || status==3">
         <div class="alarmNotice-title">消除原因<span style="color: red">*</span></div>
         <div class="alarmNotice-title">消除原因<span style="color: red">*</span></div>
         <div class="alarmsNotice">
         <div class="alarmsNotice">
-            <div class="alarmsDes"><el-input v-model="reason" placeholder="消除原因" /></div>
+            <div class="alarmsDes"><el-input v-model="reason" maxlength="200" show-word-limit placeholder="消除原因" /></div>
             <div class="alarmsNotice-radio">
             <div class="alarmsNotice-radio">
                 <span class="radioLabel">是否通知：</span>
                 <span class="radioLabel">是否通知：</span>
                 <el-radio-group v-model="noticeFlag">
                 <el-radio-group v-model="noticeFlag">
@@ -130,11 +130,13 @@
         </div>
         </div>
     </div>
     </div>
     <div class="detail_comments"  v-if="isExamine && ((status==3 || (status==1  && !isView)) || status==2) ">
     <div class="detail_comments"  v-if="isExamine && ((status==3 || (status==1  && !isView)) || status==2) ">
-        <div>
+        <div style="display: flex;">
             <div class="detail_comments_title">审核意见<span style="color: red">*</span></div>
             <div class="detail_comments_title">审核意见<span style="color: red">*</span></div>
-            <span>快捷输入：</span>
-            <el-tag  class="ml-2"  type="success" size="small" style="cursor:pointer; margin-right: 5px" @click="onInput(true)">同意</el-tag>
-            <el-tag  class="ml-2"  type="danger" size="small" style=" cursor:pointer;"  @click="onInput(false)">不同意</el-tag>
+            <div  v-if="status==1" class="detail_comments_right">
+                <span>快捷输入：</span>
+                <el-tag class="ml-2"  type="success" size="small" style="cursor:pointer; margin-right: 5px" @click="onInput(true)">同意</el-tag>
+                <el-tag class="ml-2"  type="danger" size="small" style=" cursor:pointer;"  @click="onInput(false)">不同意</el-tag>
+            </div>
         </div>
         </div>
 
 
         <el-input
         <el-input