Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0

odc.xiaohui

2023-03-14 fde37d20d715a4300ba36ef1f57d6399a6401a59

Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0

 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,

 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;


 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,