修改了AI无人站和大屏bug

48795c03 · liwei · 495c8ed2 · 48795c03 · 48795c03 · 48795c03
Commit 48795c03 authored Mar 12, 2025 by liwei
18 changed files
--- a/src/api/AIStation/Extinguisher.js
+++ b/src/api/AIStation/Extinguisher.js
@@ -15,8 +15,8 @@ export const getAlarmListData = (item) => {
    return httpTwo.post(`/busFireExtinguisherAlarm/list?page=${item.page}&rows=${item.size}`,item)
 }

-export const getAlarmNumData = () => {
-    return httpTwo.get(`/busFireExtinguisherAlarm/queryAlarmsList`)
+export const getAlarmNumData = (item) => {
+    return httpTwo.post(`/busFireExtinguisherAlarm/queryAlarmsCount`,item)
 }

 export const exportNewExtinguisherData = (item) => {

--- a/src/api/AIStation/MoveMonitor.js
+++ b/src/api/AIStation/MoveMonitor.js
@@ -12,8 +12,8 @@ export const getMoveListAlarmNewData = (item) => {
    return httpTwo.post(`/busdynamicenvironmentalalarm/list?page=${item.page}&rows=${item.size}`,item)
 }

-export const getMoveAlarmNumber = () => {
-    return httpTwo.get(`/busdynamicenvironmentalalarm/queryAlarmsList`)
+export const getMoveAlarmNumber = (item) => {
+    return httpTwo.post(`/busdynamicenvironmentalalarm/queryAlarmsCount`,item)
 }

 export const exportMoveMonitorNewData = (item) => {

--- a/src/api/AIStation/PipelineTemp.js
+++ b/src/api/AIStation/PipelineTemp.js
@@ -12,8 +12,8 @@ export const getPipListAlarmData = (item) =>{
    return httpTwo.post(`/buspipelinetemperaturealarm/list?page=${item.page}&rows=${item.size}`,item)
 }

-export const getPipAlarmNumber = () =>{
-    return httpTwo.get(`/buspipelinetemperaturealarm/queryAlarmsList`)
+export const getPipAlarmNumber = (item) =>{
+    return httpTwo.post(`/buspipelinetemperaturealarm/queryAlarmsCount`,item)
 }

 export const exportPipelineTempNewData = (item) =>{

--- a/src/api/AIStation/RecyclePump.js
+++ b/src/api/AIStation/RecyclePump.js
@@ -11,8 +11,8 @@ export const getRecycleListAlarmData = (item) =>{
    return httpTwo.post(`/buscirculatingpumpalarm/list?page=${item.page}&rows=${item.size}`,item)
 }

-export const getRecycleAlarmNumber = () => {
-    return httpTwo.get(`/buscirculatingpumpalarm/queryAlarmsList`)
+export const getRecycleAlarmNumber = (item) => {
+    return httpTwo.post(`/buscirculatingpumpalarm/queryAlarmsCount`,item)
 }

 export const exportRecyclePumpNewData = (item) => {

--- a/src/api/AIStation/TransTemp.js
+++ b/src/api/AIStation/TransTemp.js
@@ -12,8 +12,8 @@ export const getTransListAlarmData = (item) =>{
    return httpTwo.post(`/bustransfertemperaturealarm/list?page=${item.page}&rows=${item.size}`,item)
 }

-export const getTransAlarmNumber = () => {
-    return httpTwo.get(`/bustransfertemperaturealarm/queryAlarmsList`)
+export const getTransAlarmNumber = (item) => {
+    return httpTwo.post(`/bustransfertemperaturealarm/queryAlarmsCount`,item)
 }

 export const exportTransTempNewData = (item) =>{

--- a/src/components/screenDisplay.vue
+++ b/src/components/screenDisplay.vue
@@ -3628,7 +3628,9 @@ export default defineComponent({
    /** 最大化*/
    handleDetails() {
      this.queryParams = ''
+      this.queryParams2 = ''
      this.stopParams += 1
+      this.stopParams2 += 1
      this.detailOpen = true
      this.audioId = this.AudioUrlIdList[this.audioNum]
    },
@@ -3636,9 +3638,14 @@ export default defineComponent({
      this.detailOpen = false
      const videoList = []
      videoList.push(this.VideoInfo.playVideoList[this.videoNum])
+      const videoList2 = []
+      videoList2.push(this.VideoInfo.playVideoList[this.videoNum2])
      this.getDivWidth()
+      this.getDivWidth2()
      this.queryParams = JSON.stringify(videoList)
+      this.queryParams2 = JSON.stringify(videoList2)
      this.videoLoading = true
+      this.videoLoading2 = true
    },
    // 查询管道光纤测漏温度曲线统计图
    getTemperatureStatistics() {

--- a/src/views/AIStation/ExtinguisherPage/ExtinguisherHistoryPage.vue
+++ b/src/views/AIStation/ExtinguisherPage/ExtinguisherHistoryPage.vue
@@ -177,6 +177,8 @@ function Nindex(index) {
              <el-image
                  style="width:100%;height:100%;"
                  :src="getImageSrc(scope.row)"
+                  :preview-src-list="[getImageSrc(scope.row)]"
+                  preview-teleported
              >
                <div slot="error" class="image-slot">
                  <i class="el-icon-picture-outline"/>

--- a/src/views/AIStation/ExtinguisherPage/ExtinguisherNewDataPage.vue
+++ b/src/views/AIStation/ExtinguisherPage/ExtinguisherNewDataPage.vue
@@ -167,6 +167,8 @@ function Nindex(index) {
              <el-image
                  style="width:100%;height:100%;"
                  :src="getImageSrc(scope.row)"
+                  :preview-src-list="[getImageSrc(scope.row)]"
+                  preview-teleported
              >
                <div slot="error" class="image-slot">
                  <i class="el-icon-picture-outline"/>

--- a/src/views/AIStation/ExtinguisherPage/index.vue
+++ b/src/views/AIStation/ExtinguisherPage/index.vue
@@ -210,8 +210,18 @@ const search = () => {

 //报警数量
 function getNumber() {
-  getAlarmNumData().then(res => {
-    console.log('123123123123-----------', res.data)
+  //当前时间为2025-02-15 9:50:56  则开始时间为2025-02-14 09:00:00  结束时间为2025-02-15 09:00:00
+  let now = new Date();
+  now.setMinutes(0, 0, 0); // 将分钟、秒数和毫秒数都设为0
+  let start = new Date(now.getTime() - 24 * 60 * 60 * 1000); // 减去24小时的毫秒数
+  let endTime = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')} ${String(now.getHours()).padStart(2, '0')}:00:00`;
+  start.setMinutes(0, 0, 0); // 确保分钟、秒数和毫秒数都为0
+  let startTime = `${start.getFullYear()}-${String(start.getMonth() + 1).padStart(2, '0')}-${String(start.getDate()).padStart(2, '0')} ${String(start.getHours()).padStart(2, '0')}:00:00`;
+  const params = {
+    beginTime: startTime,
+    endTime: endTime
+  }
+  getAlarmNumData(params).then(res => {
    alarmNum.value = res.data ? res.data : 0
  })
 }

--- a/src/views/AIStation/MoveMonitorPage/MoveMonitorHistoryPage.vue
+++ b/src/views/AIStation/MoveMonitorPage/MoveMonitorHistoryPage.vue
@@ -216,6 +216,8 @@ function Nindex(index) {
              <el-image
                  style="width:100%;height:100%;"
                  :src="getImageSrc(scope.row)"
+                  :preview-src-list="[getImageSrc(scope.row)]"
+                  preview-teleported
              >
                <div slot="error" class="image-slot">
                  <i class="el-icon-picture-outline"/>

--- a/src/views/AIStation/MoveMonitorPage/MoveMonitorNewDataPage.vue
+++ b/src/views/AIStation/MoveMonitorPage/MoveMonitorNewDataPage.vue
@@ -230,6 +230,8 @@ function handleCamera(row) {
              <el-image
                  style="width:100%;height:100%;"
                  :src="getImageSrc(scope.row)"
+                  :preview-src-list="[getImageSrc(scope.row)]"
+                  preview-teleported
              >
                <div slot="error" class="image-slot">
                  <i class="el-icon-picture-outline"/>

--- a/src/views/AIStation/MoveMonitorPage/index.vue
+++ b/src/views/AIStation/MoveMonitorPage/index.vue
@@ -172,8 +172,18 @@ const search = () => {
 };

 function getNumber() {
-  getMoveAlarmNumber().then(res => {
-    console.log('123123123123-----------', res.data)
+  //当前时间为2025-02-15 9:50:56  则开始时间为2025-02-14 09:00:00  结束时间为2025-02-15 09:00:00
+  let now = new Date();
+  now.setMinutes(0, 0, 0); // 将分钟、秒数和毫秒数都设为0
+  let start = new Date(now.getTime() - 24 * 60 * 60 * 1000); // 减去24小时的毫秒数
+  let endTime = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')} ${String(now.getHours()).padStart(2, '0')}:00:00`;
+  start.setMinutes(0, 0, 0); // 确保分钟、秒数和毫秒数都为0
+  let startTime = `${start.getFullYear()}-${String(start.getMonth() + 1).padStart(2, '0')}-${String(start.getDate()).padStart(2, '0')} ${String(start.getHours()).padStart(2, '0')}:00:00`;
+  const params = {
+    beginTime: startTime,
+    endTime: endTime
+  }
+  getMoveAlarmNumber(params).then(res => {
    alarmNum.value = res.data ? res.data : 0
  })
 }
@@ -574,16 +584,23 @@ function batchSetHandleChange(e){
            </el-form-item>
          </div>
        </div>
-        <div style="display: flex; flex-direction: column;margin-bottom: 1%;margin-right: 10px;">
+        <div style="display: flex; flex-direction: column;margin-bottom: 1%;margin-right: 10px;" v-if="selectedBtn !== 1">
          <div style="display: flex; justify-content: space-between;">
            <el-button style="margin-left: 12px;" type="primary" @click="search" class="add-search-btn">查询</el-button>
            <el-button style="margin-left: 12px;" type="primary" @click="resetSearch" class="add-search-btn">重置</el-button>
            <el-button style="margin-left: 12px;" type="primary" @click="handleExport" class="add-search-btn">导出</el-button>
-            <el-button style="margin-left: 12px;" type="primary" @click="setError" class="add-search-btn" v-if="selectedBtn === 1">设置误差</el-button>
          </div>
-          <div style="display: flex; justify-content: flex-start;align-items: center;">
-            <el-button style="margin-top: 12px;margin-left: 12px" type="primary" @click="downloadPlugin()" class="add-search-btn" v-if="selectedBtn === 1">下载证书</el-button>
-            <span v-if="selectedBtn === 1">（如果图片不能加载请安装证书）</span>
+        </div>
+        <div style="display: flex; flex-direction: column;margin-bottom: 1%;margin-right: 20px;width: 360px" v-if="selectedBtn === 1">
+          <div style="display: flex;">
+            <el-button style="margin-left: 12px;width: 80px" type="primary" @click="search" class="add-search-btn">查询</el-button>
+            <el-button style="margin-left: 12px;width: 80px" type="primary" @click="handleExport" class="add-search-btn">导出</el-button>
+            <el-button style="margin-left: 40px;width: 80px" type="primary" @click="downloadPlugin()" class="add-search-btn" v-if="selectedBtn === 1">下载证书</el-button>
+          </div>
+          <div style="display: flex;align-items: center;margin-top: 10px;">
+            <el-button style="margin-left: 12px;width: 80px" type="primary" @click="resetSearch" class="add-search-btn">重置</el-button>
+            <el-button style="margin-left: 12px;width: 80px" type="primary" @click="setError" class="add-search-btn" v-if="selectedBtn === 1">设置误差</el-button>
+            <span v-if="selectedBtn === 1" style="font-size: 12px;">（图片不能加载请安装证书）</span>
          </div>
        </div>
      </el-form>

--- a/src/views/AIStation/PipelineTempPage/index.vue
+++ b/src/views/AIStation/PipelineTempPage/index.vue
@@ -171,7 +171,18 @@ const search = () => {
 };

 function getNumber() {
-  getPipAlarmNumber().then(res => {
+  //当前时间为2025-02-15 9:50:56  则开始时间为2025-02-14 09:00:00  结束时间为2025-02-15 09:00:00
+  let now = new Date();
+  now.setMinutes(0, 0, 0); // 将分钟、秒数和毫秒数都设为0
+  let start = new Date(now.getTime() - 24 * 60 * 60 * 1000); // 减去24小时的毫秒数
+  let endTime = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')} ${String(now.getHours()).padStart(2, '0')}:00:00`;
+  start.setMinutes(0, 0, 0); // 确保分钟、秒数和毫秒数都为0
+  let startTime = `${start.getFullYear()}-${String(start.getMonth() + 1).padStart(2, '0')}-${String(start.getDate()).padStart(2, '0')} ${String(start.getHours()).padStart(2, '0')}:00:00`;
+  const params = {
+    beginTime: startTime,
+    endTime: endTime
+  }
+  getPipAlarmNumber(params).then(res => {
    alarmNum.value = res.data ? res.data : 0
  })
 }

--- a/src/views/AIStation/RecyclePumpPage/index.vue
+++ b/src/views/AIStation/RecyclePumpPage/index.vue
@@ -98,7 +98,6 @@ const handleTabClick = (tab, event) => {
      queryParams.beginTime = startTime
      queryParams.endTime = endTime
    }
-    getNumber()
    search()
  }
 };
@@ -205,8 +204,18 @@ const search = () => {

 // 获取报警数量
 function getNumber() {
-  getRecycleAlarmNumber().then(res => {
-    console.log('123123123123-----------', res.data)
+  //当前时间为2025-02-15 9:50:56  则开始时间为2025-02-14 09:00:00  结束时间为2025-02-15 09:00:00
+  let now = new Date();
+  now.setMinutes(0, 0, 0); // 将分钟、秒数和毫秒数都设为0
+  let start = new Date(now.getTime() - 24 * 60 * 60 * 1000); // 减去24小时的毫秒数
+  let endTime = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')} ${String(now.getHours()).padStart(2, '0')}:00:00`;
+  start.setMinutes(0, 0, 0); // 确保分钟、秒数和毫秒数都为0
+  let startTime = `${start.getFullYear()}-${String(start.getMonth() + 1).padStart(2, '0')}-${String(start.getDate()).padStart(2, '0')} ${String(start.getHours()).padStart(2, '0')}:00:00`;
+  const params = {
+    beginTime: startTime,
+    endTime: endTime
+  }
+  getRecycleAlarmNumber(params).then(res => {
    alarmNum.value = res.data ? res.data : 0
  })
 }

--- a/src/views/AIStation/TransTempPage/TransTempAlarmPage.vue
+++ b/src/views/AIStation/TransTempPage/TransTempAlarmPage.vue
@@ -236,6 +236,8 @@ function Nindex(index) {
              <el-image
                  style="width:100%;height:100%;"
                  :src="getImageSrc(scope.row)"
+                  :preview-src-list="[getImageSrc(scope.row)]"
+                  preview-teleported
              >
                <div slot="error" class="image-slot">
                  <i class="el-icon-picture-outline"/>

--- a/src/views/AIStation/TransTempPage/TransTempHistoryPage.vue
+++ b/src/views/AIStation/TransTempPage/TransTempHistoryPage.vue
@@ -188,6 +188,8 @@ function Nindex(index) {
              <el-image
                  style="width:100%;height:100%;"
                  :src="getImageSrc(scope.row)"
+                  :preview-src-list="[getImageSrc(scope.row)]"
+                  preview-teleported
              >
                <div slot="error" class="image-slot">
                  <i class="el-icon-picture-outline"/>

--- a/src/views/AIStation/TransTempPage/TransTempNewDataPage.vue
+++ b/src/views/AIStation/TransTempPage/TransTempNewDataPage.vue
@@ -178,6 +178,8 @@ function Nindex(index) {
              <el-image
                  style="width:100%;height:100%;"
                  :src="getImageSrc(scope.row)"
+                  :preview-src-list="[getImageSrc(scope.row)]"
+                  preview-teleported
              >
                <div slot="error" class="image-slot">
                  <i class="el-icon-picture-outline"/>

--- a/src/views/AIStation/TransTempPage/index.vue
+++ b/src/views/AIStation/TransTempPage/index.vue
@@ -222,14 +222,22 @@ const search = () => {
  } else if (selectedBtn.value === 3) {
    childParams.value = item
  }
-  console.log('查询:', item);
 };

 //获取报警数量
-getNumber()
 function getNumber() {
-  getTransAlarmNumber().then(res => {
-    console.log('123123123123-----------', res.data)
+  //当前时间为2025-02-15 9:50:56  则开始时间为2025-02-14 09:00:00  结束时间为2025-02-15 09:00:00
+  let now = new Date();
+  now.setMinutes(0, 0, 0); // 将分钟、秒数和毫秒数都设为0
+  let start = new Date(now.getTime() - 24 * 60 * 60 * 1000); // 减去24小时的毫秒数
+  let endTime = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')} ${String(now.getHours()).padStart(2, '0')}:00:00`;
+  start.setMinutes(0, 0, 0); // 确保分钟、秒数和毫秒数都为0
+  let startTime = `${start.getFullYear()}-${String(start.getMonth() + 1).padStart(2, '0')}-${String(start.getDate()).padStart(2, '0')} ${String(start.getHours()).padStart(2, '0')}:00:00`;
+  const params = {
+    beginTime: startTime,
+    endTime: endTime
+  }
+  getTransAlarmNumber(params).then(res => {
    alarmNum.value = res.data ? res.data : 0
  })
 }