monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 74333151961e9d87e4bac999fe8ef476da1366a2 1 parent 5def50cf

优化；增加图标

Inline Side-by-side
Showing 12 changed files with 93 additions and 17 deletions
@@ -55,6 +55,18 @@ @@ -55,6 +55,18 @@
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">&#xe940;</span>
  59 + <div class="name">数据库,数据</div>
  60 + <div class="code-name">&amp;#xe940;</div>
  61 + </li>
  62 +
  63 + <li class="dib">
  64 + <span class="icon iconfont">&#xe620;</span>
  65 + <div class="name">OPC跳板机权限申请</div>
  66 + <div class="code-name">&amp;#xe620;</div>
  67 + </li>
  68 +
  69 + <li class="dib">
58 <span class="icon iconfont">&#xe615;</span> 70 <span class="icon iconfont">&#xe615;</span>
59 <div class="name">资产</div> 71 <div class="name">资产</div>
60 <div class="code-name">&amp;#xe615;</div> 72 <div class="code-name">&amp;#xe615;</div>
@@ -588,9 +600,9 @@ @@ -588,9 +600,9 @@
588 <pre><code class="language-css" 600 <pre><code class="language-css"
589 >@font-face { 601 >@font-face {
590 font-family: 'iconfont'; 602 font-family: 'iconfont';
591 - src: url('iconfont.woff2?t=1636448687987') format('woff2'),  
592 - url('iconfont.woff?t=1636448687987') format('woff'),  
593 - url('iconfont.ttf?t=1636448687987') format('truetype'); 603 + src: url('iconfont.woff2?t=1637581076852') format('woff2'),
  604 + url('iconfont.woff?t=1637581076852') format('woff'),
  605 + url('iconfont.ttf?t=1637581076852') format('truetype');
594 } 606 }
595 </code></pre> 607 </code></pre>
596 <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3> 608 <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -617,6 +629,24 @@ @@ -617,6 +629,24 @@
617 <ul class="icon_lists dib-box"> 629 <ul class="icon_lists dib-box">
618 630
619 <li class="dib"> 631 <li class="dib">
  632 + <span class="icon iconfont icon-database"></span>
  633 + <div class="name">
  634 + 数据库,数据
  635 + </div>
  636 + <div class="code-name">.icon-database
  637 + </div>
  638 + </li>
  639 +
  640 + <li class="dib">
  641 + <span class="icon iconfont icon-OPCtiaobanjiquanxianshenqing"></span>
  642 + <div class="name">
  643 + OPC跳板机权限申请
  644 + </div>
  645 + <div class="code-name">.icon-OPCtiaobanjiquanxianshenqing
  646 + </div>
  647 + </li>
  648 +
  649 + <li class="dib">
620 <span class="icon iconfont icon-assets"></span> 650 <span class="icon iconfont icon-assets"></span>
621 <div class="name"> 651 <div class="name">
622 资产 652 资产
@@ -1419,6 +1449,22 @@ @@ -1419,6 +1449,22 @@
1419 1449
1420 <li class="dib"> 1450 <li class="dib">
1421 <svg class="icon svg-icon" aria-hidden="true"> 1451 <svg class="icon svg-icon" aria-hidden="true">
  1452 + <use xlink:href="#icon-database"></use>
  1453 + </svg>
  1454 + <div class="name">数据库,数据</div>
  1455 + <div class="code-name">#icon-database</div>
  1456 + </li>
  1457 +
  1458 + <li class="dib">
  1459 + <svg class="icon svg-icon" aria-hidden="true">
  1460 + <use xlink:href="#icon-OPCtiaobanjiquanxianshenqing"></use>
  1461 + </svg>
  1462 + <div class="name">OPC跳板机权限申请</div>
  1463 + <div class="code-name">#icon-OPCtiaobanjiquanxianshenqing</div>
  1464 + </li>
  1465 +
  1466 + <li class="dib">
  1467 + <svg class="icon svg-icon" aria-hidden="true">
1422 <use xlink:href="#icon-assets"></use> 1468 <use xlink:href="#icon-assets"></use>
1423 </svg> 1469 </svg>
1424 <div class="name">资产</div> 1470 <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=1636448687987') format('woff2'),  
4 - url('iconfont.woff?t=1636448687987') format('woff'),  
5 - url('iconfont.ttf?t=1636448687987') format('truetype'); 3 + src: url('iconfont.woff2?t=1637581076852') format('woff2'),
  4 + url('iconfont.woff?t=1637581076852') format('woff'),
  5 + url('iconfont.ttf?t=1637581076852') format('truetype');
6 } 6 }
7 7
8 .iconfont { 8 .iconfont {
@@ -13,6 +13,14 @@ @@ -13,6 +13,14 @@
13 -moz-osx-font-smoothing: grayscale; 13 -moz-osx-font-smoothing: grayscale;
14 } 14 }
15 15
  16 +.icon-database:before {
  17 + content: "\e940";
  18 +}
  19 +
  20 +.icon-OPCtiaobanjiquanxianshenqing:before {
  21 + content: "\e620";
  22 +}
  23 +
16 .icon-assets:before { 24 .icon-assets:before {
17 content: "\e615"; 25 content: "\e615";
18 } 26 }
@@ -6,6 +6,20 @@ @@ -6,6 +6,20 @@
6 "description": "", 6 "description": "",
7 "glyphs": [ 7 "glyphs": [
8 { 8 {
  9 + "icon_id": "18169761",
  10 + "name": "数据库,数据",
  11 + "font_class": "database",
  12 + "unicode": "e940",
  13 + "unicode_decimal": 59712
  14 + },
  15 + {
  16 + "icon_id": "25651056",
  17 + "name": "OPC跳板机权限申请",
  18 + "font_class": "OPCtiaobanjiquanxianshenqing",
  19 + "unicode": "e620",
  20 + "unicode_decimal": 58912
  21 + },
  22 + {
9 "icon_id": "1369418", 23 "icon_id": "1369418",
10 "name": "资产", 24 "name": "资产",
11 "font_class": "assets", 25 "font_class": "assets",
@@ -15,9 +15,11 @@ @@ -15,9 +15,11 @@
15 </div> 15 </div>
16 </el-col> 16 </el-col>
17 <el-col :span="20" style="text-align: right;padding-right: 10px"> 17 <el-col :span="20" style="text-align: right;padding-right: 10px">
18 - <slot name="timeRange"></slot>  
19 - <slot name="frequency"></slot>  
20 - <slot name="tools"></slot> 18 + <div style="display: flex;padding-left: calc(100% - 430px);">
  19 + <slot name="timeRange"></slot>
  20 + <slot name="frequency"></slot>
  21 + <slot name="tools"></slot>
  22 + </div>
21 </el-col> 23 </el-col>
22 </el-row> 24 </el-row>
23 25
@@ -193,8 +193,7 @@ @@ -193,8 +193,7 @@
193 <el-row :gutter="5" > 193 <el-row :gutter="5" >
194 <el-col :span="8" v-for="item in btnType.data"> 194 <el-col :span="8" v-for="item in btnType.data">
195 <el-form-item :label="item.name" :prop="item.name" class="form-class"> 195 <el-form-item :label="item.name" :prop="item.name" class="form-class">
196 - <el-input v-if="item.extend && item.extend.dict == undefined" v-model="item.value"></el-input>  
197 - 196 + <el-input v-if="item.extend == null || item.extend.dict == undefined" v-model="item.value"></el-input>
198 <el-select v-else v-model="item.value" :placeholder="`请选择${item.name}`"> 197 <el-select v-else v-model="item.value" :placeholder="`请选择${item.name}`">
199 <el-option 198 <el-option
200 v-for="item in item.extend.dict" 199 v-for="item in item.extend.dict"
@@ -12,13 +12,16 @@ const assets = (props, {attrs, slots, emit}) => { @@ -12,13 +12,16 @@ const assets = (props, {attrs, slots, emit}) => {
12 12
13 //查询资产类型列表 13 //查询资产类型列表
14 let getAssetType = () => { 14 let getAssetType = () => {
  15 + if(Object.keys(icon.value).length > 0){
  16 + return;
  17 + }
15 proxy.$http.post(`/api-web/manage/ddic/findSucDdics/OPS_SECOND_PROPERTY`, {}, function (res) { 18 proxy.$http.post(`/api-web/manage/ddic/findSucDdics/OPS_SECOND_PROPERTY`, {}, function (res) {
16 if (res && res.data.length > 0) { 19 if (res && res.data.length > 0) {
17 icon.value = {}; 20 icon.value = {};
18 res.data.forEach(function(item, index, arr){ 21 res.data.forEach(function(item, index, arr){
19 let code = item.ddicCode; 22 let code = item.ddicCode;
20 let obj = {}; 23 let obj = {};
21 - code = code.substring(code.lastIndexOf("_") + 1, code.length).toLowerCase(); 24 + // code = code.substring(code.lastIndexOf("_") + 1, code.length).toLowerCase();
22 obj.name=item.ddicName; 25 obj.name=item.ddicName;
23 obj.icon=item.ddicDesc; 26 obj.icon=item.ddicDesc;
24 icon.value[code] =obj; 27 icon.value[code] =obj;
@@ -117,12 +117,12 @@ const routes = [{ @@ -117,12 +117,12 @@ const routes = [{
117 }, 117 },
118 { 118 {
119 path: '/analysis/view', 119 path: '/analysis/view',
120 - name: 'view', 120 + name: 'analysisView',
121 component: () => myImport('views/analysis/view/index') 121 component: () => myImport('views/analysis/view/index')
122 }, 122 },
123 { 123 {
124 path: '/fault/index', 124 path: '/fault/index',
125 - name: 'view', 125 + name: 'faultIndex',
126 // component: () => myImport('views/faultDiagnosis/index') 126 // component: () => myImport('views/faultDiagnosis/index')
127 component: () => myImport('views/faultDiagnosis/components/faultForm/index') 127 component: () => myImport('views/faultDiagnosis/components/faultForm/index')
128 128
@@ -10,14 +10,18 @@ @@ -10,14 +10,18 @@
10 </template> 10 </template>
11 11
12 <template #timeRange="scope"> 12 <template #timeRange="scope">
13 - {{ item.node.timeScope }} 13 + <div style="margin-left: 10px">
  14 + {{ item.node.timeScope }}
  15 + </div>
14 </template> 16 </template>
15 <template #frequency="scope"> 17 <template #frequency="scope">
16 - {{ item.node.frequency }} 18 + <div style="margin-left: 10px">
  19 + {{ item.node.frequency }}
  20 + </div>
17 </template> 21 </template>
18 22
19 <template #tools="scope"> 23 <template #tools="scope">
20 - <router-link :to="'/analysis/add?configId=' + item.node.id " class="analysis link-type"> 24 + <router-link :to="'/analysis/add?configId=' + item.node.id " class="analysis link-type" style="margin-left: 10px">
21 编辑 25 编辑
22 </router-link> 26 </router-link>
23 </template> 27 </template>