diff --git a/public/index.html b/public/index.html index 6f294f9d..cd69496c 100644 --- a/public/index.html +++ b/public/index.html @@ -33,7 +33,7 @@ <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> <% } %> diff --git a/src/views/main-sidebar.vue b/src/views/main-sidebar.vue index 93ad0662..1a97baad 100644 --- a/src/views/main-sidebar.vue +++ b/src/views/main-sidebar.vue @@ -101,7 +101,7 @@ export default { }, connection () { // 建立连接对象 - this.socket = new SockJS('http://219.146.91.110:9094/epdc-api/ws/menuNoticeEndpoint')// 连接服务端提供的通信接口,连接以后才可以订阅广播消息和个人消息,注意这里用的是http而不是原生WebSocket的ws + this.socket = new SockJS('http://10.10.10.118:9094/epdc-api/ws/menuNoticeEndpoint')// 连接服务端提供的通信接口,连接以后才可以订阅广播消息和个人消息,注意这里用的是http而不是原生WebSocket的ws // 获取STOMP子协议的客户端对象 this.stompClient = Stomp.over(this.socket) diff --git a/src/views/modules/events/item-close-detail-view.vue b/src/views/modules/events/item-close-detail-view.vue index ee7cccf5..de6582bb 100644 --- a/src/views/modules/events/item-close-detail-view.vue +++ b/src/views/modules/events/item-close-detail-view.vue @@ -2,6 +2,7 @@
+
议题详情
{{dataForm.itemContent}}
@@ -31,7 +32,7 @@ 反对 {{dataForm.opposeNum}}
- 查看评论 + 查看评论
{{dataForm.evaluationScore}}
@@ -47,26 +48,30 @@
上报位置: {{dataForm.issueAddress}}
+
+ 返回 +
+
处理进展
-
{{activity.createdTime}} {{ '【吹哨】' }}
-
{{activity.createdTime}} {{ '【回应】' }}
-
{{activity.createdTime}} {{activity.progressName}}
-
处理部门: {{activity.handlerDept}}
-
- 吹哨部门: - {{ csDept.deptName }} - -
-
处理意见: {{activity.advice}}
+
+
{{activity.createdTime}} {{ '【吹哨】' }}
+
{{activity.createdTime}} {{ '【回应】' }}
+
{{activity.createdTime}} {{activity.progressName}}
+
处理部门: {{activity.handlerDept}}
+
+ 吹哨部门:{{ csDept.deptName }} +
+
处理意见: {{activity.advice}}
+
@@ -129,8 +134,9 @@ export default { this.init() }, methods: { - backToItemDeal () { - this.$parent.selectComponent = 'ItemClose' + back () { + this.$parent.init() + // this.$router.push({ path: this.$route.path }) }, initBmap (latitude, longitude) { this.map = new BMap.Map('map') @@ -213,18 +219,31 @@ export default { diff --git a/src/views/modules/events/item-end.vue b/src/views/modules/events/item-end.vue index 833d88f3..cbd4aca2 100644 --- a/src/views/modules/events/item-end.vue +++ b/src/views/modules/events/item-end.vue @@ -16,6 +16,11 @@ export default { components: { ItemEndList, ItemCloseDetailView + }, + methods: { + init () { + this.selectComponent = ItemEndList + } } }