zkl 4 年 前
コミット
9034338e50
2 ファイル変更9 行追加8 行削除
  1. 4 3
      minggao/src/page/commandCenter/realTime.vue
  2. 5 5
      minggao/src/util/http.js

+ 4 - 3
minggao/src/page/commandCenter/realTime.vue

@@ -93,7 +93,7 @@
                   "
                 >
                   <el-badge
-                    v-if="scope.row.unread"
+                    v-if="scope.row.unread !== 0 && scope.row.unread"
                     :value="scope.row.unread"
                     is-dot
                     :max="99"
@@ -526,8 +526,9 @@ export default {
         let sdhkj = val[i];
         for (var k = 0; k < this.websockMsgList.length; k++) {
           let sdjaks = this.websockMsgList[k];
-          if (sdhkj.user_id == sdjaks.user_id) {
-            this.tableData[k].unread = sdjaks.unread;
+          // if (sdhkj.user_id == sdjaks.user_id) {
+          if (sdhkj.real_name == sdjaks.real_name) {
+            this.tableData[i].unread = sdjaks.unread;
           }
         }
       }

+ 5 - 5
minggao/src/util/http.js

@@ -19,11 +19,11 @@ Vue.prototype.DOMIN = DOMIN
 Vue.prototype.wsUrl = wsUrl // 实时通信Url
 Vue.prototype.mapJson = mapJson //请求地图json,不带端口号
 // console.log(DOMIN)
-// axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-// axios.defaults.timeout = 30000;
-// axios.defaults.withCredentials = true //axios请求时携带session
-// axios.defaults.crossDomain = true
-// axios.defaults.baseURL = DOMIN
+axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
+axios.defaults.timeout = 30000;
+axios.defaults.withCredentials = true //axios请求时携带session
+axios.defaults.crossDomain = true
+axios.defaults.baseURL = DOMIN
 
 
 // axios请求前的拦截