feat：添加字体图标库

src/assets/css/font/iconfont.css

@@ -0,0 +1,187 @@
+@font-face {
+  font-family: "cn-icon"; /* Project id 2614877 */
+  src: url('iconfont.woff2?t=1624000421294') format('woff2'),
+       url('iconfont.woff?t=1624000421294') format('woff'),
+       url('iconfont.ttf?t=1624000421294') format('truetype');
+}
+
+.cn-icon {
+  font-family: "cn-icon" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.cn-icon-view1:before {
+  content: "\e702";
+}
+
+.cn-icon-more3:before {
+  content: "\e739";
+}
+
+.cn-icon-edit:before {
+  content: "\e68c";
+}
+
+.cn-icon-delete:before {
+  content: "\e68f";
+}
+
+.cn-icon-more1:before {
+  content: "\e677";
+}
+
+.cn-icon-gear:before {
+  content: "\e694";
+}
+
+.cn-icon-add:before {
+  content: "\e738";
+}
+
+.cn-icon-xiangshang:before {
+  content: "\e732";
+}
+
+.cn-icon-xiangxia:before {
+  content: "\e737";
+}
+
+.cn-icon-arrow-left:before {
+  content: "\e735";
+}
+
+.cn-icon-arrow-right:before {
+  content: "\e736";
+}
+
+.cn-icon-id:before {
+  content: "\e734";
+}
+
+.cn-icon-position:before {
+  content: "\e72e";
+}
+
+.cn-icon-dns:before {
+  content: "\e72f";
+}
+
+.cn-icon-sub-category:before {
+  content: "\e730";
+}
+
+.cn-icon-risk:before {
+  content: "\e731";
+}
+
+.cn-icon-category:before {
+  content: "\e733";
+}
+
+.cn-icon-alert:before {
+  content: "\e72d";
+}
+
+.cn-icon-dropdown:before {
+  content: "\e724";
+}
+
+.cn-icon-download:before {
+  content: "\e725";
+}
+
+.cn-icon-check:before {
+  content: "\e726";
+}
+
+.cn-icon-refresh:before {
+  content: "\e727";
+}
+
+.cn-icon-language:before {
+  content: "\e728";
+}
+
+.cn-icon-more:before {
+  content: "\e729";
+}
+
+.cn-icon-style:before {
+  content: "\e72a";
+}
+
+.cn-icon-expand:before {
+  content: "\e72b";
+}
+
+.cn-icon-full-screen:before {
+  content: "\e72c";
+}
+
+.cn-icon-upload:before {
+  content: "\e71f";
+}
+
+.cn-icon-package-loss:before {
+  content: "\e720";
+}
+
+.cn-icon-http:before {
+  content: "\e721";
+}
+
+.cn-icon-time:before {
+  content: "\e722";
+}
+
+.cn-icon-ssl:before {
+  content: "\e723";
+}
+
+.cn-icon-root-domain:before {
+  content: "\e71d";
+}
+
+.cn-icon-doh-domain:before {
+  content: "\e71a";
+}
+
+.cn-icon-recursive-domain:before {
+  content: "\e71b";
+}
+
+.cn-icon-authoritative-domain:before {
+  content: "\e71c";
+}
+
+.cn-icon-top-level-domain:before {
+  content: "\e71e";
+}
+
+.cn-icon-dashboard:before {
+  content: "\e714";
+}
+
+.cn-icon-entitles:before {
+  content: "\e715";
+}
+
+.cn-icon-incidents:before {
+  content: "\e716";
+}
+
+.cn-icon-artifacts-brower:before {
+  content: "\e717";
+}
+
+.cn-icon-setting:before {
+  content: "\e718";
+}
+
+.cn-icon-reports:before {
+  content: "\e719";
+}
+

src/assets/css/font/iconfont.json

@@ -0,0 +1,310 @@
+{
+  "id": "2614877",
+  "name": "Cyber Narrator",
+  "font_family": "cn-icon",
+  "css_prefix_text": "cn-icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "20712322",
+      "name": "view",
+      "font_class": "view1",
+      "unicode": "e702",
+      "unicode_decimal": 59138
+    },
+    {
+      "icon_id": "21907756",
+      "name": "更多操作1",
+      "font_class": "more3",
+      "unicode": "e739",
+      "unicode_decimal": 59193
+    },
+    {
+      "icon_id": "16827143",
+      "name": "编辑",
+      "font_class": "edit",
+      "unicode": "e68c",
+      "unicode_decimal": 59020
+    },
+    {
+      "icon_id": "16827146",
+      "name": "删除",
+      "font_class": "delete",
+      "unicode": "e68f",
+      "unicode_decimal": 59023
+    },
+    {
+      "icon_id": "21119423",
+      "name": "更  多",
+      "font_class": "more1",
+      "unicode": "e677",
+      "unicode_decimal": 58999
+    },
+    {
+      "icon_id": "16827151",
+      "name": "设置",
+      "font_class": "gear",
+      "unicode": "e694",
+      "unicode_decimal": 59028
+    },
+    {
+      "icon_id": "21209541",
+      "name": "Add",
+      "font_class": "add",
+      "unicode": "e738",
+      "unicode_decimal": 59192
+    },
+    {
+      "icon_id": "22325159",
+      "name": "向上",
+      "font_class": "xiangshang",
+      "unicode": "e732",
+      "unicode_decimal": 59186
+    },
+    {
+      "icon_id": "22325160",
+      "name": "向下",
+      "font_class": "xiangxia",
+      "unicode": "e737",
+      "unicode_decimal": 59191
+    },
+    {
+      "icon_id": "22324980",
+      "name": "左箭头",
+      "font_class": "arrow-left",
+      "unicode": "e735",
+      "unicode_decimal": 59189
+    },
+    {
+      "icon_id": "22324981",
+      "name": "右箭头",
+      "font_class": "arrow-right",
+      "unicode": "e736",
+      "unicode_decimal": 59190
+    },
+    {
+      "icon_id": "22320764",
+      "name": "id",
+      "font_class": "id",
+      "unicode": "e734",
+      "unicode_decimal": 59188
+    },
+    {
+      "icon_id": "22318866",
+      "name": "地理位置",
+      "font_class": "position",
+      "unicode": "e72e",
+      "unicode_decimal": 59182
+    },
+    {
+      "icon_id": "22318867",
+      "name": "DNS",
+      "font_class": "dns",
+      "unicode": "e72f",
+      "unicode_decimal": 59183
+    },
+    {
+      "icon_id": "22318868",
+      "name": "子分类",
+      "font_class": "sub-category",
+      "unicode": "e730",
+      "unicode_decimal": 59184
+    },
+    {
+      "icon_id": "22318869",
+      "name": "风险",
+      "font_class": "risk",
+      "unicode": "e731",
+      "unicode_decimal": 59185
+    },
+    {
+      "icon_id": "22318871",
+      "name": "类别",
+      "font_class": "category",
+      "unicode": "e733",
+      "unicode_decimal": 59187
+    },
+    {
+      "icon_id": "22292878",
+      "name": "告警",
+      "font_class": "alert",
+      "unicode": "e72d",
+      "unicode_decimal": 59181
+    },
+    {
+      "icon_id": "22292845",
+      "name": "下拉",
+      "font_class": "dropdown",
+      "unicode": "e724",
+      "unicode_decimal": 59172
+    },
+    {
+      "icon_id": "22292846",
+      "name": "下载",
+      "font_class": "download",
+      "unicode": "e725",
+      "unicode_decimal": 59173
+    },
+    {
+      "icon_id": "22292847",
+      "name": "选中",
+      "font_class": "check",
+      "unicode": "e726",
+      "unicode_decimal": 59174
+    },
+    {
+      "icon_id": "22292848",
+      "name": "刷新",
+      "font_class": "refresh",
+      "unicode": "e727",
+      "unicode_decimal": 59175
+    },
+    {
+      "icon_id": "22292849",
+      "name": "中英文",
+      "font_class": "language",
+      "unicode": "e728",
+      "unicode_decimal": 59176
+    },
+    {
+      "icon_id": "22292850",
+      "name": "更多",
+      "font_class": "more",
+      "unicode": "e729",
+      "unicode_decimal": 59177
+    },
+    {
+      "icon_id": "22292851",
+      "name": "样式",
+      "font_class": "style",
+      "unicode": "e72a",
+      "unicode_decimal": 59178
+    },
+    {
+      "icon_id": "22292852",
+      "name": "展开",
+      "font_class": "expand",
+      "unicode": "e72b",
+      "unicode_decimal": 59179
+    },
+    {
+      "icon_id": "22292853",
+      "name": "最大化",
+      "font_class": "full-screen",
+      "unicode": "e72c",
+      "unicode_decimal": 59180
+    },
+    {
+      "icon_id": "22292732",
+      "name": "重传",
+      "font_class": "upload",
+      "unicode": "e71f",
+      "unicode_decimal": 59167
+    },
+    {
+      "icon_id": "22292733",
+      "name": "丢包率",
+      "font_class": "package-loss",
+      "unicode": "e720",
+      "unicode_decimal": 59168
+    },
+    {
+      "icon_id": "22292734",
+      "name": "HTTP",
+      "font_class": "http",
+      "unicode": "e721",
+      "unicode_decimal": 59169
+    },
+    {
+      "icon_id": "22292735",
+      "name": "时间",
+      "font_class": "time",
+      "unicode": "e722",
+      "unicode_decimal": 59170
+    },
+    {
+      "icon_id": "22292736",
+      "name": "SSL",
+      "font_class": "ssl",
+      "unicode": "e723",
+      "unicode_decimal": 59171
+    },
+    {
+      "icon_id": "22292709",
+      "name": "根域名",
+      "font_class": "root-domain",
+      "unicode": "e71d",
+      "unicode_decimal": 59165
+    },
+    {
+      "icon_id": "22292704",
+      "name": "DOH域名",
+      "font_class": "doh-domain",
+      "unicode": "e71a",
+      "unicode_decimal": 59162
+    },
+    {
+      "icon_id": "22290483",
+      "name": "递归域名",
+      "font_class": "recursive-domain",
+      "unicode": "e71b",
+      "unicode_decimal": 59163
+    },
+    {
+      "icon_id": "22290484",
+      "name": "权威域名",
+      "font_class": "authoritative-domain",
+      "unicode": "e71c",
+      "unicode_decimal": 59164
+    },
+    {
+      "icon_id": "22290486",
+      "name": "顶级域名",
+      "font_class": "top-level-domain",
+      "unicode": "e71e",
+      "unicode_decimal": 59166
+    },
+    {
+      "icon_id": "22290435",
+      "name": "Dashboard",
+      "font_class": "dashboard",
+      "unicode": "e714",
+      "unicode_decimal": 59156
+    },
+    {
+      "icon_id": "22290436",
+      "name": "Entitles",
+      "font_class": "entitles",
+      "unicode": "e715",
+      "unicode_decimal": 59157
+    },
+    {
+      "icon_id": "22290437",
+      "name": "Incidents",
+      "font_class": "incidents",
+      "unicode": "e716",
+      "unicode_decimal": 59158
+    },
+    {
+      "icon_id": "22290438",
+      "name": "Artifacts Brower",
+      "font_class": "artifacts-brower",
+      "unicode": "e717",
+      "unicode_decimal": 59159
+    },
+    {
+      "icon_id": "22290439",
+      "name": "Setting",
+      "font_class": "setting",
+      "unicode": "e718",
+      "unicode_decimal": 59160
+    },
+    {
+      "icon_id": "22290440",
+      "name": "Reports",
+      "font_class": "reports",
+      "unicode": "e719",
+      "unicode_decimal": 59161
+    }
+  ]
+}

src/assets/css/main.scss

@@ -4,3 +4,4 @@
 @import './rightBoxCommon';
 @import './tableCommon';
 @import '../stylus/index.scss';
+@import './font/iconfont.css';

src/assets/css/rightBoxCommon.scss

@@ -293,7 +293,7 @@
     }
   }
 }
-.nz-icon-minus-position {
+.cn-icon-minus-position {
   display: inline-flex;
   flex-direction: column;
   position: absolute;

src/assets/css/tableCommon.scss

@@ -387,3 +387,9 @@
   height: 100%;
   cursor: col-resize;
 }
+.margin-r-10{
+  margin-right: 10px;
+}
+.margin-r-20{
+  margin-right: 20px;
+}

src/components/rightBox/settings/RoleBox.vue

@@ -3,7 +3,7 @@
     <div class="right-box__header">
       <div class="header__title">{{editRole.id ? $t('config.roles.editRole') : $t('config.roles.createRole')}}</div>
       <div class="header__operation">
-        <span v-cancel="{object: editRole, func: esc}"><i class="nz-icon nz-icon-close"></i></span>
+        <span v-cancel="{object: editRole, func: esc}"><i class="cn-icon cn-icon-close"></i></span>
       </div>
     </div>
     <div class="right-box__container">
@@ -21,7 +21,7 @@
           <el-form-item :label="$t('config.roles.permission')">
             <!--<div class="tree-option">
               <button type="button" class="nz-btn nz-btn-size-small-new nz-btn-style-light-new option-btn" style="margin-left: 0px;" @click="expandAllOrNone" :class="{'btn-active':expandAllFlag}">展开/收缩</button>
-              <button type="button" class="nz-btn nz-btn-size-small-new nz-btn-style-light-new option-btn" @click="selectAllOrNone" :class="{'btn-active':selectAllFlag}"><span ><i class="nz-icon nz-icon-delete"></i></span></button>
+              <button type="button" class="nz-btn nz-btn-size-small-new nz-btn-style-light-new option-btn" @click="selectAllOrNone" :class="{'btn-active':selectAllFlag}"><span ><i class="cn-icon cn-icon-delete"></i></span></button>
             </div>-->
             <el-tree :data="menus" :default-expand-all="expandAllFlag" :props="{label:labelFormatter}"  @check-change="selectChange" class="tree-border" node-key="id" ref="menuTree" show-checkbox id="role-box-input-menus">
               <template #default="{ data }">

src/components/table/ColumnCustomize.vue

@@ -11,8 +11,8 @@
           @click="handler(item,index)"
           :id="'element-set-el-'+index"
         >
-          <i class="nz-icon nz-icon-check" v-if="!allowedAll && !item.allowed && (index === 0 || index === 1 || item.visibility === 'disabled')"></i>
-          <i v-else class="nz-icon nz-icon-check" v-show="item.show"></i>
+          <i class="cn-icon cn-icon-check" v-if="!allowedAll && !item.allowed && (index === 0 || index === 1 || item.visibility === 'disabled')"></i>
+          <i v-else class="cn-icon cn-icon-check" v-show="item.show"></i>
           <span>{{item.label}}</span>
         </div>
 

src/components/table/settings/RoleTable.vue

@@ -56,15 +56,15 @@
       </template>
       <template #default="scope">
         <div class="table-operation-items">
-          <button class="table-operation-item" @click="tableOperation(['edit', scope.row])"><i class="nz-icon nz-icon-view1"></i></button>
+          <button class="table-operation-item" @click="tableOperation(['edit', scope.row])"><i class="cn-icon cn-icon-view1"></i></button>
           <el-dropdown size="medium" trigger="hover" @command="tableOperation">
             <div class="table-operation-item table-operation-item--more">
-              <i class="nz-icon nz-icon-more3"></i>
+              <i class="cn-icon cn-icon-more3"></i>
             </div>
             <template #dropdown>
               <el-dropdown-menu >
-                <el-dropdown-item v-has="'user_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
-                <el-dropdown-item v-has="'user_delete'" :command="['delete', scope.row]" :disabled="scope.row.id === 1"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
+                <el-dropdown-item v-has="'user_edit'" :command="['edit', scope.row]"><i class="cn-icon cn-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
+                <el-dropdown-item v-has="'user_delete'" :command="['delete', scope.row]" :disabled="scope.row.id === 1"><i class="cn-icon cn-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
               </el-dropdown-menu>
             </template>
           </el-dropdown>

src/components/table/settings/UserTable.vue

@@ -63,15 +63,15 @@
       </template>
       <template #default="scope">
         <div class="table-operation-items">
-          <button class="table-operation-item" @click="tableOperation(['edit', scope.row])"><i class="nz-icon nz-icon-view1"></i></button>
+          <button class="table-operation-item" @click="tableOperation(['edit', scope.row])"><i class="cn-icon cn-icon-view1"></i></button>
           <el-dropdown size="medium" trigger="hover" @command="tableOperation">
             <div class="table-operation-item table-operation-item--more">
-              <i class="nz-icon nz-icon-more3"></i>
+              <i class="cn-icon cn-icon-more3"></i>
             </div>
             <template #dropdown>
               <el-dropdown-menu >
-                <el-dropdown-item v-has="'user_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
-                <el-dropdown-item v-has="'user_delete'" :command="['delete', scope.row]" :disabled="scope.row.id === 1"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
+                <el-dropdown-item v-has="'user_edit'" :command="['edit', scope.row]"><i class="cn-icon cn-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
+                <el-dropdown-item v-has="'user_delete'" :command="['delete', scope.row]" :disabled="scope.row.id === 1"><i class="cn-icon cn-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
               </el-dropdown-menu>
             </template>
           </el-dropdown>

src/store/modules/user.js

@@ -43,7 +43,7 @@ const user = {
   },
   actions: {
     loginSuccess (store, res) {
-      res.data.timezone = 'America/New_York'
+      // res.data.timezone = 'America/New_York'
       window.$dayJs.tz.setDefault(res.data.timezone)
       sessionStorage.setItem('cn-token', res.data.token)
       localStorage.setItem('cn-sys-name', res.data.systemName)

src/views/settings/Roles.vue

@@ -5,12 +5,12 @@
             v-model:custom-table-title="tools.customTableTitle"
             :api="url"
             :from="fromRoute.roles"
-            :layout="['columnCustomize']"
+            :layout="['columnCustomize','elementSet']"
     >
       <template v-slot:top-tool-right>
         <button id="roles-add" v-has="'role_add'" :title="$t('overall.createRole')" class="top-tool-btn margin-r-10"
                 type="button" @click="add">
-          <i class="nz-icon-create-square nz-icon"></i>
+          <i class="cn-icon-add cn-icon"></i>
         </button>
         <delete-button id="role-list-batch-delete" v-has="'role_delete'" :api="url" :delete-objs="batchDeleteObjs" @after="getTableData" @before="delFlag=true"></delete-button>
       </template>

src/views/settings/User.vue

@@ -5,7 +5,7 @@
       v-model:custom-table-title="tools.customTableTitle"
       :api="url"
       :from="fromRoute.user"
-      :layout="['columnCustomize']"
+      :layout="['columnCustomize','elementSet']"
     >
       <template #top-tool-right>
         <button
@@ -15,7 +15,7 @@
           type="button"
           @click="add"
         >
-          <i class="cn-icon-create-square cn-icon"/>
+          <i class="cn-icon-add cn-icon"/>
         </button>
       </template>
       <template #default>