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

告警消除的搜索，进入资源详情，必填项，关键字长度等更改



See merge request !502

@@ -96,7 +96,6 @@ layui.extend({
 
     //请求视图渲染
     view().render(path.join('/')).then(function(res){
-console.log("tag&&&&&&&&&",res,pathURL)
       //遍历页签选项卡
       var matchTo
       ,tabs = $('#LAY_app_tabsheader>li');
@@ -114,17 +113,17 @@ console.log("tag&&&&&&&&&",res,pathURL)
             let el = admin.tabsPage.elem;
             if(el && el.attr('lay-href-type')){
                 //lsq 页面刷新后名称改变 2022-03-29
-                // if(el.attr('lay-href-type') == 'menu' && !matchTo){
-                if(el.attr('lay-href-type') == 'menu'){
+                if(el.attr('lay-href-type') == 'menu' && !matchTo){
+                // if(el.attr('lay-href-type') == 'menu'){
                     tabName=  admin.tabsPage.elem.text()
                 }
             }
         } catch (e){
 
         }
-        if(!tabName){
+      /*  if(!tabName){
             tabName=  res.title
-        }
+        }*/
 
         //如果未在选项卡中匹配到，则追加选项卡
         if(setter.pageTabs && pathURL !== '/'){

@@ -124,7 +124,10 @@
     border:1px solid #c0c4cc;
     padding:10px;
     min-height: 50px;
+    text-align: left;
+
 }
+
 .detail_comments{
     background: #FFFFFF;
     padding:10px;

@@ -15,7 +15,7 @@
                     <el-input v-else v-model="search.keyword" placeholder="请输入关键字"></el-input>
                 </el-form-item>
                 <el-form-item >
-                    <el-button @click="getDataList">查询</el-button>
+                    <el-button @click="getDataList(statusVal)">查询</el-button>
                 </el-form-item>
             </div>
         </div>
@@ -34,7 +34,7 @@
                            :height="height - 110">
                 <template #default="{row,prop,column}">
                     <div v-if="prop == 'resName'">
-                         <resNameComponents :textString="row.resName" :resTypeId="row.resType" :resId="resId"/>
+                         <resNameComponents :textString="row.resName" :resTypeId="row.resType" :resId="row.resId"/>
                     </div>
                 </template>
                 <template #tools="{scope}" >

@@ -77,10 +77,12 @@ export default {
 
 
         //获取aj配置信息
+        let statusVal=Vue.ref(0);
         let getDataList=(status)=>{
             if(status == undefined){
                 status = 0
             }
+            statusVal.value=status;
             search.value.status = status;
             proxy.$http.get(`/api-web/bAlarmManage/page`,{
                 page:search.value.page,
@@ -140,7 +142,8 @@ export default {
             loaddata,
             getDataList,
             handle,
-            saveback
+            saveback,
+            statusVal
         }
     }
 

@@ -124,30 +124,30 @@
             <span class="title-handle-per"  v-if="!isExamine || status==0">时间：{{dateTime}}</span>
             <span class="title-handle-per"  v-if="status==3">时间：{{handleInfoObj.managetime}}</span>
         </div>
-        <cm-wang-editor  v-if="!isExamine || status==0 || (status==3 && handleInfoObj.managename==loginName)" v-model="detail" :repositoryInfo="repositoryInfo" :isDisabled="repositoryInto==1?true:false" :isClear="isClear" @change="change" @changetext="changetext"></cm-wang-editor>
-        <div class="editor_detail"  v-if="isExamine && status!=0 && (status==3 && approverName==loginName)" >
+        <cm-wang-editor  v-if="!isExamine || status==0 || (status==3  && handleInfoObj.managename==loginName)" v-model="detail" :repositoryInfo="repositoryInfo" :isDisabled="repositoryInto==1?true:false" :isClear="isClear" @change="change" @changetext="changetext"></cm-wang-editor>
+        <div class="editor_detail"  v-if="isExamine && ((status==3 && approverName==loginName) || status==2 || status==1)" >
             <div v-html="handleInfoObj.pcontent"></div>
         </div>
     </div>
-    <div class="detail_comments"  v-if="isExamine && status!=0 && status!=3 && approverName==loginName">
+    <div class="detail_comments"  v-if="isExamine && (((status==3 || status==1) && approverName==loginName) || status==2)">
         <div class="detail_comments_title">审核意见</div>
 
         <el-input
-                v-if="status!=2"
+                v-if="status==1 && approverName==loginName"
                 v-model="opinion"
                 type="textarea"
                 :rows="5"
                 placeholder="此处输入审核意见"
         />
-        <div class="opinion-style" v-if="status==2">
+        <div class="opinion-style" v-if="((status==2 || (status==3 && approverName==loginName) || (status==1 && handleInfoObj.managename==loginName)) && handleInfoObj.managename!=approverName) || (status==2 && handleInfoObj.managename==approverName)">
             {{opinion}}
         </div>
     </div>
     <div class="alarmsClearTag" v-if="repositoryInto && (!isExamine || status==0 || status==3) ">
-        <div class="tag-keyword" v-if="approverName==loginName">
+        <div class="tag-keyword" v-if="isExamine && status!=0 && approverName==loginName">
             关键字：<span class="tag-keyword-span" v-for="tag in dynamicTags">{{tag}}</span>
         </div>
-        <div class="tag-keyword" v-if="handleInfoObj.managename==loginName">
+        <div class="tag-keyword" v-if="!isExamine || status==0">
             关键字：
             <el-tag
                     v-for="tag in dynamicTags"
@@ -167,6 +167,8 @@
                     size="small"
                     @keyup.enter="handleInputConfirm"
                     @blur="handleInputConfirm"
+                    maxlength="6"
+                    show-word-limit
             />
             <el-button v-else class="button-new-tag ml-1" size="small" @click="showInput" >
                 + 添加

@@ -67,16 +67,24 @@ export default {
                 detailText.value=''
             }
             let params={};
-
+            if((val==2 || val==3 ) && !opinion.value){
+                proxy.$global.showMsg("请输入审核意见", 'warning');
+                return;
+            }
+            if((val==0 || val==1 ) && repositoryInto.value && !pcontent){
+                proxy.$global.showMsg("请输入处理方案", 'warning');
+                return;
+            }
             if(val==2 || val==3){
-                params={
-                    status:val,//存储状态 0 草稿，1 审批中 2已审批 3驳回
-                    id:props.amId,
-                    // params.managetime=alarmInfo.managetime;//处理时间
-                    // params.managename=alarmInfo.managename;//处理人
-                    opinion:opinion.value,//审批意见
-                    alarmHisId:alarmInfo.value.alarmTypeCustom=='his'?alarmInfo.value.primaryKey:handleInfoObj.value.alarmHisId,
-                }
+                    params={
+                        status:val,//存储状态 0 草稿，1 审批中 2已审批 3驳回
+                        id:props.amId,
+                        // params.managetime=alarmInfo.managetime;//处理时间
+                        // params.managename=alarmInfo.managename;//处理人
+                        opinion:opinion.value,//审批意见
+                        alarmHisId:alarmInfo.value.alarmTypeCustom=='his'?alarmInfo.value.primaryKey:handleInfoObj.value.alarmHisId,
+                    }
+
             }else{
                 params={
                     id:props.amId,
@@ -100,11 +108,11 @@ export default {
                 }
             }
             proxy.$http.post(`/api-web/bAlarmManage/saveOrUpdateAlarmManage`, params, function (res) {
-                if (res && res.code == 0) {
+                if (res && res.success) {
                     proxy.$global.showMsg(res.msg, 'success');
                     cancleBtn(res.msg);
                 }else{
-                    proxy.$global.showMsg(res.msg, 'warning');
+                    proxy.$global.showMsg("保存失败", 'warning');
                 }
             })
         }
@@ -306,7 +314,7 @@ export default {
                     let endIndex=str.indexOf(",消除内容");
                     reason.value=str.substring(startIndex+5,endIndex);
                 }
-                alarmIdVal.value=alarmInfo.value.primaryKey;
+                alarmIdVal.value=alarmInfo.value.id;
                 getUser();
             }
             getUserByToken();

@@ -3,7 +3,7 @@
         <div class="search">
             <div class="condition">
                 <el-form-item >
-                    <el-input v-else v-model="" placeholder="请输入关键字"></el-input>
+                    <el-input  v-model="search.keyword" placeholder="请输入关键字"></el-input>
                 </el-form-item>
                 <el-form-item >
                     <el-button @click="getDataList">查询</el-button>
@@ -25,7 +25,7 @@
                            :height="height - 110">
                 <template #default="{row,prop,column}">
                     <div v-if="prop == 'resName'">
-                         <resNameComponents :textString="row.resName" :resTypeId="row.resType" :resId="resId"/>
+                         <resNameComponents :textString="row.resName" :resTypeId="row.resType" :resId="row.resId"/>
                     </div>
                 </template>
                 <template #tools="{scope}">