From 6a82d745d971c2af2ad3caaf48d757f07a8aadda Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Fri, 20 Dec 2019 13:48:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=AB=98=E7=BA=A7=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=94=9F=E6=88=90code=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/utils/Uid.js                             | 12 ++++++++++++
 src/utils/baseUrl.js                                 |  4 ++--
 .../dataRelation/automaticoperate/route.vue          |  4 ++--
 .../newMapdraft/dataRelation/pathoperate/route.vue   |  6 +++---
 .../dataRelation/routeoperate/protect.vue            |  4 ++--
 .../newMapdraft/dataRelation/routeoperate/route.vue  |  6 +++---
 .../dataRelation/routingoperate/route.vue            |  4 ++--
 .../newMapdraft/dataRelation/signaloperate/route.vue |  4 ++--
 .../newMapdraft/dataRelation/turnedoperate/route.vue |  4 ++--
 9 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/src/jmapNew/utils/Uid.js b/src/jmapNew/utils/Uid.js
index 2163c9f81..036d41c25 100644
--- a/src/jmapNew/utils/Uid.js
+++ b/src/jmapNew/utils/Uid.js
@@ -45,3 +45,15 @@ export function getUID(type, list) {
     // use Math.random to make id as unique as possible.
 }
 
+var base = 0;
+
+/**
+ * @public
+ * @param {string} type
+ * @return {string}
+ */
+export function setUID(type) {
+    // use Math.random to make id as unique as possible.
+    return [(type || ''), base++, Math.random().toFixed(5)].join('_');
+}
+
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 1e9afea51..79d1c6346 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,11 +3,11 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        BASE_API = 'https://test.joylink.club/jlcloud';
+        // BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
-        // BASE_API = 'http://192.168.3.82:9000'; // 杜康
+        BASE_API = 'http://192.168.3.82:9000'; // 杜康
     } else {
         BASE_API = process.env.VUE_APP_BASE_API;
     }
diff --git a/src/views/newMap/newMapdraft/dataRelation/automaticoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/automaticoperate/route.vue
index eacf6441d..adc6767b3 100644
--- a/src/views/newMap/newMapdraft/dataRelation/automaticoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/automaticoperate/route.vue
@@ -64,7 +64,7 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { getUID } from '@/jmap/utils/Uid';
+import { setUID } from '@/jmapNew/utils/Uid';
 import { postAutoSignalNew, putAutoSignalNew } from '@/api/jmap/mapdraft';
 import { ViewMode } from '@/scripts/ConstDic';
 import { formatName } from '@/utils/runPlan';
@@ -174,7 +174,7 @@ export default {
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     this.loading = true;
-                    postAutoSignalNew(this.buildModel(getUID('autoSingle'))).then(resp => {
+                    postAutoSignalNew(this.buildModel(setUID('autoSingle'))).then(resp => {
                         this.$message.success(this.$t('map.automaticSignalSuccessful'));
                         this.loading = false;
                         this.clear();
diff --git a/src/views/newMap/newMapdraft/dataRelation/pathoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/pathoperate/route.vue
index c2429bac7..1f3de2982 100644
--- a/src/views/newMap/newMapdraft/dataRelation/pathoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/pathoperate/route.vue
@@ -83,7 +83,7 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { getUID } from '@/jmap/utils/Uid';
+import { setUID } from '@/jmapNew/utils/Uid';
 import { addRouteUnit, setRouteUnit } from '@/api/jmap/pathunit';
 import PathRoute from './pathRoute';
 import { ViewMode } from '@/scripts/ConstDic';
@@ -123,7 +123,7 @@ export default {
             loading: false,
             addModel: {
                 mapId: '',
-                code: getUID('RouteUnit'),
+                code: setUID('RouteUnit'),
                 startSectionCode: '',
                 endSectionCode: '',
                 mapRouteUnitRelList: []
@@ -262,7 +262,7 @@ export default {
                 this.editShow = false;
                 this.addModel = {
                     mapId: this.mapInfo.id,
-                    code: getUID('RouteUnit'),
+                    code: setUID('RouteUnit'),
                     startSectionCode: '',
                     endSectionCode: '',
                     mapRouteUnitRelList: []
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
index fe740aa49..77d95dc02 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
@@ -122,7 +122,7 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { getUID } from '@/jmap/utils/Uid';
+import { setUID } from '@/jmapNew/utils/Uid';
 import { postContinueProtect, putContinueProtect, delContinueProtect } from '@/api/jmap/mapdraft';
 import { ViewMode } from '@/scripts/ConstDic';
 import { deepAssign } from '@/utils/index';
@@ -289,7 +289,7 @@ export default {
         },
         createProtect(parentFunction) {
             if (this.addModel.unlockSectionCode && this.addModel.relSectionSwitchList.length) {
-                const model = this.buildModel(getUID('Protect'));
+                const model = this.buildModel(setUID('Protect'));
                 postContinueProtect(model).then(resp => {
                     this.$emit(parentFunction, model.code);
                 }).catch(() => {
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
index 5e22cb24d..db57c9e7e 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
@@ -207,7 +207,7 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { getUID } from '@/jmap/utils/Uid';
+import { setUID } from '@/jmapNew/utils/Uid';
 import { postRouteNew, putRouteNew, getRouteNewList, getContinueProtectList } from '@/api/jmap/mapdraft';
 import RouteDetail from './detail';
 import ProtectOperate from './protect';
@@ -426,10 +426,10 @@ export default {
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     this.loading = true;
-                    postRouteNew(this.buildModel(overlapCode, getUID('Route'))).then(response => {
+                    postRouteNew(this.buildModel(overlapCode, setUID('Route'))).then(response => {
                         this.$message.success('创建成功');
                         this.loading = false;
-                        this.routeList.push(this.buildModel(getUID('Route')));
+                        this.routeList.push(this.buildModel(setUID('Route')));
                         this.clear();
                     }).catch(() => {
                         this.$messageBox(this.$t('tip.operationAbnormal'));
diff --git a/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
index 7c29dcb2e..af8b650c9 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
@@ -152,7 +152,7 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { getUID } from '@/jmap/utils/Uid';
+import { setUID } from '@/jmapNew/utils/Uid';
 import { addRouting, updateRouting } from '@/api/jmap/mapdraft';
 import { ViewMode } from '@/scripts/ConstDic';
 import { formatName } from '@/utils/runPlan';
@@ -327,7 +327,7 @@ export default {
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     this.loading = true;
-                    addRouting(this.buildModel(getUID('Routing'))).then(resp => {
+                    addRouting(this.buildModel(setUID('Routing'))).then(resp => {
                         this.$message.success(this.$t('tip.pathCreationSuccessful'));
                         this.loading = false;
                         this.clear();
diff --git a/src/views/newMap/newMapdraft/dataRelation/signaloperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/signaloperate/route.vue
index ffbc56bf6..4aa52b9af 100644
--- a/src/views/newMap/newMapdraft/dataRelation/signaloperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/signaloperate/route.vue
@@ -44,7 +44,7 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { getUID } from '@/jmap/utils/Uid';
+import { setUID } from '@/jmapNew/utils/Uid';
 import { postApproachSection, putApproachSection } from '@/api/jmap/mapdraft';
 import { ViewMode } from '@/scripts/ConstDic';
 import { formatName } from '@/utils/runPlan';
@@ -146,7 +146,7 @@ export default {
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     this.loading = true;
-                    postApproachSection(this.buildModel(getUID('signalSection'))).then(resp => {
+                    postApproachSection(this.buildModel(setUID('signalSection'))).then(resp => {
                         this.$message.success(this.$t('map.signalSectionSuccessful'));
                         this.loading = false;
                         this.clear();
diff --git a/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue
index fbb24c179..d153476c8 100644
--- a/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue
@@ -44,7 +44,7 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { getUID } from '@/jmap/utils/Uid';
+import { setUID } from '@/jmapNew/utils/Uid';
 import { postAutoReentry, putAutoReentry, getRouteNewList } from '@/api/jmap/mapdraft';
 import { ViewMode } from '@/scripts/ConstDic';
 import { formatName } from '@/utils/runPlan';
@@ -159,7 +159,7 @@ export default {
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     this.loading = true;
-                    postAutoReentry(this.buildModel(getUID('TurnedAround'))).then(resp => {
+                    postAutoReentry(this.buildModel(setUID('TurnedAround'))).then(resp => {
                         this.$message.success('创建折返成功！');
                         this.loading = false;
                         this.clear();