gengxin

src/views/Station.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import RightFrame from "@/components/RightFrame.vue";
 import Card01 from "@/components/card/Card01.vue";
-import {computed, onMounted, ref, watch} from "vue";
+import {computed, onMounted, ref} from "vue";
 import {useRoute} from 'vue-router';
 import GwVideo from '@/components/Video/index.vue'
 import {useStationStore} from '@/stores/station'
@@ -11,7 +11,7 @@ import {getTypicalData, getTypicalEvents} from "@/utils/typicalYear";
 import TypicalChart from "@/components/TypicalChart.vue";
 import {getVideoCodeByMark} from "@/components/Video/video";
 import TimeScrollbar from "@/components/TimeScrollbar.vue";
-import {Label, Operate, View} from "@/utils/tdInstruction";
+import {Label, Operate, Setting, View} from "@/utils/tdInstruction";
 import {getRainfallLatest, getWaterLevelAndFlowLatest} from "@/api/gx";
 import {getRainfallLevel} from "@/utils/rainfall";
 
@@ -51,9 +51,12 @@ function sliderlTooltip(val) {
 
 function handleTimeChange(status) {
   if (status) {
+    Setting.setWeather("中雨")
     View.changeView(station.value.stnm + '近')
     stationStore.setLabelState2('测站主页', true)
     stationStore.setLabelState2('仪器运维', false)
+  } else {
+    Setting.setWeather("晴")
   }
 }
 
@@ -144,7 +147,7 @@ onMounted(() => {
 
 .typical-event-time-scrollbar {
   position: fixed;
-  bottom: 10vh;
+  bottom: 15vh;
   left: 50%;
   transform: translateX(-50%);
   width: 50vw;

src/views/StationHouse.vue

@@ -115,17 +115,17 @@ function getLatestWaterQuality() {
 
 const alarmColumns = [
   {
-    label: '报警类型', prop: 'deviceName', width: '100', convertFn: (data) => {
+    label: '报警类型', prop: 'warnType', width: '100', convertFn: (data) => {
       return data ? data.trim() : ''
     }
   },
   {
-    label: '时间', prop: 'tm', convertFn: (data) => {
+    label: '时间', prop: 'reportTime', convertFn: (data) => {
       return data ? data.substring(5, 16) : ''
     }
   },
   {
-    label: '告警内容', prop: 'content', width: '180', convertFn: (data) => {
+    label: '告警内容', prop: 'warnContent', width: '180', convertFn: (data) => {
       return data ? data.trim() : ''
     }
   },

src/views/Zhyw.vue

@@ -14,7 +14,7 @@ const baseUrl_cx = ref('http://10.8.48.235:8100/homePage.html#/dataManagement/wa
 onMounted(() => {
   const stcd = route.params.stcd
   const srcType = route.params.type
-  const code='4a3569fd-73b3-42a4-b3d0-ba752e020c19'
+  const code = '32f1bce6-7c24-44dc-81a3-f84982ffe6fa'
 
   let baseUrl = ''
   switch (srcType) {
@@ -44,5 +44,6 @@ onMounted(() => {
   position: relative;
   height: 100%;
   overflow: hidden;
+  pointer-events: auto;
 }
 </style>