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

告警处理页面必填项加*



See merge request !542

@@ -74,7 +74,7 @@
         <cm-notice-statistics v-if="alarmIdVal" :alarmId="alarmIdVal"  :isExamine="isExamine"></cm-notice-statistics>
     </div>
     <div class="alarmsRadio" v-if="alarmInfo.alarmTypeCustom=='active'  || alarmInfo.alarmTypeCustom=='his' || status==0 || status==3">
-        <div class="alarmNotice-title">消除原因</div>
+        <div class="alarmNotice-title">消除原因<span style="color: red">*</span></div>
         <div class="alarmsNotice">
             <div class="alarmsDes"><el-input v-model="reason" placeholder="消除原因" /></div>
             <div class="alarmsNotice-radio">
@@ -90,7 +90,7 @@
     </div>
     <div class="alarmsClearEditor-scheme">
         <div class="scheme-title-per">
-            <span class="title-handle-per">处理方案</span>
+            <span class="title-handle-per">处理方案<span style="color: red">*</span></span>
             <span class="title-handle-per"  v-if="isExamine && status!=0 && status!=3">处理人：{{handleInfoObj.managenameName}}</span>
             <span class="title-handle-per"  v-if="isExamine && status!=0 && status!=3">时间：{{handleInfoObj.managetime}}</span>
 
@@ -131,7 +131,7 @@
     </div>
     <div class="detail_comments"  v-if="isExamine && ((status==3 || (status==1  && !isView)) || status==2) ">
         <div>
-            <div class="detail_comments_title">审核意见</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>
@@ -152,7 +152,7 @@
     </div>
     <div class="alarmsClearTag" v-if="repositoryInto && (!isExamine || status==0 || status==3) ">
         <div class="tag-keyword" v-if="isExamine && status == 2 && approverName==loginName">
-            关键字：<span class="tag-keyword-span" v-for="tag in dynamicTags">{{tag}}</span>
+            关键字：<span style="color: red">*</span><span class="tag-keyword-span" v-for="tag in dynamicTags">{{tag}}</span>
         </div>
         <div class="tag-keyword" v-if="!isExamine || status==0 || status==3">
             关键字：

@@ -317,6 +317,9 @@ export default {
                     }
                 }
                 alarmInfo.value=urlObj;
+                if( alarmInfo.value.busTypeName==null || alarmInfo.value.busTypeName==''){
+                    alarmInfo.value.busTypeName="暂未绑定业务"
+                }
                 if(alarmInfo.value.alarmTypeCustom=='his'){
                     let str=alarmInfo.value.alarmContent;
                     let startIndex=str.indexOf("消除原因");