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 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe940;</span>
<div class="name">数据库,数据</div>
<div class="code-name">&amp;#xe940;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe620;</span>
<div class="name">OPC跳板机权限申请</div>
<div class="code-name">&amp;#xe620;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe615;</span>
<div class="name">资产</div>
<div class="code-name">&amp;#xe615;</div>
... ... @@ -588,9 +600,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1636448687987') format('woff2'),
url('iconfont.woff?t=1636448687987') format('woff'),
url('iconfont.ttf?t=1636448687987') format('truetype');
src: url('iconfont.woff2?t=1637581076852') format('woff2'),
url('iconfont.woff?t=1637581076852') format('woff'),
url('iconfont.ttf?t=1637581076852') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
... ... @@ -617,6 +629,24 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-database"></span>
<div class="name">
数据库,数据
</div>
<div class="code-name">.icon-database
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-OPCtiaobanjiquanxianshenqing"></span>
<div class="name">
OPC跳板机权限申请
</div>
<div class="code-name">.icon-OPCtiaobanjiquanxianshenqing
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-assets"></span>
<div class="name">
资产
... ... @@ -1419,6 +1449,22 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-database"></use>
</svg>
<div class="name">数据库,数据</div>
<div class="code-name">#icon-database</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-OPCtiaobanjiquanxianshenqing"></use>
</svg>
<div class="name">OPC跳板机权限申请</div>
<div class="code-name">#icon-OPCtiaobanjiquanxianshenqing</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-assets"></use>
</svg>
<div class="name">资产</div>
... ...
@font-face {
font-family: "iconfont"; /* Project id 2843738 */
src: url('iconfont.woff2?t=1636448687987') format('woff2'),
url('iconfont.woff?t=1636448687987') format('woff'),
url('iconfont.ttf?t=1636448687987') format('truetype');
src: url('iconfont.woff2?t=1637581076852') format('woff2'),
url('iconfont.woff?t=1637581076852') format('woff'),
url('iconfont.ttf?t=1637581076852') format('truetype');
}
.iconfont {
... ... @@ -13,6 +13,14 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-database:before {
content: "\e940";
}
.icon-OPCtiaobanjiquanxianshenqing:before {
content: "\e620";
}
.icon-assets:before {
content: "\e615";
}
... ...
... ... @@ -6,6 +6,20 @@
"description": "",
"glyphs": [
{
"icon_id": "18169761",
"name": "数据库,数据",
"font_class": "database",
"unicode": "e940",
"unicode_decimal": 59712
},
{
"icon_id": "25651056",
"name": "OPC跳板机权限申请",
"font_class": "OPCtiaobanjiquanxianshenqing",
"unicode": "e620",
"unicode_decimal": 58912
},
{
"icon_id": "1369418",
"name": "资产",
"font_class": "assets",
... ...
... ... @@ -15,9 +15,11 @@
</div>
</el-col>
<el-col :span="20" style="text-align: right;padding-right: 10px">
<slot name="timeRange"></slot>
<slot name="frequency"></slot>
<slot name="tools"></slot>
<div style="display: flex;padding-left: calc(100% - 430px);">
<slot name="timeRange"></slot>
<slot name="frequency"></slot>
<slot name="tools"></slot>
</div>
</el-col>
</el-row>
... ...
... ... @@ -193,8 +193,7 @@
<el-row :gutter="5" >
<el-col :span="8" v-for="item in btnType.data">
<el-form-item :label="item.name" :prop="item.name" class="form-class">
<el-input v-if="item.extend && item.extend.dict == undefined" v-model="item.value"></el-input>
<el-input v-if="item.extend == null || item.extend.dict == undefined" v-model="item.value"></el-input>
<el-select v-else v-model="item.value" :placeholder="`请选择${item.name}`">
<el-option
v-for="item in item.extend.dict"
... ...
... ... @@ -12,13 +12,16 @@ const assets = (props, {attrs, slots, emit}) => {
//查询资产类型列表
let getAssetType = () => {
if(Object.keys(icon.value).length > 0){
return;
}
proxy.$http.post(`/api-web/manage/ddic/findSucDdics/OPS_SECOND_PROPERTY`, {}, function (res) {
if (res && res.data.length > 0) {
icon.value = {};
res.data.forEach(function(item, index, arr){
let code = item.ddicCode;
let obj = {};
code = code.substring(code.lastIndexOf("_") + 1, code.length).toLowerCase();
// code = code.substring(code.lastIndexOf("_") + 1, code.length).toLowerCase();
obj.name=item.ddicName;
obj.icon=item.ddicDesc;
icon.value[code] =obj;
... ...
... ... @@ -117,12 +117,12 @@ const routes = [{
},
{
path: '/analysis/view',
name: 'view',
name: 'analysisView',
component: () => myImport('views/analysis/view/index')
},
{
path: '/fault/index',
name: 'view',
name: 'faultIndex',
// component: () => myImport('views/faultDiagnosis/index')
component: () => myImport('views/faultDiagnosis/components/faultForm/index')
... ...
... ... @@ -10,14 +10,18 @@
</template>
<template #timeRange="scope">
{{ item.node.timeScope }}
<div style="margin-left: 10px">
{{ item.node.timeScope }}
</div>
</template>
<template #frequency="scope">
{{ item.node.frequency }}
<div style="margin-left: 10px">
{{ item.node.frequency }}
</div>
</template>
<template #tools="scope">
<router-link :to="'/analysis/add?configId=' + item.node.id " class="analysis link-type">
<router-link :to="'/analysis/add?configId=' + item.node.id " class="analysis link-type" style="margin-left: 10px">
编辑
</router-link>
</template>
... ...