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

@@ -11,12 +11,7 @@ let getRuleAdvanced = (ruleId) => {
     return get('/api-web/fault/conf/rule/getRuleAdvanced', {ruleId: ruleId});
 }
 
-/**
- * 诊断报告
- * http://192.168.0.59:3000/project/78/interface/api/3916
- * @param ruleId
- * @returns {Promise<*>}
- */
+
 let getFaultList = (params) => {
     return get('/api-web/fault/result/tableList', params);
 }

@@ -63,7 +63,6 @@
 
                     <img src="./src/assets/images/faultDiagnosis/icon-gzdy.png" class="title-img">
                     <span>故障定义</span>
-
                 </div>
             </el-col>
         </el-row>
@@ -104,32 +103,42 @@
                         </div>
                     </el-col>
                 </el-row>
+            </el-col>
+        </el-row>
+        <el-row>
+            <el-col :span="6">
+                <div class="title-text">
+                    <i class="iconfont icon-liebiao"></i>
+                    <span>高级规则</span>
+                </div>
+            </el-col>
+        </el-row>
+        <el-row>
+            <el-col :span="6">
+
+            </el-col>
+        </el-row>
         <el-row >
             <el-col :span="24" >
-
-                        <cm-table-page :columns="data.columns"
-                                       :dataList="data.tableData"
-                                       :total="data.count"
-                                       :pageSize="data.searchParams.limit"
+                <cm-table-page :columns="durationTimeObj.data.columns"
+                               :dataList="durationTimeObj.data.list"
+                               :total="durationTimeObj.data.total"
                                @loaddata="loadTableDataList"
                                @selectionChange="selectionChange"
                                :showIndex="true"
                                :showSelection="true"
                                :showBorder="true"
                                :loading="loading"
-                                       :showPage="true"
+                               :showPage="false"
                                :showTools="false"
                                :getRowKeys="'busId'"
                                :defaultExpand="true"
-                                       :height="(height - 200)">
+                               :height="400">
                     <template #default="{row,prop,column}">
                     </template>
                 </cm-table-page>
             </el-col>
         </el-row>
-            </el-col>
-
-        </el-row>
         <!--<el-row>
             <el-col :span="3">
                 <div class="fault-definition-radio flex-div-start">

-
 import store from '/vue3/src/store/index.js'
 
 export default {
@@ -210,24 +209,79 @@ export default {
 
         // 2022-7-26 10.47 故障功能优化新增功能 --start
         let durationTimeObj = Vue.ref({
+            params: {
                 ruleId: '1aa9e18147e54f0bb8b24b7c96ad60ae', // 故障定义规则ID
                 startTime: '',
                 endTime: '',
                 status: '', //  状态0禁用1启用
+            },
+            data: {
+                columns: [{
+                    prop: 'startTime',
+                    label: '开始时间',
+                    sortable: true,
+                    align: 'center',
+                    click: function (row) {
+
+                    },
+                    render: function (row) {
+                    }
+                }, {
+                    prop: 'endTime',
+                    label: '结束时间',
+                    sortable: true,
+                    align: 'center',
+                    click: function (row) {
+
+                    },
+                    render: function (row) {
+                    }
+                }, {
+                    prop: 'status',
+                    label: '状态',
+                    sortable: true,
+                    align: 'center',
+                    click: function (row) {
+
+                    },
+                    render: function (row) {
+                    }
+                }],
+                list: [],
+                total: 0
+            }
         });
 
         // 获取列表
-        store.dispatch('getRuleAdvanced',durationTimeObj.value.ruleId).then((res) =>{
-            //
-
-        }).catch(e =>{
+        const getRuleList = () => {
+            debugger
+            // store.dispatch('getFaultList', {}).then((res) => {
+            //     debugger
+            //     if (res && res.success) {
+            //         durationTimeObj.value.data.list = res.data;
+            //     }
+            // }).catch(e => {
+            //     debugger
+            //     console.log(e);
+            // })
+            store.dispatch('getRuleAdvanced', durationTimeObj.value.params.ruleId).then((res) => {
+                debugger
+                if (res && res.success) {
+                    durationTimeObj.value.data.list = res.data;
+                }
+            }).catch(e => {
                 console.log(e);
             })
+        }
 
+        Vue.onMounted(() => {
+            getRuleList();
+        })
 
         // 2022-7-26 10.47 故障功能优化新增功能 --end
 
         return {
+            durationTimeObj,
             baseList,
             callbackBaseList,
             count,
@@ -739,8 +793,6 @@ export default {
         addAPM() {
             // this.APMVisible=true;
             this.postPropsData('apm')
-
-
         },
 
         //关闭APM弹框