huang, kai (Contractor) пре 3 дана
родитељ
комит
a6042f90e2

+ 10 - 2
admin.ui.plus-master/src/views/admin/statement/alarmManagement/index.vue

@@ -92,9 +92,9 @@
                 width="150">
                 <template #default="{ row }">
     <el-link class="my-el-link mr12 ml12" :href="row.linkUrl" type="primary" icon="ele-Download" size="small"
-      :underline="false" target="_blank">报警推送记录</el-link>
+      :underline="false" target="_blank" @click="toList">报警推送记录</el-link>
       <el-link class="my-el-link mr12 ml12" :href="row.linkUrl" type="primary" icon="ele-Edit" size="small"
-      :underline="false" target="_blank">油机详情</el-link>
+      :underline="false" target="_blank" @click="toPage(row)">油机详情</el-link>
       <el-link class="my-el-link mr12 ml12" :href="row.linkUrl" type="primary" icon="ele-InfoFilled" size="small"
       :underline="false" target="_blank">诊断说明</el-link>
                 </template>
@@ -119,6 +119,7 @@ import { ElTable } from 'element-plus'
 import { alarmFilterModel_SearchFilter, alarmFilterModel, PageInputAlarmFilterModel } from "/@/api/admin/reportManagement/alarm/alarmDto";
 import { AlarmApi } from "/@/api/admin/reportManagement/alarm/alarmApi";
 import { useDynamicPageSize } from "/@/composables/useDynamicPageSize";
+import router from "/@/router";
 
 
 // 使用组合式函数获取分页状态
@@ -257,7 +258,14 @@ const onCurrentChange = (val: number) => {
   init()
 }
 
+const toPage = (row: {fuelId: any; 
+}) => {
+  router.push({ path: `/statement/${row.fuelId}` })
+}
 
+const toList = () =>{
+  router.push({ path:`/authorize/statement/alarmQuery`})
+}
 
 </script>
 

+ 3 - 3
admin.ui.plus-master/src/views/admin/statement/vxList/index.vue

@@ -9,17 +9,17 @@
             <el-form-item prop="name" style="width: 100%">
 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="姓名">
-                  <el-input v-model="state.filter.name" placeholder="单行输入" clearable></el-input>
+                  <el-input v-model="state.filter.name" placeholder="请输入姓名" clearable></el-input>
                 </el-form-item>
               </el-col>
 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="用户账号">
-                  <el-input v-model="state.filter.userName" placeholder="单行输入" clearable></el-input>
+                  <el-input v-model="state.filter.userName" placeholder="请输入账号" clearable></el-input>
                 </el-form-item>
               </el-col>
 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="用户手机号">
-                  <el-input v-model="state.filter.phone" placeholder="单行输入" clearable></el-input>
+                  <el-input v-model="state.filter.phone" placeholder="请输入手机号" clearable></el-input>
                 </el-form-item>
               </el-col>
 </el-form-item>

+ 2 - 2
admin.ui.plus-master/src/views/admin/yujing/alarmRules/index.vue

@@ -146,9 +146,9 @@ const editDialogRef = ref()
 const init = async () => {
   Data.loading = true
   const res: any = await new alarmRulesApi().getData({ ...Data.pageInput, filter: Data.Filter })
-  // console.log(res)
+  console.log(res)
   Data.tableModel = res?.data ?? []
-  // Data.total = res?.data?.length ?? 0   // 接口中没有总的数据量
+  Data.total = res?.data?.length ?? 0   // 接口中没有总的数据量
   Data.loading = false
   pushMethodChange()
 }