Skip to content

J
jingan-wisdom
Commit ea5d2f9a authored by 郭铭瑶's avatar 郭铭瑶 🤘
Browse files
Options

更新,打包

parent f99e48e1
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1903 additions and 197 deletions
dist/assets/index.406387d3.css deleted 100644 → 0
View file @ f99e48e1
This diff is collapsed.
dist/assets/index.6d616eb9.css 0 → 100644
View file @ ea5d2f9a
This diff is collapsed.
dist/index.html
View file @ ea5d2f9a
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
<link rel="icon" href="./favicon.ico" /> <link rel="icon" href="./favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>静安智慧房管</title> <title>静安智慧房管</title>
<script type="module" crossorigin src="./assets/index.73fe6fc7.js"></script> <script type="module" crossorigin src="./assets/index.afa3abf8.js"></script>
<link rel="modulepreload" href="./assets/vendor.3d772a52.js"> <link rel="modulepreload" href="./assets/vendor.d8be57b6.js">
<link rel="stylesheet" href="./assets/vendor.db35e2cd.css"> <link rel="stylesheet" href="./assets/vendor.db35e2cd.css">
<link rel="stylesheet" href="./assets/index.406387d3.css"> <link rel="stylesheet" href="./assets/index.6d616eb9.css">
</head> </head>
<body> <body>
......
src/ajax/api.ts
View file @ ea5d2f9a
...@@ -23,4 +23,5 @@ export default { ...@@ -23,4 +23,5 @@ export default {
EQUIPMENT: '/service-basicdatasync-ddd/public/community/facEqus', // 设施设备 EQUIPMENT: '/service-basicdatasync-ddd/public/community/facEqus', // 设施设备
EXPAND_INFO: EXPAND_INFO:
'/service-basicdatasync-ddd/public/tbl_community/entity/{id}/ext', // 小区拓展信息 '/service-basicdatasync-ddd/public/tbl_community/entity/{id}/ext', // 小区拓展信息
ELEVATOR: '/service-special-ja-ddd/public/elevatorInstallationInfos', // 电梯
} }
src/components/MyComponent/MyEmpty/my-empty.vue
View file @ ea5d2f9a
...@@ -29,6 +29,8 @@ export default defineComponent({ ...@@ -29,6 +29,8 @@ export default defineComponent({
flex-direction column flex-direction column
color #ccc color #ccc
font-weight bold font-weight bold
justify-content center !important
align-items center !important
>img >img
width .4rem width .4rem
height @width height @width
......
src/components/MyComponent/MyModal/my-modal.vue
View file @ ea5d2f9a
...@@ -122,7 +122,7 @@ export default defineComponent({ ...@@ -122,7 +122,7 @@ export default defineComponent({
$center() $center()
.my-modal .my-modal
color #fff color #fff
$blur() $blur(0.1rem)
z-index 99999 z-index 99999
head head
height .3rem height .3rem
......
src/components/MyComponent/main.styl
View file @ ea5d2f9a
...@@ -36,7 +36,7 @@ $card-title-size = .14rem ...@@ -36,7 +36,7 @@ $card-title-size = .14rem
$card-border = .01rem solid $primary-border $card-border = .01rem solid $primary-border
$table-title-bg =rgba(2,27,53,.5) $table-title-bg =rgba(2,27,53,.5)
$table-content-bg = rgba(2,27,53,.5) $table-content-bg = rgba(2,27,53,.6)
$table-content-hover-color = $primary-color $table-content-hover-color = $primary-color
$table-content-hover-bg = $primary-bg $table-content-hover-bg = $primary-bg
......
src/components/my-map/s-map/util.ts
View file @ ea5d2f9a
...@@ -2,7 +2,7 @@ import { LayerOption, PointsData } from '../types' ...@@ -2,7 +2,7 @@ import { LayerOption, PointsData } from '../types'
/** 转化点状覆盖物 */ /** 转化点状覆盖物 */
export function toPoints(options: LayerOption) { export function toPoints(options: LayerOption) {
const { data, size = 16, icon, labelKey, labelOptions } = options const { data, size = 16, icon, labelKey, labelOptions, _key } = options
const transData = (item: PointsData) => { const transData = (item: PointsData) => {
const iconSize = Array.isArray(size) const iconSize = Array.isArray(size)
? new SMap.Size(...size) ? new SMap.Size(...size)
...@@ -18,7 +18,7 @@ export function toPoints(options: LayerOption) { ...@@ -18,7 +18,7 @@ export function toPoints(options: LayerOption) {
size: iconSize, size: iconSize,
image: item.icon || icon, image: item.icon || icon,
}, },
attributes: { ...item }, attributes: { ...item, _key },
position: z ? [x, y, z] : [x, y], position: z ? [x, y, z] : [x, y],
} }
if (labelKey) { if (labelKey) {
......
src/components/my-map/types.ts
View file @ ea5d2f9a
...@@ -226,6 +226,7 @@ export interface LayerOption { ...@@ -226,6 +226,7 @@ export interface LayerOption {
lineStyle?: string lineStyle?: string
lineJoin?: 'bevel' | 'round' | 'miter' lineJoin?: 'bevel' | 'round' | 'miter'
lineWidth?: number lineWidth?: number
_key?: string
} }
/** 边界选项 */ /** 边界选项 */
export interface BoundaryOption { export interface BoundaryOption {
......
src/store/mutations.ts
View file @ ea5d2f9a
...@@ -4,9 +4,6 @@ export default { ...@@ -4,9 +4,6 @@ export default {
SET_LOADING(state: GlobalStateProps, val: boolean): void { SET_LOADING(state: GlobalStateProps, val: boolean): void {
state.showLoading = val state.showLoading = val
}, },
SET_COM(state: GlobalStateProps, e: any) {
state.com = e
},
SET_COMMUNITY_LIST(state: GlobalStateProps, data: any[]) { SET_COMMUNITY_LIST(state: GlobalStateProps, data: any[]) {
state.communityList = data state.communityList = data
}, },
......
src/store/state.ts
View file @ ea5d2f9a
export default { export default {
showLoading: false, showLoading: false,
com: null,
communityList: [] as any[], communityList: [] as any[],
} }
src/utils/component-lib.esm.js
View file @ ea5d2f9a
This diff is collapsed.
src/view/components/community-info.vue
View file @ ea5d2f9a
<template> <template>
<div class="community-info"> <div class="community-info">
<n-menu v-model:value="curMenu" :options="menus" style="width: 1.2rem" /> <n-menu v-model:value="curMenu" :options="menus" class="side-menu" />
<div class="content"> <div class="content">
<template v-if="curMenu === 1"> <template v-if="curMenu === 1">
<m-sub>小区基本信息</m-sub> <m-sub>小区基本信息</m-sub>
...@@ -738,7 +738,7 @@ function reset() { ...@@ -738,7 +738,7 @@ function reset() {
} }
const formatter = { const formatter = {
trueOrFalse: (val: unknown) => (val === true ? '有' : '无'), trueOrFalse: (val: unknown) => (val === true ? '有' : '无'),
yesOrNo: (val: unknown) => (val == 1 ? '是' : '否'), yesOrNo: (val: unknown) => (val == 1 ? '是' : val == 0 ? '否' : ''),
switchUnitKind, switchUnitKind,
switchOrderState, switchOrderState,
switchReceiver: (key: unknown) => { switchReceiver: (key: unknown) => {
...@@ -846,32 +846,20 @@ const selfCheckColumn = [ ...@@ -846,32 +846,20 @@ const selfCheckColumn = [
key: 'checkPersonName', key: 'checkPersonName',
}, },
{ {
title: '检查状态', title: '是否开整改单',
key: 'checkState', key: 'checkState',
render({ checkState }) { render({ checkState }) {
return h('span', null, { return h('span', null, {
default: () => formatter.switchCheckState(checkState), default: () => formatter.yesOrNo(checkState),
}) })
}, },
}, },
{ {
title: '整改情况', title: '检查状态',
key: 'checkStateDegree', key: 'checkStateDegree',
render({ checkStateDegree }) { render({ orderState }) {
return h('span', null, { return h('span', null, {
default: () => { default: () => formatter.switchOrderState(orderState),
// 0无需整改 1已整改 2整改中
switch (checkStateDegree) {
case '0':
return '无需整改'
case '1':
return '已整改'
case '2':
return '整改中'
default:
return '暂无'
}
},
}) })
}, },
}, },
...@@ -1193,6 +1181,10 @@ watch( ...@@ -1193,6 +1181,10 @@ watch(
width 100% width 100%
height 70vh height 70vh
overflow hidden overflow hidden
.side-menu
width 1.2rem
background rgba(2, 27, 53, 0.6)
margin-right .1rem
.content .content
flex 1 flex 1
overflow-y auto overflow-y auto
......
src/view/components/map-btns.vue
View file @ ea5d2f9a
<template> <template>
<div class="map-btns" :class="{ isFull: fullScreen }"> <div class="map-btns" :class="{ isFull: fullScreen }">
<img <template v-for="btn in btns">
v-for="btn in btns" <n-tooltip
v-show="!btn.hidden" v-if="!btn.hidden"
:key="btn.key" :key="btn.key"
:src="btn.icon" trigger="hover"
:title="btn?.tip" placement="left"
@click="onClick(btn.key)" >
/> <template #trigger>
<img :src="btn.icon" :title="btn?.tip" @click="onClick(btn.key)" />
</template>
{{ btn.tip }}
</n-tooltip>
</template>
</div> </div>
</template> </template>
...@@ -21,6 +26,7 @@ import btn6 from '@/assets/images/btn6.png' ...@@ -21,6 +26,7 @@ import btn6 from '@/assets/images/btn6.png'
import btn7 from '@/assets/images/btn7.png' import btn7 from '@/assets/images/btn7.png'
import btn8 from '@/assets/images/btn8.png' import btn8 from '@/assets/images/btn8.png'
import { computed, PropType } from 'vue' import { computed, PropType } from 'vue'
import { NTooltip } from 'naive-ui'
const props = defineProps({ const props = defineProps({
isDefaultScreen: { isDefaultScreen: {
...@@ -55,7 +61,7 @@ const btns = computed(() => [ ...@@ -55,7 +61,7 @@ const btns = computed(() => [
hidden: props.onlyOneView, hidden: props.onlyOneView,
tip: '屏幕列表', tip: '屏幕列表',
}, },
{ key: 'btn6', icon: btn6 }, // { key: 'btn6', icon: btn6 },
{ key: 'reset', icon: btn8, tip: '重置' }, { key: 'reset', icon: btn8, tip: '重置' },
]) ])
const onClick = (key: string) => { const onClick = (key: string) => {
......
src/view/components/map.vue
View file @ ea5d2f9a
...@@ -29,7 +29,7 @@ onMounted(async () => { ...@@ -29,7 +29,7 @@ onMounted(async () => {
mode: '2D', mode: '2D',
center: [-1931.2637583608503, 4334.0159596985895], center: [-1931.2637583608503, 4334.0159596985895],
zoom: 4, zoom: 4,
zooms: [3, 10], zooms: [4, 10],
style: 'smap://styles/dark', style: 'smap://styles/dark',
appKey: 'DTZ49ACE32PBN73GXPF085', appKey: 'DTZ49ACE32PBN73GXPF085',
netType: 'internet', netType: 'internet',
...@@ -59,7 +59,7 @@ function onComplete() { ...@@ -59,7 +59,7 @@ function onComplete() {
emit('complete') emit('complete')
} }
function setCommunityPoints(query = 'HPB_NAME = \'静安区\'') { function setCommunityPoints(query = "HPB_NAME = '静安区'") {
map.instance.getLayer('wg_gis_xq_point').visible = false map.instance.getLayer('wg_gis_xq_point').visible = false
map.instance.setFilter('wg_gis_mpz', query) map.instance.setFilter('wg_gis_mpz', query)
map.instance.setFilter('wg_gis_xq_poly', query) map.instance.setFilter('wg_gis_xq_poly', query)
......
src/view/view-page.vue
View file @ ea5d2f9a
...@@ -207,23 +207,40 @@ const elevatorDetail = ref<{ [key: string]: any }>({}) ...@@ -207,23 +207,40 @@ const elevatorDetail = ref<{ [key: string]: any }>({})
const showSafetyDrawer = ref(false) const showSafetyDrawer = ref(false)
const safetyDetail = ref<{ [key: string]: any }>({}) const safetyDetail = ref<{ [key: string]: any }>({})
const onMapClick = async (e) => { const onMapClick = async ({
if (e?.unitId) { _key = null,
unitId = null,
sectId = null,
} = {}) => {
if (unitId) {
if (_key === 'elevator') {
elevatorDetail.value =
(
await ajax.get({
url: api.ELEVATOR,
params: {
unitId_in: unitId,
},
})
)?.data?.content?.[0] || {}
showElevatorDrawer.value = true
} else if (_key === 'safety') {
safetyDetail.value = safetyDetail.value =
( (
await ajax.get({ await ajax.get({
url: api.RISK_BUILDINGS, url: api.RISK_BUILDINGS,
params: { params: {
unitId_in: e.unitId, unitId_in: unitId,
}, },
}) })
)?.data?.content?.[0] || {} )?.data?.content?.[0] || {}
showSafetyDrawer.value = true showSafetyDrawer.value = true
} else if (e?.sectId) { }
} else if (sectId) {
const data = const data =
( (
await ajax.get({ await ajax.get({
url: api.GET_COMMUNITY.replace('{id}', e.sectId), url: api.GET_COMMUNITY.replace('{id}', sectId),
}) })
)?.data?.content || {} )?.data?.content || {}
communityDetail.value = { communityDetail.value = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment