修改了AI无人站搜索框和报警监控页面分辨率问题

src/components/screenDisplay.vue

@@ -461,7 +461,7 @@ import AMapLoader from "@amap/amap-jsapi-loader";
             <div class="moreInfo" v-show="hasVideo2" @click="nextVideo2()">下一个</div>
             <div class="moreInfo" v-show="hasVideo2" @click="moreVideo2()">更多》</div>
           </div>
-          <div v-if="true" class="videoLoading-overlay2">
+          <div v-if="videoLoading2" class="videoLoading-overlay2">
             <div class="videoLoading-spinner"></div>
             <p> 视频加载中，请稍后......</p>
           </div>
@@ -605,7 +605,7 @@ import AMapLoader from "@amap/amap-jsapi-loader";
         <div class="videoInfo" ref="myDialogContainer">
           <div class="alarmInfo_header">
             <div class="alarmInfo_title">{{stationName}}</div>
-            <div class="alarmInfo_close" @click="handleVideoClose2">X</div>
+            <div v-if="showVideoClose2" class="alarmInfo_close" @click="handleVideoClose2">X</div>
           </div>
           <div v-if="videoAllLoading2" class="videoLoading-overlayAll2">
             <div class="videoLoading-spinner"></div>
@@ -726,6 +726,7 @@ export default defineComponent({
       videoAllLoading: false,
       videoAllLoading2: true,
       showVideoClose: false,
+      showVideoClose2: false,
       videoNum: 0,
       videoNum2: 0,
       queryParams: '',
@@ -3267,6 +3268,7 @@ export default defineComponent({
     },
     handleInitSuccessAll2() {
       this.videoAllLoading2 = false
+      this.showVideoClose2 = true
     },
     getGYTransferVideo2() {
       this.videoNum = 0
@@ -3363,6 +3365,7 @@ export default defineComponent({
     },
     // 关闭更多视频弹窗
     handleVideoClose2() {
+      this.showVideoClose2 = false
       this.queryParamsAll2 =  ''
       this.stopParamsAll2 += 1
       this.videoOpen2 = false

src/views/AIStation/ExtinguisherPage/ExtinguisherAlarmPage.vue

@@ -47,6 +47,8 @@ function handleCamera(row) {
     path: "/AIStation/ExtinguisherPage/VideoViewPage",
     query: {
       videoId: row.srcIndex,
+      stationName:row.stationName,
+      srcName: row.srcName
     },
   });
 }

src/views/AIStation/ExtinguisherPage/VideoViewPage.vue

 <template>
   <el-card>
     <div class="div-dropdown text-center">
-      <el-row>
-        <el-col :span="7">
-<!--          <span>换热站&nbsp;:&nbsp;</span>-->
-<!--          <el-cascader :options="VideoInfo.selectOptions" v-model="VideoInfo.value" :props="props"-->
-<!--                       collapse-tags clearable :show-all-levels="false" filterable placeholder="请选择" style=""-->
-<!--                       :change="getVideoFromVideoList(VideoInfo.value)" @visible-change="visibleCascader"-->
-<!--                       :disabled="loading"/>-->
-        </el-col>
-        <el-col :span="10">
-
-        </el-col>
-        <el-col :span="7">
-          <el-row>
-            <el-col :span="6">
-            </el-col>
-            <el-col :span="18">
-              <el-button id="startPlay" class="el-button-button" type="primary" :span="6">
-                显示视频</el-button>
-
-              <el-button id="stopPlay" class="el-button-button" type="primary" :span="6"
-                         @click="autoColBoxShow = !autoColBoxShow">隐藏视频</el-button>
-              <el-button id="down" class="el-button-button" type="primary" :span="6"
-                         @click="down">下载插件</el-button>
-            </el-col>
-          </el-row>
-        </el-col>
-      </el-row>
+      <div style="display: flex;justify-content: space-between;align-items: center">
+        <div style="display: flex">
+          <span style="font-weight: bold">{{ stationName }}(换热站)</span>&nbsp;&nbsp;
+          <span style="font-weight: bold">{{ srcName }}(设备)</span>
+        </div>
+        <div style="display: flex">
+          <el-button id="startPlay" class="el-button-button" type="primary" :span="6">
+            显示视频</el-button>
+
+          <el-button id="stopPlay" class="el-button-button" type="primary" :span="6"
+                     @click="autoColBoxShow = !autoColBoxShow">隐藏视频</el-button>
+          <el-button id="down" class="el-button-button" type="primary" :span="6"
+                     @click="down">下载插件</el-button>
+        </div>
+      </div>
     </div>
     <!--    点击此处前往海康平台下载视频播放插件-->
   </el-card>
@@ -42,7 +30,7 @@
   margin: 20px 0 0 0px;
 
   /*播放容器的宽和高设定*/
-  height: 700px;
+  //height: 700px;
 }
 
 .el-button-button {
@@ -60,7 +48,13 @@ import $ from 'jquery'
 import { JSEncrypt } from 'jsencrypt'
 import { WebControl } from '../../../assets/script/video/web-control.esm.min.js'
 import { onActivated, onDeactivated } from 'vue'
+const route = useRoute();
+const loading = ref(false)
+const stationName = ref('')
+const srcName = ref('')
 onActivated(()=>{
+  stationName.value = route.query.stationName;
+  srcName.value = route.query.srcName;
   if(route.query.videoId){
     //获取url中的参数
     VideoInfo.value=route.query.videoId.toLowerCase();
@@ -72,8 +66,6 @@ onDeactivated(() => {
   hidePlay();
 })
 
-const route = useRoute();
-const loading = ref(false)
 onBeforeRouteUpdate((to, from) => {
   var r = useRoute();
   console.log('update')

src/views/AIStation/MoveMonitorPage/VideoViewPage.vue

@@ -28,7 +28,7 @@
   margin: 20px 0 0 0px;
 
   /*播放容器的宽和高设定*/
-  height: 700px;
+  //height: 700px;
 }
 
 .el-button-button {

src/views/AIStation/RecyclePumpPage/RecyclePumpHistoryPage.vue

@@ -602,14 +602,14 @@ function Nindex(index) {
   background-color: grey;
   margin: 0 auto;
   position: absolute;
-  top: 100px;
+  top: 150px;
   left: 50%;
   transform: translateX(-50%);
 }
 
 .details-container {
   position: absolute;
-  top: 100px;
+  top: 150px;
   left: calc(52%);
   width: 48%;
   margin-top: 20px;

src/views/AIStation/RecyclePumpPage/RecyclePumpNewDataPage.vue

@@ -585,14 +585,14 @@ function Nindex(index) {
   background-color: grey;
   margin: 0 auto;
   position: absolute;
-  top: 100px;
+  top: 150px;
   left: 50%;
   transform: translateX(-50%);
 }
 
 .details-container {
   position: absolute;
-  top: 100px;
+  top: 150px;
   left: calc(52%);
   width: 48%;
   margin-top: 20px;

src/views/AIStation/RecyclePumpPage/index.vue

@@ -370,8 +370,10 @@ function getSupplys(){
             <el-form-item label="设备名称:" prop="deviceName">
               <el-input placeholder="请输入内容" style="width: 200px" v-model="queryParams.deviceName" clearable></el-input>
             </el-form-item>
-            <el-form-item label="自动更新:">
-              <el-switch v-model="refresh" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
+            <el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1 || selectedBtn === 2">
+              <el-select placeholder="请选择" clearable style="width: 200px" v-model="queryParams.alarmStatus">
+                <el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.label"/>
+              </el-select>
             </el-form-item>
           </div>
           <div style="display: flex;flex-direction: column;width: 25%" v-if="selectedBtn !== 1">
@@ -400,11 +402,9 @@ function getSupplys(){
               </el-config-provider>
             </el-form-item>
           </div>
-          <div style="width: 20%" v-if="selectedBtn === 1 || selectedBtn === 2">
-            <el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1 || selectedBtn === 2">
-              <el-select placeholder="请选择" clearable style="width: 200px" v-model="queryParams.alarmStatus">
-                <el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.label"/>
-              </el-select>
+          <div style="width: 20%">
+            <el-form-item label="自动更新:">
+              <el-switch v-model="refresh" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
             </el-form-item>
           </div>
         </div>

src/views/AIStation/TransTempPage/TransTempAlarmPage.vue

@@ -93,6 +93,8 @@ function getDataByParams() {
     beginTime: props.queryParams.beginTime,
     endTime: props.queryParams.endTime,
     alarmStatus: props.queryParams.alarmStatus,
+    handleStatus: props.queryParams.handleStatus,
+    alarmType: props.queryParams.alarmType,
     srcName: props.queryParams.deviceName,
     sortList: sortList,
   }
@@ -137,6 +139,8 @@ const handleSortChange = (data) => {
     beginTime: props.queryParams.beginTime,
     endTime: props.queryParams.endTime,
     alarmStatus: props.queryParams.alarmStatus,
+    handleStatus: props.queryParams.handleStatus,
+    alarmType: props.queryParams.alarmType,
     deviceName: props.queryParams.deviceName,
     sortList: sortList,
   }

src/views/AIStation/TransTempPage/VideoViewPage.vue

@@ -28,7 +28,7 @@
   margin: 20px 0 0 0px;
 
   /*播放容器的宽和高设定*/
-  height: 700px;
+  //height: 700px;
 }
 
 .el-button-button {

src/views/AIStation/TransTempPage/index.vue

@@ -195,6 +195,7 @@ const search = () => {
     stationList: stationId,
     handleStatus:queryParams.handleStatus,
     alarmStatus: queryParams.alarmStatus,
+    alarmType: queryParams.alarmType,
     beginTime: queryParams.beginTime,
     endTime: queryParams.endTime,
     deviceName:queryParams.deviceName
@@ -211,6 +212,9 @@ const search = () => {
   if (item.handleStatus === undefined) {
     item.handleStatus = ''
   }
+  if (item.alarmType === undefined) {
+    item.alarmType = ''
+  }
   if (selectedBtn.value === 1) {
     childParams.value = item
   } else if (selectedBtn.value === 2) {
@@ -243,6 +247,7 @@ const handleExport = () => {
     stationId: queryParams.stationId,
     alarmStatus: queryParams.alarmStatus,
     beginTime: queryParams.beginTime,
+    alarmType: queryParams.alarmType,
     endTime: queryParams.endTime,
     deviceName:queryParams.deviceName
   }
@@ -258,6 +263,9 @@ const handleExport = () => {
   if (item.handleStatus === undefined) {
     item.handleStatus = ''
   }
+  if (item.alarmType === undefined) {
+    item.alarmType = ''
+  }
   //获取当前时间
   let now = new Date();
   // 获取各部分时间
@@ -317,6 +325,7 @@ const resetSearch = () => {
   queryParams.endTime = ''
   queryParams.stationId = []
   queryParams.deviceName = ''
+  queryParams.alarmType = ''
   searchData.value = []
   childParams.value = {
     page: Page.page,
@@ -325,6 +334,7 @@ const resetSearch = () => {
     handleStatus: '',
     alarmStatus: '',
     beginTime: '',
+    alarmType: '',
     endTime: '',
     deviceName:'',
   }
@@ -388,10 +398,17 @@ function getSupplys() {
                            placeholder="请选择" style="min-width: 180px;"  :props="props" collapse-tags/>
             </el-form-item>
           </div>
-          <div style="width: 20%;display: flex;flex-direction: column">
+          <div style="width: 15%;">
             <el-form-item label="自动更新:">
               <el-switch v-model="refresh" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
             </el-form-item>
+          </div>
+          <div style="width: 20%;display: flex;flex-direction: column">
+            <el-form-item label="告警状态:" prop="alarmStatus" v-if="selectedBtn === 1 || selectedBtn === 2">
+              <el-select placeholder="请选择" clearable style="width: 200px" v-model="queryParams.alarmStatus">
+                <el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.label"/>
+              </el-select>
+            </el-form-item>
             <el-form-item label="设备名称:" prop="deviceName">
               <el-input placeholder="请输入内容" v-model="queryParams.deviceName" clearable></el-input>
             </el-form-item>
@@ -422,13 +439,6 @@ function getSupplys() {
               </el-config-provider>
             </el-form-item>
           </div>
-          <div style="width: 20%;" v-if="selectedBtn === 1 || selectedBtn === 2">
-            <el-form-item label="告警状态:" prop="alarmStatus" v-if="selectedBtn === 1 || selectedBtn === 2">
-              <el-select placeholder="请选择" clearable style="width: 200px" v-model="queryParams.alarmStatus">
-                <el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.label"/>
-              </el-select>
-            </el-form-item>
-          </div>
           <div style="width: 20%;display: flex;flex-direction: column" v-if="selectedBtn === 3">
             <el-form-item label="处理状态:" prop="handleStatus" v-if="selectedBtn === 3">
               <el-select placeholder="请选择" clearable style="width: 200px" v-model="queryParams.handleStatus">
@@ -442,13 +452,6 @@ function getSupplys() {
             </el-form-item>
           </div>
         </div>
-<!--        <div style="width: 200px;">-->
-<!--          <el-form-item>-->
-<!--            <el-button style="margin-left: 12px;margin-right: 10px" type="primary" @click="search" class="add-search-btn">查询</el-button>-->
-<!--            <el-button style="margin-right: 10px" type="primary" @click="resetSearch" class="add-search-btn">重置</el-button>-->
-<!--            <el-button style="margin-right: 10px;margin-top: 10px" type="primary" @click="handleExport" class="add-search-btn">导出</el-button>-->
-<!--          </el-form-item>-->
-<!--        </div>-->
         <div style="display: flex; align-items: center">
           <el-form-item>
             <el-button style="margin-left: 12px;" type="primary" @click="search" class="add-search-btn">查询</el-button>