From d2c4004ad8538bcf6f177016f2107369f93df619 Mon Sep 17 00:00:00 2001
From: Mr Ke <kelq@hugeinfo.com.cn>
Date: Wed, 27 May 2020 11:45:24 +0800
Subject: [PATCH] 指纹仪
---
SunshineIns/src/copy/fingerprint/js/main.js | 1
SunshineIns/src/page/CriminalExecution.jsx | 88 ++++++++++++-----------------
SunshineIns/src/copy/fingerprint/指纹登记.html | 67 +++++++++++----------
3 files changed, 72 insertions(+), 84 deletions(-)
diff --git a/SunshineIns/src/copy/fingerprint/js/main.js b/SunshineIns/src/copy/fingerprint/js/main.js
index 51e0899..4b8894a 100644
--- a/SunshineIns/src/copy/fingerprint/js/main.js
+++ b/SunshineIns/src/copy/fingerprint/js/main.js
@@ -359,6 +359,7 @@
function submitEvent()
{
storeDataToHtml();
+ console.log('storeDataToHtml()', storeDataToHtml());
showFPCount('指纹数:');
//closeWindow();
close();
diff --git "a/SunshineIns/src/copy/fingerprint/\346\214\207\347\272\271\347\231\273\350\256\260.html" "b/SunshineIns/src/copy/fingerprint/\346\214\207\347\272\271\347\231\273\350\256\260.html"
index 7df2a68..dc35eec 100644
--- "a/SunshineIns/src/copy/fingerprint/\346\214\207\347\272\271\347\231\273\350\256\260.html"
+++ "b/SunshineIns/src/copy/fingerprint/\346\214\207\347\272\271\347\231\273\350\256\260.html"
@@ -1,36 +1,33 @@
<!DOCTYPE html>
<html>
+
<head>
-<title>指纹登记</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<link rel="stylesheet" href="css/box.css" type="text/css">
-<script type="text/javascript" src="js/main.js"></script>
-<script type="text/javascript" src="js/fingerprint.js"></script>
-<script type="text/javascript" src="js/jquery.js"></script>
-<script type="text/javascript" src="js/baseMoth.js"></script>
-<script type="text/javascript" src="js/dhtmlxCommon.js"></script>
+ <title>指纹登记</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <link rel="stylesheet" href="css/box.css" type="text/css">
+ <script type="text/javascript" src="js/main.js"></script>
+ <script type="text/javascript" src="js/fingerprint.js"></script>
+ <script type="text/javascript" src="js/jquery.js"></script>
+ <script type="text/javascript" src="js/baseMoth.js"></script>
+ <script type="text/javascript" src="js/dhtmlxCommon.js"></script>
</head>
<body onload="myfunction()">
- <form method="post" id="fpVerifyForm" name="fpVerifyForm"
- action="authLoginAction!login.do?fpLogin=fpLogin"
+ <form method="post" id="fpVerifyForm" name="fpVerifyForm" action="authLoginAction!login.do?fpLogin=fpLogin"
enctype="multipart/form-data" style="display: none">
- <input type="hidden" id="verifyModel" name="verifyModel" /> <input
- type="hidden" id="verifyTemplate" name="verifyTemplate" />
+ <input type="hidden" id="verifyModel" name="verifyModel" /> <input type="hidden" id="verifyTemplate"
+ name="verifyTemplate" />
</form>
<div id="fpRegisterDiv" style="display: inline; height: do">
- <a id="fpRegister"
- onclick='submitRegister("指纹", "指纹数:", "确认保存当前修改吗？", "驱动下载", false)'
- title="请安装指纹驱动或启动该服务" class="showGray"
- onmouseover="this.className='showGray'">注册</a>
+ <a id="fpRegister" onclick='submitRegister("指纹", "指纹数:", "确认保存当前修改吗？", "驱动下载", false)' title="请安装指纹驱动或启动该服务"
+ class="showGray" onmouseover="this.className='showGray'">注册</a>
</div>
<div id="driverDownload" style="display: inline; margin: 0 0 0 5px;">
- <a id='downloadDriver' href='middleware/zkbioonline.exe'
- title='驱动下载'>驱动下载</a>
+ <a id='downloadDriver' href='middleware/zkbioonline.exe' title='驱动下载'>驱动下载</a>
</div>
- <div id="comparison" style="display: none"
- onclick='fpVerification("指纹比对","请安装指纹驱动或启动服务",true,globalContext)'>比对</div>
+ <div id="comparison" style="display: none" onclick='fpVerification("指纹比对","请安装指纹驱动或启动服务",true,globalContext)'>比对
+ </div>
<div id="comparisonDiv" class="box" style="display: none">
<h2>指纹比对</h2>
<div class="list">
@@ -44,25 +41,31 @@
<div id="box" class="box" style="display: none;">
<h2>指纹登记</h2>
<div class="list">
- <canvas id="canvas" width="430" height="450"
- style="background: rgb(243, 245, 240)"></canvas>
- <input type="hidden" id="whetherModify" name="whetherModify" alt=""
- value="111" />
+ <canvas id="canvas" width="430" height="450" style="background: rgb(243, 245, 240)"></canvas>
+ <input type="hidden" id="whetherModify" name="whetherModify" alt="" value="111" />
- <div
- style="position: absolute; left: 310px; top: 325px; width: 70px; height: 28px;">
- <button type="button" id="submitButtonId" name="makeSureName"
- onclick="submitEvent()" class="button-form">确定</button>
+ <div style="position: absolute; left: 310px; top: 325px; width: 70px; height: 28px;">
+ <button type="button" id="submitButtonId" name="makeSureName" onclick="submitEvent()"
+ class="button-form">确定</button>
<!-- ${common_edit_ok}:确定 -->
</div>
- <div
- style="position: absolute; left: 310px; top: 365px; width: 70px; height: 28px;">
- <button class="button-form" type="button" id="closeButton"
- name="closeButton" onclick='cancelEvent("确认保存当前修改吗?", "指纹数:");'>
+ <div style="position: absolute; left: 310px; top: 365px; width: 70px; height: 28px;">
+ <button class="button-form" type="button" id="closeButton" name="closeButton"
+ onclick='cancelEvent("确认保存当前修改吗?", "指纹数:");'>
取消</button>
<!-- ${common_edit_cancel}:取消 -->
</div>
</div>
</div>
</body>
+<script>
+ window.addEventListener(
+ 'message',
+ function (e) {
+ console.log(e);
+ },
+ false
+ );
+</script>
+
</html>
\ No newline at end of file
diff --git a/SunshineIns/src/page/CriminalExecution.jsx b/SunshineIns/src/page/CriminalExecution.jsx
index 8f4be90..fae5615 100644
--- a/SunshineIns/src/page/CriminalExecution.jsx
+++ b/SunshineIns/src/page/CriminalExecution.jsx
@@ -70,7 +70,11 @@
componentDidMount() {
document.title = '社会观护管理';
- this.getData();
+ window.addEventListener('message', function (e) {
+
+ }, false);
+ console.log('this', this);
+ // this.iframeAddEventListener();
}
setFormData = data => {
@@ -79,51 +83,6 @@
formData: data,
});
}
-
- getData = () => {
- const { formData } = this.state;
- this.setState({ loading: true })
- Fetch.socialQuery({ ...formData })
- .then(res => {
- console.log(res)
- for (var i = 0; i < res.rows.length; i++) {
- res.rows[i]['index'] = i + 1;
- }
- this.setState({
- data: res.rows,
- loading: false,
- });
- });
- }
-
- onInputChange = ({ target: { value, name } }) => {
- this.setState(({ formData }) => ({
- formData: {
- ...formData,
- [name]: value
- }
- }))
- }
-
- Seaech = () => {
- const { formData } = this.state;
- Fetch.getSweeping(formData)
- .then(res => {
- for (var i = 0; i < res.length; i++) {
- res[i]['index'] = i + 1;
- }
- this.setState({
- data: res
- });
- });
- }
- Reset = () => {
- this.setState({
- resetKey: Date.now(),
- formData: {}
- }, this.getData);
- }
-
confirm = (e) => {
console.log(e);
@@ -144,13 +103,13 @@
showModal = (id) => {
this.setState({
- visible: true,
+ visible: true,
});
// Fetch.socialCompanyDetail(id)
// .then(res => {
// this.setState({ savedate: res })
// })
- }
+ }
renderColumns = () => {
return [{
@@ -226,6 +185,19 @@
}]
}
+ iframeAddEventListener = () => {
+ let _this = this;
+ this.iframeWin = this.refs.iframe.contentWindow;
+ this.refs.iframe && this.refs.iframe.addEventListener("load", function () {
+ //代码能执行到这里说明已经载入成功完毕了
+ //这里是回调函数
+ console.log('menu', window.localStorage.getItem('menu'));
+ _this.iframeWin.postMessage({
+ fgData: false
+ }, '*');
+ }, false);
+ }
+
render() {
const { data, resetKey, visible, loading, savedate, closeKey, formData } = this.state;
return (
@@ -254,18 +226,29 @@
]} />
<TableView columns={this.renderColumns()} data={data} pageSize='10' size='default' loading={loading} />
</div>
+ {/* <div style={{ display: 'block' }}> */}
+ {/* <iframe
+ style={{ width: '100%', height: '100%' }}
+ onLoad={() => { }}
+ ref="iframe"
+ src='./fingerprint/指纹登记.html'
+ width="100%"
+ scrolling="no"
+ frameBorder="0"
+ /> */}
<Modal
key={closeKey}
confirmLoading={loading}
visible={visible}
title="公司信息"
- onOk={this.handleOk}
- onCancel={this.handleCancel}
+ onCancel={() => { this.setState({ visible: false }) }}
bodyStyle={{ lineHeight: 4 }}
+ footer={null}
+ width={'80%'}
+ bodyStyle={{ height: '600px' }}
>
<iframe
- className="h-100"
- style={{ width: '100%' }}
+ style={{ width: '100%', height: '100%' }}
onLoad={() => { }}
ref="iframe"
src='./fingerprint/指纹登记.html'
@@ -274,6 +257,7 @@
frameBorder="0"
/>
</Modal>
+ {/* </div> */}
</div>
)
}
--
Gitblit v1.8.0