Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'
告警消除的搜索，进入资源详情，必填项，关键字长度等更改 See merge request !502
Showing
7 changed files
with
35 additions
and
20 deletions
| @@ -96,7 +96,6 @@ layui.extend({ | @@ -96,7 +96,6 @@ layui.extend({ | ||
| 96 | 96 | ||
| 97 | //请求视图渲染 | 97 | //请求视图渲染 |
| 98 | view().render(path.join('/')).then(function(res){ | 98 | view().render(path.join('/')).then(function(res){ |
| 99 | -console.log("tag&&&&&&&&&",res,pathURL) | ||
| 100 | //遍历页签选项卡 | 99 | //遍历页签选项卡 |
| 101 | var matchTo | 100 | var matchTo |
| 102 | ,tabs = $('#LAY_app_tabsheader>li'); | 101 | ,tabs = $('#LAY_app_tabsheader>li'); |
| @@ -114,17 +113,17 @@ console.log("tag&&&&&&&&&",res,pathURL) | @@ -114,17 +113,17 @@ console.log("tag&&&&&&&&&",res,pathURL) | ||
| 114 | let el = admin.tabsPage.elem; | 113 | let el = admin.tabsPage.elem; |
| 115 | if(el && el.attr('lay-href-type')){ | 114 | if(el && el.attr('lay-href-type')){ |
| 116 | //lsq 页面刷新后名称改变 2022-03-29 | 115 | //lsq 页面刷新后名称改变 2022-03-29 |
| 117 | - // if(el.attr('lay-href-type') == 'menu' && !matchTo){ | ||
| 118 | - if(el.attr('lay-href-type') == 'menu'){ | 116 | + if(el.attr('lay-href-type') == 'menu' && !matchTo){ |
| 117 | + // if(el.attr('lay-href-type') == 'menu'){ | ||
| 119 | tabName= admin.tabsPage.elem.text() | 118 | tabName= admin.tabsPage.elem.text() |
| 120 | } | 119 | } |
| 121 | } | 120 | } |
| 122 | } catch (e){ | 121 | } catch (e){ |
| 123 | 122 | ||
| 124 | } | 123 | } |
| 125 | - if(!tabName){ | 124 | + /* if(!tabName){ |
| 126 | tabName= res.title | 125 | tabName= res.title |
| 127 | - } | 126 | + }*/ |
| 128 | 127 | ||
| 129 | //如果未在选项卡中匹配到，则追加选项卡 | 128 | //如果未在选项卡中匹配到，则追加选项卡 |
| 130 | if(setter.pageTabs && pathURL !== '/'){ | 129 | if(setter.pageTabs && pathURL !== '/'){ |
| @@ -124,7 +124,10 @@ | @@ -124,7 +124,10 @@ | ||
| 124 | border:1px solid #c0c4cc; | 124 | border:1px solid #c0c4cc; |
| 125 | padding:10px; | 125 | padding:10px; |
| 126 | min-height: 50px; | 126 | min-height: 50px; |
| 127 | + text-align: left; | ||
| 128 | + | ||
| 127 | } | 129 | } |
| 130 | + | ||
| 128 | .detail_comments{ | 131 | .detail_comments{ |
| 129 | background: #FFFFFF; | 132 | background: #FFFFFF; |
| 130 | padding:10px; | 133 | padding:10px; |
| @@ -15,7 +15,7 @@ | @@ -15,7 +15,7 @@ | ||
| 15 | <el-input v-else v-model="search.keyword" placeholder="请输入关键字"></el-input> | 15 | <el-input v-else v-model="search.keyword" placeholder="请输入关键字"></el-input> |
| 16 | </el-form-item> | 16 | </el-form-item> |
| 17 | <el-form-item > | 17 | <el-form-item > |
| 18 | - <el-button @click="getDataList">查询</el-button> | 18 | + <el-button @click="getDataList(statusVal)">查询</el-button> |
| 19 | </el-form-item> | 19 | </el-form-item> |
| 20 | </div> | 20 | </div> |
| 21 | </div> | 21 | </div> |
| @@ -34,7 +34,7 @@ | @@ -34,7 +34,7 @@ | ||
| 34 | :height="height - 110"> | 34 | :height="height - 110"> |
| 35 | <template #default="{row,prop,column}"> | 35 | <template #default="{row,prop,column}"> |
| 36 | <div v-if="prop == 'resName'"> | 36 | <div v-if="prop == 'resName'"> |
| 37 | - <resNameComponents :textString="row.resName" :resTypeId="row.resType" :resId="resId"/> | 37 | + <resNameComponents :textString="row.resName" :resTypeId="row.resType" :resId="row.resId"/> |
| 38 | </div> | 38 | </div> |
| 39 | </template> | 39 | </template> |
| 40 | <template #tools="{scope}" > | 40 | <template #tools="{scope}" > |
| @@ -77,10 +77,12 @@ export default { | @@ -77,10 +77,12 @@ export default { | ||
| 77 | 77 | ||
| 78 | 78 | ||
| 79 | //获取aj配置信息 | 79 | //获取aj配置信息 |
| 80 | + let statusVal=Vue.ref(0); | ||
| 80 | let getDataList=(status)=>{ | 81 | let getDataList=(status)=>{ |
| 81 | if(status == undefined){ | 82 | if(status == undefined){ |
| 82 | status = 0 | 83 | status = 0 |
| 83 | } | 84 | } |
| 85 | + statusVal.value=status; | ||
| 84 | search.value.status = status; | 86 | search.value.status = status; |
| 85 | proxy.$http.get(`/api-web/bAlarmManage/page`,{ | 87 | proxy.$http.get(`/api-web/bAlarmManage/page`,{ |
| 86 | page:search.value.page, | 88 | page:search.value.page, |
| @@ -140,7 +142,8 @@ export default { | @@ -140,7 +142,8 @@ export default { | ||
| 140 | loaddata, | 142 | loaddata, |
| 141 | getDataList, | 143 | getDataList, |
| 142 | handle, | 144 | handle, |
| 143 | - saveback | 145 | + saveback, |
| 146 | + statusVal | ||
| 144 | } | 147 | } |
| 145 | } | 148 | } |
| 146 | 149 |
| @@ -125,29 +125,29 @@ | @@ -125,29 +125,29 @@ | ||
| 125 | <span class="title-handle-per" v-if="status==3">时间：{{handleInfoObj.managetime}}</span> | 125 | <span class="title-handle-per" v-if="status==3">时间：{{handleInfoObj.managetime}}</span> |
| 126 | </div> | 126 | </div> |
| 127 | <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> | 127 | <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> |
| 128 | - <div class="editor_detail" v-if="isExamine && status!=0 && (status==3 && approverName==loginName)" > | 128 | + <div class="editor_detail" v-if="isExamine && ((status==3 && approverName==loginName) || status==2 || status==1)" > |
| 129 | <div v-html="handleInfoObj.pcontent"></div> | 129 | <div v-html="handleInfoObj.pcontent"></div> |
| 130 | </div> | 130 | </div> |
| 131 | </div> | 131 | </div> |
| 132 | - <div class="detail_comments" v-if="isExamine && status!=0 && status!=3 && approverName==loginName"> | 132 | + <div class="detail_comments" v-if="isExamine && (((status==3 || status==1) && approverName==loginName) || status==2)"> |
| 133 | <div class="detail_comments_title">审核意见</div> | 133 | <div class="detail_comments_title">审核意见</div> |
| 134 | 134 | ||
| 135 | <el-input | 135 | <el-input |
| 136 | - v-if="status!=2" | 136 | + v-if="status==1 && approverName==loginName" |
| 137 | v-model="opinion" | 137 | v-model="opinion" |
| 138 | type="textarea" | 138 | type="textarea" |
| 139 | :rows="5" | 139 | :rows="5" |
| 140 | placeholder="此处输入审核意见" | 140 | placeholder="此处输入审核意见" |
| 141 | /> | 141 | /> |
| 142 | - <div class="opinion-style" v-if="status==2"> | 142 | + <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)"> |
| 143 | {{opinion}} | 143 | {{opinion}} |
| 144 | </div> | 144 | </div> |
| 145 | </div> | 145 | </div> |
| 146 | <div class="alarmsClearTag" v-if="repositoryInto && (!isExamine || status==0 || status==3) "> | 146 | <div class="alarmsClearTag" v-if="repositoryInto && (!isExamine || status==0 || status==3) "> |
| 147 | - <div class="tag-keyword" v-if="approverName==loginName"> | 147 | + <div class="tag-keyword" v-if="isExamine && status!=0 && approverName==loginName"> |
| 148 | 关键字：<span class="tag-keyword-span" v-for="tag in dynamicTags">{{tag}}</span> | 148 | 关键字：<span class="tag-keyword-span" v-for="tag in dynamicTags">{{tag}}</span> |
| 149 | </div> | 149 | </div> |
| 150 | - <div class="tag-keyword" v-if="handleInfoObj.managename==loginName"> | 150 | + <div class="tag-keyword" v-if="!isExamine || status==0"> |
| 151 | 关键字： | 151 | 关键字： |
| 152 | <el-tag | 152 | <el-tag |
| 153 | v-for="tag in dynamicTags" | 153 | v-for="tag in dynamicTags" |
| @@ -167,6 +167,8 @@ | @@ -167,6 +167,8 @@ | ||
| 167 | size="small" | 167 | size="small" |
| 168 | @keyup.enter="handleInputConfirm" | 168 | @keyup.enter="handleInputConfirm" |
| 169 | @blur="handleInputConfirm" | 169 | @blur="handleInputConfirm" |
| 170 | + maxlength="6" | ||
| 171 | + show-word-limit | ||
| 170 | /> | 172 | /> |
| 171 | <el-button v-else class="button-new-tag ml-1" size="small" @click="showInput" > | 173 | <el-button v-else class="button-new-tag ml-1" size="small" @click="showInput" > |
| 172 | + 添加 | 174 | + 添加 |
| @@ -67,7 +67,14 @@ export default { | @@ -67,7 +67,14 @@ export default { | ||
| 67 | detailText.value='' | 67 | detailText.value='' |
| 68 | } | 68 | } |
| 69 | let params={}; | 69 | let params={}; |
| 70 | - | 70 | + if((val==2 || val==3 ) && !opinion.value){ |
| 71 | + proxy.$global.showMsg("请输入审核意见", 'warning'); | ||
| 72 | + return; | ||
| 73 | + } | ||
| 74 | + if((val==0 || val==1 ) && repositoryInto.value && !pcontent){ | ||
| 75 | + proxy.$global.showMsg("请输入处理方案", 'warning'); | ||
| 76 | + return; | ||
| 77 | + } | ||
| 71 | if(val==2 || val==3){ | 78 | if(val==2 || val==3){ |
| 72 | params={ | 79 | params={ |
| 73 | status:val,//存储状态 0 草稿，1 审批中 2已审批 3驳回 | 80 | status:val,//存储状态 0 草稿，1 审批中 2已审批 3驳回 |
| @@ -77,6 +84,7 @@ export default { | @@ -77,6 +84,7 @@ export default { | ||
| 77 | opinion:opinion.value,//审批意见 | 84 | opinion:opinion.value,//审批意见 |
| 78 | alarmHisId:alarmInfo.value.alarmTypeCustom=='his'?alarmInfo.value.primaryKey:handleInfoObj.value.alarmHisId, | 85 | alarmHisId:alarmInfo.value.alarmTypeCustom=='his'?alarmInfo.value.primaryKey:handleInfoObj.value.alarmHisId, |
| 79 | } | 86 | } |
| 87 | + | ||
| 80 | }else{ | 88 | }else{ |
| 81 | params={ | 89 | params={ |
| 82 | id:props.amId, | 90 | id:props.amId, |
| @@ -100,11 +108,11 @@ export default { | @@ -100,11 +108,11 @@ export default { | ||
| 100 | } | 108 | } |
| 101 | } | 109 | } |
| 102 | proxy.$http.post(`/api-web/bAlarmManage/saveOrUpdateAlarmManage`, params, function (res) { | 110 | proxy.$http.post(`/api-web/bAlarmManage/saveOrUpdateAlarmManage`, params, function (res) { |
| 103 | - if (res && res.code == 0) { | 111 | + if (res && res.success) { |
| 104 | proxy.$global.showMsg(res.msg, 'success'); | 112 | proxy.$global.showMsg(res.msg, 'success'); |
| 105 | cancleBtn(res.msg); | 113 | cancleBtn(res.msg); |
| 106 | }else{ | 114 | }else{ |
| 107 | - proxy.$global.showMsg(res.msg, 'warning'); | 115 | + proxy.$global.showMsg("保存失败", 'warning'); |
| 108 | } | 116 | } |
| 109 | }) | 117 | }) |
| 110 | } | 118 | } |
| @@ -306,7 +314,7 @@ export default { | @@ -306,7 +314,7 @@ export default { | ||
| 306 | let endIndex=str.indexOf(",消除内容"); | 314 | let endIndex=str.indexOf(",消除内容"); |
| 307 | reason.value=str.substring(startIndex+5,endIndex); | 315 | reason.value=str.substring(startIndex+5,endIndex); |
| 308 | } | 316 | } |
| 309 | - alarmIdVal.value=alarmInfo.value.primaryKey; | 317 | + alarmIdVal.value=alarmInfo.value.id; |
| 310 | getUser(); | 318 | getUser(); |
| 311 | } | 319 | } |
| 312 | getUserByToken(); | 320 | getUserByToken(); |
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 3 | <div class="search"> | 3 | <div class="search"> |
| 4 | <div class="condition"> | 4 | <div class="condition"> |
| 5 | <el-form-item > | 5 | <el-form-item > |
| 6 | - <el-input v-else v-model="" placeholder="请输入关键字"></el-input> | 6 | + <el-input v-model="search.keyword" placeholder="请输入关键字"></el-input> |
| 7 | </el-form-item> | 7 | </el-form-item> |
| 8 | <el-form-item > | 8 | <el-form-item > |
| 9 | <el-button @click="getDataList">查询</el-button> | 9 | <el-button @click="getDataList">查询</el-button> |
| @@ -25,7 +25,7 @@ | @@ -25,7 +25,7 @@ | ||
| 25 | :height="height - 110"> | 25 | :height="height - 110"> |
| 26 | <template #default="{row,prop,column}"> | 26 | <template #default="{row,prop,column}"> |
| 27 | <div v-if="prop == 'resName'"> | 27 | <div v-if="prop == 'resName'"> |
| 28 | - <resNameComponents :textString="row.resName" :resTypeId="row.resType" :resId="resId"/> | 28 | + <resNameComponents :textString="row.resName" :resTypeId="row.resType" :resId="row.resId"/> |
| 29 | </div> | 29 | </div> |
| 30 | </template> | 30 | </template> |
| 31 | <template #tools="{scope}"> | 31 | <template #tools="{scope}"> |
-
Please register or login to post a comment