monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 76dab81e88cc77f90dca937d8acf09b104510b47 1 parent 5f15663d

告警策略，弹框去除加载文字；故障管理优化；

Inline Side-by-side
Showing 5 changed files with 26 additions and 62 deletions
@@ -233,7 +233,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', @@ -233,7 +233,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
233 } 233 }
234 234
235 var syncload = layer.load(2, { 235 var syncload = layer.load(2, {
236 - content: '同步中...', 236 + content: '',
237 shade: [0.5, '#f2eeee'], //0.5透明度的灰色背景 237 shade: [0.5, '#f2eeee'], //0.5透明度的灰色背景
238 success: function (layero) { 238 success: function (layero) {
239 layero.find('.layui-layer-content').css({ 239 layero.find('.layui-layer-content').css({
@@ -392,4 +392,4 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', @@ -392,4 +392,4 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
392 392
393 return { getData: getCheckAlarmPolicyData,reloadAlarmPolicy:reloadAlarmPolicyTable()}; 393 return { getData: getCheckAlarmPolicyData,reloadAlarmPolicy:reloadAlarmPolicyTable()};
394 }); 394 });
395 -});  
  395 +});
@@ -382,7 +382,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' @@ -382,7 +382,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','
382 } 382 }
383 383
384 var syncalarmtempload = layer.load(2, { 384 var syncalarmtempload = layer.load(2, {
385 - content: '同步中...', 385 + content: '',
386 shade: [0.5, '#f2eeee'], //0.5透明度的灰色背景 386 shade: [0.5, '#f2eeee'], //0.5透明度的灰色背景
387 success: function (layero) { 387 success: function (layero) {
388 layero.find('.layui-layer-content').css({ 388 layero.find('.layui-layer-content').css({
@@ -457,4 +457,4 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' @@ -457,4 +457,4 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','
457 } 457 }
458 return { reloadtemplate: reloadalarmtemplateTable}; 458 return { reloadtemplate: reloadalarmtemplateTable};
459 }); 459 });
460 -});  
  460 +});
@@ -101,7 +101,7 @@ @@ -101,7 +101,7 @@
101 101
102 /*-------------------------------------*/ 102 /*-------------------------------------*/
103 103
104 -.el-form-item__error { 104 +.yfyw-user .el-form-item__error {
105 color: var(--el-color-danger); 105 color: var(--el-color-danger);
106 font-size: 12px; 106 font-size: 12px;
107 line-height: 1; 107 line-height: 1;
@@ -109,38 +109,15 @@ @@ -109,38 +109,15 @@
109 </el-col> 109 </el-col>
110 <el-col :span="12"> 110 <el-col :span="12">
111 <el-form-item label="影响范围" prop="influenceScope"> 111 <el-form-item label="影响范围" prop="influenceScope">
112 - <el-input v-model="handleInfoForm.influenceScope"></el-input>  
113 - </el-form-item>  
114 - </el-col>  
115 - </el-row>  
116 -  
117 - <el-row :gutter="5">  
118 - <el-col :span="12">  
119 - <el-form-item label="处理结果" prop="solveway">  
120 - <el-radio-group v-model="handleInfoForm.solveway">  
121 - <el-radio label="人工处理"></el-radio>  
122 - <el-radio label="自动处理"></el-radio>  
123 - </el-radio-group>  
124 - </el-form-item>  
125 - </el-col>  
126 - <el-col :span="12">  
127 - <el-form-item label="处理时间" prop="solveTime">  
128 - <el-date-picker  
129 - v-model="handleInfoForm.solveTime"  
130 - type="datetime"  
131 - format="YYYY/MM/DD HH:mm:ss"  
132 - value-format="YYYY-MM-DD HH:mm:ss"  
133 - placeholder="请选择处理时间"  
134 - style="width: 100%"  
135 - ></el-date-picker> 112 + <el-input v-model="handleInfoForm.influenceScope" :disabled="true"></el-input>
136 </el-form-item> 113 </el-form-item>
137 </el-col> 114 </el-col>
138 </el-row> 115 </el-row>
139 116
140 <el-row :gutter="5"> 117 <el-row :gutter="5">
141 <el-col :span="24"> 118 <el-col :span="24">
142 - <el-form-item label="原因分析" prop="reason">  
143 - <el-input v-model="handleInfoForm.reason" type="textarea"></el-input> 119 + <el-form-item label="标签" prop="label">
  120 + <el-input v-model="handleInfoForm.label" placeholder="多个标签#分割"></el-input>
144 </el-form-item> 121 </el-form-item>
145 </el-col> 122 </el-col>
146 </el-row> 123 </el-row>
@@ -156,7 +133,7 @@ @@ -156,7 +133,7 @@
156 133
157 <el-form-item> 134 <el-form-item>
158 <el-button @click="showHandleInfoDialog(false)">取消</el-button> 135 <el-button @click="showHandleInfoDialog(false)">取消</el-button>
159 - <el-button type="primary" @click="saveHandleInfo('handleForm',getPage)">保存</el-button> 136 + <el-button v-if="handleInfoForm.solveTime == null || handleInfoForm.solveTime == ''" type="primary" @click="saveHandleInfo('handleForm',getPage)">保存</el-button>
160 </el-form-item> 137 </el-form-item>
161 </el-form> 138 </el-form>
162 </template> 139 </template>
@@ -100,38 +100,11 @@ const handleInfo = () => { @@ -100,38 +100,11 @@ const handleInfo = () => {
100 solveway: '', 100 solveway: '',
101 solveTime: '', 101 solveTime: '',
102 reason: '', 102 reason: '',
103 - solution: '' 103 + solution: '',
  104 + label:''
104 }) 105 })
105 106
106 let handleInfoRules = Vue.ref({ 107 let handleInfoRules = Vue.ref({
107 - solveway: [  
108 - {  
109 - required: true,  
110 - message: '请选择处理结果',  
111 - trigger: 'change',  
112 - },  
113 - ],  
114 - solveTime: [  
115 - {  
116 - type: 'date',  
117 - required: true,  
118 - message: '请选择处理时间',  
119 - trigger: 'change',  
120 - },  
121 - ],  
122 - reason: [  
123 - {  
124 - required: true,  
125 - message: '请填写原因分析',  
126 - trigger: 'blur',  
127 - },  
128 - {  
129 - min: 5,  
130 - max: 100,  
131 - message: '原因分析内容在5到100个字符之间',  
132 - trigger: 'blur',  
133 - }  
134 - ],  
135 solution: [ 108 solution: [
136 { 109 {
137 required: true, 110 required: true,
@@ -164,7 +137,21 @@ const handleInfo = () => { @@ -164,7 +137,21 @@ const handleInfo = () => {
164 let saveHandleInfo = (key, callback) => { 137 let saveHandleInfo = (key, callback) => {
165 proxy.$refs[key].validate((valid) => { 138 proxy.$refs[key].validate((valid) => {
166 if (valid) { 139 if (valid) {
167 - proxy.$http.post('/api-web/fault/solve', handleInfoForm.value, function (res) { 140 + // proxy.$http.post('/api-web/fault/solve', handleInfoForm.value, function (res) {
  141 + // if (res && res.success) {
  142 + // proxy.$global.showMsg("处理成功！");
  143 + // showHandleInfoDialog(false);
  144 + // } else {
  145 + // proxy.$global.showMsg("处理失败，请联系管理员！");
  146 + // }
  147 + // callback();
  148 + // });
  149 +
  150 + proxy.$http.post('/api-web/fault/faultHandle', {
  151 + faultId: handleInfoForm.value.id,
  152 + label: handleInfoForm.value.label,
  153 + solution: handleInfoForm.value.solution
  154 + }, function (res) {
168 if (res && res.success) { 155 if (res && res.success) {
169 proxy.$global.showMsg("处理成功！"); 156 proxy.$global.showMsg("处理成功！");
170 showHandleInfoDialog(false); 157 showHandleInfoDialog(false);