monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit ea0b50e0438343cd168618a6b7a8d6356eff7a44 2 parents 1fc9abc3 3a85b053

Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-v32-xwx 

 Conflicts:
	hg-monitor-web-base/src/main/resources/static/vue3/src/api/faultDiagnosisApi.js
Inline Side-by-side
Showing 3 changed files with 98 additions and 42 deletions
@@ -11,12 +11,7 @@ let getRuleAdvanced = (ruleId) => { @@ -11,12 +11,7 @@ let getRuleAdvanced = (ruleId) => {
11 return get('/api-web/fault/conf/rule/getRuleAdvanced', {ruleId: ruleId}); 11 return get('/api-web/fault/conf/rule/getRuleAdvanced', {ruleId: ruleId});
12 } 12 }
13 13
14 -/**  
15 - * 诊断报告  
16 - * http://192.168.0.59:3000/project/78/interface/api/3916  
17 - * @param ruleId  
18 - * @returns {Promise<*>}  
19 - */ 14 +
20 let getFaultList = (params) => { 15 let getFaultList = (params) => {
21 return get('/api-web/fault/result/tableList', params); 16 return get('/api-web/fault/result/tableList', params);
22 } 17 }
@@ -63,7 +63,6 @@ @@ -63,7 +63,6 @@
63 63
64 <img src="./src/assets/images/faultDiagnosis/icon-gzdy.png" class="title-img"> 64 <img src="./src/assets/images/faultDiagnosis/icon-gzdy.png" class="title-img">
65 <span>故障定义</span> 65 <span>故障定义</span>
66 -  
67 </div> 66 </div>
68 </el-col> 67 </el-col>
69 </el-row> 68 </el-row>
@@ -104,31 +103,41 @@ @@ -104,31 +103,41 @@
104 </div> 103 </div>
105 </el-col> 104 </el-col>
106 </el-row> 105 </el-row>
107 - <el-row >  
108 - <el-col :span="24" >  
109 -  
110 - <cm-table-page :columns="data.columns"  
111 - :dataList="data.tableData"  
112 - :total="data.count"  
113 - :pageSize="data.searchParams.limit"  
114 - @loaddata="loadTableDataList"  
115 - @selectionChange="selectionChange"  
116 - :showIndex="true"  
117 - :showSelection="true"  
118 - :showBorder="true"  
119 - :loading="loading"  
120 - :showPage="true"  
121 - :showTools="false"  
122 - :getRowKeys="'busId'"  
123 - :defaultExpand="true"  
124 - :height="(height - 200)">  
125 - <template #default="{row,prop,column}">  
126 - </template>  
127 - </cm-table-page>  
128 - </el-col>  
129 - </el-row>  
130 </el-col> 106 </el-col>
  107 + </el-row>
  108 + <el-row>
  109 + <el-col :span="6">
  110 + <div class="title-text">
  111 + <i class="iconfont icon-liebiao"></i>
  112 + <span>高级规则</span>
  113 + </div>
  114 + </el-col>
  115 + </el-row>
  116 + <el-row>
  117 + <el-col :span="6">
131 118
  119 + </el-col>
  120 + </el-row>
  121 + <el-row >
  122 + <el-col :span="24" >
  123 + <cm-table-page :columns="durationTimeObj.data.columns"
  124 + :dataList="durationTimeObj.data.list"
  125 + :total="durationTimeObj.data.total"
  126 + @loaddata="loadTableDataList"
  127 + @selectionChange="selectionChange"
  128 + :showIndex="true"
  129 + :showSelection="true"
  130 + :showBorder="true"
  131 + :loading="loading"
  132 + :showPage="false"
  133 + :showTools="false"
  134 + :getRowKeys="'busId'"
  135 + :defaultExpand="true"
  136 + :height="400">
  137 + <template #default="{row,prop,column}">
  138 + </template>
  139 + </cm-table-page>
  140 + </el-col>
132 </el-row> 141 </el-row>
133 <!--<el-row> 142 <!--<el-row>
134 <el-col :span="3"> 143 <el-col :span="3">
1 -  
2 import store from '/vue3/src/store/index.js' 1 import store from '/vue3/src/store/index.js'
3 2
4 export default { 3 export default {
@@ -210,24 +209,79 @@ export default { @@ -210,24 +209,79 @@ export default {
210 209
211 // 2022-7-26 10.47 故障功能优化新增功能 --start 210 // 2022-7-26 10.47 故障功能优化新增功能 --start
212 let durationTimeObj = Vue.ref({ 211 let durationTimeObj = Vue.ref({
213 - ruleId: '1aa9e18147e54f0bb8b24b7c96ad60ae', // 故障定义规则ID  
214 - startTime: '',  
215 - endTime: '',  
216 - status: '', // 状态0禁用1启用 212 + params: {
  213 + ruleId: '1aa9e18147e54f0bb8b24b7c96ad60ae', // 故障定义规则ID
  214 + startTime: '',
  215 + endTime: '',
  216 + status: '', // 状态0禁用1启用
  217 + },
  218 + data: {
  219 + columns: [{
  220 + prop: 'startTime',
  221 + label: '开始时间',
  222 + sortable: true,
  223 + align: 'center',
  224 + click: function (row) {
  225 +
  226 + },
  227 + render: function (row) {
  228 + }
  229 + }, {
  230 + prop: 'endTime',
  231 + label: '结束时间',
  232 + sortable: true,
  233 + align: 'center',
  234 + click: function (row) {
  235 +
  236 + },
  237 + render: function (row) {
  238 + }
  239 + }, {
  240 + prop: 'status',
  241 + label: '状态',
  242 + sortable: true,
  243 + align: 'center',
  244 + click: function (row) {
  245 +
  246 + },
  247 + render: function (row) {
  248 + }
  249 + }],
  250 + list: [],
  251 + total: 0
  252 + }
217 }); 253 });
218 254
219 // 获取列表 255 // 获取列表
220 - store.dispatch('getRuleAdvanced',durationTimeObj.value.ruleId).then((res) =>{  
221 - // 256 + const getRuleList = () => {
  257 + debugger
  258 + // store.dispatch('getFaultList', {}).then((res) => {
  259 + // debugger
  260 + // if (res && res.success) {
  261 + // durationTimeObj.value.data.list = res.data;
  262 + // }
  263 + // }).catch(e => {
  264 + // debugger
  265 + // console.log(e);
  266 + // })
  267 + store.dispatch('getRuleAdvanced', durationTimeObj.value.params.ruleId).then((res) => {
  268 + debugger
  269 + if (res && res.success) {
  270 + durationTimeObj.value.data.list = res.data;
  271 + }
  272 + }).catch(e => {
  273 + console.log(e);
  274 + })
  275 + }
222 276
223 - }).catch(e =>{  
224 - console.log(e); 277 + Vue.onMounted(() => {
  278 + getRuleList();
225 }) 279 })
226 280
227 -  
228 // 2022-7-26 10.47 故障功能优化新增功能 --end 281 // 2022-7-26 10.47 故障功能优化新增功能 --end
229 282
230 return { 283 return {
  284 + durationTimeObj,
231 baseList, 285 baseList,
232 callbackBaseList, 286 callbackBaseList,
233 count, 287 count,
@@ -739,8 +793,6 @@ export default { @@ -739,8 +793,6 @@ export default {
739 addAPM() { 793 addAPM() {
740 // this.APMVisible=true; 794 // this.APMVisible=true;
741 this.postPropsData('apm') 795 this.postPropsData('apm')
742 -  
743 -  
744 }, 796 },
745 797
746 //关闭APM弹框 798 //关闭APM弹框