From 8a5a5ff615e1ac7cf65c298b2e641368f7b1e2b3 Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期五, 06 十二月 2024 14:08:13 +0800
Subject: [PATCH] 修改单位
---
src/views/system/tijian/index.vue | 166 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 111 insertions(+), 55 deletions(-)
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 65631ab..b1f4f3f 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1014,6 +1014,7 @@
v-for="(item, index) in tableData1"
:key="'info1-' + index"
>
+
<el-collapse-item :name="index">
<template slot="title">
<div style="width: 70%">
@@ -1044,7 +1045,7 @@
style="width: 100%"
height="270"
>
- <el-table-column prop="proName" label="椤圭洰" width="180">
+ <el-table-column prop="s" label="椤圭洰" width="180">
</el-table-column>
<el-table-column prop="proType" label="鎬у埆" width="180">
<template
@@ -1620,6 +1621,7 @@
pacRemark: null,
},
// valueUrl: "ws://127.0.0.1:18890",
+ // valueUrl: "ws://192.168.1.3:6789/websocket",
valueUrl: "ws://127.0.0.1:6789/websocket",
valueUrls: "ws://127.0.0.1:6789/websocket",
// valueUrls: "ws://"+getIp() +":6789/websocket",
@@ -1692,8 +1694,10 @@
this.getList1();
// this.getData();
},
- mounted(){
- console.log(this.dict.type.dict_user_marry,555);
+ mounted() {
+ console.log(this.dict.type.dict_user_marry, 555);
+ console.log(this.dict.type.dict_user_national, 666);
+
},
@@ -2204,6 +2208,12 @@
if (this.form.tjType === null) {
this.form.tjType = "3";
}
+ if (this.form.cusMarryStatus === "null") {
+ this.form.cusMarryStatus = "5";
+ }
+ if (this.form.cusNational === "null") {
+ this.form.cusNational = "1";
+ }
if (this.form.reservationId != null) {
if (this.form.groupingId) {
_this.tcShow = true;
@@ -2317,7 +2327,7 @@
};
var jStr = JSON.stringify(jsonObj);
this.websocket.send(jStr);
- alert("璇锋斁韬唤璇佸啀鐐圭‘璁�");
+ // alert("璇锋斁韬唤璇佸啀鐐圭‘璁�");
var jsonObj = {
// name: "readCert",
};
@@ -2327,59 +2337,14 @@
};
//鎺ユ敹鍒版秷鎭殑鍥炶皟鏂规硶
- websocket.onmessage = function (event) {
+ websocket.onmessage = (event)=> {
+ console.log(event, "event");
var resultObj = eval("(" + event.data + ")");
//resultFlag涓�0浠ｈ〃璇诲崱鎴愬姛
-
- if (
- resultObj.name == "readCard" ||
- resultObj.name == "readCert" ||
- resultObj.name == "PushWithImg" ||
- resultObj.name == "PushWithOutImg"
- ) {
- if (resultObj.resultFlag == "0") {
- //鍥炴樉鐩稿叧鏁版嵁
- _this.form.cusName = resultObj.resultContent.partyName;
- _this.form.cusSex =
- resultObj.resultContent.gender == "0" ? "濂�" : "鐢�";
- _this.form.cusNational = resultObj.resultContent.nation;
- _this.form.cusBrithday = resultObj.resultContent.bornDay;
- if (_this.form.cusBrithday) {
- _this.form.cusBrithday = _this.form.cusBrithday.replace(
- /^(\d{4})(\d{2})(\d{2})$/,
- "$1-$2-$3"
- );
- }
- _this.form.cusAddr = resultObj.resultContent.certAddress;
- _this.form.cusIdcard = resultObj.resultContent.certNumber;
- _this.imageUrl =
- "data:image/jpeg;base64," +
- resultObj.resultContent.identityPic;
- if (
- resultObj.name == "readCert" ||
- resultObj.name == "PushWithImg"
- ) {
- this.imageUrl =
- "data:image/jpeg;base64," +
- resultObj.resultContent.identityPrintPic;
- }
- } else if (resultObj.resultFlag == "-1") {
- if (resultObj.errorMsg == "绔彛鎵撳紑澶辫触") {
- //alert("璇诲崱鍣ㄦ湭杩炴帴");
- } else {
- //alert(resultObj.errorMsg);
- }
- } else if (resultObj.resultFlag == "-2") {
- //alert(resultObj.errorMsg);
- }
- } else if (resultObj.name == "getStatus") {
- if (resultObj.resultFlag == "0") {
- if (resultObj.status == "0") {
- } else {
- alert("璁惧杩炴帴宸叉柇寮�锛岃妫�鏌ヨ鍗″櫒杩炴帴");
- }
- }
- }
+ console.log(resultObj);
+ // TODO 浠ヤ笅浠ｇ爜鍙兘鏄尘宸濅娇鐢ㄧ殑
+ // this.jingChuanHandlerWebSocketResult(resultObj)
+ this.readCardWebSocket(resultObj)
};
//杩炴帴鍏抽棴鐨勫洖璋冩柟娉�
@@ -2423,6 +2388,94 @@
}
}
});
+ }
+ },
+ // 鏈�鏂颁娇鐢╳ebSocket閫氫俊
+ readCardWebSocket(resultObj){
+ let _this = this;
+ if (resultObj.code === 200 && resultObj.data.name != null) {
+ console.log('213131');
+
+ //鍥炴樉鐩稿叧鏁版嵁
+ _this.form.cusName = resultObj.data.name;
+ _this.form.cusSex =
+ resultObj.data.sex == "0" ? "濂�" : "鐢�";
+ _this.form.cusNational = resultObj.data.mz;
+ _this.form.cusBrithday = resultObj.data.csrq;
+ if (_this.form.cusBrithday) {
+ _this.form.cusBrithday = _this.form.cusBrithday.replace(
+ /^(\d{4})(\d{2})(\d{2})$/,
+ "$1-$2-$3"
+ );
+ }
+ _this.form.cusAddr = resultObj.data.addres;
+ _this.form.cusIdcard = resultObj.data.card;
+ _this.imageUrl =
+ "data:image/jpeg;base64," + resultObj.data.img;
+ if (resultObj.name == "readCert" || resultObj.name == "PushWithImg") {
+ this.imageUrl =
+ "data:image/jpeg;base64," +
+ resultObj.data.img;
+ }
+ } else {
+ this.$message.warning('璇锋斁缃韩浠借瘉鍚庡啀鐐瑰嚮璇诲彇')
+ }/* if (resultObj.resultFlag == "-1") {
+ if (resultObj.errorMsg == "绔彛鎵撳紑澶辫触") {
+ //alert("璇诲崱鍣ㄦ湭杩炴帴");
+ } else {
+ //alert(resultObj.errorMsg);
+ }
+ } else if (resultObj.resultFlag == "-2") {
+ //alert(resultObj.errorMsg);
+ } */
+ },
+ // TODO 浠ヤ笅浠ｇ爜鍙兘鏄尘宸濅娇鐢ㄧ殑
+ jingChuanHandlerWebSocketResult(resultObj) {
+ let _this = this;
+ if (
+ resultObj.name == "readCard" ||
+ resultObj.name == "readCert" ||
+ resultObj.name == "PushWithImg" ||
+ resultObj.name == "PushWithOutImg"
+ ) {
+ if (resultObj.resultFlag == "0") {
+ //鍥炴樉鐩稿叧鏁版嵁
+ _this.form.cusName = resultObj.resultContent.partyName;
+ _this.form.cusSex =
+ resultObj.resultContent.gender == "0" ? "濂�" : "鐢�";
+ _this.form.cusNational = resultObj.resultContent.nation;
+ _this.form.cusBrithday = resultObj.resultContent.bornDay;
+ if (_this.form.cusBrithday) {
+ _this.form.cusBrithday = _this.form.cusBrithday.replace(
+ /^(\d{4})(\d{2})(\d{2})$/,
+ "$1-$2-$3"
+ );
+ }
+ _this.form.cusAddr = resultObj.resultContent.certAddress;
+ _this.form.cusIdcard = resultObj.resultContent.certNumber;
+ _this.imageUrl =
+ "data:image/jpeg;base64," + resultObj.resultContent.identityPic;
+ if (resultObj.name == "readCert" || resultObj.name == "PushWithImg") {
+ this.imageUrl =
+ "data:image/jpeg;base64," +
+ resultObj.resultContent.identityPrintPic;
+ }
+ } else if (resultObj.resultFlag == "-1") {
+ if (resultObj.errorMsg == "绔彛鎵撳紑澶辫触") {
+ //alert("璇诲崱鍣ㄦ湭杩炴帴");
+ } else {
+ //alert(resultObj.errorMsg);
+ }
+ } else if (resultObj.resultFlag == "-2") {
+ //alert(resultObj.errorMsg);
+ }
+ } else if (resultObj.name == "getStatus") {
+ if (resultObj.resultFlag == "0") {
+ if (resultObj.status == "0") {
+ } else {
+ alert("璁惧杩炴帴宸叉柇寮�锛岃妫�鏌ヨ鍗″櫒杩炴帴");
+ }
+ }
}
},
changeradio() {
@@ -3266,6 +3319,9 @@
}
this.list1 = false;
this.list3 = true;
+ this.list2 = false;
+ console.log(this.list1)
+ console.log(this.list3)
} else {
this.list1 = true;
this.TotalPrice = "0.00";
--
Gitblit v1.8.0