joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev

Browse Source
This commit is contained in:
zyy 2019-09-26 17:42:32 +08:00
commit 91a93da574
12 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/demonstration/list/demonList.vue
View File

@ -21,7 +21,8 @@
<span <span
class="el-icon-tickets" class="el-icon-tickets"
:style="{color: data.valid ? 'green':''}" :style="{color: data.valid ? 'green':''}"
>&nbsp;{{ tnode.label }}</span> ></span>
<span :style="{color: data.valid ? 'green':''}">&nbsp;{{ tnode.label }}</span>
</span> </span>
</el-tree> </el-tree>
</el-scrollbar> </el-scrollbar>

5
src/views/exam/list/examList.vue
View File

@ -34,15 +34,16 @@
v-if="tnode.data.type === 'lesson'" v-if="tnode.data.type === 'lesson'"
:style="{color: tnode.data.valid ? 'green':''}" :style="{color: tnode.data.valid ? 'green':''}"
class="el-icon-tickets" class="el-icon-tickets"
>&nbsp;{{ tnode.label }}</span> ></span>
</span> </span>
<span v-if="tnode.data.type === 'exam'" :class="tnode.data.valid? 'el-icon-sold-out':'el-icon-goods'"> <span v-if="tnode.data.type === 'exam'" :class="tnode.data.valid? 'el-icon-sold-out':'el-icon-goods'">
<span <span
v-if="tnode.data.type === 'exam'" v-if="tnode.data.type === 'exam'"
:style="{color: tnode.data.valid ? 'green':''}" :style="{color: tnode.data.valid ? 'green':''}"
class="el-icon-edit-outline" class="el-icon-edit-outline"
>&nbsp;{{ tnode.label }}</span> ></span>
</span> </span>
<span :style="{color: tnode.data.valid ? 'green':''}">&nbsp;{{ tnode.label }}</span>
</span> </span>
</el-tree> </el-tree>
</el-scrollbar> </el-scrollbar>

7
src/views/lesson/lessoncategory/category/tree.vue
View File

@ -10,9 +10,10 @@
@node-contextmenu="showContextMenu" draggable :allow-drop="allowDrop" :allow-drag="allowDrag" @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-drag-end="handleDragEnd" expand-on-click-node highlight-current @node-click="clickEvent" :span=22>
<span slot-scope="{ node, data }"> <span slot-scope="{ node, data }">
<span v-if="node.data.type === 'skin'" class="el-icon-news">&nbsp;{{ node.label }}</span> <span v-if="node.data.type === 'skin'" class="el-icon-news"></span>
<span v-if="node.data.type === 'lesson'" class="el-icon-tickets">&nbsp;{{ node.label }}</span> <span v-if="node.data.type === 'lesson'" class="el-icon-tickets"></span>
<span v-if="node.data.type === 'chapter'" class="el-icon-document">&nbsp;{{ node.label }}</span> <span v-if="node.data.type === 'chapter'" class="el-icon-document"></span>
<span>&nbsp;{{ node.label }}</span>
</span> </span>
</el-tree> </el-tree>
</el-scrollbar> </el-scrollbar>

9
src/views/lesson/trainingrecord/category/tree.vue
View File

@ -19,16 +19,17 @@
@node-click="clickEvent" @node-click="clickEvent"
> >
<div slot-scope="{ node: nodeScop }"> <div slot-scope="{ node: nodeScop }">
<span v-if="nodeScop.data.type == 'skin'" class="el-icon-news">&nbsp;{{ nodeScop.label }}</span> <span v-if="nodeScop.data.type == 'skin'" class="el-icon-news"></span>
<span v-else-if="nodeScop.data.type == 'prd'" class="el-icon-tickets">&nbsp;{{ nodeScop.label }}</span> <span v-else-if="nodeScop.data.type == 'prd'" class="el-icon-tickets"></span>
<span <span
v-else-if="nodeScop.data.type == 'trainingType'" v-else-if="nodeScop.data.type == 'trainingType'"
class="el-icon-document" class="el-icon-document"
>&nbsp;{{ nodeScop.label }}</span> ></span>
<span <span
v-else-if="nodeScop.data.type == 'training'" v-else-if="nodeScop.data.type == 'training'"
class="el-icon-edit-outline" class="el-icon-edit-outline"
>&nbsp;{{ nodeScop.label }}</span> ></span>
<span>&nbsp;{{ nodeScop.label }}</span>
</div> </div>
</el-tree> </el-tree>
</el-scrollbar> </el-scrollbar>

5
src/views/map/mapdraft/mapmanage/maplist.vue
View File

@ -33,8 +33,9 @@
@node-contextmenu="showContextMenu" @node-contextmenu="showContextMenu"
> >
<span slot-scope="{ node }"> <span slot-scope="{ node }">
<span v-if="node.data.type == 'skin'" class="el-icon-news">&nbsp;{{ node.label }}</span> <span v-if="node.data.type == 'skin'" class="el-icon-news"></span>
<span v-if="node.data.type == 'map'" class="el-icon-edit-outline">&nbsp;{{ node.label }}</span> <span v-if="node.data.type == 'map'" class="el-icon-edit-outline"></span>
<span>&nbsp;{{ node.label }}</span>
</span> </span>
</el-tree> </el-tree>
</el-scrollbar> </el-scrollbar>

9
src/views/map/product/tree.vue
View File

@ -17,10 +17,11 @@
@node-click="clickEvent" @node-click="clickEvent"
> >
<span slot-scope="{ node }"> <span slot-scope="{ node }">
<span v-if="node.data.type == 'skin'" class="el-icon-news">&nbsp;{{ node.label }}</span> <span v-if="node.data.type == 'skin'" class="el-icon-news"></span>
<span v-if="node.data.type == 'prd'" class="el-icon-tickets">&nbsp;{{ node.label }}</span> <span v-if="node.data.type == 'prd'" class="el-icon-tickets"></span>
<span v-if="node.data.type == 'trainingType'" class="el-icon-document">&nbsp;{{ node.label }}</span> <span v-if="node.data.type == 'trainingType'" class="el-icon-document"></span>
<span v-if="node.data.type == 'trainingType'" class="el-icon-edit">&nbsp;{{ node.label }}</span> <span v-if="node.data.type == 'trainingType'" class="el-icon-edit"></span>
<span>&nbsp;{{ node.label }}</span>
</span> </span>
</el-tree> </el-tree>
</el-scrollbar> </el-scrollbar>

6
src/views/map/runplan/manage/list.vue
View File

@ -19,10 +19,12 @@
<span slot-scope="{ node, data }"> <span slot-scope="{ node, data }">
<el-tooltip class="item" effect="dark" :content="node.label" placement="top" :open-delay="1000"> <el-tooltip class="item" effect="dark" :content="node.label" placement="top" :open-delay="1000">
<template v-if="data.type=='skin'"> <template v-if="data.type=='skin'">
<span class="el-icon-news">&nbsp;{{ node.label }}</span> <span class="el-icon-news"></span>
<span>&nbsp;{{ node.label }}</span>
</template> </template>
<template v-else> <template v-else>
<span class="el-icon-document">&nbsp;{{ node.label }}</span> <span class="el-icon-document"></span>
<span>&nbsp;{{ node.label }}</span>
</template> </template>
</el-tooltip> </el-tooltip>
</span> </span>

3
src/views/planMonitor/planmanage/planList.vue
View File

@ -21,7 +21,8 @@
<span <span
class="el-icon-tickets" class="el-icon-tickets"
:style="{color: data.valid ? 'green':''}" :style="{color: data.valid ? 'green':''}"
>&nbsp;{{ nd.label }}</span> ></span>
<span :style="{color: data.valid ? 'green':''}">&nbsp;{{ nd.label }}</span>
</span> </span>
</el-tree> </el-tree>
</el-scrollbar> </el-scrollbar>

1
src/views/screenMonitor/list/demonList.vue
View File

@ -22,6 +22,7 @@
class="el-icon-tickets" class="el-icon-tickets"
:style="{color: data.valid ? 'green':''}" :style="{color: data.valid ? 'green':''}"
>&nbsp;{{ nd.label }}</span> >&nbsp;{{ nd.label }}</span>
<span :style="{color: data.valid ? 'green':''}">&nbsp;{{ nd.label }}</span>
</span> </span>
</el-tree> </el-tree>
</el-scrollbar> </el-scrollbar>

6
src/views/scriptManage/category/tree.vue
View File

@ -26,7 +26,8 @@
<span <span
class="el-icon-tickets" class="el-icon-tickets"
:style="{color: data.valid ? 'green':''}" :style="{color: data.valid ? 'green':''}"
>&nbsp;{{ tnode.label }}</span> ></span>
<span :style="{color: data.valid ? 'green':''}">&nbsp;{{ tnode.label }}</span>
</span> </span>
</el-tree> </el-tree>
</el-scrollbar> </el-scrollbar>
@ -74,6 +75,9 @@ export default {
this.mapList = response.data; this.mapList = response.data;
this.loading = false; this.loading = false;
this.mapSelect=localStore.get("script_mapId") || this.mapList[0].id; 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); this.getQuestPageList(this.mapSelect);
}) })
}, },

6
src/views/scriptManage/detail/index.vue
View File

@ -121,9 +121,9 @@ export default {
}, },
deleteScript() { deleteScript() {
const data=this.formModel; const data=this.formModel;
this.$confirm(this.$t('scriptRecord.deleteScriptTip'), this.$t('scriptRecord.operateTip'), { this.$confirm(this.$t('scriptRecord.deleteScriptTip'), this.$t('global.tips'), {
confirmButtonText: this.$t('scriptRecord.confirmButtonText'), confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('scriptRecord.cancelButtonText'), cancelButtonText: this.$t('global.cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
deleteQuest(data.id).then(response => { deleteQuest(data.id).then(response => {

6
src/views/teach/category/tree.vue
View File

@ -31,7 +31,6 @@
:class="tnode.data.valid? 'el-icon-sold-out':'el-icon-goods'" :class="tnode.data.valid? 'el-icon-sold-out':'el-icon-goods'"
> >
<span class="el-icon-tickets"> <span class="el-icon-tickets">
<span :style="{color: tnode.data.valid ? 'green':''}">&nbsp;{{ tnode.label }}</span>
</span> </span>
</span> </span>
<span <span
@ -39,7 +38,6 @@
:class="tnode.data.valid? 'el-icon-sold-out':'el-icon-goods'" :class="tnode.data.valid? 'el-icon-sold-out':'el-icon-goods'"
> >
<span class="el-icon-document"> <span class="el-icon-document">
<span :style="{color: tnode.data.valid ? 'green':''}">&nbsp;{{ tnode.label }}</span>
</span> </span>
</span> </span>
<span <span
@ -47,10 +45,10 @@
:class="tnode.data.valid? 'el-icon-sold-out':'el-icon-goods'" :class="tnode.data.valid? 'el-icon-sold-out':'el-icon-goods'"
> >
<span class="el-icon-mobile-phone"> <span class="el-icon-mobile-phone">
</span>
</span>
<span :style="{color: tnode.data.valid ? 'green':''}">&nbsp;{{ tnode.label }}</span> <span :style="{color: tnode.data.valid ? 'green':''}">&nbsp;{{ tnode.label }}</span>
</span> </span>
</span>
</span>
</el-tree> </el-tree>
</el-scrollbar> </el-scrollbar>
</el-card> </el-card>