Merge remote-tracking branch 'origin/master'

src/api/httpTwo.js

@@ -41,7 +41,7 @@ AIapi.interceptors.response.use((res) => {
     closeLoading();
     let httpMessage = '';
     if (error.response) {
-        // alert('1')
+        alert('1')
         if (error.response.status == '401') {
             if (error.response.data && error.response.data.status == 401) {
                 if (!localStorage.getItem('user')) {

src/api/oneKeyStartStop/index.js

+import httpTwo from '../httpTwo'
+
+// 查询一键启停状态
+export const selectOneStartStop = params => {
+    return httpTwo.get(`/busVoiceCommands/selectOneStartStop?stationId=` + params.stationId + '&unitId=' + params.unitId)
+}

src/api/screenDisplay.js

@@ -97,6 +97,13 @@ export const getGYSupplyWaterTrend = params => {
   })
 }
 
+//获取港益换热站视频数据
+export const GYTransferVideo = params => {
+  return http.post(`/api/gis/GYTransferVideo`, params).then(res => res).catch(function (error) {
+    console.log(error);
+  })
+}
+
 //获取实时数据接口
 export const postGYPipeReal = params => {
   return http.post(`/api/gis/GYPipeReal`).then(res => res).catch(function (error) {

src/components/screenDisplay.vue

@@ -534,6 +534,7 @@ import {
   GetGYHeatSourceTrend,
   getGYTransferRealData,
   getGYTransferAlarmData,
+  GYTransferVideo,
 } from "../api/screenDisplay";
 import moment from 'moment'
 import {defineComponent} from "vue";
@@ -689,7 +690,27 @@ export default defineComponent({
     },
     handleToDetail() {
       this.$router.push("/Alarm")
+      localStorage.setItem("activeTab", "/Alarm");
+    this.addTab()
     },
+    addTab() {
+      const editableTabs =   [
+        {
+          title: "首页-实时热源",
+          path: "/RealSupply",
+        },
+        {
+          title: '报警信息',
+          path: '/Alarm',
+        }
+      ]
+      //本地存储
+      window.sessionStorage.setItem(
+          "tabList",
+          JSON.stringify(editableTabs)
+      );
+      window.sessionStorage.setItem('activePath','/Alarm')
+},
     handleShowMore(type) {
       if(type === '1') {
         this.alarmList = this.alarmDataList
@@ -2902,6 +2923,17 @@ export default defineComponent({
     thirdLevelPageFun() {
       this.handleGetGYTransferRealData() // 获取港益换热站实时能耗数据
       this.handleGetGYTransferAlarmData()  // 获取港益换热站报警数据
+      this.getGYTransferVideo() // 获取港益换热站视频数据
+    },
+    // 获取港益换热站视频数据
+    getGYTransferVideo() {
+      const params = {
+        // id: this.markerThree.stationId
+         id: '9C9D13FA-BA07-4394-8441-55F98F160EDA'
+      }
+      GYTransferVideo(params).then(res => {
+
+      })
     },
     // 获取港益换热站实时能耗数据
     handleGetGYTransferRealData() {

src/router/index.js

@@ -552,6 +552,14 @@ const routes = [
           title: "语音指令部署位置",
         },
       },
+      {
+        path: "/Remote/OnekeyStartStop",
+        name: "OnekeyStartStop",
+        component: () => import("@/views/RemotePage/OnekeyStartStopPage.vue"),
+        meta: {
+          title: "一键启停",
+        },
+      },
     ],
   },
   {

src/views/Video/VideoViewPage.vue

@@ -30,7 +30,7 @@
     </div>
     <!-- <div>
     点击此处前往海康平台下载视频播放插件
-    </div> -->
+</div> -->
   </el-card>
   <div class="videoPlayer" id="playWnd">
 
@@ -96,7 +96,7 @@ var pubKey = '';
 var playWnd_width = window.innerWidth - 200;
 var playWnd_height = window.innerHeight - 220;
 var oWebControl;
-var videoIp;
+var videoIp="218.69.97.198";;
 var videoPort=1443;
 const enterpriseId = ref(null);
 enterpriseId.value = store.getters.getEnterpriseId();
@@ -234,8 +234,8 @@ function visibleCascader(isshow) {
   }
 }
 
-$(document).ready(function () {
-    initIp();//ip
+$(document).ready(async function () {
+  await initIp();//ip
   initPlugin();
   $('#startPlay').click(
       function () {
@@ -327,7 +327,9 @@ function cbIntegrationCallBack(oData) {
 
 //初始化ip
 async function initIp(){
-    const res = await fetch('https://api.ipify.org?format=json');
+  var res;
+  try{
+    res = await fetch('https://api.ipify.org?format=json');
     const data = await res.json();
     var serverIP = data.ip;
     if(serverIP === "111.160.132.74" || serverIP === "218.69.97.198"){
@@ -335,11 +337,18 @@ async function initIp(){
     }else{
       videoIp="218.69.97.198";
     }
+  }catch(e){
+    videoIp="218.69.97.198";
+  }
+
+
+
 
   videoPort=1443;
 }
 //初始化插件
 function init() {
+
   getPubKey(function () {
     console.log("ip:"+videoIp);
     ////////////////////////////////// 请自行修改以下变量值	////////////////////////////////////