From dc2165733e17e470228defe3aa7f5e183a4f04b2 Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Mon, 27 May 2024 16:33:48 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=9C=BA=E6=99=AF=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=89=E7=BB=B4=E5=9C=BA=E6=99=AF=EF=BC=8C=E5=AE=9E=E8=AE=AD?=
 =?UTF-8?q?=E4=B8=AD=E5=8F=AF=E6=A0=B9=E6=8D=AEurl=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E4=B8=89=E7=BB=B4=E5=9C=BA=E6=99=AF=EF=BC=88=E5=BE=85=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/contest/contestDetail.vue           |  15 ++-
 .../contestSceneManage/ContestSceneManage.vue |  20 +++-
 .../contestSceneManage/addThree.vue           | 108 ++++++++++++++++++
 3 files changed, 140 insertions(+), 3 deletions(-)
 create mode 100644 src/views/contestDataManage/contestSceneManage/addThree.vue

diff --git a/src/views/contest/contestDetail.vue b/src/views/contest/contestDetail.vue
index b353db0cf..0618f38d6 100644
--- a/src/views/contest/contestDetail.vue
+++ b/src/views/contest/contestDetail.vue
@@ -44,7 +44,8 @@
         </div>
         <div style="text-align: center;margin-top: 15px;">
           <el-button v-show="nowData.ruleId" v-loading="loading" type="primary" @click="showScoreRule">评分表</el-button>
-          <el-button v-show="nowData.sceneId&&nowData.scenetype!=='Video'" v-loading="loading" type="primary" @click="startTask">开始任务</el-button>
+          <el-button v-show="nowData.sceneId&&nowData.scenetype=='Local'" v-loading="loading" type="primary" @click="startTask">开始任务</el-button>
+          <el-button v-show="nowData.sceneId&&nowData.scenetype=='Link'" v-loading="loading" type="primary" @click="startThreeTask">开始任务</el-button>
           <el-button v-show="nowData.sceneId&&nowData.scenetype=='Video'" type="primary" @click="playSceneVideo">播放视频</el-button>
           <el-button v-loading="loading" type="primary" :disabled="nowKey === taskList.length-1" @click="nextTask">下一任务</el-button>
         </div>
@@ -58,6 +59,7 @@
 <script>
 import { getTaskTree, getContextSenceDetail} from '@/api/contest';
 import { createSimulationNoFunction } from '@/api/simulation';
+import { getToken } from '@/utils/auth';
 import { getPublishMapInfo } from '@/api/jmap/map';
 import ScoreRule from './scoreRule';
 import PlayVideo from './PlayVideo';
@@ -180,6 +182,17 @@ export default {
                 this.loading = false;
             }
         },
+        startThreeTask() {
+            this.loading = true;
+            getContextSenceDetail(this.nowData.sceneId).then((res) => {
+                const url = res.data.scene.url;
+                const token = getToken();
+                window.open(`${url}&token=${token}`, '_blank');
+                this.loading = false;
+            }).catch(error => {
+                this.$message.error(error.message);
+            });
+        },
         showScoreRule() {
             this.$refs.scoreRule.doShow(this.nowData.ruleId);
         },
diff --git a/src/views/contestDataManage/contestSceneManage/ContestSceneManage.vue b/src/views/contestDataManage/contestSceneManage/ContestSceneManage.vue
index ae4e2ba21..f6efeb682 100644
--- a/src/views/contestDataManage/contestSceneManage/ContestSceneManage.vue
+++ b/src/views/contestDataManage/contestSceneManage/ContestSceneManage.vue
@@ -2,16 +2,18 @@
   <div>
     <query-list-page ref="user" :card-padding="10" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
     <upload-Video ref="uploadVideo" @reloadTable="reloadTable" />
+    <add-three ref="upThree" @reloadTable="reloadTable" />
   </div>
 </template>
 
 <script>
 import { queryContestSencePaged, deleteContestSence } from '@/api/contest';
 import UploadVideo from './UploadVideo';
+import addThree from './addThree';
 export default {
     name: 'ContestSeasonManage',
     components: {
-        UploadVideo
+        UploadVideo, addThree
     },
     data() {
         return {
@@ -92,6 +94,13 @@ export default {
                                     return row.type == 'Video';
                                 }
                             },
+                            {
+                                name: '编辑',
+                                handleClick: this.doEditLink,
+                                showControl: row => {
+                                    return row.type == 'Link';
+                                }
+                            },
                             {
                                 name: '删 除',
                                 handleClick: this.doDelete,
@@ -101,7 +110,8 @@ export default {
                     }
                 ],
                 actions: [
-                    { text: '上 传', handler: this.doUpload }
+                    { text: '上 传', handler: this.doUpload },
+                    { text: '添 加', handler: this.doUpThree }
                 ]
             }
         };
@@ -116,6 +126,12 @@ export default {
         doEdit(index, row) {
             this.$refs.uploadVideo.doShow(row.id);
         },
+        doUpThree() {
+            this.$refs.upThree.doShow();
+        },
+        doEditLink(index, row) {
+            this.$refs.upThree.doShow(row.id);
+        },
         doDelete(index, row) {
             this.$confirm('该操作将删除竞赛场景，是否继续？', '提 示', {
                 confirmButtonText: '确 定',
diff --git a/src/views/contestDataManage/contestSceneManage/addThree.vue b/src/views/contestDataManage/contestSceneManage/addThree.vue
new file mode 100644
index 000000000..4ef8c79c7
--- /dev/null
+++ b/src/views/contestDataManage/contestSceneManage/addThree.vue
@@ -0,0 +1,108 @@
+<template>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="500px" :before-close="handleClose" center :close-on-click-modal="false">
+    <el-form ref="ruleForm" :model="formModel" :rules="rules" label-width="100px">
+      <el-form-item label="场景名称:" prop="name">
+        <el-input v-model="formModel.name" style="width: 350px;" />
+      </el-form-item>
+      <el-form-item label="场景url:" prop="url">
+        <el-input v-model="formModel.url" type="textarea" style="width:350px;" />
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button v-loading="loading" type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import { saveSceneVideo, editSceneVideo, getContextSenceDetail } from '@/api/contest';
+export default {
+    name: 'AddContestTask',
+    data() {
+        return {
+            dialogVisible: false,
+            formModel: {
+                id: '',
+                name: '',
+                url: ''
+            },
+            loading: false
+        };
+    },
+    computed: {
+        rules() {
+            const crules = {
+                name: [
+                    { required: true, message: '请输入场景名称', trigger: 'blur' }
+                ],
+                url: [
+                    { required: true, message: '请输入场景url', trigger: 'blur' }
+                ]
+            };
+            return crules;
+        },
+        title() {
+            return this.formModel.id ? '修改三维场景' : '新建三维场景';
+        }
+    },
+    methods:{
+        doShow(sceneId) {
+            this.dialogVisible = true;
+            if (sceneId) {
+                this.formModel.id = sceneId;
+                getContextSenceDetail(sceneId).then((res) => {
+                    this.formModel.name = res.data.name;
+                    this.formModel.url = res.data.scene.url;
+                }).catch(error => {
+                    this.$message.error(error.message);
+                });
+            } else {
+                this.formModel = {
+                    id: '',
+                    name: '',
+                    url: ''
+                };
+            }
+        },
+        handleClose() {
+            this.formModel = {
+                id: '',
+                name: '',
+                url: ''
+            };
+            this.dialogVisible = false;
+            this.loading = false;
+        },
+        doSave() {
+            this.$refs.ruleForm.validate((valid) => {
+                if (valid) {
+                    this.loading = true;
+                    const data = { name:this.formModel.name, type:'Link',
+                        scene:{url:this.formModel.url}};
+                    if (this.formModel.id) {
+                        editSceneVideo(this.formModel.id, data).then(() => {
+                            this.$message.success('修改三维场景成功！');
+                            this.handleClose();
+                            this.$emit('reloadTable');
+                        }).catch(error => {
+                            this.$message.error(error.message);
+                            this.loading = false;
+                        });
+                    } else {
+                        saveSceneVideo(data).then(() => {
+                            this.$message.success('创建三维场景成功！');
+                            this.handleClose();
+                            this.$emit('reloadTable');
+                        }).catch(error => {
+                            this.$message.error(error.message);
+                            this.loading = false;
+                        });
+                    }
+                }
+            });
+
+        }
+    }
+};
+</script>
+

From 869c86b94d312545cbf08a85ac549699aa84ef1a Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Mon, 27 May 2024 16:57:01 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=89=E7=BB=B4?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/contest/contestDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/contest/contestDetail.vue b/src/views/contest/contestDetail.vue
index 0618f38d6..6ac1d44c0 100644
--- a/src/views/contest/contestDetail.vue
+++ b/src/views/contest/contestDetail.vue
@@ -187,7 +187,7 @@ export default {
             getContextSenceDetail(this.nowData.sceneId).then((res) => {
                 const url = res.data.scene.url;
                 const token = getToken();
-                window.open(`${url}&token=${token}`, '_blank');
+                window.open(`https://joylink.club/gdtraining/index.html?name=${url}/${url}&token=${token}`, '_blank');
                 this.loading = false;
             }).catch(error => {
                 this.$message.error(error.message);

From cef55a4c6b213bc3b205ca6ac1af3c4349bcf5f4 Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Mon, 27 May 2024 17:09:01 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=B8=89=E7=BB=B4url=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/contest/contestDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/contest/contestDetail.vue b/src/views/contest/contestDetail.vue
index 6ac1d44c0..f3e8b190e 100644
--- a/src/views/contest/contestDetail.vue
+++ b/src/views/contest/contestDetail.vue
@@ -187,7 +187,7 @@ export default {
             getContextSenceDetail(this.nowData.sceneId).then((res) => {
                 const url = res.data.scene.url;
                 const token = getToken();
-                window.open(`https://joylink.club/gdtraining/index.html?name=${url}/${url}&token=${token}`, '_blank');
+                window.open(`${url}${token}`, '_blank');
                 this.loading = false;
             }).catch(error => {
                 this.$message.error(error.message);

From 081d5bf63062b4019a5c6174ce48d89eb47437c2 Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Tue, 4 Jun 2024 11:14:54 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=88=90=E9=83=BD=E5=B7=A5=E4=B8=9A?=
 =?UTF-8?q?=E5=AD=A6=E9=99=A2=E7=99=BB=E5=BD=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/thirdLogin/cgyLogin.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/thirdLogin/cgyLogin.vue b/src/views/thirdLogin/cgyLogin.vue
index 69f83fdf6..d2cca5a8a 100644
--- a/src/views/thirdLogin/cgyLogin.vue
+++ b/src/views/thirdLogin/cgyLogin.vue
@@ -27,13 +27,13 @@ export default {
         }
     },
     mounted() {
-        const appId = this.$route.query.appId;
-        const sessionId = this.$route.query.sessionId;
+        const appId = this.$route.query.app_id;
+        const sessionId = this.$route.query.session_id;
         const timeStamp = this.$route.query.timeStamp;
-        const account = this.$route.query.account;
-        const name = this.$route.query.name;
+        const account = this.$route.query.user_name;
+        const name = this.$route.query.nick_name;
         const parentAccount = this.$route.query.parentAccount;
-        const functionId = this.$route.query.functionId;
+        const functionId = this.$route.query.systemId;
         if (appId && account && name) {
             const data = {
                 appId,

From 37e0779d238432de6a2ffac3a3b65cb1e558105e Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Tue, 4 Jun 2024 11:42:34 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=88=90=E9=83=BD=E5=B7=A5=E4=B8=9A?=
 =?UTF-8?q?=E5=AD=A6=E9=99=A2=E7=AC=AC=E4=B8=89=E6=96=B9=E6=96=B0=E5=BC=80?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=85=B3=E9=97=AD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/display/simulationMenu/simulationMenu.vue | 4 +++-
 src/views/thirdLogin/cgyLogin.vue                          | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/newMap/display/simulationMenu/simulationMenu.vue b/src/views/newMap/display/simulationMenu/simulationMenu.vue
index 1f1704596..6b706615d 100644
--- a/src/views/newMap/display/simulationMenu/simulationMenu.vue
+++ b/src/views/newMap/display/simulationMenu/simulationMenu.vue
@@ -227,7 +227,9 @@ export default {
                 this.logout();
                 // });
             } else if (this.$route.query.third) {
-                if (this.$route.query.project === 'cgy' || this.$route.query.project === 'drts') {
+                if (this.$route.query.thirdOpen) {
+                    window.close();
+                } else if (this.$route.query.project === 'cgy' || this.$route.query.project === 'drts') {
                     window.parent.postMessage('back', '*');
                 } else {
                     window.close();
diff --git a/src/views/thirdLogin/cgyLogin.vue b/src/views/thirdLogin/cgyLogin.vue
index d2cca5a8a..a85e4cd28 100644
--- a/src/views/thirdLogin/cgyLogin.vue
+++ b/src/views/thirdLogin/cgyLogin.vue
@@ -63,7 +63,8 @@ export default {
         async enterSimulation() {
             const query = {
                 third: true,
-                query: 'cgy'
+                project: 'cgy',
+                thirdOpen: true
             };
             const resp = await getMapFunctioById(this.$route.query.systemId);
             query.mapId = resp.data.mapId;

From 916bc645ed5d4ac14d1984d13974a05e5b327dde Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Tue, 18 Jun 2024 15:36:57 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E5=9B=BE=E6=B5=8B=E8=AF=95=E5=AE=A2=E6=88=B7=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMap/newMapdraft/mapoperate/terminals/terminals.vue    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue b/src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue
index 3a02cb045..6e8022e90 100644
--- a/src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue
@@ -369,6 +369,11 @@ export default {
                     name: '列车PIS',
                     code: 'pisTrain',
                     isShow: () => type === 'METRO'
+                },
+				{
+                    name: '运行图测试',
+                    code: 'testRunplan',
+                    isShow: () => type === 'METRO'
                 }
             ];
             const terminalList = commonTerminals(type);