monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 1fc2e7562b623032f267588425610b85f940e7a3 2 parents 056acb1d 04bca6bf

Merge branch 'master-v32-xwx' into 'master' 

乙方运维人员信息汇总提示



See merge request !987
Inline Side-by-side
Showing 8 changed files with 117 additions and 9 deletions
@@ -3,8 +3,8 @@ @@ -3,8 +3,8 @@
3 <head> 3 <head>
4 <meta charset="utf-8"/> 4 <meta charset="utf-8"/>
5 <title>iconfont Demo</title> 5 <title>iconfont Demo</title>
6 - <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i2/O1CN01ZyAlrn1MwaMhqz36G_!!6000000001499-73-tps-64-64.ico" type="image/x-icon"/>  
7 - <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01EYTRnJ297D6vehehJ_!!6000000008020-55-tps-64-64.svg"/> 6 + <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg" type="image/x-icon"/>
  7 + <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg"/>
8 <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css"> 8 <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
9 <link rel="stylesheet" href="demo.css"> 9 <link rel="stylesheet" href="demo.css">
10 <link rel="stylesheet" href="iconfont.css"> 10 <link rel="stylesheet" href="iconfont.css">
@@ -55,6 +55,24 @@ @@ -55,6 +55,24 @@
55 <ul class="icon_lists dib-box"> 55 <ul class="icon_lists dib-box">
56 56
57 <li class="dib"> 57 <li class="dib">
  58 + <span class="icon iconfont">&#xe710;</span>
  59 + <div class="name">感叹号</div>
  60 + <div class="code-name">&amp;#xe710;</div>
  61 + </li>
  62 +
  63 + <li class="dib">
  64 + <span class="icon iconfont">&#xe7f3;</span>
  65 + <div class="name">警示 感叹号 ！</div>
  66 + <div class="code-name">&amp;#xe7f3;</div>
  67 + </li>
  68 +
  69 + <li class="dib">
  70 + <span class="icon iconfont">&#xe83d;</span>
  71 + <div class="name">拓扑</div>
  72 + <div class="code-name">&amp;#xe83d;</div>
  73 + </li>
  74 +
  75 + <li class="dib">
58 <span class="icon iconfont">&#xe67c;</span> 76 <span class="icon iconfont">&#xe67c;</span>
59 <div class="name">提示</div> 77 <div class="name">提示</div>
60 <div class="code-name">&amp;#xe67c;</div> 78 <div class="code-name">&amp;#xe67c;</div>
@@ -1452,9 +1470,9 @@ @@ -1452,9 +1470,9 @@
1452 <pre><code class="language-css" 1470 <pre><code class="language-css"
1453 >@font-face { 1471 >@font-face {
1454 font-family: 'iconfont'; 1472 font-family: 'iconfont';
1455 - src: url('iconfont.woff2?t=1659325108758') format('woff2'),  
1456 - url('iconfont.woff?t=1659325108758') format('woff'),  
1457 - url('iconfont.ttf?t=1659325108758') format('truetype'); 1473 + src: url('iconfont.woff2?t=1663752017313') format('woff2'),
  1474 + url('iconfont.woff?t=1663752017313') format('woff'),
  1475 + url('iconfont.ttf?t=1663752017313') format('truetype');
1458 } 1476 }
1459 </code></pre> 1477 </code></pre>
1460 <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3> 1478 <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -1481,6 +1499,33 @@ @@ -1481,6 +1499,33 @@
1481 <ul class="icon_lists dib-box"> 1499 <ul class="icon_lists dib-box">
1482 1500
1483 <li class="dib"> 1501 <li class="dib">
  1502 + <span class="icon iconfont icon-gantanhao"></span>
  1503 + <div class="name">
  1504 + 感叹号
  1505 + </div>
  1506 + <div class="code-name">.icon-gantanhao
  1507 + </div>
  1508 + </li>
  1509 +
  1510 + <li class="dib">
  1511 + <span class="icon iconfont icon-jingshigantanhao"></span>
  1512 + <div class="name">
  1513 + 警示 感叹号 ！
  1514 + </div>
  1515 + <div class="code-name">.icon-jingshigantanhao
  1516 + </div>
  1517 + </li>
  1518 +
  1519 + <li class="dib">
  1520 + <span class="icon iconfont icon-tuopu"></span>
  1521 + <div class="name">
  1522 + 拓扑
  1523 + </div>
  1524 + <div class="code-name">.icon-tuopu
  1525 + </div>
  1526 + </li>
  1527 +
  1528 + <li class="dib">
1484 <span class="icon iconfont icon-tishi"></span> 1529 <span class="icon iconfont icon-tishi"></span>
1485 <div class="name"> 1530 <div class="name">
1486 提示 1531 提示
@@ -3579,6 +3624,30 @@ @@ -3579,6 +3624,30 @@
3579 3624
3580 <li class="dib"> 3625 <li class="dib">
3581 <svg class="icon svg-icon" aria-hidden="true"> 3626 <svg class="icon svg-icon" aria-hidden="true">
  3627 + <use xlink:href="#icon-gantanhao"></use>
  3628 + </svg>
  3629 + <div class="name">感叹号</div>
  3630 + <div class="code-name">#icon-gantanhao</div>
  3631 + </li>
  3632 +
  3633 + <li class="dib">
  3634 + <svg class="icon svg-icon" aria-hidden="true">
  3635 + <use xlink:href="#icon-jingshigantanhao"></use>
  3636 + </svg>
  3637 + <div class="name">警示 感叹号 ！</div>
  3638 + <div class="code-name">#icon-jingshigantanhao</div>
  3639 + </li>
  3640 +
  3641 + <li class="dib">
  3642 + <svg class="icon svg-icon" aria-hidden="true">
  3643 + <use xlink:href="#icon-tuopu"></use>
  3644 + </svg>
  3645 + <div class="name">拓扑</div>
  3646 + <div class="code-name">#icon-tuopu</div>
  3647 + </li>
  3648 +
  3649 + <li class="dib">
  3650 + <svg class="icon svg-icon" aria-hidden="true">
3582 <use xlink:href="#icon-tishi"></use> 3651 <use xlink:href="#icon-tishi"></use>
3583 </svg> 3652 </svg>
3584 <div class="name">提示</div> 3653 <div class="name">提示</div>
1 @font-face { 1 @font-face {
2 font-family: "iconfont"; /* Project id 2843738 */ 2 font-family: "iconfont"; /* Project id 2843738 */
3 - src: url('iconfont.woff2?t=1659325108758') format('woff2'),  
4 - url('iconfont.woff?t=1659325108758') format('woff'),  
5 - url('iconfont.ttf?t=1659325108758') format('truetype'); 3 + src: url('iconfont.woff2?t=1663752017313') format('woff2'),
  4 + url('iconfont.woff?t=1663752017313') format('woff'),
  5 + url('iconfont.ttf?t=1663752017313') format('truetype');
6 } 6 }
7 7
8 .iconfont { 8 .iconfont {
@@ -13,6 +13,18 @@ @@ -13,6 +13,18 @@
13 -moz-osx-font-smoothing: grayscale; 13 -moz-osx-font-smoothing: grayscale;
14 } 14 }
15 15
  16 +.icon-gantanhao:before {
  17 + content: "\e710";
  18 +}
  19 +
  20 +.icon-jingshigantanhao:before {
  21 + content: "\e7f3";
  22 +}
  23 +
  24 +.icon-tuopu:before {
  25 + content: "\e83d";
  26 +}
  27 +
16 .icon-tishi:before { 28 .icon-tishi:before {
17 content: "\e67c"; 29 content: "\e67c";
18 } 30 }
@@ -6,6 +6,27 @@ @@ -6,6 +6,27 @@
6 "description": "", 6 "description": "",
7 "glyphs": [ 7 "glyphs": [
8 { 8 {
  9 + "icon_id": "9974757",
  10 + "name": "感叹号",
  11 + "font_class": "gantanhao",
  12 + "unicode": "e710",
  13 + "unicode_decimal": 59152
  14 + },
  15 + {
  16 + "icon_id": "689255",
  17 + "name": "警示 感叹号 ！",
  18 + "font_class": "jingshigantanhao",
  19 + "unicode": "e7f3",
  20 + "unicode_decimal": 59379
  21 + },
  22 + {
  23 + "icon_id": "1415612",
  24 + "name": "拓扑",
  25 + "font_class": "tuopu",
  26 + "unicode": "e83d",
  27 + "unicode_decimal": 59453
  28 + },
  29 + {
9 "icon_id": "577891", 30 "icon_id": "577891",
10 "name": "提示", 31 "name": "提示",
11 "font_class": "tishi", 32 "font_class": "tishi",
1 <div> 1 <div>
2 <div> 2 <div>
3 <!-- 人员信息总汇--> 3 <!-- 人员信息总汇-->
4 - <el-divider content-position="left">人员信息汇总</el-divider> 4 + <el-divider content-position="left">
  5 + 人员信息汇总
  6 + <el-tooltip placement="bottom-start" effect="light">
  7 + <template #content> 人员信息统计规则：<br/> &nbsp;&nbsp;&nbsp;&nbsp;• 左侧树：只统计业务下在职运维人员<br/> &nbsp;&nbsp;&nbsp;&nbsp;•人员信息汇总：统计业务下所有运维人员 </template>
  8 + <i class="iconfont icon-gantanhao" style="color:rgb(30,159,255);"></i><span></span>
  9 + </el-tooltip>
  10 + </el-divider>
5 <cm-table-page :columns="columns" :dataList="dataList" @loaddata="getPage" :showIndex="true" 11 <cm-table-page :columns="columns" :dataList="dataList" @loaddata="getPage" :showIndex="true"
6 :showBorder="true" :currentPage="currentPage" :total="total" :loading="false" 12 :showBorder="true" :currentPage="currentPage" :total="total" :loading="false"
7 :showPage="true" :height="height" :pageSize="pageSize"></cm-table-page> 13 :showPage="true" :height="height" :pageSize="pageSize"></cm-table-page>