src/api/group.js

@@ -2,6 +2,14 @@ import request from '@/utils/request.js'
 
 
 
+export const updateDeviceService = (data) => {
+    const params = new URLSearchParams();
+    for (let key in data) {
+        params.append(key, data[key])
+    }
+    return request.post('/device/update_device', params, { "headers": { 'token': data.token } });
+}
+
 export const deleteGroupService = (data) => {
     const params = new URLSearchParams();
     for (let key in data) {
@@ -10,14 +18,6 @@ export const deleteGroupService = (data) => {
     return request.post('/device/delete_device', params, { "headers": { 'token': data.token } });
 }
 
-export const updateGroupService = (data) => {
-    const params = new URLSearchParams();
-    for (let key in data) {
-        params.append(key, data[key])
-    }
-    return request.post('/im/update_group', params, { "headers": { 'token': data.token } });
-}
-
 export const addDeviceService = (data) => {
     const params = new URLSearchParams();
     for (let key in data) {

src/api/video.js

@@ -45,26 +45,18 @@ export const getVideoListService = (data) => {
                 let b1=Date.parse(data[key][0]);
                 let b2=Date.parse(data[key][1]);
                 let begin = getTimeString(b1).toString().slice(0, 10) + " 00:00:00"; //begin=data[key][0].toLocaleString().slice(0,10)+hour+":00:00";
-                
+                params.append("begin", begin);
                 //alert(begin)
                 let end = getTimeString(b2).toString().slice(0, 10) + " 23:59:59";
-                //转为时间戳
+                params.append("end", end);
-                let end_date = Date.parse(end)/1000;
-                let begin_date = Date.parse(begin)/1000;
-                params.append("begin", begin_date);
-                params.append("end", end_date);
                 continue;
             } else {
                 let b1=Date.parse(data[key][0]);
                 let b2=Date.parse(data[key][1]);
-                let begin = getTimeString(b1).toString().slice(0, 10) + " "+hour + ":00:00"; //begin=data[key][0].toLocaleString().slice(0,10)+hour+":00:00";
+                let begin = getTimeString(b1).toString().slice(0, 10) + hour + ":00:00"; //begin=data[key][0].toLocaleString().slice(0,10)+hour+":00:00";
-                //params.append("begin", begin);
+                params.append("begin", begin);
-                let end = getTimeString(b2).toString().slice(0, 10) + " "+hour + ":59:59";
+                let end = getTimeString(b2).toString().slice(0, 10) + hour + ":59:59";
-                console.log("begin:",begin);
+                params.append("end", end);
-                let end_date = Date.parse(end)/1000;
-                let begin_date = Date.parse(begin)/1000;
-                params.append("begin", begin_date);
-                params.append("end", end_date);
                 continue;
             }
 

src/utils/request.js

@@ -1,10 +1,9 @@
 import axios from "axios";
 import router from "@/router/index.js";
 //const baseURL = "https://gep.ljsea.xyz/";
-//const baseURL = "https://tx.ljsea.top/";
+const baseURL = "https://tx.ljsea.top/";
 //const baseURL= "http://localhost:8083";
 //const baseURL="https://pm.ljsea.top";
-const baseURL = "https://gep.ljsea.xyz/";
 const request = axios.create({
   baseURL: baseURL,
 });

src/views/Chat.vue

@@ -162,10 +162,7 @@
           </div>
         </el-scrollbar>
       </el-main>
-      <div>
+      <el-row class="row-bg" type="flex" justify="space-around" align="middle">
-      </div>
-      <div>  
-       <el-row class="row-bg" type="flex" justify="space-around" align="middle">
         <el-col :span="20">
           <el-input
             type="textarea"
@@ -188,7 +185,6 @@
           </el-button>
         </el-col>
       </el-row>
-      </div>
     </el-container>
   </el-container>
 </template>
@@ -468,7 +464,7 @@ export default {
             // 构建消息内容
           } else if (data.type == "check") {
             //alert("对方已下线");
-            //console.log(data.type);
+            console.log(data.type);
           }
         };
       }

src/views/Group.vue

@@ -2,13 +2,13 @@
 import axios from "axios";
 import { inject } from "vue";
 import { getGroupListService } from "@/api/group.js";
-import { updateGroupService } from "@/api/group.js";
 import { restartDeviceService } from "@/api/device.js";
 import { addDeviceService } from "@/api/device.js";
 import {sendMessageService } from "@/api/chat.js";
 import {getGroupFriendListService } from "@/api/chat.js";
 import {acceptInviteService } from "@/api/user.js";
 import { rejectInviteService } from "@/api/user.js";
+import { deleteDeviceService } from "@/api/device.js";
 import { getFriendListService } from "@/api/chat.js";
 import { getGroupUsersListService } from "@/api/chat.js";
 import { addGroupService} from "@/api/chat.js";

src/views/Im.vue

@@ -315,7 +315,7 @@ export default {
         this.socket.onmessage = async function (msg) {
           //console.log("收到数据====" + msg.data);
           let data = JSON.parse(msg.data); // 对收到的json数据进行解析， 类似这样的：
-          //console.log("收到数据====" + data);
+          console.log("收到数据====" + data);
           // 如果服务器端发送过来的json数据
           if (data.type == "msg") {  // 如果是消息类型，解密消息内容
             data.data = await _this.decryptAES(