Merge remote-tracking branch 'origin/develop'

现地工作站添加运行图加载
2024-09-30 14:35:00 +08:00 · 2024-09-30 14:33:11 +08:00 · 2024-09-30 09:32:05 +08:00 · 2024-09-29 14:11:41 +08:00 · 2024-09-29 14:11:09 +08:00 · 2024-09-27 11:03:20 +08:00
2247 changed files with 246263 additions and 125965 deletions
--- a/.env.development
+++ b/.env.development
@ -5,10 +5,10 @@ NODE_ENV = 'development'
 # base api
 # VUE_APP_BASE_API = 'https://joylink.club/jlcloud'
 # VUE_APP_BASE_API = 'http://192.168.3.4:9000'
-VUE_APP_BASE_API = 'http://192.168.3.6:9000'
-VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink'
-VUE_APP_UPLOAD_API = 'https://upload.joylink.club'
-VUE_APP_BASE_SITE='https://test.joylink.club/cbtc'
+# VUE_APP_BASE_API = 'http://192.168.3.6:9000'
+# VUE_APP_VOICE_API = 'http://119.3.163.89/oss/joylink'
+# VUE_APP_UPLOAD_API = 'http://joylink.club/jlfile'
+# VUE_APP_BASE_SITE='https://test.joylink.club/cbtc'
 # VUE_APP_VOICE_API = 'http://192.168.8.110:9008'


--- a/.env.heb
+++ b/.env.heb
@ -3,7 +3,7 @@ NODE_ENV = 'production'
 VUE_APP_PRO = 'local'

 # base api
-VUE_APP_BASE_API = 'http://160.20.60.15:9000'
-VUE_APP_VOICE_API = 'http://160.20.60.15/oss/joylink'
-VUE_APP_UPLOAD_API = 'http://160.20.60.15'
-VUE_APP_BASE_SITE='http://160.20.60.15'
+# VUE_APP_BASE_API = 'http://160.20.60.15:9000'
+# VUE_APP_VOICE_API = 'http://160.20.60.15/oss/joylink'
+# VUE_APP_UPLOAD_API = 'http://160.20.60.15'
+# VUE_APP_BASE_SITE='http://160.20.60.15'
--- a/.env.local-test
+++ b/.env.local-test
@ -0,0 +1,9 @@
+# just a flag
+NODE_ENV = 'test'
+VUE_APP_PRO = 'local-test'
+
+# base api
+# VUE_APP_BASE_API = 'https://test.joylink.club/jlcloud'
+# VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink'
+# VUE_APP_UPLOAD_API = 'https://upload.joylink.club'
+# VUE_APP_BASE_SITE='https://test.joylink.club/cbtc'
--- a/.env.ntyl
+++ b/.env.ntyl
@ -3,7 +3,7 @@ NODE_ENV = 'production'
 VUE_APP_PRO = 'ntyl'

 # base api
-VUE_APP_BASE_API = 'https://joylink.club/jlcloud'
-VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink'
-VUE_APP_UPLOAD_API = 'https://upload.joylink.club'
-VUE_APP_BASE_SITE='https://joylink.club/cbtc'
+# VUE_APP_BASE_API = 'https://joylink.club/jlcloud'
+# VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink'
+# VUE_APP_UPLOAD_API = 'https://upload.joylink.club'
+# VUE_APP_BASE_SITE='https://joylink.club/cbtc'
--- a/.env.production
+++ b/.env.production
@ -2,7 +2,7 @@
 NODE_ENV = 'production'

 # base api
-VUE_APP_BASE_API = 'https://api.joylink.club/jlcloud'
-VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink'
-VUE_APP_UPLOAD_API = 'https://upload.joylink.club'
-VUE_APP_BASE_SITE='https://joylink.club/cbtc'
+# VUE_APP_BASE_API = 'https://joylink.club/jlcloud'
+# VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink'
+# VUE_APP_UPLOAD_API = 'https://upload.joylink.club'
+# VUE_APP_BASE_SITE='https://joylink.club/cbtc'
--- a/.env.sai
+++ b/.env.sai
@ -0,0 +1,9 @@
+# just a flag
+NODE_ENV = 'production'
+VUE_APP_PRO = 'common'
+
+# base api
+# VUE_APP_BASE_API = 'http://160.20.60.15:9000'
+# VUE_APP_VOICE_API = 'http://160.20.60.15/oss/joylink'
+# VUE_APP_UPLOAD_API = 'http://160.20.60.15'
+# VUE_APP_BASE_SITE='http://160.20.60.15'
--- a/.env.staging
+++ b/.env.staging
@ -2,7 +2,7 @@
 NODE_ENV = 'test'

 # base api
-VUE_APP_BASE_API = 'https://test.joylink.club/jlcloud'
-VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink'
-VUE_APP_UPLOAD_API = 'https://upload.joylink.club'
-VUE_APP_BASE_SITE='https://test.joylink.club/cbtc'
+# VUE_APP_BASE_API = 'https://test.joylink.club/jlcloud'
+# VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink'
+# VUE_APP_UPLOAD_API = 'https://upload.joylink.club'
+# VUE_APP_BASE_SITE='https://test.joylink.club/cbtc'
--- a/.gitea/workflows/CICD_local_test.yaml
+++ b/.gitea/workflows/CICD_local_test.yaml
@ -0,0 +1,52 @@
+---
+name: local-test分支构建发布到本地服务器
+run-name: ${{ gitea.actor }} is testing out Gitea Actions
+on:
+  push:
+    branches:
+      - local-test
+jobs:
+  Build-Publish:
+    runs-on: joylink-local233
+    steps:
+      - name: 检出代码
+        uses: https://gitea.joylink.club/actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: 设置node环境
+        uses: https://gitea.joylink.club/actions/local-setup-node@v0.1.1
+        with:
+          version: v14.21.3
+          cache: yarn
+          cache-dependency-path: yarn.lock
+      - name: 安装yarn,并build
+        run: |
+          node -v
+          npm config set registry https://registry.npmmirror.com
+          npm install --global yarn
+          yarn config set registry https://registry.npmmirror.com
+          yarn
+          yarn run buildas local-test
+          tar czvf ./dist-local-test.tar.gz ./dist
+      - name: 打包发送到服务器
+        uses: https://gitea.joylink.club/appleboy/scp-action@v0.1.7
+        with:
+          host: ${{ secrets.LOCAL_233_SSH_HOST }}
+          username: ${{ secrets.LOCAL_233_SSH_USER }}
+          password: ${{ secrets.LOCAL_233_SSH_PASSWORD }}
+          port: ${{ secrets.LOCAL_233_SSH_PORT }}
+          source: ./dist-local-test.tar.gz
+          target: /home/minio/oss/rt-sim-training-client
+          overwrite: true
+      - name: SSH连接并解压发布
+        uses: https://gitea.joylink.club/appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ secrets.LOCAL_233_SSH_HOST }}
+          port: ${{ secrets.LOCAL_233_SSH_PORT }}
+          username: ${{ secrets.LOCAL_233_SSH_USER }}
+          password: ${{ secrets.LOCAL_233_SSH_PASSWORD }}
+          script: |
+            cd /home/minio/oss/rt-sim-training-client
+            rm -rf /usr/local/joylink/client/cbtc
+            mkdir -p /usr/local/joylink/client
+            tar xz --strip 2 -C /usr/local/joylink/client -f dist-local-test.tar.gz
--- a/.gitea/workflows/CICD_master.yaml
+++ b/.gitea/workflows/CICD_master.yaml
@ -0,0 +1,52 @@
+name: master分支构建发布到公网服务器
+run-name: ${{ gitea.actor }} is testing out Gitea Actions
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  Build-Publish:
+    runs-on: joylink-local233
+    steps:
+      - name: 检出代码
+        uses: https://gitea.joylink.club/actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: 设置node环境
+        uses: https://gitea.joylink.club/actions/local-setup-node@v0.1.1
+        with:
+          version: 'v14.21.3'
+          cache: 'yarn'
+          cache-dependency-path: 'yarn.lock'
+      - name: 安装yarn,并build
+        run: |
+          node -v
+          npm config set registry https://registry.npmmirror.com
+          npm install --global yarn
+          yarn config set registry https://registry.npmmirror.com
+          yarn
+          yarn run build
+          tar czvf ./dist-master.tar.gz ./dist
+      - name: 打包发送到服务器
+        uses: https://gitea.joylink.club/appleboy/scp-action@v0.1.7
+        with:
+          host: ${{ secrets.PUB1_DOMAIN_SSH_HOST }}
+          port: ${{ secrets.PUB1_DOMAIN_SSH_PORT }}
+          username: ${{ secrets.PUB1_DOMAIN_SSH_USER }}
+          password: ${{ secrets.PUB1_DOMAIN_SSH_PASSWORD }}
+          source: ./dist-master.tar.gz
+          target: /mnt/data/published/rt-sim-training-client
+          overwrite: true
+      - name: SSH连接并解压发布
+        uses: https://gitea.joylink.club/appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ secrets.PUB1_DOMAIN_SSH_HOST }}
+          port: ${{ secrets.PUB1_DOMAIN_SSH_PORT }}
+          username: ${{ secrets.PUB1_DOMAIN_SSH_USER }}
+          password: ${{ secrets.PUB1_DOMAIN_SSH_PASSWORD }}
+          script: |
+            cd /mnt/data/published/rt-sim-training-client
+            rm -rf /usr/local/joylink/client/cbtc
+            mkdir -p /usr/local/joylink/client
+            tar xz --strip 2 -C /usr/local/joylink/client -f dist-master.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -4,7 +4,6 @@ dist/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-package-lock.json
 tests/**/coverage/
 src/utils/baseUrl.js*

--- a/README.md
+++ b/README.md
@ -4,3 +4,6 @@ English | [简体中文](./README-zh.md)


 Copyright (c) 2018-present Joylink
+### 项目环境
+- "node": "<=14.21.3";
+- "webpack": ">=4 < 4.29";
--- a/package.json
+++ b/package.json
@ -6,10 +6,11 @@
  "license": "MIT",
  "scripts": {
    "start": "vue-cli-service serve --open",
-    "dev": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js serve",
+    "dev": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js serve --open",
    "build": "vue-cli-service build --mode production",
    "test": "vue-cli-service build --mode staging",
    "local": "vue-cli-service build --mode",
+    "buildas": "vue-cli-service build --mode",
    "preview": "node build/index.js --preview",
    "lint": "eslint --ext .js,.vue src",
    "test:unit": "jest --clearCache && vue-cli-service test:unit",
@ -17,8 +18,11 @@
    "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml"
  },
  "dependencies": {
-    "axios": "^0.21.1",
-    "bjjl-engine-2d": "^1.0.22",
+    "@stomp/stompjs": "^5.4.4",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^1.0.2",
+    "axios": "^0.18.0",
+    "dayjs": "^1.11.5",
    "echarts": "^4.7.0",
    "element-ui": "^2.12.0",
    "file-saver": "^1.3.3",
@ -36,15 +40,17 @@
    "sessionstorage": "^0.1.0",
    "stompjs": "^2.3.3",
    "storejs": "^1.0.25",
-    "three": "^0.130.1",
+    "three": "^0.107.0",
    "video.js": "^7.8.4",
    "vue": "^2.6.10",
    "vue-i18n": "^8.12.0",
    "vue-quill-editor": "^3.0.6",
    "vue-router": "^3.1.6",
+    "vue-video-player": "^5.0.1",
    "vuedraggable": "^2.24.3",
    "vuex": "^3.1.0",
    "wangeditor": "^4.6.17",
+    "ws": "^8.13.0",
    "xlsx": "^0.14.2",
    "zrender": "^4.0.4"
  },
@ -73,7 +79,7 @@
    "html-webpack-plugin": "3.2.0",
    "node-sass": "^4.14.1",
    "runjs": "^4.3.2",
-    "sass-loader": "^7.1.0",
+    "sass-loader": "^7.3.1",
    "script-ext-html-webpack-plugin": "2.1.3",
    "script-loader": "^0.7.2",
    "serve-static": "^1.13.2",
--- a/src/App.vue
+++ b/src/App.vue
@ -1,24 +1,44 @@
 <template>
  <div id="app">
-    <router-view />
-    <deomon-topic ref="deomonTopic" />
-    <img v-show="loading" :src="loadingImg" class="AppAll">
+    <router-view v-if="loadingComponent" />
+    <deomon-list ref="deomonList" @enterQcode="qcodeEntry" />
+    <qcode ref="qcode" />
+    <div v-show="loading" class="AppAll">
+      <img v-if="project === 'login' || project === 'design'" :src="jlFavicon" class="CompanyIcon">
+      <img :src="loadingImg" style="width: 100%; height: 100%;">
+    </div>
+    <div
+      v-if="!$store.state.user.baseUrl && needLoading"
+      v-loading="!$store.state.user.baseUrl"
+      element-loading-text="拼命加载中"
+      element-loading-background="rgba(0, 0, 0, 0)"
+      element-loading-spinner="el-icon-loading"
+      style="width: 100%;height: 100%;"
+    >
+      <img :src="appLoading" class="centerImg">
+    </div>
  </div>
 </template>

 <script>
-import { getToken } from '@/utils/auth';
-import { getSessionStorage } from '@/utils/auth';
-import { loginInfo, ProjectIcon } from '@/scripts/ProjectConfig';
-import DeomonTopic from '@/views/demonstration/deomonTopic';
+import { getToken, getUserIdKey } from '@/utils/auth';
+import { getSessionStorage, setSessionStorage } from '@/utils/auth';
 import WindowResizeHandler from '@/mixin/WindowResizeHandler';
 import LoadingImg from '@/assets/loading.gif';
+import AppLoading from '@/assets/appLoading.png';
 import { openIndexedDB } from '@/utils/indexedDb';
+import Favicon from '@/assets/icon/favicon.png';
+import DeomonList from '@/views/demonstration/deomonList/index';
+import Qcode from '@/layout/components/Qcode.vue';
+import {removeToken} from './utils/auth';
+import { getFrontProjectConfigByLogin} from '@/api/projectConfig';
+import { handlerUrl } from '@/utils/baseUrl';

 export default {
    name: 'App',
    components: {
-        DeomonTopic
+        DeomonList,
+        Qcode
    },
    mixins: [
        WindowResizeHandler
@ -26,59 +46,103 @@ export default {
    data() {
        return {
            loadingImg: LoadingImg,
-            loading: false
+            appLoading: AppLoading,
+            loading: false,
+            jlFavicon: Favicon,
+            project: '',
+            loadingComponent: false
        };
    },
+    computed: {
+        needLoading() {
+            return this.$route.path !== '/authorization';
+        }
+    },
    watch: {
-        '$store.state.socket.simulationInvite': function (val) {
-            if (val.creator) {
-                this.subscribeMessage(val);
-            }
-        },
-        '$store.state.socket.roomInvite': function (val) {
-            if (val.creator) {
-                this.subscribeMessage(val);
-            }
-        },
        '$store.state.socket.beLogoutCount': async function(val) {
-            this.$store.dispatch('disconnect').then(()=>{
-                this.$alert(this.$t('tip.logoutTips'), this.$t('tip.hint'), {
-                    confirmButtonText: this.$t('tip.confirm'),
-                    callback: action => {
-                        this.$store.dispatch('exit').then(resp => {
-                            this.$router.push({path: loginInfo[getSessionStorage('project')].loginPath});
-                        });
-                    }
+            if (this.$store.state.socket.loggedOutMsg.token === getToken()) {
+                this.$store.dispatch('disconnect').then(()=>{
+                    this.$alert(this.$t('tip.logoutTips'), this.$t('tip.hint'), {
+                        confirmButtonText: this.$t('tip.confirm'),
+                        callback: action => {
+                            removeToken();
+                            this.$store.dispatch('exit').then(resp => {
+                                this.$router.push({path: `/login?project=${this.$store.state.projectConfig.markKey}`});
+                            });
+                        }
+                    });
                });
-            });
+            }
+
        },
        '$store.state.app.transitionAnimationsCount': function(val) {
            this.loading = true;
        },
        '$store.state.app.animationsCloseCount': function(val) {
            this.loading = false;
-        }
-    },
-    created() {
-        const project = getSessionStorage('project');
-        if (project) {
-            document.querySelector("link[rel*='icon']").href = loginInfo[project].linkIcon || ProjectIcon[project];
+        },
+        '$route': function(val) {
+            if (val.path == '/display/demon' && val.query.client == 'diagramEdit') { // 运行图编制
+                this.loading = false;
+            }
+            if (this.$route.query.project || this.$route.path === '/login' || this.$route.path === '/') {
+                setSessionStorage('project', this.$route.query.project || 'login');
+            }
+            this.project = getSessionStorage('project');
+            if (this.project !== this.$store.state.projectConfig.markKey) {
+                this.initFrontProjectConfig();
+            }
+        },
+        '$store.state.projectConfig.markKey': function(val) {
+            if (val) { this.loadingComponent = true; }
        }
    },
    mounted() {
        this.prohibitSystemContextMenu();
-
        window.addEventListener('beforeunload', async e => {
            if (!this.$route.query.noPreLogout) {
                await this.$store.dispatch('preLogout');
            }
        });
+        window.addEventListener('storage', e => {
+            if (this.$route.path.includes('trainingDesign') || this.$route.path.includes('trainingPreview')) {
+                if (e.key == getUserIdKey('nextNew')) {
+                    const operate = JSON.parse(e.newValue);
+                    this.$store.dispatch('trainingNew/next', operate);
+                }
+            }
+
+        });
        this.$nextTick(() => {
-            this.subscribe();
            openIndexedDB();
        });
    },
+    beforeDestroy() {
+        this.$store.dispatch('subscribe_un', {});
+    },
    methods: {
+        initFrontProjectConfig() {
+            getFrontProjectConfigByLogin(this.project).then(resp => {
+                const urlData = handlerUrl();
+                const { baseApiUrl, baseSite, ossUrl, loginProLogo, browserTitle} = resp.data.viewSetting;
+                this.$store.dispatch('setBaseUrl', baseApiUrl || urlData.BASE_API);
+                this.$store.dispatch('setBaseSite', baseSite || urlData.BASE_SITE);
+                this.$store.dispatch('setOssUrl', ossUrl || urlData.OSS_URL);
+                this.$store.dispatch('projectConfig/setMarkKey', resp.data.markKey);
+                this.$store.dispatch('projectConfig/setProjectCode', resp.data.project);
+                this.$store.dispatch('projectConfig/setViewSetting', resp.data.viewSetting);
+                document.title = browserTitle;
+                if (loginProLogo) {
+                    document.querySelector("link[rel*='icon']").href = (ossUrl || urlData.OSS_URL) + '/logo/' + loginProLogo;
+                }
+            }).catch(e => this.$message.error('获取配置数据失败！'));
+        },
+        quickEntry() {
+            this.$refs.deomonList.doShow();
+        },
+        qcodeEntry() {
+            this.$refs.qcode.doShow();
+        },
        resizeHandler() {
            this.$store.dispatch('app/resize', { width: this._clientWidth, height: this._clientHeight });
        },
@ -86,28 +150,28 @@ export default {
            window.document.oncontextmenu = function () {
                return false;
            };
-        },
-        subscribeMessage(res) {
-            if (this.$refs.deomonTopic && !window.location.href.includes('trainroom')) {
-                if (!(getSessionStorage('project').includes('design'))) {
-                    this.$refs.deomonTopic.doShow(res);
-                }
-                this.$store.dispatch('socket/setSimulationInvite');
-                this.$store.dispatch('socket/setRoomInvite');
-            }
-        },
-        subscribe() {
-            const token = getToken();
-            const path = window.location.pathname;
-            if (token && this.$route.path != '/404' && !path.endsWith('login')) {
-                const header = { group: '', 'X-Token': token };
-                this.$store.dispatch('subscribe', {header, type: getSessionStorage('project')});
-            }
        }
    }
 };

 </script>
 <style lang="scss" scoped>
-.AppAll{position: absolute;top: 0;left: 0;width: 100%;height: 100%;z-index: 2003}
+.AppAll{position: absolute;top: 0;left: 0;width: 100%;height: 100%;z-index: 3003}
+	.centerImg {
+		position: absolute;
+		left:50%;
+		top: 50%;
+		width: 480px;
+		height: 456px;
+		margin-left: -240px;
+		margin-top: -228px;
+	}
+	.CompanyIcon{
+		position: absolute;
+		z-index: 3000;
+		left: 50%;
+		margin-left: -60px;
+		width: 120px;
+		top: 30px;
+	}
 </style>
--- a/src/api/assist.js
+++ b/src/api/assist.js
@ -0,0 +1,36 @@
+import request from '@/utils/request';
+
+// 查询指示灯关联信息列表
+export function queryAssistListPaged(params, mapId) {
+	return request({
+		// url: `/api/assist/indicator/section/list/${mapId}`,
+		url: `/api/station/direction/list/${mapId}`,
+		method: 'get',
+		params
+	});
+}
+// 根据id查询单个指示灯关联信息
+export function queryAssistById(mapId){
+	return request({
+		// url: `/api/assist/indicator/section/${id}`,
+		url: `/api/station/direction/${mapId}`,
+		method: 'get'
+	})
+}
+// 保存或更新指示灯关联信息
+export function saveAssist(data, mapId) {
+	return request({
+		// url: `/api/assist/indicator/section/save/${mapId}`,
+		url: `/api/station/direction/save/${mapId}`,
+		method: 'post',
+		data
+	})
+}
+// 删除指示灯关联关系
+export function deleteAssist(id) {
+	return request({
+		// url: `/api/assist/indicator/section/delete/${id}`,
+		url: `/api/station/direction/delete/${id}`,
+		method: 'delete'
+	})
+}
--- a/src/api/audioResources.js
+++ b/src/api/audioResources.js
@ -0,0 +1,57 @@
+import request from '@/utils/request';
+
+// 创建音频资源
+export function createAudioResources(data) {
+    return request({
+        url: `/api/audioResources`,
+        method: 'post',
+        data
+    });
+}
+// 查询所有音频资源
+export function queryAllAudioResources() {
+    return request({
+        url: `/api/audioResources/list`,
+        method: 'get'
+    });
+}
+// 删除音频资源
+export function deleteAudioResources(id) {
+    return request({
+        url: `/api/audioResources/${id}`,
+        method: 'delete'
+    });
+}
+// 更新音频资源
+export function updateAudioResources(id, data) {
+    return request({
+        url: `/api/audioResources/${id}`,
+        method: 'put',
+        data
+    });
+}
+// 分页查询音频资源
+export function pagedAudioResources(params) {
+    return request({
+        url: `/api/audioResources/paged`,
+        method: 'get',
+        params
+    });
+}
+// 上传音频文件
+export function uploadAudio(file) {
+    return request({
+        url: `/api/upload/AUDIO?appId=00001&appSecret=joylink00001`,
+        method: 'post',
+        data: file,
+        upload: true
+    });
+}
+// 生成音频文件
+export function generateAudio(data) {
+    return request({
+        url: `/api/audioResources/generate`,
+        method: 'post',
+        data
+    });
+}
--- a/src/api/authorityTransfer.js
+++ b/src/api/authorityTransfer.js
@ -0,0 +1,53 @@
+
+import request from '@/utils/request';
+
+/** 创建权限分发*/
+export function createDistribute(data) {
+    return request({
+        url: `/api/v3/permission/distribute/create`,
+        method: 'post',
+        data
+    });
+}
+
+/** 分页获取权限分发列表*/
+export function getDistributeList(data) {
+    return request({
+        url: `/api/v3/permission/distribute/paging`,
+        method: 'post',
+        data
+    });
+}
+
+// /** 设置权限分发立即失效*/
+// export function setDistributeInvalidate(pdId) {
+//     return request({
+//         url: `/api/v2/permission/distribute/${pdId}/invalidate`,
+//         method: 'put'
+//     });
+// }
+
+/** 获取权限分发明细*/
+export function getDistributeDetail(disId) {
+    return request({
+        url: `/api/v3/permission/distribute/list/distribute/${disId}`,
+        method: 'get'
+    });
+}
+
+/** 从权限分发，直接分发给指定主体*/
+export function setDistributeToSubject(pdId, subjectType, subjectId) {
+    return request({
+        url: `/api/v3/permission/distribute/${pdId}/to/${subjectType}/${subjectId}`,
+        method: 'post'
+    });
+}
+
+/** 生成分发二维码*/
+export function getDistributeQrCode(pdId) {
+    return request({
+        url: `/api/v3/permission/distribute/${pdId}/qrCode`,
+        method: 'get'
+    });
+}
+
--- a/src/api/chat.js
+++ b/src/api/chat.js
@ -61,3 +61,19 @@ export function sendConversationText (group, id, data) {
        data
    });
 }
+/** 发送会话语音(新接口) */
+export function sendChatAudioBase64 (group, data) {
+    return request({
+        url: `/simulation/${group}/operate/Conversation_Chat_Audio_Base64`,
+        method: 'post',
+        data
+    });
+}
+/** 发送会话文字(新接口) */
+export function sendChatText (group, data) {
+    return request({
+        url: `/simulation/${group}/operate/Conversation_Chat_Text`,
+        method: 'post',
+        data
+    });
+}
--- a/src/api/circuitryDraft.js
+++ b/src/api/circuitryDraft.js
@ -1,50 +0,0 @@
-import request from '@/utils/request';
-
-/** 查询用户所有电路数据 */
-export function queryCircuitryDraftList() {
-    return request({
-        url: `/api/circuitryDraft/list/users`,
-        method: 'get'
-    });
-}
-
-/** 分页查询用户电路数据 */
-export function queryCircuitryDraftListPaging(params) {
-    return request({
-        url: `/api/circuitryDraft/page/users`,
-        method: 'get',
-        params
-    });
-}
-
-/** 根据id获取数据 */
-export function getCircuitryDraftDataById(id) {
-    return request({
-        url: `/api/circuitryDraft/${id}`,
-        method: 'get'
-    });
-}
-
-/** 创建草稿 */
-export function createCircuitryDraft(data) {
-    return request({
-        url: `/api/circuitryDraft`,
-        method: 'post',
-        data
-    });
-}
-/** 更新草稿数据 */
-export function updateCircuitryDraft(id, data) {
-    return request({
-        url: `/api/circuitryDraft/${id}/data`,
-        method: 'put',
-        data
-    });
-}
-/** 删除草稿 */
-export function deleteCircuitryDarft(id) {
-    return request({
-        url: `/api/circuitryDraft/${id}`,
-        method: 'delete'
-    });
-}
--- a/src/api/company.js
+++ b/src/api/company.js
@ -309,3 +309,10 @@ export function getUserDuration(params) {
        params
    });
 }
+/** 获取单位二维码 */
+export function getCompanyQrCode(orgId) {
+    return request({
+        url: `/api/company/${orgId}/qrCode`,
+        method: 'get'
+    });
+}
--- a/src/api/contest.js
+++ b/src/api/contest.js
@ -0,0 +1,416 @@
+import request from '@/utils/request';
+
+/**
+ * 获取竞赛试卷分页列表
+ * @param {Object} params
+ * @param {String} params.name 试卷名称
+ */
+export function getPaperList(params) {
+    return request({
+        url: '/api/exercise/race/paper/page',
+        method: 'GET',
+        params
+    });
+}
+
+/**
+ * 创建试卷
+ * @param {Object} data
+ * @param {String} data.name 试卷名称
+ * @param {String} data.desc 基础描述
+ * @param {Number} data.seasonId 所属赛季id
+ * @param {Boolean} data.supportCopy 是否支持拷贝
+ */
+export function createPaper(data) {
+    return request({
+        url: '/api/exercise/race/paper',
+        method: 'POST',
+        data
+    });
+}
+
+/** 修改试卷
+ * @param {Object} data  同创建试卷
+ * @param {Number} id 试卷id
+ */
+export function editPaper(id, data) {
+    return request({
+        url: `/api/exercise/race/paper/${id}`,
+        method: 'POST',
+        data
+    });
+}
+
+/** 删除指定试卷
+ * @param {Number} id 任务id
+ */
+export function deletePaper(id) {
+    return request({
+        url: `/api/exercise/race/paper/${id}`,
+        method: 'DELETE'
+    });
+}
+
+/**
+ * 获取竞赛试卷菜单
+ * @param {Object} params
+ * @param {String} params.group 分组ZZ=中职;GZ=高职
+ */
+export function getPaperMenu(params) {
+    return request({
+        url: '/api/exercise/race/paper/menu',
+        method: 'GET',
+        params
+    });
+}
+
+/** 模块修改任务设置
+ * @param {Object} data
+ * @param {Array} data.modules 所有模块
+ * @param {Number} data.modules[i].module_name 模块名字
+ * @param {Number} data.modules[i].duration 考试总时间
+ * @param {Number} data.modules[i].group 任务分组
+ * @param {Number} data.modules[i].group.taskIds 此分组中的任务id
+ * @param {Number} data.modules[i].group.name 此组的名字
+ * @param {Number} data.modules[i].group.group 此分组的子分组
+ */
+export function paperModuleTaskSetting(paperId, data) {
+    return request({
+        url: `/api/exercise/race/paper/${paperId}/config`,
+        method: 'POST',
+        data
+    });
+}
+
+/** 查看试卷明细
+ * @param {Number} id 模块id
+ */
+export function getPaperDetail(id) {
+    return request({
+        url: `/api/exercise/race/paper/${id}`,
+        method: 'GET'
+    });
+}
+
+/** 试卷拷贝
+ * @param {Number} id 模块id
+ */
+export function copyPaper(id) {
+    console.log(id);
+    return request({
+        url: `/api/exercise/race/paper/${id}/copy`,
+        method: 'PUT'
+    });
+}
+
+/** 查看所有任务数据 */
+export function getTaskTreeDatas() {
+    return request({
+        url: '/api/exercise/race/task/tree',
+        method: 'GET'
+    });
+}
+
+/**
+ * 创建任务
+ * @param {Object} data
+ * @param {String} data.name 任务名称
+ * @param {String} data.desc 基础描述
+ * @param {String} data.content 考核内容
+ * @param {String} data.standards 评价标准
+ * @param {Number} data.parentId 如果是子任务，需要父任务的id
+ */
+export function createTask(data) {
+    return request({
+        url: '/api/exercise/race/task',
+        method: 'POST',
+        data
+    });
+}
+
+/** 修改指定任务
+ * @param {Object} data  同创建任务
+ * @param {Number} id 任务id
+ */
+export function editTask(id, data) {
+    return request({
+        url: `/api/exercise/race/task/${id}`,
+        method: 'POST',
+        data
+    });
+}
+
+/** 删除指定任务
+ * @param {Number} id 任务id
+ */
+export function deleteTask(id) {
+    return request({
+        url: `/api/exercise/race/task/${id}`,
+        method: 'DELETE'
+    });
+}
+
+/** 查看任务详情
+ * @param {Number} id 任务id
+ */
+export function getTaskDetail(id) {
+    return request({
+        url: `/api/exercise/race/task/${id}`,
+        method: 'GET'
+    });
+}
+
+/** 查看指定子任务
+ * @param {Number} id 任务id
+ */
+export function getchildrenTaskDatas(id) {
+    return request({
+        url: `/api/exercise/race/task/${id}/children`,
+        method: 'GET'
+    });
+}
+
+/** 任务绑定
+ * @param {Array} data
+ * @param {Number} taskId 任务id
+ * @param {Number} data[i].bindId 绑定id，根据bindtype来区分对应的id
+ * @param {String} data[i].bindType rule =0评分规则;scene=1场景
+ * @param {Number} data[i].status 0=绑定 ；1=解绑
+ */
+export function bindTask(taskId, data) {
+    return request({
+        url: `/api/exercise/race/task/${taskId}/bind`,
+        method: 'POST',
+        data
+    });
+}
+/** 竞赛赛季添加
+ * @param {Object} data
+ * @param {Number} data.group 分组 1-高职 2中职
+ * @param {String} data.term 赛季
+ * @param {String} data.code 编号
+ */
+export function addContestSeason(data) {
+    return request({
+        url: '/api/exercise/race/season',
+        method: 'post',
+        data
+    });
+}
+/** 竞赛赛季分页查询
+ * @param {Object} params
+ * @param {Number} params.group 分组 1-高职 2中职
+ * @param {String} params.term 赛季
+ * @param {String} params.code 编号
+ */
+export function queryContestSeasonPaged(params) {
+    return request({
+        url: '/api/exercise/race/season/page',
+        method: 'get',
+        params
+    });
+}
+/** 竞赛赛季修改
+ * @param {Object} data
+ * @param {Number} id 赛季id
+ * @param {String} data.group 分组 ZZ=中职；GZ=高职
+ * @param {String} data.term 赛季
+ * @param {String} data.code 编号
+ */
+export function updateContestSeason(id, data) {
+    return request({
+        url: `/api/exercise/race/season/${id}`,
+        method: 'post',
+        data
+    });
+}
+/** 竞赛赛季删除
+ * @param {Number} id 赛季id
+ */
+export function deleteContestSeason(id) {
+    return request({
+        url: `/api/exercise/race/season/${id}`,
+        method: 'delete'
+    });
+}
+/** 竞赛评分创建基本信息
+ * @param {Object} data
+ * @param {String} data.name 名称
+ */
+export function createContextScore(data) {
+    return request({
+        url: '/api/exercise/race/score',
+        method: 'post',
+        data
+    });
+}
+/** 竞赛评分列表分页
+ * @param {Object} params
+ * @param {String} params.name 名称
+ */
+export function queryContextScorePaged(params) {
+    return request({
+        url: '/api/exercise/race/score/page',
+        method: 'get',
+        params
+    });
+}
+/** 竞赛评分删除
+ * @param {Number} id 评分id
+ */
+export function deleteContextScore(id) {
+    return request({
+        url: `/api/exercise/race/score/${id}`,
+        method: 'delete'
+    });
+}
+/** 竞赛评分修改评分详情内容
+ * @param {Number} id 评分id
+ * @param {Object} data
+ * @param {Array [object]} data.units 评分单元
+ * @param {String} data.units[0].text 文字描述
+ * @param {Number} data.units[0].sceneStepId 场景步骤ID
+ * @param {Number} data.units[0].score 分值
+ * @param {String} data.units[0].worker 作业程序
+ * @param {String} data.units[0].criteria 评分标准
+ */
+export function updateContextScoreDetail(id, data) {
+    return request({
+        url: `/api/exercise/race/score/edit/rule/${id}`,
+        method: 'post',
+        data
+    });
+}
+/** 竞赛评分详情
+ * @param {Number} id 评分id
+ */
+export function getContextScoreDetail(id) {
+    return request({
+        url: `/api/exercise/race/score/${id}`,
+        method: 'get'
+    });
+}
+/** 竞赛场景分页查询
+ *  @param {Object} params
+ * @param {String} params.type  竞赛类型 local=场景;link=3D
+ */
+export function queryContestSencePaged(params) {
+    return request({
+        url: '/api/exercise/race/scene/page',
+        method: 'get',
+        params
+    });
+}
+/** 竞赛场景删除
+ * @param {Number} id 场景id
+ */
+export function deleteContestSence(id) {
+    return request({
+        url: `/api/exercise/race/scene/${id}`,
+        method: 'delete'
+    });
+}
+/** 竞赛场景详情
+ * @param {Number} id 场景id
+ */
+export function getContextSenceDetail(id) {
+    return request({
+        url: `/api/exercise/race/scene/${id}`,
+        method: 'get'
+    });
+}
+/** 实训场景发布到大赛场景
+ * @param {Object} data
+ *  @param {Number} data.traningPublishId 草稿实训场景id
+ *  @param {String} data.name 大赛场景名称
+ */
+export function publishContextSence(data) {
+    return request({
+        url: `/api/exercise/race/scene/publish/training`,
+        method: 'post',
+        data
+    });
+}
+
+/** 场景视频保存
+ * @param {Object} data
+ *  @param {String} data.name 场景名称
+ *  @param {String} data.type Video=视频
+ *  @param {Object} data.scene 大赛场景
+ *  @param {String} data.scene.url 地址
+ *  @param {String} data.scene.fileName 文件名
+ */
+export function saveSceneVideo(data) {
+    return request({
+        url: `/api/exercise/race/scene/custom/edit`,
+        method: 'post',
+        data
+    });
+}
+
+/** 场景视频编辑 */
+export function editSceneVideo(sceneId, data) {
+    return request({
+        url: `/api/exercise/race/scene/custom/${sceneId}/edit`,
+        method: 'post',
+        data
+    });
+}
+
+/** 竞赛试卷测试模块任务集合
+ * 	@param {String} paperId 试卷id
+ * 	@param {String} moduleId 模块id
+ */
+export function getTaskTree(paperId, moduleId) {
+    return request({
+        url: `/api/exercise/race/paper/${paperId}/module/${moduleId}/task`,
+        method: 'get'
+    });
+}
+
+/** 竞赛开始训练
+ * 	@param {String} paperId 试卷id
+ * 	@param {String} moduleId 模块id
+ */
+export function beginContestExercise(paperId, moduleId) {
+    return request({
+        url: `/api/race/${paperId}/${moduleId}`,
+        method: 'POST'
+    });
+}
+
+/** 竞赛完成训练 */
+export function finishContestExercise() {
+    return request({
+        url: '/api/race/finish',
+        method: 'PUT'
+    });
+}
+
+/** 竞赛赛季html内容编辑
+* 	@param {String} id 赛季id
+* 	@param {String} data.htmlContent 内容
+*/
+export function editSeasonContent(id, data) {
+    return request({
+        url: `/api/exercise/race/season/${id}/html`,
+        method: 'post',
+        data
+    });
+}
+/** 竞赛赛季html内容获取
+ * @param {String} id 赛季id
+*/
+export function getSeasonContent(id) {
+    return request({
+        url: `/api/exercise/race/season/${id}/html`,
+        method: 'get'
+    });
+}
+
+export function getTheoryList() {
+    return request({
+        url: '/api/exercise/race/paper/questions',
+        method: 'get'
+    });
+}
--- a/src/api/disStation.js
+++ b/src/api/disStation.js
@ -0,0 +1,40 @@
+import request from '@/utils/request';
+
+// 创建调度台逻辑数据
+export function createDisStation(mapId, data) {
+    return request({
+        url: `/api/draftMap/${mapId}/disStation`,
+        method: 'post',
+        data
+    });
+}
+// 更新调度台逻辑数据
+export function updateDisStation(mapId, data) {
+    return request({
+        url: `/api/draftMap/${mapId}/disStation`,
+        method: 'put',
+        data
+    });
+}
+// 删除调度台逻辑数据
+export function deleteDisStation(mapId, code) {
+    return request({
+        url: `/api/draftMap/${mapId}/disStation/${code}`,
+        method: 'delete'
+    });
+}
+// 获取调度台逻辑数据
+export function getDisStationListPaged(mapId, data) {
+    return request({
+        url: `/api/draftMap/${mapId}/disStation/page`,
+        method: 'post',
+        data
+    });
+}
+/** 查询调度台列表 */
+export function getDisStationList(mapId) {
+    return request({
+        url: `api/draftMap/${mapId}/disStation/list`,
+        method: 'get'
+    });
+}
--- a/src/api/functionManage.js
+++ b/src/api/functionManage.js
@ -0,0 +1,26 @@
+import request from '@/utils/request';
+
+// 分页查询权限功能的基本信息
+export function getAbilityPage(data) {
+    return request({
+        url: `/api/v2/permission/system/ability/page`,
+        method: 'post',
+        data
+    });
+}
+
+// 自动生成
+export function autoCreate() {
+    return request({
+        url: `/api/v2/permission/system/ability/autoCreate`,
+        method: 'get'
+    });
+}
+
+// 获取所有功能
+export function getAllAbility() {
+    return request({
+        url: `/api/v2/permission/system/ability/list`,
+        method: 'get'
+    });
+}
--- a/src/api/iscs.js
+++ b/src/api/iscs.js
@ -49,3 +49,116 @@ export function queryHasIscs(params) {
        params
    });
 }
+// iscs设备创建
+export function createIscsDevcie(data) {
+    return request({
+        url: `/api/iscsDevice`,
+        method: 'post',
+        data
+    });
+}
+// 查询所有iscs设备
+export function queryAllIscsDevice() {
+    return request({
+        url: `/api/iscsDevice/all`,
+        method: 'get'
+    });
+}
+// 根据id查询iscs设备
+export function queryIscsDevcieById(id) {
+    return request({
+        url:
+			`/api/iscsDevice/${id}`,
+        method: 'get'
+    });
+}
+// 根据mapId获取Iscs设备list
+export function queryIscsDeviceListByMapId(mapId) {
+    return request({
+        url: `/api/iscsDevice/list/mapId/${mapId}`,
+        method: 'get'
+    });
+}
+// 分页查询ISCS设备
+export function pagedIscsDevice(params) {
+    return request({
+        url: `/api/iscsDevice/paged`,
+        method: 'get',
+        params
+    });
+}
+// 删除ISCS设备
+export function deleteIscsDevice(id) {
+    return request({
+        url: `/api/iscsDevice/${id}`,
+        method: 'delete'
+    });
+}
+// 根据mapId查询设备列表
+export function getIscsDeviceListByMapId(mapId) {
+    return request({
+        url: `/api/iscsDevice/list/mapId/${mapId}`,
+        method: 'get'
+    });
+}
+// 根据条件查询设备列表
+export function queryIscsDeviceCod(params) {
+    return request({
+        url: `/api/iscsDevice/list/criteria`,
+        method: 'get',
+        params
+    });
+}
+// 批量创建ISCS设备
+export function batchCreateIscsDevcie(data) {
+    return request({
+        url: `/api/iscsDevice/create/batch`,
+        method: 'post',
+        data
+    });
+}
+// 创建ISCS系统资源
+export function createIscsResources(data) {
+    return request({
+        url: `/api/systemRes`,
+        method: 'post',
+        data
+    });
+}
+// 查询所有ISCS系统资源
+export function queryAllIscsResources() {
+    return request({
+        url: `/api/systemRes/all`,
+        method: 'get'
+    });
+}
+// 根据id查询ISCS系统资源
+export function queryIscsResourcesById(id) {
+    return request({
+        url: `/api/systemRes/${id}`,
+        method: 'get'
+    });
+}
+// 分页查询ISCS系统资源
+export function pagedIscsResources(params) {
+    return request({
+        url: `/api/systemRes/paged`,
+        method: 'get',
+        params
+    });
+}
+// 删除ISCS系统资源
+export function deleteIscsResources(id) {
+    return request({
+        url: `/api/systemRes/${id}`,
+        method: 'delete'
+    });
+}
+// 按条件查询ISCS系统资源
+export function queryIscsResourcesCod(params) {
+    return request({
+        url: `/api/systemRes/list/criteria`,
+        method: 'get',
+        params
+    });
+}
--- a/src/api/jlmap3d/assets3d.js
+++ b/src/api/jlmap3d/assets3d.js
@ -1,13 +1,11 @@
 import request from '@/utils/request';
-
+import store from '@/store/index';
 const publicPath = process.env.VUE_APP_PRO == 'local' ? '' : '/cbtc';

 export const JL3D_LOCAL_STATIC = publicPath+"/static";
-const BASE_UPLOAD_API = process.env.VUE_APP_UPLOAD_API;
-export const BASE_ASSET_API = process.env.VUE_APP_VOICE_API;
-// console.log(JL3D_LOCAL_STATIC);
-// console.log(BASE_UPLOAD_API);
-// console.log(BASE_ASSET_API);
+const BASE_UPLOAD_API = store.state.user.uploadUrl;
+// export const BASE_ASSET_API = store.state.user.resourcesUrl;
+export const BASE_ASSET_API = store.state.user.ossUrl;

 export function getUploadModelUrl() {
 	return (BASE_UPLOAD_API+"/api/upload/MODEL?appId=00001&appSecret=joylink00001");
--- a/src/api/jlmap3d/load3ddata.js
+++ b/src/api/jlmap3d/load3ddata.js
@ -2,85 +2,85 @@ import request from '@/utils/request';

 /** 根据皮肤获取地图版本信息*/
 export function getPublishMapVersion(id) {
-	return request({
-		url: `/api/map/${id}/version`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/map/${id}/version`,
+        method: 'get'
+    });
 }

 /** 根据皮肤获取发布地图详细内容*/
 export function getPublishMapDetail(id) {
-	const datad = request({
-		url: `/api/map/${id}/graphData`,
-		method: 'get'
-	});
-	return datad.then();
+    const datad = request({
+        url: `/api/map/${id}/graphData`,
+        method: 'get'
+    });
+    return datad.then();
 }

 /** 根据地图id获取地图信息*/
 export function getPublishMapInfo(mapId) {
-	return request({
-		url: `/api/map/${mapId}`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/map/${mapId}`,
+        method: 'get'
+    });
 }

 /** 获取草稿地图详细内容*/
 export function getMapDetail(id) {
-	return request({
-		url: `/api/mapBuild/${id}/mapDataDetail`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/mapBuild/${id}/mapDataDetail`,
+        method: 'get'
+    });
 }

 /** 创建地图3d数据*/
 export function set3dMapData(data) {
-	return request({
-		url: `/api/mapBuild/3dMapData`,
-		method: 'post',
-		data: data
-	});
+    return request({
+        url: `/api/mapBuild/3dMapData`,
+        method: 'post',
+        data: data
+    });
 }

 /** 通过地图id获取地图3d数据*/
 export function get3dMapData(mapId) {
-	return request({
-		url: `/api/mapBuild/3dMapData/${mapId}`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/mapBuild/3dMapData/${mapId}`,
+        method: 'get'
+    });
 }

 /** 更新地图3d数据*/
 export function update3dMapData(data) {
-	return request({
-		url: `/api/mapBuild/3dMapData/${data.id}`,
-		method: 'put',
-		data: data
-	});
+    return request({
+        url: `/api/mapBuild/3dMapData/${data.id}`,
+        method: 'put',
+        data: data
+    });
 }

 /** 获取模型资源列表*/
 export function loadmap3dModel() {
-	return request({
-		url: `/api/map3dModel/all`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/map3dModel/all`,
+        method: 'get'
+    });
 }
 export function getPublish3dMapDetail(id) {
-	const datad = request({
-		url: `/api/map/${id}/3dMapData`,
-		method: 'get'
-	});
-	return datad.then();
+    const datad = request({
+        url: `/api/map/${id}/3dMapData`,
+        method: 'get'
+    });
+    return datad.then();
 }

 /** 录制托管*/
-export function tuoguan3ddrive(group,data) {
-	return request({
-		url: `/api/scriptSimulation/${group}/trust`,
-		method: 'put',
-		data: data
-	});
+export function tuoguan3ddrive(group, data) {
+    return request({
+        url: `/api/scriptSimulation/${group}/trust`,
+        method: 'put',
+        data: data
+    });
 }

 /** 三维设备故障钩锁操作*/
@ -101,33 +101,33 @@ export function saveStationManagerData(data) {
    });
 }
 // 更新数据
-export function updateStationManagerData(id,data) {
-	return request({
-		url: `/api/pfp/${id}`,
-		method: 'put',
-		data: data
-	});
+export function updateStationManagerData(id, data) {
+    return request({
+        url: `/api/pfp/${id}`,
+        method: 'put',
+        data: data
+    });
 }
 // 查询数据列表
 export function getStationManagerDataList() {
-	const datad = request({
-		url: `/api/pfp/list`,
-		method: 'get'
-	});
-	return datad.then();
+    const datad = request({
+        url: `/api/pfp/list`,
+        method: 'get'
+    });
+    return datad.then();
 }
 // 查询数据
 export function getStationManagerData(id) {
-	const datad = request({
-		url: `/api/pfp/${id}`,
-		method: 'get'
-	});
-	return datad.then();
+    const datad = request({
+        url: `/api/pfp/${id}`,
+        method: 'get'
+    });
+    return datad.then();
 }
 // 删除数据
 export function deleteStationManagerData(id) {
-	return request({
-		url: `/api/pfp/${id}`,
-		method: 'delete',
-	});
+    return request({
+        url: `/api/pfp/${id}`,
+        method: 'delete'
+    });
 }
--- a/src/api/jmap/lesson3d.js
+++ b/src/api/jmap/lesson3d.js
@ -1,5 +1,5 @@
 import request from '@/utils/request';
-
+//获取三维课程草稿列表
 export function getLesson3dDrftList(params) {
    return request({
        url: `/api/draft3dLesson/paging`,
@ -7,7 +7,7 @@ export function getLesson3dDrftList(params) {
        params: params
    });
 }
-
+//获取三维课程草稿数据
 export function getLesson3dData(lessonId) {
    return request({
        url: `/api/draft3dLesson/${lessonId}`,
@ -15,13 +15,47 @@ export function getLesson3dData(lessonId) {
        params: ''
    });
 }
+//获取三维课程发布数据
+export function getPublishLesson3dData(lessonId) {
+    return request({
+        url: `/api/lesson3d/${lessonId}`,
+        method: 'get',
+        params: ''
+    });
+}
+//上架课程
+export function onlineLesson3d(lessonId) {
+    return request({
+        url: `/api/lesson3d/${lessonId}/online`,
+        method: 'put',
+        params: ''
+    });
+}
+//下架课程
+export function offlineLesson3d(lessonId) {
+    return request({
+        url: `/api/lesson3d/${lessonId}/offline`,
+        method: 'put',
+        params: ''
+    });
+}
+
+export function getSelectLesson3dList(params) {
+    return request({
+        url: `/api/lesson3d/list`,
+        method: 'get',
+        params: params
+    });
+}
+
+

 //查询发布课程
-export function publishedLesson3d() {
+export function publishedLesson3d(params) {
    return request({
        url: `/api/lesson3d/paging`,
        method: 'get',
-        params: ''
+        params: params
    });
 }

@ -39,7 +73,7 @@ export function publishLesson3d(lessonId) {
    return request({
        url: `/api/draft3dLesson/${lessonId}/publish`,
        method: 'post',
-        data: ""
+        data: ''
    });
 }

--- a/src/api/jmap/map.js
+++ b/src/api/jmap/map.js
@ -285,3 +285,47 @@ export function allSimulationCheck() {
        method: 'get'
    });
 }
+/** 根据地图查询仿真成员 */
+export function querySimulationMemberByMapId(id) {
+    return request({
+        url: `/api/map/${id}/memberMap`,
+        method: 'get'
+    });
+}
+
+/** 根据地图查询车站(含车辆段停车场) */
+export function querySimulationStationsByMapId(id) {
+    return request({
+        url: `/api/map/${id}/stations`,
+        method: 'get'
+    });
+}
+/** 根据用户查询地图列表 */
+export function queryMapListByUser() {
+    return request({
+        url: `/api/map/list/online/ofUser`,
+        method: 'get'
+    });
+}
+/** 根据mapId获取客户端信息数据 */
+export function getClientDataById(mapId) {
+    return request({
+        url: `/api/map/${mapId}/mapClientMap`,
+        method: 'get'
+    });
+}
+/** 发布地图根据id生成实训 */
+export function generateTrainingData(data) {
+    return request({
+        url: `/api/v2/training/rule/generate/mapId`,
+        method: 'post',
+        data: data
+    });
+}
+/** 根据mapId获取列车信息 */
+export function getTrainListByMapId(mapId) {
+    return request({
+        url: `/api/map/${mapId}/trains`,
+        method: 'get'
+    });
+}
--- a/src/api/jmap/mapdraft.js
+++ b/src/api/jmap/mapdraft.js
@ -51,6 +51,14 @@ export function deleteMap(data) {
    });
 }

+/** 删除所有草稿地图 */
+export function deleteAllMap() {
+    return request({
+        url: `/api/mapBuild/delete/all`,
+        method: 'delete'
+    });
+}
+
 /** 保存草稿地图*/
 export function saveMap(data) {
    return request({
@ -651,6 +659,15 @@ export function deleteBigRoute(mapId, code) {
    });
 }

+// 大铁地图进路修改接口
+export function editBigRoute(data, mapId, code ) {
+    return request({
+        url: `/api/draftMap/${mapId}/route/${code}`,
+        method: 'put',
+        data
+    });
+}
+
 // 草稿地图修改检查配置接口
 export function checkConfig(mapId, data) {
    return request({
@ -660,3 +677,85 @@ export function checkConfig(mapId, data) {
    });
 }
 // { check: true/false } （body体）
+// 进路数据处理删除扣车
+export function deleteDetain(mapId) {
+    return request({
+        url: `/api/draftMap/${mapId}/route/handle/standHoldList/delete`,
+        method: 'put'
+    });
+}
+// 进路数据处理不办延续保护
+export function noOverlap(mapId) {
+    return request({
+        url: `/api/draftMap/${mapId}/route/handle/setOverlapInCtc/false`,
+        method: 'put'
+    });
+}
+// 创建进路
+export function createRoute(mapId, data) {
+    return request({
+        url: `/api/draftMap/${mapId}/route`,
+        method: 'post',
+        data
+    });
+}
+// 创建延续保护
+export function createOverlap(mapId, data) {
+    return request({
+        url: `/api/draftMap/${mapId}/overlap`,
+        method: 'post',
+        data
+    });
+}
+// 创建超限区段
+export function createOverrunSection(mapId, data) {
+    return request({
+        url: `/api/draftMap/${mapId}/overrun`,
+        method: 'post',
+        data
+    });
+}
+// 分页查询超限区段
+export function queryOverrunSectionPaging(mapId, params) {
+    return request({
+        url: `/api/draftMap/${mapId}/overrun/paging`,
+        method: 'get',
+        params
+    });
+}
+// 更新超限区段
+export function updateOverrunSection(mapId, data) {
+    return request({
+        url: `/api/draftMap/${mapId}/overrun/${data.code}`,
+        method: 'put',
+        data
+    });
+}
+// 删除超限区段
+export function deleteOverrunSection(mapId, code) {
+    return request({
+        url: `/api/draftMap/${mapId}/overrun/${code}`,
+        method: 'delete'
+    });
+}
+// 查询超限区段list
+export function queryOverunSectionList(mapId) {
+    return request({
+        url: `/api/draftMap/${mapId}/overrun/all`,
+        method: 'get'
+    });
+}
+// 自动生成车辆段停车场连锁关系
+export function generateDepotCiData(mapId, stationCode) {
+    return request({
+        url: `/api/mapBuild/${mapId}/ci/generateAndSaveDepot?stationCode=${stationCode}`,
+        method: 'post'
+    });
+}
+// 大铁线路批量生成进路
+export function generateRoute(mapId) {
+    return request({
+        url: `/api/draftMap/${mapId}/route/railway/generate`,
+        method: 'post'
+    });
+}
--- a/src/api/jmap/training.js
+++ b/src/api/jmap/training.js
@ -158,3 +158,118 @@ export function getTrainingTypeAndNumByMapIdAndPrdType(params) {
        params
    });
 }
+/** 已发布实训分页列表 */
+export function getPublishTrainingListPaged(data) {
+    return request({
+        url: `/api/v2/training/published/page`,
+        method: 'post',
+        data
+    });
+}
+/** 已发布实训上架 */
+export function publishTrainingPutOn(data) {
+    return request({
+        url: `/api/v2/training/published/put/on`,
+        method: 'post',
+        data
+    });
+}
+/** 已发布实训下架 */
+export function publishTrainingPutOff(data) {
+    return request({
+        url: `/api/v2/training/published/pull/off`,
+        method: 'post',
+        data
+    });
+}
+/** 已发布实训删除 */
+export function publishTrainingDelete(data) {
+    return request({
+        url: `/api/v2/training/published`,
+        method: 'delete',
+        data
+    });
+}
+/** 查全部组织已发布实训的基础信息 */
+export function getAllPublishTrainingList(params) {
+    return request({
+        url: `/api/v2/training/published/list`,
+        method: 'get',
+        params
+    });
+}
+/** 查询组织已发布实训的基础信息 */
+export function getPublishTrainingListInOrg(data) {
+    return request({
+        url: `/api/v2/training/published/infos`,
+        method: 'post',
+        data
+    });
+}
+/** 查询组织已发布的实训列表 */
+export function getManageTrainingListInOrg(data) {
+    return request({
+        url: `/api/v2/training/published/manage/infos`,
+        method: 'post',
+        data
+    });
+}
+/** 根据实训id查该已发布实训的所有信息 */
+export function getPublishTrainingDetail(trainingId) {
+    return request({
+        url: `/api/v2/training/published/${trainingId}`,
+        method: 'get'
+    });
+}
+/** 加载发布实训 */
+export function loadPublishTraining(group, trainingId) {
+    return request({
+        url: `/api/training2Simulation/${group}/load/${trainingId}`,
+        method: 'post'
+    });
+}
+/** 加载草稿实训 */
+export function loadDraftTraining(group, trainingId) {
+    return request({
+        url: `/api/training2Simulation/${group}/load/draft/${trainingId}`,
+        method: 'post'
+    });
+}
+/** 开始实训 */
+export function startTraining(group, params) {
+    return request({
+        url: `/api/training2Simulation/${group}/start`,
+        method: 'put',
+        params
+    });
+}
+/** 结束实训 */
+export function endTraining(group, data) {
+    return request({
+        url: `/api/training2Simulation/${group}/finish`,
+        method: 'put',
+        data
+    });
+}
+/** 实训完成步骤 */
+export function endTrainingStep(group, stepId) {
+    return request({
+        url: `/api/training2Simulation/${group}/completion/step/${stepId}`,
+        method: 'put'
+    });
+}
+/** 编制剧本的时候加载背景 */
+export function loadTrainingBg(group, trainingId) {
+    return request({
+        url: `/api/training2Simulation/${group}/draw/${trainingId}`,
+        method: 'post'
+    });
+}
+/** 预备开始场景 */
+export function prepareScene(group, params) {
+    return request({
+        url:`/api/training2Simulation/${group}/prepare/start`,
+        method: 'post',
+        params
+    });
+}
--- a/src/api/login.js
+++ b/src/api/login.js
@ -93,3 +93,33 @@ export function getLoginInfo(token) {
        }
    });
 }
+
+/**
+ * 获取用户所属组织列表
+ */
+export function getOrgList() {
+    return request({
+        url: '/api/orgProject/list',
+        method: 'get'
+    });
+}
+
+/**
+ * 登入组织
+ */
+export function selectOrgnization(orgId) {
+    return request({
+        url: `/api/orgProject/signIn/${orgId}`,
+        method: 'put'
+    });
+}
+
+/**
+ * 获取用户已经加入的仿真
+ */
+export function getSimulationJoined() {
+    return request({
+        url: '/simulation/joined/by/me',
+        method: 'get'
+    });
+}
--- a/src/api/management/exam.js
+++ b/src/api/management/exam.js
@ -90,3 +90,267 @@ export function getExamListByMapIdAndPrdType(mapId, prdType) {
        params: { prdType: prdType }
    });
 }
+/** 更新试卷规则 */
+export function updateExamRule(data) {
+    return request({
+        url: `/api/exam/update/rules`,
+        method: 'put',
+        data: data
+    });
+}
+/** 检查并更新【规则数据异常】状态 */
+export function checkAndUpdateAbnormal(mapId) {
+    return request({
+        url: `/api/exam/checkAndUpdateAbnormal/${mapId}`,
+        method: 'put'
+    });
+}
+/** 重新生成考试规则 */
+export function regenerateRule(mapId) {
+    return request({
+        url: `/api/exam/regenerateRules/${mapId}`,
+        method: 'put'
+    });
+}
+
+/**
+ * ============================================================================
+ * ============================================================================
+ * ============================= 以下为新版试卷的接口 ============================
+ * ============================================================================
+ * ============================================================================
+ */
+
+/**
+ * LIST -
+ * 根据试卷蓝图名称简介分页查找某个组织的试卷蓝图
+ * @param {Object} data
+ * @param {Number} data.orgId 组织ID
+ * @param {String} data.name 试卷蓝图名称
+ * @param {String} data.profile 试卷蓝图简介
+ * @param {Number} data.findState 状态: (All(1)-所有,Editing(2)-正在编辑的,CanUse(3)-可以用于生成试卷的,Locked(4)-封存,Used(5)-已经被使用过)
+ * @param {Number} data.orderBy 排序依据: (1--创建时间 2--更新时间 3--名称；默认值为1)
+ */
+export function getPapaerListOfOrg({ orgId, ...data }) {
+    return request({
+        url: `/api/v2/paper/composition/find/page/for/${orgId}`,
+        method: 'POST',
+        data
+    });
+}
+
+export function getAllPapaerListOfOrg({ ...data }) {
+    // 全部组织
+    return request({
+        url: `/api/v2/paper/composition/manage/paging`,
+        method: 'POST',
+        data
+    });
+}
+
+/**
+ * 创建试卷蓝图
+ * @param {Object} data
+ * @param {Number} data.orgId 组织ID
+ * @param {String} data.name 试卷蓝图名称
+ * @param {String} data.profile 简介
+ * @param {String} data.startTime 启用起始时间
+ * @param {String} data.endTime 启用截止时间
+ * @param {Number} data.validDuration 考试时长
+ * @param {String} data.passScore 及格分
+ * @param {String} data.fullScore 满分
+ * @param {Object} data.ruleList 规则列表
+ * @param {Object} data.ruleList.id 规则id
+ * @param {Object} data.ruleList.pcId 试卷蓝图ID
+ * @param {Object} data.ruleList.type 试题类型
+ * @param {Object} data.ruleList.subtype 规则类型
+ * @param {Object} data.ruleList.tags 标签
+ * @param {Object} data.ruleList.amount 数量
+ * @param {Object} data.ruleList.score 每题分值
+ */
+export function createPaper(data) {
+    return request({
+        url: `/api/v2/paper/composition/${data.orgId}`,
+        method: 'POST',
+        data
+    });
+}
+
+/** 修改试卷蓝图基本信息
+ * @param {Object} data
+ * @param {Number} data.id 试卷蓝图ID
+ * @param {Number} data.orgId 组织ID
+ * @param {String} data.name 试卷蓝图名称
+ * @param {String} data.profile 简介
+ * @param {String} data.startTime 启用起始时间
+ * @param {String} data.endTime 启用截止时间
+ * @param {Number} data.validDuration 考试时长
+ * @param {String} data.passScore 及格分
+ * @param {String} data.fullScore 满分
+ * @param {Object} data.ruleList 规则列表
+ * @param {Object} data.ruleList.id 规则id
+ * @param {Object} data.ruleList.pcId 试卷蓝图ID
+ * @param {Object} data.ruleList.type 试题类型
+ * @param {Object} data.ruleList.subtype 规则类型
+ * @param {Object} data.ruleList.tags 标签
+ * @param {Object} data.ruleList.amount 数量
+ * @param {Object} data.ruleList.score 每题分值
+ */
+export function editPaper(data) {
+    return request({
+        url: `/api/v2/paper/composition`,
+        method: 'PUT',
+        data
+    });
+}
+
+/** 获取试卷完整的蓝图，包括规则
+ * @param {Number} pcId 试卷蓝图ID
+ */
+export function getPaperDetail(pcId) {
+    return request({
+        url: `/api/v2/paper/composition/${pcId}`,
+        method: 'GET'
+    });
+}
+
+/** 查询组织下各类型题的数量
+ * @param {Object} data
+ * @param {Number} data.orgId
+ * @param {Number} data.subtype
+ * @param {Array<String>} data.tags
+ */
+export function getQuestionAmount(data) {
+    return request({
+        url: `/api/v2/paper/question/count`,
+        method: 'POST',
+        data
+    });
+}
+
+/** 试卷蓝图封存
+ * @param {Number} pcId 试卷蓝图Id
+ */
+export function lockPaper(pcId) {
+    return request({
+        url: `/api/v2/paper/composition/${pcId}/lock`,
+        method: 'PUT'
+    });
+}
+
+/** 试卷蓝图
+ * @param {Number} pcId 试卷蓝图Id
+ */
+export function invalidPaper(pcId) {
+    return request({
+        url: `/api/v2/paper/composition/${pcId}/invalid`,
+        method: 'PUT'
+    });
+}
+
+/** 试卷蓝图删除
+ * @param {Number} pcId 试卷蓝图Id
+ */
+export function deletePaper(pcId) {
+    return request({
+        url: `/api/v2/paper/composition/${pcId}`,
+        method: 'DELETE'
+    });
+}
+
+/** 根据试卷蓝图生成用户的试卷
+ * @param {Number} pcId 试卷蓝图Id
+ */
+export function generateExam(pcId) {
+    return request({
+        url: `/api/v2/paper/${pcId}`,
+        method: 'POST'
+    });
+}
+
+/** 删除用户试卷 */
+// export function deleteUserExam(param) {
+//     return request({
+//         url: `/api/v2/paper/user/${puId}`,
+//         method: 'DELETE'
+//     });
+// }
+
+/** 获取用户试卷完整信息
+ * @param {Number} puId 用户试卷Id
+ */
+export function getUserExamInfo(puId) {
+    return request({
+        url: `/api/v2/paper/user/${puId}`,
+        method: 'GET'
+    });
+}
+
+/** 加载用户试卷试题 */
+export function loadQuestion({ type, questionId, puId }) {
+    return request({
+        url: `/api/v2/paper/user/question/${type}/${questionId}/${puId}`,
+        method: 'GET'
+    });
+}
+
+/** 提交答案
+ * @param {Object} data
+ * @param {Number} data.puId 用户试卷id
+ * @param {Number} data.pqId 用户试卷试题id
+ * @param {Number} data.type 试题类型
+ * @param {Number} data.subType 试题子类型
+ * @param {Number} data.answer 答案(理论题)
+ * @param {Boolean} data.trainingSuccess 是否完成(实训题)
+ */
+export function submitAnswer(data) {
+    return request({
+        url: `/api/v2/paper/user/question/answer`,
+        method: 'POST',
+        data
+    });
+}
+
+/** 交卷
+ * @param {Number} puId 用户试卷id
+ */
+export function submitPaper(puId) {
+    return request({
+        url: `/api/v2/paper/user/${puId}/submit`,
+        method: 'POST'
+    });
+}
+
+/**
+ * 根据mapId查询蓝图的基本信息
+ */
+export function queryPaperList(data) {
+    return request({
+        url: `/api/v2/paper/composition/find/list`,
+        method: 'POST',
+        data
+    });
+}
+/**
+*	获取标签分类
+ * @param {Number} ordId 组织id
+ * @param {Number} groupType 1-理论题 2-实训题
+ * @param {Number} subType 1-选择题 2-多选题 3-判断题 4-单操 5-场景
+*/
+export function queryTagList(data) {
+    return request({
+        url: `/api/v2/paper/question/label`,
+        method: 'POST',
+        data
+    });
+}
+/**
+ * 获取试卷创建者list
+ */
+export function queryPaperCreatorList(data) {
+    return request({
+        url: `/api/v2/paper/composition/list/creatorInfo`,
+		method: 'POST',
+		data
+    })
+}
--- a/src/api/management/fileManage.js
+++ b/src/api/management/fileManage.js
@ -0,0 +1,45 @@
+import request from '@/utils/request.js'
+
+/** 获取文件列表 */
+export function getFileList(params) {
+	return request({
+		url: `/api/minio/file/list`,
+		method: 'get',
+		params,
+	})
+}
+
+/** 检查资源是否已存在 */
+export function checkIsExist(params) {
+	return request({
+		url: `/api/minio/checkIsExist`,
+		method: 'get',
+		params,
+	})
+}
+
+/** 保存文件 */
+export function saveFileInfo(data) {
+	return request({
+		url: `/api/minio/file/save`,
+		method: 'post',
+		data,
+	})
+}
+
+/** 更新文件标题 */
+export function updateFileTitle(data) {
+	return request({
+		url: `/api/minio/file/update`,
+		method: 'put',
+		data,
+	})
+}
+
+/** 删除文件 */
+export function deleteFile(id) {
+	return request({
+		url: `api/minio/file/del/${id}`,
+		method: 'delete',
+	})
+}
--- a/src/api/management/model.js
+++ b/src/api/management/model.js
@ -1,109 +0,0 @@
-import request from '@/utils/request';
-
-/** 新建用户草稿2d模型*/
-export function createModelDraft(data) {
-    return request({
-        url: `/draft/model2d/`,
-        method: 'post',
-        data
-    });
-}
-
-/** 分页查询用户2d模型草稿*/
-export function getModelDraftList(params) {
-    return request({
-        url: `/draft/model2d/paging`,
-        method: 'get',
-        params
-    });
-}
-
-/** 更新2d模型基本信息 */
-export function updateModelDraftInfo(data) {
-    return request({
-        url: `/draft/model2d/${data.id}/basic`,
-        method: 'put',
-        data
-    });
-}
-
-/** 更新2d模型数据 */
-export function updateModelDraftData(data) {
-    return request({
-        url: `/draft/model2d/${data.id}/data`,
-        method: 'put',
-        data
-    });
-}
-
-/** 根据id查询2d模型草稿数据 */
-export function getModelDraftData(id) {
-    return request({
-        url: `/draft/model2d/${id}`,
-        method: 'get'
-    });
-}
-
-/** 发布模型 */
-export function publishModelDraft(id) {
-    return request({
-        url: `/draft/model2d/${id}/publish`,
-        method: 'post'
-    });
-}
-
-/** 删除草稿模型 */
-export function deleteModelDraft(id) {
-    return request({
-        url: `/draft/model2d/${id}`,
-        method: 'delete'
-    });
-}
-
-/** 分页查询模型数据 */
-export function getModelList() {
-    return request({
-        url: `/api/model2d/paging`,
-        method: 'get'
-    });
-}
-/** 查询模型数据 */
-export function getModelListUnpage() {
-    return request({
-        url: '/api/model2d/list',
-        method: 'get'
-    });
-}
-
-/** 查询某个模型所有历史版本数据 */
-export function getModelVersions(code) {
-    return request({
-        url: `/api/model2d/${code}/versions`,
-        method: 'get'
-    });
-}
-
-/** 分页查询模型历史版本 */
-export function getModelVersionsPaging(code) {
-    return request({
-        url: `/api/model2d/${code}/versions/paging`,
-        method: 'get'
-    });
-}
-
-/** 更新2d模型基础信息 */
-export function updateModelBasicInfo(id) {
-    return request({
-        url: `/api/model2d/{id}/basic`,
-        method: 'put'
-    });
-}
-
-/** 回滚版本 */
-export function setModelVersion(code, version) {
-    return request({
-        url: `/api/model2d/${code}/version/${version}`,
-        method: 'put'
-    });
-}
-
--- a/src/api/management/user.js
+++ b/src/api/management/user.js
@ -17,6 +17,32 @@ export function getUserList(params) {
    });
 }

+/** 查询所有用户列表*/
+export function getManageUserList(params) {
+    return request({
+        url: `/api/manage/user/list`,
+        method: 'get',
+        params: params
+    });
+}
+
+/** 根据用户查询用户角色列表*/
+export function getUserRolesList(uid) {
+    return request({
+        url: `/api/manage/${uid}/roles`,
+        method: 'get'
+    });
+}
+
+/** 绑定用户角色*/
+export function getBindUserRoles(data) {
+    return request({
+        url: `/api/manage/bind/org`,
+        method: 'post',
+        data
+    });
+}
+
 /** 模糊查询用户 昵称、名称、手机号*/
 export function getDimUserList(params) {
    return request({
@ -238,3 +264,70 @@ export function registerUser(data) {
        data
    });
 }
+/** 超管重置用户密码 */
+export function adminResetUserPassword(userId) {
+    return request({
+        url: `/api/userinfo/${userId}/reset/pwd`,
+        method: 'put'
+    });
+}
+/** 找回密码 */
+export function findPassword(data) {
+    return request({
+        url: `/api/userinfo/retrieve/pwd`,
+        method: 'put',
+        data
+    });
+}
+/** 发送手机验证码 */
+export function sendPhoneVfcode(data) {
+    return request({
+        url: '/api/userinfo/mobile/code',
+        method: 'post',
+        data
+    });
+}
+/** 发送邮箱验证码 */
+export function sendEmailVfcode(params) {
+    return request({
+        url: '/api/userinfo/email/code',
+        method: 'post',
+        params
+    });
+}
+
+/** 新注册接口 */
+export function registerUserNew(data) {
+    return request({
+        url: `/api/userinfo/register2`,
+        method: 'post',
+        data
+    });
+}
+
+// 手机号是否已经注册
+export function isExistMobile(params) {
+    return request({
+        url: `/api/userinfo/isExist/mobile`,
+        method: 'get',
+        params
+    });
+}
+
+// 手机号是否已经注册
+export function isExistEmail(params) {
+    return request({
+        url: `/api/userinfo/isExist/email`,
+        method: 'get',
+        params
+    });
+}
+
+// 成工院第三方登录
+export function cgyThirdLogin(data) {
+    return request({
+        url: '/api/login/cgy/third',
+        method: 'post',
+        data
+    });
+}
--- a/src/api/management/userexam.js
+++ b/src/api/management/userexam.js
@ -1,19 +1,19 @@
-import request from '@/utils/request';
+import request from '@/utils/request'

 /** 获取用户试题列表*/
 export function generateExamList(examId) {
    return request({
        url: `/api/userExam/${examId}/generate`,
-        method: 'get'
-    });
+        method: 'get',
+    })
 }

 /** 刷新考题列表*/
 export function refreshExamList(userExamId) {
    return request({
        url: `/api/userExam/${userExamId}`,
-        method: 'get'
-    });
+        method: 'get',
+    })
 }

 /** 提交一个考题*/
@ -21,17 +21,16 @@ export function finishOneExamQuestion(data) {
    return request({
        url: '/api/userExam/finish',
        method: 'put',
-        data: data
-    });
+        data: data,
+    })
 }

 /** 考试完成提交*/
 export function submitExam(examId) {
    return request({
        url: `/api/userExam/${examId}/submit`,
-        method: 'put'
-    });
-
+        method: 'put',
+    })
 }

 /** 获取用户考试列表*/
@ -39,38 +38,71 @@ export function getPublishExam(data) {
    return request({
        url: `/api/userExam/list`,
        method: 'get',
-        params: data
-    });
+        params: data,
+    })
 }

 /** 删除用户考试*/
 export function delPublishExam(id) {
    return request({
        url: `/api/userExam/${id}`,
-        method: 'delete'
-    });
+        method: 'delete',
+    })
 }

 export function updateExam(data) {
    return request({
        url: `/api/userExam/${data.id}`,
        method: 'put',
-        data: data
-    });
+        data: data,
+    })
 }
 /** 获取班级考试成绩列表 */
-export function getClassGradeList(examId, params) {
+export function getClassGradeList(params) {
    return request({
-        url: `/api/userExam/paged/orgUser/${params.orgId}/${examId}`,
+        url: `/api/v2/paper/user/page`,
        method: 'get',
-        params
-    });
+        params,
+    })
 }

 /** 查询组织学生单次考试成绩曲线 */
 export function getClassGradeStatistic(orgId, examId) {
    return request({
-        url: `/api/userExam/curve/${orgId}/${examId}`,
-        method: 'get'
-    });
+        url: `/api/v2/paper/user/curve`,
+        params: { pcId: examId, orgId },
+        method: 'get',
+    })
+}
+
+/** 查询组织学生单次考试成绩曲线 */
+export function getStuGradeStatistic(userId) {
+    return request({
+        url: `/api/userExam/curve/${userId}`,
+        method: 'get',
+    })
+}
+
+/** 个人仿真数据统计 */
+export function getSimulationTimeChart(mapId) {
+    return request({
+        url: `/api/stats/simulation/${mapId}/stats`,
+        method: 'get',
+    })
+}
+
+// // 课程内实训数据统计
+// export function getLessonTimeChart(id) {
+//     return request({
+//         url: `/api/stats/lesson/${id}/stats`,
+//         method: 'get',
+//     })
+// }
+
+// 课程列表
+export function getLessonList() {
+    return request({
+        url: '/api/stats/lesson/list',
+        method: 'get',
+    })
 }
--- a/src/api/newChat.js
+++ b/src/api/newChat.js
@ -0,0 +1,221 @@
+
+import request from '@/utils/request';
+
+/**
+ * 获取群列表
+ * @param {String} groupId 房间号
+ * @returns
+ */
+export function getGroupList(groupId) {
+    return request({
+        url: `/api/simulation/${groupId}/conversation/group/list`,
+        method: 'get'
+    });
+}
+
+/**
+ * 创建群
+ * @param {String} groupId 房间号
+ * @param {String} data
+ * @param {String} data.name 群组名称
+ * @param {String} data.imageUrl 群组头像
+ * @param {Array} data.memberIds 角色id列表
+ * @returns
+ */
+export function createGroup(groupId, data) {
+    return request({
+        url: `/simulation/${groupId}/operate/Conversation_Group_Create`,
+        method: 'post',
+        data
+    });
+}
+
+/**
+ * 修改群组名称
+ * @param {String} groupId 房间号
+ * @param {Object} data
+ * @param {String} data.id 群组id
+ * @param {String} data.name 群组名称
+ * @returns
+ */
+export function updateGroupName(groupId, data) {
+    return request({
+        url: `/simulation/${groupId}/operate/Conversation_Group_Update_Name`,
+        method: 'post',
+        data
+    });
+}
+
+/**
+ * 修改群组群主
+ * @param {String} groupId 房间号
+ * @param {Object} data
+ * @param {Number} data.id 群组id
+ * @param {String} data.memberId 角色id
+ * @returns
+ */
+export function updateGroupLeader(groupId, data) {
+    return request({
+        url: `/simulation/${groupId}/operate/Conversation_Group_Update_Leader`,
+        method: 'post',
+        data
+    });
+}
+
+/**
+ * 邀请人员入群
+ * @param {String} groupId 房间号
+ * @param {Object} data
+ * @param {Number} data.id 群组id
+ * @param {Array} data.memberIds 角色id列表
+ * @returns
+ */
+export function inviteMemberToGroup(groupId, data) {
+    return request({
+        url: `/simulation/${groupId}/operate/Conversation_Group_Invite_Member`,
+        method: 'post',
+        data
+    });
+}
+
+/**
+ * 移除群内人员
+ * @param {String} groupId 房间号
+ * @param {Object} data
+ * @param {Number} data.id 群组id
+ * @param {Array} data.memberIds 角色id列表
+ * @returns
+ */
+export function removeMemberFromGroup(groupId, data) {
+    return request({
+        url: `/simulation/${groupId}/operate/Conversation_Group_Remove_Member`,
+        method: 'post',
+        data
+    });
+}
+
+/**
+ * 退出群组
+ * @param {String} groupId 房间号
+ * @param {Object} data
+ * @param {Number} data.id 群组id
+ * @returns
+ */
+export function exitGroup(groupId, data) {
+    return request({
+        url: `/simulation/${groupId}/operate/Conversation_Group_Exit`,
+        method: 'post',
+        data
+    });
+}
+
+/**
+ * 解散群组
+ * @param {String} groupId 房间号
+ * @param {Object} data
+ * @param {Number} data.id 群组id
+ * @returns
+ */
+export function dissolveGroup(groupId, data) {
+    return request({
+        url: `/simulation/${groupId}/operate/Conversation_Group_Dissolve`,
+        method: 'post',
+        data
+    });
+}
+
+/**
+ * 发送语音信息
+ * @param {String} groupId 房间号
+ * @param {Object} data
+ * @param {Number} data.id 群组id
+ * @param {String} data.audioPath 文件地址
+ * @param {String} data.content 语音内容
+ * @returns
+ */
+export function sendAudio(groupId, data) {
+    return request({
+        url: `/simulation/${groupId}/operate/Conversation_Group_Audio_Chat`,
+        method: 'post',
+        data
+    });
+}
+
+/**
+ * 发送文字信息
+ * @param {String} groupId 房间号
+ * @param {Object} data
+ * @param {Number} data.id 群组id
+ * @param {String} data.content 文字内容
+ * @returns
+ */
+export function sendText(groupId, data) {
+    return request({
+        url: `/simulation/${groupId}/operate/Conversation_Group_Text_Chat`,
+        method: 'post',
+        data
+    });
+}
+
+/**
+ * 发送BASE64信息
+ * @param {String} groupId 房间号
+ * @param {Object} data
+ * @param {Number} data.id 群组id
+ * @param {String} data.fileBase64Str 文件base64码
+ * @returns
+ */
+export function sendBase64(groupId, data) {
+    return request({
+        url: `/simulation/${groupId}/operate/Conversation_Group_Audio_Base64`,
+        method: 'post',
+        data
+    });
+}
+
+/**
+ * 设置群消息已读
+ * @param {String} groupId 房间号
+ * @param {Object} data
+ * @param {Number} data.id 群组id
+ * @returns
+ */
+export function setGroupReadMessage(groupId, data) {
+    return request({
+        url: `/simulation/${groupId}/operate/Conversation_Group_Read_Message`,
+        method: 'post',
+        data
+    });
+}
+
+/**
+ * 发送私聊文字信息
+ * @param {String} groupId 房间号
+ * @param {Object} data
+ * @param {Number} data.memberId 角色id
+ * @param {String} data.content 文字内容
+ * @returns
+ */
+export function sendPrivateText(groupId, data) {
+    return request({
+        url: `/simulation/${groupId}/operate/Conversation_Group_Private_Text_Chat`,
+        method: 'post',
+        data
+    });
+}
+
+/**
+ * 发送私聊BASE64信息
+ * @param {String} groupId 房间号
+ * @param {Object} data
+ * @param {Number} data.memberId 角色id
+ * @param {String} data.fileBase64Str 文件base64码
+ * @returns
+ */
+export function sendPrivateBase64(groupId, data) {
+    return request({
+        url: `/simulation/${groupId}/operate/Conversation_Group_Private_Audio_Base64`,
+        method: 'post',
+        data
+    });
+}
--- a/src/api/permissionManage.js
+++ b/src/api/permissionManage.js
@ -0,0 +1,28 @@
+import request from '@/utils/request';
+
+// 创建权限
+export function createPermission(data) {
+    return request({
+        url: `/api/v2/permission/create`,
+        method: 'post',
+        data
+    });
+}
+
+// 权限修改
+export function updatePermission(data) {
+    return request({
+        url: `/api/v2/permission/update`,
+        method: 'put',
+        data
+    });
+}
+
+// 分页获取权限
+export function getPermissionPage(data) {
+    return request({
+        url: `/api/v2/permission/find/page`,
+        method: 'post',
+        data
+    });
+}
--- a/src/api/project.js
+++ b/src/api/project.js
@ -37,38 +37,6 @@ export function getDeviceDetail(id) {
        method: 'get'
    });
 }
-/** 添加/修改屏蔽门设备网关映射配置 */
-export function setPsdConfig(id, data) {
-    return request({
-        url: `/api/device/${id}/config/psd`,
-        method: 'put',
-        data: data
-    });
-}
-/** 添加/修改信号机设备网关映射配置 */
-export function setSignalConfig(id, data) {
-    return request({
-        url: `/api/device/${id}/config/signal`,
-        method: 'put',
-        data: data
-    });
-}
-/** 添加/修改信号机设备网关映射配置 */
-export function setSwitchConfig(id, data) {
-    return request({
-        url: `/api/device/${id}/config/switch`,
-        method: 'put',
-        data: data
-    });
-}
-/** 添加/修改端头控制盒网关映射配置 */
-export function setPslConfig(id, data) {
-    return request({
-        url: `/api/device/${id}/config/psl`,
-        method: 'put',
-        data: data
-    });
-}
 /** 添加/修改ibp盘网关映射配置 */
 export function setIbpConfig(id, data) {
    return request({
@ -77,15 +45,6 @@ export function setIbpConfig(id, data) {
        data: data
    });
 }
-/** 添加/修改psc控制柜网关映射配置 */
-export function setPscConfig(id, data) {
-    return request({
-        url: `/api/device/${id}/config/psc`,
-        method: 'put',
-        data: data
-    });
-}
-
 /** 添加/修改ibp设备配置 */
 export function setVrIbpConfig(id, data) {
    return request({
@ -102,10 +61,10 @@ export function setLwConfig(id, data) {
        data: data
    });
 }
-/** 查询所有的某类型设备 */
-export function getDevicesByType(type) {
+/** 查询某个项目下的所有的某类型设备 */
+export function getDevicesByType(project, type) {
    return request({
-        url: `/api/device/${type}/all`,
+        url: `/api/device/${project}/${type}/all`,
        method: 'get'
    });
 }
@ -177,3 +136,18 @@ export function setIlwConfig(id, data) {
        data: data
    });
 }
+/** 添加/修改设备配置 */
+export function setDeviceConfig(data) {
+    return request({
+        url: `/api/device/config/updateConfig`,
+        method: 'put',
+        data: data
+    });
+}
+/** 获取所有项目 */
+export function getAllProject() {
+    return request({
+        url: `/api/project/all `,
+        method: 'get'
+    });
+}
--- a/src/api/projectConfig.js
+++ b/src/api/projectConfig.js
@ -0,0 +1,187 @@
+import request from '@/utils/request';
+
+/** 后端项目配置分页 */
+export function getBackProjectConfigByPage(params) {
+    return request({
+        url: `/api/project/page`,
+        method: 'get',
+        params
+    });
+}
+
+/** 全量后端项目配置 */
+export function getAllBackProjectConfig() {
+    return request({
+        url: `/api/project/all`,
+        method: 'get'
+    });
+}
+
+/** 主键获取后端项目配置 */
+export function getBackProjectConfigById(id) {
+    return request({
+        url: `/api/project/${id}`,
+        method: 'get'
+    });
+}
+
+/** 通过code获取后端项目配置 */
+export function getBackProjectConfigByCode(code) {
+    return request({
+        url: `/api/project/code/${code}`,
+        method: 'get'
+    });
+}
+
+/** 删除后端项目配置 */
+export function deleteBackProjectConfig(id) {
+    return request({
+        url: `/api/project/del/${id}`,
+        method: 'delete'
+    });
+}
+
+/** 更新后端项目配置 */
+export function updateBackProjectConfig(data) {
+    return request({
+        url: `/api/project/update`,
+        method: 'put',
+        data
+    });
+}
+
+/** 保存后端项目配置 */
+export function saveBackProjectConfig(data) {
+    return request({
+        url: `/api/project/save`,
+        method: 'POST',
+        data
+    });
+}
+
+/** 获取后端项目列表，关联时使用 */
+export function getBackProjectConfigList(id) {
+    return request({
+        url: `/api/project/simple`,
+        method: 'get'
+    });
+}
+
+/** 前端项目配置分页 */
+export function getFrontProjectConfigByPage(params) {
+    return request({
+        url: `/api/project/viewSetting/page`,
+        method: 'get',
+        params
+    });
+}
+
+/** 全量前端项目配置 */
+export function getAllFrontProjectConfig() {
+    return request({
+        url: `/api/project/viewSetting/all`,
+        method: 'get'
+    });
+}
+
+/** 获取前端项目配置 */
+export function getFrontProjectConfigById(id) {
+    return request({
+        url: `/api/project/viewSetting/${id}`,
+        method: 'get'
+    });
+}
+
+/** 删除前端项目配置 */
+export function deleteFrontProjectConfig(id) {
+    return request({
+        url: `/api/project/viewSetting/del/${id}`,
+        method: 'delete'
+    });
+}
+
+/** 更新前端项目配置 */
+export function updateFrontProjectConfig(data) {
+    return request({
+        url: `/api/project/viewSetting/update`,
+        method: 'put',
+        data
+    });
+}
+
+/** 保存前端项目配置 */
+export function saveFrontProjectConfig(data) {
+    return request({
+        url: `/api/project/viewSetting/save`,
+        method: 'POST',
+        data
+    });
+}
+
+/** 登录时根据前端标识获取配置 */
+export function getFrontProjectConfigByLogin(markKey) {
+    return request({
+        url: `/api/project/viewSetting/project/${markKey}`,
+        method: 'get'
+    });
+}
+
+/** 登录时获取全量前端配置 */
+export function getAllFrontProjectConfigByLogin(markKey) {
+    return request({
+        url: `/api/project/viewSetting/simple/all`,
+        method: 'get'
+    });
+}
+
+/** 检查项目code */
+export function checkBackProjectExist(params) {
+    return request({
+        url: `/api/project/check/code`,
+        method: 'get',
+        params
+    });
+}
+
+/** 检查项目markKey */
+export function checkFrontProjectExist(params) {
+    return request({
+        url: `/api/project/check/markKey`,
+        method: 'get',
+        params
+    });
+}
+//
+export function getUploadUrl(params) {
+    return request({
+        url: `/api/minio/preSignedUrl`,
+        method: 'get',
+        params
+    });
+}
+
+/** 设置默认组织 */
+export function setDefaultOrg(data) {
+    return request({
+        url: `/api/project/setDefaultOrg`,
+        method: 'put',
+        data
+    });
+}
+
+/** 创建默认组织 */
+export function createDefaultOrg(id, data) {
+    return request({
+        url: `/api/project/${id}/createDefaultOrg`,
+        method: 'POST',
+        data
+    });
+}
+
+/** 登录项目组织列表 */
+export function getOrgList(id) {
+    return request({
+        url: `/api/project/${id}/orgList`,
+        method: 'get'
+    });
+}
--- a/src/api/projectServer.js
+++ b/src/api/projectServer.js
@ -0,0 +1,40 @@
+import request from '@/utils/request';
+
+/** 获取请求baseURL */
+export function getBaseUrlByProject(project) {
+    return request({
+        url: `/api/projectServer/project/${project}`,
+        method: 'get'
+    });
+}
+/** 分页查询项目服务器 */
+export function projectServerPaging(params) {
+    return request({
+        url: `/api/projectServer/paging`,
+        method: 'get',
+        params
+    });
+}
+/** 创建项目服务器数据 */
+export function createProjectServer(data) {
+    return request({
+        url: `/api/projectServer`,
+        method: 'post',
+        data
+    });
+}
+/** 修改项目服务器数据 */
+export function updateProjectServer(id, data) {
+    return request({
+        url: `/api/projectServer/${id}`,
+        method: 'put',
+        data
+    });
+}
+/** 删除项目服务器数据 */
+export function deleteProjectServer(id) {
+    return request({
+        url: `/api/projectServer/${id}`,
+        method: 'delete'
+    });
+}
--- a/src/api/pushMessage.js
+++ b/src/api/pushMessage.js
@ -28,6 +28,7 @@ export function postLicenseValidate(data) {
    return request({
        url: `/api/license/validate`,
        method: 'post',
+        production: true,
        // baseURL: 'https://joylink.club/jlcloud',
        data
    });
--- a/src/api/questionBank.js
+++ b/src/api/questionBank.js
@ -1,18 +1,45 @@
 import request from '@/utils/request';

+// 查询理论试题(全部组织)
+export function listAllQuestionPage(params) {
+    return request({
+        url: `/api/question/paging`,
+        method: 'get',
+        params
+    });
+}
+
 // 分页查询理论试题
 export function listQuestionPage(params) {
    return request({
-        url: `/api/questionBank/questions/paging`,
+        // url: `/api/questionBank/questions/paging`,
+        url: `/api/question/org/paging`,
        method: 'get',
        params
    });
 }

+// 查询所有理论试题
+export function listQuestionAll() {
+    return request({
+        url: `/api/question/org`,
+        method: 'get'
+    });
+}
+
+// 标签列表
+export function getLabelList() {
+    return request({
+        url: `/api/question/org/label`,
+        method: 'get'
+    });
+}
+
 // 创建题目
 export function createQuestion(data) {
    return request({
-        url: `/api/questionBank/questions`,
+        // url: `/api/questionBank/questions`,
+        url: `/api/question/org`,
        method: 'post',
        data
    });
@ -21,25 +48,55 @@ export function createQuestion(data) {
 // 删除题目
 export function deleteQuestion(questionId) {
    return request({
-        url: `/api/questionBank/questions/${questionId}`,
-        method: 'delete'
+        // url: `/api/questionBank/questions/${questionId}`,
+        url: `/api/question/org`,
+        method: 'delete',
+        data: [questionId]
    });
 }

 // 更新题目
 export function updateOption(data) {
    return request({
-        url: `/api/questionBank/questions/${data.id}`,
+        // url: `/api/questionBank/questions/${data.id}`,
+        url: `/api/question/org/${data.id}`,
        method: 'put',
        data
    });
 }

 // 获取题目信息
-export function getQuestionInfo(questionId) {
+export function getQuestionInfo(questionId, params) {
    return request({
-        url: `/api/questionBank/questions/${questionId}`,
-        method: 'get'
+        // url: `/api/questionBank/questions/${questionId}`,
+        url: `/api/question/org/${questionId}`,
+        method: 'get',
+        params
    });
 }

+// 题库批量导入
+export function importQuestion(data) {
+    return request({
+        url: `/api/question/org/import`,
+        method: 'post',
+        data
+    });
+}
+
+// 预览答题
+export function testAnswer(questionId, data) {
+    return request({
+        url: `/api/question/org/test/answer/${questionId}`,
+        method: 'post',
+        data
+    });
+}
+
+// 清空题库
+export function clearBank() {
+    return request({
+        url: `/api/question/org/clear`,
+        method: 'get'
+    });
+}
--- a/src/api/race.js
+++ b/src/api/race.js
@ -15,3 +15,20 @@ export function selectQuestionTypeNum(companyId) {
        method: 'get'
    });
 }
+
+/** 加载场景 */
+export function loadRace(simulationId, sceneId) {
+    return request({
+        url: `/api/race/${simulationId}/load/${sceneId}`,
+        method: 'put'
+    });
+
+}
+/** 完成任务 */
+export function overTask(taskId, data) {
+    return request({
+        url: `/api/race/${taskId}/finish`,
+        method: 'put',
+        data
+    });
+}
--- a/src/api/record.js
+++ b/src/api/record.js
@ -0,0 +1,10 @@
+import request from '@/utils/request';
+
+/** 查询用户使用记录统计 */
+export function queryUserSimulationRecord(params, userId) {
+    return request({
+        url: `/api/record/stats/list/criteria/${userId}`,
+        method: 'get',
+        params
+    });
+}
--- a/src/api/rtSimulation.js
+++ b/src/api/rtSimulation.js
@ -6,29 +6,15 @@ export function createSimulation(data) {
        method: 'post'
    });
 }
-/** 根据仿真group获取仿真基础信息 */
+/** 根据仿真group获取仿真基础信息 废弃 */
 export function getSimulationInfoByGroup(groupId) {
    return request({
        url: `/common/simulation/${groupId}`,
        method: 'get'
    });
 }
-/** 根据仿真group获取仿真地图数据 */
-export function getMapDataByGroup(groupId) {
-    return request({
-        url: `/rtSimulation/${groupId}/mapData`,
-        method: 'get'
-    });
-}
-/** 仿真发送指令 */
-export function sendSimulationCommand(group, memberId, type, data) {
-    return request({
-        url: `/common/simulation/${group}/member/${memberId}/operate/${type}`,
-        method: 'post',
-        data
-    });
-}
-/** 获取仿真成员列表 */
+
+/** 获取仿真成员列表 废弃 */
 export function getMemberListCommon(group, role) {

    if (!role) {
@ -39,14 +25,14 @@ export function getMemberListCommon(group, role) {
        method: 'get'
    });
 }
-/** 获取仿真用户列表 */
+/** 获取仿真用户列表 废弃 */
 export function getUserListCommon(group) {
    return request({
        url: `/common/simulation/${group}/users`,
        method: 'get'
    });
 }
-/** 销毁仿真 */
+/** 销毁仿真 废弃 */
 export function destroySimulation(group) {
    return request({
        url: `/common/simulation/${group}/destroy`,
@ -56,11 +42,11 @@ export function destroySimulation(group) {
 /** 初始化仿真 */
 export function initSimulation(group) {
    return request({
-        url: `/common/simulation/${group}/init`,
+        url: `/simulation/new/${group}/reset`,
        method: 'put'
    });
 }
-/** 设置故障 */
+/** 设置故障 废弃 */
 export function setSimulationFault(group, data) {
    return request({
        url: `/common/simulation/${group}/fault`,
@ -68,7 +54,7 @@ export function setSimulationFault(group, data) {
        data
    });
 }
-/** 取消故障 */
+/** 取消故障 废弃 */
 export function cancelSimulationFault(group, deviceId, faultType) {
    return request({
        url: `/common/simulation/${group}/device/${deviceId}/fault/${faultType}`,
@ -78,28 +64,28 @@ export function cancelSimulationFault(group, deviceId, faultType) {
 /** 仿真运行倍速 */
 export function timesSpeedPlayback(group, speed) {
    return request({
-        url: `/common/simulation/${group}/updateSpeed/${speed}`,
+        url: `/simulation/${group}/updateSpeed/${speed}`,
        method: 'put'
    });
 }
 /** 仿真暂停 */
 export function simulationPause(group) {
    return request({
-        url: `/common/simulation/${group}/pause`,
+        url: `/simulation/${group}/pause`,
        method: 'put'
    });
 }
 /** 仿真开始 */
 export function simulationStart(group) {
    return request({
-        url: `/common/simulation/${group}/start`,
+        url: `/simulation/${group}/start`,
        method: 'put'
    });
 }
 /** 获取存在的仿真列表 */
 export function getExistSimulationList(params) {
    return request({
-        url: `/common/simulation/list`,
+        url: `/simulation/list`,
        method: 'get',
        params
    });
@ -107,7 +93,15 @@ export function getExistSimulationList(params) {
 /** 获取仿真用户信息 */
 export function getSimulationUserInfo(id) {
    return request({
-        url: `/common/simulation/${id}/users`,
+        url: `/simulation/${id}/users`,
        method: 'get'
    });
 }
+/** 监管仿真 */
+export function getSuperviseSimulation(params) {
+    return request({
+        url: `/simulation/supervise`,
+        method: 'get',
+        params
+    });
+}
--- a/src/api/runplan.js
+++ b/src/api/runplan.js
@ -513,3 +513,19 @@ export function updateTemplateRunPlan (data) {
        data
    });
 }
+
+// 大铁 获取 调度台 运行计划
+export function getRunplanInRailway(group) {
+    return request({
+        url: `/api/simulation/${group}/ctc/railway/runPlan/list`,
+        method: 'get'
+    });
+}
+
+// 大铁 获取 ctc 车站 运行日志
+export function getRunplanInStation(group) {
+    return request({
+        url: `/api/simulation/${group}/ctc/station/runPlan/list`,
+        method: 'get'
+    });
+}
--- a/src/api/simulation.js
+++ b/src/api/simulation.js
@ -47,39 +47,39 @@ export function examNotifyNew({ examId }) {
    });
 }
 /** 获取用户实训列表*/
-export function getSimulationList(data) {
-    return request({
-        url: `/api/stats/simulation`,
-        method: 'get',
-        params: data
-    });
-}
+// export function getSimulationList(data) {
+//     return request({
+//         url: `/api/stats/simulation`,
+//         method: 'get',
+//         params: data
+//     });
+// }

-/** 添加用户仿真数据*/
-export function postSimulationStats(data) {
-    return request({
-        url: `/api/stats/simulation`,
-        method: 'post',
-        data: data
-    });
-}
+// /** 添加用户仿真数据*/
+// export function postSimulationStats(data) {
+//     return request({
+//         url: `/api/stats/simulation`,
+//         method: 'post',
+//         data: data
+//     });
+// }

-/** 更新用户仿真数据*/
-export function putSimulationStats(data) {
-    return request({
-        url: `/api/stats/${data.id}`,
-        method: 'put',
-        data: data
-    });
-}
+// /** 更新用户仿真数据*/
+// export function putSimulationStats(data) {
+//     return request({
+//         url: `/api/stats/${data.id}`,
+//         method: 'put',
+//         data: data
+//     });
+// }

 /** 删除用户仿真数据*/
-export function deleteSimulationStats(statsId) {
-    return request({
-        url: `/api/stats/${statsId}`,
-        method: 'delete'
-    });
-}
+// export function deleteSimulationStats(statsId) {
+//     return request({
+//         url: `/api/stats/${statsId}`,
+//         method: 'delete'
+//     });
+// }

 /** 录制脚本仿真(新版)*/
 export function scriptRecordNotifyNew(scriptId) {
@ -228,22 +228,22 @@ export function handlerIbpEvent(group, button, stationCode, buttonCode) {
    });
 }

-/** 处理ibp盘事件(按下) */
-
-export function handleIbpPress(group, stationCode, buttonCode) {
-    return request({
-        url: `/simulation/${group}/ibp/press/${stationCode}/${buttonCode}`,
-        method: 'put'
-    })
-}
-/** 处理ibp盘事件(松开) */
-
-export function handleIbpRelease(group, stationCode, buttonCode) {
-    return request({
-        url: `/simulation/${group}/ibp/release/${stationCode}/${buttonCode}`,
-        method: 'put'
-    })
-}
+// /** 处理ibp盘事件(按下) */
+//
+// export function handleIbpPress(group, stationCode, buttonCode) {
+//     return request({
+//         url: `/simulation/${group}/ibp/press/${stationCode}/${buttonCode}`,
+//         method: 'put'
+//     });
+// }
+// /** 处理ibp盘事件(松开) */
+//
+// export function handleIbpRelease(group, stationCode, buttonCode) {
+//     return request({
+//         url: `/simulation/${group}/ibp/release/${stationCode}/${buttonCode}`,
+//         method: 'put'
+//     });
+// }

 /** 预览脚本仿真（新版）*/
 export function scriptDraftRecordNotifyNew(scriptId) {
@ -284,10 +284,19 @@ export function getEveryDayRunPlanNew(group) {
    });
 }

+/** 大铁线路 修改系统时间 */
+export function modifySystemTime(data, group) {
+    return request({
+        url: `simulation/${group}/modifySystemTime`,
+        method: 'PUT',
+        data: data
+    });
+}
+
 /** 新版地图按计划行车 */
 export function ranAsPlan(data, group) {
    return request({
-        url: `/simulation/${group}/ranAsPlan`,
+        url: `/simulation/new/${group}/runAsPlan`,
        method: 'post',
        data: data
    });
@ -340,6 +349,15 @@ export function simulationLoadRunPlan(group, templateId) {
        method: 'put'
    });
 }
+
+/** 仿真里加载草稿运行图 */
+export function simulationLoadDraftRunPlan(group, draftRunPlanId) {
+    return request({
+        url:`/simulation/${group}/load/draftRunPlan/${draftRunPlanId} `,
+        method: 'put'
+    });
+}
+
 /** 根据车次号获取列车信息 */
 export function getTrainDetailBytripNumber(group, params) {
    return request({
@ -497,3 +515,95 @@ export function getStandListByRunLineOrTrainCode(group, params) {
        params
    });
 }
+/** 沙盘列车控制 */
+export function sandTableTrainControl(group, params) {
+    return request({
+        url: `/api/sandTable/${group}/control`,
+        method: 'put',
+        params
+    });
+}
+/** 条件查询仿真中的ISCS资源 */
+export function queryIscsResourcesByGroup(group, params) {
+    return request({
+        url: `simulation/${group}/iscs/systemResources`,
+        method: 'get',
+        params
+    });
+}
+/** 获取机器人驾驶参数 */
+export function getRobotDrivingParam(simulationId, groupNumber) {
+    return request({
+        url: `/simulation/${simulationId}/driveParam/${groupNumber}`,
+        method: 'get'
+    });
+}
+/** 查询所有pa系统的定时播放任务 */
+export function queryPaTimedList(group, params) {
+    return request({
+        url: `/simulation/${group}/iscs/paTimedPlay`,
+        method: 'get',
+        params
+    });
+}
+/** 创建仿真 */
+export function createSimulation(id) {
+    return request({
+        url: `/simulation/new/mapFunction/${id}`,
+        method: 'post'
+    });
+}
+
+/** 根据地图ID和功能ID获取仿真GroupId */
+export function getGroupByMapAndFunction(mapId, functionId) {
+    return request({
+        url: `/simulation/new/map/${mapId}/function/${functionId}`,
+        method: 'get'
+    });
+}
+/** 由系统管理员和教员销毁仿真 */
+export function destroySimulationByAdmin(group) {
+    return request({
+        url: `/simulation/${group}/destroy`,
+        method: 'delete'
+    });
+}
+
+/** 非仿真创建者退出仿真 */
+export function exitSimulation(group) {
+    return request({
+        url: `/simulation/${group}/exit`,
+        method: 'put'
+    });
+}
+/** 仿真监管那里进入仿真 */
+export function enterSimulationByTeacher(group) {
+    return request({
+        url: `/simulation/${group}/monitor`,
+        method: 'post'
+    });
+}
+/** 切换角色后触发消息 */
+export function getUnreceivedMessages(simulationId, memberId) {
+    return request({
+        url: `/simulation/${simulationId}/${memberId}/unreceivedMessages`,
+        method: 'get'
+    });
+}
+
+/** 控制叶佳供货的小车 */
+export function controlYjTrain(simulationId, right) {
+    return request({
+        url: `/api/realDevice/${simulationId}/train`,
+        method: 'put',
+        params: { right }
+    });
+}
+/** 创建仿真（不通过功能id） */
+export function createSimulationNoFunction(mapId, data) {
+    return request({
+        url: `/simulation/new/${mapId}`,
+        method: 'post',
+        data
+    });
+}
--- a/src/api/thirdAccountConfig.js
+++ b/src/api/thirdAccountConfig.js
@ -0,0 +1,27 @@
+import request from '@/utils/request';
+
+/** 删除第三方配置 */
+export function deleteThirdAccountConfig(id) {
+    return request({
+        url: `/api/thirdAccountConfig/${id}`,
+        method: 'delete'
+    });
+}
+
+/** 分页查询所有配置 */
+export function queryThirdAccountConfig(params) {
+    return request({
+        url: `/api/thirdAccountConfig/paged`,
+        method: 'get',
+        params
+    });
+}
+
+/** 新增或更新第三方配置 */
+export function updateThirdAccountConfig(data) {
+    return request({
+        url: `/api/thirdAccountConfig`,
+        method: 'post',
+        data
+    });
+}
--- a/src/api/trainingManage.js
+++ b/src/api/trainingManage.js
@ -0,0 +1,198 @@
+import request from '@/utils/request';
+
+/** 获取当前用户的所有实训草稿数据 */
+export function getAllTrainingList(params) {
+    return request({
+        url: `/api/v2/draft/training/all`,
+        method: 'get',
+        params
+    });
+}
+/** 分页获取当前用户的实训草稿数据 */
+export function getTrainingList(data) {
+    return request({
+        url: `/api/v2/draft/training/info/page`,
+        method: 'post',
+        data
+    });
+}
+/** 创建实训草稿 */
+export function createTraining(data) {
+    return request({
+        url: `/api/v2/draft/training/create`,
+        method: 'post',
+        data
+    });
+}
+/** 更新当前用户的某个实训草稿 */
+export function updateTraining(data) {
+    return request({
+        url: `/api/v2/draft/training/update/info`,
+        method: 'post',
+        data
+    });
+}
+/** 更新发布实训信息（标签， 描述， 标题） */
+export function updateTrainingInfo(data) {
+    return request({
+        url: `/api/v2/training/published/update`,
+        method: 'put',
+        data
+    });
+}
+/** 已发布实训转为草稿 */
+export function saveAsTrainingDraft(trainingId) {
+    return request({
+        url: `/api/v2/training/published/${trainingId}/saveAsDraft`,
+        method: 'post'
+    });
+}
+/** 查询步骤列表 */
+export function getTrainingStepList(trainingId) {
+    return request({
+        url: `/api/v2/draft/training/${trainingId}/step/list`,
+        method: 'get'
+    });
+}
+/** 修改实训所有步骤 */
+export function updateTrainingStep(group, trainingId, data) {
+    return request({
+        url: `/api/v2/draft/training/${group}/${trainingId}/step/update`,
+        method: 'put',
+        data: data
+    });
+}
+/** 删除当前用户的实训草稿 */
+export function deleteTraining(data) {
+    return request({
+        url: `/api/v2/draft/training`,
+        method: 'delete',
+        data: {trainingDraftIds: data}
+    });
+}
+/** 当前用户发布自己的实训草稿 */
+export function publishTraining(data) {
+    return request({
+        url: `/api/v2/draft/training/publish`,
+        method: 'post',
+        data
+    });
+}
+/** 查询实现草稿发布轨迹 */
+export function draftPubTrace(data) {
+    return request({
+        url: `/api/v2/training/draft/pub/trace/find/page`,
+        method: 'post',
+        data
+    });
+}
+/** 删除草稿发布轨迹 */
+export function deleteTrace(data) {
+    return request({
+        url: `/api/v2/training/draft/pub/trace`,
+        method: 'delete',
+        data
+    });
+}
+/** 更新当前用户的某个实训草稿的大字段信息 */
+export function updateTrainingContent(data) {
+    return request({
+        url: `/api/v2/draft/training/update/content`,
+        method: 'post',
+        data
+    });
+}
+/** 获取当前用户的某个实训草稿的所有信息 */
+export function getTrainingAll(trainingId) {
+    return request({
+        url: `/api/v2/draft/training/all/${trainingId}`,
+        method: 'get'
+    });
+}
+/** 单独更新当前用户的某个实训草稿的初始背景 */
+export function updateTrainingBackgroud(data) {
+    return request({
+        url: `/api/v2/draft/training/update/content/background`,
+        method: 'post',
+        data
+    });
+}
+/** 更新当前用户实训草稿定位 */
+export function updateTrainingMaplocation(data) {
+    return request({
+        url: `/api/v2/draft/training/update/content/maplocation`,
+        method: 'post',
+        data
+    });
+}
+
+/** 获取实训表达式条件素材 */
+export function getTrainingMaterials() {
+    return request({
+        url: `/api/v2/draft/training/expression/materials`,
+        method: 'get'
+    });
+}
+
+/** 获取实训所有成员 */
+export function getTrainingMmembers(trainingId) {
+    return request({
+        url: `/api/v2/draft/training/${trainingId}/member/list`,
+        method: 'get'
+    });
+}
+
+/** 获取实训所有参与者 */
+export function getTrainingPlayers(trainingId) {
+    return request({
+        url: `/api/v2/draft/training/${trainingId}/player/list`,
+        method: 'get'
+    });
+}
+
+/** 更新所有评分规则*/
+export function updateTrainingGradeRules(trainingId, data) {
+    return request({
+        url: `/api/v2/draft/training/${trainingId}/scoringRule/list`,
+        method: 'put',
+        data: data
+    });
+}
+
+/** 获取所有评分规则 */
+export function getTrainingGradeRules(trainingId) {
+    return request({
+        url: `/api/v2/draft/training/${trainingId}/scoringRule/list`,
+        method: 'get'
+    });
+}
+/** 清空重置实训 */
+export function clearDesignTraining(trainingId, group) {
+    return request({
+        url: `/api/v2/draft/training/${group}/reset/${trainingId}`,
+        method: 'delete'
+    });
+}
+/** 导出实训数据 */
+export function exportTrainingData(data) {
+    return request({
+        url: `/api/v2/training/published/export`,
+        method: 'post',
+        data
+    });
+}
+/** 导入实训数据 */
+export function importTrainingData(data) {
+    return request({
+        url: `/api/v2/training/published/import`,
+        method: 'post',
+        data
+    });
+}
+/** 实训跳转到当前步骤*/
+export function jumpToTraining(group, stepId) {
+    return request({
+        url: `/api/training2Simulation/${group}/jumpTo/${stepId}`,
+        method: 'put'
+    });
+}
--- a/src/api/trainingPlatform.js
+++ b/src/api/trainingPlatform.js
@ -75,4 +75,129 @@ export function getSubSystemByProjectCode() {
        method: 'get'
    });
 }
+/** 创建地图系统 */
+export function createMapFunction(data) {
+    return request({
+        url: `/api/mapFunction`,
+        method: 'post',
+        data
+    });
+}
+/** 列表查询地图系统 */
+export function queryMapFunctionList(params) {
+    return request({
+        url: `/api/mapFunction/list`,
+        method: 'get',
+        params
+    });
+}
+/** 更新地图系统 */
+export function updateMapFunction(data) {
+    return request({
+        url: `/api/mapFunction/${data.id}`,
+        method: 'put',
+        data
+    });
+}
+/** 删除地图系统 */
+export function deleteMapFunction(id) {
+    return request({
+        url: `/api/mapFunction/${id}`,
+        method: 'delete'
+    });
+}
+/** 分页查询地图系统 */
+export function queryMapFunctionPaged(params) {
+    return request({
+        url: `/api/mapFunction/paged`,
+        method: 'get',
+        params
+    });
+}
+/** 生成地图子系统 */
+export function generateMapFunctionNew(mapId, data) {
+    return request({
+        url: `/api/mapFunction/${mapId}/generate`,
+        method: 'post',
+        data
+    });
+}

+/** 根据id查询地图系统 */
+export function getMapFunctioById(id) {
+    return request({
+        url: `/api/mapFunction/${id}`,
+        method: 'get'
+    });
+}
+
+/** 一键删除地图下所有线路功能 */
+export function deleteAllMapFunction(mapId) {
+    return request({
+        url: `/api/mapFunction/batch/${mapId}`,
+        method: 'delete'
+    });
+}
+/** 新增分组 */
+export function updateMapFunctionSubset(data) {
+    return request({
+        url: `/api/mapFunction/group`,
+        method: 'put',
+        data
+    });
+}
+/** 根据模板生成地图功能 */
+export function generateMapFunctionByTemplate(data) {
+    return request({
+        url: `/api/mapFunction/generate/from/template`,
+        method: 'post',
+        data
+    });
+}
+/** 创建模板线路功能 */
+export function createTemplateMapFunction(data) {
+    return request({
+        url: `/api/mapFunction/template`,
+        method: 'post',
+        data
+    });
+}
+/** 修改模板线路功能 */
+export function updateTemplateMapFunction(data) {
+    return request({
+        url: `/api/mapFunction/template/${data.id}`,
+        method: 'put',
+        data
+    });
+}
+/** 删除模板线路功能 */
+export function deleteTemplateMapFunction(id) {
+    return request({
+        url: `/api/mapFunction/template/${id}`,
+        method: 'delete'
+    });
+}
+/** 查询模板线路功能列表 */
+export function queryTemplateMapFunctionList(params) {
+    return request({
+        url: `/api/mapFunction/template/list`,
+        method: 'get',
+        params
+    });
+}
+/** 分页查询模板线路功能列表 */
+export function queryTemplateMapFunPaged(params) {
+    return request({
+        url: `/api/mapFunction/template/paged`,
+        method: 'get',
+        params
+    });
+}
+/** 线路功能覆盖生成（主要用于客户端重新生成后线路功能里客户端重新匹配） */
+export function generateMapFun(data) {
+    return request({
+        url: `/api/mapFunction/generate/mapIds`,
+        method: 'post',
+        data
+    });
+}
--- a/src/api/upload.js
+++ b/src/api/upload.js
@ -10,7 +10,7 @@ export const meansUrl = `/api/upload/MEANS?appId=${productIdentify}`;
 // export const regulationUrl = `/api/upload/regulation?appId=${productIdentify}`;

 export function getUrl(relatedUrl) {
-    return `${process.env.VUE_APP_UPLOAD_API}${relatedUrl}`;
+    return `${this.$store.state.user.uploadUrl}${relatedUrl}`;
 }

 export function uploadFile(url, data) {
--- a/src/api/userRulesManage.js
+++ b/src/api/userRulesManage.js
@ -0,0 +1,35 @@
+
+import request from '@/utils/request';
+
+/** 设置权限失效或有效*/
+export function setPermissonInValid(subjectId) {
+    return request({
+        url: `/api/v2/permission/subject/inValid/${subjectId}`,
+        method: 'get'
+    });
+}
+
+/** 用户权限列表*/
+export function listPermision(params) {
+    return request({
+        url: `/api/v2/permission/subject/page`,
+        method: 'get',
+        params: params
+    });
+}
+
+/** 查看用户分发的下级所有用户权限*/
+export function getPermissonInDistribute(subjectId) {
+    return request({
+        url: `/api/v2/permission/subject/distribute/${subjectId}`,
+        method: 'get'
+    });
+}
+
+/** 查看当前mapId 下用户的所有权限及功能*/
+export function getMapIdPermisson(mapId) {
+    return request({
+        url: `/api/v2/permission/subject/permission/${mapId}`,
+        method: 'get'
+    });
+}
--- a/src/api/voice.js
+++ b/src/api/voice.js
@ -8,4 +8,10 @@ export function uploadAudioFiles(file) {
        data: file
    });
 }
-
+/** 获取百度语音合成token */
+export function getBaiduToken() {
+    return request({
+        url: `/api/voice/token/baidu`,
+        method: 'get'
+    });
+}
--- a/src/assets/appLoading.png
+++ b/src/assets/appLoading.png
--- a/src/assets/bg_pis.png
+++ b/src/assets/bg_pis.png
--- a/src/assets/bg_tms.png
+++ b/src/assets/bg_tms.png
--- a/src/assets/ctc_icon/camera.png
+++ b/src/assets/ctc_icon/camera.png
--- a/src/assets/ctc_icon/link.png
+++ b/src/assets/ctc_icon/link.png
--- a/src/assets/ctc_icon/panel.png
+++ b/src/assets/ctc_icon/panel.png
--- a/src/assets/ctc_icon/pic1.png
+++ b/src/assets/ctc_icon/pic1.png
--- a/src/assets/ctc_icon/pic10.png
+++ b/src/assets/ctc_icon/pic10.png
--- a/src/assets/ctc_icon/pic11.png
+++ b/src/assets/ctc_icon/pic11.png
--- a/src/assets/ctc_icon/pic12.png
+++ b/src/assets/ctc_icon/pic12.png
--- a/src/assets/ctc_icon/pic13.png
+++ b/src/assets/ctc_icon/pic13.png
--- a/src/assets/ctc_icon/pic14.png
+++ b/src/assets/ctc_icon/pic14.png
--- a/src/assets/ctc_icon/pic15.png
+++ b/src/assets/ctc_icon/pic15.png
--- a/src/assets/ctc_icon/pic16.png
+++ b/src/assets/ctc_icon/pic16.png
--- a/src/assets/ctc_icon/pic17.png
+++ b/src/assets/ctc_icon/pic17.png
--- a/src/assets/ctc_icon/pic18.png
+++ b/src/assets/ctc_icon/pic18.png
--- a/src/assets/ctc_icon/pic2.png
+++ b/src/assets/ctc_icon/pic2.png
--- a/src/assets/ctc_icon/pic3.png
+++ b/src/assets/ctc_icon/pic3.png
--- a/src/assets/ctc_icon/pic4.png
+++ b/src/assets/ctc_icon/pic4.png
--- a/src/assets/ctc_icon/pic5.png
+++ b/src/assets/ctc_icon/pic5.png
--- a/src/assets/ctc_icon/pic6.png
+++ b/src/assets/ctc_icon/pic6.png
--- a/src/assets/ctc_icon/pic7.png
+++ b/src/assets/ctc_icon/pic7.png
--- a/src/assets/ctc_icon/pic8.png
+++ b/src/assets/ctc_icon/pic8.png
--- a/src/assets/ctc_icon/pic9.png
+++ b/src/assets/ctc_icon/pic9.png
--- a/src/assets/ctc_icon/rpadd.png
+++ b/src/assets/ctc_icon/rpadd.png
--- a/src/assets/ctc_icon/rpb.png
+++ b/src/assets/ctc_icon/rpb.png
--- a/src/assets/ctc_icon/rpd.png
+++ b/src/assets/ctc_icon/rpd.png
--- a/src/assets/ctc_icon/rpdu.png
+++ b/src/assets/ctc_icon/rpdu.png
--- a/src/assets/ctc_icon/rpe.png
+++ b/src/assets/ctc_icon/rpe.png
--- a/src/assets/ctc_icon/rph.png
+++ b/src/assets/ctc_icon/rph.png
--- a/src/assets/ctc_icon/rpsa.png
+++ b/src/assets/ctc_icon/rpsa.png
--- a/src/assets/ctc_icon/rpsw.png
+++ b/src/assets/ctc_icon/rpsw.png
--- a/src/assets/ctc_icon/rpu.png
+++ b/src/assets/ctc_icon/rpu.png
--- a/src/assets/ctc_icon/rpvb.png
+++ b/src/assets/ctc_icon/rpvb.png
--- a/src/assets/ctc_icon/rpvs.png
+++ b/src/assets/ctc_icon/rpvs.png
--- a/src/assets/ctc_icon/rpw.png
+++ b/src/assets/ctc_icon/rpw.png
--- a/src/assets/ctc_icon/rpwp.png
+++ b/src/assets/ctc_icon/rpwp.png
--- a/src/assets/ctc_icon/setting.png
+++ b/src/assets/ctc_icon/setting.png
--- a/src/assets/ctc_icon/shutdown.png
+++ b/src/assets/ctc_icon/shutdown.png
--- a/src/assets/ctc_icon/t3.png
+++ b/src/assets/ctc_icon/t3.png
--- a/src/assets/ctc_icon/train.png
+++ b/src/assets/ctc_icon/train.png
--- a/src/assets/ctc_icon/unknow.png
+++ b/src/assets/ctc_icon/unknow.png
--- a/src/assets/datie/arrow.png
+++ b/src/assets/datie/arrow.png
--- a/src/assets/datie/camera.png
+++ b/src/assets/datie/camera.png
--- a/src/assets/datie/controlPanel.png
+++ b/src/assets/datie/controlPanel.png
--- a/src/assets/datie/controlPanel2.png
+++ b/src/assets/datie/controlPanel2.png
--- a/src/assets/datie/link.png
+++ b/src/assets/datie/link.png
--- a/Show More
+++ b/Show More