From ad34f06ad18352e280b23b1b782558656f5fad5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=9D=B0?= <zhengjie@tom.com>
Date: Wed, 26 Dec 2018 17:31:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7=E3=80=81?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E3=80=81=E6=9D=83=E9=99=90=E3=80=81=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=88=96=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99=E6=97=B6?=
 =?UTF-8?q?=E5=86=8D=E6=AC=A1=E6=B7=BB=E5=8A=A0=E5=90=8E=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/monitor/log/msg.vue         | 5 ++++-
 src/views/system/menu/module/add.vue  | 1 +
 src/views/system/menu/module/edit.vue | 1 +
 src/views/system/role/module/add.vue  | 1 +
 src/views/system/role/module/edit.vue | 1 +
 src/views/system/user/module/add.vue  | 1 +
 src/views/system/user/module/edit.vue | 1 +
 7 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/views/monitor/log/msg.vue b/src/views/monitor/log/msg.vue
index adf6f1d..2c93ec0 100644
--- a/src/views/monitor/log/msg.vue
+++ b/src/views/monitor/log/msg.vue
@@ -11,7 +11,7 @@
     <div id="console" :style="'height:'+ height" class="console">
       <div v-for="item in data" :key="item.time">
         <span>{{ item.name }}</span>
-        <span style="color:#CD0066 ">{{ item.timestamp+' ' }}</span>
+        <span style="color:#CD0066 ">{{ time(item.timestamp)+' ' }}</span>
         <span style="color: #00CD00">{{ item.threadName+' ' }}</span>
         <span :style="'color:'+ getColor(item.level) ">
           {{ item.level+' ' }}
@@ -58,6 +58,9 @@ export default {
     clearInterval(this.timer)
   },
   methods: {
+    time(date) {
+      return parseTime(date)
+    },
     initWebSocket() {
       this.connection(this)
       // 断开重连机制,尝试发送消息,捕获异常发生时重连
diff --git a/src/views/system/menu/module/add.vue b/src/views/system/menu/module/add.vue
index d78414a..bc862ec 100644
--- a/src/views/system/menu/module/add.vue
+++ b/src/views/system/menu/module/add.vue
@@ -87,6 +87,7 @@ export default {
     doSubmit() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
+          this.form.roles = []
           const _this = this
           this.roleIds.forEach(function(data, index) {
             const role = { id: data }
diff --git a/src/views/system/menu/module/edit.vue b/src/views/system/menu/module/edit.vue
index ac387f4..e84e1cd 100644
--- a/src/views/system/menu/module/edit.vue
+++ b/src/views/system/menu/module/edit.vue
@@ -103,6 +103,7 @@ export default {
     doSubmit() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
+          this.form.roles = []
           const _this = this
           this.roleIds.forEach(function(data, index) {
             const role = { id: data }
diff --git a/src/views/system/role/module/add.vue b/src/views/system/role/module/add.vue
index ea9c818..9390c60 100644
--- a/src/views/system/role/module/add.vue
+++ b/src/views/system/role/module/add.vue
@@ -50,6 +50,7 @@ export default {
     doSubmit() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
+          this.form.permissions = []
           const _this = this
           this.permissionIds.forEach(function(data, index) {
             const permission = { id: data }
diff --git a/src/views/system/role/module/edit.vue b/src/views/system/role/module/edit.vue
index a0acb60..1151b8b 100644
--- a/src/views/system/role/module/edit.vue
+++ b/src/views/system/role/module/edit.vue
@@ -68,6 +68,7 @@ export default {
     doSubmit() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
+          this.form.permissions = []
           const _this = this
           this.permissionIds.forEach(function(data, index) {
             const permission = { id: data }
diff --git a/src/views/system/user/module/add.vue b/src/views/system/user/module/add.vue
index cd39282..16adee3 100644
--- a/src/views/system/user/module/add.vue
+++ b/src/views/system/user/module/add.vue
@@ -62,6 +62,7 @@ export default {
     doSubmit() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
+          this.form.roles = []
           const _this = this
           this.roleIds.forEach(function(data, index) {
             const role = { id: data }
diff --git a/src/views/system/user/module/edit.vue b/src/views/system/user/module/edit.vue
index 6dde2f9..21c007d 100644
--- a/src/views/system/user/module/edit.vue
+++ b/src/views/system/user/module/edit.vue
@@ -78,6 +78,7 @@ export default {
     doSubmit() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
+          this.form.roles = []
           const _this = this
           this.roleIds.forEach(function(data, index) {
             const role = { id: data }