Merge http://39.104.94.153:3000/yf_zy/MingGao_vue

minggao/config/index.js

@@ -23,7 +23,7 @@ module.exports = {
     },
 
     // Various Dev Server settings
-    host: '192.168.1.29', // can be overwritten by process.env.HOST
+    host: '192.168.1.4', // can be overwritten by process.env.HOST
     port: 8888, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

minggao/src/components/tree-table/tree-item.vue

@@ -10,7 +10,7 @@
         <td :colspan="colSpan">
           <table>
             <tr class="leve" :class="levelClass">
-              <td class="td1">{{ model.id }}</td>
+              <!-- <td class="td1">{{ model.id }}</td> -->
               <td class="td2">
                 <div class="td-title" @dblclick="handlerExpand(model)">
                   <span

minggao/src/components/tree-table/tree_table.vue

@@ -3,9 +3,9 @@
     <div class="tree-head">
       <table>
         <tr>
-          <td class="td1">
+          <!-- <td class="td1">
             序号
-          </td>
+          </td> -->
           <td class="td2">组织名称</td>
           <td class="td3" @click="isDesc = !isDesc">
             创建时间
@@ -134,7 +134,7 @@ export default {
 // 动态类名
 .leve(@n, @i:1) when (@i <= @n) {
   .leve-@{i} {
-    .td1 {
+    .td2 {
       padding-left: @padding + (@i * 16);
     }
   }

minggao/src/page/commandCenter/realTime.vue

@@ -251,7 +251,7 @@
 
         <li class="list" v-for="(item, index) in msgList.msg_list" :key="index">
           <!-- me -->
-          <div class="list_msgBox1" v-if="item.send_real_name == userName">
+          <div class="list_msgBox1" v-if="item.is_right == true">
             <div
               style="
                 background: #60fba5;
@@ -284,7 +284,7 @@
           </div>
           <!-- you -->
           <div
-            v-else-if="item.recv_user_id == this.getUserObj.user_id"
+            v-else-if="item.is_right == false"
             class="list_msgBox2"
           >
             <div>
@@ -701,6 +701,7 @@ export default {
 
     // 文本消息功能初始化
     msgInit() {
+      var that = this
       if (typeof WebSocket === "undefined") {
         alert("您的浏览器不支持socket！");
       } else {
@@ -716,7 +717,7 @@ export default {
           console.log(event);
         };
         this.websock.onmessage = event => {
-          console.log("WebSocket:消息");
+          // console.log("WebSocket:消息");
           // console.log(JSON.parse(event.data));
           var data = JSON.parse(event.data);
           if (data.action == "none") {
@@ -725,17 +726,25 @@ export default {
             console.log(data.data);
             var datArr = data.data; // 总数据
             if (datArr.length !== 0) {
+              // for (var i = 0; i < datArr.length; i++) {
+              //   for (var j = 0; j < datArr[i].msg_list.length; j++) {
+              //     if (
+              //       this.getUserObj.user_id ==
+              //       datArr[i].msg_list[j].recv_user_id
+              //     ) {
+              //       data.data[i].msg_list = data.data[i].msg_list.reverse();
+              //       this.msgList = data.data[i];
+              //       return;
+              //       // console.log(111)
+              //     }
+              //   }
+              // }
+
               for (var i = 0; i < datArr.length; i++) {
-                for (var j = 0; j < datArr[i].msg_list.length; j++) {
-                  if (
-                    this.getUserObj.user_id ==
-                    datArr[i].msg_list[j].recv_user_id
-                  ) {
-                    data.data[i].msg_list = data.data[i].msg_list.reverse();
-                    this.msgList = data.data[i];
-                    return;
-                    // console.log(111)
-                  }
+                if (this.getUserObj.user_id == datArr[i].user_id) {
+                   data.data[i].msg_list = data.data[i].msg_list.reverse();
+                    that.msgList = data.data[i];
+                   console.log(data.data[i])
                 }
               }
             }
@@ -759,6 +768,7 @@ export default {
           } else if (data.action == "recv_video") {
             // 获取当前点击用户的房间号以及登录房间所需的Token
             // console.log(JSON.parse(event.data));
+            console.log(data)
             var data = JSON.parse(event.data);
             this.RoomID = data.data.room_id; // 房间号
             this.Token = data.data.room_token; // Token
@@ -772,6 +782,7 @@ export default {
               )
               .then(result => {
                 if (result == true) {
+                  console.log('0000000000000000000000000000000000000登录成功')
                   this.plugFlow(); //推流
                   this.videoVisible = true;
                 }