From a73ae082a8bee455dd434a5803434f2c347c97c5 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Wed, 25 Sep 2019 09:39:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?elementUI=E5=9B=BE=E6=A0=87=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E8=8B=B1=E6=96=87X?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lesson/trainingrecord/category/tree.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/lesson/trainingrecord/category/tree.vue b/src/views/lesson/trainingrecord/category/tree.vue index d210f6cc8..9c7ddde0f 100644 --- a/src/views/lesson/trainingrecord/category/tree.vue +++ b/src/views/lesson/trainingrecord/category/tree.vue @@ -19,16 +19,17 @@ @node-click="clickEvent" >
-  {{ nodeScop.label }} -  {{ nodeScop.label }} + +  {{ nodeScop.label }} + >  {{ nodeScop.label }} + > +  {{ nodeScop.label }}
From 5964baeea10a06d21a0b0073210c70a0baa0de71 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 26 Sep 2019 10:59:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=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/views/scriptManage/detail/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/scriptManage/detail/index.vue b/src/views/scriptManage/detail/index.vue index 408c3559b..e4d1cc7b2 100644 --- a/src/views/scriptManage/detail/index.vue +++ b/src/views/scriptManage/detail/index.vue @@ -121,9 +121,9 @@ export default { }, deleteScript() { const data=this.formModel; - this.$confirm(this.$t('scriptRecord.deleteScriptTip'), this.$t('scriptRecord.operateTip'), { - confirmButtonText: this.$t('scriptRecord.confirmButtonText'), - cancelButtonText: this.$t('scriptRecord.cancelButtonText'), + this.$confirm(this.$t('scriptRecord.deleteScriptTip'), this.$t('global.tips'), { + confirmButtonText: this.$t('global.confirm'), + cancelButtonText: this.$t('global.cancel'), type: 'warning' }).then(() => { deleteQuest(data.id).then(response => { From 293cee8d2fb3418391477ab75a43410a4f3363b3 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 26 Sep 2019 11:07:30 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E7=AE=A1=E7=90=86bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/scriptManage/category/tree.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/scriptManage/category/tree.vue b/src/views/scriptManage/category/tree.vue index 137cf92b2..5b7110ee0 100644 --- a/src/views/scriptManage/category/tree.vue +++ b/src/views/scriptManage/category/tree.vue @@ -74,6 +74,9 @@ export default { this.mapList = response.data; this.loading = false; this.mapSelect=localStore.get("script_mapId") || this.mapList[0].id; + if(localStore.get("script_mapId")){ + this.$store.dispatch('scriptRecord/updateScriptId',localStore.get("script_mapId")); + } this.getQuestPageList(this.mapSelect); }) }, From 2ce7cde8cbef756ca94ea9c2c514eb1eb4b8d113 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 26 Sep 2019 15:43:19 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4icon=E5=AF=BC=E8=87=B4x?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/demonstration/list/demonList.vue | 3 ++- src/views/exam/list/examList.vue | 5 +++-- src/views/lesson/lessoncategory/category/tree.vue | 7 ++++--- src/views/map/mapdraft/mapmanage/maplist.vue | 5 +++-- src/views/map/product/tree.vue | 9 +++++---- src/views/map/runplan/manage/list.vue | 6 ++++-- src/views/planMonitor/planmanage/planList.vue | 3 ++- src/views/screenMonitor/list/demonList.vue | 1 + src/views/scriptManage/category/tree.vue | 7 ++++--- src/views/teach/category/tree.vue | 4 +--- 10 files changed, 29 insertions(+), 21 deletions(-) diff --git a/src/views/demonstration/list/demonList.vue b/src/views/demonstration/list/demonList.vue index dddbcdc18..bd5131bf1 100644 --- a/src/views/demonstration/list/demonList.vue +++ b/src/views/demonstration/list/demonList.vue @@ -21,7 +21,8 @@  {{ tnode.label }} + > +  {{ tnode.label }} diff --git a/src/views/exam/list/examList.vue b/src/views/exam/list/examList.vue index 3d31185ef..832d6bee8 100644 --- a/src/views/exam/list/examList.vue +++ b/src/views/exam/list/examList.vue @@ -34,15 +34,16 @@ v-if="tnode.data.type === 'lesson'" :style="{color: tnode.data.valid ? 'green':''}" class="el-icon-tickets" - > {{ tnode.label }} + >  {{ tnode.label }} + > +  {{ tnode.label }} diff --git a/src/views/lesson/lessoncategory/category/tree.vue b/src/views/lesson/lessoncategory/category/tree.vue index 7836e17b4..2540127b5 100644 --- a/src/views/lesson/lessoncategory/category/tree.vue +++ b/src/views/lesson/lessoncategory/category/tree.vue @@ -10,9 +10,10 @@ @node-contextmenu="showContextMenu" draggable :allow-drop="allowDrop" :allow-drag="allowDrag" @node-drag-end="handleDragEnd" expand-on-click-node highlight-current @node-click="clickEvent" :span=22> -  {{ node.label }} -  {{ node.label }} -  {{ node.label }} + + + +  {{ node.label }} diff --git a/src/views/map/mapdraft/mapmanage/maplist.vue b/src/views/map/mapdraft/mapmanage/maplist.vue index bbeebfb08..9616b0e12 100644 --- a/src/views/map/mapdraft/mapmanage/maplist.vue +++ b/src/views/map/mapdraft/mapmanage/maplist.vue @@ -33,8 +33,9 @@ @node-contextmenu="showContextMenu" > -  {{ node.label }} -  {{ node.label }} + + +  {{ node.label }} diff --git a/src/views/map/product/tree.vue b/src/views/map/product/tree.vue index 17eca4c9b..0626229f6 100644 --- a/src/views/map/product/tree.vue +++ b/src/views/map/product/tree.vue @@ -17,10 +17,11 @@ @node-click="clickEvent" > -  {{ node.label }} -  {{ node.label }} -  {{ node.label }} -  {{ node.label }} + + + + +  {{ node.label }} diff --git a/src/views/map/runplan/manage/list.vue b/src/views/map/runplan/manage/list.vue index 4fcc7e31c..ab37388df 100644 --- a/src/views/map/runplan/manage/list.vue +++ b/src/views/map/runplan/manage/list.vue @@ -19,10 +19,12 @@ diff --git a/src/views/planMonitor/planmanage/planList.vue b/src/views/planMonitor/planmanage/planList.vue index 4b3c2f28d..320db479f 100644 --- a/src/views/planMonitor/planmanage/planList.vue +++ b/src/views/planMonitor/planmanage/planList.vue @@ -21,7 +21,8 @@  {{ nd.label }} + > +  {{ nd.label }} diff --git a/src/views/screenMonitor/list/demonList.vue b/src/views/screenMonitor/list/demonList.vue index 1ecad8ff7..4a3545edd 100644 --- a/src/views/screenMonitor/list/demonList.vue +++ b/src/views/screenMonitor/list/demonList.vue @@ -22,6 +22,7 @@ class="el-icon-tickets" :style="{color: data.valid ? 'green':''}" > {{ nd.label }} +  {{ nd.label }} diff --git a/src/views/scriptManage/category/tree.vue b/src/views/scriptManage/category/tree.vue index 137cf92b2..365d1d5c0 100644 --- a/src/views/scriptManage/category/tree.vue +++ b/src/views/scriptManage/category/tree.vue @@ -26,7 +26,8 @@  {{ tnode.label }} + > +  {{ tnode.label }} @@ -113,7 +114,7 @@ export default { } this.getQuestPageList(this.mapSelect).then(function(){ that.$refs.tree.setCurrentKey(data.scriptId); - }); + }); } else { @@ -140,4 +141,4 @@ export default { color:#409eff; font-size: 15px; } - \ No newline at end of file + diff --git a/src/views/teach/category/tree.vue b/src/views/teach/category/tree.vue index 6b2f69215..38334aed7 100644 --- a/src/views/teach/category/tree.vue +++ b/src/views/teach/category/tree.vue @@ -31,7 +31,6 @@ :class="tnode.data.valid? 'el-icon-sold-out':'el-icon-goods'" > -  {{ tnode.label }} -  {{ tnode.label }} -  {{ tnode.label }} +  {{ tnode.label }}