linqilong 1 tháng trước cách đây
mục cha
commit
b18552bebf
2 tập tin đã thay đổi với 28 bổ sung23 xóa
  1. 2 2
      src/permission.ts
  2. 26 21
      src/views/Yuyan.vue

+ 2 - 2
src/permission.ts

@@ -18,8 +18,8 @@ router.beforeEach((to, from, next) => {
       next();
     } else {
       // 否则全部重定向到登录页
-      // window.location.href = 'http://10.8.11.123:8089/cas/login?service=http://10.8.11.98:9888/check'
-      window.location.href = 'http://10.8.11.123:8089/cas/login?service=http://localhost/check'
+      window.location.href = 'http://10.8.11.123:8089/cas/login?service=http://10.8.11.98:9888/check'
+      // window.location.href = 'http://10.8.11.123:8089/cas/login?service=http://localhost/check'
     }
   }
 });

+ 26 - 21
src/views/Yuyan.vue

@@ -1,18 +1,18 @@
 <script lang="ts" setup>
-import { onMounted, onUnmounted, ref } from 'vue'
+import {onMounted, onUnmounted, ref} from 'vue'
 import RightFrame from '@/components/RightFrame.vue'
 import Card01 from '@/components/card/Card01.vue'
 import StripeTable from '@/components/StripeTable.vue'
-import { Operate, Point, View } from '@/utils/tdInstruction'
+import {Operate, Point, View} from '@/utils/tdInstruction'
 import StationRightButtonGroup from '@/components/StationRightButtonGroup.vue'
-import { useBasinStore } from '@/stores/basin'
-import { getYuyanDataList, getYuyanFanganList } from '@/api/yuyan'
-import { convertDate, removeDuplicates } from '@/utils/date'
-import { useTimeScrollbarStore } from '@/stores/timeScrollbar'
-import { extractList } from '@/utils/list'
-import { formatd } from '@/utils/ruoyi'
-import { stationList } from '@/assets/js/station'
-import { slopeCalculation } from '@/utils/slopeCalculation'
+import {useBasinStore} from '@/stores/basin'
+import {getYuyanDataList, getYuyanFanganList} from '@/api/yuyan'
+import {convertDate, removeDuplicates} from '@/utils/date'
+import {useTimeScrollbarStore} from '@/stores/timeScrollbar'
+import {extractList} from '@/utils/list'
+import {formatd} from '@/utils/ruoyi'
+import {stationList} from '@/assets/js/station'
+import {slopeCalculation} from '@/utils/slopeCalculation'
 
 const timeScrollbarStore = useTimeScrollbarStore()
 const basinStore = useBasinStore()
@@ -24,17 +24,24 @@ const tableColumns = [
   //   showOverflowTooltip: true,
   //   convertFn: (data) => data ? data.trim() : ''
   // },
-  { label: '方案', prop: 'DD_NAME', showOverflowTooltip: true },
+  {label: '方案', prop: 'DD_NAME', showOverflowTooltip: true},
 ]
 const tableData = ref([])
 
 const dataTableColumns = [
-  { label: '测站', prop: 'label' },
+  {label: '测站', prop: 'label'},
   {
     label: '预报水位',
     prop: 'value',
-    convertFn: data => {
-      return data ? data.trim() : ''
+    convertFn: (data, index) => {
+      if (data === dataTableMaxData.value) {
+        return `<span style="color: #F56C6C;">${data}</span>`
+      }
+      if (data === dataTableMinData.value) {
+        return `<span style="color: #67C23A;">${data}</span>`
+      }
+
+      return data || ''
     },
   },
 ]
@@ -135,10 +142,11 @@ function handleCurrentChange(row) {
           }
         })
         .sort((a, b) => b.value - a.value)
-      dataTableMaxData.value = dataTableData.value[0]
+      debugger
+      dataTableMaxData.value = dataTableData.value[0].value
       dataTableMinData.value =
-        dataTableData.value[dataTableData.value.length - 1]
-
+        dataTableData.value[dataTableData.value.length - 1].value
+      debugger
       const data = list.map(d => {
         let station = stationList.find(s => s.id === d.STCD)
 
@@ -248,10 +256,7 @@ onUnmounted(() => {
         ></stripe-table>
       </card01>
       <card01 style="height: 65%" title="预报数据">
-        <stripe-table
-          :columns="dataTableColumns"
-          :data="dataTableData"
-        ></stripe-table>
+        <stripe-table :columns="dataTableColumns" :data="dataTableData"></stripe-table>
       </card01>
     </template>
     <template #btnGroup>