修改大屏监控显示数量

new-map
ihzero 2023-01-04 16:35:02 +08:00
parent 08327912e8
commit 25d9e60dc5
5 changed files with 38 additions and 15 deletions

View File

@ -6,7 +6,7 @@ VITE_PUBLIC_PATH = /
# Cross-domain proxy, you can configure multiple # Cross-domain proxy, you can configure multiple
# Please note that no line breaks # Please note that no line breaks
VITE_PROXY = [["/api","http://lcny-api.peidikeji.cn"],["/upload","http://lcny-api.peidikeji.cn/api/web/upload"]] VITE_PROXY = [["/api","http://36.133.205.221:81"],["/upload","http://36.133.205.221:81/api/web/upload"]]
# Delete console # Delete console
VITE_DROP_CONSOLE = false VITE_DROP_CONSOLE = false

View File

@ -39,6 +39,10 @@
<Notify v-if="getShowNotice" :class="`${prefixCls}-action__item notify-item`" /> <Notify v-if="getShowNotice" :class="`${prefixCls}-action__item notify-item`" />
<div class="px-8px cursor-pointer">
<router-link to="/v">数据看板</router-link>
</div>
<FullScreen v-if="getShowFullScreen" :class="`${prefixCls}-action__item fullscreen-item`" /> <FullScreen v-if="getShowFullScreen" :class="`${prefixCls}-action__item fullscreen-item`" />
<AppLocalePicker <AppLocalePicker

View File

@ -15,7 +15,7 @@
@change="inputChange('longitude', $event)" @change="inputChange('longitude', $event)"
v-model:value="model[field]" v-model:value="model[field]"
placeholder="请输入" placeholder="请输入"
></InputNumber> />
</template> </template>
<!-- 基地纬度 --> <!-- 基地纬度 -->
<template #address_lat="{ model, field }"> <template #address_lat="{ model, field }">
@ -23,7 +23,7 @@
@change="inputChange('latitude', $event)" @change="inputChange('latitude', $event)"
v-model:value="model[field]" v-model:value="model[field]"
placeholder="请输入" placeholder="请输入"
></InputNumber> />
</template> </template>
</BasicForm> </BasicForm>
<Map v-model:modelValue="mapInfo" :params="params" /> <Map v-model:modelValue="mapInfo" :params="params" />

View File

@ -6,6 +6,10 @@ export const columns: BasicColumn[] = [
title: '基地名称', title: '基地名称',
dataIndex: 'name', dataIndex: 'name',
}, },
{
title: '排序',
dataIndex: 'sort',
},
{ {
title: '基地负责人', title: '基地负责人',
dataIndex: 'person', dataIndex: 'person',
@ -74,7 +78,17 @@ export const accountFormSchema: FormSchema[] = [
required: true, required: true,
component: 'Input', component: 'Input',
}, },
{
field: 'sort',
label: '排序',
required: true,
component: 'InputNumber',
componentProps: {
min: 0,
precision: 0,
},
defaultValue: 0,
},
{ {
field: 'person', field: 'person',
label: '基地负责人', label: '基地负责人',

View File

@ -33,24 +33,24 @@
</div> </div>
<div class="flex-1 px-11px flex flex-col py-10px box-content" :class="{ 'pt-0': !isBase }"> <div class="flex-1 px-11px flex flex-col py-10px box-content" :class="{ 'pt-0': !isBase }">
<div class="flex-1"> <div class="flex-1">
<div class="bg-light-600 h-full" :class="{ 'h-140px': isBase }"> <div
<VideoFlv class="h-full"
class="cursor-pointer" :class="{ 'h-140px': isBase }"
v-if="currentVido" v-for="(item, index) in listBig"
:url="currentVido.url" :key="index"
:name="currentVido.base_name" >
/> <VideoFlv class="cursor-pointer" :url="item.url" :name="item.base_name" />
</div> </div>
</div> </div>
<div class="grid grid-cols-3 gap-x-6px pt-10px"> <div class="grid grid-cols-3 gap-x-6px pt-10px">
<div class="h-66px" v-for="item in list" :key="item.id"> <div class="h-66px" v-for="item in listSmall" :key="item.id">
<VideoFlv <VideoFlv
class="cursor-pointer" class="cursor-pointer"
:url="item.url" :url="item.url"
:name="item.base_name" :name="item.base_name"
:screen="false" :screen="true"
@onClick="onChangeVideo(item)"
/> />
<!-- @onClick="onChangeVideo(item)" -->
<!-- <img <!-- <img
:src="item.img" :src="item.img"
class="object-cover w-full h-full" class="object-cover w-full h-full"
@ -98,6 +98,9 @@
const currentVido = ref<any>(null) const currentVido = ref<any>(null)
const listSmall = computed(() => Data.list.slice(1, 4))
const listBig = computed(() => Data.list.slice(0, 1))
const currentTabValue = computed( const currentTabValue = computed(
() => Data.tabList.find((e) => e.id == Data.currentTab)?.name ?? '', () => Data.tabList.find((e) => e.id == Data.currentTab)?.name ?? '',
) )
@ -128,7 +131,7 @@
currentVido.value = null currentVido.value = null
Data.list = resData.splice(0, 3).map((e, index) => { Data.list = resData.splice(0, 4).map((e, index) => {
const { rtsp_url } = e.extends const { rtsp_url } = e.extends
const url = rtsp_url const url = rtsp_url
// const url = 'rtsp://admin:admin12345@183.222.79.115:9007/cam/realmonitor?channel=1&subtype=0' // const url = 'rtsp://admin:admin12345@183.222.79.115:9007/cam/realmonitor?channel=1&subtype=0'
@ -157,6 +160,8 @@
return { return {
isBase, isBase,
listBig,
listSmall,
onChangeVideo, onChangeVideo,
currentVido, currentVido,
...toRefs(Data), ...toRefs(Data),