From 0a50c69b2c6cf89fdd5b4f50b1569c2fc4214a50 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 16 Jul 2020 19:11:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=85=8D=E7=BD=AE=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/QueryListPage/DataForm.vue | 7 +-
src/views/jsxt/refereeList/menuReplay.vue | 2 +-
src/views/newMap/displayNew/designIndex.vue | 2 +-
src/views/newMap/displayNew/menuDemon.vue | 2 +-
.../{newChatView => chatView}/chatBox.vue | 15 +-
.../{newChatView => chatView}/chatContent.vue | 0
.../chatMemberList.vue | 0
.../{newChatView => chatView}/chatSetting.vue | 0
.../{newChatView => chatView}/chatTooltip.vue | 0
.../memberManage/membersManage.vue | 1 -
.../newMap/jointTrainingNew/menuDemon.vue | 2 +-
.../system/deviceManage/editConfigGateway.vue | 2 +-
.../system/deviceManage/editConfigIbp.vue | 736 +++++++++++++++++-
13 files changed, 748 insertions(+), 21 deletions(-)
rename src/views/newMap/jointTrainingNew/{newChatView => chatView}/chatBox.vue (97%)
rename src/views/newMap/jointTrainingNew/{newChatView => chatView}/chatContent.vue (100%)
rename src/views/newMap/jointTrainingNew/{newChatView => chatView}/chatMemberList.vue (100%)
rename src/views/newMap/jointTrainingNew/{newChatView => chatView}/chatSetting.vue (100%)
rename src/views/newMap/jointTrainingNew/{newChatView => chatView}/chatTooltip.vue (100%)
diff --git a/src/components/QueryListPage/DataForm.vue b/src/components/QueryListPage/DataForm.vue
index 0cf7b57c5..22f35ee0b 100644
--- a/src/components/QueryListPage/DataForm.vue
+++ b/src/components/QueryListPage/DataForm.vue
@@ -348,9 +348,9 @@ export default {
}
},
inline: {
- type: Boolean,
+ type: Boolean,
default() {
- return false;
+ return false;
}
}
},
@@ -376,6 +376,9 @@ export default {
}
});
},
+ validateField(field) {
+ this.$refs.form.validateField(field);
+ },
resetForm() {
this.$refs.form.resetFields();
},
diff --git a/src/views/jsxt/refereeList/menuReplay.vue b/src/views/jsxt/refereeList/menuReplay.vue
index 8d1a6d0ee..ac52d9992 100644
--- a/src/views/jsxt/refereeList/menuReplay.vue
+++ b/src/views/jsxt/refereeList/menuReplay.vue
@@ -22,7 +22,7 @@
diff --git a/src/views/newMap/jointTrainingNew/newChatView/chatContent.vue b/src/views/newMap/jointTrainingNew/chatView/chatContent.vue
similarity index 100%
rename from src/views/newMap/jointTrainingNew/newChatView/chatContent.vue
rename to src/views/newMap/jointTrainingNew/chatView/chatContent.vue
diff --git a/src/views/newMap/jointTrainingNew/newChatView/chatMemberList.vue b/src/views/newMap/jointTrainingNew/chatView/chatMemberList.vue
similarity index 100%
rename from src/views/newMap/jointTrainingNew/newChatView/chatMemberList.vue
rename to src/views/newMap/jointTrainingNew/chatView/chatMemberList.vue
diff --git a/src/views/newMap/jointTrainingNew/newChatView/chatSetting.vue b/src/views/newMap/jointTrainingNew/chatView/chatSetting.vue
similarity index 100%
rename from src/views/newMap/jointTrainingNew/newChatView/chatSetting.vue
rename to src/views/newMap/jointTrainingNew/chatView/chatSetting.vue
diff --git a/src/views/newMap/jointTrainingNew/newChatView/chatTooltip.vue b/src/views/newMap/jointTrainingNew/chatView/chatTooltip.vue
similarity index 100%
rename from src/views/newMap/jointTrainingNew/newChatView/chatTooltip.vue
rename to src/views/newMap/jointTrainingNew/chatView/chatTooltip.vue
diff --git a/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue b/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
index 201a0e5eb..beefe2d3f 100644
--- a/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
+++ b/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
@@ -4,7 +4,6 @@
:visible.sync="show"
:direction="direction"
:before-close="doClose"
- :wrapper-closable="false"
custom-class="drawer_box"
size="43%"
>
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 8a33b9d6c..bad3f34a7 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -31,7 +31,7 @@