Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into …

…master-v32-lushangqing

 <div >
 <div >
     <!--  表格-->
     <!--  表格-->
-    <el-table :border="showBorder" v-loading="loading"  @selection-change="handleSelectionChange"  :data="dataList" stripe header-row-class-name="tbl-header-class" :height="height"
+    <el-table :border="showBorder" v-loading="loading" :size="size"  @selection-change="handleSelectionChange"  :data="dataList" stripe header-row-class-name="tbl-header-class" :height="height"
               style="width: 100%;margin: 0px 0px;">
               style="width: 100%;margin: 0px 0px;">
         <el-table-column v-if="showSelection && columns.length > 0"  type="selection" width="55" />
         <el-table-column v-if="showSelection && columns.length > 0"  type="selection" width="55" />
         <el-table-column v-if="showIndex && columns.length > 0" type="index" :label="indexLabel" align="center" width="50"/>
         <el-table-column v-if="showIndex && columns.length > 0" type="index" :label="indexLabel" align="center" width="50"/>

@@ -75,7 +75,12 @@ export default {
         showTools:{
         showTools:{
             type: Boolean,
             type: Boolean,
             default: false
             default: false
-        }
+        },
+        // medium / small / mini
+        size:{
+            type: String,
+            default: 'small'
+        },
     },
     },
     data() {
     data() {
         return {}
         return {}
@@ -130,6 +135,9 @@ export default {
 
 
         // 每页展示多少条
         // 每页展示多少条
         let handleSizeChange = (val) => {
         let handleSizeChange = (val) => {
+            // Start Wang 2021/12/15 23:46 切换页码重置初始页
+            currentPage.value = 1
+            // End Wang 2021/12/15 23:46 切换页码重置初始页
             // console.log(`每页 ${val} 条`)
             // console.log(`每页 ${val} 条`)
             //props.pageSize = val;
             //props.pageSize = val;
             pageSize.value = val;
             pageSize.value = val;

@@ -16,7 +16,8 @@
                        :showPage="false"
                        :showPage="false"
                        :showTools="showDetail"
                        :showTools="showDetail"
                        :maxWidth="width"
                        :maxWidth="width"
-                       :height="200">
+                        size="mini"
+                       :height="300">
             <template #tools="{scope}">
             <template #tools="{scope}">
                 <el-button type="text" size="small" @click.prevent="handleClick(scope.row,scope.$index)">
                 <el-button type="text" size="small" @click.prevent="handleClick(scope.row,scope.$index)">
                     明细
                     明细

@@ -180,7 +180,7 @@ const colTypes = (props, list,openLine,openAlarmDialog) => {
         let col = [{
         let col = [{
             prop: 'resName',
             prop: 'resName',
             label: props.itemName,
             label: props.itemName,
-            width: 100
+            width: 150
         }];
         }];
 
 
         let index = 0;
         let index = 0;
@@ -194,7 +194,7 @@ const colTypes = (props, list,openLine,openAlarmDialog) => {
                     let colInfo = {
                     let colInfo = {
                         prop: v.kpiId,
                         prop: v.kpiId,
                         label: v.kpiName,
                         label: v.kpiName,
-                        width: 80
+                        width: 50
                     };
                     };
 
 
                     if (lineKpiIds.indexOf(v.kpiId) != -1) {
                     if (lineKpiIds.indexOf(v.kpiId) != -1) {

@@ -97,7 +97,7 @@
 
 
                     <el-tabs v-model="activeName" @tab-click="tabClick">
                     <el-tabs v-model="activeName" @tab-click="tabClick">
                         <el-tab-pane label="已添加" name="first">
                         <el-tab-pane label="已添加" name="first">
-                            <cm-table-page :columns="columns" :dataList="tabFirstList" @loaddata="loadFirstList"
+                            <cm-table-page :columns="columns" :dataList="tabFirstList" @loaddata="getPageInfoFirst"
                                            :showIndex="true"   :total="countFirst"
                                            :showIndex="true"   :total="countFirst"
                                            :showBorder="true" :loading="false"
                                            :showBorder="true" :loading="false"
                                            :showPage="true" :showTools="true" :height="(height - 500)">
                                            :showPage="true" :showTools="true" :height="(height - 500)">
@@ -110,7 +110,7 @@
                             </cm-table-page>
                             </cm-table-page>
                         </el-tab-pane>
                         </el-tab-pane>
                         <el-tab-pane label="未添加" name="second">
                         <el-tab-pane label="未添加" name="second">
-                            <cm-table-page :columns="columns" :dataList="tabSecondList" @loaddata="loadSecondList"
+                            <cm-table-page :columns="columns" :dataList="tabSecondList" @loaddata="getPageInfoSecond"
                                            :showIndex="true" :total="count"
                                            :showIndex="true" :total="count"
                                            :showBorder="true" :loading="false"
                                            :showBorder="true" :loading="false"
                                            :showPage="true" :showTools="true" :height="(height - 500)">
                                            :showPage="true" :showTools="true" :height="(height - 500)">

@@ -188,26 +188,23 @@ export default {
             busTypeArr.value = types;
             busTypeArr.value = types;
             loeadTable();
             loeadTable();
         }
         }
-
         // 查询参数
         // 查询参数
-        let getParams = () =>{
-            return  {
-                keyWords: keyWords.value,
-                resType: resTypeArr.value.join(','),
-                kpiId: kpiTypeArr.value.join(','),
-                busId: busTypeArr.value.join(','),
-                configId: config.value,
-                page: 1,
-                limit: 50
-            }
-        }
+        let getParams = Vue.ref({
+            keyWords: keyWords.value,
+            resType: resTypeArr.value.join(','),
+            kpiId: kpiTypeArr.value.join(','),
+            busId: busTypeArr.value.join(','),
+            configId: config.value,
+            page: 1,
+            limit: 10
+        })
 
 
         let loadFirstList = (reload) => {
         let loadFirstList = (reload) => {
             // if (!reload && tabFirstList.value.length > 0) {
             // if (!reload && tabFirstList.value.length > 0) {
             //     return false;
             //     return false;
             // }
             // }
             if(isSign.value){//true为编辑，false为新增
             if(isSign.value){//true为编辑，false为新增
-                proxy.$http.get(`/api-web/ContrastAnalysis/added`, getParams(), function (res) {
+                proxy.$http.get(`/api-web/ContrastAnalysis/added`, getParams.value, function (res) {
                     if (res && res.success) {
                     if (res && res.success) {
                         proxy.countFirst = res.count;
                         proxy.countFirst = res.count;
                         tabFirstList.value = res.data;
                         tabFirstList.value = res.data;
@@ -220,7 +217,7 @@ export default {
             // if (!reload && tabSecondList.value.length > 0) {
             // if (!reload && tabSecondList.value.length > 0) {
             //     return false;
             //     return false;
             // }
             // }
-            proxy.$http.get(`/api-web/ContrastAnalysis/notAdded`, getParams(), function (res) {
+            proxy.$http.get(`/api-web/ContrastAnalysis/notAdded`, getParams.value, function (res) {
                 if (res && res.success) {
                 if (res && res.success) {
                     proxy.count = res.count;
                     proxy.count = res.count;
                     tabSecondList.value = res.data;
                     tabSecondList.value = res.data;
@@ -228,6 +225,21 @@ export default {
             });
             });
         }
         }
 
 
+        let getPageInfoFirst = ({page, limit}) => {
+            getParams.value.page = page;
+            getParams.value.limit = limit;
+
+            // 下一页搜索
+            loadFirstList();
+        }
+        let getPageInfoSecond = ({page, limit}) => {
+            getParams.value.page = page;
+            getParams.value.limit = limit;
+
+            // 下一页搜索
+            loadSecondList();
+        }
+
 
 
         let tabClick = (tab, event) => {
         let tabClick = (tab, event) => {
             let name = tab.paneName;
             let name = tab.paneName;
@@ -542,6 +554,8 @@ export default {
             deleteRes,
             deleteRes,
             onBtnSearch,
             onBtnSearch,
             onReset,
             onReset,
+            getPageInfoFirst,
+            getPageInfoSecond,
 
 
             getResType,
             getResType,
             getKpiType,
             getKpiType,

@@ -15,33 +15,33 @@ const faultDetail = () => {
             faultTypeName: '拨测',
             faultTypeName: '拨测',
             components: 'result-item',
             components: 'result-item',
             color: '#67C23A',
             color: '#67C23A',
-            itemName:'场景名称',
-            detail:false,
-            colType:'kpi'
-        },{
+            itemName: '场景名称',
+            detail: false,
+            colType: 'kpi'
+        }, {
             faultType: 'NPM',
             faultType: 'NPM',
             faultTypeName: 'NPM',
             faultTypeName: 'NPM',
             components: 'result-item',
             components: 'result-item',
             color: '#E6A23C',
             color: '#E6A23C',
-            itemName:'链路（流名称）',
-            detail:false,
-            colType:'kpi'
-        },{
+            itemName: '链路（流名称）',
+            detail: false,
+            colType: 'kpi'
+        }, {
             faultType: 'BASE',
             faultType: 'BASE',
             faultTypeName: '基础',
             faultTypeName: '基础',
             components: 'result-item',
             components: 'result-item',
             color: '#67C23A',
             color: '#67C23A',
-            itemName:'检测指标',
-            detail:true,
-            colType:'flag'
-        },  {
+            itemName: '检测指标',
+            detail: true,
+            colType: 'flag'
+        }, {
             faultType: 'APM',
             faultType: 'APM',
             faultTypeName: 'APM',
             faultTypeName: 'APM',
             components: 'result-item',
             components: 'result-item',
             color: '#F56C6C',
             color: '#F56C6C',
-            itemName:'检测指标',
-            detail:true,
-            colType:'flag'
+            itemName: '检测指标',
+            detail: true,
+            colType: 'flag'
         }/*, {
         }/*, {
             faultType: 'NETLINK',
             faultType: 'NETLINK',
             faultTypeName: '网络链路',
             faultTypeName: '网络链路',
@@ -112,7 +112,7 @@ const handleInfo = () => {
                 trigger: 'change',
                 trigger: 'change',
             },
             },
         ],
         ],
-        solvetime: [
+        solveTime: [
             {
             {
                 type: 'date',
                 type: 'date',
                 required: true,
                 required: true,
@@ -162,11 +162,11 @@ const handleInfo = () => {
      * 作者： Wang
      * 作者： Wang
      * 时间：2021/12/14 23:05
      * 时间：2021/12/14 23:05
      */
      */
-    let saveHandleInfo = (key,callback) => {
+    let saveHandleInfo = (key, callback) => {
         proxy.$refs[key].validate((valid) => {
         proxy.$refs[key].validate((valid) => {
             if (valid) {
             if (valid) {
-                proxy.$http.post('/api-web/fault/solve',handleInfoForm.value,function (res){
-                    if(res && res.success){
+                proxy.$http.post('/api-web/fault/solve', handleInfoForm.value, function (res) {
+                    if (res && res.success) {
                         proxy.$global.showMsg("处理成功！");
                         proxy.$global.showMsg("处理成功！");
                         showHandleInfoDialog(false);
                         showHandleInfoDialog(false);
                     } else {
                     } else {
@@ -234,42 +234,56 @@ export default {
             columns: [{
             columns: [{
                 prop: 'faultBody',
                 prop: 'faultBody',
                 label: '故障主体',
                 label: '故障主体',
+                width: 150,
                 click: function (row) {
                 click: function (row) {
                     // 展示弹框
                     // 展示弹框
                     closeFaultDetailDialog(true);
                     closeFaultDetailDialog(true);
                     // 设置相信信息
                     // 设置相信信息
                     settingDetail(row);
                     settingDetail(row);
+                },
+                render: function (row) {
+                    return `<span style="text-decoration: underline;color: blue;">${row.faultBody}</span>`
                 }
                 }
             }, {
             }, {
                 prop: 'faulttype',
                 prop: 'faulttype',
+                width: 80,
                 label: '故障分类'
                 label: '故障分类'
             }, {
             }, {
                 prop: 'createTime',
                 prop: 'createTime',
-                label: '发生时间'
+                label: '发生时间',
+                width: 120,
             }, {
             }, {
                 prop: 'faultState',
                 prop: 'faultState',
-                label: '故障状态'
+                label: '故障状态',
+                width: 80,
             }, {
             }, {
                 prop: 'solveway',
                 prop: 'solveway',
-                label: '处理方式'
+                label: '处理方式',
+                width: 70,
             }, {
             }, {
                 prop: 'solveTime',
                 prop: 'solveTime',
-                label: '处理时间'
+                label: '处理时间',
+                width: 120,
             }, {
             }, {
                 prop: 'solveby',
                 prop: 'solveby',
-                label: '处理人'
+                label: '处理人',
+                width: 80,
             }, {
             }, {
                 prop: 'duration',
                 prop: 'duration',
-                label: '持续时长'
+                label: '持续时长',
+                width: 80,
             }, {
             }, {
                 prop: 'reason',
                 prop: 'reason',
-                label: '原因分析'
+                label: '原因分析',
+                width: 220,
             }, {
             }, {
                 prop: 'solution',
                 prop: 'solution',
-                label: '处理方案'
+                label: '处理方案',
+                width: 150,
             }, {
             }, {
                 prop: 'influenceScope',
                 prop: 'influenceScope',
-                label: '影响范围'
+                label: '影响范围',
+                width: 220,
             }],
             }],
             dataList: [],
             dataList: [],
             total: 0
             total: 0