lihongxiao 2 лет назад
Родитель
Сommit
784ca60ebc

+ 13 - 0
src/utils/websocket.js

@@ -17,6 +17,7 @@ function websocketonmessage (e) {
 export function websocketSend (agentData) {
   // 加延迟是为了尽量让ws连接状态变为OPEN
   setTimeout(() => {
+    if(websock){
     // 添加状态判断,当为OPEN时,发送消息
     if (websock.readyState === websock.OPEN) { // websock.OPEN = 1
       // 发给后端的数据需要字符串化
@@ -27,6 +28,18 @@ export function websocketSend (agentData) {
       // Message.error('ws连接异常,请稍候重试')
       errorCallback()
     }
+  }
+else{
+  let userId = sessionStorage.getItem("user");
+  let data = {
+    ...agentData,
+    userId,
+  };
+  sendWebsocket(
+    `${process.env.SOCKET_Url}/pcWebsocket/${userId}`,
+    data
+  );
+}
   }, 500)
 }
 

+ 6 - 3
src/views/PeopleManage/PcLoginRecord.vue

@@ -224,23 +224,26 @@
             </el-table-column>
             <el-table-column prop="carNumber" label="车险录单">
               <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" :content="scope.row.carNumberTime" placement="bottom">
+              <el-tooltip v-if="scope.row.carNumber" class="item" effect="dark" :content="scope.row.carNumberTime" placement="bottom">
                   <span >{{ scope.row.carNumber }}</span>
                 </el-tooltip>
+              <span v-else>{{ scope.row.carNumber }}</span>
               </template > 
             </el-table-column>
             <el-table-column prop="orderNumber" label="订单查询">
               <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" :content="scope.row.orderNumberTime" placement="bottom">
+              <el-tooltip v-if="scope.row.orderNumber" class="item" effect="dark" :content="scope.row.orderNumberTime" placement="bottom">
                   <span >{{ scope.row.orderNumber }}</span>
                 </el-tooltip>
+                <span v-else>{{ scope.row.orderNumber }}</span>
               </template > 
             </el-table-column>
             <el-table-column prop="walletNumber" label="钱包">
               <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" :content="scope.row.walletNumberTime" placement="bottom">
+              <el-tooltip v-if="scope.row.walletNumber" class="item" effect="dark" :content="scope.row.walletNumberTime" placement="bottom">
                   <span >{{ scope.row.walletNumber }}</span>
                 </el-tooltip>
+                <span v-else>{{ scope.row.walletNumber }}</span>
               </template > 
             </el-table-column>  
           </el-table>

+ 11 - 6
src/views/PeopleManage/UserMap.vue

@@ -232,37 +232,42 @@
           </el-table-column>
           <el-table-column prop="carNumber" label="车险录单">
             <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" :content="scope.row.carNumberTime" placement="bottom">
+              <el-tooltip v-if="scope.row.carNumber" class="item" effect="dark" :content="scope.row.carNumberTime" placement="bottom">
                   <span >{{ scope.row.carNumber }}</span>
                 </el-tooltip>
+              <span v-else>{{ scope.row.carNumber }}</span>
               </template > 
           </el-table-column>
           <el-table-column prop="memberNumber" label="会员分享">
-            <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" :content="scope.row.memberNumberTime" placement="bottom">
+            <template  slot-scope="scope">
+              <el-tooltip v-if="scope.row.memberNumber" class="item" effect="dark" :content="scope.row.memberNumberTime" placement="bottom">
                   <span >{{ scope.row.memberNumber }}</span>
                 </el-tooltip>
+              <span v-else>{{ scope.row.memberNumber }}</span>
               </template > 
           </el-table-column>
           <el-table-column prop="managementNumber" label="会员管理">
             <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" :content="scope.row.managementNumberTime" placement="bottom">
+              <el-tooltip v-if="scope.row.managementNumber" class="item" effect="dark" :content="scope.row.managementNumberTime" placement="bottom">
                   <span >{{ scope.row.managementNumber }}</span>
                 </el-tooltip>
+              <span v-else>{{ scope.row.managementNumber }}</span>
               </template > 
           </el-table-column>
           <el-table-column prop="walletNumber" label="钱包">
             <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" :content="scope.row.walletNumberTime" placement="bottom">
+              <el-tooltip v-if="scope.row.walletNumber" class="item" effect="dark" :content="scope.row.walletNumberTime" placement="bottom">
                   <span >{{ scope.row.walletNumber }}</span>
                 </el-tooltip>
+              <span v-else>{{ scope.row.walletNumber }}</span>
               </template > 
           </el-table-column>
           <el-table-column prop="posterNumber" label="海报管理">
             <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" :content="scope.row.posterNumberTime" placement="bottom">
+              <el-tooltip v-if="scope.row.posterNumber" class="item" effect="dark" :content="scope.row.posterNumberTime" placement="bottom">
                   <span >{{ scope.row.posterNumber }}</span>
                 </el-tooltip>
+                <span v-else>{{ scope.row.posterNumber }}</span>
               </template > 
           </el-table-column>
         </el-table>