Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-07 748131d23e54d553d6485202c7b3e0ff9e3a2410

Merge remote-tracking branch 'origin/master'

 applications/drone-command/src/assets/images/dataCockpit/equipment.png

 applications/drone-command/src/assets/images/dataCockpit/warning.png

 applications/drone-command/src/assets/images/topContainer/top-bg.png

 applications/drone-command/src/components/basic-container/main.vue

@@ -2,7 +2,7 @@
 * @Author       : yuan
 * @Date         : 2025-06-14 15:19:16
 * @LastEditors  : yuan
 * @LastEditTime : 2026-01-07 09:28:08
 * @LastEditTime : 2026-01-07 16:26:20
 * @FilePath     : \applications\drone-command\src\components\basic-container\main.vue
 * @Description  : 
 * Copyright 2025 OBKoro1, All Rights Reserved. 
@@ -45,6 +45,8 @@

<style lang="scss" scoped>
.basic-container {
  margin-top: 109px;

  height: 0;
  flex: 1;


 applications/drone-command/src/page/index/top/index.vue

@@ -116,7 +116,8 @@
  display: flex;
  justify-content: space-between;
  height: 100%;
  background: url('@/assets/images/topContainer/top-bg.png') center no-repeat !important;
  background: url('@/assets/images/topContainer/top-bg.png') center / 100% 100% no-repeat !important;
  pointer-events: none;
}

.top-bar__left {
@@ -157,6 +158,7 @@
  display: flex !important;
  align-items: center;
  height: 100%;
  pointer-events: auto;

  .icon-box {
    display: flex;

 applications/drone-command/src/store/modules/common.js

@@ -23,6 +23,15 @@
    },
    safeHeight: 0, // 获取选择航线高度
    positionsArr: [], // 获取选择航线点数据


    // 地图设置
        mapSetting: {
            mode: 17, // 0为标准地图, 1为卫星地图
            roadLine: true,
            visual: '3D',
            isDark: false,
        },
  },
  mutations: {
    setSafeHeight (state, data) {
@@ -104,6 +113,10 @@
        type: 'session',
      });
    },
    
        SET_MAP_MODE: (state, mode) => {
            state.mapSetting.mode = mode
        }
  },
};
export default common;

 applications/drone-command/src/styles/common.scss

@@ -63,12 +63,12 @@
    top: 0;
    left: 0;
    width: 100%;
    height: 97px;
    height: 109px;
    z-index: 9;
  }

  > .leaf-container {
    padding-top: 97px;
    padding-top: 109px;
    width: 160px;
    height: 100%;

@@ -125,7 +125,6 @@
}

.main-avue-view-container {
  margin-top: 97px;
  height: 0;
  flex: 1;
  display: flex;

 applications/drone-command/src/styles/sidebar.scss

@@ -37,6 +37,29 @@
    background-color: rgba(0, 0, 0, .4);
  }

  .el-menu-item {
    padding-left: 41.4px !important;
  }

  .el-sub-menu {
    .el-sub-menu__title {
      padding-left: 41.4px !important;
    }

    .el-menu-item {
      padding-left: 54px !important;
    }

    &.is-active {

      .el-sub-menu__title {
        i, span {
          color: #fff;
        }
      }
    }
  }

  .el-menu-item, .el-sub-menu__title {
    i {
      margin-right: 5px;
@@ -60,9 +83,10 @@
        top: 0;
        left: 0;
        bottom: 0;
        width: 4px;
        width: 2px;
        background: #0041FF;
        position: absolute;
        border-right: 1px solid #1D56FF;
      }

      background-color: rgba(0, 0, 0, .8);

 applications/drone-command/src/styles/top.scss

@@ -1,7 +1,6 @@
.avue-top {
  position: relative;
  background-color: #fff;
  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15);
  color: rgba(0, 0, 0, .65);
  font-size: 28px;
  height: $top_height;

 applications/drone-command/src/views/dataCockpit/components/CenterContainer.vue

New file
@@ -0,0 +1,199 @@
<template>
    <div class="center-container">
        <div class="left-box">
            <div class="logo">
                <img :src="warningLogo" alt="">
            </div>

            <div class="list">
                <div class="item" v-for="item, ind in warningList" :key="ind">
                    <div class="val" @click="warningTypeClick(item.type)">
                        {{ item.value }}
                    </div>

                    <div class="name">
                        {{ item.title }}
                    </div>
                </div>
            </div>
        </div>

        <div class="right-box">
            <div class="logo">
                <img :src="equipmentLogo" alt="">
            </div>

            <div class="list">
                <div class="item" v-for="item, ind in equipmentList" :key="ind">
                    <div class="val" :class="{highlight: item.isHighlight}" @click="equipmentClick(item.isHighlight)">
                        {{ item.value }}
                    </div>

                    <div class="name">
                        {{ item.title }}
                    </div>
                </div>
            </div>
        </div>
    </div>
</template>

<script setup>
import warningLogo from '@/assets/images/dataCockpit/warning.png'
import equipmentLogo from '@/assets/images/dataCockpit/equipment.png'


let warningList = ref([
    {
        title: '实时告警',
        value: 56,
        type: 1
    },
    {
        title: '设备告警',
        value: 127,
        type: 2
    },
    {
        title: '历史告警',
        value: 619,
        type: 3
    },
])

let equipmentList = ref([
    {
        title: '设备统计',
        value: 18,
        isHighlight: true,
    },
    {
        title: '无线电',
        value: 9,
    },
    {
        title: '光电',
        value: 6,
    },
    {
        title: '雷达',
        value: 3,
    }
])

const warningTypeClick = (type) => {
    console.log('点击了告警类型：', type);
}

const equipmentClick = (isHighlight) => {
    if (isHighlight) {
        console.log('点击了设备统计');
    }
}
</script>

<style lang="scss" scoped>
.center-container {
    display: flex;
    position: absolute;
    top: 75px;
    left: 465px;
    z-index: 9;
    pointer-events: none;

    .left-box {
        width: 356px;

        .list {
            .item {
                .val {
                    color: #FF4444;
                    cursor: pointer;
                }
            }
        }
    }

    .right-box {
        margin-left: 20px;
        width: 455px;

        .list {
            .item {
                .val.highlight {
                    color: #6382FF;
                    cursor: pointer;
                }
            }
        }
    }

    .left-box,
    .right-box {
        padding: 17px 20px;
        display: flex;
        align-items: center;
        height: 100px;
        background: #05050F;
        box-sizing: border-box;
        border-radius: 16px 16px 16px 16px;
        pointer-events: auto;

        .logo {
            img {
                width: 40px;
                height: 40px;
            }
        }

        .list {
            width: 0;
            flex: 1;
            height: 100%;
            display: flex;

            .item {
                width: 0;
                flex: 1;
                position: relative;
                padding-left: 20px;
                color: #fff;

                .name {
                    font-family: Open Sans, Open Sans;
                    font-weight: 400;
                    font-size: 14px;
                    color: #FFFFFF;
                    text-align: left;
                    font-style: normal;
                    text-transform: none;
                }

                .val {
                    font-family: Source Han Sans CN, Source Han Sans CN;
                    font-weight: bold;
                    font-size: 30px;
                    text-align: left;
                    font-style: normal;
                    text-transform: none;
                }

                &::after {
                    content: '';
                    position: absolute;
                    top: 0;
                    right: 0;
                    width: 1px;
                    height: 100%;
                    width: 1px;
                    background: #333355;
                }

                &:last-child::after {
                    display: none;
                }
            }
        }
    }
}
</style>

 applications/drone-command/src/views/dataCockpit/components/LeftContainer.vue

New file
@@ -0,0 +1,15 @@
<template>
    <div class="left-container">
        <div class="wrapper">
			
        </div>
    </div>
</template>

<script setup>

</script>

<style lang="scss" scoped>

</style>

 applications/drone-command/src/views/dataCockpit/components/MapContainer.vue

@@ -1,13 +1,41 @@
<template>
    <div>
    <div class="ztzf-cesium map-container" id="cesium">

    </div>
</template>

<script setup>
import { PublicCesium } from '@/utils/cesium/publicCesium'
let viewInstance = null
let viewer = null
onMounted(() => {
    viewInstance = new PublicCesium({
        dom: 'cesium',
        flatMode: false,
        terrain: false,
        layerMode: 4,
        contour: false,
    })

    viewer = viewInstance.getViewer()
}) 

onBeforeUnmount(() => {
    if (viewInstance) {
        viewInstance.destroy()
        viewInstance = null
    }

    viewer = null
})
</script>

<style lang="scss" scoped>

.map-container {
    position: absolute;
    top: 0;
    left: 0;
    width: 100%;
    height: 100%;
}
</style>

 applications/drone-command/src/views/dataCockpit/components/RightContainer.vue

New file
@@ -0,0 +1,15 @@
<template>
    <div class="right-container">
        <div class="wrapper">
			
        </div>
    </div>
</template>

<script setup>

</script>

<style lang="scss" scoped>

</style>

 applications/drone-command/src/views/dataCockpit/index.vue

@@ -1,9 +1,74 @@
<!--
 * @Author       : yuan
 * @Date         : 2026-01-06 16:35:50
 * @LastEditors  : yuan
 * @LastEditTime : 2026-01-07 17:33:02
 * @FilePath     : \applications\drone-command\src\views\dataCockpit\index.vue
 * @Description  : 
 * Copyright 2026 OBKoro1, All Rights Reserved. 
 * 2026-01-06 16:35:50
-->
<template>
  <basic-container>
    维护记录管理
  </basic-container>
  <div class="page-container">
    <MapContainer />  
    <LeftContainer class="left-container" />  
    <RightContainer class="right-container" />  
    <CenterContainer />  
  </div>
</template>

<script setup>
  import MapContainer from './components/MapContainer.vue';
  import LeftContainer from './components/LeftContainer.vue';
  import RightContainer from './components/RightContainer.vue';
  import CenterContainer from './components/CenterContainer.vue';
</script>

<style scoped lang="scss">
  .page-container {
    position: relative;
    width: 100%;
    height: 100%;
  }

  .left-container,
  .right-container {
    position: absolute;
    top: 96px;
    bottom: 0;
    width: 401px;
    z-index: 9;
    backdrop-filter: blur(5px);

    ::v-deep(.wrapper) {
      position: absolute;
      top: 17px;
      bottom: 20px;
      padding: 20px;
      width: 300px;
      background: rgba(0,0,0,0.3);
      border-radius: 10px 10px 10px 10px;
    }
  }

  .left-container {
    top: 96px;
    left: 0;
    background: linear-gradient( 270deg, rgba(17,23,34,0) 0%, rgba(17,23,34,0.56) 50%, rgba(17,23,34,0.96) 100%);

    ::v-deep(.wrapper) {
      left: 17px;
    }
  }

  .right-container {
    top: 54px;
    right: 0;
    background: linear-gradient( 270deg, rgba(17,23,34,0.96) 0.16%, rgba(17,23,34,0.56) 57.57%, rgba(4,30,37,0) 100%);

    ::v-deep(.wrapper) {
      top: 21px;
      right: 17px;
    }
  }
</style>