bdzl2/bxztApp
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: bdzl2:26d7a1ecbf316a958e62794b67553c7cf34e360c
Branches Tags
bdzl2:main
bdzl2:dev
bdzl2:feat-zc
..
compare: bdzl2:a4d97d7e562070643fd535fdd87d5396fc92a97b
Branches Tags
bdzl2:dev
bdzl2:feat-zc
bdzl2:main

No commits in common. "26d7a1ecbf316a958e62794b67553c7cf34e360c" and "a4d97d7e562070643fd535fdd87d5396fc92a97b" have entirely different histories.
26d7a1ecbf ... a4d97d7e56

16 changed files with 405 additions and 442 deletions
Show Stats Expand all files Collapse all files

13
.prettierrc
View File

@ -1,11 +1,10 @@
{ {
"printWidth": 150, "printWidth": 100,
"tabWidth": 2, "tabWidth": 2,
"useTabs": false, "semi": true,
"semi": false,
"singleQuote": true, "singleQuote": true,
"trailingComma": "all", "trailingComma": "es5",
"bracketSpacing": true, "arrowParens": "avoid",
"arrowParens": "always", "htmlWhitespaceSensitivity": "ignore",
"endOfLine": "lf" "vueIndentScriptAndStyle": false
} }

BIN
packages/screen/src/assets/MaMap_img/危大工程icon@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.7 KiB

BIN
packages/screen/src/assets/MaMap_img/隐患点icon1@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
packages/screen/src/assets/MaMap_img/隐患点icon@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
packages/screen/src/assets/RiskWarning_img/危大工程icon1@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.9 KiB

BIN
packages/screen/src/assets/RiskWarning_img/危大工程icon@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
packages/screen/src/assets/RiskWarning_img/队伍icon定位@2x (1).png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.7 KiB

178
packages/screen/src/views/RiskWarning/Dialog/clearanceSituationDialog.vue
View File

@ -25,13 +25,30 @@
clearable clearable
@change="handleFilterChange" @change="handleFilterChange"
> >
<el-option v-for="item in regionOptions" :key="item.value" :label="item.label" :value="item.value" /> <el-option
v-for="item in regionOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select> </el-select>
</div> </div>
<div class="filter-item"> <div class="filter-item">
<span class="filter-label">类型</span> <span class="filter-label">类型</span>
<el-select :teleported="false" v-model="filterForm.type" placeholder="请选择" class="filter-select" clearable @change="handleFilterChange"> <el-select
<el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" /> :teleported="false"
v-model="filterForm.type"
placeholder="请选择"
class="filter-select"
clearable
@change="handleFilterChange"
>
<el-option
v-for="item in typeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select> </el-select>
</div> </div>
<div class="filter-item"> <div class="filter-item">
@ -44,7 +61,12 @@
clearable clearable
@change="handleFilterChange" @change="handleFilterChange"
> >
<el-option v-for="item in controlMeasureOptions" :key="item.value" :label="item.label" :value="item.value" /> <el-option
v-for="item in controlMeasureOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select> </el-select>
</div> </div>
</div> </div>
@ -79,13 +101,13 @@
</template> </template>
<script setup> <script setup>
import { ref, computed, watch, inject, onMounted, onUnmounted } from 'vue' import { ref, computed, watch, inject } from 'vue';
import { Close } from '@element-plus/icons-vue' import { Close } from '@element-plus/icons-vue';
import { regionOptions, typeOptions, controlMeasureOptions } from '../component/index.js' import { regionOptions, typeOptions, controlMeasureOptions } from '../component/index.js';
import BaseDialog from '../component/baseDialog.vue' import BaseDialog from '../component/baseDialog.vue';
import { request } from '@/utils/request' import { request } from '@/utils/request';
import { formatDateTime } from '../component/index.js' import { formatDateTime } from '../component/index.js';
0 0;
// 注入日期范围 // 注入日期范围
// const dateRange = inject('dateRange', ref([])); // const dateRange = inject('dateRange', ref([]));
const props = defineProps({ const props = defineProps({
@ -101,33 +123,25 @@ const props = defineProps({
type: Object, type: Object,
default: () => {}, default: () => {},
}, },
}) });
const emit = defineEmits(['update:visible', 'close', 'detail', 'itemdata']) const emit = defineEmits(['update:visible', 'close', 'detail', 'itemdata']);
// 筛选表单 // 筛选表单
const filterForm = ref({ const filterForm = ref({
district: '', district: '',
type: '', type: '',
roadConditionType: '', roadConditionType: '',
}) });
watch( watch(
() => props.itemFilterForm, // 监听父组件传递的筛选表单 () => props.itemFilterForm,
(newVal) => { newVal => {
console.log('newVal', newVal) console.log('newVal', newVal);
if (newVal.label) { filterForm.value.roadConditionType = newVal.label.substring(0, newVal.label.length - 1) || '';
filterForm.value.roadConditionType = newVal.label.substring(0, newVal.label.length - 1) || '' currentPage.value = 1;
currentPage.value = 1 fetchData();
fetchData()
} else {
filterForm.value = {
district: '',
type: '',
roadConditionType: '',
} }
} );
},
)
// 影响区域选项 // 影响区域选项
// 已从 index.js 导入 // 已从 index.js 导入
@ -139,7 +153,7 @@ watch(
// 已从 index.js 导入 // 已从 index.js 导入
// 表格高度 // 表格高度
const tableHeight = ref(300) const tableHeight = ref(300);
// 表格列配置 // 表格列配置
const tableColumns = ref([ const tableColumns = ref([
@ -158,36 +172,36 @@ const tableColumns = ref([
slot: 'roadConditionType', slot: 'roadConditionType',
}, },
{ prop: 'operation', label: '操作', width: '', slot: 'operation' }, { prop: 'operation', label: '操作', width: '', slot: 'operation' },
]) ]);
// 表格数据 // 表格数据
const tableData = ref([]) const tableData = ref([]);
// 分页 // 分页
const currentPage = ref(1) const currentPage = ref(1);
const pageSize = ref(10) const pageSize = ref(10);
const total = ref(36) const total = ref(36);
const totalPages = computed(() => Math.ceil(total.value / pageSize.value)) const totalPages = computed(() => Math.ceil(total.value / pageSize.value));
const visiblePages = computed(() => { const visiblePages = computed(() => {
const pages = [] const pages = [];
const maxVisible = 5 const maxVisible = 5;
let start = Math.max(1, currentPage.value - Math.floor(maxVisible / 2)) let start = Math.max(1, currentPage.value - Math.floor(maxVisible / 2));
let end = Math.min(totalPages.value, start + maxVisible - 1) let end = Math.min(totalPages.value, start + maxVisible - 1);
if (end - start + 1 < maxVisible) { if (end - start + 1 < maxVisible) {
start = Math.max(1, end - maxVisible + 1) start = Math.max(1, end - maxVisible + 1);
} }
for (let i = start; i <= end; i++) { for (let i = start; i <= end; i++) {
pages.push(i) pages.push(i);
} }
return pages return pages;
}) });
// 获取管控措施样式类 // 获取管控措施样式类
const getControlClass = (measure) => { const getControlClass = measure => {
const classMap = { const classMap = {
全幅封闭: 'control-close', 全幅封闭: 'control-close',
半幅封闭: 'control-half', 半幅封闭: 'control-half',
@ -198,47 +212,47 @@ const getControlClass = (measure) => {
半幅通行: 'control-half', 半幅通行: 'control-half',
限速: 'control-limit', 限速: 'control-limit',
告警阻拦: 'control-limit', 告警阻拦: 'control-limit',
} };
return classMap[measure] || '' return classMap[measure] || '';
} };
// 关闭对话框 // 关闭对话框
const handleClose = () => { const handleClose = () => {
emit('update:visible', false) emit('update:visible', false);
emit('close') emit('close');
} };
// 查看详情 // 查看详情
const handleDetail = (item) => { const handleDetail = item => {
emit('detail', item) emit('detail', item);
emit('itemdata', item) emit('itemdata', item);
} };
// 分页操作 // 分页操作
const handleSizeChange = (val) => { const handleSizeChange = val => {
pageSize.value = val pageSize.value = val;
fetchData() fetchData();
} };
const handleCurrentChange = (val) => { const handleCurrentChange = val => {
currentPage.value = val currentPage.value = val;
fetchData() fetchData();
} };
// 筛选条件改变时触发 // 筛选条件改变时触发
const handleFilterChange = () => { const handleFilterChange = () => {
currentPage.value = 1 currentPage.value = 1;
fetchData() fetchData();
} };
// 获取数据 // 获取数据
const fetchData = async () => { const fetchData = async () => {
try { try {
let params = { let params = {
start: '', start: '',
end: '', end: '',
} };
if (props.dateRange && props.dateRange.length === 2) { if (props.dateRange && props.dateRange.length === 2) {
params.start = formatDateTime(props.dateRange[0]) params.start = formatDateTime(props.dateRange[0]);
params.end = formatDateTime(props.dateRange[1]) params.end = formatDateTime(props.dateRange[1]);
} }
const res = await request({ const res = await request({
@ -254,10 +268,10 @@ const fetchData = async () => {
roadConditionType: filterForm.value.type, // 类型 roadConditionType: filterForm.value.type, // 类型
processingMeasure: filterForm.value.roadConditionType, // 管控措施 processingMeasure: filterForm.value.roadConditionType, // 管控措施
}, },
}) });
if (res.code === '00000' && res.data) { if (res.code === '00000' && res.data) {
const data = res.data const data = res.data;
// 转换数据格式 // 转换数据格式
tableData.value = data.records.map((item, index) => { tableData.value = data.records.map((item, index) => {
return { return {
@ -273,25 +287,25 @@ const fetchData = async () => {
roadConditionType: item.processingMeasure || '-', roadConditionType: item.processingMeasure || '-',
expectRecoverTime: item.expectRecoverTime || '-', expectRecoverTime: item.expectRecoverTime || '-',
eventStatus: item.eventStatus || '-', eventStatus: item.eventStatus || '-',
} };
}) });
total.value = data.total total.value = data.total;
} }
} catch (error) { } catch (error) {
console.error('获取管控情况数据失败:', error) console.error('获取管控情况数据失败:', error);
} }
} };
watch( watch(
() => filterForm.value, () => filterForm.value,
(newVal) => { newVal => {
console.log('filterForm.value变化:', newVal) console.log('filterForm.value变化:', newVal);
if (newVal) { if (newVal) {
currentPage.value = 1 currentPage.value = 1;
fetchData() fetchData();
} }
}, }
) );
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

2
packages/screen/src/views/RiskWarning/Dialog/impactPointDetailDialog.vue
View File

@ -183,6 +183,8 @@ watch(
if (newVal) { if (newVal) {
// 当弹窗打开时获取数据 // 当弹窗打开时获取数据
getAffectedObjectTypeId(props.item); getAffectedObjectTypeId(props.item);
console.log(basicInfo.value);
console.log(props.item);
} }
} }
); );

361
packages/screen/src/views/RiskWarning/Dialog/impactPointDialog.vue
View File

@ -52,7 +52,12 @@
clearable clearable
@change="handleFilterChange" @change="handleFilterChange"
> >
<el-option v-for="option in pointLevelOptions" :key="option.value" :label="option.label" :value="option.value" /> <el-option
v-for="option in pointLevelOptions"
:key="option.value"
:label="option.label"
:value="option.value"
/>
</el-select> </el-select>
</div> </div>
<div class="filter-item"> <div class="filter-item">
@ -65,7 +70,12 @@
clearable clearable
@change="handleFilterChange" @change="handleFilterChange"
> >
<el-option v-for="option in regionOptions" :key="option.value" :label="option.label" :value="option.value" /> <el-option
v-for="option in regionOptions"
:key="option.value"
:label="option.label"
:value="option.value"
/>
</el-select> </el-select>
</div> </div>
<div class="filter-item"> <div class="filter-item">
@ -176,25 +186,25 @@
</template> </template>
<script setup> <script setup>
import { ref, computed, watch, onMounted, nextTick } from 'vue' import { ref, computed, watch, onMounted } from 'vue';
import { Close, ArrowLeft, ArrowRight } from '@element-plus/icons-vue' import { Close, ArrowLeft, ArrowRight } from '@element-plus/icons-vue';
import { request } from '@/utils/request' import { request } from '@/utils/request';
import { pointTypeOptions, pointLevelOptions, regionOptions } from '../component/index.js' import { pointTypeOptions, pointLevelOptions, regionOptions } from '../component/index.js';
import baseDialog from '../component/baseDialog.vue' import baseDialog from '../component/baseDialog.vue';
import respondedIcon from '../../../assets/xiangying/有回应@2x.png' import respondedIcon from '../../../assets/xiangying/有回应@2x.png';
import notRespondedIcon from '../../../assets/xiangying/无回应@2x.png' import notRespondedIcon from '../../../assets/xiangying/无回应@2x.png';
import selectedIcon from '../../../assets/xiangying/选中bg@2x.png' import selectedIcon from '../../../assets/xiangying/选中bg@2x.png';
import unselectedIcon from '../../../assets/xiangying/未选中bg@2x.png' import unselectedIcon from '../../../assets/xiangying/未选中bg@2x.png';
import Icon0 from '../../../assets/xiangying/选中@2x.png' import Icon0 from '../../../assets/xiangying/选中@2x.png';
import Icon1 from '../../../assets/xiangying/未选中1@2x.png' import Icon1 from '../../../assets/xiangying/未选中1@2x.png';
import Icon2 from '../../../assets/xiangying/未选中2@2x.png' import Icon2 from '../../../assets/xiangying/未选中2@2x.png';
import Icon3 from '../../../assets/xiangying/未选中3@2x.png' import Icon3 from '../../../assets/xiangying/未选中3@2x.png';
import Icon4 from '../../../assets/xiangying/未选中4@2x.png' import Icon4 from '../../../assets/xiangying/未选中4@2x.png';
import { formatDateTime } from '../component/index.js' import { formatDateTime } from '../component/index.js';
onMounted(() => {}) onMounted(() => {});
const props = defineProps({ const props = defineProps({
visible: { visible: {
type: Boolean, type: Boolean,
@ -204,16 +214,16 @@ const props = defineProps({
type: Object, type: Object,
default: () => {}, default: () => {},
}, },
}) });
const emit = defineEmits(['update:visible', 'close', 'detail', 'itemClick']) const emit = defineEmits(['update:visible', 'close', 'detail', 'itemClick']);
// 筛选表单 // 筛选表单
const filterForm = ref({ const filterForm = ref({
pointType: '', pointType: '',
pointLevel: '', pointLevel: '',
region: '', region: '',
}) });
// 统一的表格列配置（桥梁、边坡、隧道、路段使用） // 统一的表格列配置（桥梁、边坡、隧道、路段使用）
const unifiedColumns = [ const unifiedColumns = [
@ -249,7 +259,7 @@ const unifiedColumns = [
slot: 'operation', slot: 'operation',
fixed: 'right', fixed: 'right',
}, },
] ];
// 项目类型专用表格列配置 // 项目类型专用表格列配置
const projectColumns = [ const projectColumns = [
@ -293,19 +303,19 @@ const projectColumns = [
width: '', width: '',
slot: 'cityResponsible', slot: 'cityResponsible',
}, },
] ];
// 为兼容旧代码，保留变量名引用 // 为兼容旧代码，保留变量名引用
const bridgeColumns = unifiedColumns const bridgeColumns = unifiedColumns;
const slopeColumns = unifiedColumns const slopeColumns = unifiedColumns;
const tunnelColumns = unifiedColumns const tunnelColumns = unifiedColumns;
const roadColumns = unifiedColumns const roadColumns = unifiedColumns;
// 当前表格列配置 // 当前表格列配置
const tableColumns = ref(bridgeColumns) const tableColumns = ref(bridgeColumns);
// 表格数据 // 表格数据
const tableData = ref([]) const tableData = ref([]);
// 影响点数据 // 影响点数据
const impactData = ref([ const impactData = ref([
{ name: '影响路段', count: 0, icon: Icon4, type: '路段' }, { name: '影响路段', count: 0, icon: Icon4, type: '路段' },
@ -313,17 +323,17 @@ const impactData = ref([
{ name: '影响隧道', count: 0, icon: Icon2, type: '隧道' }, { name: '影响隧道', count: 0, icon: Icon2, type: '隧道' },
{ name: '影响边坡', count: 0, icon: Icon1, type: '边坡' }, { name: '影响边坡', count: 0, icon: Icon1, type: '边坡' },
{ name: '影响项目', count: 0, icon: Icon3, type: '项目' }, { name: '影响项目', count: 0, icon: Icon3, type: '项目' },
]) ]);
// 顶部卡片数据 // 顶部卡片数据
const loadBarChartData = async () => { const loadBarChartData = async () => {
try { try {
const res = await request({ const res = await request({
url: '/snow-ops-platform/weather-warning/affected-count', url: '/snow-ops-platform/weather-warning/affected-count',
method: 'GET', method: 'GET',
}) });
if (res.code == '00000') { if (res.code == '00000') {
const data = res.data const data = res.data;
if (data && Array.isArray(data)) { if (data && Array.isArray(data)) {
// 英文转中文映射 // 英文转中文映射
const nameMap = { const nameMap = {
@ -337,141 +347,135 @@ const loadBarChartData = async () => {
Tunnel: '隧道', Tunnel: '隧道',
Slope: '边坡', Slope: '边坡',
Project: '项目', Project: '项目',
} };
// 转换英文name为中文 // 转换英文name为中文
const convertedData = data.map((item) => { const convertedData = data.map(item => {
const name = nameMap[item.name] || item.name const name = nameMap[item.name] || item.name;
return { ...item, name } return { ...item, name };
}) });
convertedData.forEach((item) => { convertedData.forEach(item => {
impactData.value.forEach((stat) => { impactData.value.forEach(stat => {
if (stat.name.includes(item.extension)) { if (stat.name.includes(item.extension)) {
stat.count = item.count || 0 stat.count = item.count || 0;
} }
}) });
}) });
} }
} }
} catch (error) { } catch (error) {
console.error('加载柱状图数据失败:', error) console.error('加载柱状图数据失败:', error);
} }
} };
const cardType = ref('0') const cardType = ref('0');
const cardTypeVal = ref('路段') const cardTypeVal = ref('路段');
// 根据 cardType 获取对应的表格列配置 // 根据 cardType 获取对应的表格列配置
const getColumnsByType = (type) => { const getColumnsByType = type => {
const typeMap = { const typeMap = {
路段: bridgeColumns, 路段: bridgeColumns,
桥梁: slopeColumns, 桥梁: slopeColumns,
隧道: tunnelColumns, 隧道: tunnelColumns,
边坡: roadColumns, 边坡: roadColumns,
项目: projectColumns, 项目: projectColumns,
} };
// { name: '影响路段', count: 0, icon: Icon4, type: '路段' }, // { name: '影响路段', count: 0, icon: Icon4, type: '路段' },
// { name: '影响桥梁', count: 0, icon: Icon0, type: '桥梁' }, // { name: '影响桥梁', count: 0, icon: Icon0, type: '桥梁' },
// { name: '影响隧道', count: 0, icon: Icon2, type: '隧道' }, // { name: '影响隧道', count: 0, icon: Icon2, type: '隧道' },
// { name: '影响边坡', count: 0, icon: Icon1, type: '边坡' }, // { name: '影响边坡', count: 0, icon: Icon1, type: '边坡' },
// { name: '影响项目', count: 0, icon: Icon3, type: '项目' }, // { name: '影响项目', count: 0, icon: Icon3, type: '项目' },
return typeMap[type] || bridgeColumns return typeMap[type] || bridgeColumns;
} };
// 根据 cardType 获取对应的 API 路径 // 根据 cardType 获取对应的 API 路径
const getApiUrlByType = (type) => { const getApiUrlByType = type => {
const urlMap = { const urlMap = {
桥梁: '/snow-ops-platform/weather-warning/affected-object/bridge', 桥梁: '/snow-ops-platform/weather-warning/affected-object/bridge',
边坡: '/snow-ops-platform/weather-warning/affected-object/slope', 边坡: '/snow-ops-platform/weather-warning/affected-object/slope',
隧道: '/snow-ops-platform/weather-warning/affected-object/tunnel', 隧道: '/snow-ops-platform/weather-warning/affected-object/tunnel',
项目: '/snow-ops-platform/weather-warning/affected-object/project', 项目: '/snow-ops-platform/weather-warning/affected-object/project',
路段: '/snow-ops-platform/weather-warning/affected-object/road-section', 路段: '/snow-ops-platform/weather-warning/affected-object/road-section',
} };
return urlMap[type] || '/snow-ops-platform/weather-warning/affected-object/bridge' return urlMap[type] || '/snow-ops-platform/weather-warning/affected-object/bridge';
} };
// 点击卡片切换 // 点击卡片切换
const handleClick = (index, item) => { const handleClick = (index, item) => {
tableData.value = [] tableData.value = [];
cardType.value = index + '' cardType.value = index + '';
cardTypeVal.value = item.type cardTypeVal.value = item.type;
// 切换表格列配置 // 切换表格列配置
tableColumns.value = getColumnsByType(item.type) tableColumns.value = getColumnsByType(item.type);
// 重置分页并获取数据 // 重置分页并获取数据
currentPage.value = 1 currentPage.value = 1;
fetchData() fetchData();
} };
// 分页 // 分页
const currentPage = ref(1) const currentPage = ref(1);
const pageSize = ref(10) const pageSize = ref(10);
const total = ref(0) const total = ref(0);
const totalPages = computed(() => Math.ceil(total.value / pageSize.value)) const totalPages = computed(() => Math.ceil(total.value / pageSize.value));
const visiblePages = computed(() => { const visiblePages = computed(() => {
const pages = [] const pages = [];
const maxVisible = 4 const maxVisible = 4;
let start = Math.max(1, currentPage.value - Math.floor(maxVisible / 2)) let start = Math.max(1, currentPage.value - Math.floor(maxVisible / 2));
let end = Math.min(totalPages.value, start + maxVisible - 1) let end = Math.min(totalPages.value, start + maxVisible - 1);
if (end - start + 1 < maxVisible) { if (end - start + 1 < maxVisible) {
start = Math.max(1, end - maxVisible + 1) start = Math.max(1, end - maxVisible + 1);
} }
for (let i = start; i <= end; i++) { for (let i = start; i <= end; i++) {
pages.push(i) pages.push(i);
} }
return pages return pages;
}) });
// 关闭对话框 // 关闭对话框
const handleClose = () => { const handleClose = () => {
emit('update:visible', false) emit('update:visible', false);
emit('close') emit('close');
} };
// 点击遮罩关闭已由base-dialog组件处理 // 点击遮罩关闭已由base-dialog组件处理
// 查询 // 查询
const handleSearch = () => { const handleSearch = () => {
console.log('查询条件:', filterForm.value) console.log('查询条件:', filterForm.value);
currentPage.value = 1 currentPage.value = 1;
fetchData() fetchData();
} };
// 查看详情 // 查看详情
const handleDetail = (item) => { const handleDetail = item => {
emit('detail', item) emit('detail', item);
emit('itemClick', item) emit('itemClick', item);
} };
// 分页操作 // 分页操作
const handleSizeChange = (val) => { const handleSizeChange = val => {
pageSize.value = val pageSize.value = val;
fetchData() fetchData();
} };
const handleCurrentChange = (val) => { const handleCurrentChange = val => {
currentPage.value = val currentPage.value = val;
fetchData() fetchData();
} };
// 筛选条件改变时触发 // 筛选条件改变时触发
const handleFilterChange = () => { const handleFilterChange = () => {
currentPage.value = 1 currentPage.value = 1;
fetchData() fetchData();
} };
// 获取时间参数 // 获取时间参数
const getTimeParams = () => { const getTimeParams = () => {
console.log('原始时间范围:', props.handleImpactItem) console.log('原始时间范围:', props.handleImpactItem);
let countyName = '' const roadConditionType =
regionOptions.value.forEach((item) => { regionOptions.value.find(item => item.value === filterForm.value.region)?.label || '';
if (item.label === filterForm.value.region) {
countyName = item.label || ''
}
})
return { return {
// start: `${year}-${month}-01 00:00:00`, // start: `${year}-${month}-01 00:00:00`,
// end: `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`, // end: `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`,
@ -479,14 +483,14 @@ const getTimeParams = () => {
end: formatDateTime(props.handleImpactItem.dateRange?.[1] || ''), end: formatDateTime(props.handleImpactItem.dateRange?.[1] || ''),
limit: pageSize.value, limit: pageSize.value,
offset: (currentPage.value - 1) * pageSize.value, offset: (currentPage.value - 1) * pageSize.value,
countyName: countyName || '', roadConditionType: roadConditionType || '',
riskLevel: filterForm.value.pointLevel || '', riskLevel: filterForm.value.pointLevel || '',
} };
} };
// 处理数据为统一格式 // 处理数据为统一格式
const processUnifiedData = (item, type) => { const processUnifiedData = (item, type) => {
// 获取等级样式类 // 获取等级样式类
const getLevelClass = (level) => { const getLevelClass = level => {
const levelMap = { const levelMap = {
红色预警: 'level-red', 红色预警: 'level-red',
橙色预警: 'level-orange', 橙色预警: 'level-orange',
@ -495,23 +499,37 @@ const processUnifiedData = (item, type) => {
高风险: 'level-red', 高风险: 'level-red',
中风险: 'level-orange', 中风险: 'level-orange',
低风险: 'level-blue', 低风险: 'level-blue',
} };
return levelMap[level] || '' return levelMap[level] || '';
} };
// 获取影响点等级 // 获取影响点等级
const pointLevel = item.riskLevel || item.warningLevel || item.level || item.GL1_PDDJ || item.GL1_JSDJ || '-' const pointLevel =
item.riskLevel || item.warningLevel || item.level || item.GL1_PDDJ || item.GL1_JSDJ || '-';
// 基础数据 // 基础数据
const baseData = { const baseData = {
item, item,
id: item.id, id: item.id,
// 影响区域 // 影响区域
region: item.GL1_QXMC || item.COUNTY || item.county || item.region || item.ADMINISTRATIVE_REGION || item.COUNTY_NAME || '-', region:
item.GL1_QXMC ||
item.COUNTY ||
item.county ||
item.region ||
item.ADMINISTRATIVE_REGION ||
'-',
// 影响点类型 // 影响点类型
pointType: impactData.value[type].type || '-', pointType: impactData.value[type].type || '-',
// 影响点位置（根据类型取不同字段） // 影响点位置（根据类型取不同字段）
pointLocation: item.GL1_QLMC || item.NAME || item.GL1_SDMC || item.PROJECT_NAME || item.GL1_LXBH || item.name || '-', pointLocation:
item.GL1_QLMC ||
item.NAME ||
item.GL1_SDMC ||
item.PROJECT_NAME ||
item.GL1_LXBH ||
item.name ||
'-',
// 影响点等级 // 影响点等级
pointLevel: pointLevel, pointLevel: pointLevel,
levelClass: getLevelClass(pointLevel), levelClass: getLevelClass(pointLevel),
@ -552,7 +570,7 @@ const processUnifiedData = (item, type) => {
}, },
// 保留原始数据供详情使用 // 保留原始数据供详情使用
rawData: item, rawData: item,
} };
// 桥梁类型特殊处理（根据BASE_GLQL桥梁信息表字典） // 桥梁类型特殊处理（根据BASE_GLQL桥梁信息表字典）
if (cardTypeVal.value === '桥梁') { if (cardTypeVal.value === '桥梁') {
@ -590,7 +608,7 @@ const processUnifiedData = (item, type) => {
// name: item.GL1_QLGCS || "-", // name: item.GL1_QLGCS || "-",
// phone: item.GL1_QLGCSDH || "-", // phone: item.GL1_QLGCSDH || "-",
// }, // },
} };
} }
// 隧道类型特殊处理（根据BASE_GLSD隧道信息表字典） // 隧道类型特殊处理（根据BASE_GLSD隧道信息表字典）
@ -629,7 +647,7 @@ const processUnifiedData = (item, type) => {
// name: item.GL1_GYDWYHGCS || "-", // name: item.GL1_GYDWYHGCS || "-",
// phone: item.GL1_GYDWYHGSCSDH || "-", // phone: item.GL1_GYDWYHGSCSDH || "-",
// }, // },
} };
} }
// 路段类型特殊处理（根据BASE_XJLD路线信息表字典） // 路段类型特殊处理（根据BASE_XJLD路线信息表字典）
@ -637,11 +655,16 @@ const processUnifiedData = (item, type) => {
return { return {
...baseData, ...baseData,
// 影响区域 - 使用区县名称 // 影响区域 - 使用区县名称
region: item.COUNTY_NAME || '-', region: item.GL1_ZDMC || '-',
// 影响点位置 - 使用路线名称+起终点桩号 // 影响点位置 - 使用路线名称+起终点桩号
pointLocation: pointLocation:
item.GL1_QDZH && item.GL1_ZDZH item.GL1_QDZH && item.GL1_ZDZH
? item.GL1_LXMC + '(k' + (item.GL1_QDZH + '').replace('.', '+') + '至k' + (item.GL1_ZDZH + '').replace('.', '+') + ')' ? item.GL1_LXMC +
'(k' +
(item.GL1_QDZH + '').replace('.', '+') +
'至k' +
(item.GL1_ZDZH + '').replace('.', '+') +
')'
: item.GL1_LXMC, : item.GL1_LXMC,
// 影响点等级 - 使用风险等级 // 影响点等级 - 使用风险等级
pointLevel: item.GL1_FXDJ || '', pointLevel: item.GL1_FXDJ || '',
@ -671,7 +694,7 @@ const processUnifiedData = (item, type) => {
name: item.ROAD_SECTION_CHIEF_NAME || '-', name: item.ROAD_SECTION_CHIEF_NAME || '-',
phone: item.ROAD_SECTION_CHIEF_PHONE || '-', phone: item.ROAD_SECTION_CHIEF_PHONE || '-',
}, },
} };
} }
// 项目类型特殊处理（根据SQL字段映射） // 项目类型特殊处理（根据SQL字段映射）
@ -714,105 +737,85 @@ const processUnifiedData = (item, type) => {
name: item.CITY_RESPONSIBLE_PERSON || item.cityResponsiblePerson || '-', name: item.CITY_RESPONSIBLE_PERSON || item.cityResponsiblePerson || '-',
phone: item.CITY_RESPONSIBLE_PHONE || item.cityResponsiblePhone || '-', phone: item.CITY_RESPONSIBLE_PHONE || item.cityResponsiblePhone || '-',
}, },
} };
} }
return baseData return baseData;
} };
// 根据类型处理数据（统一格式） // 根据类型处理数据（统一格式）
const processDataByType = (item, type) => { const processDataByType = (item, type) => {
return processUnifiedData(item, type) return processUnifiedData(item, type);
} };
// 获取数据 // 获取数据
const fetchData = async () => { const fetchData = async () => {
console.log('获取第', currentPage.value, '页数据, 类型:', cardType.value) console.log('获取第', currentPage.value, '页数据, 类型:', cardType.value);
try { try {
const timeParams = getTimeParams() const timeParams = getTimeParams();
// 根据 cardType 获取对应的 API URL // 根据 cardType 获取对应的 API URL
const apiUrl = getApiUrlByType(cardTypeVal.value) const apiUrl = getApiUrlByType(cardTypeVal.value);
const res = await request({ const res = await request({
url: apiUrl, url: apiUrl,
method: 'GET', method: 'GET',
params: timeParams, params: timeParams,
}) });
// 路段存在分页功能了，需要处理返回数据 // 路段存在分页功能了，需要处理返回数据
if (cardTypeVal.value == '路段') { if (cardTypeVal.value == '路段') {
if (res.data) { if (res.data) {
tableData.value = res.data.map((item, index) => ({ tableData.value = res.data.map((item, index) => ({
...processDataByType(item, cardType.value), ...processDataByType(item, cardType.value),
id: index + 1, id: index + 1,
})) }));
total.value = res.total || 0 total.value = res.total || 0;
} }
} else { } else {
if (res.code === '00000' && res.data) { if (res.code === '00000' && res.data) {
// 处理返回数据 // 处理返回数据
const allData = res.data const allData = res.data;
total.value = allData.length || 0 total.value = allData.length || 0;
// 客户端分页：计算当前页的数据范围 // 客户端分页：计算当前页的数据范围
const startIndex = (currentPage.value - 1) * pageSize.value const startIndex = (currentPage.value - 1) * pageSize.value;
const endIndex = startIndex + pageSize.value const endIndex = startIndex + pageSize.value;
const currentPageData = allData.slice(startIndex, endIndex) const currentPageData = allData.slice(startIndex, endIndex);
tableData.value = currentPageData.map((item, index) => ({ tableData.value = currentPageData.map((item, index) => ({
...processDataByType(item, cardType.value), ...processDataByType(item, cardType.value),
id: startIndex + index + 1, id: startIndex + index + 1,
})) }));
} else { } else {
tableData.value = [] tableData.value = [];
total.value = 0 total.value = 0;
} }
} }
} catch (error) { } catch (error) {
console.error('获取影响点数据失败:', error) console.error('获取影响点数据失败:', error);
tableData.value = [] tableData.value = [];
total.value = 0 total.value = 0;
} }
} };
watch(
() => props.handleImpactItem,
(newVal) => {
total.value = 0
tableData.value = []
cardType.value = '0'
loadBarChartData()
console.log('影响点情况=========newVal:', newVal)
if (newVal) {
filterForm.value.region = newVal.countyName
currentPage.value = 1
fetchData()
} else {
filterForm.value = {
district: '',
type: '',
roadConditionType: '',
}
}
},
)
// 监听visible变化 // 监听visible变化
watch( watch(
() => props.visible, () => props.visible,
(newVal) => { newVal => {
// if (newVal) { if (newVal) {
// filterForm.value = { filterForm.value = {
// pointType: '', pointType: '',
// pointLevel: '', pointLevel: '',
// region: '', region: '',
// } };
// tableData.value = [] tableData.value = [];
// cardType.value = '0' cardType.value = '0';
// loadBarChartData() loadBarChartData();
// currentPage.value = 1 currentPage.value = 1;
// fetchData() fetchData();
// } }
}, }
) );
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

57
packages/screen/src/views/RiskWarning/Dialog/mapInfoDialog.vue
View File

@ -1,5 +1,9 @@
<template> <template>
<div v-if="props.visible" class="map-info-dialog" :style="{ backgroundImage: `url(${iconProject})` }"> <div
v-if="props.visible"
class="map-info-dialog"
:style="{ backgroundImage: `url(${iconProject})` }"
>
<!-- 关闭按钮 --> <!-- 关闭按钮 -->
<div class="dialog-close" @click="handleClose">×</div> <div class="dialog-close" @click="handleClose">×</div>
@ -20,9 +24,9 @@
</template> </template>
<script setup> <script setup>
import { defineProps, defineEmits, computed } from 'vue' import { defineProps, defineEmits, computed } from 'vue';
import iconProject from '../../../assets/RiskWarning_img/弹窗背景@2x.png' import iconProject from '../../../assets/RiskWarning_img/弹窗背景@2x.png';
import iconTunnel from '../../../assets/RiskWarning_img/图标_media_dvr@2x.png' import iconTunnel from '../../../assets/RiskWarning_img/图标_media_dvr@2x.png';
const props = defineProps({ const props = defineProps({
visible: { visible: {
@ -37,13 +41,13 @@ const props = defineProps({
type: Object, type: Object,
default: () => ({}), default: () => ({}),
}, },
}) });
const emit = defineEmits(['update:visible']) const emit = defineEmits(['update:visible']);
const handleClose = () => { const handleClose = () => {
emit('update:visible', false) emit('update:visible', false);
} };
// 根据类型和数据显示不同的标题和内容 // 根据类型和数据显示不同的标题和内容
const dialogTitle = computed(() => { const dialogTitle = computed(() => {
@ -54,14 +58,13 @@ const dialogTitle = computed(() => {
road: '路段信息', road: '路段信息',
emergency: '抢险队伍', emergency: '抢险队伍',
slope: '边坡信息', slope: '边坡信息',
engineering: '危大工程信息', };
} return titleMap[props.type] || '详细信息';
return titleMap[props.type] || '详细信息' });
})
const dialogItems = computed(() => { const dialogItems = computed(() => {
const data = props.data const data = props.data;
const type = props.type const type = props.type;
switch (type) { switch (type) {
case 'project': case 'project':
@ -91,7 +94,7 @@ const dialogItems = computed(() => {
{ label: '吹哨人', value: data.WHISTLEBLOWER_NAME || '-' }, { label: '吹哨人', value: data.WHISTLEBLOWER_NAME || '-' },
{ label: '吹哨人电话', value: data.WHISTLEBLOWER_PHONE || '-' }, { label: '吹哨人电话', value: data.WHISTLEBLOWER_PHONE || '-' },
{ label: '备注', value: data.REMARKS || '-' }, { label: '备注', value: data.REMARKS || '-' },
] ];
case 'tunnel': case 'tunnel':
return [ return [
{ {
@ -147,7 +150,7 @@ const dialogItems = computed(() => {
label: '评定等级', label: '评定等级',
value: data.GL1_PDDJ || '-', value: data.GL1_PDDJ || '-',
}, },
] ];
case 'bridge': case 'bridge':
return [ return [
{ {
@ -195,7 +198,7 @@ const dialogItems = computed(() => {
label: '技术状况', label: '技术状况',
value: data.GL1_JSZKPJDJ || '-', value: data.GL1_JSZKPJDJ || '-',
}, },
] ];
case 'road': case 'road':
return [ return [
{ {
@ -226,7 +229,7 @@ const dialogItems = computed(() => {
label: '照片', label: '照片',
value: data.photos || data.photos || '-', value: data.photos || data.photos || '-',
}, },
] ];
case 'emergency': case 'emergency':
return [ return [
{ label: '队伍名称', value: data.gl1Yjllmc || '-' }, { label: '队伍名称', value: data.gl1Yjllmc || '-' },
@ -236,7 +239,7 @@ const dialogItems = computed(() => {
{ label: '地址', value: data.gl1Xxdz || '-' }, { label: '地址', value: data.gl1Xxdz || '-' },
{ label: '物资装备', value: data.materialsAndEquipments || '-' }, { label: '物资装备', value: data.materialsAndEquipments || '-' },
{ label: '照片', value: data.photos || data.photos || '-' }, { label: '照片', value: data.photos || data.photos || '-' },
] ];
case 'slope': case 'slope':
return [ return [
{ label: '边坡坡长(km)', value: data.NAME || data.name || '-' }, { label: '边坡坡长(km)', value: data.NAME || data.name || '-' },
@ -247,25 +250,15 @@ const dialogItems = computed(() => {
{ label: '监测设施设置', value: data.COUNTY || data.county || '-' }, { label: '监测设施设置', value: data.COUNTY || data.county || '-' },
{ label: '起点桩号', value: data.photos || data.photos || [] }, { label: '起点桩号', value: data.photos || data.photos || [] },
{ label: '止点桩号', value: data.photos || data.photos || [] }, { label: '止点桩号', value: data.photos || data.photos || [] },
] ];
case 'engineering':
return [
{ label: '项目名称', value: data.projectName || '-' },
{ label: '所属区县', value: data.districtName || '-' },
{ label: '技术等级', value: data.techLevel || '-' },
{ label: '等级', value: data.projectLevel || '-' },
{ label: '当前状态', value: data.currentStatus || '-' },
{ label: '预估/实际动工年月', value: data.startDate && data.endDate ? data.startDate + '至' + data.endDate : '-' },
{ label: '质量安全监督责任人及联系方式', value: data.supervisorInfo || '-' },
]
default: default:
return [ return [
{ label: '名称', value: data.NAME || data.name || '-' }, { label: '名称', value: data.NAME || data.name || '-' },
{ label: '所属区县', value: data.COUNTY || data.county || '-' }, { label: '所属区县', value: data.COUNTY || data.county || '-' },
] ];
} }
}) });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

9
packages/screen/src/views/RiskWarning/bottom.vue
View File

@ -59,7 +59,6 @@ import bridgeIconIcon from '../../assets/RiskWarning_img/桥梁icon@2x.png';
import roadIconIcon from '../../assets/RiskWarning_img/线路路段icon@2x.png'; import roadIconIcon from '../../assets/RiskWarning_img/线路路段icon@2x.png';
import teamIconIcon from '../../assets/RiskWarning_img/队伍icon@2x.png'; import teamIconIcon from '../../assets/RiskWarning_img/队伍icon@2x.png';
import hazardIconIconIcon from '../../assets/RiskWarning_img/隐患点icon@2x.png'; import hazardIconIconIcon from '../../assets/RiskWarning_img/隐患点icon@2x.png';
import engineeringIconIconIcon from '../../assets/RiskWarning_img/危大工程icon@2x.png';
import warningIconIcon1 from '../../assets/RiskWarning_img/风险预警icon1@2x.png'; import warningIconIcon1 from '../../assets/RiskWarning_img/风险预警icon1@2x.png';
import tunnelIconIcon1 from '../../assets/RiskWarning_img/隧道icon1@2x.png'; import tunnelIconIcon1 from '../../assets/RiskWarning_img/隧道icon1@2x.png';
@ -68,7 +67,6 @@ import bridgeIconIcon1 from '../../assets/RiskWarning_img/桥梁icon1@2x.png';
import roadIconIcon1 from '../../assets/RiskWarning_img/线路路段icon1@2x.png'; import roadIconIcon1 from '../../assets/RiskWarning_img/线路路段icon1@2x.png';
import teamIconIcon1 from '../../assets/RiskWarning_img/队伍icon1@2x.png'; import teamIconIcon1 from '../../assets/RiskWarning_img/队伍icon1@2x.png';
import hazardIconIcon from '../../assets/RiskWarning_img/隐患点icon1@2x.png'; import hazardIconIcon from '../../assets/RiskWarning_img/隐患点icon1@2x.png';
import engineeringIconIcon from '../../assets/RiskWarning_img/危大工程icon1@2x.png';
import hazardIconIcon1 from '../../assets/MaMap_img/一般路内隐患点@2x.png'; import hazardIconIcon1 from '../../assets/MaMap_img/一般路内隐患点@2x.png';
import hazardIconIcon2 from '../../assets/MaMap_img/一般路外隐患点@2x.png'; import hazardIconIcon2 from '../../assets/MaMap_img/一般路外隐患点@2x.png';
@ -142,13 +140,6 @@ const menuItems = [
icon: teamIconIcon, icon: teamIconIcon,
icon1: teamIconIcon1, icon1: teamIconIcon1,
}, },
{
label: '危大工程',
icon: 'icon-hazard',
iconClass: 'hazard',
icon: engineeringIconIconIcon,
icon1: engineeringIconIcon,
},
]; ];
// 涉灾隐患点弹窗相关 // 涉灾隐患点弹窗相关

194
packages/screen/src/views/RiskWarning/component/ChongqingMap.vue
View File

@ -42,7 +42,6 @@ import bridgeIcon from '../../../assets/MaMap_img/桥梁icon@2x.png';
import tunnelIcon from '../../../assets/MaMap_img/蓝色@2x1.png'; import tunnelIcon from '../../../assets/MaMap_img/蓝色@2x1.png';
import tunnelIcon2 from '../../../assets/MaMap_img/隧洞icon@2x.png'; import tunnelIcon2 from '../../../assets/MaMap_img/隧洞icon@2x.png';
import rescueTeamIcon from '../../../assets/MaMap_img/队伍icon@2x.png'; import rescueTeamIcon from '../../../assets/MaMap_img/队伍icon@2x.png';
import engineeringIconIcon from '../../../assets/MaMap_img/危大工程icon@2x.png';
import hazardIconIcon1 from '../../../assets/MaMap_img/一般路内隐患点@2x.png'; import hazardIconIcon1 from '../../../assets/MaMap_img/一般路内隐患点@2x.png';
import hazardIconIcon2 from '../../../assets/MaMap_img/一般路外隐患点@2x.png'; import hazardIconIcon2 from '../../../assets/MaMap_img/一般路外隐患点@2x.png';
@ -90,9 +89,11 @@ const props = defineProps({
watch( watch(
() => props.roadItem, () => props.roadItem,
async (newVal, oldVal) => { async (newVal, oldVal) => {
getAffectedRoadSectionData(false); if (newVal !== oldVal) {
await getAffectedRoadSectionData(false);
}
}, },
{ immediate: false } { immediate: true }
); );
// 定义 emits // 定义 emits
const emit = defineEmits([ const emit = defineEmits([
@ -350,18 +351,15 @@ const getAffectedCountyData = async () => {
params: timeParams, params: timeParams,
}); });
console.log('受影响对象数据:', res); console.log('受影响对象数据:', res);
clearProjectMarkers();
if (res.code === '00000' && res.data) { if (res.code === '00000' && res.data) {
// 统计各区县预警数量 // 统计各区县预警数量
const warningStats = countWarningsByCounty(res.data); const warningStats = countWarningsByCounty(res.data);
console.log('区县预警统计:', warningStats); console.log('区县预警统计:', warningStats);
affectedCountyData.value = warningStats; affectedCountyData.value = warningStats;
getAffectedProjectData(true); // 获取受影响项目数据 getAffectedProjectData(true);
getAffectedTunnelData(true); // 获取受影响隧道数据 getAffectedTunnelData(true);
getAffectedBridgeData(true); // 获取受影响桥梁数据 getAffectedBridgeData(true);
getDangerProjectData(true); // 获取危大工程数据
// 获取受影响路段数据
for (let index = 0; index < 5; index++) { for (let index = 0; index < 5; index++) {
console.log(index); console.log(index);
if (index == 0) { if (index == 0) {
@ -382,51 +380,13 @@ const getAffectedCountyData = async () => {
// getEmergencyForceData(); // getEmergencyForceData();
loadMapData(); // 加载地图数据 loadMapData();
} }
} catch (error) { } catch (error) {
console.error('获取受影响对象数据失败:', error); console.error('获取受影响对象数据失败:', error);
} }
}; };
/**
* 通用数据过滤方法 - 根据区县筛选数据并设置坐标
* @param {Array} dataList - 原始数据列表
* @param {boolean} flag - 是否只筛选受影响区县的数据
* @param {Object} options - 配置选项
* @param {string} options.countyField - 区县字段名
* @param {string} options.countyMatchField - 匹配区县时使用的字段名（如与countyField不同）
* @param {Function} options.coordinateParser - 坐标解析函数，接收item返回[lng, lat]
* @returns {Array} 过滤后的数据
*/
const filterDataByCounty = (dataList, flag, options) => {
const { countyField = 'COUNTY', countyMatchField, coordinateParser } = options;
const matchField = countyMatchField || countyField;
const filteredData = [];
dataList.forEach(item => {
// 区县名称处理：江北/渝北 -> 两江新区
const countyValue = item[countyField];
if (countyValue && (countyValue.includes('江北') || countyValue.includes('渝北'))) {
item[countyField] = '两江新区';
}
// 根据受影响区县列表进行过滤
affectedCountyData.value.sortedList.forEach(j => {
const matchValue = item[matchField];
if (flag && matchValue && j.name && matchValue.includes(j.name)) {
item.COORDINATE_POINT = coordinateParser(item);
filteredData.push(item);
} else if (!flag) {
item.COORDINATE_POINT = coordinateParser(item);
filteredData.push(item);
}
});
});
return filteredData;
};
const affectedBridgeData = ref([]); const affectedBridgeData = ref([]);
// 获取受影响桥梁数据 // 获取受影响桥梁数据
const getAffectedBridgeData = async flag => { const getAffectedBridgeData = async flag => {
@ -438,16 +398,24 @@ const getAffectedBridgeData = async flag => {
params: timeParams, params: timeParams,
}); });
if (res.data) { if (res.data) {
// 使用通用过滤方法处理数据 res.data.forEach(item => {
const filteredData = filterDataByCounty(res.data, flag, { if (item.COUNTY && (item.COUNTY.includes('江北') || item.COUNTY.includes('渝北'))) {
countyField: 'COUNTY', item.COUNTY = '两江新区';
countyMatchField: 'GL1_QXMC', }
coordinateParser: item => [item.GL1_QLJD, item.GL1_QLWD], affectedCountyData.value.sortedList.forEach(j => {
// 判断是否是影响区域
if (flag && item.GL1_QXMC && j.name && item.GL1_QXMC.includes(j.name)) {
item.COORDINATE_POINT = [item.GL1_QLJD, item.GL1_QLWD];
affectedBridgeData.value.push(item);
} else if (!flag) {
item.COORDINATE_POINT = [item.GL1_QLJD, item.GL1_QLWD];
affectedBridgeData.value.push(item);
}
}); });
affectedBridgeData.value = filteredData; });
}
console.log('受影响桥梁数据:', affectedBridgeData.value); console.log('受影响桥梁数据:', affectedBridgeData.value);
addProjectMarkers(affectedBridgeData.value, bridgeIcon, 'bridge'); addProjectMarkers(affectedBridgeData.value, bridgeIcon, 'bridge');
}
} catch (error) { } catch (error) {
console.error('获取受影响桥梁数据失败:', error); console.error('获取受影响桥梁数据失败:', error);
return []; return [];
@ -465,13 +433,21 @@ const getAffectedTunnelData = async flag => {
params: timeParams, params: timeParams,
}); });
if (res.code === '00000' && res.data) { if (res.code === '00000' && res.data) {
// 使用通用过滤方法处理数据 res.data.forEach(item => {
const filteredData = filterDataByCounty(res.data, flag, { if (item.COUNTY && (item.COUNTY.includes('江北') || item.COUNTY.includes('渝北'))) {
countyField: 'COUNTY', item.COUNTY = '两江新区';
countyMatchField: 'GL1_QXMC', }
coordinateParser: item => [Number(item.GL1_SDJD2), Number(item.GL1_SDWD2)],
affectedCountyData.value.sortedList.forEach(j => {
if (flag && j.name && item.GL1_QXMC && item.GL1_QXMC.includes(j.name)) {
item.COORDINATE_POINT = [Number(item.GL1_SDJD2), Number(item.GL1_SDWD2)];
tunnelInfoDialogRef.value.push(item);
} else if (!flag) {
item.COORDINATE_POINT = [Number(item.GL1_SDJD2), Number(item.GL1_SDWD2)];
tunnelInfoDialogRef.value.push(item);
}
});
}); });
tunnelInfoDialogRef.value = filteredData;
console.log('受影响隧道数据:', tunnelInfoDialogRef.value); console.log('受影响隧道数据:', tunnelInfoDialogRef.value);
addProjectMarkers(tunnelInfoDialogRef.value, tunnelIcon2, 'tunnel'); addProjectMarkers(tunnelInfoDialogRef.value, tunnelIcon2, 'tunnel');
} }
@ -495,30 +471,48 @@ const getAffectedProjectData = async flag => {
console.log('受影响项目数据:', res); console.log('受影响项目数据:', res);
if (res.code === '00000' && res.data) { if (res.code === '00000' && res.data) {
console.log('项目数据条数:', res.data.length); console.log('项目数据条数:', res.data.length);
// 预处理：解析坐标格式 // 解析坐标数据
const preprocessedData = res.data.map(item => { const parsedData = res.data.map(item => {
if (item.COUNTY && (item.COUNTY.includes('江北') || item.COUNTY.includes('渝北'))) {
item.COUNTY = '两江新区';
}
affectedCountyData.value.sortedList.forEach(j => {
const newItem = { ...item }; const newItem = { ...item };
if (item.COORDINATE_POINT) { // 判断 flag = true 是页面第一次进入
if (
flag &&
item.COORDINATE_POINT &&
j.name &&
item.COUNTY &&
item.COUNTY.includes(j.name)
) {
console.log('原始坐标:', item.COORDINATE_POINT); console.log('原始坐标:', item.COORDINATE_POINT);
newItem.COORDINATE_POINT_PARSED = item.COORDINATE_POINT.substring( newItem.COORDINATE_POINT = item.COORDINATE_POINT.substring(
6, 6,
item.COORDINATE_POINT.length - 1 item.COORDINATE_POINT.length - 1
) )
.split(' ') .split(' ')
.reverse(); .reverse();
console.log('解析后坐标:', newItem.COORDINATE_POINT_PARSED); console.log('解析后坐标:', newItem.COORDINATE_POINT);
} else if (!flag && item.COORDINATE_POINT) {
console.log('原始坐标:', item.COORDINATE_POINT);
newItem.COORDINATE_POINT = item.COORDINATE_POINT.substring(
6,
item.COORDINATE_POINT.length - 1
)
.split(' ')
.reverse();
console.log('解析后坐标:', newItem.COORDINATE_POINT);
} }
return newItem; return newItem;
}); });
// 使用通用过滤方法处理数据
const filteredData = filterDataByCounty(preprocessedData, flag, {
countyField: 'COUNTY',
coordinateParser: item => item.COORDINATE_POINT_PARSED || [],
}); });
affectedProjectData.value = filteredData;
affectedProjectData.value = parsedData;
// 在地图上添加项目标记 // 在地图上添加项目标记
console.log('开始添加项目标记...'); console.log('开始添加项目标记...');
addProjectMarkers(filteredData, projectIcon, 'project'); addProjectMarkers(parsedData, projectIcon, 'project');
} else { } else {
console.warn('没有获取到项目数据或返回码错误:', res); console.warn('没有获取到项目数据或返回码错误:', res);
} }
@ -563,15 +557,21 @@ const getAffectedRoadSectionData = async flag => {
}, },
}); });
console.log('受影响路段数据:', res); console.log('受影响路段数据:', res);
if (res.code === '00000' && res.data) { if (res.code === '00000' && res.data) {
// 使用通用过滤方法处理数据 res.data.forEach(item => {
const filteredData = filterDataByCounty(res.data, flag, { if (item.COUNTY && (item.COUNTY.includes('江北') || item.COUNTY.includes('渝北'))) {
countyField: 'COUNTY', item.COUNTY = '两江新区';
countyMatchField: 'GL1_QXMC', }
coordinateParser: item => [item.GL1_LON, item.GL1_LAT], affectedCountyData.value.sortedList.forEach(j => {
if (flag && item.GL1_QXMC && j.name && item.GL1_QXMC.includes(j.name)) {
// item.COORDINATE_POINT = JSON.parse(item.STARTPOINT);
item.COORDINATE_POINT = [item.GL1_LON, item.GL1_LAT];
} else if (!flag) {
item.COORDINATE_POINT = [item.GL1_LON, item.GL1_LAT];
}
}); });
affectedRoadSectionData.value = filteredData; });
affectedRoadSectionData.value = res.data;
// 在地图上添加项目标记 // 在地图上添加项目标记
console.log('受影响路段数据:', affectedRoadSectionData.value); console.log('受影响路段数据:', affectedRoadSectionData.value);
@ -648,37 +648,6 @@ const getEmergencyForceData = async () => {
} }
}; };
const dangerProjectData = ref([]);
// 获取危大工程数据
const getDangerProjectData = async flag => {
try {
const res = await request({
url: '/snow-ops-platform/dangerProjectInfo/listAll',
method: 'GET',
});
console.log('危大工程数据:', res);
if (res.code === '00000' && res.data) {
// 使用通用过滤方法处理数据
const filteredData = filterDataByCounty(res.data, flag, {
countyField: 'districtName',
coordinateParser: item => [item.longitude, item.latitude],
});
dangerProjectData.value = filteredData;
console.log('过滤后危大工程数据:', filteredData);
// 在地图上添加危大工程标记
console.log('开始添加危大工程标记...', filteredData);
addProjectMarkers(filteredData, engineeringIconIcon, 'engineering');
} else {
console.warn('没有获取到危大工程数据或返回码错误:', res);
}
return res.data || [];
} catch (error) {
console.error('获取危大工程数据失败:', error);
return [];
}
};
// 风险点数据 // 风险点数据
const riskPointData = ref([]); const riskPointData = ref([]);
// 风险点统计数据 // 风险点统计数据
@ -1335,9 +1304,6 @@ watch(
case '队伍': case '队伍':
await getEmergencyForceData(); await getEmergencyForceData();
break; break;
case '危大工程':
await getDangerProjectData(false);
break;
default: default:
break; break;
} }
@ -1367,8 +1333,6 @@ watch(
async (newVal, oldVal) => { async (newVal, oldVal) => {
console.log('dateRange 变化:', newVal, oldVal); console.log('dateRange 变化:', newVal, oldVal);
// 先重新加载受影响区县数据 // 先重新加载受影响区县数据
clearProjectMarkers(); // 清除项目标记
await getAffectedCountyData(); await getAffectedCountyData();
}, },
{ deep: true } { deep: true }

1
packages/screen/src/views/RiskWarning/index.vue
View File

@ -31,7 +31,6 @@
<left <left
:dateRange="getdateRange" :dateRange="getdateRange"
@warningClick="handleWarningClick" @warningClick="handleWarningClick"
@closeImpactItem="handleImpactItem = {}"
@openImpactDetail="openDialog('impactPoint')" @openImpactDetail="openDialog('impactPoint')"
@openWarningInfo="openDialog('warningInfo')" @openWarningInfo="openDialog('warningInfo')"
@dispatchDateRange="handleDispatchDateRange" @dispatchDateRange="handleDispatchDateRange"

2
packages/screen/src/views/RiskWarning/left.vue
View File

@ -203,7 +203,6 @@ const emit = defineEmits([
'dispatchDateRange', 'dispatchDateRange',
'openOfflineHelp', 'openOfflineHelp',
'openImageInspection', 'openImageInspection',
'closeImpactItem',
]); ]);
// 点击统计项 // 点击统计项
@ -234,7 +233,6 @@ const handleWarningCardClick = item => {
// 点击影响点明细 // 点击影响点明细
const handleImpactDetailClick = () => { const handleImpactDetailClick = () => {
emit('openImpactDetail'); emit('openImpactDetail');
emit('closeImpactItem', {});
}; };
// 点击调度清单卡片 // 点击调度清单卡片

6
packages/screen/src/views/RiskWarning/right.vue
View File

@ -71,7 +71,7 @@
<!-- 巡查公路里程 --> <!-- 巡查公路里程 -->
<div class="patrol-section clickable"> <div class="patrol-section clickable">
<div class="patrol-header display jc_sb ai_center"> <div class="patrol-header display jc_sb ai_center">
<div @click="handlePatrolClick" style="cursor: pointer"> <div @click="handlePatrolClick" style="cursor: pointer;">
<span class="patrol-title">巡查公路里程</span> <span class="patrol-title">巡查公路里程</span>
<span class="patrol-mileage ml_10">{{ roadInspectionMileage }}km</span> <span class="patrol-mileage ml_10">{{ roadInspectionMileage }}km</span>
</div> </div>
@ -80,7 +80,7 @@
<span class="patrol-mileage ml_10">0处</span> <span class="patrol-mileage ml_10">0处</span>
</div> </div>
</div> </div>
<div class="patrol-grid" style="cursor: pointer" @click="handlePatrolSituationClick"> <div class="patrol-grid" style="cursor: pointer;" @click="handlePatrolSituationClick">
<div v-for="(item, index) in patrolData" :key="index" class="patrol-item"> <div v-for="(item, index) in patrolData" :key="index" class="patrol-item">
<div class="patrol-value">{{ item.value }}</div> <div class="patrol-value">{{ item.value }}</div>
<div class="patrol-label">{{ item.label }}</div> <div class="patrol-label">{{ item.label }}</div>
@ -546,7 +546,7 @@ const handleControlClick = item => {
// 点击阻断情况 // 点击阻断情况
const handleBlockClick = () => { const handleBlockClick = () => {
emit('openClearanceSituation'); emit('openClearanceSituation');
emit('update:filterForm', {}); emit('update:dateRange', dateRange.value);
}; };
// 点击巡查公路里程 // 点击巡查公路里程