Skip to content

F
founder_vue
Commit 28d46b91 by liyuhang19990520
Options

解决冲突

parents eaaa260a bfa1d5b5
Showing with 414 additions and 11 deletions
dist.zip
No preview for this file type
public/iconfont/iconfont.css
@font-face { @font-face {
font-family: "iconfont"; /* Project id 2961960 */ font-family: "iconfont"; /* Project id 2961960 */
src: url('iconfont.woff2?t=1637734956272') format('woff2'), src: url('iconfont.woff2?t=1638244699125') format('woff2'),
url('iconfont.woff?t=1637734956272') format('woff'), url('iconfont.woff?t=1638244699125') format('woff'),
url('iconfont.ttf?t=1637734956272') format('truetype'); url('iconfont.ttf?t=1638244699125') format('truetype');
} }
.iconfont { .iconfont {
...@@ -14,6 +14,146 @@ ...@@ -14,6 +14,146 @@
} }
.icon-fanhui:before { .icon-fanhui:before {
content: "\e601"; content: "\e625";
}
.icon-duihao:before {
content: "\e624";
}
.icon-cishu:before {
content: "\e622";
}
.icon-shijian:before {
content: "\e623";
}
.icon-xiugaiyonghuquanxian-bianji:before {
content: "\e621";
}
.icon-tezhengdian:before {
content: "\e620";
}
.icon-xitongjiaose:before {
content: "\e61e";
}
.icon-ketianjiajiaose:before {
content: "\e61f";
}
.icon-danchuang-guanbi:before {
content: "\e61d";
}
.icon-shanchujiaose:before {
content: "\e61c";
}
.icon-tianjiajiaose:before {
content: "\e61b";
}
.icon-xitongguanli:before {
content: "\e61a";
}
.icon-zhiliangjiancha:before {
content: "\e613";
}
.icon-shujuziyuanguanli:before {
content: "\e617";
}
.icon-zhizhangwenluru:before {
content: "\e618";
}
.icon-zhizhangwencaiji:before {
content: "\e619";
}
.icon-chaxunrending:before {
content: "\e614";
}
.icon-danganxinxi:before {
content: "\e615";
}
.icon-zhiwenbianji:before {
content: "\e616";
}
.icon-shenhe-xiala:before {
content: "\e612";
}
.icon-bujizhanguo:before {
content: "\e60b";
}
.icon-chexiaoshenhe:before {
content: "\e60c";
}
.icon-jiruzhanguo:before {
content: "\e60d";
}
.icon-shenhe:before {
content: "\e60e";
}
.icon-shenhewuxiao:before {
content: "\e60f";
}
.icon-shangbaoshengxingzhuan:before {
content: "\e610";
}
.icon-zhongxinshenhe:before {
content: "\e611";
}
.icon-quxiaoguanzhu:before {
content: "\e60a";
}
.icon-rengongrending:before {
content: "\e608";
}
.icon-shanchu:before {
content: "\e609";
}
.icon-fuzhitiaomahao:before {
content: "\e602";
}
.icon-bianji:before {
content: "\e603";
}
.icon-gaihao:before {
content: "\e604";
}
.icon-fuzhishuju:before {
content: "\e605";
}
.icon-dayin:before {
content: "\e606";
}
.icon-chaxun:before {
content: "\e607";
} }
public/iconfont/iconfont.json
{ {
"id": "2961960", "id": "2961960",
"name": "指纹", "name": "指纹-icon",
"font_family": "iconfont", "font_family": "iconfont",
"css_prefix_text": "icon-", "css_prefix_text": "icon-",
"description": "", "description": "",
"glyphs": [ "glyphs": [
{ {
"icon_id": "25962198", "icon_id": "26093978",
"name": "返回", "name": "返回",
"font_class": "fanhui", "font_class": "fanhui",
"unicode": "e601", "unicode": "e625",
"unicode_decimal": 58881 "unicode_decimal": 58917
},
{
"icon_id": "26085803",
"name": "对号",
"font_class": "duihao",
"unicode": "e624",
"unicode_decimal": 58916
},
{
"icon_id": "26078043",
"name": "次数",
"font_class": "cishu",
"unicode": "e622",
"unicode_decimal": 58914
},
{
"icon_id": "26078044",
"name": "时间",
"font_class": "shijian",
"unicode": "e623",
"unicode_decimal": 58915
},
{
"icon_id": "26064091",
"name": "修改用户权限-编辑",
"font_class": "xiugaiyonghuquanxian-bianji",
"unicode": "e621",
"unicode_decimal": 58913
},
{
"icon_id": "26048886",
"name": "特征点",
"font_class": "tezhengdian",
"unicode": "e620",
"unicode_decimal": 58912
},
{
"icon_id": "26048209",
"name": "系统角色",
"font_class": "xitongjiaose",
"unicode": "e61e",
"unicode_decimal": 58910
},
{
"icon_id": "26048210",
"name": "可添加角色",
"font_class": "ketianjiajiaose",
"unicode": "e61f",
"unicode_decimal": 58911
},
{
"icon_id": "26048208",
"name": "弹窗-关闭",
"font_class": "danchuang-guanbi",
"unicode": "e61d",
"unicode_decimal": 58909
},
{
"icon_id": "26048084",
"name": "删除角色",
"font_class": "shanchujiaose",
"unicode": "e61c",
"unicode_decimal": 58908
},
{
"icon_id": "26048083",
"name": "添加角色",
"font_class": "tianjiajiaose",
"unicode": "e61b",
"unicode_decimal": 58907
},
{
"icon_id": "26047446",
"name": "系统管理",
"font_class": "xitongguanli",
"unicode": "e61a",
"unicode_decimal": 58906
},
{
"icon_id": "26047431",
"name": "质量检查",
"font_class": "zhiliangjiancha",
"unicode": "e613",
"unicode_decimal": 58899
},
{
"icon_id": "26047432",
"name": "数据资源管理",
"font_class": "shujuziyuanguanli",
"unicode": "e617",
"unicode_decimal": 58903
},
{
"icon_id": "26047433",
"name": "指掌纹录入",
"font_class": "zhizhangwenluru",
"unicode": "e618",
"unicode_decimal": 58904
},
{
"icon_id": "26047434",
"name": "指掌纹采集",
"font_class": "zhizhangwencaiji",
"unicode": "e619",
"unicode_decimal": 58905
},
{
"icon_id": "26047428",
"name": "查询认定",
"font_class": "chaxunrending",
"unicode": "e614",
"unicode_decimal": 58900
},
{
"icon_id": "26047429",
"name": "档案信息",
"font_class": "danganxinxi",
"unicode": "e615",
"unicode_decimal": 58901
},
{
"icon_id": "26047430",
"name": "指纹编辑",
"font_class": "zhiwenbianji",
"unicode": "e616",
"unicode_decimal": 58902
},
{
"icon_id": "26036713",
"name": "审核-下拉",
"font_class": "shenhe-xiala",
"unicode": "e612",
"unicode_decimal": 58898
},
{
"icon_id": "26036280",
"name": "不计战果",
"font_class": "bujizhanguo",
"unicode": "e60b",
"unicode_decimal": 58891
},
{
"icon_id": "26036281",
"name": "撤销审核",
"font_class": "chexiaoshenhe",
"unicode": "e60c",
"unicode_decimal": 58892
},
{
"icon_id": "26036282",
"name": "计入战果",
"font_class": "jiruzhanguo",
"unicode": "e60d",
"unicode_decimal": 58893
},
{
"icon_id": "26036283",
"name": "审核",
"font_class": "shenhe",
"unicode": "e60e",
"unicode_decimal": 58894
},
{
"icon_id": "26036284",
"name": "审核无效",
"font_class": "shenhewuxiao",
"unicode": "e60f",
"unicode_decimal": 58895
},
{
"icon_id": "26036285",
"name": "上报省刑专",
"font_class": "shangbaoshengxingzhuan",
"unicode": "e610",
"unicode_decimal": 58896
},
{
"icon_id": "26036286",
"name": "重新审核",
"font_class": "zhongxinshenhe",
"unicode": "e611",
"unicode_decimal": 58897
},
{
"icon_id": "25988681",
"name": "取消关注",
"font_class": "quxiaoguanzhu",
"unicode": "e60a",
"unicode_decimal": 58890
},
{
"icon_id": "25980862",
"name": "人工认定",
"font_class": "rengongrending",
"unicode": "e608",
"unicode_decimal": 58888
},
{
"icon_id": "25980863",
"name": "删除",
"font_class": "shanchu",
"unicode": "e609",
"unicode_decimal": 58889
},
{
"icon_id": "25980856",
"name": "复制条码号",
"font_class": "fuzhitiaomahao",
"unicode": "e602",
"unicode_decimal": 58882
},
{
"icon_id": "25980857",
"name": "编辑",
"font_class": "bianji",
"unicode": "e603",
"unicode_decimal": 58883
},
{
"icon_id": "25980858",
"name": "改号",
"font_class": "gaihao",
"unicode": "e604",
"unicode_decimal": 58884
},
{
"icon_id": "25980859",
"name": "复制数据",
"font_class": "fuzhishuju",
"unicode": "e605",
"unicode_decimal": 58885
},
{
"icon_id": "25980860",
"name": "打印",
"font_class": "dayin",
"unicode": "e606",
"unicode_decimal": 58886
},
{
"icon_id": "25980861",
"name": "查询",
"font_class": "chaxun",
"unicode": "e607",
"unicode_decimal": 58887
} }
] ]
} }
public/index.html
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>icon.ico"> <link rel="icon" href="<%= BASE_URL %>icon.ico">
<link rel="stylesheet" href="./iconfont/iconfont.css">
<!-- <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" /> --> <!-- <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" /> -->
<!-- <link rel="icon" sizes="any" mask href="//www.baidu.com/img/baidu_85beaf5496f291521eb75ba38eacbd87.svg"> --> <!-- <link rel="icon" sizes="any" mask href="//www.baidu.com/img/baidu_85beaf5496f291521eb75ba38eacbd87.svg"> -->
<link rel="stylesheet" href="<%= BASE_URL %>image-edit/css/tui-color-picker.css"> <link rel="stylesheet" href="<%= BASE_URL %>image-edit/css/tui-color-picker.css">
......
src/views/AllPersonnelBase/modules/ryxxk.vue
...@@ -44,6 +44,12 @@ ...@@ -44,6 +44,12 @@
<div class='jbxxCenter'> <div class='jbxxCenter'>
<div class="sjx l1"> <div class="sjx l1">
<div class='sjxLeft'> <div class='sjxLeft'>
<svg
class="icon"
aria-hidden="true"
>
<use xlink:href="#icon-cishu"></use>
</svg>
</div> </div>
<div class='sjxRight'> <div class='sjxRight'>
<div> <div>
...@@ -56,7 +62,12 @@ ...@@ -56,7 +62,12 @@
</div> </div>
<div class="sjx l2"> <div class="sjx l2">
<div class='sjxLeft'> <div class='sjxLeft'>
<svg
class="icon"
aria-hidden="true"
>
<use xlink:href="#icon-shijian"></use>
</svg>
</div> </div>
<div class='sjxRight'> <div class='sjxRight'>
<div> <div>
...@@ -564,6 +575,13 @@ export default { ...@@ -564,6 +575,13 @@ export default {
background: #ddebff; background: #ddebff;
border-radius: 4px; border-radius: 4px;
margin-right: 10px; margin-right: 10px;
display: flex;
justify-content: center;
align-items: center;
.icon {
width: 20px;
height: 20px;
}
} }
.sjxRight { .sjxRight {
div { div {
......
src/views/login/modules/AccountsLogin.vue
...@@ -100,7 +100,6 @@ export default { ...@@ -100,7 +100,6 @@ export default {
this.$bus.emit('goLogin') this.$bus.emit('goLogin')
} else { } else {
this.$message.error("登陆失败"); this.$message.error("登陆失败");
// this.$bus.emit('goLogin')
} }
}); });
}, },
......
vue.config.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-30 09:39:56 * @LastEditTime: 2021-11-30 13:52:04
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js * @FilePath: \指纹系统\founder_vue\vue.config.js
......
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