Merge branch 'master' into guangyin

# Conflicts: # src/views/overview.component.ts
2023-05-16 18:09:33 +08:00 · 2023-05-16 18:09:33 +08:00 · f13a95d92d
parent 0937577802 5b6fa34bb9
commit f13a95d92d
9 changed files with 136 additions and 80 deletions
--- a/.env.development
+++ b/.env.development
@ -1,12 +1,19 @@
+
 #开发环境
 NODE_ENV:"development"
 # 页面标题
-VUE_APP_TITLE = 汉邦唐全真数字服务平台
+VUE_APP_TITLE = 汉邦唐消防训练基地
+# 网关地址
+VUE_APP_GATEWAY_URL="/dev-api"
 # UE4服务地址
 VUE_APP_PALYER_URL="192.168.1.66:8080"
 # 服务地址
-VUE_APP_BASE_API_URL="/dev-api"
+VUE_APP_BASE_API_URL="http://192.168.2.3:8081"
+# 服务前-- 请严格遵守格式  不允许换行
+VUE_APP_SERVICE_PREFIX= '{"knowledge":"/knowledge","system":"/system"}'
+# 是否显示全部菜单
+VUE_APP_ALL_MENU = false
 # 微前端地址
 VUE_APP_REMOTES_URL="http://119.45.158.12/common/"
 # 当前应用部署地址
-VUE_APP_EXPOSES_URL=""
+VUE_APP_EXPOSES_URL=""
--- a/.env.production
+++ b/.env.production
@ -1,11 +1,18 @@
-#生产环境
+
+#开发环境
 NODE_ENV:"production"
 # 页面标题
-VUE_APP_TITLE = 汉邦唐全真数字服务平台
+VUE_APP_TITLE = 汉邦唐消防训练基地
+# 网关地址
+VUE_APP_GATEWAY_URL="/dev-api"
 # UE4服务地址
 VUE_APP_PALYER_URL="192.168.1.66:8080"
 # 服务地址
-VUE_APP_BASE_API_URL=""
+VUE_APP_BASE_API_URL="http://192.168.2.3:8081"
+# 服务前-- 请严格遵守格式  不允许换行
+VUE_APP_SERVICE_PREFIX= '{"knowledge":"/knowledge","system":"/system"}'
+# 是否显示全部菜单
+VUE_APP_ALL_MENU = false
 # 微前端地址
 VUE_APP_REMOTES_URL="http://119.45.158.12/common/"
 # 当前应用部署地址
--- a/.env.test
+++ b/.env.test
@ -1,12 +1,19 @@
-#测试环境
+
+#开发环境
 NODE_ENV:"development"
 # 页面标题
-VUE_APP_TITLE = 汉邦唐全真数字服务平台
+VUE_APP_TITLE = 汉邦唐消防训练基地
+# 网关地址
+VUE_APP_GATEWAY_URL="/dev-api"
 # UE4服务地址
 VUE_APP_PALYER_URL="192.168.1.66:8080"
 # 服务地址
-VUE_APP_BASE_API_URL=""
+VUE_APP_BASE_API_URL="http://192.168.2.3:8081"
+# 服务前-- 请严格遵守格式  不允许换行
+VUE_APP_SERVICE_PREFIX= '{"knowledge":"/knowledge","system":"/system"}'
+# 是否显示全部菜单
+VUE_APP_ALL_MENU = false
 # 微前端地址
-VUE_APP_REMOTES_URL="http://192.168.2.99:8080"
+VUE_APP_REMOTES_URL="http://119.45.158.12/common/"
 # 当前应用部署地址
 VUE_APP_EXPOSES_URL=""
--- a/package.json
+++ b/package.json
@ -18,7 +18,7 @@
    "echarts-wordcloud": "^2.1.0",
    "element-ui": "^2.15.13",
    "file-saver": "^2.0.5",
-    "hbt-common": "0.0.3",
+    "hbt-common": "0.0.5",
    "jquery": "^3.6.4",
    "layui-layer": "^1.0.9",
    "mockjs": "^1.1.0",
--- a/src/mock/layer.ts
+++ b/src/mock/layer.ts
@ -25,7 +25,7 @@ export default [ {
    value:"bounds",
    color:COLOR.BOUNDS,
    selected:false,
-    pages:["closePark","peopleCar"]
+    pages:["manage"]
 },{
    name:"人员定位",
    ids:[] as string[],
@ -36,7 +36,7 @@ export default [ {
    assetPath:"/JC_CustomAssets/VehicleLibrary/Exhibition/重型货车_01",
    coordinateType:1,
    selected:false,
-    pages:["closePark","peopleCar","smartSafetySupervision","smartEmergency"]
+    pages:["home","view"]
 },{
    name:"车辆定位",
    ids:[] as string[],
@ -51,5 +51,5 @@ export default [ {
    ],
    coordinateType:1,
    selected:false,
-    pages:["closePark","peopleCar","smartSafetySupervision","smartEmergency"]
+    pages:["home","view"]
 }]
--- a/src/popup/pop.component.vue
+++ b/src/popup/pop.component.vue
@ -4,33 +4,54 @@
        <div class="border r-t"></div>
        <div class="border r-b"></div>
        <div class="border l-b"></div>
-        <div class="title">
-            <i class="el-icon-warning" ></i>
-            告警类型{{$route.query.typeName}}</div>
-        <div class="content">
-            <span>上报人员：</span> 
-            <p>
-                <span>{{$route.query.reporter}}</span>
-                <a :href="'tel:'+$route.query.tel" class="tel">
-                     <img src="~@/assets/img/phone.png" alt=""> 一键联系
-                </a>
-            </p>
+        <div class="content mg-b-20">
+            <div class="flow-light-box">
+                <div class="img-box"></div>
+            </div>
+            <div class="content col" style="justify-content: center;s">
+                <div class="mg-b-5 title">顶层沸溢火</div>
+                <div class="content disable opacity5 mg-b-5">
+                    难度：
+                    <el-rate
+                        v-model="star"
+                        :colors="colors">
+                    </el-rate>
+                </div>
+                <div class="content disable opacity5">
+                    火点：5个
+                </div>
+            </div>
        </div>
-        <div class="content">
-            <span>告警内容：</span> 
-            <p>{{$route.query.content}}</p>
+        <div class="mg-b-20 title">
+            训练说明
+        </div>
+        <div class="opacity5 mg-b-20">
+            模拟在密闭建筑物内发生火灾，消防员在高温、浓烟、高噪音的情况下进行火情侦察，寻找被困人员，救出被困人员，灭火抢险等战斗
+        </div>
+        <div class="mg-b-20 title">
+            训练要点
+        </div>
+        <div class="opacity5 mg-b-20">
+            模拟在密闭建筑物内发生火灾，消防员在高温、浓烟、高噪音的情况下进行火情侦察，寻找被困人员，救出被困人员，灭火抢险等战斗
        </div>
    </div>
 </template>
 <style lang="scss" scoped>
+@keyframes turnRound {
+    0%{
+        transform:rotate(0);
+    }
+    100%{
+        transform:rotate(360deg);
+    }
+}
 .pop-box{
    width: 100%;
    height: 100%;
    border-radius: 4px 4px 4px 4px;
    opacity: 1;
    border: 1px solid #FFFFFF;
-    background: linear-gradient(180deg, rgba(176,38,38,0.6) 0%, rgba(113,41,41,0.8) 22%, rgba(0,0,0,0.8) 100%);
-    color: #E8E8E8;
+    background: linear-gradient(180deg, rgba(0,0,0,0.8) 0%, rgba(0,0,0,0.7) 100%);
    padding: 30px;
    font-size: 14px;
    position: relative;
@ -60,56 +81,53 @@
            transform: rotate(270deg);
        }
    }
-    .title{
+    .flow-light-box{
+        width: 160px;
+        height: 90px;
+        border-radius: 6px;
        display: flex;
        align-items: center;
-        // font-weight: bold;
-        font-size: 16px;
-        padding: 20px 0;
-        i{
-            margin-right: 10px;
-            color: #F00;
-            font-size: 20px;
+        justify-content: center;
+        overflow: hidden;
+        position: relative;
+        margin-right: 15px;
+        &::before{
+            content: "";
+            width: 200px;
+            height: 200px;
+            display: block;
+            flex: none;
+            background: conic-gradient(#F5F500 ,#F4FF00,#FF8600 ,#FF0000 ,rgba(255,255,255,0.83) ,transparent,transparent,transparent,transparent );
+            animation: turnRound 1.5s linear infinite;
+        }
+        .img-box{
+            inset: 2px;
+            border-radius: 6px;
+            background: #000;
+            position: absolute;
        }
    }
    .content{
        display: flex;
-        span{
-            align-self: flex-start;
-            white-space: nowrap;
-        }
-        p{
-            width: 1px;
-            flex: 1;
-            height: 48px;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin:0;
-            display: flex;
-            flex-wrap: wrap;
-            line-height: 24px;
-            word-break: break-all;
-            align-self: flex-start;
-            padding: 0;
-            .tel{
-                width: 100px;
-                height: 24px;
-                display: inline-flex;
-                font-size: 12px;
-                text-decoration: none;
-                color: #FFF;
-                align-items: center;
-                margin-left: 10px;
-                justify-content: center;
-                background: rgba(255,255,255,0.15);
-                border-radius: 16px;
-                border: 1px solid #FFFFFF;
-                img{
-                    margin-right: 5px;
-                }
-            }
+        &.col{
+            flex-direction: column;
        }
    }
+    .title{
+        font-size: 16px;
+    }
+    .opacity5{
+        opacity: 0.5;
+    }
+    .disable{
+        pointer-events: none;
+    }
+    .mg-b-20{
+        margin-bottom: 10px;
+    }
+    .mg-b-5{
+        margin-bottom: 5px;
+    }
 }
 </style>
 <script lang="ts">
@ -119,12 +137,12 @@ declare const ue
 export default Vue.extend({
    data(){
        return{
-            params:JSON.stringify(this.$route)
+            params:{},
+            colors:["#FFF","#FFF","#FFF"],
+            star:3
        }
    },
    created(){
-        console.log(this.params)
-        this.params = new URLSearchParams(location.href)
        ue.dtspoi.postevent(JSON.stringify(this.$route))
        //
    },
--- a/src/views/overview.component.html
+++ b/src/views/overview.component.html
@ -24,10 +24,21 @@
    <div class="fixed-btn" @click="resetMap">
        <hbt-svg name="fixed"></hbt-svg>
    </div>
+    <div class="layer-btn-box" :style="{height:openLayerDrawer?(currentLayers.length+1) * 50+'px':'50px'}">
+        <div class="layer-btn" :class="{active:item.selected}" v-show="openLayerDrawer"
+            v-for="(item,index) in currentLayers" :key="index">
+            <el-tooltip effect="dark" :content="item.name" placement="left">
+                <hbt-svg :name="item.value" @click="toggleLayer(item)"></hbt-svg>
+            </el-tooltip>
+        </div>
+        <div class="layer-btn">
+            <hbt-svg name="layer" @click="toggleHeight"></hbt-svg>
+        </div>
+    </div>



-    <div class="top-bg">
+    <div class="top-bg" :style="{top:hideAllPanel?'-90px':0}">
        <HeaderComponent @onDrawer="drawerChange($event)" @onNavChanged="navChange($event)"></HeaderComponent>
    </div>

--- a/src/views/overview.component.scss
+++ b/src/views/overview.component.scss
@ -70,6 +70,7 @@
    pointer-events: none;
    height: 90px;
    background: linear-gradient(180deg, #333333 0%, rgba(51, 51, 51, 0) 100%);
+    transition:top 2s;
  }

  .fixed-btn {
--- a/src/views/overview.component.ts
+++ b/src/views/overview.component.ts
@ -32,10 +32,10 @@ export default class OverViewComponent extends BaseComponent {
    //展示导览右侧
    viewRightShow = false

+    // 是否隐藏除地图外所有板块
+    public hideAllPanel = false;
    created(){
-        this.warnTimer = setInterval(()=>{
-            this.upDateEventList()
-        },10000)
+        this.currentLayers = this.getCurrentLayers()
    }
    public upDateEventList(){
        const eventList = MockData.getEventList().data
@ -83,8 +83,8 @@ export default class OverViewComponent extends BaseComponent {

    public navChange(data: string) {
        this.currentNav = data;
+        this.currentLayers = this.getCurrentLayers()
        if(this.player){
-            this.currentLayers = this.getCurrentLayers();
            this.resetMap();
        }
        console.log('当前点击导航', data)
@ -121,6 +121,11 @@ export default class OverViewComponent extends BaseComponent {
        }
    }

+    public toggleAllPanel(){
+        this.hideAllPanel = true;
+        this.drawerChange(false)
+    }
+
    public toggleHeight(){
        this.openLayerDrawer = !this.openLayerDrawer;
    }