大屏视频监控出调整

bigScreen3/src/views/dashboard/cpns/VideoSurveillance.vue

@@ -41,7 +41,6 @@
               playsinline 
               controls 
               class="video-player" 
-              style="width: 100%; height: 100%; object-fit: contain;"
               autoplay
               muted
             ></video>
@@ -60,6 +59,10 @@ import { getPageListData } from '@/api/index'
 import videoSrc from '@/assets/mp4/ziyuan.mp4'
 import defaultImg from '@/assets/defaultImg.png'
 import axios from 'axios'
+import { getToken } from '@/utils/auth'
+import { ElMessage } from 'element-plus'
+
+
 
 // 监控设备列表（响应式数据）
 const videoList = ref([])
@@ -86,8 +89,8 @@ const fetchDriveInfoList = async () => {
         return {
           name: device.deviceName || device.fRemark || '未知监控设备',
           time: formattedTime,
-          deviceId: device.id || device.deviceId || '',
-          streamUrl: 'rtsp://'+device.fAccount+':'+device.fPassword+'@'+device.fIp,
+          deviceId: device.fDriveid,
+          streamUrl: device.url,
           fImg: device.fImg || '' // 保存设备图片地址
         }
       })
@@ -134,14 +137,18 @@ watch(() => props.selectedProjectId, () => {
   // 重新获取数据
   fetchDriveInfoList();
 }, { immediate: true })
-
+const fDriveid = ref('')
 // 关闭所有视频并打开模态框
 function closeAllVideosAndOpenModal(video) {
-  
+  if (!video.streamUrl) {
+    ElMessage.warning('视频流URL为空，无法播放');
+
+    return;
+  }
   // 打开模态框播放当前视频
   selectedVideo.value = video
   isModalOpen.value = true
-  
+  fDriveid.value = video.deviceId
   // 等待模态框完全渲染后初始化视频元素并自动播放
   setTimeout(() => {
     if (videoElement.value) {
@@ -159,7 +166,7 @@ function closeAllVideosAndOpenModal(video) {
 // 关闭视频播放模态框
 function closeModal() {
   // 先触发截图并上传
-  // captureAndUploadSnapshot();
+  captureAndUploadSnapshot();
   
   // 停止视频播放
   if (videoElement.value) {
@@ -204,29 +211,57 @@ async function captureAndUploadSnapshot() {
           console.warn('创建截图失败');
           return;
         }
-        
+        console.log('截图创建成功，大小:', blob.size);
         try {
-          // 创建FormData用于上传
+          // 创建FormData用于上传，添加文件名参数
           const formData = new FormData();
-          const fileName = `${selectedVideo.value?.deviceId || 'unknown'}_${new Date().getTime()}_snapshot.jpg`;
+          // 为文件添加文件名参数，格式为：监控截图_时间戳.jpg
+          const fileName = `监控截图_${Date.now()}.jpg`;
           formData.append('file', blob, fileName);
           
-          // 添加其他可能需要的参数
-          if (selectedVideo.value) {
-            formData.append('deviceId', selectedVideo.value.deviceId);
-            formData.append('deviceName', selectedVideo.value.name);
-          }
-          
           // 上传图片到指定接口
-          const response = await axios.post('/file/uploadFacilityFile', formData, {
+          const response = await axios.post(import.meta.env.VITE_APP_BASE_API +'/file/uploadFile', formData, {
             headers: {
               'Content-Type': 'multipart/form-data',
-              'token': localStorage.getItem('token') || ''
+              'fSource':2,
+              'token':getToken()
             },
             timeout: 10000 // 设置10秒超时
           });
           
           console.log('截图上传成功:', response.data);
+          // 上传成功后保存图片路径到设备信息
+          if (response.data && response.data.data && response.data.data[0]) {
+            const fFileurl = response.data.data[0].fFileurl;
+            // 获取当前设备ID
+           
+            
+            // 调用更新设备信息接口保存图片路径
+            try {
+              if (!fDriveid.value) {
+                console.warn('设备ID为空，无法保存图片路径');
+                return;
+              }
+              await axios.post(import.meta.env.VITE_APP_BASE_API + 'tbasedriveinfo/updateDriveInfo', {
+                data: {
+                  fDriveid: fDriveid.value,
+                  fImg: fFileurl,
+                }
+              }, {
+                headers: {
+                  'Content-Type': 'application/json',
+                  'token': getToken(),
+                  'fSource':2
+                }
+              });
+              fDriveid.value = ''
+              fetchDriveInfoList()
+              console.log('图片路径保存成功');
+            } catch (saveError) {
+              console.error('图片路径保存失败:', saveError.message || saveError);
+            }
+          }
+
         } catch (uploadError) {
           console.error('截图上传失败:', uploadError.message || uploadError);
         }
@@ -551,7 +586,6 @@ onUnmounted(() => {
     height: 72vh;
     background-image: url('@/assets/bj2.png');
     background-size: 100% 100%;
-    background-size: cover;
     background-position: center;
     background-repeat: no-repeat;
     border-radius: 6px;
@@ -564,7 +598,7 @@ onUnmounted(() => {
       flex: 1;
       display: flex;
       flex-direction: column;
-      
+      height: 100%;
       .video-wrapper {
         position: relative;
         flex: 1;
@@ -577,7 +611,7 @@ onUnmounted(() => {
         .video-player {
           width: 100%;
           height: 100%;
-          object-fit: contain;
+          object-fit: cover;
           background: #000;
           cursor: pointer;
         }

web/src/views/sbss_manage/drivelist.vue

@@ -167,17 +167,8 @@
           <el-form-item label="设备编号" prop="fNvscode" >
             <el-input  v-model="tableForm.fNvscode" placeholder="设备编号"></el-input>
           </el-form-item>
-          <el-form-item label="地址" prop="fIp" >
-            <el-input  v-model="tableForm.fIp" placeholder="设备地址"></el-input>
-          </el-form-item>
-          <el-form-item label="端口" prop="fPort" >
-            <el-input  v-model="tableForm.fPort" placeholder="设备端口"></el-input>
-          </el-form-item>
-          <el-form-item label="用户名" prop="fAccount" >
-            <el-input  v-model="tableForm.fAccount" placeholder="登录用户名"></el-input>
-          </el-form-item>
-          <el-form-item label="密码" prop="fPassword" >
-            <el-input  v-model="tableForm.fPassword" placeholder="登录密码" show-password></el-input>
+          <el-form-item label="地址" prop="url" >
+            <el-input  v-model="tableForm.url" placeholder="设备地址"></el-input>
           </el-form-item>
           <el-form-item label="设备名称" prop="fName" >
             <el-input  v-model="tableForm.fName" placeholder="设备名称"></el-input>
@@ -397,10 +388,7 @@
                   fIsuse: this.tableForm.fIsuse,
                   fState: this.tableForm.fState,
                   fDriveid: null,
-                  fIp: this.tableForm.fIp,
-                  fPort: this.tableForm.fPort,
-                  fAccount: this.tableForm.fAccount,
-                  fPassword: this.tableForm.fPassword
+                  url: this.tableForm.url
                 }
               })
               // console.log('res', res)
@@ -427,14 +415,11 @@
               fParkname: this.tableForm.fParkname,
               fParkid: this.tableForm.fParkid,
               fIsuse: this.tableForm.fIsuse,
-                  fX: this.tableForm.fX,
-                  fY: this.tableForm.fY,
-                  fState: this.tableForm.fState,
-                  fDriveid: this.tableForm.fDriveid,
-                  fIp: this.tableForm.fIp,
-                  fPort: this.tableForm.fPort,
-                  fAccount: this.tableForm.fAccount,
-                  fPassword: this.tableForm.fPassword
+              fX: this.tableForm.fX,
+              fY: this.tableForm.fY,
+              fState: this.tableForm.fState,
+              fDriveid: this.tableForm.fDriveid,
+              url: this.tableForm.url,
             }
           }).then(res => {
             // console.log('res修改,', res)

web/src/views/workorder/workordercreate.vue

@@ -367,7 +367,7 @@
       resetForm() {
         // 重置表单数据
         this.fileList = []
-        this.sizeForm.type = ''
+        // this.sizeForm.type = ''
         this.sizeForm.company = ''
         this.sizeForm.director = ''
         this.sizeForm.unit = ''

wxproject/packageA/pages/onDuty/onDuty.wxml

@@ -3,9 +3,9 @@
 	<view class="calendar">
 		<view class='bcfff'>
 			<view class="map_box">
-        <view class="jilu"  catchtap="nav" data-url="/packageA/pages/recordDetail/recordDetail">
-          打卡记录
-        </view>
+			<view class="jilu"  catchtap="nav" data-url="/packageA/pages/recordDetail/recordDetail">
+			打卡记录
+			</view>
 				<map id="map" longitude="{{posObj.longitude}}" latitude="{{posObj.latitude}}" markers='{{markers}}' scale="17" show-location class="mapSize" polyline="{{polyline}}" circles="{{circles}}" ></map>
 			</view>
 			<view class="timeactive">