Merge remote-tracking branch 'origin/visu_environment_01_siping_2.5d' into visu_environment_01_siping_2.5d

public/index.html

@@ -276,6 +276,13 @@
 <script src="hk/jsWebControl-1.0.0.min.js"></script>   <!-- 用于前端与插件交互 -->
 <!--<script src="h5player/h5player.min.js"></script>-->
 
+<script type="text/javascript" src="./SuperMap3D/Build/Cesium/Cesium.js"></script>
+<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/tooltip.js"></script>
+<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/bubble/popup.js"></script>
+<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/jquery.min.js"></script>
+<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/config.js"></script>
+<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/bootstrap-select.min.js"></script>
+<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/supermap/SuperMap.Include.js"></script>
 
 
 <!--  <link rel="stylesheet" href="./supermap/libs/plotting/leaflet/10.2.1/iclient-plot-leaflet.css">-->
@@ -288,13 +295,7 @@
 <!--  <script type="text/javascript" src="./supermap/libs/plotting/leaflet/10.2.1/iclient-plot-leaflet-es6.min.js"></script>-->
 <script type="text/javascript" include="PlotPanel,StylePanel,SMLInfosPanel,iPortalStylePanel"
         src="./supermap/examples/js/plottingPanel/PlottingPanel.Include.js"></script>
-<script type="text/javascript" src="./SuperMap3D/Build/Cesium/Cesium.js"></script>
-<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/tooltip.js"></script>
-<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/bubble/popup.js"></script>
-<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/jquery.min.js"></script>
-<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/config.js"></script>
-<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/bootstrap-select.min.js"></script>
-<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/supermap/SuperMap.Include.js"></script>
+
 
 
 <div id="app">

src/components/vBottomMenu.vue

@@ -395,8 +395,6 @@
 				filterchangListAll: [],
 				eventId: null,
         websock: '',
-        wsuri:'ws://127.0.0.1:10012/messagePush/',
-        wsuri2:'ws://127.0.0.1:10005/taskPush/',
         setIntervalWesocketPush: null,
         websockSid: {
           userId: ''
@@ -505,7 +503,8 @@
 				searchFB: '',
 				filterchang: '', //林场搜索
 				btmCurrent: '',
-
+        wsurl:'',
+        postName:'',
 				eventWarn: false, //webSocket事件问题警报标记
 			}
 		},
@@ -519,23 +518,29 @@
       this.websockSid.userId=Cookies.get("userId")
     },
     methods: {
-      initWebSocket(wsurl,userId) {        //初始化weosocket
-        //const wsuri = 'ws://127.0.0.1:10003/eventPush/' + userId + '/' + eventTypeDl + '/' + eventType
-        const wsuri = wsurl+userId
-        // const wsuri = 'ws://172.28.20.82:10012/taskPush/'+userId
-        this.websock = new WebSocket(wsuri)
-        console.log('建立websocket连接'+wsuri)
-        this.websock.onopen = this.websocketonopen
-        this.websock.onmessage = this.websocketonmessage
-        this.websock.onerror = this.websocketonerror
+      initWebSocket(wsurl,postName,userId) {
+        this.postName=postName
+        this.wsurl=wsurl
+        selectConfigKey(wsurl).then(res => {
+          //初始化weosocket
+          //const wsuri = 'ws://127.0.0.1:10003/eventPush/' + userId + '/' + eventTypeDl + '/' + eventType
+          const wsuri = res.data  +postName+ userId
+          // const wsuri = 'ws://172.28.20.82:10012/taskPush/'+userId
+          this.websock = new WebSocket(wsuri)
+          //console.log('建立websocket连接' + wsuri)
+          this.websock.onopen = this.websocketonopen
+          this.websock.onmessage = this.websocketonmessage
+          this.websock.onerror = this.websocketonerror
+        })
       },
+
       websocketonopen() { //连接建立之后执行send方法发送数据
         console.log('websocket连接成功')
         this.weosocket = true
         this.sendPing()
       },
       websocketonerror() { //连接建立失败重连
-        this.initWebSocket(this.wsuri,this.websockSid.userId)
+        this.initWebSocket(this.wsurl,this.postName,this.websockSid.userId)
       },
       websocketonmessage(e) { //数据接收
         console.log('接收数据', e.data)
@@ -797,7 +802,7 @@
 					this.taskList = res.data
 					this.taskCount = res.data.length
 				})
-        this.initWebSocket(this.wsuri2,this.websockSid.userId)
+        this.initWebSocket('TASK_SOCKET','/taskPush/',this.websockSid.userId)
 			},
 
       selectMessageById(id) {
@@ -805,7 +810,7 @@
           /** 获取消息列表 */
           this.selectMessageList();
         });
-        this.initWebSocket(this.wsuri,this.websockSid.userId)
+        this.initWebSocket('MESSAGE_SOCKET','/messagePush/',this.websockSid.userId)
       },
       /** 获取消息列表 */
       selectMessageList(){

src/utils/request.js

@@ -55,11 +55,12 @@ service.interceptors.request.use(config => {
       const s_url = sessionObj.url;                  // 请求地址
       const s_data = sessionObj.data;                // 请求数据
       const s_time = sessionObj.time;                // 请求时间
-      const interval = 1000;                         // 间隔时间(ms)，小于此时间视为重复提交
+      const interval = 500;                         // 间隔时间(ms)，小于此时间视为重复提交
       if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
         const message = '数据正在处理，请勿重复提交';
         console.warn(`[${s_url}]: ` + message)
-        return Promise.reject(new Error(message))
+        //Promise.reject(new Error(message))
+        return Promise.reject()
       } else {
         cache.session.setJSON('sessionObj', requestObj)
       }
@@ -105,12 +106,14 @@ service.interceptors.response.use(res => {
         message: msg,
         type: 'error'
       })
-      return Promise.reject(new Error(msg))
+      //Promise.reject(new Error(msg))
+      return Promise.reject()
     } else if (code !== 200) {
       Notification.error({
         title: msg
       })
-      return Promise.reject('error')
+      //Promise.reject('error')
+      return Promise.reject()
     } else {
       return res.data
     }
@@ -133,7 +136,8 @@ service.interceptors.response.use(res => {
       type: 'error',
       duration: 5 * 1000
     })
-    return Promise.reject(error)
+    //Promise.reject(error)
+    return Promise.reject()
   }
 )
 

src/views/eventdetailsdialog.vue

@@ -1,7 +1,5 @@
 <template>
   <div class="visual-con">
-    <!--头部-->
-    <vheader></vheader>
     <!--主体-->
     <div class="visual-body">
       <button @click="showEventDialog"
@@ -1071,7 +1069,6 @@
 <script>
 import html2canvas from 'html2canvas'//截图组件
 import supermapDialog from '@/components/supermap' //超图
-import vheader from '@/components/v-header.vue' //一体化共用头部
 import vBottomMenu from '@/components/vBottomMenu.vue' //一体化公共底部菜单
 import eventLogUpload from '@/views/eventLogUpload.vue' //日志上传文件
 import areaSupermap from '@/components/supermap'//区域标记地图
@@ -1122,7 +1119,6 @@ export default {
     }
   },
   components: {
-    vheader,
     TVWall,
     vBottomMenu,
     supermapDialog,

src/views/firespread.vue

@@ -1,7 +1,5 @@
 <template>
   <div class="visual-con">
-    <!--头部-->
-    <vheader></vheader>
     <!--主体-->
     <div class="visual-body">
       <button @click="showEventDialog"
@@ -146,7 +144,6 @@
 <script>
   import html2canvas from 'html2canvas'//截图组件
   import supermapDialog1 from '@/components/supermap' //超图
-  import vheader from '@/components/v-header.vue' //一体化共用头部
   import vBottomMenu from '@/components/vBottomMenu.vue' //一体化公共底部菜单
   import eventLogUpload from '@/views/eventLogUpload.vue' //日志上传文件
   import areaSupermap from '@/components/supermap'//区域标记地图
@@ -190,7 +187,6 @@
       }
     },
     components: {
-      vheader,
       vBottomMenu,
       supermapDialog1,
       eventLogUpload,