diff --git a/src/assets/js/http.js b/src/assets/js/http.js index fd882353..1b2b505a 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -83,12 +83,12 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江 // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益(上海建工) // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 - // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 + axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 - axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 + // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上(最新)地址 // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上(最新)地址 diff --git a/src/components/videoModule/playBack/playBack.vue b/src/components/videoModule/playBack/playBack.vue index 0fb9f2e6..1e7e71e8 100644 --- a/src/components/videoModule/playBack/playBack.vue +++ b/src/components/videoModule/playBack/playBack.vue @@ -405,8 +405,7 @@ export default { //关闭视频窗口 closeWindow() { - if (this.oWebControl != null) { - this.oWebControl.JS_HideWnd(); // 先让窗口隐藏,规避可能的插件窗口滞后于浏览器消失问题 + this.oWebControl.JS_HideWnd(); // 先让窗口隐藏,规避可能的插件窗口滞后于浏览器消失问题 this.oWebControl.JS_Disconnect().then( () => { // 断开与插件服务连接成功 @@ -415,7 +414,6 @@ export default { // 断开与插件服务连接失败 } ); - } } } }; diff --git a/src/views/projectFront/replayVideoManage/components/playBack/playBack.vue b/src/views/projectFront/replayVideoManage/components/playBack/playBack.vue index 8086667e..20f871c4 100644 --- a/src/views/projectFront/replayVideoManage/components/playBack/playBack.vue +++ b/src/views/projectFront/replayVideoManage/components/playBack/playBack.vue @@ -203,7 +203,7 @@ export default { var buttonIDs = "0,16,256,257,258,259,260,512,513,514,515,516,517,768,769"; //自定义工具条按钮 ////////////////////////////////// 请自行修改以上变量值 //////////////////////////////////// - + var toolBarButtonIDs = "2048,2049,2050,2304,2306,2307,2308,2309,4096,4608,4097,4099,4098,4609,4100"; //自定义回放功能底部工具条按钮 this.oWebControl .JS_RequestInterface({ //通用请求响应接口 @@ -221,7 +221,8 @@ export default { encryptedFields: encryptedFields, //加密字段 showToolbar: showToolbar, //是否显示工具栏 showSmart: showSmart, //是否显示智能信息 - buttonIDs: buttonIDs //自定义工具条按钮 + buttonIDs: buttonIDs, //自定义工具条按钮 + toolBarButtonIDs: toolBarButtonIDs //自定义回放功能工具条按钮 }) }) .then(oData => { @@ -386,8 +387,7 @@ export default { //关闭视频窗口 closeWindow() { - if (this.oWebControl != null) { - this.oWebControl.JS_HideWnd(); // 先让窗口隐藏,规避可能的插件窗口滞后于浏览器消失问题 + this.oWebControl.JS_HideWnd(); // 先让窗口隐藏,规避可能的插件窗口滞后于浏览器消失问题 this.oWebControl.JS_Disconnect().then( () => { // 断开与插件服务连接成功 @@ -396,7 +396,6 @@ export default { // 断开与插件服务连接失败 } ); - } } } };