Merge remote-tracking branch 'origin/codeCheck' into codeCheck

nezha-fronted/src/assets/css/font/iconfont.svg

@@ -20,6 +20,9 @@ Created by iconfont
   />
     <missing-glyph />
     
+    <glyph glyph-name="navmore" unicode="&#59035;" d="M735.390624 192 928.609376 192C945.945939 192 960 178.236326 960 160.609376L960-32.609376C960-49.945939 946.236326-64 928.609376-64L735.390624-64C718.054061-64 704-50.236326 704-32.609376L704 160.609376C704 177.945939 717.763674 192 735.390624 192ZM735.390624 512 928.609376 512C945.945939 512 960 498.236328 960 480.609375L960 287.390625C960 270.054061 946.236326 256 928.609376 256L735.390624 256C718.054061 256 704 269.763672 704 287.390625L704 480.609375C704 497.945939 717.763674 512 735.390624 512ZM735.390624 832 928.609376 832C945.945939 832 960 818.236328 960 800.609375L960 607.390625C960 590.054061 946.236326 576 928.609376 576L735.390624 576C718.054061 576 704 589.763672 704 607.390625L704 800.609375C704 817.945939 717.763674 832 735.390624 832ZM415.390625 192 608.609375 192C625.945939 192 640 178.236326 640 160.609376L640-32.609376C640-49.945939 626.236328-64 608.609375-64L415.390625-64C398.054061-64 384-50.236326 384-32.609376L384 160.609376C384 177.945939 397.763672 192 415.390625 192ZM415.390625 512 608.609375 512C625.945939 512 640 498.236328 640 480.609375L640 287.390625C640 270.054061 626.236328 256 608.609375 256L415.390625 256C398.054061 256 384 269.763672 384 287.390625L384 480.609375C384 497.945939 397.763672 512 415.390625 512ZM415.390625 832 608.609375 832C625.945939 832 640 818.236328 640 800.609375L640 607.390625C640 590.054061 626.236328 576 608.609375 576L415.390625 576C398.054061 576 384 589.763672 384 607.390625L384 800.609375C384 817.945939 397.763672 832 415.390625 832ZM95.390625 192 288.609375 192C305.945939 192 320 178.236326 320 160.609376L320-32.609376C320-49.945939 306.236328-64 288.609375-64L95.390625-64C78.054061-64 64-50.236326 64-32.609376L64 160.609376C64 177.945939 77.763672 192 95.390625 192ZM95.390625 512 288.609375 512C305.945939 512 320 498.236328 320 480.609375L320 287.390625C320 270.054061 306.236328 256 288.609375 256L95.390625 256C78.054061 256 64 269.763672 64 287.390625L64 480.609375C64 497.945939 77.763672 512 95.390625 512ZM95.390625 832 288.609375 832C305.945939 832 320 818.236328 320 800.609375L320 607.390625C320 590.054061 306.236328 576 288.609375 576L95.390625 576C78.054061 576 64 589.763672 64 607.390625L64 800.609375C64 817.945939 77.763672 832 95.390625 832ZM768-32.609376C768-14.697645 753.207834 0 735.390624 0L928.609376 0C910.697645 0 896-14.792166 896-32.609376L896 160.609376C896 142.697645 910.792166 128 928.609376 128L735.390624 128C753.302355 128 768 142.792166 768 160.609376L768-32.609376ZM768 287.390625C768 305.302355 753.207834 320 735.390624 320L928.609376 320C910.697645 320 896 305.207833 896 287.390625L896 480.609375C896 462.697645 910.792166 448 928.609376 448L735.390624 448C753.302355 448 768 462.792167 768 480.609375L768 287.390625ZM768 607.390625C768 625.302355 753.207834 640 735.390624 640L928.609376 640C910.697645 640 896 625.207833 896 607.390625L896 800.609375C896 782.697645 910.792166 768 928.609376 768L735.390624 768C753.302355 768 768 782.792167 768 800.609375L768 607.390625ZM448-32.609376C448-14.697645 433.207833 0 415.390625 0L608.609375 0C590.697645 0 576-14.792166 576-32.609376L576 160.609376C576 142.697645 590.792167 128 608.609375 128L415.390625 128C433.302355 128 448 142.792166 448 160.609376L448-32.609376ZM448 287.390625C448 305.302355 433.207833 320 415.390625 320L608.609375 320C590.697645 320 576 305.207833 576 287.390625L576 480.609375C576 462.697645 590.792167 448 608.609375 448L415.390625 448C433.302355 448 448 462.792167 448 480.609375L448 287.390625ZM448 607.390625C448 625.302355 433.207833 640 415.390625 640L608.609375 640C590.697645 640 576 625.207833 576 607.390625L576 800.609375C576 782.697645 590.792167 768 608.609375 768L415.390625 768C433.302355 768 448 782.792167 448 800.609375L448 607.390625ZM128-32.609376C128-14.697645 113.207833 0 95.390625 0L288.609375 0C270.697645 0 256-14.792166 256-32.609376L256 160.609376C256 142.697645 270.792167 128 288.609375 128L95.390625 128C113.302355 128 128 142.792166 128 160.609376L128-32.609376ZM128 287.390625C128 305.302355 113.207833 320 95.390625 320L288.609375 320C270.697645 320 256 305.207833 256 287.390625L256 480.609375C256 462.697645 270.792167 448 288.609375 448L95.390625 448C113.302355 448 128 462.792167 128 480.609375L128 287.390625ZM128 607.390625C128 625.302355 113.207833 640 95.390625 640L288.609375 640C270.697645 640 256 625.207833 256 607.390625L256 800.609375C256 782.697645 270.792167 768 288.609375 768L95.390625 768C113.302355 768 128 782.792167 128 800.609375L128 607.390625Z"  horiz-adv-x="1024" />
+
+    
     <glyph glyph-name="sort2" unicode="&#58994;" d="M917.333333 725.333333H405.333333c-23.466667 0-42.666667-19.2-42.666666-42.666666s19.2-42.666667 42.666666-42.666667h512c23.466667 0 42.666667 19.2 42.666667 42.666667s-19.2 42.666667-42.666667 42.666666M917.333333 426.666667H405.333333c-23.466667 0-42.666667-19.2-42.666666-42.666667s19.2-42.666667 42.666666-42.666667h512c23.466667 0 42.666667 19.2 42.666667 42.666667s-19.2 42.666667-42.666667 42.666667M917.333333 128H405.333333c-23.466667 0-42.666667-19.2-42.666666-42.666667s19.2-42.666667 42.666666-42.666666h512c23.466667 0 42.666667 19.2 42.666667 42.666666s-19.2 42.666667-42.666667 42.666667M170.666667 725.333333c-23.466667 0-42.666667-19.2-42.666667-42.666666v-448H81.066667c-29.866667 0-49.066667-29.866667-34.133334-53.333334l89.6-140.8c14.933333-23.466667 51.2-23.466667 66.133334 0l89.6 140.8c14.933333 23.466667-4.266667 53.333333-34.133334 53.333334H213.333333V682.666667c0 23.466667-19.2 42.666667-42.666666 42.666666"  horiz-adv-x="1024" />
 
     

nezha-fronted/src/components/common/header.vue

@@ -7,6 +7,18 @@
       active="1"
       unique-opened
     >
+      <el-submenu :index="'-3'" popper-class="nz-submenu" class="icon-menu-item">
+        <template slot="title">
+          <i class="nz-icon-navmore nz-icon"></i>
+        </template>
+        <template v-for="(item, index) in $store.state.linkData">
+          <el-menu-item :index="'0-' + index">
+            <div>
+              <span><a :href='item.url' class="nz-a" target="_blank" :title="item.url">{{item.name}}</a></span>
+            </div>
+          </el-menu-item>
+        </template>
+      </el-submenu>
       <el-submenu :index="'-1'" class="icon-menu-item" popper-class="display-none">
         <div slot="title" class="el-submenu__title" @click="cli()" >
           <i class="nz-icon nz-icon-cli"></i>
@@ -496,12 +508,22 @@
         console.info(this.activeIndex)
         //this.$router.go(-1);
       },
+      getLinkData(){
+        console.log('aaa');
+        this.$get('link').then(response=>{
+          console.log(response);
+          // this.linkData=response.data;
+          this.$store.commit('setLinkData',response.data);
+          console.log(this.$store)
+        });
+      },
     },
     mounted() {
       this.$i18n.locale = this.language;
       this.getUserData();
       this.getAssetData();
       this.getProjectList();
+      this.getLinkData();
       // 刷新后有高亮
       let activePath = this.$route.path.slice(1);
       this.activeIndex = activePath;
@@ -517,7 +539,7 @@
       if (window.history && window.history.pushState) {
         history.pushState(null, null, document.URL);
         window.addEventListener('popstate', this.cancel, false);
-      }
+      };
     },
     computed: {
       projectListReloadWatch() {
@@ -555,7 +577,7 @@
       currentProjectWatch(n,o){
         this.currentProject=n;
         this.activeItemIndex=n.id;
-      }
+      },
     },
     destroyed() {
       window.removeEventListener('popstate', this.cancel, false);
@@ -745,6 +767,10 @@
   .menu-create-title {
     font-size: 14px;
   }
+  a.nz-a{
+    color: inherit;
+    text-decoration:none;
+  }
   .header {
     position: relative;
     box-sizing: border-box;

nezha-fronted/src/components/common/language/cn.js

@@ -36,7 +36,7 @@ const cn = {
     unavailable: "不可用",
     available: "可用",
     createChart: "新增图表",
-    createProject: "新增项目",
+    createProject: "新增业务系统",
     createAsset: "新增资产",
     createAlertRule: "新增告警规则",
     createAccount: "新增用户名",
@@ -140,6 +140,9 @@ const cn = {
           },
           singleStat:{
             label:"SingleStat"
+          },
+          alertList:{
+            label:"告警列表"
           }
         },
         statisticsVal:{
@@ -161,6 +164,7 @@ const cn = {
         legendTip: "使用名称或表达式控制时间序列的名称。例如{{hostname}将替换为标签主机名的标签值。",
         option: "操作",
         alertParam:{
+          param:'参数',
           select:'选择',
           alertRule:'告警规则',
           level:'级别',
@@ -264,7 +268,7 @@ const cn = {
         }
       },
       project: {
-        project: "项目",
+        project: "业务系统",
         name: "名称",
         module: "组件",
         endpoint: "Endpoint"
@@ -345,6 +349,7 @@ const cn = {
     no: "否",
     deleteSuccess: "删除成功",
     saveSuccess: "保存成功",
+    addSuccess: "添加成功",
     duplicateSuccess: '复制成功', //"复制成功"
     coverSuccess: "覆盖成功",
     refreshLater: "请稍后刷新",
@@ -556,7 +561,7 @@ const cn = {
       accountList: "用户列表",
       account: "用户",
       language: "语言",
-      receiver: "用户组",
+      receiver: "接收人",
       createTime: "创建时间",
       enable: "可用",
       option: "操作",
@@ -725,6 +730,16 @@ const cn = {
         map: "LDAP属性映射",
         active: "启用LDAP认证"
       },
+      link: {
+        link:'Link',
+        name: "名称",
+        url: "URL",
+        operation: "操作",
+        add: "添加",
+        update: "更新",
+        del: "删除",
+        nameMaxLength:"长度应小于64"
+      },
       reset: {
         reset: "重置",
         type: "类型",

nezha-fronted/src/components/common/language/en.js

@@ -355,6 +355,7 @@ const en = {
     no: "No",//No
     deleteSuccess: 'Delete success',//"删除成功"
     saveSuccess: 'Save success', //"保存成功"
+    addSuccess: 'Add success', //"保存成功"
     duplicateSuccess: 'Duplicate success', //"复制成功"
     coverSuccess: 'Override success',//'覆盖成功'
     refreshLater:'Refresh later',//'请稍后刷新'
@@ -738,6 +739,16 @@ const en = {
         map:'LDAP Field Mapping',
         active:'LDAP Authentication'
       },
+      link: {
+        link:'Link',
+        name: "Name",
+        url: "URL",
+        operation: "Operation",
+        add: "Add",
+        update: "Update",
+        del: "Delete",
+        nameMaxLength:'The length should be less than 64',
+      },
       reset:{
         reset:'Reset',
         type:'Type',

nezha-fronted/src/store/index.js

@@ -40,6 +40,7 @@ const store = new Vuex.Store({
     isAddConsole:false,//是否增加窗口
     consoleParam:{},//新开console窗口参数
     leftMenuStat:false, //0展开状态，1隐藏状态
+    linkData:[],//导航数据
   },
   getters: {
   },
@@ -114,7 +115,10 @@ const store = new Vuex.Store({
     },
     setLeftMenuStat:function(state,data){
       state.leftMenuStat=data
-    }
+    },
+    setLinkData:function(state,data){
+      state.linkData=data
+    },
   },
   actions: {
   }