Commit 64e88736 by 张超军

对比度,正查页面

parent 3fc4c26f
...@@ -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);
......
...@@ -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;
......
...@@ -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;
......
<!-- <!--
* @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,
......
...@@ -3,59 +3,31 @@ ...@@ -3,59 +3,31 @@
<div class="confirm_header_search"> <div class="confirm_header_search">
<div class="display_style"> <div class="display_style">
<span><b>查询条件</b></span> <span><b>查询条件</b></span>
<div class="btn" @click="clearParams">清空</div> <div class="clear_btn" @click="clearParams">清空</div>
</div> </div>
<div class="width100 margin_top24_bottom24"> <div class="width100 margin_top24_bottom24">
<div class="display_style"> <div class="display_style">
<span>条码号:</span> <span>条码号:</span>
<el-input <el-input class="el_input" v-model="reqParam.contrastCustomSearchReq.barcode" placeholder="请输入条码号"></el-input>
class="el_input"
v-model="reqParam.contrastCustomSearchReq.barcode"
placeholder="请输入条码号"
></el-input>
</div> </div>
<div class="display_style"> <div class="display_style">
<span>用户ID:</span> <span>用户ID:</span>
<el-select <el-select class="el_select" v-model="reqParam.contrastCustomSearchReq.userid" @change="selectUserInfo">
class="el_select" <el-option v-for="item in userOption" :key="item.userid" :label="item.userdesc" :value="item.userid">
v-model="reqParam.contrastCustomSearchReq.userid"
@change="selectUserInfo"
>
<el-option
v-for="item in userOption"
:key="item.userid"
:label="item.userdesc"
:value="item.userid"
>
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div class="display_style"> <div class="display_style">
<span>查询ID:</span> <span>查询ID:</span>
<el-input <el-input class="el_input" placeholder="请输入查询ID" v-model="reqParam.contrastCustomSearchReq.qqid"></el-input>
class="el_input"
placeholder="请输入查询ID"
v-model="reqParam.contrastCustomSearchReq.qqid"
></el-input>
</div> </div>
<div class="display_style"> <div class="display_style">
<span>任务号:</span> <span>任务号:</span>
<el-input <el-input class="el_input" placeholder="请输入任务号" v-model="reqParam.contrastCustomSearchReq.qid"></el-input>
class="el_input"
placeholder="请输入任务号"
v-model="reqParam.contrastCustomSearchReq.qid"
></el-input>
</div> </div>
<div class="display_style"> <div class="display_style send_time">
<span>发送时间:</span> <span>发送时间:</span>
<el-date-picker <el-date-picker v-model="startEndDate" class="el_data_picker" type="daterange" range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间">
v-model="startEndDate"
class="el_data_picker"
type="daterange"
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
>
</el-date-picker> </el-date-picker>
</div> </div>
<!-- <div class="display_style">--> <!-- <div class="display_style">-->
...@@ -79,15 +51,11 @@ ...@@ -79,15 +51,11 @@
<div class="display_style"> <div class="display_style">
<label>查询类型:</label> <label>查询类型:</label>
<div v-for="(btn, index) in queryTypeBtns" :key="index"> <div v-for="(btn, index) in queryTypeBtns" :key="index">
<div <div class="btn" @click="getQueryType(btn, 'querytypes')" :class="[
class="btn"
@click="getQueryType(btn, 'querytypes')"
:class="[
reqParam.contrastCustomSearchReq.querytypes.includes(btn.value) reqParam.contrastCustomSearchReq.querytypes.includes(btn.value)
? 'btn-active' ? 'btn-active'
: '' : ''
]" ]">
>
{{ btn.name }} {{ btn.name }}
</div> </div>
</div> </div>
...@@ -95,15 +63,11 @@ ...@@ -95,15 +63,11 @@
<div class="display_style"> <div class="display_style">
<label>优先级:</label> <label>优先级:</label>
<div v-for="(btn, index) in queryClassBtns" :key="index"> <div v-for="(btn, index) in queryClassBtns" :key="index">
<div <div class="btn" @click="getQueryType(btn, 'queryclasss')" :class="[
class="btn"
@click="getQueryType(btn, 'queryclasss')"
:class="[
reqParam.contrastCustomSearchReq.queryclasss.includes(btn.value) reqParam.contrastCustomSearchReq.queryclasss.includes(btn.value)
? 'btn-active' ? 'btn-active'
: '' : ''
]" ]">
>
{{ btn.name }} {{ btn.name }}
</div> </div>
</div> </div>
...@@ -111,23 +75,17 @@ ...@@ -111,23 +75,17 @@
<div class="display_style"> <div class="display_style">
<label>是否远程:</label> <label>是否远程:</label>
<div v-for="(btn, index) in remoteFlagBtns" :key="index"> <div v-for="(btn, index) in remoteFlagBtns" :key="index">
<div <div class="btn" @click="getQueryType(btn, 'remoteflags')" :class="[
class="btn"
@click="getQueryType(btn, 'remoteflags')"
:class="[
reqParam.contrastCustomSearchReq.remoteflags.includes(btn.value) reqParam.contrastCustomSearchReq.remoteflags.includes(btn.value)
? 'btn-active' ? 'btn-active'
: '' : ''
]" ]">
>
{{ btn.name }} {{ btn.name }}
</div> </div>
</div> </div>
</div> </div>
<div class="display_style"> <div class="display_style">
<el-checkbox <el-checkbox><span>显示"{{ account }}"发查询用户查询</span></el-checkbox>
><span>显示"{{ account }}"发查询用户查询</span></el-checkbox
>
</div> </div>
</div> </div>
<div class="width100 margin_top24_bottom24 display_style"> <div class="width100 margin_top24_bottom24 display_style">
...@@ -135,15 +93,11 @@ ...@@ -135,15 +93,11 @@
<!-- -1:无效;0:等待比对;1:正在比对;9:比对出错;10:比对完成(等待认定);11:正在认定;19:认定出错;20:认定完成(等待复核);21:正在复核;29:复核出错;30;复合完成;99:标记删除--> <!-- -1:无效;0:等待比对;1:正在比对;9:比对出错;10:比对完成(等待认定);11:正在认定;19:认定出错;20:认定完成(等待复核);21:正在复核;29:复核出错;30;复合完成;99:标记删除-->
<div class="btn" @click="allQueryType()">全部</div> <div class="btn" @click="allQueryType()">全部</div>
<div v-for="(btn, index) in queryStateBtns" :key="index"> <div v-for="(btn, index) in queryStateBtns" :key="index">
<div <div class="btn" @click="getQueryType(btn, 'querystates')" :class="[
class="btn"
@click="getQueryType(btn, 'querystates')"
:class="[
reqParam.contrastCustomSearchReq.querystates.includes(btn.value) reqParam.contrastCustomSearchReq.querystates.includes(btn.value)
? 'btn-active' ? 'btn-active'
: '' : ''
]" ]">
>
{{ btn.name }} {{ btn.name }}
</div> </div>
</div> </div>
...@@ -159,14 +113,7 @@ ...@@ -159,14 +113,7 @@
全部数据&nbsp> 全部数据&nbsp>
<!-- <span>共找到{{ reqParam.page.total }}</span>--> <!-- <span>共找到{{ reqParam.page.total }}</span>-->
</div> </div>
<el-tag <el-tag style="margin-right: 10px;" :key="index" v-for="(tag, index) in dynamicTags" closable :disable-transitions="false" @close="handleClose(tag)">
style="margin-right: 10px;"
:key="index"
v-for="(tag, index) in dynamicTags"
closable
:disable-transitions="false"
@close="handleClose(tag)"
>
{{ tag.name }} {{ tag.name }}
</el-tag> </el-tag>
</div> </div>
...@@ -177,15 +124,8 @@ ...@@ -177,15 +124,8 @@
<el-dropdown trigger="click"> <el-dropdown trigger="click">
<el-button type="info">自定义列</el-button> <el-button type="info">自定义列</el-button>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-checkbox-group <el-checkbox-group v-model="checkedProps" @change="changeCheckbox">
v-model="checkedProps" <el-checkbox v-for="(item, index) in defaultTableProps" :label="item.prop" :key="index">
@change="changeCheckbox"
>
<el-checkbox
v-for="(item, index) in defaultTableProps"
:label="item.prop"
:key="index"
>
{{ item.colume }} {{ item.colume }}
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
...@@ -194,13 +134,7 @@ ...@@ -194,13 +134,7 @@
</div> </div>
<!-- 自定义列 止 --> <!-- 自定义列 止 -->
<!-- 复制条码号 起 --> <!-- 复制条码号 起 -->
<el-button <el-button type="info" v-clipboard:copy="barcode" @click="getBarcode" v-clipboard:success="onCopy" v-clipboard:error="onError">
type="info"
v-clipboard:copy="barcode"
@click="getBarcode"
v-clipboard:success="onCopy"
v-clipboard:error="onError"
>
复制条码 复制条码
</el-button> </el-button>
<!-- 复制条码号 止 --> <!-- 复制条码号 止 -->
...@@ -208,98 +142,45 @@ ...@@ -208,98 +142,45 @@
<!-- <el-button>发查询</el-button>--> <!-- <el-button>发查询</el-button>-->
</div> </div>
</div> </div>
<el-tag <el-tag style="width:100%;color:#666666;margin-top:1rem;" v-show="isShowTip">
style="width:100%;color:#666666;margin-top:16px;" <i class="el-icon-info" style="color:#055FE7;font-size:.9375rem"></i>
v-show="isShowTip"
>
<i class="el-icon-info" style="color:#055FE7;font-size:15px"></i>
已选择 已选择
<span style="color:#055FE7">{{ selectionData.length }}</span> 项​ <span style="color:#055FE7">{{ selectionData.length }}</span> 项​
<span v-html="'&nbsp;&nbsp;'"></span> <span v-html="'&nbsp;&nbsp;'"></span>
​服务调用总计:<span v-html="'&nbsp;&nbsp;'"></span>36.4万 ​服务调用总计:<span v-html="'&nbsp;&nbsp;'"></span>36.4万
<el-link <el-link type="primary" :underline="false" style="margin-left:1.25rem;" @click="toggleSelection()">清除</el-link>
type="primary"
:underline="false"
style="margin-left:20px;"
@click="toggleSelection()"
>清除</el-link
>
</el-tag> </el-tag>
<div class="confirm_main_table"> <div class="confirm_main_table">
<el-table <el-table style="width: 100%" class="mineral-table" border @selection-change="handleSelectionChange" height="450" ref="confirmTable" tooltip-effect="dark" :data="list" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" row-key="queryId" @row-click="confirm" @expand-change="hadnlExpandChange">
class="mineral-table" <el-table-column type="selection" height width="auto" v-if="isSelected"></el-table-column>
border <el-table-column prop="" label="任务号/查询号" width="225">
@selection-change="handleSelectionChange"
height="450"
ref="confirmTable"
tooltip-effect="dark"
:data="list"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
row-key="queryId"
@row-click="confirm"
@expand-change="hadnlExpandChange"
>
<el-table-column
type="selection"
height
width="auto"
v-if="isSelected"
></el-table-column>
<el-table-column prop="" label="任务号/查询号" width="155">
<template slot-scope="scope"> <template slot-scope="scope">
<svg-icon <svg-icon style="width: .875rem;height: .6875rem;margin-bottom: .125rem ;margin-left: .3125rem ;" v-if="scope.row.children || scope.row.children === null" icon-class="tree_f">
style="width: 14px;height: 11px;margin-bottom: 2px ;margin-left: 5px ;"
v-if="scope.row.children || scope.row.children === null"
icon-class="tree_f"
>
</svg-icon> </svg-icon>
<svg-icon <svg-icon style="width: .8125rem;height: .375rem;margin: 0 0 .1875rem 0 ;" v-else-if="!scope.row.children || scope.row.children !== null" icon-class="tree_c"></svg-icon>
style="width: 13px;height: 6px;margin: 0 0 3px 0 ;"
v-else-if="!scope.row.children || scope.row.children !== null"
icon-class="tree_c"
></svg-icon>
{{ {{
scope.row.children || scope.row.children === null scope.row.children || scope.row.children === null
? scope.row.qid ? scope.row.qid
: scope.row.qqid : scope.row.qqid
}} }}
<div <div v-show="scope.row.children && scope.row.children !== null" class="children-count">
v-show="scope.row.children && scope.row.children !== null"
class="children-count"
>
{{ scope.row.children ? scope.row.children.length : 0 }} {{ scope.row.children ? scope.row.children.length : 0 }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column v-for="(item, index) in tableProps" show-overflow-tooltip :key="index" :label="item.colume" :prop="item.prop" :width="item.width">
v-for="(item, index) in tableProps"
show-overflow-tooltip
:key="index"
:label="item.colume"
:prop="item.prop"
:width="item.width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="item.prop === 'querytype'"> <template v-if="item.prop === 'querytype'">
<div v-if="scope.row.querytype === '3'" style="color: #FFA219"> <div v-if="scope.row.querytype === '3'" style="color: #FFA219">
{{ scope.row.queryTypeName }} {{ scope.row.queryTypeName }}
</div> </div>
<div <div v-else-if="scope.row.querytype === '0'" style="color: #005FE7">
v-else-if="scope.row.querytype === '0'"
style="color: #005FE7"
>
{{ scope.row.queryTypeName }} {{ scope.row.queryTypeName }}
</div> </div>
<div <div v-else-if="scope.row.querytype === '1'" style="color:#E60012 ">
v-else-if="scope.row.querytype === '1'"
style="color:#E60012 "
>
{{ scope.row.queryTypeName }} {{ scope.row.queryTypeName }}
</div> </div>
<div <div v-else-if="scope.row.querytype === '2'" style="color:#08BD9E">
v-else-if="scope.row.querytype === '2'"
style="color:#08BD9E"
>
{{ scope.row.queryTypeName }} {{ scope.row.queryTypeName }}
</div> </div>
<div v-else> <div v-else>
...@@ -337,42 +218,19 @@ ...@@ -337,42 +218,19 @@
}} }}
</template> </template>
<template v-else> <template v-else>
{{ dataFormat(scope.row, item.prop) }}</template {{ dataFormat(scope.row, item.prop) }}</template>
>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="auto" label="操作"> <el-table-column width="auto" label="操作" align="left">
<template slot-scope="scope"> <template slot-scope="scope">
<div <div class="img" @click="edit(scope.row)" type="text" style="font-size:1.5rem" v-if="scope.row.barcode">
class="img"
@click="edit(scope.row)"
type="text"
style="font-size:24px"
v-if="scope.row.barcode"
>
<i> <i>
<img <img style="width:1rem;height:1rem;cursor: pointer;" :src="editUrl" alt />
style="width:16px;height:16px;cursor: pointer;
"
:src="editUrl"
alt
/>
</i> </i>
</div> </div>
<div <div v-if="scope.row.barcode" class="img" @click.stop="delOne(scope.row.qqid)" type="text" style="font-size:1.5rem">
v-if="scope.row.barcode"
class="img"
@click.stop="delOne(scope.row.qqid)"
type="text"
style="font-size:24px"
>
<i> <i>
<img <img style="width:.75rem;height:.875rem;cursor: pointer;" :src="delUrl" alt />
style="width:12px;height:14px;cursor: pointer;
"
:src="delUrl"
alt
/>
</i> </i>
</div> </div>
</template> </template>
...@@ -381,23 +239,11 @@ ...@@ -381,23 +239,11 @@
</div> </div>
</div> </div>
<div class="footer"> <div class="footer">
<span class="count" <span class="count">共{{ reqParam.page.total }} 条记录 第{{ reqParam.page.currPage }}/{{
>共{{ reqParam.page.total }} 条记录 第{{ reqParam.page.currPage }}/{{
Tpage Tpage
}}页</span }}页</span>
>
<div class="page"> <div class="page">
<el-pagination <el-pagination class="paging" background @size-change="handleSizeChange" @current-change="handleCurrPageChange" :current-page="reqParam.page.currPage" :page-sizes="[10, 20, 50, 100]" :page-size="reqParam.page.pageSize" layout="prev, pager, next" :total="reqParam.page.total">
class="paging"
background
@size-change="handleSizeChange"
@current-change="handleCurrPageChange"
:current-page="reqParam.page.currPage"
:page-sizes="[10, 20, 50, 100]"
:page-size="reqParam.page.pageSize"
layout="prev, pager, next"
:total="reqParam.page.total"
>
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
...@@ -418,7 +264,7 @@ import "@/icons/tree_c.svg"; ...@@ -418,7 +264,7 @@ import "@/icons/tree_c.svg";
export default { export default {
name: "QueryConfirm", name: "QueryConfirm",
components: { SvgIcon }, components: { SvgIcon },
data() { data () {
return { return {
isShowTip: false, //批量操作提示 isShowTip: false, //批量操作提示
// selectionData: [], // 表单选择项目 // selectionData: [], // 表单选择项目
...@@ -514,7 +360,7 @@ export default { ...@@ -514,7 +360,7 @@ export default {
}, },
watch: { watch: {
// 批量处理 // 批量处理
checkedProps(val) { checkedProps (val) {
this.tableProps = this.defaultTableProps.filter( this.tableProps = this.defaultTableProps.filter(
i => val.indexOf(i.prop) >= 0 i => val.indexOf(i.prop) >= 0
); );
...@@ -524,7 +370,7 @@ export default { ...@@ -524,7 +370,7 @@ export default {
}, },
computed: { computed: {
// 计算总页数 // 计算总页数
Tpage() { Tpage () {
return ( return (
Math.floor(this.reqParam.page.total / this.reqParam.page.pageSize) + 1 Math.floor(this.reqParam.page.total / this.reqParam.page.pageSize) + 1
); );
...@@ -532,7 +378,7 @@ export default { ...@@ -532,7 +378,7 @@ export default {
}, },
methods: { methods: {
// 获取认定列表 // 获取认定列表
search() { search () {
this.getParam(); this.getParam();
// console.info("请求===>", this.reqParam.contrastCustomSearchReq); // console.info("请求===>", this.reqParam.contrastCustomSearchReq);
this.$axios this.$axios
...@@ -550,7 +396,7 @@ export default { ...@@ -550,7 +396,7 @@ export default {
}); });
}, },
// 格式化参数 // 格式化参数
getParam() { getParam () {
if (this.startEndDate !== null) { if (this.startEndDate !== null) {
this.reqParam.contrastCustomSearchReq.sendTimeStart = moment( this.reqParam.contrastCustomSearchReq.sendTimeStart = moment(
this.startEndDate[0] this.startEndDate[0]
...@@ -561,7 +407,7 @@ export default { ...@@ -561,7 +407,7 @@ export default {
} }
}, },
// 选择用户下拉框变化时 当前页为1 // 选择用户下拉框变化时 当前页为1
selectUserInfo() { selectUserInfo () {
this.reqParam.page.currPage = 1; this.reqParam.page.currPage = 1;
console.info( console.info(
"当前选中的用户为-------->", "当前选中的用户为-------->",
...@@ -570,11 +416,11 @@ export default { ...@@ -570,11 +416,11 @@ export default {
this.search(); this.search();
}, },
// 清空用户id // 清空用户id
clearUser() { clearUser () {
this.reqParam.contrastCustomSearchReq.userid = null; this.reqParam.contrastCustomSearchReq.userid = null;
}, },
// 获取用户信息 // 获取用户信息
getUserInfo(val) { getUserInfo (val) {
var userInfo = []; var userInfo = [];
val.forEach(item => { val.forEach(item => {
var user = {}; var user = {};
...@@ -594,7 +440,7 @@ export default { ...@@ -594,7 +440,7 @@ export default {
// console.info("用户信息==>", this.userOption); // console.info("用户信息==>", this.userOption);
}, },
// 用户信息去重 // 用户信息去重
unique(arr) { unique (arr) {
// 需要唯一标识来对数组进行过滤 // 需要唯一标识来对数组进行过滤
// 定义常量res,值为一个map对象实例 // 定义常量res,值为一个map对象实例
const res = new Map(); const res = new Map();
...@@ -605,7 +451,7 @@ export default { ...@@ -605,7 +451,7 @@ export default {
); );
}, },
// 多条件查询 获取查询条件 // 多条件查询 获取查询条件
getQueryType(data, type) { getQueryType (data, type) {
let { name, value } = data; let { name, value } = data;
let list = this.reqParam.contrastCustomSearchReq[type]; let list = this.reqParam.contrastCustomSearchReq[type];
if (list.includes(value)) { if (list.includes(value)) {
...@@ -623,7 +469,7 @@ export default { ...@@ -623,7 +469,7 @@ export default {
this.search(); this.search();
}, },
// 格式化 // 格式化
dataFormat(row, prop) { dataFormat (row, prop) {
// colnum为使用了formatter的列 // colnum为使用了formatter的列
// clonum.property为当前列的prop值 // clonum.property为当前列的prop值
// row为当前行,是一个类数组对象,可通过[]拿值 // row为当前行,是一个类数组对象,可通过[]拿值
...@@ -634,7 +480,7 @@ export default { ...@@ -634,7 +480,7 @@ export default {
} }
}, },
// 优先级格式化 // 优先级格式化
queryClassFormat(row, colnum) { queryClassFormat (row, colnum) {
let prop = colnum.property; let prop = colnum.property;
let showProp = null; let showProp = null;
for (let i = 0; i < this.queryClassList.length; i++) { for (let i = 0; i < this.queryClassList.length; i++) {
...@@ -644,7 +490,7 @@ export default { ...@@ -644,7 +490,7 @@ export default {
return showProp; return showProp;
}, },
// 多选删除 // 多选删除
delMore() { delMore () {
// 检查table选择的数据 如果没有选择则不可以删除 // 检查table选择的数据 如果没有选择则不可以删除
if (this.selectionData.length === 0) { if (this.selectionData.length === 0) {
this.$message.error("请选择需要删除的数据!"); this.$message.error("请选择需要删除的数据!");
...@@ -658,7 +504,7 @@ export default { ...@@ -658,7 +504,7 @@ export default {
this.doDelete(qqid); this.doDelete(qqid);
}, },
// 单选删除 // 单选删除
delOne(val) { delOne (val) {
// 将传入的qqid转为数组 // 将传入的qqid转为数组
let qqid = []; let qqid = [];
qqid.push(val); qqid.push(val);
...@@ -666,7 +512,7 @@ export default { ...@@ -666,7 +512,7 @@ export default {
this.doDelete(qqid); this.doDelete(qqid);
}, },
// 请求删除接口 // 请求删除接口
doDelete(qqid) { doDelete (qqid) {
// 删除确认提示 // 删除确认提示
this.$confirm("是否确定删除已选择的数据?", "提示", { this.$confirm("是否确定删除已选择的数据?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
...@@ -693,7 +539,7 @@ export default { ...@@ -693,7 +539,7 @@ export default {
}); });
}, },
// 认定 // 认定
confirm(row) { confirm (row) {
// tt 查重 0 // tt 查重 0
if (row.querytype === "0") { if (row.querytype === "0") {
console.log(row); console.log(row);
...@@ -762,9 +608,9 @@ export default { ...@@ -762,9 +608,9 @@ export default {
} }
}, },
// 编辑 // 编辑
edit() {}, edit () { },
// 展开或关闭行 // 展开或关闭行
hadnlExpandChange(row, expanded) { hadnlExpandChange (row, expanded) {
// 获取展开标志 // 获取展开标志
this.expanded = expanded; this.expanded = expanded;
// 获取下标 // 获取下标
...@@ -815,7 +661,7 @@ export default { ...@@ -815,7 +661,7 @@ export default {
} }
}, },
// table表格选中获取数据 // table表格选中获取数据
handleSelectionChange(val) { handleSelectionChange (val) {
this.selectionData = val; this.selectionData = val;
console.log(this.selectionData); console.log(this.selectionData);
if (this.selectionData.length) { if (this.selectionData.length) {
...@@ -825,7 +671,7 @@ export default { ...@@ -825,7 +671,7 @@ export default {
} }
}, },
// 复制条码号 获取选中条码值 // 复制条码号 获取选中条码值
getBarcode() { getBarcode () {
let self = this; let self = this;
this.barcode = []; this.barcode = [];
// if (this.selectionData.length === 0) { // if (this.selectionData.length === 0) {
...@@ -846,7 +692,7 @@ export default { ...@@ -846,7 +692,7 @@ export default {
} }
}, },
// 复制成功时的回调函数 // 复制成功时的回调函数
onCopy(e) { onCopy (e) {
console.info(this.barcode); console.info(this.barcode);
this.$message({ this.$message({
type: "success", type: "success",
...@@ -855,27 +701,27 @@ export default { ...@@ -855,27 +701,27 @@ export default {
}); });
}, },
// 复制失败时的回调函数 // 复制失败时的回调函数
onError(e) { onError (e) {
this.$message.error("抱歉,复制条码号失败!"); this.$message.error("抱歉,复制条码号失败!");
}, },
// 自定义展示列 多选框 // 自定义展示列 多选框
changeCheckbox() { changeCheckbox () {
// console.info("默认", this.defaultTableProps); // console.info("默认", this.defaultTableProps);
// console.info("table", this.tableProps); // console.info("table", this.tableProps);
// console.info("选中", this.checkedProps); // console.info("选中", this.checkedProps);
}, },
// 当期页发生变化 // 当期页发生变化
handleCurrPageChange: function(val) { handleCurrPageChange: function (val) {
this.reqParam.page.currPage = val; this.reqParam.page.currPage = val;
this.search(); this.search();
}, },
// 每页展示数量发生变化 // 每页展示数量发生变化
handleSizeChange: function(val) { handleSizeChange: function (val) {
this.reqParam.page.pageSize = val; this.reqParam.page.pageSize = val;
this.search(); this.search();
}, },
// 标签关闭 isTag:是否为标签点击 // 标签关闭 isTag:是否为标签点击
handleClose(tag) { handleClose (tag) {
let { type, value } = tag; let { type, value } = tag;
this.dynamicTags = this.dynamicTags.filter(item => item.value !== value); this.dynamicTags = this.dynamicTags.filter(item => item.value !== value);
this.reqParam.contrastCustomSearchReq[ this.reqParam.contrastCustomSearchReq[
...@@ -886,7 +732,7 @@ export default { ...@@ -886,7 +732,7 @@ export default {
this.search(); this.search();
}, },
// 标签生成 // 标签生成
tagClick(name) { tagClick (name) {
if (this.dynamicTags.indexOf(name) === -1) { if (this.dynamicTags.indexOf(name) === -1) {
this.dynamicTags.push(name); this.dynamicTags.push(name);
} else { } else {
...@@ -894,7 +740,7 @@ export default { ...@@ -894,7 +740,7 @@ export default {
} }
}, },
// 全部状态 // 全部状态
allQueryType() { allQueryType () {
let newdynamicTags = []; let newdynamicTags = [];
this.dynamicTags.forEach((item, index) => { this.dynamicTags.forEach((item, index) => {
if (item.type !== "querystates") { if (item.type !== "querystates") {
...@@ -906,17 +752,17 @@ export default { ...@@ -906,17 +752,17 @@ export default {
this.reqParam.contrastCustomSearchReq.querytypes = []; this.reqParam.contrastCustomSearchReq.querytypes = [];
this.search(); this.search();
}, },
showHistory() { showHistory () {
this.historyDialogVisible = true; this.historyDialogVisible = true;
}, },
// 全部数据 // 全部数据
clearAll() { clearAll () {
this.dynamicTags = []; this.dynamicTags = [];
this.clearParams(); this.clearParams();
this.search(); this.search();
}, },
// 清空筛选条件 // 清空筛选条件
clearParams() { clearParams () {
// this.remoteFlag = null; // this.remoteFlag = null;
this.startEndDate = null; this.startEndDate = null;
this.reqParam.page.currPage = 1; this.reqParam.page.currPage = 1;
...@@ -939,7 +785,7 @@ export default { ...@@ -939,7 +785,7 @@ export default {
// this.tableProps = this.defaultTableProps; // this.tableProps = this.defaultTableProps;
// }, // },
// 批量操作 // 批量操作
batch() { batch () {
this.isSelected = !this.isSelected; this.isSelected = !this.isSelected;
}, },
/** /**
...@@ -947,7 +793,7 @@ export default { ...@@ -947,7 +793,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
toggleSelection(rows) { toggleSelection (rows) {
if (rows) { if (rows) {
rows.forEach(row => { rows.forEach(row => {
this.$refs.confirmTable.toggleRowSelection(row); this.$refs.confirmTable.toggleRowSelection(row);
...@@ -958,7 +804,7 @@ export default { ...@@ -958,7 +804,7 @@ export default {
console.log(this.selectionData); console.log(this.selectionData);
} }
}, },
mounted() { mounted () {
this.search(); this.search();
// zoom('confirm_base') // zoom('confirm_base')
// window.addEventListener('resize', function () { // window.addEventListener('resize', function () {
...@@ -1382,6 +1228,7 @@ b { ...@@ -1382,6 +1228,7 @@ b {
margin-right: 8px; margin-right: 8px;
display: block; display: block;
} }
.el-icon-arrow-down { .el-icon-arrow-down {
color: #999999; color: #999999;
border: #999999 1px solid; border: #999999 1px solid;
...@@ -1419,6 +1266,22 @@ b { ...@@ -1419,6 +1266,22 @@ b {
display: inline-block; display: inline-block;
margin: 5px 24px 5px 0; margin: 5px 24px 5px 0;
} }
.margin_top24_bottom24 {
display: flex;
align-items: center;
}
.send_time {
display: flex;
align-items: center;
/deep/.el-input__icon {
height: 32px;
}
/deep/ .el-input__icon.el-range__icon.el-icon-date {
position: absolute;
right: 6px;
}
}
.display_style span { .display_style span {
height: 24px; height: 24px;
font-size: 14px; font-size: 14px;
...@@ -1433,7 +1296,10 @@ b { ...@@ -1433,7 +1296,10 @@ b {
height: 32px; height: 32px;
background: #ffffff; background: #ffffff;
border-radius: 4px; border-radius: 4px;
border: 1px solid #e6e6e8; // border: 1px solid #e6e6e8;
}
/deep/.el-input__icon {
line-height: 32px !important;
} }
.el_data_picker { .el_data_picker {
width: 256px; width: 256px;
...@@ -1447,10 +1313,16 @@ b { ...@@ -1447,10 +1313,16 @@ b {
height: 32px; height: 32px;
background: #ffffff; background: #ffffff;
border-radius: 4px; border-radius: 4px;
border: 1px solid #e6e6e8; // border: 1px solid #e6e6e8;
}
/deep/.el-input__inner {
height: 32px !important;
} }
.btn { .btn {
width: fit-content; width: fit-content;
display: flex;
align-items: center;
justify-content: center;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
border: none; border: none;
height: 22px; height: 22px;
...@@ -1469,6 +1341,25 @@ b { ...@@ -1469,6 +1341,25 @@ b {
color: #055fe7; color: #055fe7;
} }
.clear_btn {
width: fit-content;
font-family: MicrosoftYaHei;
border: none;
height: 22px;
padding: 0;
margin: 0 12px 0 12px;
font-size: 14px;
font-weight: 350;
color: #333333;
cursor: pointer;
&:hover {
color: #055fe7;
}
&:active {
color: #055fe7;
}
}
.el-button--primary { .el-button--primary {
width: 96px; width: 96px;
height: 32px; height: 32px;
......
...@@ -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;
......
...@@ -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