Skip to content

F
founder_vue
Commit edb2fbd2 by 张超军
Options

修改指纹采集移入样式，单击事件，重复指位弹窗逻辑

parent 11c2df41
Showing with 382 additions and 31 deletions
public/iconfont/demo_index.html
......@@ -55,6 +55,66 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe651;</span>
<div class="name">叹号</div>
<div class="code-name">&amp;#xe651;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe650;</span>
<div class="name">PDF</div>
<div class="code-name">&amp;#xe650;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe64f;</span>
<div class="name">Word</div>
<div class="code-name">&amp;#xe64f;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe64e;</span>
<div class="name">Excel</div>
<div class="code-name">&amp;#xe64e;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe64d;</span>
<div class="name">可视化切换</div>
<div class="code-name">&amp;#xe64d;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe64c;</span>
<div class="name">报表</div>
<div class="code-name">&amp;#xe64c;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe615;</span>
<div class="name">暂停</div>
<div class="code-name">&amp;#xe615;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe613;</span>
<div class="name">预览</div>
<div class="code-name">&amp;#xe613;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe614;</span>
<div class="name">指纹采集标记</div>
<div class="code-name">&amp;#xe614;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe64b;</span>
<div class="name">采集logo</div>
<div class="code-name">&amp;#xe64b;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe649;</span>
<div class="name">提示</div>
<div class="code-name">&amp;#xe649;</div>
......@@ -420,9 +480,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1641955164800') format('woff2'),
url('iconfont.woff?t=1641955164800') format('woff'),
url('iconfont.ttf?t=1641955164800') format('truetype');
src: url('iconfont.woff2?t=1642564860670') format('woff2'),
url('iconfont.woff?t=1642564860670') format('woff'),
url('iconfont.ttf?t=1642564860670') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
......@@ -449,6 +509,96 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-tanhao2"></span>
<div class="name">
叹号
</div>
<div class="code-name">.icon-tanhao2
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-PDF"></span>
<div class="name">
PDF
</div>
<div class="code-name">.icon-PDF
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-WORD"></span>
<div class="name">
Word
</div>
<div class="code-name">.icon-WORD
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-excel"></span>
<div class="name">
Excel
</div>
<div class="code-name">.icon-excel
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-keshihuaqiehuan"></span>
<div class="name">
可视化切换
</div>
<div class="code-name">.icon-keshihuaqiehuan
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-baobiao1"></span>
<div class="name">
报表
</div>
<div class="code-name">.icon-baobiao1
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-zanting"></span>
<div class="name">
暂停
</div>
<div class="code-name">.icon-zanting
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-yulan"></span>
<div class="name">
预览
</div>
<div class="code-name">.icon-yulan
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-zhiwencaijibiaoji"></span>
<div class="name">
指纹采集标记
</div>
<div class="code-name">.icon-zhiwencaijibiaoji
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-xingzhuang1"></span>
<div class="name">
采集logo
</div>
<div class="code-name">.icon-xingzhuang1
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-tishi"></span>
<div class="name">
提示
......@@ -999,6 +1149,86 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-tanhao2"></use>
</svg>
<div class="name">叹号</div>
<div class="code-name">#icon-tanhao2</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-PDF"></use>
</svg>
<div class="name">PDF</div>
<div class="code-name">#icon-PDF</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-WORD"></use>
</svg>
<div class="name">Word</div>
<div class="code-name">#icon-WORD</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-excel"></use>
</svg>
<div class="name">Excel</div>
<div class="code-name">#icon-excel</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-keshihuaqiehuan"></use>
</svg>
<div class="name">可视化切换</div>
<div class="code-name">#icon-keshihuaqiehuan</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-baobiao1"></use>
</svg>
<div class="name">报表</div>
<div class="code-name">#icon-baobiao1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-zanting"></use>
</svg>
<div class="name">暂停</div>
<div class="code-name">#icon-zanting</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-yulan"></use>
</svg>
<div class="name">预览</div>
<div class="code-name">#icon-yulan</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-zhiwencaijibiaoji"></use>
</svg>
<div class="name">指纹采集标记</div>
<div class="code-name">#icon-zhiwencaijibiaoji</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-xingzhuang1"></use>
</svg>
<div class="name">采集logo</div>
<div class="code-name">#icon-xingzhuang1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-tishi"></use>
</svg>
<div class="name">提示</div>
......
public/iconfont/iconfont.css
@font-face {
font-family: "iconfont"; /* Project id 2961960 */
src: url('iconfont.woff2?t=1641955164800') format('woff2'),
url('iconfont.woff?t=1641955164800') format('woff'),
url('iconfont.ttf?t=1641955164800') format('truetype');
src: url('iconfont.woff2?t=1642564860670') format('woff2'),
url('iconfont.woff?t=1642564860670') format('woff'),
url('iconfont.ttf?t=1642564860670') format('truetype');
}
.iconfont {
......@@ -13,6 +13,46 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-tanhao2:before {
content: "\e651";
}
.icon-PDF:before {
content: "\e650";
}
.icon-WORD:before {
content: "\e64f";
}
.icon-excel:before {
content: "\e64e";
}
.icon-keshihuaqiehuan:before {
content: "\e64d";
}
.icon-baobiao1:before {
content: "\e64c";
}
.icon-zanting:before {
content: "\e615";
}
.icon-yulan:before {
content: "\e613";
}
.icon-zhiwencaijibiaoji:before {
content: "\e614";
}
.icon-xingzhuang1:before {
content: "\e64b";
}
.icon-tishi:before {
content: "\e649";
}
......
public/iconfont/iconfont.json
......@@ -6,6 +6,76 @@
"description": "",
"glyphs": [
{
"icon_id": "27311234",
"name": "叹号",
"font_class": "tanhao2",
"unicode": "e651",
"unicode_decimal": 58961
},
{
"icon_id": "27229233",
"name": "PDF",
"font_class": "PDF",
"unicode": "e650",
"unicode_decimal": 58960
},
{
"icon_id": "27229222",
"name": "Word",
"font_class": "WORD",
"unicode": "e64f",
"unicode_decimal": 58959
},
{
"icon_id": "27229195",
"name": "Excel",
"font_class": "excel",
"unicode": "e64e",
"unicode_decimal": 58958
},
{
"icon_id": "27227907",
"name": "可视化切换",
"font_class": "keshihuaqiehuan",
"unicode": "e64d",
"unicode_decimal": 58957
},
{
"icon_id": "27227902",
"name": "报表",
"font_class": "baobiao1",
"unicode": "e64c",
"unicode_decimal": 58956
},
{
"icon_id": "27193829",
"name": "暂停",
"font_class": "zanting",
"unicode": "e615",
"unicode_decimal": 58901
},
{
"icon_id": "27193722",
"name": "预览",
"font_class": "yulan",
"unicode": "e613",
"unicode_decimal": 58899
},
{
"icon_id": "27193723",
"name": "指纹采集标记",
"font_class": "zhiwencaijibiaoji",
"unicode": "e614",
"unicode_decimal": 58900
},
{
"icon_id": "27193537",
"name": "采集logo",
"font_class": "xingzhuang1",
"unicode": "e64b",
"unicode_decimal": 58955
},
{
"icon_id": "27150195",
"name": "提示",
"font_class": "tishi",
......
public/index.html
......@@ -31,13 +31,13 @@
* {
padding: 0;
margin: 0 auto;
/* -moz-user-select: none;
-moz-user-select: none;
-o-user-select: none;
-khtml-user-select: none;
-webkit-user-select: none;
-ms-user-select: none;
user-select: none; */
/* cursor: default; */
user-select: none;
/*cursor: default;*/
}
img {
-webkit-user-drag: none;
......
src/views/Editor/modules/rydaxx.scss
......@@ -161,16 +161,16 @@
width: 16px;
height: 16px;
&::before {
content: " ";
width: 16px;
height: 16px;
background-image: url("../../../assets/img/inputerror.png");
background-repeat: no-repeat;
background-size: cover;
top: 12px;
right: 0;
position: absolute;
font-family: "iconfont";
content: "\e628";
//width: 16px;
//height: 16px;
//background-image: url("../../../assets/img/inputerror.png");
//background-repeat: no-repeat;
//background-size: cover;
//top: 12px;
//right: 0;
//position: absolute;
}
}
......
src/views/zzwcj/fingerprint.scss
......@@ -1286,10 +1286,17 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
img {
cursor: pointer;
}
span {
color: $picSelected;
}
}
.pic.select:hover {
cursor: pointer;
border: 2px solid $pichover;
//border: 2px solid $pichover;
border: 3px solid $picSelected;
span {
color: $picSelected;
}
}
.score.success {
position: absolute;
......@@ -2940,9 +2947,12 @@ $foundColor: var(--foundColor,#ffffff);//ffc005
background:$cirBackground;
font-size: 12px;
border-radius: 50%;
padding: 3px 8px;
//padding: 3px 8px;
// color: #fff;
color:$cirDuigou
color:$cirDuigou;
display: flex;
justify-content: center;
align-items: center;
}
span {
......
src/views/zzwcj/fingerprint.vue
......@@ -19,7 +19,7 @@
</div>
<div style="display: flex;margin-left: 12.75rem;">
<div class="fir">
<div class="cir">√</div>
<div class="cir iconfont icon-duihao"></div>
<span>人员信息 </span>
<div class="solid"></div>
</div>
......@@ -406,19 +406,17 @@
</div>
<div class="btns-dialog">
<!-- 采集成功弹窗 -->
<el-dialog title="提示" :visible.sync="finishVisible" width="30rem" :modal-append-to-body='false'>
<el-dialog title="提示" :visible.sync="finishVisible" width="30rem" :modal-append-to-body='false' :close-on-click-modal="false">
<span>当前页面所有指位均采集完成，是否确认上传？</span>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="uploadFinger">上传</el-button>
<el-button type="primary" @click="finishVisible = false">取消</el-button>
</span>
</el-dialog>
<!-- 采集不成功弹窗 -->
<el-dialog title="提示" :visible.sync="failVisible" width="30rem" :modal-append-to-body='false'>
<el-dialog title="提示" :visible.sync="failVisible" width="30rem" :modal-append-to-body='false' :close-on-click-modal="false">
<span>当前页面有未采集指位，确定要结束采集吗？<br>选择“是”，未采集指位将被置为缺指。</span>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="setFinger">是</el-button>
<el-button type="default" @click="failVisible = false">否</el-button>
</span>
......@@ -605,15 +603,14 @@
<div class="left">
<div class="icon">
<img v-if="themeType == '深色' || themeType == '浅色'" src="../../assets/img/zw/info.png" alt="">
<span v-if="themeType == '默认'" style="color: #005fe7;">
&#xe651;
<span v-if="themeType == '默认'" class="iconfont icon-tanhao2" style="color: #fff;">
</span>
</div>
<div class="title">{{errTitle}}</div>
</div>
<div class="close" @click="closeAlert">
<img v-if="themeType == '深色' || themeType == '浅色'" src="../../assets/img/zw/close.png" alt="">
<span v-if="themeType == '默认'" style="color: #005fe7;">
<span v-if="themeType == '默认'" class="iconfont" style="color: #fff;">
&#xe648;
</span>
</div>
......@@ -623,7 +620,7 @@
</div>
<!-- 重复采集弹窗 -->
<div class="repeatDialog">
<el-dialog title="提示" :visible.sync="repeatVisible" width="30rem" :modal-append-to-body='false'>
<el-dialog title="提示" :visible.sync="repeatVisible" width="30rem" :modal-append-to-body='false' @close="cancelRepeat" :close-on-click-modal="false">
<span>当前有重复指位采集，是否继续?</span>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="setRepeat">是</el-button>
......@@ -1382,8 +1379,10 @@ export default {
this.deviceModel = result.productName
this.deviceSn = result.serialNumber
this.iBversion.deviceSN = result.serialNumber
if(result.serialNumber) {
this.pop = false
this.isAlter = false
}
} catch (error) {
//console.log(error);
}
......@@ -2291,8 +2290,10 @@ export default {
self.clickTimes = 0; // 单击清零
// 触发单击事件...
// alert(1)
if(finger.imgSrcR && finger.imgSrcL) {
self.lookFinger(finger, index, type)
}
}
}, 300)
if (self.clickTimes === 2) { //当点击次数为2
self.clickTimes = 0; //记得清零
......
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