Skip to content

F
founder_vue
Commit e2be3cfa by maxiaohan
Options

Merge remote-tracking branch 'origin/dev_zwpt' into dev_zwpt

parents 4b8d9fd7 a0cb0ec8
Showing with 1113 additions and 853 deletions
public/index.html
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:58:13 * @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-11-08 20:01:13 * @LastEditTime: 2021-11-12 17:43:47
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\public\index.html * @FilePath: \指纹系统\founder_vue\public\index.html
...@@ -18,8 +18,11 @@ ...@@ -18,8 +18,11 @@
<!-- <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">
<!-- <link rel="stylesheet" href="<%= BASE_URL %>image-edit/css/service-basic.css"> --> <!-- <link rel="stylesheet" href="<%= BASE_URL %>image-edit/css/service-basic.css"> -->
<title> <!-- <title>
<%= htmlWebpackPlugin.options.title %> <%= htmlWebpackPlugin.options.title %>
</title> -->
<title>
指纹系统
</title> </title>
</head> </head>
<style> <style>
......
src/components/ImageEd.scss
...@@ -1204,6 +1204,21 @@ div { ...@@ -1204,6 +1204,21 @@ div {
width: 142px; width: 142px;
height: 3px; height: 3px;
} }
/deep/ .el-slider__runway {
width: 142px;
height: 3px;
margin: 0;
}
/deep/ .el-slider__bar {
height: 3px;
background-color: #055FE7;
}
/deep/ .el-slider__button {
width: 10px;
height: 10px;
background: #FFFFFF;
border: 2px solid #055FE7;
}
.qb_v { .qb_v {
width: 34px; width: 34px;
height: 21px; height: 21px;
......
src/components/ImageEd.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-09 09:28:46 * @Date: 2021-09-09 09:28:46
* @LastEditTime: 2021-11-09 21:14:34 * @LastEditTime: 2021-11-12 21:00:12
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue * @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
...@@ -414,7 +414,8 @@ ...@@ -414,7 +414,8 @@
<div class="color-filter" v-show="optionsColorFilter"> <div class="color-filter" v-show="optionsColorFilter">
<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" /> <el-slider class="range-narrow" id="input-range-color-filter-value" v-model="inputColorFilterRange" :min="0" :max="255"></el-slider>
<!-- <input class="range-narrow" id="input-range-color-filter-value" type="range" min="0" :value="inputColorFilterRange" max="255" /> -->
<input class="qb_v" type="text" v-model="inputColorFilterRange"> <input class="qb_v" type="text" v-model="inputColorFilterRange">
</div> </div>
</div> </div>
...@@ -938,7 +939,7 @@ export default { ...@@ -938,7 +939,7 @@ export default {
console.log(111); console.log(111);
}, },
undoStackChanged: function (length) { undoStackChanged: function (length) {
console.log(length,'undoStackChanged') // console.log(length,'undoStackChanged')
if (length) { if (length) {
$btnUndo.removeClass('disabled'); $btnUndo.removeClass('disabled');
} else { } else {
...@@ -947,7 +948,7 @@ export default { ...@@ -947,7 +948,7 @@ export default {
resizeEditor(); resizeEditor();
}, },
redoStackChanged: function (length) { redoStackChanged: function (length) {
console.log(length,'redoStackChanged') // console.log(length,'redoStackChanged')
if (length) { if (length) {
$btnRedo.removeClass('disabled'); $btnRedo.removeClass('disabled');
} else { } else {
...@@ -4796,6 +4797,11 @@ export default { ...@@ -4796,6 +4797,11 @@ export default {
} }
}, },
watch: { watch: {
isActive(val){
if(val == false){
this.isShowSizeSynchro = false;
}
},
isSizeSynchro (newValue, oldValue) { isSizeSynchro (newValue, oldValue) {
// 监听同步原尺寸显示 // 监听同步原尺寸显示
if (newValue) { if (newValue) {
...@@ -4844,13 +4850,13 @@ export default { ...@@ -4844,13 +4850,13 @@ export default {
this.imageEditor.applyFilter('removeColor', { this.imageEditor.applyFilter('removeColor', {
distance: parseInt(newValue, 10) / 255, distance: parseInt(newValue, 10) / 255,
}).then(function (result) { }).then(function (result) {
console.log(result); // console.log(result);
}); });
} else { } else {
this.imageEditor2.applyFilter('removeColor', { this.imageEditor2.applyFilter('removeColor', {
distance: parseInt(newValue, 10) / 255, distance: parseInt(newValue, 10) / 255,
}).then(function (result) { }).then(function (result) {
console.log(result); // console.log(result);
}); });
} }
}, },
......
src/router/modules/index.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:58:13 * @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-11-11 17:06:35 * @LastEditTime: 2021-11-12 17:41:04
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js * @FilePath: \founder_vue\src\router\modules\index.js
...@@ -10,7 +10,12 @@ import leftMenu from './leftMenu' ...@@ -10,7 +10,12 @@ import leftMenu from './leftMenu'
export default [ export default [
{ {
path: "/", path: "/",
redirect: "/login1" // redirect: "/login1"
meta: {
title: "登录",
auth: "5"
},
component: () => import("@/views/login/Login1.vue")
}, },
{ {
path: "/login", path: "/login",
......
src/store/modules/mutations-types.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-11-04 13:14:49 * @Date: 2021-11-04 13:14:49
* @LastEditTime: 2021-11-11 11:46:50 * @LastEditTime: 2021-11-11 23:22:22
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\store\modules\mutations-types.js * @FilePath: \指纹系统\founder_vue\src\store\modules\mutations-types.js
...@@ -11,3 +11,5 @@ export const SET_TZDALL = 'setTzdall'; ...@@ -11,3 +11,5 @@ export const SET_TZDALL = 'setTzdall';
export const SET_AUTOTZDALL = 'setAutoTzdall'; export const SET_AUTOTZDALL = 'setAutoTzdall';
export const SET_ZYHZ = 'setZyhz'; export const SET_ZYHZ = 'setZyhz';
export const SET_YXHZ = 'setYxhz'; export const SET_YXHZ = 'setYxhz';
export const SET_AUTOYXHZ = 'setAutoYxhz'
export const SET_AUTOZYHZ = 'setAutoZyhz'
src/store/modules/zwbj.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-11-04 11:12:33 * @Date: 2021-11-04 11:12:33
* @LastEditTime: 2021-11-11 11:48:45 * @LastEditTime: 2021-11-11 23:22:08
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\store\modules\zwbj.js * @FilePath: \指纹系统\founder_vue\src\store\modules\zwbj.js
*/ */
import { SET_SEQ, SET_TZDALL, SET_AUTOTZDALL, SET_ZYHZ, SET_YXHZ } from "./mutations-types"; import { SET_SEQ, SET_TZDALL, SET_AUTOTZDALL, SET_ZYHZ, SET_YXHZ, SET_AUTOYXHZ, SET_AUTOZYHZ } from "./mutations-types";
const state = { const state = {
// 当前的指位 // 当前的指位
seq: '', seq: '',
...@@ -16,8 +16,12 @@ const state = { ...@@ -16,8 +16,12 @@ const state = {
autopretzdall: [], autopretzdall: [],
// 自由绘制数组 // 自由绘制数组
zyhz: [], zyhz: [],
// 自由绘制数组--自动
autozyhz: [],
// 圆形绘制数组 // 圆形绘制数组
yxhz: [] yxhz: [],
// 圆形绘制数组--自动
autoyxhz: []
}; };
const mutations = { const mutations = {
...@@ -35,7 +39,13 @@ const mutations = { ...@@ -35,7 +39,13 @@ const mutations = {
}, },
[SET_YXHZ] (state, content) { [SET_YXHZ] (state, content) {
state.yxhz = content state.yxhz = content
} },
[SET_AUTOYXHZ] (state, content) {
state.autoyxhz = content
},
[SET_AUTOZYHZ] (state, content) {
state.autozyhz = content
},
}; };
const actions = { const actions = {
......
src/views/AllPersonnelBase/AllPersonnelBase.vue
<template> <template>
<el-container <el-container
class="AllPersonnelBase" class="AllPersonnelBase"
direction='vertical' direction="vertical"
id="AllPersonnelBase" id="AllPersonnelBase"
> >
<!--一--> <!--一-->
<!-- <div class='title'>全部人员库</div> --> <!-- <div class='title'>全部人员库</div> -->
<!--二--> <!--二-->
<div class='search'> <div class="search">
<el-input <el-input
clear="search-input" clear="search-input"
placeholder="请输入条码，*支持模糊搜索" placeholder="请输入条码，*支持模糊搜索"
...@@ -19,13 +19,10 @@ ...@@ -19,13 +19,10 @@
</el-input> </el-input>
<i <i
class="el-icon-circle-close" class="el-icon-circle-close"
v-if="reqParam.personStoreCustomSearch.ysxtAsjxgrybh.length>0" v-if="reqParam.personStoreCustomSearch.ysxtAsjxgrybh.length > 0"
@click='empty' @click="empty"
></i> ></i>
<div <div class="search-icon el-icon-search" @click="search"></div>
class="search-icon el-icon-search"
@click="search"
></div>
<el-radio-group <el-radio-group
v-model="reqParam.personStoreCustomSearch.searchOptions" v-model="reqParam.personStoreCustomSearch.searchOptions"
@change="searchStyle" @change="searchStyle"
...@@ -38,10 +35,7 @@ ...@@ -38,10 +35,7 @@
<!-- 三 --> <!-- 三 -->
<div class="options"> <div class="options">
<div class="left"> <div class="left">
<div <div class="btn" @click="batch">批量操作</div>
class="btn"
@click="batch"
>批量操作</div>
<el-checkbox-group <el-checkbox-group
v-model="reqParam.personStoreCustomSearch.checkboxQuery" v-model="reqParam.personStoreCustomSearch.checkboxQuery"
@change="searchCheckList" @change="searchCheckList"
...@@ -53,59 +47,47 @@ ...@@ -53,59 +47,47 @@
</el-checkbox-group> </el-checkbox-group>
</div> </div>
<div class="right"> <div class="right">
<div <div class="btn" @click="isShowTjddlBtn">添加到队列</div>
class="btn"
@click="isShowTjddlBtn"
>添加到队列</div>
<div <div
class="btn" class="btn"
v-clipboard:copy="ysxtAsjxgrybh" v-clipboard:copy="ysxtAsjxgrybh"
@click="getysxtAsjxgrybh" @click="getysxtAsjxgrybh"
v-clipboard:success="onCopy" v-clipboard:success="onCopy"
v-clipboard:error="onError" v-clipboard:error="onError"
>复制条码</div> >
<div 复制条码
class="btn" </div>
@click="isShowDcftpxBtn" <div class="btn" @click="isShowDcftpxBtn">FPTX导出</div>
>FPTX导出</div> <div class="btn" @click="isShowGzBtn">关注</div>
<div <div class="btn" @click="delMore">删除</div>
class="btn" <div class="btn send" @click="isShowFcxBtn">发查询</div>
@click="isShowGzBtn"
>关注</div>
<div
class="btn"
@click="delMore"
>删除</div>
<div
class="btn send"
@click="isShowFcxBtn"
>发查询</div>
<button <button
:class="this.disabled?'btn disabled ':'btn new'" :class="this.disabled ? 'btn disabled ' : 'btn new'"
@click="isShowXzryBtn" @click="isShowXzryBtn"
:disabled="disabled" :disabled="disabled"
><i class="el-icon-plus"></i>新增人员</button> >
<i class="el-icon-plus"></i>新增人员
</button>
</div> </div>
</div> </div>
<!--四 --> <!--四 -->
<el-tag <el-tag
style="width:100%;color:#666666;margin-bottom:1rem" style="width: 100%; color: #666666; margin-bottom: 1rem"
v-show="isShowTip" v-show="isShowTip"
> >
<span v-html="'&nbsp;&nbsp;'"></span> <span v-html="'&nbsp;&nbsp;'"></span>
<i <i class="el-icon-info" style="color: #055fe7; font-size: 15px"></i>
class="el-icon-info" 已选择
style="color:#055FE7;font-size:15px" <span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
></i>
已选择 <span style="color:#055FE7">{{multipleSelection.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" type="primary"
:underline="false" :underline="false"
style="margin-left:1.25rem;" style="margin-left: 1.25rem"
@click="toggleSelection()" @click="toggleSelection()"
>清除</el-link> >清除</el-link
>
</el-tag> </el-tag>
<!-- 五 --> <!-- 五 -->
<el-table <el-table
...@@ -114,33 +96,21 @@ ...@@ -114,33 +96,21 @@
:data="tableDate" :data="tableDate"
:row-key="getRowKeys" :row-key="getRowKeys"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%;" style="width: 100%"
:class="{delSelection: !selectBoo}"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column <el-table-column
type="selection" type="selection"
width="auto"
v-if="isSelected"
:reserve-selection="true" :reserve-selection="true"
:width="width33"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="ysxtAsjxgrybh" label="人员编号" :width="width1">
prop="ysxtAsjxgrybh"
label="人员编号"
:width="width1"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="xm" label="姓名" :width="width2">
prop="xm"
label="姓名"
:width="width2"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="zjhm" label="身份证号" :width="width3">
prop="zjhm"
label="身份证号"
:width="width3"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
:formatter="dateTimeFormat" :formatter="dateTimeFormat"
...@@ -156,29 +126,13 @@ ...@@ -156,29 +126,13 @@
:formatter="xbdmFormat" :formatter="xbdmFormat"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="rollcount" label="滚动" :width="width5">
prop="rollcount"
label="滚动"
:width="width5"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="plancount" label="平面" :width="width5">
prop="plancount"
label="平面"
:width="width5"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="plamcount" label="掌纹" :width="width5">
prop="plamcount"
label="掌纹"
:width="width5"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="piccount" label="人像" :width="width5">
prop="piccount"
label="人像"
:width="width5"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="ifidcard" prop="ifidcard"
...@@ -194,29 +148,19 @@ ...@@ -194,29 +148,19 @@
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column fixed="right" label="操作" width="auto">
fixed="right"
label="操作"
width="auto"
>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="ops"> <div class="ops" @click="closeSelected">
<el-tooltip <el-tooltip
class="item" class="item"
effect="dark" effect="dark"
content="编辑" content="编辑"
placement="top" placement="top"
:open-delay='500' :open-delay="500"
@click="handleClick(scope.row)"
>
<div
class="icon bj"
@click="handleClick(scope.row)" @click="handleClick(scope.row)"
> >
<img <div class="icon bj" @click="handleClick(scope.row)">
src="../../assets/img/qbryk/bj.svg" <img src="../../assets/img/qbryk/bj.svg" alt="" />
alt=""
>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
...@@ -224,13 +168,9 @@ ...@@ -224,13 +168,9 @@
effect="dark" effect="dark"
content="关注" content="关注"
placement="top" placement="top"
:open-delay='500' :open-delay="500"
>
<div
v-if="scope.row.collectstatus==1"
class="icon sc"
> >
<div v-if="scope.row.collectstatus == 1" class="icon sc">
<el-popconfirm <el-popconfirm
placement="top-start" placement="top-start"
:hide-icon="true" :hide-icon="true"
...@@ -240,44 +180,25 @@ ...@@ -240,44 +180,25 @@
title="确认取消关注该数据吗？该操作无法撤消！" title="确认取消关注该数据吗？该操作无法撤消！"
> >
<div slot="reference"> <div slot="reference">
<img <img src="../../assets/img/qbryk/gz.svg" alt="" />
src="../../assets/img/qbryk/gz.svg"
alt=""
>
</div> </div>
</el-popconfirm> </el-popconfirm>
</div> </div>
<div <div v-else class="icon sc">
v-else <div class="icon sc" @click="isShowGzBtn1(scope.row)">
class="icon sc" <img src="../../assets/img/qbryk/sc.svg" alt="" />
>
<div
class="icon sc"
@click="isShowGzBtn1(scope.row)"
>
<img
src="../../assets/img/qbryk/sc.svg"
alt=""
>
</div> </div>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
class="item" class="item"
effect="dark" effect="dark"
content="改号" content="改号"
placement="top" placement="top"
:open-delay='500' :open-delay="500"
>
<div
class="icon gx"
@click='isShowGgrytmBtn(scope.row)'
>
<img
src="../../assets/img/qbryk/gx.svg"
alt=""
> >
<div class="icon gx" @click="isShowGgrytmBtn(scope.row)">
<img src="../../assets/img/qbryk/gx.svg" alt="" />
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
...@@ -285,16 +206,10 @@ ...@@ -285,16 +206,10 @@
effect="dark" effect="dark"
content="发查询" content="发查询"
placement="top" placement="top"
:open-delay='500' :open-delay="500"
>
<div
class="icon look"
@click="isShowFcxBtn1(scope.row)"
>
<img
src="../../assets/img/qbryk/search.svg"
alt=""
> >
<div class="icon look" @click="isShowFcxBtn1(scope.row)">
<img src="../../assets/img/qbryk/search.svg" alt="" />
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
...@@ -302,16 +217,10 @@ ...@@ -302,16 +217,10 @@
effect="dark" effect="dark"
content="复制数据" content="复制数据"
placement="top" placement="top"
:open-delay='500' :open-delay="500"
>
<div
class="icon bz"
@click='isShowFztmBtn(scope.row)'
>
<img
src="../../assets/img/qbryk/bz.svg"
alt=""
> >
<div class="icon bz" @click="isShowFztmBtn(scope.row)">
<img src="../../assets/img/qbryk/bz.svg" alt="" />
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
...@@ -319,16 +228,10 @@ ...@@ -319,16 +228,10 @@
effect="dark" effect="dark"
content="打印" content="打印"
placement="top" placement="top"
:open-delay='500' :open-delay="500"
>
<div
class="icon print"
@click="handleClick(scope.row)"
>
<img
src="../../assets/img/qbryk/print.svg"
alt=""
> >
<div class="icon print" @click="handleClick(scope.row)">
<img src="../../assets/img/qbryk/print.svg" alt="" />
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
...@@ -336,7 +239,7 @@ ...@@ -336,7 +239,7 @@
effect="dark" effect="dark"
content="删除" content="删除"
placement="top" placement="top"
:open-delay='500' :open-delay="500"
> >
<el-popconfirm <el-popconfirm
placement="top-start" placement="top-start"
...@@ -347,10 +250,7 @@ ...@@ -347,10 +250,7 @@
title="确认要删除该数据吗？该操作无法撤消！" title="确认要删除该数据吗？该操作无法撤消！"
> >
<div slot="reference"> <div slot="reference">
<img <img src="../../assets/img/qbryk/del.svg" alt="" />
src="../../assets/img/qbryk/del.svg"
alt=""
>
</div> </div>
</el-popconfirm> </el-popconfirm>
</el-tooltip> </el-tooltip>
...@@ -360,9 +260,13 @@ ...@@ -360,9 +260,13 @@
</el-table> </el-table>
<!-- 六 --> <!-- 六 -->
<div class="block"> <div class="block">
<span class="record">共{{ reqParam.page.total }}条记录 第{{ reqParam.page.currPage }}/{{ Tpage }}页</span> <span class="record"
>共{{ reqParam.page.total }}条记录 第{{ reqParam.page.currPage }}/{{
Tpage
}}页</span
>
<el-pagination <el-pagination
class='paging' class="paging"
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="reqParam.page.currPage" :current-page="reqParam.page.currPage"
...@@ -418,25 +322,21 @@ ...@@ -418,25 +322,21 @@
> >
</fcx> </fcx>
<!-- 新增案件弹窗 --> <!-- 新增案件弹窗 -->
<xzry <xzry :isShowXzry="isShowXzry" @closeXzry="closeXzry"> </xzry>
:isShowXzry="isShowXzry"
@closeXzry="closeXzry"
>
</xzry>
</div> </div>
</el-container> </el-container>
</template> </template>
<script> <script>
import moment from "moment"; import moment from "moment";
import tjddl from "./modules/tjddl.vue" // 添加到队列弹窗 import tjddl from "./modules/tjddl.vue"; // 添加到队列弹窗
import gz from "./modules/gz.vue" // 关注 import gz from "./modules/gz.vue"; // 关注
import fztm from "./modules/fztm.vue" // 复制数据弹窗 import fztm from "./modules/fztm.vue"; // 复制数据弹窗
import dcftpx from "./modules/dcftpx.vue" //导出FPTX弹窗 import dcftpx from "./modules/dcftpx.vue"; //导出FPTX弹窗
import ggrytm from "./modules/ggrytm.vue"// 更改人员条码弹窗 import ggrytm from "./modules/ggrytm.vue"; // 更改人员条码弹窗
import fcx from "./modules/fcx.vue" // 发查询弹窗 import fcx from "./modules/fcx.vue"; // 发查询弹窗
import xzry from "./modules/xzry.vue"// 新增案件 import xzry from "./modules/xzry.vue"; // 新增案件
export default { export default {
name: 'AllPersonnelBase', name: "AllPersonnelBase",
components: { components: {
tjddl, tjddl,
gz, gz,
...@@ -444,21 +344,23 @@ export default { ...@@ -444,21 +344,23 @@ export default {
dcftpx, dcftpx,
ggrytm, ggrytm,
fcx, fcx,
xzry xzry,
}, },
created () { created() {
let w1 = 1920 let w1 = 1920;
let w2 = window.innerWidth let w2 = window.innerWidth;
this.height = this.height * w2 / w1 this.height = (this.height * w2) / w1;
this.width1 = this.width1 * w2 / w1 this.width1 = (this.width1 * w2) / w1;
this.width2 = this.width2 * w2 / w1 this.width2 = (this.width2 * w2) / w1;
this.width3 = this.width3 * w2 / w1 this.width3 = (this.width3 * w2) / w1;
this.width4 = this.width4 * w2 / w1 this.width4 = (this.width4 * w2) / w1;
this.width5 = this.width5 * w2 / w1 this.width5 = (this.width5 * w2) / w1;
}, },
data () { data() {
return { return {
width33:"50",
selectBoo: false,// 是否批量操作
width5: 80, width5: 80,
width4: 110, width4: 110,
width3: 180, width3: 180,
...@@ -466,56 +368,65 @@ export default { ...@@ -466,56 +368,65 @@ export default {
width1: 220, width1: 220,
height: 550, height: 550,
disabled: false, // 新增人员按钮状态 disabled: false, // 新增人员按钮状态
isSelected: false,// 是否批量操作 isShowTjddl: false, // 添加到队列
isShowTjddl: false,// 添加到队列 isShowGz: false, // 关注
isShowGz: false,// 关注
isShowDcftpx: false, // 导出FPTX isShowDcftpx: false, // 导出FPTX
isShowGgrytm: false,// 更改人员条码 isShowGgrytm: false, // 更改人员条码
isShowFztm: false, //复制条码 isShowFztm: false, //复制条码
isShowFcx: false, //发查询 isShowFcx: false, //发查询
isShowXzry: false, // 新增人员 isShowXzry: false, // 新增人员
type: 'ry', // 人员还是案件 type: "ry", // 人员还是案件
rowData: {}, // 单行数据 rowData: {}, // 单行数据
ysxtAsjxgrybh: null, ysxtAsjxgrybh: null,
reqParam: { // 请求参数 reqParam: {
// 请求参数
page: { page: {
total: 0,//表格条数 total: 0, //表格条数
pageSize: 10, //当前选择要显示的条数 pageSize: 10, //当前选择要显示的条数
currPage: 1 // 当前在第几页 currPage: 1, // 当前在第几页
}, },
personStoreCustomSearch: { personStoreCustomSearch: {
ysxtAsjxgrybh: '', // 搜索框内容 ysxtAsjxgrybh: "", // 搜索框内容
searchOptions: 3, // 默认搜索方式 searchOptions: 3, // 默认搜索方式
checkboxQuery: [], //滚动平面等筛选条件 checkboxQuery: [], //滚动平面等筛选条件
} },
}, },
tableDate: [ tableDate: [
{ {
ysxtAsjxgrybh: 'B00000022111452111214211', ysxtAsjxgrybh: "B00000022111452111214211",
xm: '王小虎', xm: "王小虎",
zjhm: '46000000232********', zjhm: "46000000232********",
csrq: '1996-07-21', csrq: "1996-07-21",
xbdm: '1', xbdm: "1",
rollcount: '10', rollcount: "10",
plancount: '10', plancount: "10",
plamcount: '10', plamcount: "10",
piccount: '10', piccount: "10",
ifidcard: '1', ifidcard: "1",
nydwGajgmc: '海南省海口市公安局ssssssssssssssssssssssssssss' nydwGajgmc: "海南省海口市公安局ssssssssssssssssssssssssssss",
} },
], // 人员列表数据 ], // 人员列表数据
multipleSelection: [], // 表单选择项目 multipleSelection: [], // 表单选择项目
isShowTip: false,//批量操作提示 isShowTip: false, //批量操作提示
selectionData: [], selectionData: [],
}; };
}, },
methods: { methods: {
cellClass(row){
if (row.columnIndex === 0) {
return 'disableheadselection'
}
},
closeSelected() {
this.selectBoo = false;
this.toggleSelection();
},
// 获取全部人员列表请求 // 获取全部人员列表请求
search () { search() {
// console.info("请求===>", this.reqParam); // console.info("请求===>", this.reqParam);
this.$axios this.$axios
.post("/api/personstore/allperson", this.reqParam) .post("/api/personstore/allperson", this.reqParam)
.then(response => { .then((response) => {
if (response.data.code === 0) { if (response.data.code === 0) {
this.tableDate = response.data.ret.list; this.tableDate = response.data.ret.list;
this.reqParam.page.total = response.data.ret.total; this.reqParam.page.total = response.data.ret.total;
...@@ -527,86 +438,85 @@ export default { ...@@ -527,86 +438,85 @@ export default {
}); });
}, },
// 保存选中的数据,row-key就是要指定一个key标识这一行的数据 // 保存选中的数据,row-key就是要指定一个key标识这一行的数据
getRowKeys (row) { getRowKeys(row) {
return row.id return row.id;
}, },
// 清空输入框 // 清空输入框
empty () { empty() {
this.reqParam.personStoreCustomSearch.ysxtAsjxgrybh = '' this.reqParam.personStoreCustomSearch.ysxtAsjxgrybh = "";
this.search() this.search();
}, },
// 新增案件操作 // 新增案件操作
isShowXzryBtn () { isShowXzryBtn() {
this.isShowXzry = true; this.isShowXzry = true;
}, },
closeXzry (val) { closeXzry(val) {
console.log('新增人员关闭', val) console.log("新增人员关闭", val);
this.isShowXzry = val this.isShowXzry = val;
this.search() this.search();
}, },
// 时间格式化 // 时间格式化
dateTimeFormat (row, colnum) { dateTimeFormat(row, colnum) {
let prop = colnum.property; let prop = colnum.property;
return row[prop] ? moment(row[prop]).format("YYYY-MM-DD") : "---"; return row[prop] ? moment(row[prop]).format("YYYY-MM-DD") : "---";
}, },
// 性别格式化 // 性别格式化
xbdmFormat (row, colnum) { xbdmFormat(row, colnum) {
let xbdm = row.xbdm; let xbdm = row.xbdm;
let showProp = null; let showProp = null;
if (xbdm == 0) { if (xbdm == 0) {
showProp = '未知' showProp = "未知";
} else if (xbdm == 1) { } else if (xbdm == 1) {
showProp = '男' showProp = "男";
} else if (xbdm == 2) { } else if (xbdm == 2) {
showProp = '女' showProp = "女";
} else if (xbdm == 9) { } else if (xbdm == 9) {
showProp = '未说明' showProp = "未说明";
} else { } else {
showProp = '---' showProp = "---";
} }
return showProp; return showProp;
}, },
// 是否采集二代证格式化 // 是否采集二代证格式化
ifidcardFormat (row, colnum) { ifidcardFormat(row, colnum) {
let ifidcard = row.ifidcard; let ifidcard = row.ifidcard;
let showProp = null; let showProp = null;
if (ifidcard == 1) { if (ifidcard == 1) {
showProp = '是' showProp = "是";
} else if (ifidcard == 0) { } else if (ifidcard == 0) {
showProp = '否' showProp = "否";
} else { } else {
showProp = '未知' showProp = "未知";
} }
return showProp; return showProp;
}, },
// 搜索方式 // 搜索方式
searchStyle (val) { searchStyle(val) {
// console.log(val, '搜索方式') // console.log(val, '搜索方式')
this.reqParam.page.searchOptions = val this.reqParam.page.searchOptions = val;
// console.log(this.reqParam.page.searchOptions) // console.log(this.reqParam.page.searchOptions)
}, },
//滚动平面等筛选条件 //滚动平面等筛选条件
searchCheckList (val) { searchCheckList(val) {
console.log(val, '筛选条件') console.log(val, "筛选条件");
this.reqParam.page.checkboxQuery = val this.reqParam.page.checkboxQuery = val;
console.log(this.reqParam.page.checkboxQuery) console.log(this.reqParam.page.checkboxQuery);
this.search() this.search();
}, },
// 复制条码号 获取选中条码值 // 复制条码号 获取选中条码值
getysxtAsjxgrybh () { getysxtAsjxgrybh() {
let self = this; let self = this;
this.ysxtAsjxgrybh = []; this.ysxtAsjxgrybh = [];
if (this.multipleSelection.length === 0) { if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要复制条码号的数据！"); this.$message.error("请选择需要复制条码号的数据！");
this.isSelected = true this.selectBoo = true;
} else { } else {
self.multipleSelection.forEach(item => { self.multipleSelection.forEach((item) => {
self.ysxtAsjxgrybh.push(item.ysxtAsjxgrybh); self.ysxtAsjxgrybh.push(item.ysxtAsjxgrybh);
}); });
this.ysxtAsjxgrybh = this.ysxtAsjxgrybh.join(","); this.ysxtAsjxgrybh = this.ysxtAsjxgrybh.join(",");
} }
// else if (this.multipleSelection.length === 1) { // else if (this.multipleSelection.length === 1) {
// this.ysxtAsjxgrybh = this.multipleSelection[0].ysxtAsjxgrybh; // this.ysxtAsjxgrybh = this.multipleSelection[0].ysxtAsjxgrybh;
// } else { // } else {
...@@ -614,101 +524,104 @@ export default { ...@@ -614,101 +524,104 @@ export default {
// } // }
}, },
// 复制成功时的回调函数 // 复制成功时的回调函数
onCopy (e) { onCopy(e) {
this.$message({ this.$message({
type: "success", type: "success",
// message: "复制条码号:" + this.ysxtAsjxgrybh + "成功！" // message: "复制条码号:" + this.ysxtAsjxgrybh + "成功！"
message: "已复制到剪切板" message: "已复制到剪切板",
}); });
}, },
// 复制失败时的回调函数 // 复制失败时的回调函数
onError (e) { onError(e) {
this.$message.error("抱歉，复制条码号失败！"); this.$message.error("抱歉，复制条码号失败！");
}, },
// 添加到队列 // 添加到队列
isShowTjddlBtn () { isShowTjddlBtn() {
console.log('添加到队列') console.log("添加到队列");
if (this.multipleSelection.length === 0) { if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要添加到队列的数据！"); this.$message.error("请选择需要添加到队列的数据！");
this.isSelected = true this.selectBoo = true;
} else { } else {
this.rowData = this.multipleSelection this.rowData = this.multipleSelection;
this.isShowTjddl = true; this.isShowTjddl = true;
} }
}, },
closeTjddl (val) { closeTjddl(val) {
console.log('添加到队列关闭', val) console.log("添加到队列关闭", val);
this.isShowTjddl = val this.isShowTjddl = val;
}, },
// 导出FPTX // 导出FPTX
isShowDcftpxBtn () { // 多行 isShowDcftpxBtn() {
console.log('导出FPTX') // 多行
console.log("导出FPTX");
if (this.multipleSelection.length === 0) { if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要导出FPTX的数据！"); this.$message.error("请选择需要导出FPTX的数据！");
this.isSelected = true this.selectBoo = true;
} else if (this.multipleSelection.length === 1) { } else if (this.multipleSelection.length === 1) {
this.rowData = this.multipleSelection this.rowData = this.multipleSelection;
this.isShowDcftpx = true; this.isShowDcftpx = true;
} else { } else {
this.$message.error("只能导出单条数据的FPTX！"); this.$message.error("只能导出单条数据的FPTX！");
} }
// if (this.multipleSelection.length === 0) { // if (this.multipleSelection.length === 0) {
// this.$message.error("请选择需要导出的数据！"); // this.$message.error("请选择需要导出的数据！");
// this.isSelected = true // this.selectBoo = true
// } else { // } else {
// this.rowData = this.multipleSelection // this.rowData = this.multipleSelection
// this.isShowDcftpx = true; // this.isShowDcftpx = true;
// } // }
}, },
closeDcftpx (val) { closeDcftpx(val) {
console.log('导出FPTX关闭', val) console.log("导出FPTX关闭", val);
this.isShowDcftpx = val this.isShowDcftpx = val;
}, },
// 关注 // 关注
isShowGzBtn () { // 多行 isShowGzBtn() {
console.log('关注') // 多行
console.log("关注");
let newarr = []; let newarr = [];
if (this.multipleSelection.length === 0) { if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要关注的数据！"); this.$message.error("请选择需要关注的数据！");
this.isSelected = true this.selectBoo = true;
} else { } else {
let arr = this.multipleSelection let arr = this.multipleSelection;
for (var i = 0; i < arr.length; i++) { for (var i = 0; i < arr.length; i++) {
if (arr[i].collectstatus == 1) { if (arr[i].collectstatus == 1) {
// this.$message.error("该数据已关注") // this.$message.error("该数据已关注")
} else { } else {
newarr.push(arr[i]) newarr.push(arr[i]);
} }
} }
if (newarr.length == 0) { if (newarr.length == 0) {
this.$message.error("不能重复关注") this.$message.error("不能重复关注");
} else { } else {
this.$message.info("已过滤关注数据") this.$message.info("已过滤关注数据");
this.rowData = newarr this.rowData = newarr;
this.isShowGz = true; this.isShowGz = true;
} }
} }
}, },
isShowGzBtn1 (val) { // 单行 isShowGzBtn1(val) {
console.log(val, 123) // 单行
console.log(val, 123);
let rowVal = []; let rowVal = [];
rowVal.push(val) rowVal.push(val);
this.rowData = rowVal this.rowData = rowVal;
this.isShowGz = true; this.isShowGz = true;
}, },
closeGz (val) { closeGz(val) {
console.log('关注关闭', val) console.log("关注关闭", val);
this.isShowGz = val this.isShowGz = val;
this.search() this.search();
}, },
// 取消关注 // 取消关注
qxgz (val) { qxgz(val) {
// alert(val) // alert(val)
this.$axios this.$axios
.delete("/api/mypsn/cancel", { params: { pids: val } }) .delete("/api/mypsn/cancel", { params: { pids: val } })
.then(response => { .then((response) => {
if (response.data.code === 0) { if (response.data.code === 0) {
this.$message.success("取消关注成功"); this.$message.success("取消关注成功");
this.search(); this.search();
...@@ -716,60 +629,59 @@ export default { ...@@ -716,60 +629,59 @@ export default {
this.$message.error("取消关注失败"); this.$message.error("取消关注失败");
} }
}); });
}, },
// 更改条码操作 // 更改条码操作
isShowGgrytmBtn (val) { isShowGgrytmBtn(val) {
console.log('更改条码', val) console.log("更改条码", val);
this.rowData = val this.rowData = val;
this.isShowGgrytm = true; this.isShowGgrytm = true;
}, },
closeGgrytm (val) { closeGgrytm(val) {
console.log('更改条码关闭', val) console.log("更改条码关闭", val);
this.isShowGgrytm = val this.isShowGgrytm = val;
this.search() this.search();
}, },
//复制条码列表操作 //复制条码列表操作
isShowFztmBtn (val) { isShowFztmBtn(val) {
console.log('复制条码', val) console.log("复制条码", val);
this.rowData = val this.rowData = val;
this.isShowFztm = true; this.isShowFztm = true;
}, },
closeFztm (val) { closeFztm(val) {
console.log('closeFztm复制条码关闭', val) console.log("closeFztm复制条码关闭", val);
this.isShowFztm = val this.isShowFztm = val;
this.search() this.search();
}, },
//发查询操作(多行) //发查询操作(多行)
isShowFcxBtn () { isShowFcxBtn() {
if (this.multipleSelection.length === 0) { if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要发查询的数据！"); this.$message.error("请选择需要发查询的数据！");
this.isSelected = true this.selectBoo = true;
} else { } else {
this.rowData = this.multipleSelection this.rowData = this.multipleSelection;
this.isShowFcx = true; this.isShowFcx = true;
} }
}, },
isShowFcxBtn1 (val) { isShowFcxBtn1(val) {
console.log('单行人员发查询数据', val) console.log("单行人员发查询数据", val);
let rowVal = []; let rowVal = [];
rowVal.push(val) rowVal.push(val);
this.rowData = rowVal this.rowData = rowVal;
this.isShowFcx = true; this.isShowFcx = true;
}, },
closeFcx (val) { closeFcx(val) {
console.log('发查询关闭', val) console.log("发查询关闭", val);
this.isShowFcx = val this.isShowFcx = val;
// this.search() // this.search()
}, },
// 多选删除 // 多选删除
delMore () { delMore() {
// 检查table选择的数据 如果没有选择则不可以删除 // 检查table选择的数据 如果没有选择则不可以删除
if (this.multipleSelection.length === 0) { if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要删除的数据！"); this.$message.error("请选择需要删除的数据！");
this.isSelected = true this.selectBoo = true;
return; return;
} }
// 封装删除的psns为数组 // 封装删除的psns为数组
...@@ -780,8 +692,8 @@ export default { ...@@ -780,8 +692,8 @@ export default {
this.doDelete(psns); this.doDelete(psns);
}, },
// 单选删除 // 单选删除
delOne (val) { delOne(val) {
console.log("删除数据") console.log("删除数据");
// 将传入的psns转为数组 // 将传入的psns转为数组
let psns = []; let psns = [];
psns.push(val); psns.push(val);
...@@ -789,10 +701,10 @@ export default { ...@@ -789,10 +701,10 @@ export default {
this.doDelete(psns); this.doDelete(psns);
}, },
// 请求删除接口 // 请求删除接口
doDelete (psns) { doDelete(psns) {
this.$axios this.$axios
.post("/api/personstore/delete", { psns: psns }) .post("/api/personstore/delete", { psns: psns })
.then(response => { .then((response) => {
if (response.data.code === 0) { if (response.data.code === 0) {
this.$message.success("删除成功"); this.$message.success("删除成功");
this.search(); this.search();
...@@ -806,37 +718,37 @@ export default { ...@@ -806,37 +718,37 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
batch () { batch() {
this.disabled = !this.disabled this.disabled = !this.disabled;
this.isSelected = !this.isSelected this.selectBoo = !this.selectBoo;
this.toggleSelection() this.toggleSelection();
// this.$set(this.multipleSelection, []) // this.$set(this.multipleSelection, [])
}, },
cancel () { cancel() {
alert(888) alert(888);
}, },
/** /**
* @description: 编辑数据 * @description: 编辑数据
* @param {*} row * @param {*} row
* @return {*} * @return {*}
*/ */
handleClick (row) { handleClick(row) {
this.closeSelected();
console.log(row); console.log(row);
this.$router.push('/ryzwbj/' + row.id + '/' + row.ysxtAsjxgrybh) this.$router.push("/ryzwbj/" + row.id + "/" + row.ysxtAsjxgrybh);
}, },
/** /**
* @description: 单选事件 * @description: 单选事件
* @param {*} val * @param {*} val
* @return {*} * @return {*}
*/ */
handleSelectionChange (val) { handleSelectionChange(val) {
this.multipleSelection = val; this.multipleSelection = val;
console.log(this.multipleSelection); console.log(this.multipleSelection);
if (this.multipleSelection.length) { if (this.multipleSelection.length) {
this.isShowTip = true this.isShowTip = true;
} else { } else {
this.isShowTip = false this.isShowTip = false;
} }
}, },
/** /**
...@@ -844,35 +756,35 @@ export default { ...@@ -844,35 +756,35 @@ export default {
* @param {*} pageSize 每页条数 * @param {*} pageSize 每页条数
* @return {*} * @return {*}
*/ */
handleSizeChange (pageSize) { handleSizeChange(pageSize) {
this.reqParam.page.pageSize = pageSize; this.reqParam.page.pageSize = pageSize;
console.log('每页条数', this.reqParam.page.pageSize); console.log("每页条数", this.reqParam.page.pageSize);
}, },
/** /**
* @description: currentPage 改变时会触发 * @description: currentPage 改变时会触发
* @param {*} page 当前页 * @param {*} page 当前页
* @return {*} * @return {*}
*/ */
handleCurrentChange (page) { handleCurrentChange(page) {
this.reqParam.page.currPage = page this.reqParam.page.currPage = page;
console.log('当前页', this.reqParam.page.currPage); console.log("当前页", this.reqParam.page.currPage);
this.search() this.search();
}, },
/** /**
* @description: 清除所有选项 * @description: 清除所有选项
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
toggleSelection (rows) { toggleSelection(rows) {
if (rows) { if (rows) {
rows.forEach(row => { rows.forEach((row) => {
this.$refs.multipleTable.toggleRowSelection(row); this.$refs.multipleTable.toggleRowSelection(row);
}); });
} else { } else {
this.$refs.multipleTable.clearSelection(); this.$refs.multipleTable.clearSelection();
} }
console.log(this.multipleSelection); console.log(this.multipleSelection);
} },
}, },
computed: { computed: {
/** /**
...@@ -880,18 +792,20 @@ export default { ...@@ -880,18 +792,20 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
Tpage () { Tpage() {
return Math.floor(this.reqParam.page.total / this.reqParam.page.pageSize) + 1; return (
Math.floor(this.reqParam.page.total / this.reqParam.page.pageSize) + 1
);
}, },
}, },
mounted () { mounted() {
this.search(); this.search();
// zoom('AllPersonnelBase') // zoom('AllPersonnelBase')
// window.addEventListener('resize', function () { // window.addEventListener('resize', function () {
// zoom('AllPersonnelBase') // zoom('AllPersonnelBase')
// }) // })
} },
} };
</script> </script>
<style lang="scss"> <style lang="scss">
.el-popconfirm__main { .el-popconfirm__main {
...@@ -934,6 +848,11 @@ export default { ...@@ -934,6 +848,11 @@ export default {
.el-popconfirm__action { .el-popconfirm__action {
text-align: right; text-align: right;
} }
.delSelection /deep/ .el-table-column--selection .cell{
display: none;
}
.delSelection /deep/ .el-table-column--selection{
}
// 滚动条的宽度 // 滚动条的宽度
/deep/ .el-table__body-wrapper::-webkit-scrollbar { /deep/ .el-table__body-wrapper::-webkit-scrollbar {
width: 6px; // 横向滚动条 width: 6px; // 横向滚动条
...@@ -1110,22 +1029,23 @@ export default { ...@@ -1110,22 +1029,23 @@ export default {
} }
.disabled { .disabled {
border: none; border: none;
border: 1px solid #ccc; border: 1px solid #ecedf1;
font-size: 14px; font-size: 14px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #ccc; background-color: #fff;
color: #c2c4c7;
i { i {
font-size: 14px; font-size: 14px;
margin-right: 5px; margin-right: 5px;
} }
&:hover { // &:hover {
border: 1px solid #ccc; // border: 1px solid #ccc;
color: #ccc; // color: #ccc;
} // }
&:active { // &:active {
border: 1px solid #ccc; // border: 1px solid #ccc;
color: #ccc; // color: #ccc;
} // }
} }
} }
} }
...@@ -1202,6 +1122,9 @@ export default { ...@@ -1202,6 +1122,9 @@ export default {
/deep/.el-form-item__label { /deep/.el-form-item__label {
color: #333333; color: #333333;
} }
/deep/ .disableheadselection > .cell .el-checkbox__inner {
display: none;
}
/deep/.el-table th > .cell { /deep/.el-table th > .cell {
font-size: 14px; font-size: 14px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
......
src/views/AllPersonnelBase/modules/dcfptxAj.vue
...@@ -45,9 +45,16 @@ ...@@ -45,9 +45,16 @@
<el-form-item label="数据类型："> <el-form-item label="数据类型：">
<el-radio-group v-model="sjlx"> <el-radio-group v-model="sjlx">
<el-radio :label="1">原图</el-radio> <el-radio
<el-radio :label="2">压缩图</el-radio> @click.native.prevent="clickitemsjlx(1)"
<el-radio :label="3">特征</el-radio> :label="1"
>原图</el-radio>
<el-radio
@click.native.prevent="clickitemsjlx(2)"
:label="2"
>压缩图</el-radio>
<!-- <el-radio :label="3">特征</el-radio> -->
<el-checkbox v-model="tz">特征</el-checkbox>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="文件格式："> <el-form-item label="文件格式：">
...@@ -70,10 +77,12 @@ ...@@ -70,10 +77,12 @@
> >
<el-radio <el-radio
:label="1" :label="1"
@click.native.prevent="clickitemtmbz(1)"
border border
>000</el-radio> >000</el-radio>
<el-radio <el-radio
:label="2" :label="2"
@click.native.prevent="clickitemtmbz(2)"
border border
>999</el-radio> >999</el-radio>
</el-radio-group> </el-radio-group>
...@@ -122,11 +131,12 @@ export default { ...@@ -122,11 +131,12 @@ export default {
dialogVisible: false, // 弹窗状态 dialogVisible: false, // 弹窗状态
wzChecked: true, // 文字单选 wzChecked: true, // 文字单选
sjlx: 1, // 数据类型 sjlx: null, // 数据类型
wjgs: 1,//文件格式 wjgs: 1,//文件格式
dcms: 1, //导出模式 dcms: 1, //导出模式
tmbz: 1,// 条码补值 tmbz: null,// 条码补值
tm: 'true', // 脱密 tm: null, // 脱密
tz: null,// 特征
checkAll: false, // 是否全选 checkAll: false, // 是否全选
checkedTargets: [], // 选定指位 checkedTargets: [], // 选定指位
...@@ -189,6 +199,12 @@ export default { ...@@ -189,6 +199,12 @@ export default {
} }
}); });
}, },
clickitemsjlx (e) {
e === this.sjlx ? this.sjlx = '' : this.sjlx = e
},
clickitemtmbz (e) {
e === this.tmbz ? this.tmbz = '' : this.tmbz = e
},
handleClose (done) { handleClose (done) {
targtOptions = []; targtOptions = [];
this.targts = targtOptions this.targts = targtOptions
......
src/views/AllPersonnelBase/modules/dcftpx.vue
...@@ -257,9 +257,16 @@ ...@@ -257,9 +257,16 @@
> >
<el-form-item label="数据类型："> <el-form-item label="数据类型：">
<el-radio-group v-model="sjlx"> <el-radio-group v-model="sjlx">
<el-radio :label="1">原图</el-radio> <el-radio
<el-radio :label="2">压缩图</el-radio> @click.native.prevent="clickitemsjlx(1)"
<el-radio :label="3">特征</el-radio> :label="1"
>原图</el-radio>
<el-radio
@click.native.prevent="clickitemsjlx(2)"
:label="2"
>压缩图</el-radio>
<!-- <el-radio :label="3">特征</el-radio> -->
<el-checkbox v-model="tz">特征</el-checkbox>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="文件格式："> <el-form-item label="文件格式：">
...@@ -293,10 +300,12 @@ ...@@ -293,10 +300,12 @@
> >
<el-radio <el-radio
:label="1" :label="1"
@click.native.prevent="clickitemtmbz(1)"
border border
>000</el-radio> >000</el-radio>
<el-radio <el-radio
:label="2" :label="2"
@click.native.prevent="clickitemtmbz(2)"
border border
>999</el-radio> >999</el-radio>
</el-radio-group> </el-radio-group>
...@@ -350,6 +359,7 @@ export default { ...@@ -350,6 +359,7 @@ export default {
filenameexport: '文件', filenameexport: '文件',
dialogVisible: false, // 弹窗状态 dialogVisible: false, // 弹窗状态
wzChecked: true, // 文字单选 wzChecked: true, // 文字单选
tz: null,// 特征
// 滚动指纹 // 滚动指纹
gdzwisIndeterminate: false, // 滚动指纹状态 gdzwisIndeterminate: false, // 滚动指纹状态
gdzwCheckAll: true, // 滚动指纹全选 gdzwCheckAll: true, // 滚动指纹全选
...@@ -395,10 +405,10 @@ export default { ...@@ -395,10 +405,10 @@ export default {
checkedrxs: ['正面照', '左侧照', '右侧照', '身份证'], checkedrxs: ['正面照', '左侧照', '右侧照', '身份证'],
rxs: rxOptions, rxs: rxOptions,
sjlx: 1, // 数据类型 sjlx: null, // 数据类型
wjgs: 1,//文件格式 wjgs: 1,//文件格式
dcms: 1, //导出模式 dcms: 1, //导出模式
tmbz: 1,// 条码补值 tmbz: null,// 条码补值
}; };
}, },
mounted () { mounted () {
...@@ -647,6 +657,12 @@ export default { ...@@ -647,6 +657,12 @@ export default {
this.rxcheckAll = checkedCount === this.rxs.length; this.rxcheckAll = checkedCount === this.rxs.length;
this.rxisIndeterminate = checkedCount > 0 && checkedCount < this.rxs.length; this.rxisIndeterminate = checkedCount > 0 && checkedCount < this.rxs.length;
}, },
clickitemsjlx (e) {
e === this.sjlx ? this.sjlx = '' : this.sjlx = e
},
clickitemtmbz (e) {
e === this.tmbz ? this.tmbz = '' : this.tmbz = e
},
} }
}; };
</script> </script>
......
src/views/AllPersonnelBase/modules/fcx.vue
...@@ -516,7 +516,6 @@ export default { ...@@ -516,7 +516,6 @@ export default {
byzs: '1000',// 该类型下本月总数 byzs: '1000',// 该类型下本月总数
sytsArr: '',// 剩余条数 sytsArr: '',// 剩余条数
syts: '300', //该类型下剩余条数 syts: '300', //该类型下剩余条数
color: 'color_a0e7db', // 进度条颜色
bcxh: '1', //本次消耗 bcxh: '1', //本次消耗
checkAll_mbljk: false, // 目标逻辑库全选 checkAll_mbljk: false, // 目标逻辑库全选
checkedTargets: [], // 选定目标逻辑库 checkedTargets: [], // 选定目标逻辑库
...@@ -592,8 +591,12 @@ export default { ...@@ -592,8 +591,12 @@ export default {
if (newVal == true) { if (newVal == true) {
this.searchZTS() this.searchZTS()
this.searchsytsArr() this.searchsytsArr()
this.getHpseqno()
this.bcxh = this.rowData.length; this.bcxh = this.rowData.length;
if (this.type == 'aj') {
console.log('案件数据开始获取')
this.getHpseqno()
this.fingerscountArr()
}
} }
}, },
dialogVisible (val) { dialogVisible (val) {
...@@ -696,39 +699,6 @@ export default { ...@@ -696,39 +699,6 @@ export default {
} }
}, },
methods: { methods: {
// // 发查询指位信息
// getHpseqno () {
// let reqParam = {
// barcodes: '', // 条码号
// };
// let barcodeArr = []
// for (let i = 0; i < this.rowData.length; i++) {
// barcodeArr.push(this.rowData[i].barcode)
// }
// reqParam.barcodes = barcodeArr
// this.$axios
// .post("/api/casestore/getHpseqno", reqParam)
// .then(response => {
// if (response.data.code === 0) {
// let arr = response.data.ret
// if (this.rowData.length == 1) {
// for (var item in arr) {
// this.cities = arr[item]
// console.log("指位返回列表===>", item, arr);
// }
// } else {
// console.log("多条案件")
// for (var item in arr) {
// this.cities = arr[item]
// console.log("指位返回列表===>", item, arr);
// }
// }
// } else {
// this.$message.error(response.data.message);
// }
// });
// },
// 发查询指位信息 // 发查询指位信息
getHpseqno () { getHpseqno () {
let reqParam = { let reqParam = {
...@@ -1064,6 +1034,27 @@ export default { ...@@ -1064,6 +1034,27 @@ export default {
} }
}); });
}, },
// 获取多条案件指位个数
fingerscountArr () {
let fingerscountArr = [];
for (let i = 0; i < this.rowData.length; i++) {
fingerscountArr.push(this.rowData[i].id)
};
this.$axios
.post("/api/casestore/fingerscount", { cids: fingerscountArr })
.then(response => {
if (response.data.code === 0) {
this.bcxh = response.data.ret;
// this.sytsArr = response.data.ret
// this.syts = this.sytsArr[0].level1
console.info("555发查询剩余条数返回列表===>", response);
} else {
// this.$message.error(response.data.message);
this.$message.error('获取发查询剩余条数失败');
}
});
},
} }
}; };
</script> </script>
......
src/views/AllPersonnelBase/modules/xzaj.vue
...@@ -29,12 +29,13 @@ ...@@ -29,12 +29,13 @@
prop="ysxtAsjbh" prop="ysxtAsjbh"
> >
<el-input <el-input
class="inputBh"
v-model.trim="ruleForm.ysxtAsjbh" v-model.trim="ruleForm.ysxtAsjbh"
placeholder="请输入案事件编号" placeholder="请输入案事件编号"
maxlength="23" maxlength="22"
show-word-limit show-word-limit
clearable clearable
></el-input> ><template slot="prepend">A</template></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -223,6 +224,9 @@ ...@@ -223,6 +224,9 @@
placeholder="请选择提取时间" placeholder="请选择提取时间"
v-model="ruleForm.tqsj" v-model="ruleForm.tqsj"
style="width: 100%;" style="width: 100%;"
:picker-options="{
disabledDate: disabledDate,
}"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -358,6 +362,13 @@ export default { ...@@ -358,6 +362,13 @@ export default {
} }
}, },
methods: { methods: {
disabledDate (a) {
if (a.getTime() > new Date().getTime()) {
return true;
} else {
return false;
}
},
submitForm (formName) { submitForm (formName) {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
...@@ -365,6 +376,8 @@ export default { ...@@ -365,6 +376,8 @@ export default {
caseBase: "" caseBase: ""
} }
reqParam.caseBase = this.ruleForm reqParam.caseBase = this.ruleForm
let defaultArr = 'A'
reqParam.personDo.ysxtAsjbh = defaultArr.concat(this.ruleForm.ysxtAsjbh)
this.$axios this.$axios
.post("/api/casestore/caseadd", reqParam) .post("/api/casestore/caseadd", reqParam)
.then(response => { .then(response => {
...@@ -402,6 +415,16 @@ export default { ...@@ -402,6 +415,16 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.inputBh {
/deep/.el-input-group__prepend {
width: 40px;
text-align: center;
padding: 0;
}
/deep/.el-input__inner {
width: 224px;
}
}
// 滚动条的宽度 // 滚动条的宽度
/deep/ .el-form::-webkit-scrollbar { /deep/ .el-form::-webkit-scrollbar {
width: 6px; // 横向滚动条 width: 6px; // 横向滚动条
......
src/views/AllPersonnelBase/modules/xzry.vue
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
top="1.25rem" top="1.25rem"
append-to-body append-to-body
:before-close="handleClose" :before-close="handleClose"
:close-on-click-modal='false' :close-on-click-modal="false"
> >
<el-form <el-form
:label-position="labelPosition" :label-position="labelPosition"
...@@ -24,24 +24,19 @@ ...@@ -24,24 +24,19 @@
<!-- 二 --> <!-- 二 -->
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="人员编号：" prop="ysxtAsjxgrybh">
label="人员编号："
prop="ysxtAsjxgrybh"
>
<el-input <el-input
class="inputBh"
v-model.trim="ruleForm.ysxtAsjxgrybh" v-model.trim="ruleForm.ysxtAsjxgrybh"
placeholder="请输入人员编号" placeholder="请输入人员编号"
maxlength="23" maxlength="22"
show-word-limit show-word-limit
clearable clearable
></el-input> ><template slot="prepend">R</template></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="警综人员编号：" prop="jzrybh">
label="警综人员编号："
prop="jzrybh"
>
<el-input <el-input
v-model.trim="ruleForm.jzrybh" v-model.trim="ruleForm.jzrybh"
placeholder="请输入警综人员编号" placeholder="请输入警综人员编号"
...@@ -55,10 +50,7 @@ ...@@ -55,10 +50,7 @@
<!-- 三 --> <!-- 三 -->
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="案事件相关人员编号：" prop="asjxgrybh">
label="案事件相关人员编号："
prop="asjxgrybh"
>
<el-input <el-input
v-model.trim="ruleForm.asjxgrybh" v-model.trim="ruleForm.asjxgrybh"
placeholder="请输入案事件相关人员编号" placeholder="请输入案事件相关人员编号"
...@@ -69,10 +61,7 @@ ...@@ -69,10 +61,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="指掌纹卡编号：" prop="zzhwkbh">
label="指掌纹卡编号："
prop="zzhwkbh"
>
<el-input <el-input
v-model.trim="ruleForm.zzhwkbh" v-model.trim="ruleForm.zzhwkbh"
placeholder="请输入指掌纹卡编号" placeholder="请输入指掌纹卡编号"
...@@ -86,27 +75,17 @@ ...@@ -86,27 +75,17 @@
<!-- 四 --> <!-- 四 -->
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="采集信息原因：" prop="cjxxyydm">
label="采集信息原因："
prop="cjxxyydm"
>
<el-select <el-select
v-model="ruleForm.cjxxyydm" v-model="ruleForm.cjxxyydm"
placeholder="根据代码自动匹配" placeholder="根据代码自动匹配"
> >
<el-option <el-option label="1" value="1"></el-option>
label="1" <el-option label="2" value="2"></el-option>
value="1"
></el-option>
<el-option
label="2"
value="2"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12"> </el-col>
</el-col>
</el-row> </el-row>
<el-divider></el-divider> <el-divider></el-divider>
<!-- 五 --> <!-- 五 -->
...@@ -117,10 +96,7 @@ ...@@ -117,10 +96,7 @@
<!-- 六 --> <!-- 六 -->
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="姓名：" prop="xm">
label="姓名："
prop="xm"
>
<el-input <el-input
v-model.trim="ruleForm.xm" v-model.trim="ruleForm.xm"
placeholder="请输入姓名" placeholder="请输入姓名"
...@@ -145,35 +121,23 @@ ...@@ -145,35 +121,23 @@
<!-- 七 --> <!-- 七 -->
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="性别：" prop="xbdm">
label="性别：" <el-select v-model="ruleForm.xbdm" placeholder="请选择性别">
prop="xbdm" <el-option label="男" value="1"></el-option>
> <el-option label="女" value="0"></el-option>
<el-select
v-model="ruleForm.xbdm"
placeholder="请选择性别"
>
<el-option
label="男"
value="1"
></el-option>
<el-option
label="女"
value="0"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="出生日期：" prop="csrq">
label="出生日期："
prop="csrq"
>
<el-date-picker <el-date-picker
type="date" type="date"
placeholder="请选择出生日期" placeholder="请选择出生日期"
v-model="ruleForm.csrq" v-model="ruleForm.csrq"
style="width: 100%;" style="width: 100%"
:picker-options="{
disabledDate: disabledDate,
}"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -181,42 +145,18 @@ ...@@ -181,42 +145,18 @@
<!-- 八 --> <!-- 八 -->
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="国籍：" prop="gjdm">
label="国籍：" <el-select v-model="ruleForm.gjdm" placeholder="请选择国籍">
prop="gjdm" <el-option label="区域一" value="1"></el-option>
> <el-option label="区域二" value="2"></el-option>
<el-select
v-model="ruleForm.gjdm"
placeholder="请选择国籍"
>
<el-option
label="区域一"
value="1"
></el-option>
<el-option
label="区域二"
value="2"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="民族：" prop="mzdm">
label="民族：" <el-select v-model="ruleForm.mzdm" placeholder="请选择民族">
prop="mzdm" <el-option label="区域一" value="1"></el-option>
> <el-option label="区域二" value="2"></el-option>
<el-select
v-model="ruleForm.mzdm"
placeholder="请选择民族"
>
<el-option
label="区域一"
value="1"
></el-option>
<el-option
label="区域二"
value="2"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -224,30 +164,15 @@ ...@@ -224,30 +164,15 @@
<!-- 九 --> <!-- 九 -->
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="证件类型：" prop="cyzjdm">
label="证件类型：" <el-select v-model="ruleForm.cyzjdm" placeholder="请选择证件类型">
prop="cyzjdm" <el-option label="户口" value="1"></el-option>
> <el-option label="身份证" value="2"></el-option>
<el-select
v-model="ruleForm.cyzjdm"
placeholder="请选择证件类型"
>
<el-option
label="户口"
value="1"
></el-option>
<el-option
label="身份证"
value="2"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="证件号码：" prop="zjhm">
label="证件号码："
prop="zjhm"
>
<el-input <el-input
v-model.trim="ruleForm.zjhm" v-model.trim="ruleForm.zjhm"
placeholder="请输入证件号码" placeholder="请输入证件号码"
...@@ -260,30 +185,18 @@ ...@@ -260,30 +185,18 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="户籍地行政区：" prop="hjdzXzqhdm">
label="户籍地行政区："
prop="hjdzXzqhdm"
>
<el-select <el-select
v-model="ruleForm.hjdzXzqhdm" v-model="ruleForm.hjdzXzqhdm"
placeholder="请选择户籍地行政区" placeholder="请选择户籍地行政区"
> >
<el-option <el-option label="区域一" value="1"></el-option>
label="区域一" <el-option label="区域二" value="2"></el-option>
value="1"
></el-option>
<el-option
label="区域二"
value="2"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="户籍地址：" prop="hjdzDzmc">
label="户籍地址："
prop="hjdzDzmc"
>
<el-input <el-input
v-model="ruleForm.hjdzDzmc" v-model="ruleForm.hjdzDzmc"
placeholder="请输入户籍地址" placeholder="请输入户籍地址"
...@@ -296,30 +209,18 @@ ...@@ -296,30 +209,18 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="现住址行政区：" prop="xzzXzqhdm">
label="现住址行政区："
prop="xzzXzqhdm"
>
<el-select <el-select
v-model="ruleForm.xzzXzqhdm" v-model="ruleForm.xzzXzqhdm"
placeholder="请选择现住址行政区" placeholder="请选择现住址行政区"
> >
<el-option <el-option label="区域一" value="1"></el-option>
label="区域一" <el-option label="区域二" value="2"></el-option>
value="1"
></el-option>
<el-option
label="区域二"
value="2"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="现住址：" prop="xzzDzmc">
label="现住址："
prop="xzzDzmc"
>
<el-input <el-input
v-model.trim="ruleForm.xzzDzmc" v-model.trim="ruleForm.xzzDzmc"
placeholder="请输入现住址" placeholder="请输入现住址"
...@@ -357,17 +258,16 @@ ...@@ -357,17 +258,16 @@
:indeterminate="isIndeterminate" :indeterminate="isIndeterminate"
v-model="checkAll" v-model="checkAll"
@change="handleCheckAllChange" @change="handleCheckAllChange"
>全选</el-checkbox> >全选</el-checkbox
<div style="margin: 15px 0;"></div> >
<div style="margin: 15px 0"></div>
<el-checkbox-group <el-checkbox-group
v-model="checkedTargets" v-model="checkedTargets"
@change="handleCheckedTargetsChange" @change="handleCheckedTargetsChange"
> >
<el-checkbox <el-checkbox v-for="city in targets" :label="city" :key="city">{{
v-for="city in targets" city
:label="city" }}</el-checkbox>
:key="city"
>{{city}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-row> </el-row>
<el-divider></el-divider> <el-divider></el-divider>
...@@ -379,10 +279,7 @@ ...@@ -379,10 +279,7 @@
<!-- 七 --> <!-- 七 -->
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="捺印单位：" prop="nydwGajgmc">
label="捺印单位："
prop="nydwGajgmc"
>
<el-input <el-input
v-model="ruleForm.nydwGajgmc" v-model="ruleForm.nydwGajgmc"
placeholder="请输入捺印单位名称" placeholder="请输入捺印单位名称"
...@@ -394,10 +291,7 @@ ...@@ -394,10 +291,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="捺印人姓名：" prop="nyryXm">
label="捺印人姓名："
prop="nyryXm"
>
<el-input <el-input
v-model="ruleForm.nyryXm" v-model="ruleForm.nyryXm"
placeholder="请输入捺印人姓名" placeholder="请输入捺印人姓名"
...@@ -411,23 +305,20 @@ ...@@ -411,23 +305,20 @@
<!-- 八 --> <!-- 八 -->
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="捺印时间：" prop="nysj">
label="捺印时间："
prop="nysj"
>
<el-date-picker <el-date-picker
type="datetime" type="datetime"
placeholder="请输入捺印时间" placeholder="请输入捺印时间"
v-model="ruleForm.nysj" v-model="ruleForm.nysj"
style="width: 100%;" style="width: 100%"
:picker-options="{
disabledDate: disabledDate,
}"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="捺印人身份证号：" prop="nyryGmsfhm">
label="捺印人身份证号："
prop="nyryGmsfhm"
>
<el-input <el-input
v-model="ruleForm.nyryGmsfhm" v-model="ruleForm.nyryGmsfhm"
placeholder="请输入捺印人身份证号" placeholder="请输入捺印人身份证号"
...@@ -441,15 +332,10 @@ ...@@ -441,15 +332,10 @@
<!-- 九 --> <!-- 九 -->
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item> <el-form-item> </el-form-item>
</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="捺印人联系电话：" prop="nyryLxdh">
label="捺印人联系电话："
prop="nyryLxdh"
>
<el-input <el-input
v-model="ruleForm.nyryLxdh" v-model="ruleForm.nyryLxdh"
placeholder="请输入捺印人联系电话" placeholder="请输入捺印人联系电话"
...@@ -460,164 +346,173 @@ ...@@ -460,164 +346,173 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-divider></el-divider> <el-divider></el-divider>
<!-- 十 --> <!-- 十 -->
<span <span slot="footer" class="dialog-footer">
slot="footer"
class="dialog-footer"
>
<el-button @click="submitForm('ruleForm')">提交并新增指掌纹</el-button> <el-button @click="submitForm('ruleForm')">提交并新增指掌纹</el-button>
<el-button <el-button @click="resetForm('ruleForm')" type="primary">取 消</el-button>
@click="resetForm('ruleForm')"
type="primary"
>取 消</el-button>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
const targetOptions = ['本地案件库', '比中案件库', '已破案件库', '重大案件库', 'B类案件库', 'C类案件库', '勘查案件库', '协查案件库']; const targetOptions = [
"本地案件库",
"比中案件库",
"已破案件库",
"重大案件库",
"B类案件库",
"C类案件库",
"勘查案件库",
"协查案件库",
];
export default { export default {
name: "xzry", name: "xzry",
props: { props: {
isShowXzry: { isShowXzry: {
type: [Number, String, Boolean], type: [Number, String, Boolean],
default: false default: false,
} },
}, },
data () { data() {
return { return {
dialogVisible: false, // 弹窗状态 dialogVisible: false, // 弹窗状态
labelPosition: 'left',// 数据项对齐方式 labelPosition: "left", // 数据项对齐方式
checkAll: false, // 目标逻辑库 checkAll: false, // 目标逻辑库
checkedTargets: [], // 选定的目标逻辑库 checkedTargets: [], // 选定的目标逻辑库
targets: targetOptions, // 目标逻辑库 targets: targetOptions, // 目标逻辑库
isIndeterminate: false, // 目标逻辑库不确定状态 isIndeterminate: false, // 目标逻辑库不确定状态
ruleForm: { ruleForm: {
ysxtAsjxgrybh: '', // 人员编号 ysxtAsjxgrybh: "", // 人员编号
jzrybh: '', // 警综人员编号 jzrybh: "", // 警综人员编号
asjxgrybh: '', // 案事件相关人员编号号 asjxgrybh: "", // 案事件相关人员编号号
zzhwkbh: '', // 现场掌指纹卡编号 zzhwkbh: "", // 现场掌指纹卡编号
cjxxyydm: '', // 采集信息原因 cjxxyydm: "", // 采集信息原因
xm: "", // 姓名
bmch: "", // 别名
xbdm: "", // 性别
csrq: "", // 出生日期
gjdm: "", // 国籍
mzdm: "", // 民族
cyzjdm: "", // 证件类型
zjhm: "", // 证件号码
hjdzXzqhdm: "", // 户籍地行政区
hjdzDzmc: "", // 户籍地址
xzzXzqhdm: "", // 现住址行政区
xzzDzmc: "", // 现住址
bz: "", // 备注
xm: '',// 姓名 nydwGajgmc: "", // 捺印单位
bmch: '',// 别名 nyryXm: "", // 捺印人姓名
xbdm: '',// 性别 nysj: "", // 捺印时间
csrq: '', // 出生日期 nyryGmsfhm: "", // 捺印人身份证号
gjdm: '', // 国籍 nyryLxdh: "", // 捺印人电话
mzdm: '', // 民族
cyzjdm: '', // 证件类型
zjhm: '', // 证件号码
hjdzXzqhdm: '',// 户籍地行政区
hjdzDzmc: '',// 户籍地址
xzzXzqhdm: '',// 现住址行政区
xzzDzmc: '',// 现住址
bz: "",// 备注
nydwGajgmc: '',// 捺印单位 ifidcard: "是", // 是否采集二代身份证
nyryXm: '',// 捺印人姓名 zwbdxtlxms: "1", // 指纹比对描述
nysj: '',// 捺印时间 nydwGajgjgdm: "1", // 捺印单位代码
nyryGmsfhm: '',// 捺印人身份证号
nyryLxdh: '',// 捺印人电话
ifidcard: "是",// 是否采集二代身份证
zwbdxtlxms: '1', // 指纹比对描述
nydwGajgjgdm: '1',// 捺印单位代码
}, },
rules: { rules: {
ysxtAsjxgrybh: [ ysxtAsjxgrybh: [
{ required: true, message: '请输入人员条码号', trigger: 'blur' }, { required: true, message: "请输入人员条码号", trigger: "blur" },
], ],
jzrybh: [ jzrybh: [
{ required: true, message: '请输入警综人员编号', trigger: 'blur' }, { required: true, message: "请输入警综人员编号", trigger: "blur" },
], ],
asjxgrybh: [ asjxgrybh: [
{ required: true, message: '请输入案事件人员号', trigger: 'blur' }, { required: true, message: "请输入案事件人员号", trigger: "blur" },
], ],
zzhwkbh: [ zzhwkbh: [
{ required: true, message: '请输入掌指纹卡编号', trigger: 'blur' }, { required: true, message: "请输入掌指纹卡编号", trigger: "blur" },
], ],
cjxxyydm: [ cjxxyydm: [
{ required: true, message: '请选择采集信息原因', trigger: 'blur' }, { required: true, message: "请选择采集信息原因", trigger: "blur" },
], ],
xm: [ xm: [{ required: true, message: "请输入姓名", trigger: "blur" }],
{ required: true, message: '请输入姓名', trigger: 'blur' }, xbdm: [{ required: true, message: "请选择性别", trigger: "blur" }],
],
xbdm: [
{ required: true, message: '请选择性别', trigger: 'blur' },
],
csrq: [ csrq: [
{ type: 'date', required: true, message: '请选择出生日期', trigger: 'change' } {
], type: "date",
gjdm: [ required: true,
{ required: true, message: '请选择国籍', trigger: 'blur' }, message: "请选择出生日期",
], trigger: "change",
mzdm: [ },
{ required: true, message: '请选择民族', trigger: 'blur' },
], ],
gjdm: [{ required: true, message: "请选择国籍", trigger: "blur" }],
mzdm: [{ required: true, message: "请选择民族", trigger: "blur" }],
cyzjdm: [ cyzjdm: [
{ required: true, message: '请选择证件类型', trigger: 'blur' }, { required: true, message: "请选择证件类型", trigger: "blur" },
],
zjhm: [
{ required: true, message: '请输入证件号码', trigger: 'blur' },
], ],
zjhm: [{ required: true, message: "请输入证件号码", trigger: "blur" }],
hjdzXzqhdm: [ hjdzXzqhdm: [
{ required: true, message: '请选择户籍地行政区', trigger: 'blur' }, { required: true, message: "请选择户籍地行政区", trigger: "blur" },
], ],
hjdzDzmc: [ hjdzDzmc: [
{ required: true, message: '请输入户籍地址', trigger: 'blur' }, { required: true, message: "请输入户籍地址", trigger: "blur" },
], ],
xzzXzqhdm: [ xzzXzqhdm: [
{ required: true, message: '请选现住地行政区', trigger: 'blur' }, { required: true, message: "请选现住地行政区", trigger: "blur" },
], ],
xzzDzmc: [ xzzDzmc: [
{ required: true, message: '请输入现住地址', trigger: 'blur' }, { required: true, message: "请输入现住地址", trigger: "blur" },
], ],
nydwGajgmc: [ nydwGajgmc: [
{ required: true, message: '请输入捺印单位', trigger: 'blur' }, { required: true, message: "请输入捺印单位", trigger: "blur" },
], ],
nyryXm: [ nyryXm: [
{ required: true, message: '请输入捺印人员姓名', trigger: 'change' } { required: true, message: "请输入捺印人员姓名", trigger: "change" },
], ],
nysj: [ nysj: [
{ type: 'date', required: true, message: '请选择捺印时间', trigger: 'change' } {
type: "date",
required: true,
message: "请选择捺印时间",
trigger: "change",
},
], ],
nyryGmsfhm: [ nyryGmsfhm: [
{ required: true, message: '请输入捺印人身份证号', trigger: 'blur' }, { required: true, message: "请输入捺印人身份证号", trigger: "blur" },
], ],
nyryLxdh: [ nyryLxdh: [
{ required: true, message: '请输入捺印人联系电话', trigger: 'blur' } { required: true, message: "请输入捺印人联系电话", trigger: "blur" },
], ],
} },
}; };
}, },
mounted () { mounted() {
this.dialogVisible = this.isShowXzry; this.dialogVisible = this.isShowXzry;
}, },
watch: { watch: {
isShowXzry (newVal, oldVal) { isShowXzry(newVal, oldVal) {
this.dialogVisible = newVal; this.dialogVisible = newVal;
}, },
dialogVisible (val) { dialogVisible(val) {
this.$emit('closeXzry', this.dialogVisible); this.$emit("closeXzry", this.dialogVisible);
} },
}, },
methods: { methods: {
submitForm (formName) { disabledDate(a) {
if (a.getTime() > new Date().getTime()) {
return true;
} else {
return false;
}
},
submitForm(formName) {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
let reqParam = { let reqParam = {
personDo: "" personDo: "",
} };
reqParam.personDo = this.ruleForm reqParam.personDo = this.ruleForm;
let defaultArr = 'R'
reqParam.personDo.ysxtAsjxgrybh = defaultArr.concat(this.ruleForm.ysxtAsjxgrybh)
this.$axios this.$axios
.post("/api/personstore/personadd", reqParam) .post("/api/personstore/personadd", reqParam)
.then(response => { .then((response) => {
if (response.data.code === 0) { if (response.data.code === 0) {
this.$message.success("新增成功"); this.$message.success("新增成功");
this.dialogVisible = false; this.dialogVisible = false;
...@@ -630,28 +525,39 @@ export default { ...@@ -630,28 +525,39 @@ export default {
} }
}); });
}, },
resetForm (formName) { resetForm(formName) {
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
this.dialogVisible = false this.dialogVisible = false;
}, },
handleClose (done) { handleClose(done) {
this.dialogVisible = false; this.dialogVisible = false;
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
}, },
handleCheckAllChange (val) { handleCheckAllChange(val) {
this.checkedTargets = val ? targetOptions : []; this.checkedTargets = val ? targetOptions : [];
this.isIndeterminate = false; this.isIndeterminate = false;
}, },
handleCheckedTargetsChange (value) { handleCheckedTargetsChange(value) {
let checkedCount = value.length; let checkedCount = value.length;
this.checkAll = checkedCount === this.targets.length; this.checkAll = checkedCount === this.targets.length;
this.isIndeterminate = checkedCount > 0 && checkedCount < this.targets.length; this.isIndeterminate =
} checkedCount > 0 && checkedCount < this.targets.length;
} },
},
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.inputBh {
/deep/.el-input-group__prepend {
width: 40px;
text-align: center;
padding: 0;
}
/deep/.el-input__inner {
width: 224px;
}
}
// 滚动条的宽度 // 滚动条的宽度
/deep/ .el-form::-webkit-scrollbar { /deep/ .el-form::-webkit-scrollbar {
width: 6px; // 横向滚动条 width: 6px; // 横向滚动条
......
src/views/AllPersonnelBase/qbalk.vue
...@@ -996,22 +996,22 @@ const datas1 = [ ...@@ -996,22 +996,22 @@ const datas1 = [
} }
.disabled { .disabled {
border: none; border: none;
border: 1px solid #ccc; border: 1px solid #ecedf1;
font-size: 14px; font-size: 14px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #ccc; color: #c2c4c7;
i { i {
font-size: 14px; font-size: 14px;
margin-right: 5px; margin-right: 5px;
} }
&:hover { // &:hover {
border: 1px solid #ccc; // border: 1px solid #ccc;
color: #ccc; // color: #ccc;
} // }
&:active { // &:active {
border: 1px solid #ccc; // border: 1px solid #ccc;
color: #ccc; // color: #ccc;
} // }
} }
} }
} }
......
src/views/Editor/modules/ajzwbjLeft.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 09:42:07 * @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-11-11 15:33:03 * @LastEditTime: 2021-11-12 20:17:17
* @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\ryzwbjLeft.vue * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
...@@ -86,26 +86,26 @@ export default { ...@@ -86,26 +86,26 @@ export default {
activeFinger: '01', activeFinger: '01',
activeHand: '01', activeHand: '01',
fingers: [ fingers: [
{ // {
code: '06', // code: '06',
name: '拇', // name: '拇',
image: null // image: null
}, // },
{ // {
code: '07', // code: '07',
name: '食', // name: '食',
image: null // image: null
}, // },
{ // {
code: '06', // code: '06',
name: '拇', // name: '拇',
image: null // image: null
}, // },
{ // {
code: '07', // code: '07',
name: '食', // name: '食',
image: null // image: null
}, // },
], ],
hands: [ hands: [
{ {
...@@ -142,7 +142,9 @@ export default { ...@@ -142,7 +142,9 @@ export default {
preTzdArr: state => state.zwbj.pretzdall, preTzdArr: state => state.zwbj.pretzdall,
autopretzdall: state => state.zwbj.autopretzdall, autopretzdall: state => state.zwbj.autopretzdall,
zyhz: state => state.zwbj.zyhz, zyhz: state => state.zwbj.zyhz,
yxhz: state => state.zwbj.yxhz yxhz: state => state.zwbj.yxhz,
autoyxhz: state => state.zwbj.autoyxhz,
autozyhz: state => state.zwbj.autozyhz,
}) })
}, },
mounted () { mounted () {
...@@ -163,8 +165,13 @@ export default { ...@@ -163,8 +165,13 @@ export default {
this.$store.commit('zwbj/setSeq', seq) this.$store.commit('zwbj/setSeq', seq)
let self = this let self = this
this.$axios({ this.$axios({
method: 'get', method: 'post',
url: `/api/org/case/${self.id}/${seq}?mnt=1`, url: `/api/org/caseBybarcode/barcode/seq`,
// url: `/api/org/case/${self.id}/${seq}?mnt=1`,
data: {
barcode: self.barcode,
seqno: self.seq
},
loading: false loading: false
}).then(res => { }).then(res => {
console.log(res); console.log(res);
...@@ -186,8 +193,12 @@ export default { ...@@ -186,8 +193,12 @@ export default {
getCaseFinger () { getCaseFinger () {
let self = this let self = this
this.$axios({ this.$axios({
method: 'get', method: 'post',
url: '/api/org/case/' + self.id + '?mnt=1' // url: '/api/org/case/' + self.id + '?mnt=1'
url: `/api/png/caseEBybarcode/barcode`,
data: {
barcode: self.barcode
}
}).then(res => { }).then(res => {
// console.log(res); // console.log(res);
if (res.data.code === 0) { if (res.data.code === 0) {
...@@ -241,18 +252,29 @@ export default { ...@@ -241,18 +252,29 @@ export default {
sessionStorage.setItem(this.preSeq, JSON.stringify(self.preTzdArr)) sessionStorage.setItem(this.preSeq, JSON.stringify(self.preTzdArr))
sessionStorage.setItem(`auto_tzdDom${this.preSeq}`, JSON.stringify(self.autopretzdall)) sessionStorage.setItem(`auto_tzdDom${this.preSeq}`, JSON.stringify(self.autopretzdall))
} }
self.$store.commit('zwbj/setTzdall', null) // self.$store.commit('zwbj/setTzdall', null)
self.$store.commit('zwbj/setAutoTzdall', null) // self.$store.commit('zwbj/setAutoTzdall', null)
// 重要区域的特征保存 // 重要区域的特征保存
console.log(self.zyhz); console.log(self.zyhz);
if(self.zyhz&&self.zyhz.length>=0) { if (self.zyhz && self.zyhz.length >= 0) {
sessionStorage.setItem(`zyhz_${this.preSeq}`, JSON.stringify(self.zyhz)) sessionStorage.setItem(`zyhz_${this.preSeq}`, JSON.stringify(self.zyhz))
self.$store.commit('zwbj/setZyhz', null) // self.$store.commit('zwbj/setZyhz', null)
} }
console.log(self.yxhz); console.log(self.yxhz);
if(self.yxhz&&self.yxhz.length>=0) { if (self.yxhz && self.yxhz.length >= 0) {
console.log(self.yxhz);
sessionStorage.setItem(`yxhz_${this.preSeq}`, JSON.stringify(self.yxhz)) sessionStorage.setItem(`yxhz_${this.preSeq}`, JSON.stringify(self.yxhz))
self.$store.commit('zwbj/setYxhz', null) // self.$store.commit('zwbj/setYxhz', null)
}
if (self.autoyxhz && self.autoyxhz.length >= 0) {
console.log(self.autoyxhz);
sessionStorage.setItem(`auto_yxhz_${this.preSeq}`, JSON.stringify(self.autoyxhz))
// self.$store.commit('zwbj/setAutoYxhz', null)
}
if (self.autozyhz && self.autozyhz.length >= 0) {
console.log(self.autozyhz);
sessionStorage.setItem(`auto_zyhz_${this.preSeq}`, JSON.stringify(self.autozyhz))
// self.$store.commit('zwbj/setAutoZyhz', null)
} }
} }
this.preSeq = finger.code this.preSeq = finger.code
...@@ -267,6 +289,7 @@ export default { ...@@ -267,6 +289,7 @@ export default {
*/ */
zzwChange (event) { zzwChange (event) {
this.zwSelect = event.target.innerText this.zwSelect = event.target.innerText
this.$bus.emit('zwType', this.zwSelect)
}, },
}, },
} }
......
src/views/Editor/modules/imageEd.scss
...@@ -101,6 +101,12 @@ $transOrigin: var(--transOrigin, 0px, 0px); ...@@ -101,6 +101,12 @@ $transOrigin: var(--transOrigin, 0px, 0px);
.bzd { .bzd {
margin-right: 40px; margin-right: 40px;
} }
.disabled {
.disabled-img {
width: 64px;
height: 32px;
}
}
.size, .size,
.line { .line {
&::after { &::after {
......
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-11-11 17:50:45 * @LastEditTime: 2021-11-12 21:00:34
* @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
...@@ -104,11 +104,11 @@ ...@@ -104,11 +104,11 @@
</div> </div>
<!-- 原尺寸显示下拉框 --> <!-- 原尺寸显示下拉框 -->
<div class="size-options" v-show="isShowsizeOptions"> <div class="size-options" v-show="isShowsizeOptions">
<div class="size-options-item" @click="OriginalChange"> <div class="size-options-item" @click="OriginalChange(false)">
<div class="item-selected"><span v-show="issize">√</span></div> <div class="item-selected"><span v-show="issize">√</span></div>
<div class="item-name">原图</div> <div class="item-name">原图</div>
</div> </div>
<div class="size-options-item" @click="ModerateChange"> <div class="size-options-item" @click="ModerateChange(false)">
<div class="item-selected"><span v-show="ismoderate">√</span></div> <div class="item-selected"><span v-show="ismoderate">√</span></div>
<div class="item-name">适中</div> <div class="item-name">适中</div>
</div> </div>
...@@ -119,9 +119,12 @@ ...@@ -119,9 +119,12 @@
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="缩略图"> <el-tooltip class="item" effect="dark" content="缩略图">
<div class="icon bzd" @click="onchangePreview"> <div class="icon bzd" @click="onchangePreview" v-if="zwType=='掌纹'">
<img src="@/assets/img/zcedit/bzd.png" alt=""> <img src="@/assets/img/zcedit/bzd.png" alt="">
</div> </div>
<div class="disabled" v-else>
<img class="disabled-img" src="@/assets/img/zcedit/slt_disabled.png" alt="">
</div>
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
...@@ -210,16 +213,16 @@ ...@@ -210,16 +213,16 @@
<!-- </div>--> <!-- </div>-->
</div> </div>
<div class="save"> <div class="save">
<div class="save-type" @click="saveTypeOptionsChange">选择保存类型<img src="@/assets/img/rybj/arrow_d.png" alt=""></div> <div class="save-type" @click="saveTypeOptionsChange">{{saveType}}<img src="@/assets/img/rybj/arrow_d.png" alt=""></div>
<div class="save-btn" v-if="saveType==''">保存</div> <div class="save-btn" v-if="saveType==''">保存</div>
<div class="save-btn isActive" v-else @click="goSave">保存</div> <div class="save-btn isActive" v-else @click="goSave">保存</div>
<div class="save-type-options" v-show="isShowSaveTypeOptions"> <div class="save-type-options" v-show="isShowSaveTypeOptions">
<div class="save-type-options-item" @click.stop="changeSaveType('当前特征')"> <div class="save-type-options-item" @click.stop="changeSaveType('当前指位特征')">
<div class="item-selected"><span v-show="saveType==='当前特征'">√</span></div> <div class="item-selected"><span v-show="saveType==='当前指位特征'">√</span></div>
<div class="item-name">当前指位特征</div> <div class="item-name">当前指位特征</div>
</div> </div>
<div class="save-type-options-item" @click.stop="changeSaveType('全部特征')"> <div class="save-type-options-item" @click.stop="changeSaveType('全部指位特征')">
<div class="item-selected"><span v-show="saveType==='全部特征'">√</span></div> <div class="item-selected"><span v-show="saveType==='全部指位特征'">√</span></div>
<div class="item-name">全部指位特征</div> <div class="item-name">全部指位特征</div>
</div> </div>
</div> </div>
...@@ -299,6 +302,8 @@ import "@/icons/direction.svg"; ...@@ -299,6 +302,8 @@ import "@/icons/direction.svg";
export default { export default {
data () { data () {
return { return {
zwType: '指纹',
xsType: 'yuantu',
canvasWidth: 640, canvasWidth: 640,
canvasHeight: 640, canvasHeight: 640,
// 对比度 // 对比度
...@@ -320,7 +325,7 @@ export default { ...@@ -320,7 +325,7 @@ export default {
isShowsizeOptions: false, isShowsizeOptions: false,
issize: true, issize: true,
ismoderate: false, ismoderate: false,
saveType: '当前特征', saveType: '选择保存类型',
isShowSaveTypeOptions: false, isShowSaveTypeOptions: false,
isZYQY: false, isZYQY: false,
isTZ: true, isTZ: true,
...@@ -1184,6 +1189,9 @@ export default { ...@@ -1184,6 +1189,9 @@ export default {
}) })
this.$bus.on('ryzwbjImage', (sourceImage) => { this.$bus.on('ryzwbjImage', (sourceImage) => {
// 缩放为1
self.zoomLevel = 1
imageEditor.resetZoom()
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) {
// console.log(sizeValue); // console.log(sizeValue);
...@@ -1195,8 +1203,6 @@ export default { ...@@ -1195,8 +1203,6 @@ export default {
$('.tzdDom').remove() $('.tzdDom').remove()
$('.auto_tzdDom').remove() $('.auto_tzdDom').remove()
imageEditor.clearUndoStack(); imageEditor.clearUndoStack();
// 缩放为1
self.zoomLevel = 1
// 获取自动提取特征 // 获取自动提取特征
self.getAutoTzd(false) self.getAutoTzd(false)
...@@ -1622,6 +1628,10 @@ export default { ...@@ -1622,6 +1628,10 @@ export default {
direction_flag = false direction_flag = false
} }
}) })
this.$bus.on('zwType', (zwType) => {
self.zwType = zwType
})
}, },
methods: { methods: {
/** /**
...@@ -1630,6 +1640,7 @@ export default { ...@@ -1630,6 +1640,7 @@ export default {
* @return {*} * @return {*}
*/ */
async getAutoTzd (flag) { async getAutoTzd (flag) {
this.isHandTZD = false
let self = this let self = this
console.log(this.seq); console.log(this.seq);
if (!sessionStorage.getItem(`auto${this.seq}`)) [ if (!sessionStorage.getItem(`auto${this.seq}`)) [
...@@ -1727,6 +1738,7 @@ export default { ...@@ -1727,6 +1738,7 @@ export default {
* @return {*} * @return {*}
*/ */
rotateChange () { rotateChange () {
this.isHandTZD = false
$('.icon_line').css('background', 'rgba(5, 95, 231, 0.05)') $('.icon_line').css('background', 'rgba(5, 95, 231, 0.05)')
$('.icon_circle').css('background', 'rgba(5, 95, 231, 0.05)') $('.icon_circle').css('background', 'rgba(5, 95, 231, 0.05)')
$('.icon_rotate').css('background', 'rgba(5, 95, 231, 0.05)') $('.icon_rotate').css('background', 'rgba(5, 95, 231, 0.05)')
...@@ -1925,7 +1937,8 @@ export default { ...@@ -1925,7 +1937,8 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
ModerateChange () { ModerateChange (type) {
this.isHandTZD = false
this.issize = false this.issize = false
this.ismoderate = true this.ismoderate = true
this.imageEditor.zoom({ this.imageEditor.zoom({
...@@ -1933,19 +1946,33 @@ export default { ...@@ -1933,19 +1946,33 @@ export default {
y: 320, y: 320,
zoomLevel: 1.2 zoomLevel: 1.2
}) })
// 特征点图层缩放设置为1.2 this.zoomLevel = 1.2
$('.tzdDrawing').css('transform', 'scale(1.2)'); this.xsType = 'shizhong'
if(!type){
// isActive
this.isActive = true;
$('.icon_size').css('background', 'rgba(5, 95, 231, 0.05)')
// 是否原尺寸同步
this.isSizeSynchro = false
// 是否展示原尺寸同步下拉框
this.isShowSizeSynchro = false
this.isShowsizeOptions = false
this.sizeChange();
}
}, },
/** /**
* @description: 原图显示 * @description: 原图显示
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
OriginalChange () { OriginalChange (type) {
this.isHandTZD = false
let self = this; let self = this;
self.isX = false self.isX = false
self.isY = false self.isY = false
self.isReset = true self.isReset = true
self.xsType = 'yuantu'
// 旋转角度同样恢复到0 // 旋转角度同样恢复到0
self.inputRotationRange = 0 self.inputRotationRange = 0
// 事件不能连续重复执行，需要缓存时间 // 事件不能连续重复执行，需要缓存时间
...@@ -1967,6 +1994,18 @@ export default { ...@@ -1967,6 +1994,18 @@ export default {
$('.tzdDrawing').css('transform', 'rotateY(0)') $('.tzdDrawing').css('transform', 'rotateY(0)')
this.issize = true this.issize = true
this.ismoderate = false this.ismoderate = false
if(!type){
// isActive
this.isActive = true;
$('.icon_size').css('background', 'rgba(5, 95, 231, 0.05)')
// 是否原尺寸同步
this.isSizeSynchro = false
// 是否展示原尺寸同步下拉框
this.isShowSizeSynchro = false
this.isShowsizeOptions = false
this.sizeChange();
}
// this.imageEditor.resetZoom() // this.imageEditor.resetZoom()
// self.zoomLevel = 1; // self.zoomLevel = 1;
// this.imageEditor.rotate(-parseInt(-self.startPlace)); // this.imageEditor.rotate(-parseInt(-self.startPlace));
...@@ -1990,6 +2029,7 @@ export default { ...@@ -1990,6 +2029,7 @@ export default {
* @return {*} * @return {*}
*/ */
delPic () { delPic () {
this.isHandTZD = false
let self = this let self = this
this.isActive_clear = false this.isActive_clear = false
this.isShowClearDialog = false this.isShowClearDialog = false
...@@ -2024,6 +2064,7 @@ export default { ...@@ -2024,6 +2064,7 @@ export default {
* @return {*} * @return {*}
*/ */
changeMultiply () { changeMultiply () {
this.isHandTZD = false
// 是否展示旋转的下拉框 // 是否展示旋转的下拉框
this.isRotateOptions = false this.isRotateOptions = false
// 是否展示园标记弹出框 // 是否展示园标记弹出框
...@@ -2073,6 +2114,7 @@ export default { ...@@ -2073,6 +2114,7 @@ export default {
* @return {*} * @return {*}
*/ */
changeRemoveWhite () { changeRemoveWhite () {
this.isHandTZD = false
// 是否展示旋转的下拉框 // 是否展示旋转的下拉框
this.isRotateOptions = false this.isRotateOptions = false
// 是否展示园标记弹出框 // 是否展示园标记弹出框
...@@ -2124,6 +2166,7 @@ export default { ...@@ -2124,6 +2166,7 @@ export default {
* @return {*} * @return {*}
*/ */
changeBlend () { changeBlend () {
this.isHandTZD = false
// 是否展示旋转的下拉框 // 是否展示旋转的下拉框
this.isRotateOptions = false this.isRotateOptions = false
// 是否展示园标记弹出框 // 是否展示园标记弹出框
...@@ -2174,6 +2217,7 @@ export default { ...@@ -2174,6 +2217,7 @@ export default {
* @return {*} * @return {*}
*/ */
changeInvert () { changeInvert () {
this.isHandTZD = false
// 是否展示旋转的下拉框 // 是否展示旋转的下拉框
this.isRotateOptions = false this.isRotateOptions = false
// 是否展示园标记弹出框 // 是否展示园标记弹出框
...@@ -2219,6 +2263,7 @@ export default { ...@@ -2219,6 +2263,7 @@ export default {
* @return {*} * @return {*}
*/ */
changeEmboss () { changeEmboss () {
this.isHandTZD = false
// 是否展示旋转的下拉框 // 是否展示旋转的下拉框
this.isRotateOptions = false this.isRotateOptions = false
// 是否展示园标记弹出框 // 是否展示园标记弹出框
...@@ -2264,6 +2309,7 @@ export default { ...@@ -2264,6 +2309,7 @@ export default {
* @return {*} * @return {*}
*/ */
changeSharpen () { changeSharpen () {
this.isHandTZD = false
// 是否展示旋转的下拉框 // 是否展示旋转的下拉框
this.isRotateOptions = false this.isRotateOptions = false
// 是否展示园标记弹出框 // 是否展示园标记弹出框
...@@ -2308,6 +2354,7 @@ export default { ...@@ -2308,6 +2354,7 @@ export default {
* @return {*} * @return {*}
*/ */
changeEqualization () { changeEqualization () {
this.isHandTZD = false
// 是否展示旋转的下拉框 // 是否展示旋转的下拉框
this.isRotateOptions = false this.isRotateOptions = false
// 是否展示园标记弹出框 // 是否展示园标记弹出框
...@@ -2342,6 +2389,7 @@ export default { ...@@ -2342,6 +2389,7 @@ export default {
* @return {*} * @return {*}
*/ */
changeHorseshoeMirror () { changeHorseshoeMirror () {
this.isHandTZD = false
// 是否展示旋转的下拉框 // 是否展示旋转的下拉框
this.isRotateOptions = false this.isRotateOptions = false
// 是否展示园标记弹出框 // 是否展示园标记弹出框
...@@ -2383,6 +2431,7 @@ export default { ...@@ -2383,6 +2431,7 @@ export default {
* @return {*} * @return {*}
*/ */
changeVintage () { changeVintage () {
this.isHandTZD = false
// 是否展示旋转的下拉框 // 是否展示旋转的下拉框
this.isRotateOptions = false this.isRotateOptions = false
// 是否展示园标记弹出框 // 是否展示园标记弹出框
...@@ -2428,6 +2477,7 @@ export default { ...@@ -2428,6 +2477,7 @@ export default {
* @return {*} * @return {*}
*/ */
changeGray () { changeGray () {
this.isHandTZD = false
// 是否展示旋转的下拉框 // 是否展示旋转的下拉框
this.isRotateOptions = false this.isRotateOptions = false
// 是否展示园标记弹出框 // 是否展示园标记弹出框
...@@ -2473,9 +2523,10 @@ export default { ...@@ -2473,9 +2523,10 @@ export default {
* @return {*} * @return {*}
*/ */
goSave () { goSave () {
this.isHandTZD = false
let self = this let self = this
console.log('保存'); console.log('保存');
if (self.saveType == '当前特征') { if (self.saveType == '当前指位特征') {
self.tzdall = [] self.tzdall = []
// let tzdall = self.tzdArr.concat(self.autoTzdArr) // let tzdall = self.tzdArr.concat(self.autoTzdArr)
if (self.tzdArr.length > 0) { if (self.tzdArr.length > 0) {
...@@ -2515,7 +2566,7 @@ export default { ...@@ -2515,7 +2566,7 @@ export default {
self.$message.success('保存成功！') self.$message.success('保存成功！')
} }
}) })
} else if (self.saveType == '全部特征') { } else if (self.saveType == '全部指位特征') {
let allTZData = [] let allTZData = []
console.log('111'); console.log('111');
sessionStorage.setItem(self.seq, JSON.stringify(self.preTzdArr)) sessionStorage.setItem(self.seq, JSON.stringify(self.preTzdArr))
...@@ -2570,6 +2621,7 @@ export default { ...@@ -2570,6 +2621,7 @@ export default {
* @return {*} * @return {*}
*/ */
changeSaveType (saveType) { changeSaveType (saveType) {
this.isHandTZD = false
this.saveType = saveType this.saveType = saveType
this.isShowSaveTypeOptions = false this.isShowSaveTypeOptions = false
}, },
...@@ -2579,6 +2631,7 @@ export default { ...@@ -2579,6 +2631,7 @@ export default {
* @return {*} * @return {*}
*/ */
saveTypeOptionsChange () { saveTypeOptionsChange () {
this.isHandTZD = false
this.isShowSaveTypeOptions = !this.isShowSaveTypeOptions this.isShowSaveTypeOptions = !this.isShowSaveTypeOptions
}, },
/** /**
...@@ -2587,6 +2640,7 @@ export default { ...@@ -2587,6 +2640,7 @@ export default {
* @return {*} * @return {*}
*/ */
changeyxhz () { changeyxhz () {
this.isHandTZD = false
this.iszyhz = false this.iszyhz = false
this.isyxhz = true this.isyxhz = true
}, },
...@@ -2596,6 +2650,7 @@ export default { ...@@ -2596,6 +2650,7 @@ export default {
* @return {*} * @return {*}
*/ */
changezyhz () { changezyhz () {
this.isHandTZD = false
this.iszyhz = true this.iszyhz = true
this.isyxhz = false this.isyxhz = false
}, },
...@@ -2605,6 +2660,7 @@ export default { ...@@ -2605,6 +2660,7 @@ export default {
* @return {*} * @return {*}
*/ */
zyhzOptionsChange () { zyhzOptionsChange () {
this.isHandTZD = false
this.isShowzyhzOptions = !this.isShowzyhzOptions this.isShowzyhzOptions = !this.isShowzyhzOptions
}, },
/** /**
...@@ -2613,6 +2669,7 @@ export default { ...@@ -2613,6 +2669,7 @@ export default {
* @return {*} * @return {*}
*/ */
enlarge () { enlarge () {
this.isHandTZD = false
$('.icon_line').css('background', 'rgba(5, 95, 231, 0.05)') $('.icon_line').css('background', 'rgba(5, 95, 231, 0.05)')
$('.icon_circle').css('background', 'rgba(5, 95, 231, 0.05)') $('.icon_circle').css('background', 'rgba(5, 95, 231, 0.05)')
$('.icon_rotate').css('background', 'rgba(5, 95, 231, 0.05)') $('.icon_rotate').css('background', 'rgba(5, 95, 231, 0.05)')
...@@ -2772,6 +2829,7 @@ export default { ...@@ -2772,6 +2829,7 @@ export default {
* @return {*} * @return {*}
*/ */
sizeChange () { sizeChange () {
this.isHandTZD = false
$('.icon_line').css('background', 'rgba(5, 95, 231, 0.05)') $('.icon_line').css('background', 'rgba(5, 95, 231, 0.05)')
$('.icon_circle').css('background', 'rgba(5, 95, 231, 0.05)') $('.icon_circle').css('background', 'rgba(5, 95, 231, 0.05)')
$('.icon_rotate').css('background', 'rgba(5, 95, 231, 0.05)') $('.icon_rotate').css('background', 'rgba(5, 95, 231, 0.05)')
...@@ -2910,12 +2968,16 @@ export default { ...@@ -2910,12 +2968,16 @@ export default {
this.isActive = !this.isActive this.isActive = !this.isActive
if (this.isActive) { if (this.isActive) {
//重置图像大小，旋转方向的方法 //重置图像大小，旋转方向的方法
this.OriginalChange(); if(this.xsType == 'yuantu'){
this.OriginalChange('yes');
this.issize = true
}else{
this.ModerateChange('yes');
this.ismoderate = true;
}
$('.icon_size').css('background', '#055FE7') $('.icon_size').css('background', '#055FE7')
this.isShowSizeSynchro = true this.isShowSizeSynchro = true
this.isShowsizeOptions = true this.isShowsizeOptions = true
this.issize = true
this.ismoderate = false
// 特征点图层缩放设置为1 // 特征点图层缩放设置为1
$('.tzdDrawing').css('transform', 'scale(1)'); $('.tzdDrawing').css('transform', 'scale(1)');
// // 是否原尺寸同步 // // 是否原尺寸同步
...@@ -2937,8 +2999,6 @@ export default { ...@@ -2937,8 +2999,6 @@ export default {
// 是否展示原尺寸同步下拉框 // 是否展示原尺寸同步下拉框
this.isShowSizeSynchro = false this.isShowSizeSynchro = false
this.isShowsizeOptions = false this.isShowsizeOptions = false
this.issize = false
this.ismoderate = true
} }
}, },
/** /**
...@@ -2965,6 +3025,7 @@ export default { ...@@ -2965,6 +3025,7 @@ export default {
* @return {*} * @return {*}
*/ */
hand () { hand () {
this.isHandTZD = false
let self = this let self = this
$('.icon_line').css('background', 'rgba(5, 95, 231, 0.05)') $('.icon_line').css('background', 'rgba(5, 95, 231, 0.05)')
$('.icon_circle').css('background', 'rgba(5, 95, 231, 0.05)') $('.icon_circle').css('background', 'rgba(5, 95, 231, 0.05)')
...@@ -3177,6 +3238,7 @@ export default { ...@@ -3177,6 +3238,7 @@ export default {
* @return {*} * @return {*}
*/ */
initStatus () { initStatus () {
this.isHandTZD = false
$('.icon_line').css('background', 'rgba(5, 95, 231, 0.05)') $('.icon_line').css('background', 'rgba(5, 95, 231, 0.05)')
$('.icon_circle').css('background', 'rgba(5, 95, 231, 0.05)') $('.icon_circle').css('background', 'rgba(5, 95, 231, 0.05)')
$('.icon_rotate').css('background', 'rgba(5, 95, 231, 0.05)') $('.icon_rotate').css('background', 'rgba(5, 95, 231, 0.05)')
...@@ -3325,6 +3387,11 @@ export default { ...@@ -3325,6 +3387,11 @@ export default {
} }
}, },
watch: { watch: {
isActive(val){
if(val == false){
this.isShowsizeOptions = false;
}
},
inputRotationRange (newValue, oldValue) { inputRotationRange (newValue, oldValue) {
let deg = newValue - this.startPlace; let deg = newValue - this.startPlace;
if (!deg) deg = 0; if (!deg) deg = 0;
......
src/views/Editor/modules/imageEdAJ.scss
...@@ -97,6 +97,12 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -97,6 +97,12 @@ $directionRotate: var(--directionRotate, 0deg);
.bzd { .bzd {
margin-right: 40px; margin-right: 40px;
} }
.disabled {
.disabled-img {
width: 64px;
height: 32px;
}
}
.size, .size,
.line { .line {
&::after { &::after {
......
src/views/Editor/modules/imageEdAJ.vue
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/Editor/modules/ryzwbjLeft.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 09:42:07 * @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-11-09 17:29:05 * @LastEditTime: 2021-11-12 19:48:54
* @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\ryzwbjLeft.vue * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
...@@ -92,6 +92,9 @@ import { mapState } from 'vuex'; ...@@ -92,6 +92,9 @@ import { mapState } from 'vuex';
export default { export default {
data () { data () {
return { return {
// 判断是否有平面指纹
PainFingerFlag: true,
barcode: this.$route.params.barcode,
// 上一次的指纹序号 // 上一次的指纹序号
preSeq: '', preSeq: '',
// 找到第一个有图片的指纹 // 找到第一个有图片的指纹
...@@ -315,8 +318,12 @@ export default { ...@@ -315,8 +318,12 @@ export default {
item.image = null item.image = null
}) })
let res = await this.$axios({ let res = await this.$axios({
method: 'get', method: 'post',
url: '/api/org/roll/'+self.id+'?mnt=1', // url: '/api/org/roll/'+self.id+'?mnt=1',
url: '/api/png/rollEByBarcode/barcode',
data: {
barcode: self.barcode
},
loading: false loading: false
// url: '/api/png/roll/1?mnt=1' // url: '/api/png/roll/1?mnt=1'
}) })
...@@ -325,7 +332,7 @@ export default { ...@@ -325,7 +332,7 @@ export default {
for (const key in res.data.ret) { for (const key in res.data.ret) {
const element = res.data.ret[key]; const element = res.data.ret[key];
// 左手 // 左手
if (key > 5) { if (element.seq > 5) {
self.rollFingersLeft.forEach((item) => { self.rollFingersLeft.forEach((item) => {
if (item.code == element.seq) { if (item.code == element.seq) {
item.image = element.image item.image = element.image
...@@ -357,19 +364,27 @@ export default { ...@@ -357,19 +364,27 @@ export default {
item.image = null item.image = null
}) })
let res = await this.$axios({ let res = await this.$axios({
method: 'get', method: 'post',
url: '/api/org/plain/'+self.id+'?mnt=1', // url: '/api/org/plain/'+self.id+'?mnt=1',
url: '/api/png/plainEByBarcode/barcode',
data: {
barcode: self.barcode
},
loading: false loading: false
// url: '/api/png/plain/1?mnt=1' // url: '/api/png/plain/1?mnt=1'
}) })
// console.log(res); // console.log(res);
if (res.data.code === 0) { if (res.data.code === 0) {
console.log(res);
if (res.data.ret.length > 0) {
for (const key in res.data.ret) { for (const key in res.data.ret) {
const element = res.data.ret[key]; const element = res.data.ret[key];
// 左手 // 左手
if (key > 15) { if (element.seq > 15) {
self.painFingersLeft.forEach((item) => { self.painFingersLeft.forEach((item) => {
if (item.code == element.seq) { if (item.code == element.seq) {
item.image = element.image item.image = element.image
} }
}) })
...@@ -382,6 +397,11 @@ export default { ...@@ -382,6 +397,11 @@ export default {
}) })
} }
} }
self.PainFingerFlag = true
} else {
// 没有平面指纹，不能切换tabl栏
self.PainFingerFlag = false
}
} }
}, },
/** /**
...@@ -391,11 +411,11 @@ export default { ...@@ -391,11 +411,11 @@ export default {
*/ */
rollFingersLeftChange (finger) { rollFingersLeftChange (finger) {
let self = this let self = this
if(this.preSeq) { if (this.preSeq) {
// 保存当前的指位特征点信息 // 保存当前的指位特征点信息
// 直接覆盖之前的数据 // 直接覆盖之前的数据
console.log(self.preTzdArr); console.log(self.preTzdArr);
if(self.preTzdArr && self.preTzdArr.length>=0) { if (self.preTzdArr && self.preTzdArr.length >= 0) {
sessionStorage.setItem(this.preSeq, JSON.stringify(self.preTzdArr)) sessionStorage.setItem(this.preSeq, JSON.stringify(self.preTzdArr))
sessionStorage.setItem(`auto${this.preSeq}`, JSON.stringify(self.autopretzdall)) sessionStorage.setItem(`auto${this.preSeq}`, JSON.stringify(self.autopretzdall))
} }
...@@ -457,6 +477,9 @@ export default { ...@@ -457,6 +477,9 @@ export default {
* @return {*} * @return {*}
*/ */
zzwChange (event) { zzwChange (event) {
if(!this.PainFingerFlag && event.target.innerText == '平面指纹') {
return
}
this.zwSelect = event.target.innerText this.zwSelect = event.target.innerText
}, },
/** /**
......
src/views/Home.vue
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<img v-else :src="leftImg" alt="" /> <img v-else :src="leftImg" alt="" />
</div> </div>
<div class="options"> <div class="options">
<div class="sendFind">发查询</div> <!-- <div class="sendFind">发查询</div> -->
<div class="set">系统管理</div> <div class="set">系统管理</div>
<div class="role">指纹员</div> <div class="role">指纹员</div>
<div class="message"> <div class="message">
...@@ -445,6 +445,9 @@ export default { ...@@ -445,6 +445,9 @@ export default {
background-color: #006aff; background-color: #006aff;
display: none; display: none;
} }
.el-tabs__nav-wrap::after{
height: 1px!important;
}
.el-tabs__item { .el-tabs__item {
position: relative; position: relative;
padding-right: 35px !important; padding-right: 35px !important;
......
src/views/cxyrd/LT.vue
...@@ -123,7 +123,6 @@ ...@@ -123,7 +123,6 @@
<div <div
class="rdwcDialog" class="rdwcDialog"
v-show="isShowrdwcDialogBg" v-show="isShowrdwcDialogBg"
@click="cancelrdwc"
></div> ></div>
<div class="rdwccontent" v-show="isShowrdwcDialog"> <div class="rdwccontent" v-show="isShowrdwcDialog">
<div class="title">当前候选未全部查看，是否确认认定完成？</div> <div class="title">当前候选未全部查看，是否确认认定完成？</div>
...@@ -521,7 +520,7 @@ div { ...@@ -521,7 +520,7 @@ div {
height: 22px; height: 22px;
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
color: #00b47a; color: #00B47A;
line-height: 22px; line-height: 22px;
margin-top: 14px; margin-top: 14px;
} }
......
src/views/cxyrd/TL.vue
...@@ -169,6 +169,7 @@ export default { ...@@ -169,6 +169,7 @@ export default {
}; };
}, },
watch: { watch: {
phone(newValue, oldValue) { phone(newValue, oldValue) {
if (newValue.length < 7) { if (newValue.length < 7) {
this.isPhoneError = true; this.isPhoneError = true;
......
src/views/cxyrd/TT.vue
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="rd-btn" @click="Rdwc">认定完成</div> <div class="rd-btn" @click="Rdwc">认定完成</div>
</div> </div>
</div> </div>
<Swiper /> <!-- <Swiper /> -->
<div class="main"> <div class="main">
<div class="data"> <div class="data">
<!-- 卡片源数据--> <!-- 卡片源数据-->
...@@ -796,6 +796,7 @@ export default { ...@@ -796,6 +796,7 @@ export default {
console.log("源qqid====>", this.currentQqid); console.log("源qqid====>", this.currentQqid);
}, },
watch: { watch: {
phone(newValue, oldValue) { phone(newValue, oldValue) {
if (newValue.length < 7) { if (newValue.length < 7) {
this.isPhoneError = true; this.isPhoneError = true;
......
src/views/cxyrd/modules/LTCandidate.vue
...@@ -1097,7 +1097,7 @@ export default { ...@@ -1097,7 +1097,7 @@ export default {
// } // }
let zcseq = sessionStorage.getItem('zcseq') let zcseq = sessionStorage.getItem('zcseq')
let qqid = sessionStorage.getItem('qqid') let qqid = sessionStorage.getItem('qqid')
this.$axios.post(`/api/query/matchcand/dest/${qqid}/${zcseq}`, { srcbarcode: sessionStorage.getItem('srcbarcode'), destbarcode: self.input3 }) this.$axios.post(`/api/query/matchcand/dest/${qqid}/${zcseq}`, { srcbarcode: sessionStorage.getItem('srcbarcode'), destbarcode: self.input3.trim() })
.then(response => { .then(response => {
console.log(response); console.log(response);
self.tableData = response.data.ret self.tableData = response.data.ret
......
src/views/cxyrd/modules/TLCandidate.vue
...@@ -68,7 +68,7 @@ export default { ...@@ -68,7 +68,7 @@ export default {
let self = this let self = this
let dcseq = sessionStorage.getItem('dcseq') let dcseq = sessionStorage.getItem('dcseq')
let qqid = sessionStorage.getItem('qqid') let qqid = sessionStorage.getItem('qqid')
this.$axios.post(`/api/query/matchcand/dest/${qqid}/${dcseq}`, { srcbarcode: sessionStorage.getItem('srcbarcode'), destbarcode: self.input3 }) this.$axios.post(`/api/query/matchcand/dest/${qqid}/${dcseq}`, { srcbarcode: sessionStorage.getItem('srcbarcode'), destbarcode: self.input3.trim() })
.then(response => { .then(response => {
console.log(response); console.log(response);
self.tableData = response.data.ret self.tableData = response.data.ret
......
src/views/drFPTX/RAList.vue
<template> <template>
<el-container class="RAList" direction="vertical"> <div
class="RAList"
direction="vertical"
>
<!-- 一 --> <!-- 一 -->
<div class="head" v-if="showType == 1"> <div
<el-radio-group v-model="dataType" class="chooseType"> class="head"
v-if="showType == 1"
>
<el-radio-group
v-model="dataType"
class="chooseType"
>
<el-radio :label="1">人员</el-radio> <el-radio :label="1">人员</el-radio>
<el-radio :label="2">案件</el-radio> <el-radio :label="2">案件</el-radio>
</el-radio-group> </el-radio-group>
...@@ -19,7 +28,10 @@ ...@@ -19,7 +28,10 @@
</div> </div>
<div class="search ljfk"> <div class="search ljfk">
<div class="item">逻辑分库：</div> <div class="item">逻辑分库：</div>
<el-select v-model="logicDatabase" placeholder="请选择逻辑分库"> <el-select
v-model="logicDatabase"
placeholder="请选择逻辑分库"
>
<el-option <el-option
v-for="item in logicDatabaseoptions" v-for="item in logicDatabaseoptions"
:key="item.value" :key="item.value"
...@@ -42,7 +54,10 @@ ...@@ -42,7 +54,10 @@
</div> </div>
<div class="search rkzt"> <div class="search rkzt">
<div class="item">入库状态：</div> <div class="item">入库状态：</div>
<el-select v-model="status" placeholder="请选择入库状态"> <el-select
v-model="status"
placeholder="请选择入库状态"
>
<el-option <el-option
v-for="item in statusoptions" v-for="item in statusoptions"
:key="item.value" :key="item.value"
...@@ -55,7 +70,7 @@ ...@@ -55,7 +70,7 @@
<div class="search sjxz"> <div class="search sjxz">
<div class="item">时间选择：</div> <div class="item">时间选择：</div>
<el-date-picker <el-date-picker
v-model="value1" v-model="startEndDate"
type="daterange" type="daterange"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
...@@ -80,7 +95,10 @@ ...@@ -80,7 +95,10 @@
</div> </div>
<div class="search ljfk"> <div class="search ljfk">
<div class="item">查询类型：</div> <div class="item">查询类型：</div>
<el-select v-model="queryType" placeholder="请选择查询类型"> <el-select
v-model="queryType"
placeholder="请选择查询类型"
>
<el-option <el-option
v-for="item in queryTypeOptions" v-for="item in queryTypeOptions"
:key="item.value" :key="item.value"
...@@ -92,7 +110,10 @@ ...@@ -92,7 +110,10 @@
</div> </div>
<div class="search ljfk"> <div class="search ljfk">
<div class="item">逻辑分库：</div> <div class="item">逻辑分库：</div>
<el-select v-model="logicDatabase" placeholder="请选择逻辑分库"> <el-select
v-model="logicDatabase"
placeholder="请选择逻辑分库"
>
<el-option <el-option
v-for="item in logicDatabaseoptions" v-for="item in logicDatabaseoptions"
:key="item.value" :key="item.value"
...@@ -113,7 +134,10 @@ ...@@ -113,7 +134,10 @@
</div> --> </div> -->
<div class="search rkzt"> <div class="search rkzt">
<div class="item">入库状态：</div> <div class="item">入库状态：</div>
<el-select v-model="status" placeholder="请选择入库状态"> <el-select
v-model="status"
placeholder="请选择入库状态"
>
<el-option <el-option
v-for="item in statusoptions" v-for="item in statusoptions"
:key="item.value" :key="item.value"
...@@ -126,7 +150,7 @@ ...@@ -126,7 +150,7 @@
<!-- <div class='search sjxz'> <!-- <div class='search sjxz'>
<div class='item'> 时间选择：</div> <div class='item'> 时间选择：</div>
<el-date-picker <el-date-picker
v-model="value1" v-model="startEndDate"
type="datetimerange" type="datetimerange"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
...@@ -137,7 +161,10 @@ ...@@ -137,7 +161,10 @@
<!-- 二 --> <!-- 二 -->
<div class="buttons"> <div class="buttons">
<div class="left"> <div class="left">
<el-radio-group v-model="showType" size="small"> <el-radio-group
v-model="showType"
size="small"
>
<el-radio-button label="1">人员案件</el-radio-button> <el-radio-button label="1">人员案件</el-radio-button>
<el-radio-button label="2">比中关系</el-radio-button> <el-radio-button label="2">比中关系</el-radio-button>
</el-radio-group> </el-radio-group>
...@@ -150,10 +177,16 @@ ...@@ -150,10 +177,16 @@
<!-- 三 --> <!-- 三 -->
<div class="options"> <div class="options">
<div class="left"> <div class="left">
<div class="btn" @click="batch">批量操作</div> <div
class="btn"
@click="batch"
>批量操作</div>
</div> </div>
<div class="right"> <div class="right">
<div class="btn" @click="isShowTjddlBtn">添加到队列</div> <div
class="btn"
@click="isShowTjddlBtn"
>添加到队列</div>
<div class="btn">复制入库失败编号</div> <div class="btn">复制入库失败编号</div>
<div class="btn">复制入库成功编号</div> <div class="btn">复制入库成功编号</div>
<div <div
...@@ -165,7 +198,10 @@ ...@@ -165,7 +198,10 @@
> >
复制条码 复制条码
</div> </div>
<div class="btn send" @click="isShowFcxBtn">发查询</div> <div
class="btn send"
@click="isShowFcxBtn"
>发查询</div>
</div> </div>
</div> </div>
<!--四 --> <!--四 -->
...@@ -173,7 +209,10 @@ ...@@ -173,7 +209,10 @@
style="width: 100%; color: #666666; margin-bottom: 16px" style="width: 100%; color: #666666; margin-bottom: 16px"
v-show="isShowTip" v-show="isShowTip"
> >
<i class="el-icon-info" style="color: #055fe7; font-size: 15px"></i> <i
class="el-icon-info"
style="color: #055fe7; font-size: 15px"
></i>
已选择 已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​ <span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
<span v-html="'&nbsp;&nbsp;'"></span> <span v-html="'&nbsp;&nbsp;'"></span>
...@@ -183,13 +222,12 @@ ...@@ -183,13 +222,12 @@
:underline="false" :underline="false"
style="margin-left: 20px" style="margin-left: 20px"
@click="toggleSelection()" @click="toggleSelection()"
>清除</el-link >清除</el-link>
>
</el-tag> </el-tag>
<!-- 五 --> <!-- 五 -->
<div v-if="showType == 1"> <div v-if="showType == 1">
<el-table <el-table
max-height="500" max-height="700"
ref="multipleTable" ref="multipleTable"
:data="tableDate1" :data="tableDate1"
tooltip-effect="dark" tooltip-effect="dark"
...@@ -201,21 +239,53 @@ ...@@ -201,21 +239,53 @@
}" }"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="auto" v-if="isSelected"> <el-table-column
type="selection"
width="70"
v-if="isSelected"
>
</el-table-column> </el-table-column>
<el-table-column prop="taskNumber" label="任务号" width="200"> <el-table-column
prop="taskNumber"
label="任务号"
width="350"
>
</el-table-column> </el-table-column>
<el-table-column prop="fileName" label="文件名" width="300"> <el-table-column
prop="fileName"
label="文件名"
width="400"
>
</el-table-column> </el-table-column>
<el-table-column prop="barcode" label="人员编号/案事件编号" width="300"> <el-table-column
prop="barcode"
label="人员编号/案事件编号"
width="350"
>
</el-table-column> </el-table-column>
<el-table-column prop="dataType" label="类型" width="auto"> <el-table-column
prop="dataType"
label="类型"
width="200"
>
</el-table-column> </el-table-column>
<el-table-column prop="logicDatabase" label="逻辑分库" width="auto"> <el-table-column
prop="logicDatabase"
label="逻辑分库"
width="200"
>
</el-table-column> </el-table-column>
<el-table-column prop="status" label="状态" width="auto"> <el-table-column
prop="status"
label="状态"
width="auto"
>
</el-table-column> </el-table-column>
<el-table-column fixed="right" label="操作" width="100"> <el-table-column
fixed="right"
label="操作"
width="200"
>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="ops"> <div class="ops">
<el-tooltip <el-tooltip
...@@ -226,8 +296,14 @@ ...@@ -226,8 +296,14 @@
:open-delay="500" :open-delay="500"
@click="handleClick(scope.row)" @click="handleClick(scope.row)"
> >
<div class="icon bj" @click="handleClick(scope.row)"> <div
<img src="../../assets/img/qbryk/bj.svg" alt="" /> class="icon bj"
@click="handleClick(scope.row)"
>
<img
src="../../assets/img/qbryk/bj.svg"
alt=""
/>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
...@@ -237,8 +313,14 @@ ...@@ -237,8 +313,14 @@
placement="top" placement="top"
:open-delay="500" :open-delay="500"
> >
<div class="icon bz" @click="isShowFztmBtn(scope.row)"> <div
<img src="../../assets/img/qbryk/bz.svg" alt="" /> class="icon bz"
@click="isShowFztmBtn(scope.row)"
>
<img
src="../../assets/img/qbryk/bz.svg"
alt=""
/>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
...@@ -248,8 +330,14 @@ ...@@ -248,8 +330,14 @@
placement="top" placement="top"
:open-delay="500" :open-delay="500"
> >
<div class="icon look" @click="isShowFcxBtn1(scope.row)"> <div
<img src="../../assets/img/qbryk/search.svg" alt="" /> class="icon look"
@click="isShowFcxBtn1(scope.row)"
>
<img
src="../../assets/img/qbryk/search.svg"
alt=""
/>
</div> </div>
</el-tooltip> </el-tooltip>
</div> </div>
...@@ -260,7 +348,7 @@ ...@@ -260,7 +348,7 @@
<el-table <el-table
v-if="showType == 2" v-if="showType == 2"
max-height="500" max-height="700"
ref="multipleTable" ref="multipleTable"
:data="tableDate2" :data="tableDate2"
tooltip-effect="dark" tooltip-effect="dark"
...@@ -272,25 +360,57 @@ ...@@ -272,25 +360,57 @@
}" }"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="auto" v-if="isSelected"> <el-table-column
type="selection"
width="auto"
v-if="isSelected"
>
</el-table-column> </el-table-column>
<el-table-column prop="taskNumber" label="任务号" width="200"> <el-table-column
prop="taskNumber"
label="任务号"
width="350"
>
</el-table-column> </el-table-column>
<el-table-column prop="fileName" label="文件名" width="300"> <el-table-column
prop="fileName"
label="文件名"
width="400"
>
</el-table-column> </el-table-column>
<el-table-column prop="queryType" label="查询类型" width="auto"> <el-table-column
prop="queryType"
label="查询类型"
width="200"
>
</el-table-column> </el-table-column>
<el-table-column prop="barcode" label="人员编号/案事件编号" width="300"> <el-table-column
prop="barcode"
label="人员编号/案事件编号"
width="350"
>
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.srcBarcode }}</div> <div>{{ scope.row.srcBarcode }}</div>
<div>{{ scope.row.destBarcode }}</div> <div>{{ scope.row.destBarcode }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="logicDatabase" label="逻辑分库" width="auto"> <el-table-column
prop="logicDatabase"
label="逻辑分库"
width="200"
>
</el-table-column> </el-table-column>
<el-table-column prop="status" label="状态" width="auto"> <el-table-column
prop="status"
label="状态"
width="auto"
>
</el-table-column> </el-table-column>
<el-table-column fixed="right" label="操作" width="100"> <el-table-column
fixed="right"
label="操作"
width="200"
>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="ops"> <div class="ops">
<el-tooltip <el-tooltip
...@@ -301,8 +421,14 @@ ...@@ -301,8 +421,14 @@
:open-delay="500" :open-delay="500"
@click="handleClick(scope.row)" @click="handleClick(scope.row)"
> >
<div class="icon bj" @click="handleClick(scope.row)"> <div
<img src="../../assets/img/qbryk/bj.svg" alt="" /> class="icon bj"
@click="handleClick(scope.row)"
>
<img
src="../../assets/img/qbryk/bj.svg"
alt=""
/>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
...@@ -312,8 +438,14 @@ ...@@ -312,8 +438,14 @@
placement="top" placement="top"
:open-delay="500" :open-delay="500"
> >
<div class="icon bz" @click="isShowFztmBtn(scope.row)"> <div
<img src="../../assets/img/qbryk/bz.svg" alt="" /> class="icon bz"
@click="isShowFztmBtn(scope.row)"
>
<img
src="../../assets/img/qbryk/bz.svg"
alt=""
/>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
...@@ -323,8 +455,14 @@ ...@@ -323,8 +455,14 @@
placement="top" placement="top"
:open-delay="500" :open-delay="500"
> >
<div class="icon look" @click="isShowFcxBtn1(scope.row)"> <div
<img src="../../assets/img/qbryk/search.svg" alt="" /> class="icon look"
@click="isShowFcxBtn1(scope.row)"
>
<img
src="../../assets/img/qbryk/search.svg"
alt=""
/>
</div> </div>
</el-tooltip> </el-tooltip>
</div> </div>
...@@ -332,25 +470,41 @@ ...@@ -332,25 +470,41 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 六 --> <!-- 六 -->
<div class="block"> <div
<span class="record" class="block"
>共{{ reqParam.page.total }}条记录 第{{ reqParam.page.currPage }}/{{ v-if="showType == 1"
Tpage >
}}页</span <span class="record">共{{ total1 }}条记录 第{{ currPage1 }}/{{Tpage1}}页</span>
<el-pagination
class="paging"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"
:current-page="currPage1"
:page-sizes="[10, 20, 30, 40]"
background
layout="prev, pager, next"
:total="total1"
>
</el-pagination>
</div>
<div
class="block"
v-if="showType == 2"
> >
<span class="record">共{{ total2 }}条记录 第{{ currPage2 }}/{{Tpage2}}页</span>
<el-pagination <el-pagination
class="paging" class="paging"
@size-change="handleSizeChange" @size-change="handleSizeChange2"
@current-change="handleCurrentChange" @current-change="handleCurrentChange2"
:current-page="reqParam.page.currPage" :current-page="currPage2"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10, 20, 30, 40]"
background background
layout="prev, pager, next" layout="prev, pager, next"
:total="reqParam.page.total" :total="total2"
> >
</el-pagination> </el-pagination>
<!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40]" background layout="sizes, prev, pager, next" :total="tableDataLength"> </div>
</el-pagination> -->
<!-- 添加到队列弹窗 --> <!-- 添加到队列弹窗 -->
<tjddl <tjddl
:isShowTjddl="isShowTjddl" :isShowTjddl="isShowTjddl"
...@@ -374,12 +528,12 @@ ...@@ -374,12 +528,12 @@
> >
</fcx> </fcx>
</div> </div>
</el-container>
</template> </template>
<script> <script>
import tjddl from "../AllPersonnelBase/modules/tjddl.vue"; // 添加到队列弹窗 import tjddl from "../AllPersonnelBase/modules/tjddl.vue"; // 添加到队列弹窗
import fztm from "../AllPersonnelBase/modules/fztm.vue"; // 复制数据弹窗 import fztm from "../AllPersonnelBase/modules/fztm.vue"; // 复制数据弹窗
import fcx from "../AllPersonnelBase/modules/fcx.vue"; // 发查询弹窗 import fcx from "../AllPersonnelBase/modules/fcx.vue"; // 发查询弹窗
import moment from "moment";
export default { export default {
name: "RAList", name: "RAList",
components: { components: {
...@@ -387,7 +541,7 @@ export default { ...@@ -387,7 +541,7 @@ export default {
fztm, fztm,
fcx, fcx,
}, },
data() { data () {
return { return {
dataType: 1, // 导入类型 dataType: 1, // 导入类型
barcode: "", // 条码号 barcode: "", // 条码号
...@@ -411,7 +565,7 @@ export default { ...@@ -411,7 +565,7 @@ export default {
], ],
status: null, // 入库状态 status: null, // 入库状态
logicDatabase: "", // 逻辑库 logicDatabase: "", // 逻辑库
value1: "", // 时间 startEndDate: null, // 时间
taskNumber: "", // 任务号 taskNumber: "", // 任务号
showType: "1", // 1:人案 2：比中 showType: "1", // 1:人案 2：比中
queryType: "", // 比中类型 queryType: "", // 比中类型
...@@ -437,6 +591,17 @@ export default { ...@@ -437,6 +591,17 @@ export default {
tableDate1: [], // 人员列表数据 tableDate1: [], // 人员列表数据
tableDate2: [], // 人员列表数据 tableDate2: [], // 人员列表数据
total1: null, // 总条数
total2: null, // 总条数
pageSize: 10, //当前选择要显示的条数
currPage1: 1, // 当前在第几页
currPage2: 1, // 当前在第几页
sendTimeStart: "", // 开始时间
sendTimeEnd: "", // 结束时间
isSelected: false, // 是否批量操作 isSelected: false, // 是否批量操作
isShowTjddl: false, // 添加到队列 isShowTjddl: false, // 添加到队列
isShowFztm: false, //复制条码 isShowFztm: false, //复制条码
...@@ -447,15 +612,11 @@ export default { ...@@ -447,15 +612,11 @@ export default {
reqParam: { reqParam: {
// 请求参数 // 请求参数
page: { page: {
total: 0, //表格条数 total1: 0, //表格条数
pageSize: 10, //当前选择要显示的条数 pageSize: 10, //当前选择要显示的条数
currPage: 1, // 当前在第几页 currPage1: 1, // 当前在第几页
},
personStoreCustomSearch: {
ysxtAsjxgrybh: "", // 搜索框内容
searchOptions: 3, // 默认搜索方式
checkboxQuery: [], //滚动平面等筛选条件
}, },
}, },
multipleSelection: [], // 表单选择项目 multipleSelection: [], // 表单选择项目
...@@ -464,7 +625,7 @@ export default { ...@@ -464,7 +625,7 @@ export default {
}; };
}, },
watch: { watch: {
showType(newNum, oldNum) { showType (newNum, oldNum) {
// ... // ...
console.log(newNum, 123); console.log(newNum, 123);
this.search(); this.search();
...@@ -473,7 +634,7 @@ export default { ...@@ -473,7 +634,7 @@ export default {
methods: { methods: {
// 获取全部人员列表请求 // 获取全部人员列表请求
search () { search () {
console.log(this.value1, 123321) this.getParam()
let reqUrl = null; let reqUrl = null;
let reqParam = null; let reqParam = null;
if (this.showType == 1) { if (this.showType == 1) {
...@@ -484,6 +645,10 @@ export default { ...@@ -484,6 +645,10 @@ export default {
status: null, // 状态 status: null, // 状态
barcode: "", // 条码号 barcode: "", // 条码号
logicDatabase: "", // 逻辑分库 logicDatabase: "", // 逻辑分库
sendTimeStart: null, // 开始时间
sendTimeEnd: null, // 结束时间
offSet: null, // 当前页数
limit: null // 当页条数
}; };
reqParam.taskNumber = this.taskNumber; reqParam.taskNumber = this.taskNumber;
reqParam.dataType = Number(this.dataType); reqParam.dataType = Number(this.dataType);
...@@ -491,6 +656,10 @@ export default { ...@@ -491,6 +656,10 @@ export default {
reqParam.status = this.status != null ? Number(this.status) : null; reqParam.status = this.status != null ? Number(this.status) : null;
reqParam.barcode = this.barcode; reqParam.barcode = this.barcode;
reqParam.logicDatabase = this.logicDatabase; reqParam.logicDatabase = this.logicDatabase;
reqParam.sendTimeStart = this.sendTimeStart = this.sendTimeStart;
reqParam.sendTimeEnd = this.sendTimeEnd = this.sendTimeStart;
reqParam.offSet = this.currPage1;
reqParam.limit = this.pageSize
} else if (this.showType == 2) { } else if (this.showType == 2) {
// console.log('bizhong bizhong ') // console.log('bizhong bizhong ')
reqUrl = "/api/record/import/affirm/search"; reqUrl = "/api/record/import/affirm/search";
...@@ -499,11 +668,15 @@ export default { ...@@ -499,11 +668,15 @@ export default {
barcode: "", // 条码号 barcode: "", // 条码号
logicDatabase: "", // 逻辑分库 logicDatabase: "", // 逻辑分库
queryType: "", // 类型 queryType: "", // 类型
offSet: null, // 当前页数
limit: null // 当页条数
}; };
reqParam.status = this.status != null ? Number(this.status) : null; reqParam.status = this.status != null ? Number(this.status) : null;
reqParam.barcode = this.barcode; reqParam.barcode = this.barcode;
reqParam.logicDatabase = this.logicDatabase; reqParam.logicDatabase = this.logicDatabase;
reqParam.queryType = this.queryType; reqParam.queryType = this.queryType;
reqParam.offSet = this.currPage2;
reqParam.limit = this.pageSize
} }
// console.info("请求===>", this.reqParam); // console.info("请求===>", this.reqParam);
this.$axios.post(reqUrl, reqParam).then((response) => { this.$axios.post(reqUrl, reqParam).then((response) => {
...@@ -511,18 +684,36 @@ export default { ...@@ -511,18 +684,36 @@ export default {
if (response.data.code === 0) { if (response.data.code === 0) {
if (this.showType == 1) { if (this.showType == 1) {
this.tableDate1 = response.data.ret.pcImportRecordChildren; this.tableDate1 = response.data.ret.pcImportRecordChildren;
this.total1 = response.data.ret.total;
console.log('total', this.total1)
} else if (this.showType == 2) { } else if (this.showType == 2) {
this.tableDate2 = response.data.ret.affirmImportRecordChildren; this.tableDate2 = response.data.ret.affirmImportRecordChildren;
this.total2 = response.data.ret.total;
} }
// this.reqParam.page.total = response.data.ret.total; // this.reqParam.page.total1 = response.data.ret.total1;
console.info("查询结果===>", this.tableDate); console.info("查询结果1===>", this.tableDate1);
console.info("查询结果2===>", this.tableDate2);
} else { } else {
this.$message.error(response.data.message); this.$message.error(response.data.message);
} }
}); });
}, },
// 格式化参数
getParam () {
if (this.startEndDate !== null) {
this.sendTimeStart = moment(
this.startEndDate[0]
).format("YYYY-MM-DD");
this.sendTimeEnd = moment(
this.startEndDate[1]
).format("YYYY-MM-DD");
} else {
this.sendTimeStart = null
this.sendTimeEnd = null
}
},
// 复制条码号 获取选中条码值 // 复制条码号 获取选中条码值
getBarcode() { getBarcode () {
let self = this; let self = this;
this.ysxtAsjxgrybh = []; this.ysxtAsjxgrybh = [];
if (this.multipleSelection.length === 0) { if (this.multipleSelection.length === 0) {
...@@ -540,7 +731,7 @@ export default { ...@@ -540,7 +731,7 @@ export default {
// } // }
}, },
// 复制成功时的回调函数 // 复制成功时的回调函数
onCopy(e) { onCopy (e) {
this.$message({ this.$message({
type: "success", type: "success",
// message: "复制条码号:" + this.ysxtAsjxgrybh + "成功！" // message: "复制条码号:" + this.ysxtAsjxgrybh + "成功！"
...@@ -548,11 +739,11 @@ export default { ...@@ -548,11 +739,11 @@ export default {
}); });
}, },
// 复制失败时的回调函数 // 复制失败时的回调函数
onError(e) { onError (e) {
this.$message.error("抱歉，复制条码号失败！"); this.$message.error("抱歉，复制条码号失败！");
}, },
// 添加到队列 // 添加到队列
isShowTjddlBtn() { isShowTjddlBtn () {
console.log("添加到队列"); console.log("添加到队列");
if (this.multipleSelection.length === 0) { if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要添加到队列的数据！"); this.$message.error("请选择需要添加到队列的数据！");
...@@ -562,24 +753,24 @@ export default { ...@@ -562,24 +753,24 @@ export default {
this.isShowTjddl = true; this.isShowTjddl = true;
} }
}, },
closeTjddl(val) { closeTjddl (val) {
console.log("添加到队列关闭", val); console.log("添加到队列关闭", val);
this.isShowTjddl = val; this.isShowTjddl = val;
}, },
//复制条码列表操作 //复制条码列表操作
isShowFztmBtn(val) { isShowFztmBtn (val) {
console.log("复制条码", val); console.log("复制条码", val);
this.rowData = val; this.rowData = val;
this.isShowFztm = true; this.isShowFztm = true;
}, },
closeFztm(val) { closeFztm (val) {
console.log("closeFztm复制条码关闭", val); console.log("closeFztm复制条码关闭", val);
this.isShowFztm = val; this.isShowFztm = val;
this.search(); this.search();
}, },
//发查询操作(多行) //发查询操作(多行)
isShowFcxBtn() { isShowFcxBtn () {
if (this.multipleSelection.length === 0) { if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要发查询的数据！"); this.$message.error("请选择需要发查询的数据！");
this.isSelected = true; this.isSelected = true;
...@@ -588,14 +779,14 @@ export default { ...@@ -588,14 +779,14 @@ export default {
this.isShowFcx = true; this.isShowFcx = true;
} }
}, },
isShowFcxBtn1(val) { isShowFcxBtn1 (val) {
console.log("单行人员发查询数据", val); console.log("单行人员发查询数据", val);
let rowVal = []; let rowVal = [];
rowVal.push(val); rowVal.push(val);
this.rowData = rowVal; this.rowData = rowVal;
this.isShowFcx = true; this.isShowFcx = true;
}, },
closeFcx(val) { closeFcx (val) {
console.log("发查询关闭", val); console.log("发查询关闭", val);
this.isShowFcx = val; this.isShowFcx = val;
this.search(); this.search();
...@@ -605,11 +796,11 @@ export default { ...@@ -605,11 +796,11 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
batch() { batch () {
this.isSelected = !this.isSelected; this.isSelected = !this.isSelected;
this.toggleSelection(); this.toggleSelection();
}, },
cancel() { cancel () {
alert(888); alert(888);
}, },
/** /**
...@@ -617,7 +808,7 @@ export default { ...@@ -617,7 +808,7 @@ export default {
* @param {*} row * @param {*} row
* @return {*} * @return {*}
*/ */
handleClick(row) { handleClick (row) {
console.log(row); console.log(row);
}, },
/** /**
...@@ -625,7 +816,7 @@ export default { ...@@ -625,7 +816,7 @@ export default {
* @param {*} val * @param {*} val
* @return {*} * @return {*}
*/ */
handleSelectionChange(val) { handleSelectionChange (val) {
this.multipleSelection = val; this.multipleSelection = val;
console.log(this.multipleSelection); console.log(this.multipleSelection);
if (this.multipleSelection.length) { if (this.multipleSelection.length) {
...@@ -639,18 +830,37 @@ export default { ...@@ -639,18 +830,37 @@ export default {
* @param {*} pageSize 每页条数 * @param {*} pageSize 每页条数
* @return {*} * @return {*}
*/ */
handleSizeChange(pageSize) { handleSizeChange1 (pageSize) {
this.reqParam.page.pageSize = pageSize; this.pageSize = pageSize;
console.log("每页条数", this.reqParam.page.pageSize); console.log("每页条数", this.pageSize);
}, },
/** /**
* @description: currentPage 改变时会触发 * @description: currentPage 改变时会触发
* @param {*} page 当前页 * @param {*} page 当前页
* @return {*} * @return {*}
*/ */
handleCurrentChange(page) { handleCurrentChange1 (page) {
this.reqParam.page.currPage = page; this.currPage1 = page;
console.log("当前页", this.reqParam.page.currPage); console.log("当前页", this.currPage1);
this.search();
},
/**
* @description: pageSize 改变时会触发
* @param {*} pageSize 每页条数
* @return {*}
*/
handleSizeChange2 (pageSize) {
this.pageSize = pageSize;
console.log("每页条数", this.pageSize);
},
/**
* @description: currentPage 改变时会触发
* @param {*} page 当前页
* @return {*}
*/
handleCurrentChange2 (page) {
this.currPage1 = page;
console.log("当前页", this.currPage1);
this.search(); this.search();
}, },
/** /**
...@@ -658,7 +868,7 @@ export default { ...@@ -658,7 +868,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
toggleSelection(rows) { toggleSelection (rows) {
if (rows) { if (rows) {
rows.forEach((row) => { rows.forEach((row) => {
this.$refs.multipleTable.toggleRowSelection(row); this.$refs.multipleTable.toggleRowSelection(row);
...@@ -675,13 +885,18 @@ export default { ...@@ -675,13 +885,18 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
Tpage() { Tpage1 () {
return (
Math.floor(this.total1 / this.pageSize) + 1
);
},
Tpage2 () {
return ( return (
Math.floor(this.reqParam.page.total / this.reqParam.page.pageSize) + 1 Math.floor(this.total2 / this.pageSize) + 1
); );
}, },
}, },
mounted() { mounted () {
this.search(); this.search();
this.showType = this.$route.query.id || "1"; this.showType = this.$route.query.id || "1";
}, },
......
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-11 17:17:56 * @LastEditTime: 2021-11-12 20:42:26
* @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
...@@ -91,13 +91,13 @@ module.exports = { ...@@ -91,13 +91,13 @@ module.exports = {
"/api": { "/api": {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ // target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://172.18.108.2:8099/", // 张 认定 // target: "http://172.18.108.2:8099/", // 张 认定
// target: "http://192.168.128.112:8099", // 湖南-张 target: "http://192.168.128.110:8099", // 湖南-张
// target: "http://192.168.128.114:8099", // 湖南-马 // target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王 // target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma // target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099", // target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602", // target: "http://47.92.225.109:5602",
target: "http://www.meetfood.cn:2390/", // 湖南-线上 // target: "http://www.meetfood.cn:2390/", // 湖南-线上
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
......
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