renkang/xj-screen
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source 
1.新疆大屏新需求
This commit is contained in:
weixin
2025-09-19 18:34:40 +08:00
parent 1714ff19f5
commit a97d9c64aa
41 changed files with 1121 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/chinaMap/chinaHooks.ts
+4 -2
View File
@@ -115,12 +115,14 @@ export function mapApiSwitch(type, params: any) {
}
export const mapIcon1 = new URL('/@/assets/img/mapIcon1.png', import.meta.url).href;
export const mapIcon11 = new URL('/@/assets/img/mapIcon1-1.png', import.meta.url).href;
export const mapIcon2 = new URL('/@/assets/img/mapIcon2.png', import.meta.url).href;
export const mapIcon3 = new URL('/@/assets/img/mapIcon3.png', import.meta.url).href;
export const mapIcon4 = new URL('/@/assets/img/mapIcon4.png', import.meta.url).href;
export const mapIcon41 = new URL('/@/assets/img/mapIcon4-1.png', import.meta.url).href;
export const mapIcon5 = new URL('/@/assets/img/mapIcon5.png', import.meta.url).href;
export const mapIcon6 = new URL('/@/assets/img/mapIcon6.png', import.meta.url).href;
export const mapIcon7 = new URL('/@/assets/img/mapIcon7.png', import.meta.url).href;
export const mapIcon51 = new URL('/@/assets/img/mapIcon5-1.png', import.meta.url).href;
export const watchIconR = new URL('/@/assets/img/watchIconR.svg', import.meta.url).href;
export const legend1 = new URL('/@/assets/img/legend1.png', import.meta.url).href;
export const legend2 = new URL('/@/assets/img/legend2.png', import.meta.url).href;
src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue
+2 -2
View File
@@ -9,9 +9,9 @@
:rowClassName="(record, index) => (index % 2 === 1 ? 'table-default' : 'table-striped')"
>
<template #bodyCell="{ column, record, index, text }">
<template v-if="column.customRender && isFunction(column.customRender)" v-html="column.customRender({ column, record, index, text })">
<template v-if="column?.customRender && isFunction(column.customRender)" v-html="column.customRender({ column, record, index, text })">
</template>
<slot v-else-if="column.slot" :name="column.slot" v-bind="{ column, record, index, text } || {}"></slot>
<slot v-else-if="column?.slot" :name="column.slot" v-bind="{ column, record, index, text } || {}"></slot>
<template v-else>
{{ text }}
</template>
src/components/xianMap/xianMapHooks.ts
+3 -46
View File
@@ -1,53 +1,10 @@
import { getAllList, getAllListNew, getAmbulanceList } from '/@/components/xianMap/xianMapApi.ts';
// export enum TabType {
// all = '', //所有资源
// youTianYiYuan = '1', //油田医院
// heZuoYiYuan = '2', //合作医院
// yiLiaoDian = '3', //医疗点
// jiuHuChe = '5', //救护车
// zhiShengJi = '4', //直升机
// diFangYiYuan = '6', //地方医院
// }
//
// export const tabList = [
// {
// name: '所有资源',
// type: TabType.all,
// },
// {
// name: '油田医院',
// type: TabType.youTianYiYuan,
// },
// {
// name: '医疗点',
// type: TabType.yiLiaoDian,
// },
// {
// name: '救护车',
// type: TabType.jiuHuChe,
// },
// {
// name: '合作医院',
// type: TabType.heZuoYiYuan,
// },
// {
// name: '地方医院',
// type: TabType.diFangYiYuan,
// },
// // {
// // name: '直升机',
// // type: TabType.zhiShengJi,
// // },
// {
// name: '急救路线',
// },
// ];
export enum TabType {
all = '', //所有资源
youTianYiYuan = '1', //油田医院
jianKangXiaoWu = '2', //健康小屋
jianKangXiaoWu = '3', //健康小屋
aed = '4', //AED
jiuHuChe = '5', //救护车
}
export const tabList = [
@@ -130,7 +87,7 @@ export function aircraftContent() {
export function mapApiSwitch(type, params: any) {
// 全部 油田 医疗点 合作医院
if ([TabType.all, TabType.youTianYiYuan, TabType.jianKangXiaoWu, TabType.jiuHuChe].includes(type)) {
if ([TabType.all, TabType.youTianYiYuan, TabType.jianKangXiaoWu, TabType.jiuHuChe, TabType.aed].includes(type)) {
// return getAllList({ ...params });
return getAllListNew({ ...params });
}