From 23a24471815a58f61805d6024a155163a235bf51 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Thu, 20 Jul 2023 11:10:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=9B=E6=80=BB=E6=8C=87=E7=A4=BA=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datie_02/menus/menuDialog/childDialog/twoConfirmation.vue | 2 +-
 .../theme/datie_02/menus/menuDialog/stationControlConvert.vue | 2 +-
 src/utils/baseUrl.js                                          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/childDialog/twoConfirmation.vue
index 65a4410d7..5e6a6b832 100644
--- a/src/jmapNew/theme/datie_02/menus/menuDialog/childDialog/twoConfirmation.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuDialog/childDialog/twoConfirmation.vue
@@ -117,7 +117,7 @@ export default {
                 operate.cmdType = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL;
                 operate.operation = OperationEvent.StationControl.emergencyStationControl.confirm.operation;
             } else if (this.operation == OperationEvent.StationControl.forcedStationControl.menu.operation) {
-                operate.cmdType = CMD.ControlConvertMenu.CMD_CM_FORCE_STATION_CONTROL;
+                operate.cmdType = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL;
                 operate.operation = OperationEvent.StationControl.forcedStationControl.confirm.operation;
             }
             this.$emit('setOperate', { selection: this.operate.selection, commit: true });
diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/stationControlConvert.vue
index 7bad2ac58..cb686d661 100644
--- a/src/jmapNew/theme/datie_02/menus/menuDialog/stationControlConvert.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuDialog/stationControlConvert.vue
@@ -50,7 +50,7 @@
     </el-table>
     <el-row class="button-group">
       <el-col :span="10" :offset="3" class="control_button">
-        <el-button style="width: 150px" v-if="isFork" :id="domIdFork" :disabled="disabledCommit" @click="forkCommit">Forced Station Control</el-button>
+        <el-button style="width: 200px" v-if="isFork" :id="domIdFork" :disabled="disabledCommit" @click="forkCommit">Emergency Station Control</el-button>
         <el-button style="width: 150px" v-if="isRequest" :id="domIdRequest" :disabled="disabledCommit" @click="requestCommit">To Station Control</el-button>
         <el-button style="width: 150px" v-if="isConter" :id="domIdConter" :disabled="disabledCommit" @click="conterCommit">To Center Control</el-button>
       </el-col>
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 09f5d349f..c3d8d55e6 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -23,13 +23,13 @@ export function handlerUrl() {
     let OSS_URL;
     if (process.env.NODE_ENV === 'development') {
         // 开发分支
-        // BASE_API = 'http://192.168.3.233/rtss-server';
+        BASE_API = 'http://192.168.3.233/rtss-server';
         // BASE_API = 'https://joylink.club/jlcloud';
         // BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://114.116.51.125/jlcloud';
         // BASE_API = 'http://192.168.3.47:9000'; // 周寅
         // BASE_API = 'http://192.168.3.94:9000'; // 旭强
-        BASE_API = 'http://192.168.3.15:9000'; // 张赛
+        // BASE_API = 'http://192.168.3.15:9000'; // 张赛
         // BASE_API = 'http://192.168.3.5:9000'; // 夏增彬
         // BASE_API = 'http://192.168.3.37:9000'; // 卫志宏
         // BASE_API = 'http://b29z135112.zicp.vip';