bug修改

jero-web/src/views/documentManage/ocr/index.vue

@@ -184,8 +184,8 @@
         console.log("------------WebSocket连接成功");
         // WebSocket与普通的请求所用协议有所不同，ws等同于http，wss等同于https
         let userId = store.getters.userInfo.id;
-        let url = window._CONFIG['domianWebSocketURL'].replace("https://","wss://").replace("http://","ws://") + '/websocket/socketServer'
-        // let url = 'http://10.0.1.25:8080/jero-boot'.replace("https://","wss://").replace("http://","ws://") + '/websocket/socketServer'
+        // let url = window._CONFIG['domianWebSocketURL'].replace("https://","wss://").replace("http://","ws://") + '/websocket/socketServer'
+        let url = 'http://139.9.235.66:8008/jero-boot'.replace("https://","wss://").replace("http://","ws://") + '/websocket/socketServer'
         this.websock = new WebSocket(url);
         this.websock.onopen = this.websocketOnopen;
         this.websock.onerror = this.websocketOnerror;
@@ -201,7 +201,7 @@
         this.timer = setInterval(() => {
           try {
             self.websock.send('test')
-            // console.log('发送消息');
+            console.log('发送消息');
           }catch(err){
             console.log('断开了：' + err);
             self.connection()
@@ -213,8 +213,9 @@
         this.reconnect();
       },
       websocketOnmessage: function (e) {
-        // console.log("WebSocket连接数据1111");
+        console.log("WebSocket连接数据1111",e);
         if(e.data=='1'){
+          console.log('data改变')
           eventBUs.$emit('searchReset')
         }
       },

jero-web/src/views/documentManage/splitting/modules/splitDetail.vue

@@ -87,7 +87,7 @@
                 </div>
               </div>
               <div class="split-detail-table">
-                <a-table bordered :data-source="tableData" :columns="columns" rowKey="id" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" :loading="loading" class="tag-con-table">
+                <a-table :data-source="tableData" :columns="columns" rowKey="id" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" :loading="loading"  class="tag-con-table">
                   <template slot="clauseContent" slot-scope="text, record">
                     <a class="content-show" href="javascript:;" :title="record.serialContent" @click="showContent">{{record.serialContent}}</a>
                   </template>
@@ -208,7 +208,9 @@
             dataIndex: 'serialContent',
             key: 'serialContent',
             align: "center",
+            width: '50%',
             scopedSlots: {customRender: 'clauseContent'},
+
           },
           {
             title: this.$t('functionalAreas'),
@@ -576,6 +578,7 @@
             -webkit-box-orient: vertical;
             height: 60px;
             line-height: 20px;
+            white-space: pre-wrap;
           }
           .page{
             text-align: right;
@@ -590,6 +593,9 @@
       }
     }
   }
+  /deep/.ant-table-body{
+    overflow: hidden!important;
+  }
 </style>
 
 <style lang="less">