JX.LI 1 jaar geleden
bovenliggende
commit
7aec174f12
2 gewijzigde bestanden met toevoegingen van 6 en 36 verwijderingen
  1. 3 36
      src/views/eventdetailsdialog.vue
  2. 3 0
      src/views/firespread.vue

+ 3 - 36
src/views/eventdetailsdialog.vue

@@ -3146,10 +3146,7 @@
         // imageTofile是给截图范围内的父级元素自定义的ref名称
         // let canvasBox = this.$refs.imageTofile
         let canvasBox = document.getElementById("forestWarmSuperMap");
-        // let toolbar = document.getElementById("toolbar");
-        // if (toolbar != null) {
-        //   canvasBox.removeChild(toolbar);
-        // }
+
         // 获取父级的宽高
         const width = parseInt(window.getComputedStyle(canvasBox).width);
         const height = parseInt(window.getComputedStyle(canvasBox).height);
@@ -3225,35 +3222,6 @@
       preview(cameraParam) {
         if (cameraParam.type == "1") {
           this.showTVWall(cameraParam.code, cameraParam.name);
-          // getDahuaVideoServer().then(newResponse => {
-          //   console.log(newResponse)
-          //   this.ws.detectConnectQt().then(res => {
-          //     if (res) { // 连接客户端成功
-          //       this.alertLogin()
-          //       this.ws.login({
-          //         loginIp: newResponse.loginIp,
-          //         loginPort: newResponse.loginPort,
-          //         userName: newResponse.userName,
-          //         userPwd: newResponse.userPwd,
-          //         token: '',
-          //         https: 1
-          //       })
-          //       this.ws.on('loginState', (res) => {
-          //         this.isLogin = res
-          //         console.log('---res-----', res)
-          //         if (res) {
-          //           this.alertLoginSuccess()
-          //           this.activePanel = 'key2'
-          //           this.realTimeVideoDialog(cameraParam.code)
-          //         } else {
-          //           this.alertLoginFailed()
-          //         }
-          //       })
-          //     } else { // 连接客户端失败
-          //       this.alertReinstall()
-          //     }
-          //   })
-          // })
         } else if (cameraParam.type == "0") {
           let that = this;
           that.cameraVisible = true;
@@ -3512,7 +3480,7 @@
         selectConfigKey('meeting_plugin_url').then(response => {
           that.$alert(
             "如您已经安装请点击【确定】,如未安装可<a style='text-decoration:underline;color:blue;' href='" + response.data +
-            "'>点击此处</ a>进行下载",
+            "'>点击此处</a >进行下载",
             "该功能需要使用云会议客户端", {
               confirmButtonText: "确定",
               dangerouslyUseHTMLString: true,
@@ -3532,7 +3500,6 @@
       /** ----------------------------------视频会议结束------------------------------------- */
     },
   };
-
   // 推送消息
   function cbIntegrationCallBack(oData) {
     console.log(JSON.stringify(oData.responseMsg));
@@ -3897,4 +3864,4 @@
       }
     }
   }
-</style>
+</style>

+ 3 - 0
src/views/firespread.vue

@@ -1095,6 +1095,9 @@
   import {
     joinConferences
   } from "@/api/meeting";
+  import {
+    selectConfigKey
+  } from "@/api/system/config";
   import findUserByDept from '@/views/findUserByDept'
   import Cookies from "js-cookie"; //责任人选择弹框
   export default {