Skip to content

F
founder_vue
Commit 64e88736 by 张超军
Options

对比度，正查页面

parent 3fc4c26f
Showing with 60 additions and 32 deletions
public/image-edit/js/tui-image-editor.js
...@@ -19033,6 +19033,7 @@ var ImageEditor = function () { ...@@ -19033,6 +19033,7 @@ var ImageEditor = function () {
}, { }, {
key: 'applyFilter', key: 'applyFilter',
value: function applyFilter(type, options, isSilent) { value: function applyFilter(type, options, isSilent) {
// debugger
var executeMethodName = isSilent ? 'executeSilent' : 'execute'; var executeMethodName = isSilent ? 'executeSilent' : 'execute';
return this[executeMethodName](_consts.commandNames.APPLY_FILTER, type, options); return this[executeMethodName](_consts.commandNames.APPLY_FILTER, type, options);
......
src/views/AllPersonnelBase/qbalk.vue
...@@ -814,7 +814,7 @@ const datas1 = [ ...@@ -814,7 +814,7 @@ const datas1 = [
border: none; border: none;
} }
width: 296px; width: 296px;
height: 40px; // height: 40px;
background: #ffffff; background: #ffffff;
border-radius: 4px; border-radius: 4px;
border: 1px solid #e6e6e8; border: 1px solid #e6e6e8;
......
src/views/Editor/modules/imageEd.scss
...@@ -1301,7 +1301,7 @@ $transOrigin: var(--transOrigin, 0px, 0px); ...@@ -1301,7 +1301,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8), box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8),
-4px -4px 4px 0px #ffffff; -4px -4px 4px 0px #ffffff;
border-radius: 4px; border-radius: 4px;
margin-right: 16px; margin-right: 12px;
margin-bottom: 16px; margin-bottom: 16px;
&:active { &:active {
background: #055fe7; background: #055fe7;
......
src/views/Editor/modules/imageEd.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 11:36:10 * @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-10-28 17:34:54 * @LastEditTime: 2021-10-29 15:47:32
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
...@@ -267,12 +267,12 @@ ...@@ -267,12 +267,12 @@
<input class="qb_v" type="text" v-model="inputBrightnessRange"> <input class="qb_v" type="text" v-model="inputBrightnessRange">
</div> </div>
</div> </div>
<!-- 亮度 --> <!-- 对比度 -->
<div class="contrast-ratio"> <div class="contrast-ratio">
<div class="title">对比度</div> <div class="title">对比度</div>
<div class="content"> <div class="content">
<input class="range-narrow" id="input-range-color-filter-value" type="range" min="0" :value="inputColorFilterRange" max="255" /> <input class="range-narrow" id="input-range-contrast-value" type="range" min="0" :value="inputContrastRange" max="255" />
<input class="qb_v" type="text" v-model="inputColorFilterRange"> <input class="qb_v" type="text" v-model="inputContrastRange">
</div> </div>
</div> </div>
</div> </div>
...@@ -288,6 +288,8 @@ import "@/icons/direction.svg"; ...@@ -288,6 +288,8 @@ import "@/icons/direction.svg";
export default { export default {
data () { data () {
return { return {
// 对比度
inputContrastRange: 0,
// 特征点id // 特征点id
tzdId: 0, tzdId: 0,
// 特征点开启 // 特征点开启
...@@ -532,6 +534,7 @@ export default { ...@@ -532,6 +534,7 @@ export default {
var $inputRangeBrightnessValue = $('#input-range-brightness-value'); var $inputRangeBrightnessValue = $('#input-range-brightness-value');
var $inputCheckBlend = $('#input-check-blend'); var $inputCheckBlend = $('#input-check-blend');
var $inputRangeColorFilterValue = $('#input-range-color-filter-value'); var $inputRangeColorFilterValue = $('#input-range-color-filter-value');
var $inputRangeContrastValue = $('#input-range-contrast-value')
var $imageFilterSubMenu = $('#image-filter-sub-menu'); var $imageFilterSubMenu = $('#image-filter-sub-menu');
...@@ -551,7 +554,7 @@ export default { ...@@ -551,7 +554,7 @@ export default {
}); });
this.imageEditor = imageEditor this.imageEditor = imageEditor
imageEditor.loadImageFromURL('img/finger.bmp', 'SampleImage').then(function (sizeValue) { imageEditor.loadImageFromURL('img/dogsleep.jpg', 'SampleImage').then(function (sizeValue) {
console.log(sizeValue); console.log(sizeValue);
imageEditor.clearUndoStack(); imageEditor.clearUndoStack();
}); });
...@@ -1087,6 +1090,14 @@ export default { ...@@ -1087,6 +1090,14 @@ export default {
}); });
}); });
// 对比度
$inputRangeContrastValue.on('change', function () {
self.inputContrastRange = this.value
applyOrRemoveFilter(true, 'contrast', {
contrast: this.value / 255,
});
})
this.$bus.on('ryzwbjImage', (sourceImage) => { this.$bus.on('ryzwbjImage', (sourceImage) => {
self.sourceImage = sourceImage self.sourceImage = sourceImage
imageEditor.loadImageFromURL('data:image/jpeg;base64,' + sourceImage, 'SampleImage').then(function (sizeValue) { imageEditor.loadImageFromURL('data:image/jpeg;base64,' + sourceImage, 'SampleImage').then(function (sizeValue) {
...@@ -2873,6 +2884,14 @@ export default { ...@@ -2873,6 +2884,14 @@ export default {
console.log(result); console.log(result);
}); });
}, },
// 对比度
inputContrastRange (newValue, oldValue) {
this.imageEditor.applyFilter('Contrast', {
contrast: parseInt(newValue, 10) / 255,
}).then(function (result) {
console.log(result);
});
},
inputColorFilterRange (newValue, oldValue) { inputColorFilterRange (newValue, oldValue) {
this.imageEditor.applyFilter('removeColor', { this.imageEditor.applyFilter('removeColor', {
distance: parseInt(newValue, 10) / 255, distance: parseInt(newValue, 10) / 255,
......
src/views/cxyrd/modules/LTSrc.vue
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
<div class="lt_middle"> <div class="lt_middle">
<!-- 源数据区 --> <!-- 源数据区 -->
<div class="lt_middle_src_data"> <div class="lt_middle_src_data">
<el-table ref="singleTable" highlight-current-row @current-change="handleCurrentChange" :data="dataList" class="lt_candidate_table border_radius" :height="tableHeight" @row-click="getFirgerPrintDetail" :row-class-name="tableRowClassName"> <el-table ref="singleTable" highlight-current-row @current-change="handleCurrentChange" :data="dataList" class="lt_candidate_table border_radius tableHeight" @row-click="getFirgerPrintDetail" :row-class-name="tableRowClassName">
<el-table-column prop="qqid" label="查询ID" width="80"></el-table-column> <el-table-column prop="qqid" label="查询ID" width="90"></el-table-column>
<el-table-column prop="barcode" label="源条码号" width="190"></el-table-column> <el-table-column prop="barcode" label="源条码号" width="auto"></el-table-column>
<el-table-column prop="fingerCount" label="枚数" width="80"></el-table-column> <el-table-column prop="fingerCount" label="枚数" width="70"></el-table-column>
</el-table> </el-table>
<div class="lt_middle_bottom"> <div class="lt_middle_bottom">
<span>该任务共计<b>{{total}}</b>条查询</span> <span>该任务共计<b>{{total}}</b>条查询</span>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
{{ Number(index+1) &lt; 9 ? ('0'+Number(index+1)) : Number(index+1) }} {{ Number(index+1) &lt; 9 ? ('0'+Number(index+1)) : Number(index+1) }}
</div> </div>
<br /> <br />
<img :src="'data:image/jpeg;base64,'+item.image" style="width: 106px;height: 106px;" /> <img :src="'data:image/jpeg;base64,'+item.image" style="width: 6.625rem;height: 6.625rem;" />
<div class="finger-tips"> <div class="finger-tips">
<!-- 认定完成 --> <!-- 认定完成 -->
<div class="affirmstatus1" v-if="item.affirmstatus==1"> <div class="affirmstatus1" v-if="item.affirmstatus==1">
...@@ -243,10 +243,12 @@ export default { ...@@ -243,10 +243,12 @@ export default {
changeTableHeight () { changeTableHeight () {
this.isShowPrint = !this.isShowPrint this.isShowPrint = !this.isShowPrint
if (!this.isShowPrint) { if (!this.isShowPrint) {
this.tableHeight = 810 document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '50.625rem');
// this.tableHeight = 810
this.options = '收缩' this.options = '收缩'
} else { } else {
this.tableHeight = 368 document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '23rem');
// this.tableHeight = 368
this.options = '展开' this.options = '展开'
} }
} }
...@@ -580,6 +582,10 @@ const datas = [ ...@@ -580,6 +582,10 @@ const datas = [
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
$tableHeight: var(--tableHeight, 368px);
.tableHeight {
height: $tableHeight;
}
/* 设置滚动条的样式 */ /* 设置滚动条的样式 */
::-webkit-scrollbar { ::-webkit-scrollbar {
width:6px; width:6px;
......
src/views/drFPTX/Index.vue
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
<el-dialog <el-dialog
style=" margin-top:10vh" style=" margin-top:10vh"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="480px" width="30rem"
:modal-append-to-body="false" :modal-append-to-body="false"
> >
<div v-if="showProgress"> <div v-if="showProgress">
...@@ -207,20 +207,20 @@ ...@@ -207,20 +207,20 @@
type="circle" type="circle"
:percentage="UploadPercent" :percentage="UploadPercent"
></el-progress> ></el-progress>
<div style="margin-top:15px; margin-bottom:15px;font-size: 14px;font-family: MicrosoftYaHei;color: #909090;">正在解析指纹文件，点击“取消”可终止处理</div> <div style="margin-top:.9375rem; margin-bottom:.9375rem;font-size: .875rem;font-family: MicrosoftYaHei;color: #909090;">正在解析指纹文件，点击“取消”可终止处理</div>
<el-button @click="abort">取 消</el-button> <el-button @click="abort">取 消</el-button>
</div> </div>
<div v-else> <div v-else>
<div> <div>
<img <img
style="width: 134px;height:134px" style="width: 8.375rem;height:8.375rem"
src="../../assets/img/drFptx/success.svg" src="../../assets/img/drFptx/success.svg"
alt="" alt=""
> >
</div> </div>
<div style="margin-top:15px; margin-bottom:15px;font-size: 14px;font-family: MicrosoftYaHei;color: #909090;">导出成功432条，失败34条</div> <div style="margin-top:.9375rem; margin-bottom:.9375rem;font-size: .875rem;font-family: MicrosoftYaHei;color: #909090;">导出成功432条，失败34条</div>
<el-button <el-button
style="background: #055FE7;border-radius: 4px; border-color:#055FE7;" style="background: #055FE7;border-radius: .25rem; border-color:#055FE7;"
type="primary" type="primary"
@click="goList" @click="goList"
>查看详情</el-button> >查看详情</el-button>
...@@ -239,10 +239,6 @@ export default { ...@@ -239,10 +239,6 @@ export default {
components: { components: {
}, },
mounted () { mounted () {
zoom('drFPTX')
window.addEventListener('resize', function () {
zoom('drFPTX')
})
}, },
data () { data () {
return { return {
...@@ -512,6 +508,12 @@ export default { ...@@ -512,6 +508,12 @@ export default {
/deep/.el-checkbox__input.is-checked + .el-checkbox__label { /deep/.el-checkbox__input.is-checked + .el-checkbox__label {
color: #333333; color: #333333;
} }
/deep/.el-table.el-table--fit.el-table--enable-row-hover {
height: 501px !important;
}
/deep/.el-table__body-wrapper.is-scrolling-none {
height: 499px !important;
}
.drFPTX { .drFPTX {
padding: 25px; padding: 25px;
} }
...@@ -574,7 +576,7 @@ export default { ...@@ -574,7 +576,7 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
width: 343px; width: 343px;
height: 40px; // height: 40px;
background: #ffffff; background: #ffffff;
border-radius: 4px; border-radius: 4px;
border: 1px solid #e6e6e8; border: 1px solid #e6e6e8;
...@@ -618,7 +620,7 @@ export default { ...@@ -618,7 +620,7 @@ export default {
display: flex; display: flex;
.left { .left {
display: flex; display: flex;
height: 610px; height: 560px;
width: 1392px; width: 1392px;
.el-col { .el-col {
.el-table { .el-table {
...@@ -680,16 +682,16 @@ export default { ...@@ -680,16 +682,16 @@ export default {
} }
} }
.right { .right {
height: 610px; height: 560px;
width: 161px; width: 161px;
.target { .target {
margin: 0 auto; margin: 0 auto;
width: 137px; width: 137px;
height: 610px; height: 560px;
border-radius: 6px; border-radius: 6px;
border: 1px solid #d1d1d1; border: 1px solid #d1d1d1;
.targetHead { .targetHead {
width: 137px; width: 135px;
height: 56px; height: 56px;
background: #f0f3f6; background: #f0f3f6;
border-radius: 6px 6px 0px 0px; border-radius: 6px 6px 0px 0px;
...@@ -719,7 +721,7 @@ export default { ...@@ -719,7 +721,7 @@ export default {
display: flex; display: flex;
.left { .left {
display: flex; display: flex;
height: 610px; height: 560px;
width: 1240px; width: 1240px;
margin-right: 14px; margin-right: 14px;
.el-col { .el-col {
...@@ -782,7 +784,7 @@ export default { ...@@ -782,7 +784,7 @@ export default {
} }
} }
.right { .right {
height: 610px; height: 560px;
width: 284px; width: 284px;
.head { .head {
display: flex; display: flex;
...@@ -804,7 +806,7 @@ export default { ...@@ -804,7 +806,7 @@ export default {
} }
.bottom { .bottom {
width: 284px; width: 284px;
height: 555px; height: 500px;
display: flex; display: flex;
border-radius: 0 0 6px 6px; border-radius: 0 0 6px 6px;
border: 1px solid #d1d1d1; border: 1px solid #d1d1d1;
...@@ -827,7 +829,7 @@ export default { ...@@ -827,7 +829,7 @@ export default {
.line { .line {
margin-top: 30px; margin-top: 30px;
width: 1px; width: 1px;
height: 490px; height: 440px;
border: 1px dashed #eeeeee; border: 1px dashed #eeeeee;
} }
.targetRight { .targetRight {
......
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