From d6b1c3f862715fd2de5df6d4ccf940c336bade47 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期二, 03 十二月 2024 17:02:00 +0800
Subject: [PATCH] lkk 12.03
---
src/views/system/tijian/index.vue | 17 +++++++++++------
vue.config.js | 1 +
src/views/system/tijianall/index.vue | 7 ++++---
3 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 96721e4..6f317e7 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1619,10 +1619,11 @@
pacName: null,
pacRemark: null,
},
- valueUrl: "ws://127.0.0.1:18890",
+ // valueUrl: "ws://127.0.0.1:18890",
+ valueUrl: "ws://127.0.0.1:6789/websocket",
valueUrls: "ws://127.0.0.1:6789/websocket",
// valueUrls: "ws://"+getIp() +":6789/websocket",
- WebSocket: null,
+ webSocket: null,
// 韬唤璇侀渶瑕�
// socket: null,
// value: 1,
@@ -2277,8 +2278,10 @@
// this.$message.error("姝ょ敤鎴蜂笉瀛樺湪");
// });
} else {
+
let configKey = "getInfoFromSqlData";
getconfigKey(configKey).then((res) => {
+ console.log(res);
if (res.code == 200) {
if (res.msg == "N") {
var websocket = null;
@@ -2305,16 +2308,17 @@
this.websocket = websocket;
// 杩炴帴璁惧
var jsonObj = {
- name: "connect",
+ // name: "connect",
+ type: "1",
};
var jStr = JSON.stringify(jsonObj);
this.websocket.send(jStr);
alert("璇锋斁韬唤璇佸啀鐐圭‘璁�");
var jsonObj = {
- name: "readCert",
+ // name: "readCert",
};
- var jStr = JSON.stringify(jsonObj);
- this.websocket.send(jStr);
+ // var jStr = JSON.stringify(jsonObj);
+ // this.websocket.send(jStr);
this.dialogVisible = false;
};
@@ -2322,6 +2326,7 @@
websocket.onmessage = function (event) {
var resultObj = eval("(" + event.data + ")");
//resultFlag涓�0浠ｈ〃璇诲崱鎴愬姛
+
if (
resultObj.name == "readCard" ||
resultObj.name == "readCert" ||
diff --git a/src/views/system/tijianall/index.vue b/src/views/system/tijianall/index.vue
index 831fd34..4a1596c 100644
--- a/src/views/system/tijianall/index.vue
+++ b/src/views/system/tijianall/index.vue
@@ -1060,7 +1060,8 @@
tableDatas: [],
packageList: [],
checkedkeys: [],
- valueUrl: "ws://127.0.0.1:18890",
+ // valueUrl: "ws://127.0.0.1:18890",
+ valueUrl: "ws://127.0.0.1:6789/websocket",
valueUrls: "ws://127.0.0.1:6789/websocket",
dialogVisiblese: false,
cardreader: false,
@@ -1804,8 +1805,8 @@
try {
// 杩炴帴璁惧
var jsonObjs = {
- type: 1,
- data: {},
+ type: "1",
+ // data: {},
};
var jStrs = JSON.stringify(jsonObjs);
websocket.send(jStrs);
diff --git a/vue.config.js b/vue.config.js
index 4cf09ce..8eb252c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -54,6 +54,7 @@
[process.env.VUE_APP_BASE_API]: {
// target: `https://ltpeis.xaltjdkj.cn:5801/`,
target: `http://localhost:5011`,
+ target: `http://192.168.1.3:5011`,
// target: `http://192.168.1.113:5011`,
// // target: `http://192.168.0.99:8080/ltkj-admin`,
// target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin`,
--
Gitblit v1.8.0