Skip to content

H
haoban-3
Commit 855438ec by crushh
Options

Merge branch 'feature/act-code' into dev

parents ed70b344 eb51596e
Showing with 155 additions and 14 deletions
src/assets/font/demo_index.html
......@@ -55,6 +55,24 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont-hb3">&#xee14;</span>
<div class="name">操作日志</div>
<div class="code-name">&amp;#xee14;</div>
</li>
<li class="dib">
<span class="icon iconfont-hb3">&#xec64;</span>
<div class="name">no-data</div>
<div class="code-name">&amp;#xec64;</div>
</li>
<li class="dib">
<span class="icon iconfont-hb3">&#xebcc;</span>
<div class="name">user-default</div>
<div class="code-name">&amp;#xebcc;</div>
</li>
<li class="dib">
<span class="icon iconfont-hb3">&#xebeb;</span>
<div class="name">电话</div>
<div class="code-name">&amp;#xebeb;</div>
......@@ -73,6 +91,12 @@
</li>
<li class="dib">
<span class="icon iconfont-hb3">&#xec98;</span>
<div class="name">更多</div>
<div class="code-name">&amp;#xec98;</div>
</li>
<li class="dib">
<span class="icon iconfont-hb3">&#xe62c;</span>
<div class="name">close</div>
<div class="code-name">&amp;#xe62c;</div>
......@@ -810,9 +834,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont-hb3';
src: url('iconfont.woff2?t=1657521279508') format('woff2'),
url('iconfont.woff?t=1657521279508') format('woff'),
url('iconfont.ttf?t=1657521279508') format('truetype');
src: url('iconfont.woff2?t=1658209429777') format('woff2'),
url('iconfont.woff?t=1658209429777') format('woff'),
url('iconfont.ttf?t=1658209429777') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
......@@ -839,6 +863,33 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont-hb3 iconcaozuorizhi"></span>
<div class="name">
操作日志
</div>
<div class="code-name">.iconcaozuorizhi
</div>
</li>
<li class="dib">
<span class="icon iconfont-hb3 iconno-data"></span>
<div class="name">
no-data
</div>
<div class="code-name">.iconno-data
</div>
</li>
<li class="dib">
<span class="icon iconfont-hb3 iconuser-default"></span>
<div class="name">
user-default
</div>
<div class="code-name">.iconuser-default
</div>
</li>
<li class="dib">
<span class="icon iconfont-hb3 icondianhua"></span>
<div class="name">
电话
......@@ -866,6 +917,15 @@
</li>
<li class="dib">
<span class="icon iconfont-hb3 icongengduo3"></span>
<div class="name">
更多
</div>
<div class="code-name">.icongengduo3
</div>
</li>
<li class="dib">
<span class="icon iconfont-hb3 iconclose1"></span>
<div class="name">
close
......@@ -1974,6 +2034,30 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconcaozuorizhi"></use>
</svg>
<div class="name">操作日志</div>
<div class="code-name">#iconcaozuorizhi</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconno-data"></use>
</svg>
<div class="name">no-data</div>
<div class="code-name">#iconno-data</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconuser-default"></use>
</svg>
<div class="name">user-default</div>
<div class="code-name">#iconuser-default</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icondianhua"></use>
</svg>
<div class="name">电话</div>
......@@ -1998,6 +2082,14 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icongengduo3"></use>
</svg>
<div class="name">更多</div>
<div class="code-name">#icongengduo3</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconclose1"></use>
</svg>
<div class="name">close</div>
......
src/assets/font/iconfont.css
@font-face {
font-family: "iconfont-hb3"; /* Project id 1628375 */
src: url('iconfont.woff2?t=1657521279508') format('woff2'),
url('iconfont.woff?t=1657521279508') format('woff'),
url('iconfont.ttf?t=1657521279508') format('truetype');
src: url('iconfont.woff2?t=1658209429777') format('woff2'),
url('iconfont.woff?t=1658209429777') format('woff'),
url('iconfont.ttf?t=1658209429777') format('truetype');
}
.iconfont-hb3 {
......@@ -13,6 +13,18 @@
-moz-osx-font-smoothing: grayscale;
}
.iconcaozuorizhi:before {
content: "\ee14";
}
.iconno-data:before {
content: "\ec64";
}
.iconuser-default:before {
content: "\ebcc";
}
.icondianhua:before {
content: "\ebeb";
}
......@@ -25,6 +37,10 @@
content: "\ec97";
}
.icongengduo3:before {
content: "\ec98";
}
.iconclose1:before {
content: "\e62c";
}
......
src/assets/font/iconfont.js
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/font/iconfont.json
......@@ -6,6 +6,27 @@
"description": "",
"glyphs": [
{
"icon_id": "27402276",
"name": "操作日志",
"font_class": "caozuorizhi",
"unicode": "ee14",
"unicode_decimal": 60948
},
{
"icon_id": "27977097",
"name": "no-data",
"font_class": "no-data",
"unicode": "ec64",
"unicode_decimal": 60516
},
{
"icon_id": "24838426",
"name": "user-default",
"font_class": "user-default",
"unicode": "ebcc",
"unicode_decimal": 60364
},
{
"icon_id": "25538381",
"name": "电话",
"font_class": "dianhua",
......@@ -27,6 +48,13 @@
"unicode_decimal": 60567
},
{
"icon_id": "28687124",
"name": "更多",
"font_class": "gengduo3",
"unicode": "ec98",
"unicode_decimal": 60568
},
{
"icon_id": "1457645",
"name": "close",
"font_class": "close1",
......
src/views/salesleads/actCodeManage/operateLog.vue
......@@ -35,7 +35,10 @@
</el-table-column>
<el-table-column label="操作内容" prop="content" :formatter="(row, col, val) => val || '--'" show-overflow-tooltip></el-table-column>
<el-table-column label="操作时间" prop="createTime">
<template slot-scope="{ row }" v-if="row.createTime"> {{ row.createTime }} {{ row.createTime }} </template>
<template slot-scope="{ row }" v-if="row.createTime">
{{ filters.timeStampToYmd(Number(row.createTime)) }}<br />
{{ filters.timeStampToHms(Number(row.createTime)) }}
</template>
<template v-else>--</template>
</el-table-column>
</el-table>
......@@ -46,10 +49,12 @@
<script>
import { logList, businessType, optTypes, listUserBySearchName } from '@/api/actCode';
import filters from '@/filters/index';
export default {
name: 'operateLog',
data() {
return {
filters,
requestProject: 'gic-web',
loading: false,
search: {
......@@ -94,14 +99,14 @@ export default {
const params = {};
params.requestProject = this.requestProject;
businessType(params).then(res => {
const { errorCode, result } = res.data || {};
if (errorCode == 0) {
const { code, result } = res.data || {};
if (code == 0) {
this.moduleList = (result || []).filter(el => el.key != 1001);
}
});
optTypes({ params }).then(res => {
const { errorCode, result } = res.data || {};
if (errorCode == 0) {
const { code, result } = res.data || {};
if (code == 0) {
this.businessList = (result || []).filter(el => el.key != 1001);
}
});
......@@ -124,11 +129,11 @@ export default {
const params = { searchName, pageNum, pageSize };
params.requestProject = this.requestProject;
listUserBySearchName(params).then(res => {
const { errorCode, result } = res.data || {};
const { code, result } = res.data || {};
if (pageNum == 1) {
this.userList = [];
}
if (errorCode == 0) {
if (code == 0) {
this.userList = this.userList.concat(result.result || []);
this.clerkListPager.totalPage = result.totalPage;
}
......@@ -152,7 +157,7 @@ export default {
para.requestProject = this.requestProject;
logList(para).then(res => {
let data = res.data;
if (data.errorCode == 0) {
if (data.code == 0) {
this.tableData = data.result.result;
this.pager.total = data.result.totalCount;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment