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

@@ -2,6 +2,22 @@
 @import "../css/assets.css";
 @import "../css/components.css";
 
+.d-flex {
+    display: flex;
+}
+
+.align-right {
+    text-align: right;
+}
+
+.align-left {
+    text-align: left;
+}
+
+.align-center {
+    text-align: center;
+}
+
 /*最外层样式*/
 .container {
     background-color: #CCCCCC;
@@ -26,10 +42,10 @@
     flex-wrap: wrap;
 }
 
-.container .cm-card .search .condition div{
-    margin-right: 2px!important;
-    margin-bottom: 3px!important;
-    width: 250px!important;
+.container .cm-card .search .condition div {
+    margin-right: 2px !important;
+    margin-bottom: 3px !important;
+    width: 250px !important;
 }
 
 .container .cm-card .search .btns {
@@ -37,10 +53,10 @@
     display: flex;
     padding-left: 10px;
     justify-content: center;
-    align-items:center;
+    align-items: center;
 }
 
-.container .cm-card .search-table{
+.container .cm-card .search-table {
     padding: 0px 6px;
 }
 

 @font-face {
   font-family: "iconfont"; /* Project id 2843738 */
-  src: url('iconfont.woff2?t=1637581076852') format('woff2'),
-       url('iconfont.woff?t=1637581076852') format('woff'),
-       url('iconfont.ttf?t=1637581076852') format('truetype');
+  src: url('iconfont.woff2?t=1639498542236') format('woff2'),
+       url('iconfont.woff?t=1639498542236') format('woff'),
+       url('iconfont.ttf?t=1639498542236') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,546 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-yibiaopan:before {
+  content: "\eb67";
+}
+
+.icon-nginx:before {
+  content: "\e63e";
+}
+
+.icon-dianya:before {
+  content: "\e639";
+}
+
+.icon-shujujiekou:before {
+  content: "\e641";
+}
+
+.icon-xudianchizu:before {
+  content: "\e7df";
+}
+
+.icon-tomcat2:before {
+  content: "\e63a";
+}
+
+.icon-xiaoxingji:before {
+  content: "\e63b";
+}
+
+.icon-dianyabiao:before {
+  content: "\e658";
+}
+
+.icon-suzhuji:before {
+  content: "\e63f";
+}
+
+.icon-kongtiao1:before {
+  content: "\e90d";
+}
+
+.icon-kaiguan:before {
+  content: "\e642";
+}
+
+.icon-wenduji:before {
+  content: "\e643";
+}
+
+.icon-kaiguan1:before {
+  content: "\eaf7";
+}
+
+.icon-xuehua:before {
+  content: "\e644";
+}
+
+.icon-aliyun:before {
+  content: "\e6aa";
+}
+
+.icon-kongtiao2:before {
+  content: "\e645";
+}
+
+.icon-kaiguan2:before {
+  content: "\ec76";
+}
+
+.icon-dianchizu:before {
+  content: "\e647";
+}
+
+.icon-dianchizu1:before {
+  content: "\e646";
+}
+
+.icon-CADshezhi:before {
+  content: "\e649";
+}
+
+.icon-EPStubiao:before {
+  content: "\e64a";
+}
+
+.icon-webLogic:before {
+  content: "\e73a";
+}
+
+.icon-xiaoxingji1:before {
+  content: "\e65a";
+}
+
+.icon-wenduji1:before {
+  content: "\e64b";
+}
+
+.icon-guangyuwang:before {
+  content: "\e64c";
+}
+
+.icon-wangguanshezhi:before {
+  content: "\e69f";
+}
+
+.icon-sanjiaohuanji:before {
+  content: "\e64d";
+}
+
+.icon-Redis1:before {
+  content: "\e64e";
+}
+
+.icon-dianchi3:before {
+  content: "\e64f";
+}
+
+.icon-xiaoxingji2:before {
+  content: "\e734";
+}
+
+.icon-xiaoxingji3:before {
+  content: "\e749";
+}
+
+.icon-dns:before {
+  content: "\e650";
+}
+
+.icon-yangan:before {
+  content: "\e651";
+}
+
+.icon-shujuku:before {
+  content: "\e652";
+}
+
+.icon-xuehua1:before {
+  content: "\e653";
+}
+
+.icon-kongtiao3:before {
+  content: "\e655";
+}
+
+.icon-jifang:before {
+  content: "\e6ca";
+}
+
+.icon-eps:before {
+  content: "\e8ae";
+}
+
+.icon-sharpicons_snowflake:before {
+  content: "\e7c4";
+}
+
+.icon-SANjiaohuanji:before {
+  content: "\e656";
+}
+
+.icon-dianchi4:before {
+  content: "\e659";
+}
+
+.icon-dianyabiao1:before {
+  content: "\e65f";
+}
+
+.icon-dianchizu2:before {
+  content: "\e82b";
+}
+
+.icon-hengban-huaweiyun-quanbu:before {
+  content: "\e6c9";
+}
+
+.icon-UPS:before {
+  content: "\e661";
+}
+
+.icon-yangan1:before {
+  content: "\e67e";
+}
+
+.icon-dianliu:before {
+  content: "\e68a";
+}
+
+.icon-dianchi-wu:before {
+  content: "\e662";
+}
+
+.icon-ecsyunfuwuqi:before {
+  content: "\e666";
+}
+
+.icon-ups:before {
+  content: "\e7b9";
+}
+
+.icon-mysqlshujukumgrban:before {
+  content: "\e663";
+}
+
+.icon-dianya1:before {
+  content: "\e665";
+}
+
+.icon-VMware:before {
+  content: "\e843";
+}
+
+.icon-yibiaopan1:before {
+  content: "\e664";
+}
+
+.icon-ecsyunfuwuqiECS:before {
+  content: "\e667";
+}
+
+.icon-ecsyunfuwuqiECS1:before {
+  content: "\e6e8";
+}
+
+.icon-ruqinjiance1:before {
+  content: "\e668";
+}
+
+.icon-gongxiangcunchu:before {
+  content: "\e754";
+}
+
+.icon-dianliu1:before {
+  content: "\e673";
+}
+
+.icon-icon-huaweiyunxuniji:before {
+  content: "\e927";
+}
+
+.icon-MySQLshujuku:before {
+  content: "\e72a";
+}
+
+.icon-Internet-yunzhuangjiedian:before {
+  content: "\e6ac";
+}
+
+.icon-Internet-yunzhuangjiedian1:before {
+  content: "\e6b6";
+}
+
+.icon-yangan2:before {
+  content: "\e669";
+}
+
+.icon-KAFAKA:before {
+  content: "\e801";
+}
+
+.icon-zhongjiqi:before {
+  content: "\e6b9";
+}
+
+.icon-wangguan:before {
+  content: "\e67a";
+}
+
+.icon-alarm-full:before {
+  content: "\e871";
+}
+
+.icon-alarm:before {
+  content: "\e872";
+}
+
+.icon-blood-full:before {
+  content: "\e918";
+}
+
+.icon-mianxingbaojingdengtubiao:before {
+  content: "\e6a3";
+}
+
+.icon-fuwuqi2:before {
+  content: "\e98e";
+}
+
+.icon-fenqu:before {
+  content: "\e684";
+}
+
+.icon-wenduji2:before {
+  content: "\e66a";
+}
+
+.icon-shujukucaozuo-chaxunmysqlshujuku:before {
+  content: "\e66b";
+}
+
+.icon-jifang1:before {
+  content: "\e66c";
+}
+
+.icon-zhuanyongsuzhuji:before {
+  content: "\e66d";
+}
+
+.icon-danxingwangka:before {
+  content: "\e66e";
+}
+
+.icon-wuliwangkaduankou:before {
+  content: "\e66f";
+}
+
+.icon-wangluoruqinjiance:before {
+  content: "\e672";
+}
+
+.icon-qiansuanxudianchizu:before {
+  content: "\e674";
+}
+
+.icon-UPS1:before {
+  content: "\e676";
+}
+
+.icon-guangyuwangxianlu:before {
+  content: "\e678";
+}
+
+.icon-wuliwangka:before {
+  content: "\e67f";
+}
+
+.icon-Nginx:before {
+  content: "\e683";
+}
+
+.icon-Weblogic:before {
+  content: "\e685";
+}
+
+.icon-TOMCAT:before {
+  content: "\e687";
+}
+
+.icon-wulifuwuqi1:before {
+  content: "\e688";
+}
+
+.icon-VMware1:before {
+  content: "\e68b";
+}
+
+.icon-jiqun:before {
+  content: "\e68c";
+}
+
+.icon-bianyuanjiaohuanji:before {
+  content: "\e770";
+}
+
+.icon-epsdaoru:before {
+  content: "\ee23";
+}
+
+.icon-epsdaochu:before {
+  content: "\ee24";
+}
+
+.icon-zhongjiqi1:before {
+  content: "\e8e0";
+}
+
+.icon-a-ziyuan117:before {
+  content: "\e670";
+}
+
+.icon-suzhuji1:before {
+  content: "\e671";
+}
+
+.icon-binghaitushi_shuizi:before {
+  content: "\e6a5";
+}
+
+.icon-gongxiangcunchu1:before {
+  content: "\e677";
+}
+
+.icon-loudiandianliu-xian:before {
+  content: "\e7de";
+}
+
+.icon-alarm-full1:before {
+  content: "\e679";
+}
+
+.icon-xiaoxingji4:before {
+  content: "\e7c3";
+}
+
+.icon-dianliu2:before {
+  content: "\e7b0";
+}
+
+.icon-huaweiyun:before {
+  content: "\e7ca";
+}
+
+.icon-dianchi:before {
+  content: "\e624";
+}
+
+.icon-chongdian:before {
+  content: "\e627";
+}
+
+.icon-5:before {
+  content: "\e628";
+}
+
+.icon-tomcat:before {
+  content: "\e629";
+}
+
+.icon-ids:before {
+  content: "\e6db";
+}
+
+.icon-fuzaijunheng:before {
+  content: "\e62b";
+}
+
+.icon-xuniips:before {
+  content: "\ea5d";
+}
+
+.icon-xuniips1:before {
+  content: "\ea67";
+}
+
+.icon-fanghuoqiang37:before {
+  content: "\e728";
+}
+
+.icon-vlb:before {
+  content: "\e729";
+}
+
+.icon-shouye:before {
+  content: "\e636";
+}
+
+.icon-shuizisunshixian:before {
+  content: "\e6d6";
+}
+
+.icon-ruqinjiance:before {
+  content: "\e65c";
+}
+
+.icon-jiaohuanji:before {
+  content: "\e836";
+}
+
+.icon-jingwuicon_svg-:before {
+  content: "\e65b";
+}
+
+.icon-tomcat1:before {
+  content: "\e62c";
+}
+
+.icon-jiaohuanji1:before {
+  content: "\e62f";
+}
+
+.icon-oracleshujuku:before {
+  content: "\e630";
+}
+
+.icon-fanghuoqiang:before {
+  content: "\e648";
+}
+
+.icon-fuwuqi:before {
+  content: "\e631";
+}
+
+.icon-fuwuqi1:before {
+  content: "\e632";
+}
+
+.icon-kongtiao:before {
+  content: "\e67d";
+}
+
+.icon-yunshujuku:before {
+  content: "\e744";
+}
+
+.icon-dianchi1:before {
+  content: "\e633";
+}
+
+.icon-Redis:before {
+  content: "\e6a2";
+}
+
+.icon-icon-current:before {
+  content: "\e634";
+}
+
+.icon-oracleshujuku1:before {
+  content: "\e635";
+}
+
+.icon-DNS-xiugai:before {
+  content: "\e637";
+}
+
+.icon-wulifuwuqi:before {
+  content: "\e6a8";
+}
+
+.icon-dianchi2:before {
+  content: "\e638";
+}
+
+.icon-daochu:before {
+  content: "\eabf";
+}
+
+.icon-daochu1:before {
+  content: "\e623";
+}
+
 .icon-database:before {
   content: "\e940";
 }

 {
   "id": "2843738",
-  "name": "文件系统",
+  "name": "项目常用",
   "font_family": "iconfont",
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
     {
+      "icon_id": "3868284",
+      "name": "仪表盘",
+      "font_class": "yibiaopan",
+      "unicode": "eb67",
+      "unicode_decimal": 60263
+    },
+    {
+      "icon_id": "3876341",
+      "name": "nginx",
+      "font_class": "nginx",
+      "unicode": "e63e",
+      "unicode_decimal": 58942
+    },
+    {
+      "icon_id": "3988202",
+      "name": "电流",
+      "font_class": "dianya",
+      "unicode": "e639",
+      "unicode_decimal": 58937
+    },
+    {
+      "icon_id": "4074467",
+      "name": "数据接口",
+      "font_class": "shujujiekou",
+      "unicode": "e641",
+      "unicode_decimal": 58945
+    },
+    {
+      "icon_id": "4134729",
+      "name": "蓄电池组",
+      "font_class": "xudianchizu",
+      "unicode": "e7df",
+      "unicode_decimal": 59359
+    },
+    {
+      "icon_id": "4157533",
+      "name": "tomcat",
+      "font_class": "tomcat2",
+      "unicode": "e63a",
+      "unicode_decimal": 58938
+    },
+    {
+      "icon_id": "4210626",
+      "name": "小型机",
+      "font_class": "xiaoxingji",
+      "unicode": "e63b",
+      "unicode_decimal": 58939
+    },
+    {
+      "icon_id": "4516188",
+      "name": "电压表",
+      "font_class": "dianyabiao",
+      "unicode": "e658",
+      "unicode_decimal": 58968
+    },
+    {
+      "icon_id": "4675007",
+      "name": "宿主机",
+      "font_class": "suzhuji",
+      "unicode": "e63f",
+      "unicode_decimal": 58943
+    },
+    {
+      "icon_id": "4762919",
+      "name": "空调",
+      "font_class": "kongtiao1",
+      "unicode": "e90d",
+      "unicode_decimal": 59661
+    },
+    {
+      "icon_id": "5149545",
+      "name": "开关",
+      "font_class": "kaiguan",
+      "unicode": "e642",
+      "unicode_decimal": 58946
+    },
+    {
+      "icon_id": "5206180",
+      "name": "温度计",
+      "font_class": "wenduji",
+      "unicode": "e643",
+      "unicode_decimal": 58947
+    },
+    {
+      "icon_id": "5387534",
+      "name": "开关",
+      "font_class": "kaiguan1",
+      "unicode": "eaf7",
+      "unicode_decimal": 60151
+    },
+    {
+      "icon_id": "5482494",
+      "name": "雪花",
+      "font_class": "xuehua",
+      "unicode": "e644",
+      "unicode_decimal": 58948
+    },
+    {
+      "icon_id": "5627975",
+      "name": "阿里云",
+      "font_class": "aliyun",
+      "unicode": "e6aa",
+      "unicode_decimal": 59050
+    },
+    {
+      "icon_id": "5643626",
+      "name": "空调",
+      "font_class": "kongtiao2",
+      "unicode": "e645",
+      "unicode_decimal": 58949
+    },
+    {
+      "icon_id": "5982854",
+      "name": "开关",
+      "font_class": "kaiguan2",
+      "unicode": "ec76",
+      "unicode_decimal": 60534
+    },
+    {
+      "icon_id": "6081119",
+      "name": "电池组",
+      "font_class": "dianchizu",
+      "unicode": "e647",
+      "unicode_decimal": 58951
+    },
+    {
+      "icon_id": "6119849",
+      "name": "电池组",
+      "font_class": "dianchizu1",
+      "unicode": "e646",
+      "unicode_decimal": 58950
+    },
+    {
+      "icon_id": "6161302",
+      "name": "CAD设置",
+      "font_class": "CADshezhi",
+      "unicode": "e649",
+      "unicode_decimal": 58953
+    },
+    {
+      "icon_id": "6233077",
+      "name": "EPS图标",
+      "font_class": "EPStubiao",
+      "unicode": "e64a",
+      "unicode_decimal": 58954
+    },
+    {
+      "icon_id": "6743388",
+      "name": "webLogic",
+      "font_class": "webLogic",
+      "unicode": "e73a",
+      "unicode_decimal": 59194
+    },
+    {
+      "icon_id": "6985257",
+      "name": "小型机",
+      "font_class": "xiaoxingji1",
+      "unicode": "e65a",
+      "unicode_decimal": 58970
+    },
+    {
+      "icon_id": "7123776",
+      "name": "温度计",
+      "font_class": "wenduji1",
+      "unicode": "e64b",
+      "unicode_decimal": 58955
+    },
+    {
+      "icon_id": "7330539",
+      "name": "广域网",
+      "font_class": "guangyuwang",
+      "unicode": "e64c",
+      "unicode_decimal": 58956
+    },
+    {
+      "icon_id": "7339807",
+      "name": "网关设置",
+      "font_class": "wangguanshezhi",
+      "unicode": "e69f",
+      "unicode_decimal": 59039
+    },
+    {
+      "icon_id": "7483559",
+      "name": "san交换机",
+      "font_class": "sanjiaohuanji",
+      "unicode": "e64d",
+      "unicode_decimal": 58957
+    },
+    {
+      "icon_id": "7556317",
+      "name": "Redis",
+      "font_class": "Redis1",
+      "unicode": "e64e",
+      "unicode_decimal": 58958
+    },
+    {
+      "icon_id": "7677924",
+      "name": "电池",
+      "font_class": "dianchi3",
+      "unicode": "e64f",
+      "unicode_decimal": 58959
+    },
+    {
+      "icon_id": "7986294",
+      "name": "小型机",
+      "font_class": "xiaoxingji2",
+      "unicode": "e734",
+      "unicode_decimal": 59188
+    },
+    {
+      "icon_id": "7986486",
+      "name": "小型机服务器",
+      "font_class": "xiaoxingji3",
+      "unicode": "e749",
+      "unicode_decimal": 59209
+    },
+    {
+      "icon_id": "8299126",
+      "name": "dns",
+      "font_class": "dns",
+      "unicode": "e650",
+      "unicode_decimal": 58960
+    },
+    {
+      "icon_id": "8728353",
+      "name": "烟感",
+      "font_class": "yangan",
+      "unicode": "e651",
+      "unicode_decimal": 58961
+    },
+    {
+      "icon_id": "8765123",
+      "name": "数据库",
+      "font_class": "shujuku",
+      "unicode": "e652",
+      "unicode_decimal": 58962
+    },
+    {
+      "icon_id": "8936807",
+      "name": "雪花",
+      "font_class": "xuehua1",
+      "unicode": "e653",
+      "unicode_decimal": 58963
+    },
+    {
+      "icon_id": "8974305",
+      "name": "空调",
+      "font_class": "kongtiao3",
+      "unicode": "e655",
+      "unicode_decimal": 58965
+    },
+    {
+      "icon_id": "10063123",
+      "name": "机房",
+      "font_class": "jifang",
+      "unicode": "e6ca",
+      "unicode_decimal": 59082
+    },
+    {
+      "icon_id": "10135217",
+      "name": "eps",
+      "font_class": "eps",
+      "unicode": "e8ae",
+      "unicode_decimal": 59566
+    },
+    {
+      "icon_id": "10570352",
+      "name": "sharpicons_snowflake",
+      "font_class": "sharpicons_snowflake",
+      "unicode": "e7c4",
+      "unicode_decimal": 59332
+    },
+    {
+      "icon_id": "11272443",
+      "name": "SAN交换机",
+      "font_class": "SANjiaohuanji",
+      "unicode": "e656",
+      "unicode_decimal": 58966
+    },
+    {
+      "icon_id": "11464294",
+      "name": "电池",
+      "font_class": "dianchi4",
+      "unicode": "e659",
+      "unicode_decimal": 58969
+    },
+    {
+      "icon_id": "11464297",
+      "name": "电压表",
+      "font_class": "dianyabiao1",
+      "unicode": "e65f",
+      "unicode_decimal": 58975
+    },
+    {
+      "icon_id": "11680334",
+      "name": "电池组",
+      "font_class": "dianchizu2",
+      "unicode": "e82b",
+      "unicode_decimal": 59435
+    },
+    {
+      "icon_id": "11740740",
+      "name": "横版-华为云-全部",
+      "font_class": "hengban-huaweiyun-quanbu",
+      "unicode": "e6c9",
+      "unicode_decimal": 59081
+    },
+    {
+      "icon_id": "11758212",
+      "name": "UPS",
+      "font_class": "UPS",
+      "unicode": "e661",
+      "unicode_decimal": 58977
+    },
+    {
+      "icon_id": "11806568",
+      "name": "烟感",
+      "font_class": "yangan1",
+      "unicode": "e67e",
+      "unicode_decimal": 59006
+    },
+    {
+      "icon_id": "11810507",
+      "name": "电流",
+      "font_class": "dianliu",
+      "unicode": "e68a",
+      "unicode_decimal": 59018
+    },
+    {
+      "icon_id": "11855583",
+      "name": "电池 - 无",
+      "font_class": "dianchi-wu",
+      "unicode": "e662",
+      "unicode_decimal": 58978
+    },
+    {
+      "icon_id": "11983180",
+      "name": "ecs云服务器",
+      "font_class": "ecsyunfuwuqi",
+      "unicode": "e666",
+      "unicode_decimal": 58982
+    },
+    {
+      "icon_id": "11993570",
+      "name": "ups",
+      "font_class": "ups",
+      "unicode": "e7b9",
+      "unicode_decimal": 59321
+    },
+    {
+      "icon_id": "12111690",
+      "name": "mysql数据库(mgr版)",
+      "font_class": "mysqlshujukumgrban",
+      "unicode": "e663",
+      "unicode_decimal": 58979
+    },
+    {
+      "icon_id": "12331657",
+      "name": "电压",
+      "font_class": "dianya1",
+      "unicode": "e665",
+      "unicode_decimal": 58981
+    },
+    {
+      "icon_id": "12512978",
+      "name": "VMware",
+      "font_class": "VMware",
+      "unicode": "e843",
+      "unicode_decimal": 59459
+    },
+    {
+      "icon_id": "12717498",
+      "name": "仪表盘",
+      "font_class": "yibiaopan1",
+      "unicode": "e664",
+      "unicode_decimal": 58980
+    },
+    {
+      "icon_id": "13533294",
+      "name": "ecs 云服务器ECS",
+      "font_class": "ecsyunfuwuqiECS",
+      "unicode": "e667",
+      "unicode_decimal": 58983
+    },
+    {
+      "icon_id": "13592668",
+      "name": "ecs 云服务器ECS",
+      "font_class": "ecsyunfuwuqiECS1",
+      "unicode": "e6e8",
+      "unicode_decimal": 59112
+    },
+    {
+      "icon_id": "13938211",
+      "name": "入侵检测",
+      "font_class": "ruqinjiance1",
+      "unicode": "e668",
+      "unicode_decimal": 58984
+    },
+    {
+      "icon_id": "14158394",
+      "name": "共享存储",
+      "font_class": "gongxiangcunchu",
+      "unicode": "e754",
+      "unicode_decimal": 59220
+    },
+    {
+      "icon_id": "14301846",
+      "name": "电流",
+      "font_class": "dianliu1",
+      "unicode": "e673",
+      "unicode_decimal": 58995
+    },
+    {
+      "icon_id": "14842696",
+      "name": "icon-华为云虚拟机",
+      "font_class": "icon-huaweiyunxuniji",
+      "unicode": "e927",
+      "unicode_decimal": 59687
+    },
+    {
+      "icon_id": "15420776",
+      "name": "MySQL数据库",
+      "font_class": "MySQLshujuku",
+      "unicode": "e72a",
+      "unicode_decimal": 59178
+    },
+    {
+      "icon_id": "15741703",
+      "name": "Internet-云状节点",
+      "font_class": "Internet-yunzhuangjiedian",
+      "unicode": "e6ac",
+      "unicode_decimal": 59052
+    },
+    {
+      "icon_id": "15742670",
+      "name": "Internet-云状节点",
+      "font_class": "Internet-yunzhuangjiedian1",
+      "unicode": "e6b6",
+      "unicode_decimal": 59062
+    },
+    {
+      "icon_id": "16554784",
+      "name": "烟感",
+      "font_class": "yangan2",
+      "unicode": "e669",
+      "unicode_decimal": 58985
+    },
+    {
+      "icon_id": "16616576",
+      "name": "KAFAKA",
+      "font_class": "KAFAKA",
+      "unicode": "e801",
+      "unicode_decimal": 59393
+    },
+    {
+      "icon_id": "16994042",
+      "name": "中继器",
+      "font_class": "zhongjiqi",
+      "unicode": "e6b9",
+      "unicode_decimal": 59065
+    },
+    {
+      "icon_id": "17566736",
+      "name": "网关",
+      "font_class": "wangguan",
+      "unicode": "e67a",
+      "unicode_decimal": 59002
+    },
+    {
+      "icon_id": "18164959",
+      "name": "报警,警报,报警灯,危险",
+      "font_class": "alarm-full",
+      "unicode": "e871",
+      "unicode_decimal": 59505
+    },
+    {
+      "icon_id": "18164960",
+      "name": "报警,警报,报警灯,危险",
+      "font_class": "alarm",
+      "unicode": "e872",
+      "unicode_decimal": 59506
+    },
+    {
+      "icon_id": "18169496",
+      "name": "血,血液,水,水滴",
+      "font_class": "blood-full",
+      "unicode": "e918",
+      "unicode_decimal": 59672
+    },
+    {
+      "icon_id": "18261773",
+      "name": "面性报警灯图标",
+      "font_class": "mianxingbaojingdengtubiao",
+      "unicode": "e6a3",
+      "unicode_decimal": 59043
+    },
+    {
+      "icon_id": "18267916",
+      "name": "服务器",
+      "font_class": "fuwuqi2",
+      "unicode": "e98e",
+      "unicode_decimal": 59790
+    },
+    {
+      "icon_id": "19318801",
+      "name": "分区",
+      "font_class": "fenqu",
+      "unicode": "e684",
+      "unicode_decimal": 59012
+    },
+    {
+      "icon_id": "19378052",
+      "name": "温度计",
+      "font_class": "wenduji2",
+      "unicode": "e66a",
+      "unicode_decimal": 58986
+    },
+    {
+      "icon_id": "19813990",
+      "name": "数据库操作-查询mysql数据库",
+      "font_class": "shujukucaozuo-chaxunmysqlshujuku",
+      "unicode": "e66b",
+      "unicode_decimal": 58987
+    },
+    {
+      "icon_id": "20999170",
+      "name": "机房",
+      "font_class": "jifang1",
+      "unicode": "e66c",
+      "unicode_decimal": 58988
+    },
+    {
+      "icon_id": "21053589",
+      "name": "专用宿主机",
+      "font_class": "zhuanyongsuzhuji",
+      "unicode": "e66d",
+      "unicode_decimal": 58989
+    },
+    {
+      "icon_id": "21053595",
+      "name": "弹性网卡",
+      "font_class": "danxingwangka",
+      "unicode": "e66e",
+      "unicode_decimal": 58990
+    },
+    {
+      "icon_id": "21053648",
+      "name": "物理网卡端口",
+      "font_class": "wuliwangkaduankou",
+      "unicode": "e66f",
+      "unicode_decimal": 58991
+    },
+    {
+      "icon_id": "21053660",
+      "name": "网络入侵检测",
+      "font_class": "wangluoruqinjiance",
+      "unicode": "e672",
+      "unicode_decimal": 58994
+    },
+    {
+      "icon_id": "21053673",
+      "name": "铅酸蓄电池组",
+      "font_class": "qiansuanxudianchizu",
+      "unicode": "e674",
+      "unicode_decimal": 58996
+    },
+    {
+      "icon_id": "21053692",
+      "name": "UPS",
+      "font_class": "UPS1",
+      "unicode": "e676",
+      "unicode_decimal": 58998
+    },
+    {
+      "icon_id": "21053714",
+      "name": "广域网线路",
+      "font_class": "guangyuwangxianlu",
+      "unicode": "e678",
+      "unicode_decimal": 59000
+    },
+    {
+      "icon_id": "21053761",
+      "name": "物理网卡",
+      "font_class": "wuliwangka",
+      "unicode": "e67f",
+      "unicode_decimal": 59007
+    },
+    {
+      "icon_id": "21053782",
+      "name": "Nginx",
+      "font_class": "Nginx",
+      "unicode": "e683",
+      "unicode_decimal": 59011
+    },
+    {
+      "icon_id": "21053785",
+      "name": "Weblogic",
+      "font_class": "Weblogic",
+      "unicode": "e685",
+      "unicode_decimal": 59013
+    },
+    {
+      "icon_id": "21053789",
+      "name": "TOMCAT",
+      "font_class": "TOMCAT",
+      "unicode": "e687",
+      "unicode_decimal": 59015
+    },
+    {
+      "icon_id": "21053794",
+      "name": "物理服务器",
+      "font_class": "wulifuwuqi1",
+      "unicode": "e688",
+      "unicode_decimal": 59016
+    },
+    {
+      "icon_id": "21053837",
+      "name": "VMware",
+      "font_class": "VMware1",
+      "unicode": "e68b",
+      "unicode_decimal": 59019
+    },
+    {
+      "icon_id": "21053839",
+      "name": "集群",
+      "font_class": "jiqun",
+      "unicode": "e68c",
+      "unicode_decimal": 59020
+    },
+    {
+      "icon_id": "22155948",
+      "name": "边缘交换机",
+      "font_class": "bianyuanjiaohuanji",
+      "unicode": "e770",
+      "unicode_decimal": 59248
+    },
+    {
+      "icon_id": "22385737",
+      "name": "eps导入",
+      "font_class": "epsdaoru",
+      "unicode": "ee23",
+      "unicode_decimal": 60963
+    },
+    {
+      "icon_id": "22385758",
+      "name": "eps导出",
+      "font_class": "epsdaochu",
+      "unicode": "ee24",
+      "unicode_decimal": 60964
+    },
+    {
+      "icon_id": "23492323",
+      "name": "中继器",
+      "font_class": "zhongjiqi1",
+      "unicode": "e8e0",
+      "unicode_decimal": 59616
+    },
+    {
+      "icon_id": "24818745",
+      "name": "Tomcat",
+      "font_class": "a-ziyuan117",
+      "unicode": "e670",
+      "unicode_decimal": 58992
+    },
+    {
+      "icon_id": "25269587",
+      "name": "宿主机",
+      "font_class": "suzhuji1",
+      "unicode": "e671",
+      "unicode_decimal": 58993
+    },
+    {
+      "icon_id": "25433477",
+      "name": "病害图示_水渍",
+      "font_class": "binghaitushi_shuizi",
+      "unicode": "e6a5",
+      "unicode_decimal": 59045
+    },
+    {
+      "icon_id": "25598328",
+      "name": "共享存储",
+      "font_class": "gongxiangcunchu1",
+      "unicode": "e677",
+      "unicode_decimal": 58999
+    },
+    {
+      "icon_id": "25742484",
+      "name": "漏电电流-线",
+      "font_class": "loudiandianliu-xian",
+      "unicode": "e7de",
+      "unicode_decimal": 59358
+    },
+    {
+      "icon_id": "26088265",
+      "name": "报警,警报,报警灯,危险",
+      "font_class": "alarm-full1",
+      "unicode": "e679",
+      "unicode_decimal": 59001
+    },
+    {
+      "icon_id": "26155876",
+      "name": "小型机",
+      "font_class": "xiaoxingji4",
+      "unicode": "e7c3",
+      "unicode_decimal": 59331
+    },
+    {
+      "icon_id": "26204574",
+      "name": "电流",
+      "font_class": "dianliu2",
+      "unicode": "e7b0",
+      "unicode_decimal": 59312
+    },
+    {
+      "icon_id": "26254469",
+      "name": "华为云",
+      "font_class": "huaweiyun",
+      "unicode": "e7ca",
+      "unicode_decimal": 59338
+    },
+    {
+      "icon_id": "1093",
+      "name": "电池",
+      "font_class": "dianchi",
+      "unicode": "e624",
+      "unicode_decimal": 58916
+    },
+    {
+      "icon_id": "1376",
+      "name": "充电",
+      "font_class": "chongdian",
+      "unicode": "e627",
+      "unicode_decimal": 58919
+    },
+    {
+      "icon_id": "316072",
+      "name": "water",
+      "font_class": "5",
+      "unicode": "e628",
+      "unicode_decimal": 58920
+    },
+    {
+      "icon_id": "435277",
+      "name": "tomcat",
+      "font_class": "tomcat",
+      "unicode": "e629",
+      "unicode_decimal": 58921
+    },
+    {
+      "icon_id": "588647",
+      "name": "ids",
+      "font_class": "ids",
+      "unicode": "e6db",
+      "unicode_decimal": 59099
+    },
+    {
+      "icon_id": "705335",
+      "name": "负载均衡",
+      "font_class": "fuzaijunheng",
+      "unicode": "e62b",
+      "unicode_decimal": 58923
+    },
+    {
+      "icon_id": "741753",
+      "name": "虚拟IPS",
+      "font_class": "xuniips",
+      "unicode": "ea5d",
+      "unicode_decimal": 59997
+    },
+    {
+      "icon_id": "742131",
+      "name": "虚拟IPS",
+      "font_class": "xuniips1",
+      "unicode": "ea67",
+      "unicode_decimal": 60007
+    },
+    {
+      "icon_id": "763151",
+      "name": "防火墙",
+      "font_class": "fanghuoqiang37",
+      "unicode": "e728",
+      "unicode_decimal": 59176
+    },
+    {
+      "icon_id": "763152",
+      "name": "弹性负载均衡",
+      "font_class": "vlb",
+      "unicode": "e729",
+      "unicode_decimal": 59177
+    },
+    {
+      "icon_id": "765778",
+      "name": "血糖",
+      "font_class": "shouye",
+      "unicode": "e636",
+      "unicode_decimal": 58934
+    },
+    {
+      "icon_id": "822307",
+      "name": "水渍损失险",
+      "font_class": "shuizisunshixian",
+      "unicode": "e6d6",
+      "unicode_decimal": 59094
+    },
+    {
+      "icon_id": "849430",
+      "name": "入侵检测",
+      "font_class": "ruqinjiance",
+      "unicode": "e65c",
+      "unicode_decimal": 58972
+    },
+    {
+      "icon_id": "1415509",
+      "name": "交换机",
+      "font_class": "jiaohuanji",
+      "unicode": "e836",
+      "unicode_decimal": 59446
+    },
+    {
+      "icon_id": "1909038",
+      "name": "警报",
+      "font_class": "jingwuicon_svg-",
+      "unicode": "e65b",
+      "unicode_decimal": 58971
+    },
+    {
+      "icon_id": "1994758",
+      "name": "tomcat",
+      "font_class": "tomcat1",
+      "unicode": "e62c",
+      "unicode_decimal": 58924
+    },
+    {
+      "icon_id": "2045793",
+      "name": "交换机",
+      "font_class": "jiaohuanji1",
+      "unicode": "e62f",
+      "unicode_decimal": 58927
+    },
+    {
+      "icon_id": "2061691",
+      "name": "oracle数据库",
+      "font_class": "oracleshujuku",
+      "unicode": "e630",
+      "unicode_decimal": 58928
+    },
+    {
+      "icon_id": "2080056",
+      "name": "防火墙",
+      "font_class": "fanghuoqiang",
+      "unicode": "e648",
+      "unicode_decimal": 58952
+    },
+    {
+      "icon_id": "2268414",
+      "name": "服务器",
+      "font_class": "fuwuqi",
+      "unicode": "e631",
+      "unicode_decimal": 58929
+    },
+    {
+      "icon_id": "2269861",
+      "name": "服务器",
+      "font_class": "fuwuqi1",
+      "unicode": "e632",
+      "unicode_decimal": 58930
+    },
+    {
+      "icon_id": "2271248",
+      "name": "空调",
+      "font_class": "kongtiao",
+      "unicode": "e67d",
+      "unicode_decimal": 59005
+    },
+    {
+      "icon_id": "2611804",
+      "name": "云数据库",
+      "font_class": "yunshujuku",
+      "unicode": "e744",
+      "unicode_decimal": 59204
+    },
+    {
+      "icon_id": "3102725",
+      "name": "电池",
+      "font_class": "dianchi1",
+      "unicode": "e633",
+      "unicode_decimal": 58931
+    },
+    {
+      "icon_id": "3172491",
+      "name": "Redis",
+      "font_class": "Redis",
+      "unicode": "e6a2",
+      "unicode_decimal": 59042
+    },
+    {
+      "icon_id": "3207730",
+      "name": "电流",
+      "font_class": "icon-current",
+      "unicode": "e634",
+      "unicode_decimal": 58932
+    },
+    {
+      "icon_id": "3234690",
+      "name": "oracle数据库",
+      "font_class": "oracleshujuku1",
+      "unicode": "e635",
+      "unicode_decimal": 58933
+    },
+    {
+      "icon_id": "3447389",
+      "name": "DNS-修改",
+      "font_class": "DNS-xiugai",
+      "unicode": "e637",
+      "unicode_decimal": 58935
+    },
+    {
+      "icon_id": "3831509",
+      "name": "物理服务器",
+      "font_class": "wulifuwuqi",
+      "unicode": "e6a8",
+      "unicode_decimal": 59048
+    },
+    {
+      "icon_id": "3865221",
+      "name": "电池",
+      "font_class": "dianchi2",
+      "unicode": "e638",
+      "unicode_decimal": 58936
+    },
+    {
+      "icon_id": "5387381",
+      "name": "导出",
+      "font_class": "daochu",
+      "unicode": "eabf",
+      "unicode_decimal": 60095
+    },
+    {
+      "icon_id": "7408261",
+      "name": "导出",
+      "font_class": "daochu1",
+      "unicode": "e623",
+      "unicode_decimal": 58915
+    },
+    {
       "icon_id": "18169761",
       "name": "数据库,数据",
       "font_class": "database",

@@ -234,8 +234,34 @@ global.openDetail = (resId, resType, proxy) => {
             lyaui.commonCols.detailPage(resId, resType, editFlag, provider, name, ip, resTypeName, adminName, manageIp, collProtocol);
         }
     });
+}
 
-
+/**
+ * 打开报表
+ * <p>
+ * 作者： Wang
+ * 时间：2021/12/14 21:08
+ * @param code 报表code
+ * @param parans map参数  key：参数key value：参数值
+ */
+global.openReport = (code, parans) =>{
+
+    let arr =[];
+    if(Object.keys(parans).length > 0){
+        for (const key in parans) {
+            let val = parans[key];
+            if(!val){
+                val = '';
+            }
+            arr.push(`${key}=${val}`);
+        }
+    }
+    // 报表URL
+    var url =  sessionStorage.getItem('jimuReport') + `/page/${code}?access_token=${localStorage.getItem('access_token')}`;
+    if(arr.length > 0){
+        url += "&" + arr.join('&')
+    }
+    global.openBlankWindow(url);
 }
 
 /**

@@ -395,6 +395,35 @@
     flex-wrap: nowrap;
     align-items: center;
 }
+.scrollbar{
+
+}
+.scrollbar::-webkit-scrollbar {
+    /*滚动条整体样式*/
+    width : 10px;  /*高宽分别对应横竖滚动条的尺寸*/
+    height: 1px;
+}
+.scrollbar::-webkit-scrollbar-thumb {
+    /*滚动条里面小方块*/
+    border-radius   : 10px;
+    background-color: skyblue;
+    background-image: -webkit-linear-gradient(
+            45deg,
+            rgba(255, 255, 255, 0.2) 25%,
+            transparent 25%,
+            transparent 50%,
+            rgba(255, 255, 255, 0.2) 50%,
+            rgba(255, 255, 255, 0.2) 75%,
+            transparent 75%,
+            transparent
+    );
+}
+.scrollbar::-webkit-scrollbar-track {
+    /*滚动条里面轨道*/
+    box-shadow   : inset 0 0 5px rgba(0, 0, 0, 0.2);
+    background   : #ededed;
+    border-radius: 10px;
+}
 
 .layout2 .right-item .text div {
     margin-left: 5px;

+<div>
+    <!--<el-steps :space="'20%'" :active="1" simple>
+        <el-step   title="数据库" v-for="i in 3">
+            <template #icon>
+                &lt;!&ndash;<img src="/src/style/img/restypeimg/DATABASE_REDIS.png" />&ndash;&gt;
+                <i class="iconfont icon-database" />
+            </template>
+        </el-step>
+    </el-steps>-->
+
+
+    <el-steps :active="3" align-center>
+        <el-step title="Step 1" description="Some description" v-for="i in 3">
+            <template #icon>
+                <i class="iconfont icon-database" />
+                <!--<img src="/src/style/img/restypeimg/DATABASE_REDIS.png" style="background: black;border-radius: 5px;width: 80%;height: 80%;"/>-->
+            </template>
+        </el-step>
+
+    </el-steps>
+</div>

+
+export default {
+    name: 'netLinks',
+    template: '',
+    components: {
+
+    },
+    data() {
+        return {}
+    },
+    props: {
+        faultType:{
+            type: String,
+            default:'NPM'
+        },
+        faultNo:{
+            type: String,
+            default:''
+        }
+    },
+    setup(props, {attrs, slots, emit}) {
+        let width = Vue.ref(window.innerWidth*0.8 - 190);
+        const {proxy} = Vue.getCurrentInstance();
+        let list = Vue.ref([
+            {
+                content: 'Custom icon',
+                timestamp: '2018-04-12 20:46',
+                size: 'large',
+                type: 'primary',
+            },
+            {
+                content: 'Custom color',
+                timestamp: '2018-04-03 20:46',
+                color: '#0bbd87',
+            },
+            {
+                content: 'Custom size',
+                timestamp: '2018-04-03 20:46',
+                size: 'large',
+            },
+            {
+                content: 'Custom hollow',
+                timestamp: '2018-04-03 20:46',
+                type: 'primary',
+                hollow: true,
+            },
+            {
+                content: 'Default node',
+                timestamp: '2018-04-03 20:46',
+            },
+        ]);
+
+
+        // 监听编辑状态
+        Vue.watch(() => props.faultNo, (newValue, oldVlaue) => {
+
+        });
+
+        // 挂载完
+        Vue.onMounted(() => {
+        })
+
+        return {
+            width,
+            list
+        }
+    }
+}

@@ -15,7 +15,9 @@
             </div>
             <div class="btns" style="justify-content: left;padding-left: 0px">
                 <el-form-item>
-                    <el-button type="primary" @click="getPage">搜索</el-button>
+                    <el-button type="primary" @click="getPage">
+                        搜索
+                    </el-button>
                 </el-form-item>
             </div>
         </div>
@@ -44,15 +46,115 @@
                @hidedialog="closeFaultDetailDialog" :showFooter="false">
         <template v-slot>
             <div style="text-align: left;height:720px;max-height:720px;overflow-y: auto">
+                <div style="text-align: right;padding-right: 10px">
+                    <el-button type="text" size="small"
+                               @click.prevent="$global.openReport('GZZDS',{faultNumber:faultDetailDetailInfo.faultNo})">
+                        <i class="iconfont iconfont-small icon-icon-rizhi"/> 报表
+                    </el-button>
+                </div>
                 <el-timeline>
-                    <el-timeline-item v-for="item in faultDetailDetailInfo.items" center :timestamp="item.faultTypeName" placement="top" :color="item.color" :hollow="true">
+                    <el-timeline-item v-for="item in faultDetailDetailInfo.items" center :timestamp="item.faultTypeName"
+                                      placement="top" :color="item.color" :hollow="true">
                         <el-card>
-                           <!-- <result-item :faultType="item.faultType" :faultNo="faultDetailDetailInfo.faultNo"></result-item>-->
-                            <component v-bind:is="item.components" :faultType="item.faultType" :faultNo="faultDetailDetailInfo.faultNo" />
+                            <component v-bind:is="item.components" :faultType="item.faultType"
+                                       :faultNo="faultDetailDetailInfo.faultNo"/>
                         </el-card>
                     </el-timeline-item>
                 </el-timeline>
             </div>
         </template>
     </cm-dialog>
+
+    <!-- 处理弹框 -->
+    <cm-dialog title="故障处理" width="60%" :showDialogVisible="handleInfoDialog"
+               @hidedialog="showHandelInfoDialog" :showFooter="false">
+        <template v-slot>
+            <el-form ref="handleForm" :model="handleInfoForm" :rules="handleInfoRules" label-width="120px">
+
+                <el-row :gutter="5">
+                    <el-col :span="12">
+                        <el-form-item label="故障分类" prop="faulttype">
+                            <el-input v-model="handleInfoForm.faulttype" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="发生时间" prop="createTime">
+                            <el-input v-model="handleInfoForm.createTime" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row :gutter="5">
+                    <el-col :span="12">
+                        <el-form-item label="当前状态" prop="faultState">
+                            <el-input v-model="handleInfoForm.faultState" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="持续时长" prop="duration">
+                            <el-input v-model="handleInfoForm.duration" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row :gutter="5">
+                    <el-col :span="12">
+                        <el-form-item label="故障主体" prop="faultBody">
+                            <el-input v-model="handleInfoForm.faultBody" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="影响范围" prop="influencescope">
+                            <el-input v-model="handleInfoForm.influencescope" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row :gutter="5">
+                    <el-col :span="12">
+                        <el-form-item label="处理结果" prop="solveway">
+                            <el-radio-group v-model="handleInfoForm.solveway">
+                                <el-radio label="未解决"></el-radio>
+                                <el-radio label="已解决"></el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="处理时间" prop="solvetime">
+                            <el-date-picker
+                                    v-model="handleInfoForm.solvetime"
+                                    type="datetime"
+                                    format="YYYY/MM/DD HH:mm:ss"
+                                    value-format="YYYY-MM-DD HH:mm:ss"
+                                    placeholder="请选择处理时间"
+                                    style="width: 100%"
+                            ></el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row :gutter="5">
+                    <el-col :span="24">
+                        <el-form-item label="原因分析" prop="reason">
+                            <el-input v-model="handleInfoForm.reason" type="textarea"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+
+                <el-row :gutter="5">
+                    <el-col :span="24">
+                        <el-form-item label="处理方案" prop="solution">
+                            <el-input v-model="handleInfoForm.solution" type="textarea"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-form-item>
+                    <el-button @click="showHandleInfoDialog(false)">取消</el-button>
+                    <el-button type="primary" @click="saveHandleInfo('handleForm')">保存</el-button>
+                </el-form-item>
+            </el-form>
+        </template>
+    </cm-dialog>
 </div>

+/**
+ * 故障信息
+ * <p>
+ * 作者： Wang
+ * 时间：2021/12/14 22:30
+ */
 const faultDetail = () => {
-    const { proxy } = Vue.getCurrentInstance();
+    const {proxy} = Vue.getCurrentInstance();
     let showFaultDetailDialog = Vue.ref(false);
     let faultDetailDialogTitle = Vue.ref('');
     let faultDetailDetailInfo = Vue.ref({
-        faultNo:'',
-        items:[{
-            faultType:'BASE',
-            faultTypeName:'基础',
-            components:'result-item',
-            color:'#67C23A'
-        },{
-            faultType:'NETLINK',
-            faultTypeName:'网络链路',
-            components:'result-item',
-            color:'#409EFF'
-        },{
-            faultType:'NPM',
-            faultTypeName:'NPM',
-            components:'result-item',
-            color:'#E6A23C'
-        },{
-            faultType:'APM',
-            faultTypeName:'APM',
-            components:'result-item',
-            color:'#F56C6C'
+        faultNo: '',
+        items: [{
+            faultType: 'BASE',
+            faultTypeName: '基础',
+            components: 'result-item',
+            color: '#67C23A'
+        }, {
+            faultType: 'NETLINK',
+            faultTypeName: '网络链路',
+            components: 'netLinks',
+            color: '#409EFF'
+        }, {
+            faultType: 'NPM',
+            faultTypeName: 'NPM',
+            components: 'result-item',
+            color: '#E6A23C'
+        }, {
+            faultType: 'APM',
+            faultTypeName: 'APM',
+            components: 'result-item',
+            color: '#F56C6C'
         }]
     });
 
@@ -41,14 +47,14 @@ const faultDetail = () => {
      * 设置弹框信息
      * @param row
      */
-    let settingDetail = (row) =>{
+    let settingDetail = (row) => {
         // 设置标题
         faultDetailDialogTitle.value = `${row.faultBody}诊断报告`;
-
+        // 当前故障编号
         faultDetailDetailInfo.value.faultNo = row.faultNo;
-
     }
 
+
     return {
         settingDetail,
         showFaultDetailDialog,
@@ -57,12 +63,126 @@ const faultDetail = () => {
         faultDetailDetailInfo
     }
 }
+
+/**
+ * 处理弹框
+ * <p>
+ * 作者： Wang
+ * 时间：2021/12/14 22:29
+ */
+const handleInfo = () => {
+    const {proxy} = Vue.getCurrentInstance();
+    let handleInfoDialog = Vue.ref(false);
+    let handleInfoForm = Vue.ref({
+        faulttype: '',
+        createTime: '',
+        faultState: '',
+        duration: '',
+        faultBody: '',
+        influencescope: '',
+        solveway: '',
+        solvetime: '',
+        reason: '',
+        solution: ''
+    })
+
+    let handleInfoRules = Vue.ref({
+        solveway: [
+            {
+                required: true,
+                message: '请选择处理结果',
+                trigger: 'change',
+            },
+        ],
+        solvetime: [
+            {
+                type: 'date',
+                required: true,
+                message: '请选择处理时间',
+                trigger: 'change',
+            },
+        ],
+        reason: [
+            {
+                required: true,
+                message: '请填写原因分析',
+                trigger: 'blur',
+            },
+            {
+                min: 5,
+                max: 100,
+                message: '原因分析内容在5到100个字符之间',
+                trigger: 'blur',
+            }
+        ],
+        solution: [
+            {
+                required: true,
+                message: '请填写处理方案',
+                trigger: 'blur',
+            },
+            {
+                min: 5,
+                max: 100,
+                message: '处理方案内容在5到100个字符之间',
+                trigger: 'blur',
+            }
+        ]
+    })
+
+
+    let handleClick = (row, index) => {
+        // 点击弹框
+        showHandleInfoDialog(true);
+        handleInfoForm.value = row;
+        //Object.assign(handleInfoForm.value,row);
+    }
+
+    /**
+     * 保存处理结果
+     * <p>
+     * 作者： Wang
+     * 时间：2021/12/14 23:05
+     */
+    let saveHandleInfo = (key) => {
+        proxy.$refs[key].validate((valid) => {
+            if (valid) {
+                alert('submit!')
+            } else {
+                console.log('error submit!!')
+                return false
+            }
+        })
+    }
+
+    /**
+     * 关闭弹框
+     * <p>
+     * 作者： Wang
+     * 时间：2021/12/13 20:14
+     */
+    let showHandleInfoDialog = (flg) => {
+        handleInfoDialog.value = flg;
+    }
+
+    return {
+        handleInfoForm,
+        handleInfoRules,
+        handleClick,
+        handleInfoDialog,
+        showHandleInfoDialog,
+        saveHandleInfo
+    }
+}
 export default {
     name: 'resIndex',
     template: '',
     components: {
-        'result-item':Vue.defineAsyncComponent(
+        'result-item': Vue.defineAsyncComponent(
             () => myImport('components/page/faultDiagnosis/result/item/index')
+        ),
+        'netLinks': Vue.defineAsyncComponent(
+            () => myImport('components/page/faultDiagnosis/result/netLinks/index')
         )
     },
     data() {
@@ -96,6 +216,9 @@ export default {
                     settingDetail(row);
                 }
             }, {
+                prop: 'faulttype',
+                label: '故障分类'
+            }, {
                 prop: 'createTime',
                 label: '发生时间'
             }, {
@@ -141,9 +264,6 @@ export default {
             });
         }
 
-        let handleClick = (row, index) => {
-
-        }
 
         /**
          * 分页切换
@@ -166,6 +286,15 @@ export default {
             closeFaultDetailDialog
         } = faultDetail();
 
+        const {
+            handleInfoForm,
+            handleInfoRules,
+            handleClick,
+            handleInfoDialog,
+            showHandleInfoDialog,
+            saveHandleInfo
+        } = handleInfo();
+
         // 挂载完
         Vue.onMounted(() => {
             // 初始化加载页面
@@ -178,14 +307,22 @@ export default {
             list,
             getPage,
             getPageInfo,
-            handleClick,
 
-            // 告警需求弹框
+            // 告警弹框
             settingDetail,
             showFaultDetailDialog,
             faultDetailDialogTitle,
             faultDetailDetailInfo,
-            closeFaultDetailDialog
+            closeFaultDetailDialog,
+
+            // 处理弹框
+            handleInfoForm,
+            handleInfoRules,
+            handleClick,
+            handleInfoDialog,
+            showHandleInfoDialog,
+            saveHandleInfo
+
         }
     }
 }

@@ -67,4 +67,86 @@
             </div>
         </template>
     </cm-dialog>
+
+    <cm-dialog title="故障处理" width="60%" :showDialogVisible="handleInfoDialog"
+               @hidedialog="showHandelInfoDialog" :showFooter="false">
+        <template v-slot>
+            <el-form ref="handleForm" :model="handleInfoForm"  :rules="handleInfoRules" label-width="120px">
+
+                <el-row :gutter="5">
+                    <el-col :span="12">
+                        <el-form-item label="故障分类" prop="name">
+                            <el-input v-model="handleInfoForm.name"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="发生时间" prop="name">
+                            <el-input v-model="handleInfoForm.name"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row :gutter="5">
+                    <el-col :span="12">
+                        <el-form-item label="当前状态" prop="name">
+                            <el-input v-model="handleInfoForm.name"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="持续时长" prop="name">
+                            <el-input v-model="handleInfoForm.name"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row :gutter="5">
+                    <el-col :span="12">
+                        <el-form-item label="故障主体" prop="name">
+                            <el-input v-model="handleInfoForm.name"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="影响范围" prop="name">
+                            <el-input v-model="handleInfoForm.name"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row :gutter="5">
+                    <el-col :span="12">
+                        <el-form-item label="处理结果" prop="name">
+                            <el-input v-model="handleInfoForm.name"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="处理时间" prop="name">
+                            <el-input v-model="handleInfoForm.name"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row :gutter="5">
+                    <el-col :span="24">
+                        <el-form-item label="原因分析" prop="desc">
+                            <el-input v-model="handleInfoForm.desc" type="textarea"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+
+                <el-row :gutter="5">
+                    <el-col :span="24">
+                        <el-form-item label="处理方案" prop="desc">
+                            <el-input v-model="handleInfoForm.desc" type="textarea"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-form-item>
+                    <el-button @click="showHandleInfoDialog(false)">取消</el-button>
+                    <el-button type="primary" @click="saveHandleInfo('handleForm')">保存</el-button>
+                </el-form-item>
+            </el-form>
+        </template>
+    </cm-dialog>
 </div>

+/**
+ * 故障信息
+ * <p>
+ * 作者： Wang
+ * 时间：2021/12/14 22:30
+ */
 const faultDetail = () => {
     const {proxy} = Vue.getCurrentInstance();
     let showFaultDetailDialog = Vue.ref(false);
@@ -19,6 +25,131 @@ const faultDetail = () => {
         closeFaultDetailDialog
     }
 }
+
+
+/**
+ * 处理弹框
+ * <p>
+ * 作者： Wang
+ * 时间：2021/12/14 22:29
+ */
+const handleInfo = () => {
+    const {proxy} = Vue.getCurrentInstance();
+    let handleInfoDialog = Vue.ref(false);
+    let handleInfoForm = Vue.ref({
+        name: '',
+        region: '',
+        date1: '',
+        date2: '',
+        delivery: false,
+        type: [],
+        resource: '',
+        desc: '',
+    })
+
+    let handleInfoRules = Vue.ref({
+        name: [
+            {
+                required: true,
+                message: 'Please input Activity name',
+                trigger: 'blur',
+            },
+            {
+                min: 3,
+                max: 5,
+                message: 'Length should be 3 to 5',
+                trigger: 'blur',
+            },
+        ],
+        region: [
+            {
+                required: true,
+                message: 'Please select Activity zone',
+                trigger: 'change',
+            },
+        ],
+        date1: [
+            {
+                type: 'date',
+                required: true,
+                message: 'Please pick a date',
+                trigger: 'change',
+            },
+        ],
+        date2: [
+            {
+                type: 'date',
+                required: true,
+                message: 'Please pick a time',
+                trigger: 'change',
+            },
+        ],
+        type: [
+            {
+                type: 'array',
+                required: true,
+                message: 'Please select at least one activity type',
+                trigger: 'change',
+            },
+        ],
+        resource: [
+            {
+                required: true,
+                message: 'Please select activity resource',
+                trigger: 'change',
+            },
+        ],
+        desc: [
+            {
+                required: true,
+                message: 'Please input activity form',
+                trigger: 'blur',
+            },
+        ],
+    })
+
+
+    let handleClick = (row, index) => {
+        // 点击弹框
+        showHandleInfoDialog(true);
+    }
+
+    /**
+     * 保存处理结果
+     * <p>
+     * 作者： Wang
+     * 时间：2021/12/14 23:05
+     */
+    let saveHandleInfo = (key) => {
+        proxy.$refs[key].validate((valid) => {
+            if (valid) {
+                alert('submit!')
+            } else {
+                console.log('error submit!!')
+                return false
+            }
+        })
+    }
+
+    /**
+     * 关闭弹框
+     * <p>
+     * 作者： Wang
+     * 时间：2021/12/13 20:14
+     */
+    let showHandleInfoDialog = (flg) => {
+        handleInfoDialog.value = flg;
+    }
+
+    return {
+        handleInfoForm,
+        handleInfoRules,
+        handleClick,
+        handleInfoDialog,
+        showHandleInfoDialog,
+        saveHandleInfo
+    }
+}
 export default {
     name: 'resIndex',
     template: '',
@@ -79,10 +210,6 @@ export default {
             });
         }
 
-        let handleClick = (row, index) => {
-
-        }
-
         /**
          * 分页切换
          * <p>
@@ -103,6 +230,15 @@ export default {
             closeFaultDetailDialog
         } = faultDetail();
 
+        const {
+            handleInfoForm,
+            handleInfoRules,
+            handleClick,
+            handleInfoDialog,
+            showHandleInfoDialog,
+            saveHandleInfo
+        } = handleInfo();
+
         // 挂载完
         Vue.onMounted(() => {
             // 初始化加载页面
@@ -115,12 +251,19 @@ export default {
             list,
             getPage,
             getPageInfo,
-            handleClick,
 
             // 告警需求弹框
             showFaultDetailDialog,
             faultDetailDialogTitle,
-            closeFaultDetailDialog
+            closeFaultDetailDialog,
+
+            // 处理按钮点击
+            handleInfoForm,
+            handleInfoRules,
+            handleClick,
+            handleInfoDialog,
+            showHandleInfoDialog,
+            saveHandleInfo
         }
     }
 }

@@ -62,6 +62,7 @@
                                             <div v-if="list.length == 0" class="text">
                                                 <span>暂无数据</span>
                                             </div>
+                                            <div class="scrollbar " style="display: flex;flex-wrap: wrap;align-items: center;overflow-y: auto;height: 100%;">
                                                 <div v-else v-for="d in list" class="text">
                                                     <div class="dd"></div>
                                                     <div class="name">{{d.name}}</div>
@@ -70,6 +71,7 @@
                                                 </div>
                                             </div>
                                         </div>
+                                    </div>
                                 </el-popover>
                             </div>
                         </li>