From fde37d20d715a4300ba36ef1f57d6399a6401a59 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期二, 14 三月 2023 10:27:46 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/intelligentPatrol/studyJudge/index.vue | 4 ++--
src/views/video/index.vue | 4 ++--
src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue | 4 ++++
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/views/intelligentPatrol/studyJudge/index.vue b/src/views/intelligentPatrol/studyJudge/index.vue
index 89ff8f7..04d997c 100644
--- a/src/views/intelligentPatrol/studyJudge/index.vue
+++ b/src/views/intelligentPatrol/studyJudge/index.vue
@@ -502,8 +502,8 @@
if (res) {
// 杩炴帴瀹㈡埛绔垚鍔�
this.ws.login({
- loginIp: "183.245.159.161",
- loginPort: "8282",
+ loginIp: "172.28.194.180",
+ loginPort: "7902",
userName: "suichang",
userPwd: "a12345677",
https: 1,
diff --git a/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue b/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue
index 2431bfa..5f771fc 100644
--- a/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue
+++ b/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue
@@ -401,7 +401,11 @@
},
handleSuccess(res, file, filelist) {
+<<<<<<< HEAD
+ console.log(res);
+=======
console.log(res)
+>>>>>>> 948cca39e334dde8a3ef04c030f8d691edf30bf8
const baseUrl = 'http://140.143.152.226:8410/';
this.ill.positive = baseUrl + res.data.url1;
diff --git a/src/views/video/index.vue b/src/views/video/index.vue
index 768e4ae..b30143a 100644
--- a/src/views/video/index.vue
+++ b/src/views/video/index.vue
@@ -191,8 +191,8 @@
if (res) {
// 杩炴帴瀹㈡埛绔垚鍔�
this.ws.login({
- loginIp: "183.245.159.161",
- loginPort: "8282",
+ loginIp: "172.28.194.180",
+ loginPort: "7902",
userName: "suichang",
userPwd: "a12345677",
https: 1,
--
Gitblit v1.8.0