Merge remote-tracking branch 'origin/main'

src/components/VideoComponent/index.vue

@@ -148,17 +148,31 @@ export default {
         console.log("==设备编码不全，无法播放==");
         return;
       }
+
+      if (typeof UVPVideoObj === 'undefined') {
+        console.log("UVPVideoObj尚未加载，延迟重试...");
+        setTimeout(() => {
+          that.videoPlay(options);
+        }, 100);
+        return;
+      }
+
       if (!that.nrUvpVideoObj) {
         console.log("==创建播放器==");
-        that.nrUvpVideoObj = new UVPVideoObj({
-          id: that.clientId,
-          winNum: options.winNum,
-          ip: that.cameraConfig.ip,
-          port: that.cameraConfig.port,
-          token: that.cameraConfig.token,
-          ak: that.cameraConfig.ak,
-          callback: onEventNotify
-        });
+        try {
+          that.nrUvpVideoObj = new UVPVideoObj({
+            id: that.clientId,
+            winNum: options.winNum,
+            ip: that.cameraConfig.ip,
+            port: that.cameraConfig.port,
+            token: that.cameraConfig.token,
+            ak: that.cameraConfig.ak,
+            callback: window.onEventNotify
+          });
+        } catch (error) {
+          console.error("创建UVPVideoObj实例失败:", error);
+          return;
+        }
       }
       console.log("==开始播放==>参数集: ", JSON.stringify(options));
       that.nrUvpVideoObj.uvpVideoPlay({
@@ -168,21 +182,10 @@ export default {
         streamType: 1
       });
     },
-
+    
     // 云台控制
     videoControl(options) {
       if (!options?.code) return;
-      // if (!this.nrUvpVideoObj) {
-      //   this.nrUvpVideoObj = new UVPVideoObj({
-      //       id: that.clientId,
-      //       winNum: options.winNum,
-      //       ip: that.cameraConfig.ip,
-      //       port: that.cameraConfig.port,
-      //       token: that.cameraConfig.token,
-      //       ak: that.cameraConfig.ak,
-      //       callback: onEventNotify
-      //   });
-      // }
       console.log("==进入云台操作==>参数集: ", JSON.stringify(options));
       this.nrUvpVideoObj.uvpVideoControl({
         devCode: options.code,

src/utils/request.js

@@ -29,13 +29,7 @@ service.interceptors.request.use(config => {
   // 是否需要防止数据重复提交
   const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
   if (getToken()) {
-     const loginPath = isPadDevice() ? 2 : 1;
-    console.log('loginPath:',loginPath)
-    if(loginPath==1){
       config.headers['SX-Access-Token'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-    }else{
-      config.headers['SX-Access-Token'] =getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-    }
   }
   // 请求参数加密
   if (process.env.VUE_APP_AES_ENCRYPT_ENABLED == 'true') {
@@ -110,7 +104,7 @@ service.interceptors.response.use(
     }
 
     // 判断是否为登录接口
-    if (res.config.url.includes('/login' || res.config.url.includes('/loginPad'))) {
+    if (res.config.url.includes('/login')) {
       // 跳过登录接口的统一处理，交由业务逻辑处理
       if (code !== 200) {
         return Promise.reject(res.data); // 返回原始错误数据
@@ -128,14 +122,7 @@ service.interceptors.response.use(
         }).then(() => {
           isRelogin.show = false;
           store.dispatch('LogOut').then(() => {
-             const loginPath = isPadDevice() ? 2 : 1;
-            // next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
-            if(loginPath==1){
               location.href = '#/login';
-              }else{
-                location.href = '#/loginPad';
-              }
-
           });
         }).catch(() => {
           isRelogin.show = false;

src/views/pad/building/energyRateDialog.vue

@@ -2265,6 +2265,7 @@ export default {
           position: absolute;
           margin-top: -60px;
           margin-left: 130px;
+          z-index: 1;
 
           .macBox {
             width: 325px;

src/views/pad/engineering/main.vue

@@ -733,7 +733,7 @@ export default {
       position: absolute;
       right: 50px;
       left: 50px;
-      bottom: 50px;
+      bottom: 80px;
 
       .bottom-left {
         .left-item {

src/views/pad/engineering/unitAccessto.vue

@@ -542,11 +542,11 @@
       }
       .snd{
         width:30%;
-        text-align: left;
+        text-align: center;
       }
       .thd{
         width:30%;
-        text-align: left;
+        text-align: center;
       }
     }
 

src/views/pad/engineering/unitProjectDia.vue

@@ -8,7 +8,7 @@
         <div class="firY">摄像头数量</div>
       </div>
       <div class="dataList">
-        <div class="flex-row" v-for="(item,index) in dataList" :key="index" @click="choose(item.id)">
+        <div class="flex-row" v-for="(item,index) in dataList" :key="index">
           <div class="groX">{{item.projectName}}</div>
           <div class="groY">{{item.cameraNum}}</div>
         </div>

src/views/pad/logistics/main.vue

@@ -482,7 +482,7 @@ export default {
     position: absolute;
     right: 50px;
     left: 50px;
-    bottom: 10px;
+    bottom: 5px;
     .left-item {
       width: 180px;
       height: 30px;

src/views/pad/main/main.vue

@@ -546,7 +546,7 @@ export default {
       position: absolute;
       right: 50px;
       left: 50px;
-      bottom: 50px;
+      bottom: 40px;
 
       .bottom-left {
         .left-item {

src/views/pad/official/main.vue

@@ -599,7 +599,7 @@ export default {
       position: absolute;
       right: 50px;
       left: 50px;
-      bottom: 50px;
+      bottom: 80px;
 
       .bottom-left {
         .left-item {

src/views/screen/building/energyRateDialog.vue

@@ -2262,6 +2262,7 @@ export default {
           position: absolute;
           margin-top: -60px;
           margin-left: 130px;
+          z-index: 1;
 
           .macBox {
             width: 325px;

src/views/screen/engineering/issueSubDia.vue

@@ -59,7 +59,7 @@
           <img width="100%" :src="dialogImageUrl" v-if="fileFlag" style="height: 100%;object-fit: cover;">
         </div>
         <el-button style="width: 100px;margin-top: 10px;margin-right: 10px;border: 1px solid #00FFFF;border-radius: 2px;" @click="add">提交</el-button>
-        <el-button style="width: 100px;margin-top: 10px;background: rgba(15, 86, 86, 0.54);color: #00ffff;border: 1px solid #00FFFF;border-radius: 2px;">取消</el-button>
+        <el-button style="width: 100px;margin-top: 10px;background: rgba(15, 86, 86, 0.54);color: #00ffff;border: 1px solid #00FFFF;border-radius: 2px;" @click="close">取消</el-button>
       </div>
     </div>
   </div>
@@ -70,7 +70,7 @@ import { add } from "@/api/screen/service";
 import pinyin from "../data/pinyin.js";
 
 export default {
-  name: "UnitCamera",
+  name: "IssueSubDia",
   props: {
     projectId:{
       type: Number,

src/views/screen/engineering/monitorLive.vue

@@ -199,6 +199,7 @@ export default {
     },
 
     amplify() {
+      this.direction=0x0303
       console.log(this.videoObj,'========================aaa');
       console.log("视频播放编号", this.code);
       if (!this.videoObj)
@@ -212,6 +213,7 @@ export default {
     },
 
     reduce() {
+      this.direction=0x0301
       console.log(this.videoObj,'========================aaa');
       console.log("视频播放编号", this.code);
       if (!this.videoObj)
@@ -377,7 +379,7 @@ export default {
   .c1{
   width: 50px;
   height: 30px;
-  background-color: rgba(88,139,196,0.37);box-shadow: 0 0 15px rgb(47,113,124);
+  background-color: rgb(6 28 52 / 37%);;box-shadow: 0 0 15px #123a41;
   display: flex;
   position:absolute;
   justify-content: center;
@@ -390,7 +392,7 @@ export default {
   width: 150px;
   height: 150px;
   border-radius: 50%;
-  background-color: rgba(88,139,196,0.37);box-shadow: 0 0 15px rgb(47,113,124);
+  background-color: rgb(6 28 52 / 37%);;box-shadow: 0 0 15px #123a41;
   display: flex;
   position:absolute;
   justify-content: center;

src/views/screen/engineering/unitAccessto.vue

@@ -542,11 +542,11 @@ export default {
     }
     .snd{
       width:30%;
-      text-align: left;
+      text-align: center;
     }
     .thd{
       width:30%;
-      text-align: left;
+      text-align: center;
     }
   }
 

src/views/screen/logistics/main.vue

@@ -482,7 +482,7 @@ export default {
     position: absolute;
     right: 50px;
     left: 50px;
-    bottom: 10px;
+    bottom: 15px;
     .left-item {
       width: 180px;
       height: 30px;