From ad8e8cb85dddfaca1f5b35e144565c48d49ce1f8 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 9 Sep 2020 15:32:44 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/project/image/dashed0.png          | Bin 540 -> 0 bytes
 .../common/project/image/dashed1.png          | Bin 576 -> 0 bytes
 .../common/project/image/dashed2.png          | Bin 475 -> 0 bytes
 .../common/project/image/dashed3.png          | Bin 501 -> 0 bytes
 .../common/project/image/dashed4.png          | Bin 512 -> 0 bytes
 .../common/project/popData/alertTable.vue     |  97 ++++++++++++++++++
 .../common/project/projectFacade.vue          |   6 +-
 .../components/common/project/visNetwork.vue  |  10 +-
 8 files changed, 107 insertions(+), 6 deletions(-)
 delete mode 100644 nezha-fronted/src/components/common/project/image/dashed0.png
 delete mode 100644 nezha-fronted/src/components/common/project/image/dashed1.png
 delete mode 100644 nezha-fronted/src/components/common/project/image/dashed2.png
 delete mode 100644 nezha-fronted/src/components/common/project/image/dashed3.png
 delete mode 100644 nezha-fronted/src/components/common/project/image/dashed4.png

diff --git a/nezha-fronted/src/components/common/project/image/dashed0.png b/nezha-fronted/src/components/common/project/image/dashed0.png
deleted file mode 100644
index b40b70cf89d1c56ee68d72f8ed8d18d2a0ce0c8e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 540
zcmV+%0^|LOP)<h;3K|Lk000e1NJLTq0046U000UI1^@s6hi+l-00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&0kKI$K~z{r?bSz9
z0znW3VE?{iz<^l+6*I<zD3~zZJ$kkZm7K%E@|@SbBjsOMx2wJjwYxLZUGo@2P`;^P
zm_Djtm_Djtm_8~QX1&=#E?+^eP{k(|sfI5q)$lFq$d^^2+(4nCid1c)M71W$q9rPI
zRc*9Ijm%nHPqaE{w7R0%R;^C&SDU&HI@EK}6@B!a5vM;8eHyqJkgHsGD27Aj_mW}0
zy?<cq@>Rs?;sr5J^qii>=9$_!eG=<*LRqX)GK<yZqgXk%9<Y3*mJaD2i=M~<-667n
zhXrwq`8_p9yOhB!B{B#n(g^RQG4tyN)7xrli>@(AaTSWE5Q?QRA+9hU{Y!s0&+s`z
z-ZSs>JHq=m*)_So?8EGbd*a@>NAB0|o#)W=n6vSG#-ceZ&&=~nAH1HB?Un5v`zTCL
z*<1G6_T0{ZbS`F2WM=hmW0n_{x78(cd+lxJ&E^g75A?=U&mm0$CIb_KNx{Tma<sde
zA~sQM$}~ulXOu=vCMJ|kt4f_T!8Fk{;h1zxykb?;Pm<6iqD@C8rScNg2>vsDRKYNP
eRKYNPQ@{^Hv}ghgj8$*|0000<MNUMnLSTYoqVf6w

diff --git a/nezha-fronted/src/components/common/project/image/dashed1.png b/nezha-fronted/src/components/common/project/image/dashed1.png
deleted file mode 100644
index cf6dfb422ca34a7d5650471fcc6bf2a3da390e13..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 576
zcmV-G0>Ax<P)<h;3K|Lk000e1NJLTq0046U000UI1^@s6hi+l-00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&0o6%FK~z{r?UY$l
z6G0S(`TL@RD=w&rA}DT@FQ5pTNmv2|*<vMO(^3doX5W&h<Gt7Fro&H|nuo9I<V(^$
z)3^Ez_4|F~WP^N|86qEMh8P%T*Y)x1tc~A<?FQQ0UVuN%uHaBs-t|MAwQQWX9LdUi
zL5OC@!9~ZV9BJ=|5!$vV1YxXw7{#(5@55R7C{AQuhO_c<lF<JnStCwT?UOW>-^E0l
z_O$Qydh(g!tbEoO7-r??DJDOy2$kxo_FL5xOw5(=Y_5pSgA?sH_K)%8gC%fQzD)V?
zy8<2&<-JS4zITKNv)_dE-6QSSb`Npy^)j)9)ty7_SAH~bXZowaS@{y>TT_b|B}&_u
zzPMe-%@?1AVx_LVwN=CL^95oa1<J~EzBVy0nBJ<?aD8$CHwepEhu0r@`30jyiL&zi
zJhxvh5`)jVy3@ejnI*w|FMi+qZ<aAetQqIP=kxIGccDyKc|P0m_XUh!Ip@uTV?6z6
z5&!3s*DS%e)x5DOWxnMJ-Fowev*YGq_&epfDST=mZXvTlI6Gb_ZDux3K)LJq=n!T@
zadWl09^uM*%6rsI&9;Mc!fZg!e=lr-_sEBtA@X5nh<unCA|GaE=;I$2PFdLUD1Em8
O0000<MNUMnLSTaX;uUfL

diff --git a/nezha-fronted/src/components/common/project/image/dashed2.png b/nezha-fronted/src/components/common/project/image/dashed2.png
deleted file mode 100644
index 8eecde4642607ee78d50b79b6a7bf95ae5b3a971..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 475
zcmV<10VMv3P)<h;3K|Lk000e1NJLTq0046U000UI1^@s6hi+l-00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&0dPq~K~z{r?Uidw
z0znvs`};)&2^A%zC>cdYfgpt@ikB{yT3Je#mncfq+HLO_PczeeTjvj~`@n(2J21Pm
zhdH}|0N)UV=_7(LeMAtZk6>ZSijMc;H$I4DRc8ycP&5NyV;RGV%)AKAFfox-Cf%_3
z)Qe%-?0LVc0n@Vi)Qe?1Y#-gUU^@<<dU0Ksth;cC-0750=LZ&Mqy2_>s)AUmjCy;(
z7G_av^|5nYWV(Io^Qo8WV-MTOJhl$=s5X0i>gDR8i}n2+(K+$2eCp-m?geX!4Ayot
z%!?@3J6MUGVwtE!yoh4$8H<rLmZE9qMU)#Itj5onD#VMR?-WX85!%b*@?LxndfttL
z95#urn_WKjaznmfI9WjWsKC4knn&cMgeXz1HJI<3os!#2C4$~`+6q+kwu_+anr=cR
zqFw}TB8jx1q-ey88;dsE_(#Eri0&!kzbPerjwIG@!9UYS1Y!D!AWYu?`~grXzMEAT
RqTT=i002ovPDHLkV1l|J(c%CA

diff --git a/nezha-fronted/src/components/common/project/image/dashed3.png b/nezha-fronted/src/components/common/project/image/dashed3.png
deleted file mode 100644
index 016cd9f36000df8a4d931124d8a3f63144751bec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 501
zcmV<R0Sf+!P)<h;3K|Lk000e1NJLTq0046U000UI1^@s6hi+l-00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&0g6dPK~z{r?UY$h
z!ax{B{rmc$KInr!hzXjAagDfufds=QD#*TCS;~&=OIfco)8WC4{R2%;a?+%?oqo-o
zb^`{w!6;Kl7-i}Rqf8xPl&K?FneI>)o2EzR*6|b5^O<EA{D(K3!?xLuos(zgF3}hH
z;;G1MRKnhwgXm=LTbu~QB%X@A$MZP2a4`=rRX-AWo{9vM1svVDVY*%GK`2$^sYp0o
zg4ycB$vxGN(+58ynG#P$qB$8BTY&h6bGvFhSLUfmLaN}(5oBIFRg+Scry}Wm4R@|E
ztS@UL$P{Wk70DLsuz6$LIPAVSa;3)KFLSk`uCOH1qZW(h64Tj&IA<!;Ip&KcPeo?)
z1%_jVIiQXdcApj#Wrj|F#BBGdLyVOvPetgujdmaPA8HRZB7KGy{ow?1y+drHM6I>a
z8;p4>Lg)A{w}?$hvMQZRi&l5Y%Ah4tQ~4^IodHip=<G4FIaFmtvod=REvn5f+pM8f
rfo)`Jg`6{fvpT{kQ%4wO>IUE!vJI~HyNYP000000NkvXXu0mjf?HJe#

diff --git a/nezha-fronted/src/components/common/project/image/dashed4.png b/nezha-fronted/src/components/common/project/image/dashed4.png
deleted file mode 100644
index 605ab7b01e8b97c80504e8ac324e411fe50a2b00..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 512
zcmV+b0{{JqP)<h;3K|Lk000e1NJLTq0046U000UI1^@s6hi+l-00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&0hLKaK~z{r?bPcp
zLUA0&asNIZ;DO5n*Tlp|8xbN?WXz@9N~sf-($VEqr;F<2e1GRVoBi|;oSpafdSai{
z_B}NOJIiDr(?Z$Dv{3djEtGvs3-#xi!P_{77xsjaMXxZrWIDS`@JcQee#Myc5aVQp
z_%K0MeYl9c@=EUVA&E)XF{WI8Os)GdEu3Ix;{;caDPGB4KPi~qJT(L`yA{A3aR)H(
z4&vrH%`3UP*c%+%=Wy(h5SE$K6GHgqomX=A@eJ0ymx61bTw(pd^q9!<O71C{!{*VA
zuyt&5`)`G4>VsEuF(r?k(=a@N$gkZXxko%*;Fa9J-^_lW^wA?dMt>Yox7$Oz^Nm)U
zbkHQN4s=83yUQy%dQGj-gjP3INliz^K>uS<db16+Qiocup~yZ<no!qUypq$5_sSJ3
z$bFWPWtjpg8Skz0O0KLmpyX62SrsXvh-Ai8sy28fN1yQ}ofpR;QRPD%k<e!zRN+g*
zLn0#{A`&6S!$uEWUaj&<&i<LTQ1&q`lzmLg1pELyWvD_7LlMjX0000<MNUMnLSTZR
Cs^$Cu

diff --git a/nezha-fronted/src/components/common/project/popData/alertTable.vue b/nezha-fronted/src/components/common/project/popData/alertTable.vue
index 83e943530..54fa06fba 100644
--- a/nezha-fronted/src/components/common/project/popData/alertTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/alertTable.vue
@@ -14,6 +14,21 @@
       <div class="right-box-title">Alert messages</div>
       <!-- end--标题-->
 
+      <!-- begin搜素框-->
+      <div class="top-tools">
+        <div class="top-tool-main-right" :class="{'top-tool-main-right-to-left': false}">
+          <div class="top-tool-search">
+            <search-input :searchMsg="searchMsg" @search="search" :bottomBox.inTransform="true"></search-input>
+          </div>
+          <!--<button type="button" @click="showExportDialog" :title="$t('overall.exportExcelLower')"-->
+                  <!--class="nz-btn nz-btn-size-normal nz-btn-style-light margin-l-20" id="alert-list-export">-->
+            <!--<i class="el-icon-download"></i>-->
+          <!--</button>-->
+        </div>
+        <div class="pagination-top pagination-top-hide display-none"></div>
+      </div>
+      <!-- end搜素框-->
+
       <!-- begin--表格-->
       <el-scrollbar class="right-box-form-box">
         <el-table
@@ -235,6 +250,58 @@
             width: 150
           },
         ],
+        searchMsg: { //给搜索框子组件传递的信息
+          zheze_none: true,
+          searchLabelList: [{
+            id: 1,
+            name: this.$t('alert.alertName'),
+            type: 'input',
+            label: 'alertName',
+            disabled: false
+          }, /*{
+            id: 3,
+            name: this.$t('alert.list.type'),
+            type: 'select',
+            label: 'alertType',
+            disabled: false
+          }, */{
+            id: 20,
+            name: this.$t('alert.severity'),
+            type: 'selectString',
+            label: 'severity',
+            disabled: false
+          }, {
+            id: 21,
+            name: this.$t('asset.asset'),
+            type: 'asset',
+            label: 'asset',
+            disabled: false
+          }, {
+            id:22,
+            name: this.$t('project.project.project'),
+            type: 'project',
+            label: 'project',
+            disabled: false
+          }, {
+            id:23,
+            name: this.$t('project.module.module'),
+            type: 'module',
+            label: 'module',
+            disabled: false
+          }, {
+            id:24,
+            name: this.$t('project.endpoint.endpoint'),
+            type: 'input',
+            label: 'endpointId',
+            disabled: false
+          }, {
+            id:25,
+            name: this.$t('alert.list.state'),
+            type: 'select',
+            label: 'alertMessageState',
+            disabled: false
+          }],
+        },
         tableData:[],
         loading:false,
         tableHeight:'100%',
@@ -350,6 +417,30 @@
       clickOutside() {
         this.esc(false);
       },
+      search(searchObj) {
+        let orderBy='';
+        if(this.searchLabel.orderBy){
+          orderBy=this.searchLabel.orderBy
+        }
+        this.searchLabel = {};
+        this.pageObj.pageNo = 1;
+        for (let item in searchObj) {
+          if (searchObj[item]) {
+            if (item == "alertMessageState") {
+              this.$set(this.searchLabel, "state", searchObj[item]);
+            } else{
+              this.$set(this.searchLabel, item, searchObj[item]);
+            }
+          }
+        }
+        if(orderBy){
+          this.$set(this.searchLabel, 'orderBy', orderBy);
+        }
+        this.getAlertList();
+      },
+      showExportDialog() {
+        this.importBox.show = true;
+      },
     },
 
   }
@@ -371,6 +462,12 @@
     left: 0;
     z-index: 11;
   }
+  .top-tools{
+    float: right;
+  }
+  /deep/ .top-tools>div{
+    margin-top: 3px;
+  }
   /* end--table*/
 </style>
 
diff --git a/nezha-fronted/src/components/common/project/projectFacade.vue b/nezha-fronted/src/components/common/project/projectFacade.vue
index 73bec71f3..f5769fcf1 100644
--- a/nezha-fronted/src/components/common/project/projectFacade.vue
+++ b/nezha-fronted/src/components/common/project/projectFacade.vue
@@ -100,9 +100,9 @@
           new Date(bus.computeTimezone(new Date().getTime()))
         ],
         projectInfo:{
-		      title:'Project information',
-          id:'1',
-          remark:'系统内置project，展示系统基础信息',
+		      title:'',
+          id:'',
+          remark:'',
           alertStat:[1,2,3],
           moduleMum:6,
           loading:true,
diff --git a/nezha-fronted/src/components/common/project/visNetwork.vue b/nezha-fronted/src/components/common/project/visNetwork.vue
index c265ea230..6a581bde3 100644
--- a/nezha-fronted/src/components/common/project/visNetwork.vue
+++ b/nezha-fronted/src/components/common/project/visNetwork.vue
@@ -36,7 +36,7 @@
           <div class="facade-top" v-if="!editVisNetwork">
             <div class="facade-top-left" v-loading="projectInfo.loading">
               <div class="facade-top-title">
-                {{projectInfo.title}}
+                Project information
               </div>
               <div>
                 <!--<span><span class="label">Id :</span>{{projectInfo.id}}</span>-->
@@ -57,7 +57,7 @@
                 <span><span class="label">Module Mum :</span>{{projectInfo.moduleMum}}</span>
               </div>
             </div>
-            <div class="facade-top-right" v-loading="projectInfo.loading">
+            <div class="facade-top-right" v-loading="projectInfo.loading" style="padding: 20px 20px 0 20px;height: calc(100% - 20px);">
               <div class="facade-top-title">
                 <span class="label" style="padding-left: 0;">Alert :</span>
                 {{total}}
@@ -79,7 +79,7 @@
                     {{projectInfo.alertStat[1] || 0}}
                   </div>
                 </div>
-                <div>
+                <div style="margin-bottom: 20px;">
                   <div class="content-low-title">
                     {{returnSeverityLabel('low')}}
                   </div>
@@ -104,6 +104,7 @@
             @reload="reload"
           >
           </topology>
+          <!--<other />-->
         </div>
       </div>
 
@@ -115,12 +116,14 @@
   import loading from "@/components/common/loading";
   import timePicker from '@/components/common/timePicker';
   import topology from './topology'
+  import other from './other'
   export default {
     name: 'visNetwork',
     components: {
       'loading': loading,
       'time-picker':timePicker,
       'topology':topology,
+      other
     },
     props:{
       chartIndex:{
@@ -390,6 +393,7 @@
     justify-content: space-between;
     color: #fff;
     text-align: center;
+    margin-bottom: 5px;
   }
   .facade-top-right-content > div > div:last-child{
     text-align: center;