首页 发现 帮助
注册 登录
hrx
/
vent-forewarn-micro
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

界面布局及三维GIS引入-提交

lxh 1 年之前
父节点
84fa59f279
当前提交
12d9cb4272
共有 10 个文件被更改，包括 40 次插入 和 32 次删除
分列视图 显示文件统计
  1. 2 2
      index.html
  2. 二进制
      public/logo_white.png
  3. 二进制
      src/assets/images/logo_white.png
  4. 1 1
      src/components/Application/src/AppLogo.vue
  5. 3 3
      src/views/demo/comp/qrcode/index.vue
  6. 3 3
      src/views/demo/feat/download/index.vue
  7. 1 1
      src/views/vent/common/danelBd.vue
  8. 15 11
      src/views/vent/dust/dustHome/index.vue
  9. 15 11
      src/views/vent/fire/fireHome/index.vue
  10. 0 0
      src/views/vent/monitor/index.vue

+ 2 - 2
index.html
查看文件 

@@ -9,7 +9,7 @@
 
       content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=0"
 
     />
 
     <title><%= VITE_GLOB_APP_TITLE %></title>
 
-    <link rel="icon" href="/favicon.ico" />
 
+    <link rel="icon" href="/logo_white.png" />
 
   </head>
 
   <body>
 
     <div id="app">
 
@@ -145,7 +145,7 @@
 
       </style>
 
       <div class="app-loading">
 
         <div class="app-loading-wrap">
 
-          <img src="/logo.png" class="app-loading-logo" alt="Logo" />
 
+          <img src="/logo_white.png" class="app-loading-logo" alt="Logo" />
 
           <div class="app-loading-dots">
 
             <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
 
           </div>

二进制
public/logo_white.png
查看文件


二进制
src/assets/images/logo_white.png
查看文件


+ 1 - 1
src/components/Application/src/AppLogo.vue
查看文件 

@@ -4,7 +4,7 @@
 
 -->
 
 <template>
 
   <div class="anticon" :class="getAppLogoClass" @click="goHome">
 
-    <img src="../../../assets/images/logo.png" />
 
+    <img src="../../../assets/images/logo_white.png" />
 
     <div class="ml-2 truncate md:opacity-100" :class="getTitleClass" v-show="showTitle">
 
       {{ title }}
 
     </div>

+ 3 - 3
src/views/demo/comp/qrcode/index.vue
查看文件 

@@ -25,7 +25,7 @@
 
       <CollapseContainer title="在线logo示例" class="text-center mb-6 w-1/5 mr-6">
 
         <QrCode
 
           :value="qrCodeUrl"
 
-          logo="https://vebn.oss-cn-beijing.aliyuncs.com/vben/logo.png"
 
+          logo="https://vebn.oss-cn-beijing.aliyuncs.com/vben/logo_white.png"
 
           :options="{
 
             color: { dark: '#55D187' },
 
           }"
 
@@ -36,7 +36,7 @@
 
         <QrCode
 
           :value="qrCodeUrl"
 
           :logo="{
 
-            src: 'https://vebn.oss-cn-beijing.aliyuncs.com/vben/logo.png',
 
+            src: 'https://vebn.oss-cn-beijing.aliyuncs.com/vben/logo_white.png',
 
             logoSize: 0.2,
 
             borderSize: 0.05,
 
             borderRadius: 50,
 
@@ -81,7 +81,7 @@
 
 <script lang="ts" setup>
 
   import { ref, unref } from 'vue';
 
   import { QrCode, QrCodeActionType } from '@/components/Qrcode';
 
-  import LogoImg from '@/assets/images/logo.png';
 
+  import LogoImg from '@/assets/images/logo_white.png';
 
   import { CollapseContainer } from '@/components/Container';
 
   import { PageWrapper } from '@/components/Page';
 
   import { type Nullable } from '@vben/types';

+ 3 - 3
src/views/demo/feat/download/index.vue
查看文件 

@@ -36,19 +36,19 @@
 
     });
 
 
     downloadByUrl({
 
-      url: 'https://vebn.oss-cn-beijing.aliyuncs.com/vben/logo.png',
 
+      url: 'https://vebn.oss-cn-beijing.aliyuncs.com/vben/logo_white.png',
 
       target: '_self',
 
     });
 
   }
 
 
   function handleDownloadByBase64() {
 
-    downloadByBase64(imgBase64, 'logo.png');
 
+    downloadByBase64(imgBase64, 'logo_white.png');
 
   }
 
 
   function handleDownloadByOnlineUrl() {
 
     downloadByOnlineUrl(
 
       'https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/5944817f47b8408e9f1442ece49d68ca~tplv-k3u1fbpfcp-watermark.image',
 
-      'logo.png',
 
+      'logo_white.png',
 
     );
 
   }
 
 </script>

+ 1 - 1
src/views/vent/common/danelBd.vue
查看文件 

@@ -1,7 +1,7 @@
 
 <template>
 
   <div class="dane-bd">
 
     <div v-if="moduleNames" class="dane-title"
 
-      :style="{ 'margin-bottom': contentStyle.contentH == '0px' ? '0px' : '5px' }">
 
+      :style="{ 'margin-bottom': contentStyle.contentH == '0px' ? '0px' : '3px' }">
 
       <div :class="commonTitle == 'selected' ? 'common-navL' : 'common-navL1'">
 
         <img src="@/assets/images/fire/firehome/title-2.png" alt="" />
 
         <span>{{ moduleNames }}</span>

+ 15 - 11
src/views/vent/dust/dustHome/index.vue
查看文件 

@@ -1,7 +1,9 @@
 
 <template>
 
   <div class="dustHome">
 
     <!-- 模型区域 -->
 
-    <!-- <div class="moduleArea"></div> -->
 
+    <div class="moduleArea">
 
+      <iframe src="http://82.157.13.146:18224/" width="100%" height="100%" frameborder="0"></iframe>
 
+    </div>
 
     <div class="main-container">
 
       <div class="left-area">
 
         <!-- 左上区域 -->
 
@@ -20,7 +22,7 @@
 
         </div>
 
         <!-- 左中区域 -->
 
         <div class="left-c">
 
-          <DanelBd :moduleName="'工作面风险监测'" :contentStyle="{ contentH: '570px' }">
 
+          <DanelBd :moduleName="'工作面风险监测'" :contentStyle="{ contentH: '600px' }">
 
             <workJc :heightT="'26%'" :heightB="'74%'" :cardData="cardData" :echartData="echartDataWork" />
 
           </DanelBd>
 
         </div>
 
@@ -40,21 +42,21 @@
 
       <div class="right-area">
 
         <!-- 右上区域 -->
 
         <div class="right-t">
 
-          <DanelBd :moduleName="'智能喷雾降尘装置'" :contentStyle="{ contentH: '280px' }">
 
+          <DanelBd :moduleName="'智能喷雾降尘装置'" :contentStyle="{ contentH: '295px' }">
 
             <dustFallDevice :deviceTotal="deviceTotal" :pwTotal="pwTotal" :interTotal="interTotal"
 
               :unInterTotal="unInterTotal" :pwData="pwData" />
 
           </DanelBd>
 
         </div>
 
         <!-- 右中区域 -->
 
         <div class="right-c">
 
-          <DanelBd :moduleName="'粉尘关联指标'" :contentStyle="{ contentH: '220px' }" commonTitle="selected"
 
+          <DanelBd :moduleName="'粉尘关联指标'" :contentStyle="{ contentH: '230px' }" commonTitle="selected"
 
             :selectList="selectListBd" @changeSelect="changeSelect1">
 
             <dustGlzb :dustGlzbData="dustGlzbData" />
 
           </DanelBd>
 
         </div>
 
         <!-- 右下区域 -->
 
         <div class="right-b">
 
-          <DanelBd :moduleName="'粉尘静态指标'" :contentStyle="{ contentH: '135px' }" commonTitle="selected">
 
+          <DanelBd :moduleName="'粉尘静态指标'" :contentStyle="{ contentH: '150px' }" commonTitle="selected">
 
             <dustJtzb />
 
           </DanelBd>
 
         </div>
 
@@ -223,13 +225,15 @@ onMounted(() => {
 
 
 .dustHome {
 
   position: relative;
 
-  width: calc(100% - 20px);
 
-  height: calc(100vh - 82px);
 
-  margin: 50px 10px 15px;
 
+  // width: calc(100% - 20px);
 
+  // height: calc(100vh - 82px);
 
+  width: 100%;
 
+  height: calc(100vh - 70px);
 
+  margin-top: 50px;
 
 
   .moduleArea {
 
     width: 100%;
 
-    height: calc(100% - 15px);
 
+    height: 100%;
 
   }
 
 
   .main-container {
 
@@ -241,7 +245,7 @@ onMounted(() => {
 
     justify-content: space-between;
 
     width: 100%;
 
     height: 100%;
 
-    padding-top: 15px;
 
+    padding: 15px 10px;
 
 
     .left-area {
 
       display: flex;
 
@@ -321,7 +325,7 @@ onMounted(() => {
 
       flex-direction: column;
 
       align-items: center;
 
       justify-content: flex-end;
 
-      width: calc(40% - 40px);
 
+      width: calc(40% - 30px);
 
       height: 100%;
 
 
       .center-b {

+ 15 - 11
src/views/vent/fire/fireHome/index.vue
查看文件 

@@ -1,7 +1,9 @@
 
 <template>
 
   <div class="fireHome">
 
     <!-- 模型区域 -->
 
-    <!-- <div class="moduleArea"></div> -->
 
+    <div class="moduleArea">
 
+      <iframe src="http://82.157.13.146:18224/" width="100%" height="100%" frameborder="0"></iframe>
 
+    </div>
 
     <div class="main-container">
 
       <div class="left-area">
 
         <!-- 左上区域 -->
 
@@ -26,7 +28,7 @@
 
         </div>
 
         <!-- 左下区域 -->
 
         <div class="left-b">
 
-          <DanelBd :moduleName="'密闭采空区监测系统'" :contentStyle="{ contentH: '180px' }" commonTitle="selected"
 
+          <DanelBd :moduleName="'密闭采空区监测系统'" :contentStyle="{ contentH: '170px' }" commonTitle="selected"
 
             :selectList="selectListMb" @changeSelect="changeSelect">
 
             <emptyJc :emptyData="emptyData" />
 
           </DanelBd>
 
@@ -336,13 +338,13 @@ function getTableList() {
 
       getHeadingFaceList()
 
       break;
 
     case 'three':
 
-    getMainTrafficYwList()
 
+      getMainTrafficYwList()
 
       break;
 
     case 'four':
 
-    getDsWdList()
 
+      getDsWdList()
 
       break;
 
     default:
 
-    getZcHfWdList()
 
+      getZcHfWdList()
 
       break
 
   }
 
 }
 
@@ -446,13 +448,15 @@ onMounted(() => {
 
 
 .fireHome {
 
   position: relative;
 
-  width: calc(100% - 20px);
 
-  height: calc(100vh - 82px);
 
-  margin: 50px 10px 15px;
 
+  // width: calc(100% - 20px);
 
+  // height: calc(100vh - 82px);
 
+  width: 100%;
 
+  height: calc(100vh - 70px);
 
+  margin-top: 50px;
 
 
   .moduleArea {
 
     width: 100%;
 
-    height: calc(100% - 15px);
 
+    height: 100%;
 
   }
 
 
   .main-container {
 
@@ -464,7 +468,7 @@ onMounted(() => {
 
     justify-content: space-between;
 
     width: 100%;
 
     height: 100%;
 
-    padding-top: 15px;
 
+    padding: 15px 10px;
 
 
     .left-area {
 
       display: flex;
 
@@ -548,7 +552,7 @@ onMounted(() => {
 
       flex-direction: column;
 
       align-items: center;
 
       justify-content: flex-end;
 
-      width: calc(40% - 40px);
 
+      width: calc(40% - 30px);
 
 
       .center-b {
 
         width: 100%;

+ 0 - 0
src/views/vent/monitor/index.vue
查看文件