实训调整

src/views/designPlatform/scenePlayRole.vue

@@ -0,0 +1,33 @@
+<template>
+  <el-dialog
+    title="提示"
+    :visible.sync="dialogVisible"
+    width="30%"
+    :before-close="doClose"
+  >
+    <span />
+  </el-dialog>
+</template>
+
+<script>
+export default {
+    name: 'ScenePlayRole',
+    data() {
+        return {
+            dialogVisible: false
+        };
+    },
+    methods: {
+        doClose() {
+            this.dialogVisible = false;
+        },
+        doShow() {
+            this.dialogVisible = true;
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>

src/views/designPlatform/trainingJlmap.vue

@@ -73,6 +73,11 @@ export default {
                 this.initLoadData();
             });
         },
+        '$store.state.socket.trainingReloadCount': function () {
+            if (this.$store.state.trainingNew.trainingDetail && this.$store.state.trainingNew.trainingDetail.type === 'SCENE') {
+                this.initMemberUserInfo();
+            }
+        },
         '$store.state.app.windowSizeCount': function() { // 窗口缩放
             this.setWindowSize();
         },
@@ -96,7 +101,7 @@ export default {
                 this.menus = this.$theme.loadMenuComponent(lineCode);
                 this.$store.commit('training/notifyGetCommandDefinition', lineCode);
             }
-            this.initMemberUserInfo(true);
+            this.initMemberUserInfo();
         },
         '$store.state.map.map': function (map) {
             if (map) {
@@ -458,7 +463,7 @@ export default {
                 this.endViewLoading();
             }
         },
-        initMemberUserInfo(isFirst = false) {
+        initMemberUserInfo() {
             if (this.$route.query.newApi + '' === 'true') {
                 getMemberListCommon(this.group).then(resp => {
                     this.$store.dispatch('training/setMemberList', { memberList: resp.data, userId: this.userId });

src/views/designPlatform/trainingList.vue

@@ -5,17 +5,20 @@
         <div style="margin-bottom: 10px;font-size: 16px;">{{ `当前实训名称：${training.name || ''}` }}</div>
         <div style="font-size: 16px;">{{ `当前实训描述：${training.description || ''}` }}</div>
       </el-card>
-      <div class="trainingHeader">
-        <div class="trainingList">实训列表</div>
-        <div class="flexNull" />
-      </div>
-      <QueryListPage ref="queryListPage" :card-padding="10" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+      <el-tabs v-model="activeName">
+        <el-tab-pane label="单操实训" name="first">
+          <QueryListPage ref="queryListPage" :card-padding="10" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+        </el-tab-pane>
+        <el-tab-pane label="场景实训" name="second">
+          <QueryListPage ref="queryListPage" :card-padding="10" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryListScene" />
+        </el-tab-pane>
+      </el-tabs>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import { getPublishSingleList, getPublishTrainingDetail, loadPublishTraining } from '@/api/jmap/training';
+import { getPublishSingleList, getPublishTrainingDetail, loadPublishTraining, getPublishScenesList } from '@/api/jmap/training';
 import Cookies from 'js-cookie';
 import ConstConfig from '@/scripts/ConstConfig';
 
@@ -27,6 +30,7 @@ export default {
     data() {
         return {
             dialogVisible: false,
+            activeName: 'first',
             pagerConfig: {
                 pageSize: 'pageSize',
                 pageIndex: 'pageNum'
@@ -85,6 +89,47 @@ export default {
                         ]
                     }
                 ]
+            },
+            queryListScene: {
+                query: this.queryFunctionScene,
+                selectCheckShow: false,
+                paginationHiden: true,
+                indexShow: true,
+                height: 500,
+                columns: [
+                    {
+                        title: this.$t('trainingManage.name'),
+                        prop: 'name'
+                    },
+                    {
+                        title: this.$t('trainingManage.description'),
+                        prop: 'description'
+                    },
+                    {
+                        title: this.$t('trainingManage.type'),
+                        prop: 'type',
+                        type: 'tag',
+                        columnValue: (row) => { return this.covertData(row); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        title: this.$t('trainingManage.labelJson'),
+                        prop: 'labelJson'
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('trainingManage.operate'),
+                        width: '150',
+                        buttons: [
+                            {
+                                name: '加载',
+                                handleClick: this.loadScript,
+                                type: 'primary',
+                                showControl:(row) => { return row.id; }
+                            }
+                        ]
+                    }
+                ]
             }
         };
     },
@@ -106,6 +151,9 @@ export default {
         queryFunction() {
             return getPublishSingleList(this.mapId);
         },
+        queryFunctionScene() {
+            return getPublishScenesList(this.mapId);
+        },
         doShow() {
             this.getListData();
             this.dialogVisible = true;