Compare commits

..

3 Commits

Author SHA1 Message Date
lcw
a718b46427 lcw 2026-01-20 18:38:33 +08:00
lcw
177db3438e Merge branch 'main' of http://61.139.16.27:26684/zy_oyj/sgxt_web 2026-01-20 18:21:43 +08:00
lcw
756fe87256 lcw 2026-01-20 18:21:40 +08:00
11 changed files with 34 additions and 171 deletions

View File

@ -45,15 +45,11 @@
</el-icon> </el-icon>
<span style="vertical-align: middle">删除</span> <span style="vertical-align: middle">删除</span>
</el-button> </el-button>
<el-button type="success" @click="openSearch">
<Search style="width: 1em; height: 1em; margin-right: 8px" />
<span style="vertical-align: middle" v-if="!search">搜索</span>
<span style="vertical-align: middle" v-else>关闭搜索</span>
</el-button>
</PageTitle> </PageTitle>
</div> </div>
<!-- 搜索 --> <!-- 搜索 -->
<div ref="searchBox" v-if="search"> <div ref="searchBox">
<Searchs :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount" /> <Searchs :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount" />
</div> </div>
@ -482,20 +478,10 @@ const dologCancel = () => {
exportFileModel.value = true; exportFileModel.value = true;
} }
// 搜索栏 // 搜索栏
const search = ref(false)
const openSearch = () => {
search.value = !search.value
nextTick(() => {
tabHeightFn()
})
}
// 表格高度计算 // 表格高度计算
const tabHeightFn = () => { const tabHeightFn = () => {
if (search.value) {
pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250; pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
} else {
pageData.tableHeight = window.innerHeight - 250;
}
window.onresize = function () { window.onresize = function () {
tabHeightFn(); tabHeightFn();
}; };

View File

@ -5,16 +5,12 @@
<!-- <el-button type="primary" @click="exportExcel"> <!-- <el-button type="primary" @click="exportExcel">
<span style="vertical-align: middle">导出</span> <span style="vertical-align: middle">导出</span>
</el-button> --> </el-button> -->
<el-button type="success" @click="openSearch">
<Search style="width: 1em; height: 1em; margin-right: 8px" />
<span style="vertical-align: middle" v-if="!search">搜索</span>
<span style="vertical-align: middle" v-else>关闭搜索</span>
</el-button>
<el-button type="primary" @click="exportExl">导出</el-button> <el-button type="primary" @click="exportExl">导出</el-button>
</PageTitle> </PageTitle>
</div> </div>
<!-- 搜索 --> <!-- 搜索 -->
<div ref="searchBox" v-if="search"> <div ref="searchBox">
<Searchs :searchArr="searchConfiger" @submit="onSearch" @reset="reset" :key="pageData.keyCount"> <Searchs :searchArr="searchConfiger" @submit="onSearch" @reset="reset" :key="pageData.keyCount">
<template #jfd> <template #jfd>
<div> <div>
@ -316,13 +312,7 @@ const openAddModel = (row) => {
} }
const search = ref(false)
const openSearch = () => {
search.value = !search.value
nextTick(() => {
tabHeightFn()
})
}
// 选择系数 // 选择系数
const chooseJfShow = ref(false) const chooseJfShow = ref(false)
@ -338,11 +328,8 @@ const chooseJfFun = (val) => {
// 表格高度计算 // 表格高度计算
const tabHeightFn = () => { const tabHeightFn = () => {
if (search.value) {
pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250; pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
} else {
pageData.tableHeight = window.innerHeight - 250;
}
window.onresize = function() { window.onresize = function() {
tabHeightFn(); tabHeightFn();
}; };

View File

@ -5,16 +5,12 @@
<!-- <el-button> <!-- <el-button>
<span style="vertical-align: middle">导出</span> <span style="vertical-align: middle">导出</span>
</el-button> --> </el-button> -->
<el-button type="success" @click="openSearch">
<Search style="width: 1em; height: 1em; margin-right: 8px" />
<span style="vertical-align: middle" v-if="!search">搜索</span>
<span style="vertical-align: middle" v-else>关闭搜索</span>
</el-button>
<el-button type="primary" @click="exportExl">导出</el-button> <el-button type="primary" @click="exportExl">导出</el-button>
</PageTitle> </PageTitle>
</div> </div>
<!-- 搜索 --> <!-- 搜索 -->
<div ref="searchBox" v-if="search"> <div ref="searchBox">
<Searchs :searchArr="searchConfiger" @submit="onSearch" @reset="reset" :key="pageData.keyCount"> <Searchs :searchArr="searchConfiger" @submit="onSearch" @reset="reset" :key="pageData.keyCount">
<template #jfd> <template #jfd>
<div> <div>
@ -314,21 +310,11 @@ const chooseJfFun = (val) => {
}) })
} }
// 搜索栏
const search = ref(false)
const openSearch = () => {
search.value = !search.value
nextTick(() => {
tabHeightFn()
})
}
// 表格高度计算 // 表格高度计算
const tabHeightFn = () => { const tabHeightFn = () => {
if (search.value) {
pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250; pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
} else {
pageData.tableHeight = window.innerHeight - 250;
}
window.onresize = function() { window.onresize = function() {
tabHeightFn(); tabHeightFn();
}; };

View File

@ -2,16 +2,12 @@
<div> <div>
<div class="titleBox"> <div class="titleBox">
<PageTitle title="预警布控"> <PageTitle title="预警布控">
<el-button type="success" @click="openSearch">
<Search style="width: 1em; height: 1em; margin-right: 8px" />
<span style="vertical-align: middle" v-if="!search">搜索</span>
<span style="vertical-align: middle" v-else>关闭搜索</span>
</el-button>
<el-button type="primary" @click="exportExl">导出</el-button> <el-button type="primary" @click="exportExl">导出</el-button>
</PageTitle> </PageTitle>
</div> </div>
<!-- 搜索 --> <!-- 搜索 -->
<div ref="searchBox" v-if="search"> <div ref="searchBox" >
<Searchs :searchArr="searchConfiger" @submit="onSearch" @reset="reset" :key="pageData.keyCount"> <Searchs :searchArr="searchConfiger" @submit="onSearch" @reset="reset" :key="pageData.keyCount">
<template #jfd> <template #jfd>
<div> <div>
@ -238,25 +234,14 @@ const addModelRef = ref(null)
const openAddFrom = (row) => { const openAddFrom = (row) => {
addModelRef.value.init('add', row) addModelRef.value.init('add', row)
} }
// 搜索栏
const search = ref(false)
const openSearch = () => {
search.value = !search.value
nextTick(() => {
tabHeightFn()
})
}
const handleCzjy = (row) => { const handleCzjy = (row) => {
czjyRef.value.init( row) czjyRef.value.init( row)
} }
// 表格高度计算 // 表格高度计算
const tabHeightFn = () => { const tabHeightFn = () => {
if (search.value) {
pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250; pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
} else {
pageData.tableHeight = window.innerHeight - 250;
}
window.onresize = function() { window.onresize = function() {
tabHeightFn(); tabHeightFn();
}; };

View File

@ -5,16 +5,11 @@
<!-- <el-button> <!-- <el-button>
<span style="vertical-align: middle">导出</span> <span style="vertical-align: middle">导出</span>
</el-button> --> </el-button> -->
<el-button type="success" @click="openSearch">
<Search style="width: 1em; height: 1em; margin-right: 8px" />
<span style="vertical-align: middle" v-if="!search">搜索</span>
<span style="vertical-align: middle" v-else>关闭搜索</span>
</el-button>
<el-button type="primary" @click="exportExl">导出</el-button> <el-button type="primary" @click="exportExl">导出</el-button>
</PageTitle> </PageTitle>
</div> </div>
<!-- 搜索 --> <!-- 搜索 -->
<div ref="searchBox" v-if="search"> <div ref="searchBox">
<Searchs :searchArr="searchConfiger" @submit="onSearch" @reset="reset" :key="pageData.keyCount"> <Searchs :searchArr="searchConfiger" @submit="onSearch" @reset="reset" :key="pageData.keyCount">
<template #jfd> <template #jfd>
<div> <div>
@ -325,25 +320,15 @@ const chooseJfFun = (val) => {
}) })
} }
// 搜索栏
const search = ref(false)
const openSearch = () => {
search.value = !search.value
nextTick(() => {
tabHeightFn()
})
}
const handleCzjy = (row) => { const handleCzjy = (row) => {
czjyRef.value.init( row) czjyRef.value.init( row)
} }
// 表格高度计算 // 表格高度计算
const tabHeightFn = () => { const tabHeightFn = () => {
if (search.value) {
pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250; pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
} else {
pageData.tableHeight = window.innerHeight - 250;
}
window.onresize = function() { window.onresize = function() {
tabHeightFn(); tabHeightFn();
}; };

View File

@ -5,16 +5,12 @@
<!-- <el-button> <!-- <el-button>
<span style="vertical-align: middle">导出</span> <span style="vertical-align: middle">导出</span>
</el-button> --> </el-button> -->
<el-button type="success" @click="openSearch">
<Search style="width: 1em; height: 1em; margin-right: 8px" />
<span style="vertical-align: middle" v-if="!search">搜索</span>
<span style="vertical-align: middle" v-else>关闭搜索</span>
</el-button>
<el-button type="primary" @click="exportExl">导出</el-button> <el-button type="primary" @click="exportExl">导出</el-button>
</PageTitle> </PageTitle>
</div> </div>
<!-- 搜索 --> <!-- 搜索 -->
<div ref="searchBox" v-if="search"> <div ref="searchBox" >
<Searchs :searchArr="searchConfiger" @submit="onSearch" @reset="reset" :key="pageData.keyCount"> <Searchs :searchArr="searchConfiger" @submit="onSearch" @reset="reset" :key="pageData.keyCount">
<template #jfd> <template #jfd>
<div> <div>
@ -312,21 +308,10 @@ const chooseJfFun = (val) => {
}) })
} }
// 搜索栏
const search = ref(false)
const openSearch = () => {
search.value = !search.value
nextTick(() => {
tabHeightFn()
})
}
// 表格高度计算 // 表格高度计算
const tabHeightFn = () => { const tabHeightFn = () => {
if (search.value) {
pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250; pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
} else {
pageData.tableHeight = window.innerHeight - 250;
}
window.onresize = function () { window.onresize = function () {
tabHeightFn(); tabHeightFn();
}; };

View File

@ -2,15 +2,11 @@
<div> <div>
<div class="titleBox"> <div class="titleBox">
<PageTitle title="积分排名"> <PageTitle title="积分排名">
<el-button type="success" @click="openSearch">
<Search style="width: 1em; height: 1em; margin-right: 8px" />
<span style="vertical-align: middle" v-if="!search">搜索</span>
<span style="vertical-align: middle" v-else>关闭搜索</span>
</el-button>
</PageTitle> </PageTitle>
</div> </div>
<!-- 搜索 --> <!-- 搜索 -->
<div ref="searchBox" v-if="search"> <div ref="searchBox">
<Searchs :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount"> <Searchs :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount">
</Searchs> </Searchs>
</div> </div>
@ -240,22 +236,10 @@ const getRowClassName = (row) => {
return ''; return '';
}; };
// 搜索栏
const search = ref(false)
const openSearch = () => {
search.value = !search.value
nextTick(() => {
tabHeightFn()
})
}
// 表格高度计算 // 表格高度计算
const tabHeightFn = () => { const tabHeightFn = () => {
if (search.value) {
pageData.tableHeight = window.innerHeight - (searchBox.value?.offsetHeight || 0) - 250; pageData.tableHeight = window.innerHeight - (searchBox.value?.offsetHeight || 0) - 250;
} else {
pageData.tableHeight = window.innerHeight - 250;
}
window.onresize = function() { window.onresize = function() {
tabHeightFn(); tabHeightFn();
}; };

View File

@ -107,10 +107,7 @@ const props = defineProps({
type: [Number, String], type: [Number, String],
default: 666 default: 666
}, },
search: {
type: Boolean,
default: false
},
excelTitle: { excelTitle: {
type: String, type: String,
default: '预警信息' default: '预警信息'

View File

@ -2,16 +2,12 @@
<div> <div>
<div class="titleBox"> <div class="titleBox">
<PageTitle title="人像预警"> <PageTitle title="人像预警">
<el-button type="success" @click="openSearch">
<Search style="width: 1em; height: 1em; margin-right: 8px" />
<span style="vertical-align: middle" v-if="!search">搜索</span>
<span style="vertical-align: middle" v-else>关闭搜索</span>
</el-button>
<el-button type="primary" @click="exportExl">导出</el-button> <el-button type="primary" @click="exportExl">导出</el-button>
</PageTitle> </PageTitle>
</div> </div>
<!-- 搜索 --> <!-- 搜索 -->
<div ref="searchBox" class="searchBox" v-if="search"> <div ref="searchBox" class="searchBox" >
<el-form :model="listQuery" label-width="auto" :inline="true" ref="searchArr"> <el-form :model="listQuery" label-width="auto" :inline="true" ref="searchArr">
<el-form-item label="布控人员" prop="yjRyxm "> <el-form-item label="布控人员" prop="yjRyxm ">
<el-select clearable v-model="listQuery.yjRyxm" filterable remote reserve-keyword placeholder="请输入布控人员" <el-select clearable v-model="listQuery.yjRyxm" filterable remote reserve-keyword placeholder="请输入布控人员"
@ -44,8 +40,8 @@
<!-- 表格 --> <!-- 表格 -->
<div class="tabBox" :style="{ height: (pageData.tableHeight + 40) + 'px', paddingTop: '10px' }"> <div class="tabBox" :style="{ height: (pageData.tableHeight + 40) + 'px', paddingTop: '10px' }">
<!-- <div style="padding:0 10px;"> <el-button type="primary" @click="exportExcel">导出</el-button></div> --> <!-- <div style="padding:0 10px;"> <el-button type="primary" @click="exportExcel">导出</el-button></div> -->
<LocalWarning :maxHeight="search ? (pageData.tableHeight - 160) : (pageData.tableHeight - 110)" <LocalWarning :maxHeight="pageData.tableHeight - 160"
ref="localWarningRef" :dict="{ D_GSXT_YJXX_CZZT, D_BZ_YJJB, D_BZ_YJLYXT,D_BZ_YJLY }" :search="search" excelTitle="人像预警" /> ref="localWarningRef" :dict="{ D_GSXT_YJXX_CZZT, D_BZ_YJJB, D_BZ_YJLYXT,D_BZ_YJLY }" excelTitle="人像预警" />
</div> </div>
</div> </div>
<el-dialog v-model="showDc" title="导出预警" width="80%"> <el-dialog v-model="showDc" title="导出预警" width="80%">
@ -235,20 +231,10 @@ const resetForm = (formEl) => {
// }; // };
// }; // };
// 搜索栏 // 搜索栏
const search = ref(false)
const openSearch = () => {
search.value = !search.value
nextTick(() => {
tabHeightFn()
})
}
// 表格高度计算 // 表格高度计算
const tabHeightFn = () => { const tabHeightFn = () => {
if (search.value) {
pageData.tableHeight = window.innerHeight - (searchBox.value?.offsetHeight || 0) - 250; pageData.tableHeight = window.innerHeight - (searchBox.value?.offsetHeight || 0) - 250;
} else {
pageData.tableHeight = window.innerHeight - 250;
}
window.onresize = function() { window.onresize = function() {
tabHeightFn(); tabHeightFn();
}; };

View File

@ -106,9 +106,6 @@ const props = defineProps({
maxHeight: { maxHeight: {
type: [Number, String], type: [Number, String],
default: 666 default: 666
}, search: {
type: Boolean,
default: false
} }
}); });
const permission_sfqs = ref(false) const permission_sfqs = ref(false)

View File

@ -3,16 +3,12 @@
<div class="titleBox"> <div class="titleBox">
<PageTitle title="车辆预警"> <PageTitle title="车辆预警">
<el-button type="success" @click="openSearch">
<Search style="width: 1em; height: 1em; margin-right: 8px" />
<span style="vertical-align: middle" v-if="!search">搜索</span>
<span style="vertical-align: middle" v-else>关闭搜索</span>
</el-button>
<el-button type="primary" @click="exportExl">导出</el-button> <el-button type="primary" @click="exportExl">导出</el-button>
</PageTitle> </PageTitle>
</div> </div>
<!-- 搜索 --> <!-- 搜索 -->
<div ref="searchBox" class="searchBox" v-if="search"> <div ref="searchBox" class="searchBox">
<el-form :model="listQuery" label-width="auto" :inline="true" ref="searchArr"> <el-form :model="listQuery" label-width="auto" :inline="true" ref="searchArr">
<el-form-item label="时间筛选"> <el-form-item label="时间筛选">
<el-date-picker v-model="listQuery.time" type="datetimerange" :shortcuts="shortcuts" range-separator="To" <el-date-picker v-model="listQuery.time" type="datetimerange" :shortcuts="shortcuts" range-separator="To"
@ -39,8 +35,8 @@
<!-- 表格 --> <!-- 表格 -->
<div class="tabBox" :style="{ height: (pageData.tableHeight + 40) + 'px', paddingTop: '10px' }"> <div class="tabBox" :style="{ height: (pageData.tableHeight + 40) + 'px', paddingTop: '10px' }">
<!-- <div style="padding:0 10px;"> <el-button type="primary" @click="exportExcel">导出</el-button></div> --> <!-- <div style="padding:0 10px;"> <el-button type="primary" @click="exportExcel">导出</el-button></div> -->
<LocalWarning :maxHeight="search ? (pageData.tableHeight - 160) : (pageData.tableHeight - 110)" <LocalWarning :maxHeight=" pageData.tableHeight - 160"
ref="localWarningRef" :dict="{ D_GSXT_YJXX_CZZT, D_BZ_YJJB, D_BZ_YJLYXT ,D_BZ_YJLY}" :search="search" excelTitle="车辆预警" /> ref="localWarningRef" :dict="{ D_GSXT_YJXX_CZZT, D_BZ_YJJB, D_BZ_YJLYXT ,D_BZ_YJLY}" excelTitle="车辆预警" />
</div> </div>
</div> </div>
<el-dialog v-model="showDc" title="导出预警" width="80%"> <el-dialog v-model="showDc" title="导出预警" width="80%">
@ -209,21 +205,10 @@ const resetForm = (formEl) => {
localWarningRef.value.getList() localWarningRef.value.getList()
} }
// 搜索栏
const search = ref(false)
const openSearch = () => {
search.value = !search.value
nextTick(() => {
tabHeightFn()
})
}
// 表格高度计算 // 表格高度计算
const tabHeightFn = () => { const tabHeightFn = () => {
if (search.value) {
pageData.tableHeight = window.innerHeight - (searchBox.value?.offsetHeight || 0) - 250; pageData.tableHeight = window.innerHeight - (searchBox.value?.offsetHeight || 0) - 250;
} else {
pageData.tableHeight = window.innerHeight - 250;
}
window.onresize = function() { window.onresize = function() {
tabHeightFn(); tabHeightFn();
}; };