Browse Source

333

tags/v1.1.0^2
unknown 1 year ago
parent
commit
a65375f00d
2 changed files with 29 additions and 40 deletions
  1. +18
    -8
      src/views/dashboard/components/AirInfo.vue
  2. +11
    -32
      src/views/dashboard/components/OneMap.vue

+ 18
- 8
src/views/dashboard/components/AirInfo.vue View File

<div class="monitorList"> <div class="monitorList">
<div class="innerMonitor"> <div class="innerMonitor">
<div class="monitorName">机场内部监控</div> <div class="monitorName">机场内部监控</div>
<img src="../../../assets/images/webScreen.png" @click="videoShowStyle">
<!-- <img src="../../../assets/images/webScreen.png" @click="videoShowStyle"> -->
<videoPlay <videoPlay
v-bind="innerMonitorOptions" v-bind="innerMonitorOptions"
style="z-index:1" style="z-index:1"
</div> </div>
<div class="innerMonitor"> <div class="innerMonitor">
<div class="monitorName">机场外部监控</div> <div class="monitorName">机场外部监控</div>
<img src="../../../assets/images/webScreen.png" @click="outerVideoShowStyle">
<!-- <img src="../../../assets/images/webScreen.png" @click="outerVideoShowStyle"> -->
<videoPlay <videoPlay
v-bind="outsideMonitorOptions" v-bind="outsideMonitorOptions"
style="z-index:1" style="z-index:1"
innerMonitorOptions: { innerMonitorOptions: {
width: '256px', width: '256px',
height: '198px', height: '198px',
controls: false,
src: '',
webFullScreen: false
control: true, // 是否显示控制
controlBtns: [

'fullScreen'
], // 显示所有按钮,

src: ''


}, },
outsideMonitorOptions: { outsideMonitorOptions: {
width: '256px', width: '256px',
height: '198px', height: '198px',
controls: false,
src: '',
webFullScreen: false
control: true, // 是否显示控制
controlBtns: [

'fullScreen'
], // 显示所有按钮,
src: ''

} }


}) })
}) })
const videoShowStyle = () => { const videoShowStyle = () => {
data.innerMonitorOptions.webFullScreen = !data.innerMonitorOptions.webFullScreen data.innerMonitorOptions.webFullScreen = !data.innerMonitorOptions.webFullScreen
// data.innerMonitorOptions.width = '500px'
// data.innerMonitorOptions.webFullScreen = true
} }
const outerVideoShowStyle = () => { const outerVideoShowStyle = () => {
data.outsideMonitorOptions.webFullScreen = !data.outsideMonitorOptions.webFullScreen data.outsideMonitorOptions.webFullScreen = !data.outsideMonitorOptions.webFullScreen

+ 11
- 32
src/views/dashboard/components/OneMap.vue View File

class="map-container" class="map-container"
:="getMapOptions" :="getMapOptions"
/> />
<!-- <div class="layer-management">
<div class="list-manage">
<p>列表</p>
<n-switch v-model:value="listShow" />
</div>
<div class="air-manage">
<p>机场</p>
<n-switch v-model:value="airShow"
@update:value="airShowHide" />
</div>
</div> -->

<div <div


id="airOverlay" id="airOverlay"
type="line" type="line"
animated animated
> >
<!-- <n-tab-pane name="task" tab="任务">
任务
</n-tab-pane> -->

<n-tab-pane <n-tab-pane
name="question" name="question"
tab="问题" tab="问题"
:default-value="[Date.now() - 6.048e8, Date.now()]" :default-value="[Date.now() - 6.048e8, Date.now()]"
:is-date-disabled="disablePreviousDate" :is-date-disabled="disablePreviousDate"
/> />
<!-- <n-checkbox-group :value="cities" @update:value="handleUpdateValue">
<n-space style="display: block;">
<n-checkbox value="Beijing" label="北京" />
<n-checkbox value="Shanghai" label="上海" />
<n-checkbox value="Guangzhou" label="广州" />
<n-checkbox value="Shenzen" label="深圳" />
</n-space>
</n-checkbox-group> -->

</n-tab-pane> </n-tab-pane>
</n-tabs> </n-tabs>
</n-card> </n-card>
style="display:flex;font-size:14px" style="display:flex;font-size:14px"
> >
<div style="width:145px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis">{{ item.taskName }}</div> <div style="width:145px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis">{{ item.taskName }}</div>
<div style="42px">{{ item.statusInfo }}</div>
<!-- <div v-if="item.status==1"
@click="performTask(item)">立即执行</div> -->
<!-- <n-button v-if="item.status==1"
@click="handleConfirm">立即执行</n-button> -->
<div style="width:42px">{{ item.statusInfo }}</div>

<n-popconfirm <n-popconfirm
v-if="item.status==1" v-if="item.status==1"
@positive-click="handlePositiveClick(item)" @positive-click="handlePositiveClick(item)"
const initTaskList = () => { const initTaskList = () => {
getMissionList({ getMissionList({
page: data.page, page: data.page,
limit: 12
limit: 8
}).then(res => { }).then(res => {
if (res.code === 0) { if (res.code === 0) {
data.taskList = res.data.records data.taskList = res.data.records
data.pageCount = res.data.pages data.pageCount = res.data.pages
// console.log(data.pageCount, '页数')
data.taskList.map((item) => { data.taskList.map((item) => {
const arr = item.executionStartTime.split(/[ ]+/)// 以空格分开 const arr = item.executionStartTime.split(/[ ]+/)// 以空格分开
item.taskName = arr[0] + item.name item.taskName = arr[0] + item.name
overflow:hidden; overflow:hidden;
} }
.map-container { .map-container {
width: 100%;
height:100%;
width:100vw;
height:100vh;
} }


.layer-management { .layer-management {
li { li {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding: 8px 2px;
margin-bottom: 15px;
padding: 5px 2px;
margin-bottom: 10px;
} }
} }
} }

Loading…
Cancel
Save