瀏覽代碼

Merge branch 'master' of http://182.92.126.35:3000/hrx/vent-forewarn-micro

lxh 1 年之前
父節點
當前提交
a5654776ef

+ 22 - 22
.github/commit-template

@@ -1,22 +1,22 @@
-# Pick one keyword from below
-# Feat
-# Fix
-# Style
-# Perf
-# Refactor
-# Revert
-# Test
-# Docs
-# Chore
-# Workflow
-# CI
-# Mod
-# Wip
-# Types
-[Feat 0000] xxx
-
-Discription
-
-Associated Tasks
-
-Assignee
+# 从下列关键词中选取一项
+# Feat 添加新功能、开发新页面
+# Fix 修复功能、样式问题
+# Mod 页面已有功能修改
+# Style 调整页面样式、代码格式
+# Perf 项目性能优化
+# Refactor 项目重构,模块重构
+# Revert 撤销已同步到远程仓库的提交
+# Test 单元测试
+# Docs 项目文档添加、更新
+# Chore 项目架构开发、更新
+# Workflow 项目工作流开发、更新
+# CI 项目自动集成流程开发、更新
+# Wip 暂未完成的工作
+# Types 类型补充
+# 提交信息应如`[Feat 0000(即禅道任务ID,暂无就用0000)] xxxx(即禅道任务名称,暂无可自己编写)`
+# 下面是几个例子,最好能写成一行,方便changelog归档:
+# [Feat 1234] 元宝湾-开发风门页面
+# [Feat 4321] 元宝湾-风门模块api对接
+# [Fix 0000] 宝平湾-首页传感器数据显示不正确
+# [Mod 0000] 袁大滩-风门传感器列表去掉风速一列
+[Feat 0000] xxxx

+ 8 - 23
README.md

@@ -1,5 +1,3 @@
-
-
 **English** | [中文](./README.zh-CN.md)
 
 ## Feature
@@ -43,13 +41,13 @@ Open the project in Gitpod (free online dev environment for GitHub) and start co
 
 pnpm install
 
-```
+````
 
 - run
 
 ```bash
 pnpm serve
-```
+````
 
 - build
 
@@ -91,28 +89,15 @@ You are very welcome to join![Raise an issue](https://github.com/anncwb/vue-vb
 **Pull Request:**
 
 1. Fork code!
-2. Create your own branch: `git checkout -b feat/xxxx`
-3. Submit your changes: `git commit -am 'feat(function): add xxxxx'`
-4. Push your branch: `git push origin feat/xxxx`
-5. submit`pull request`
+2. Set up commit template: `git config commit.template .github/commit-template`
+3. Create your own branch: `git checkout -b feat/xxxx`
+4. Submit your changes: `git commit -am 'feat(function): add xxxxx'`
+5. Push your branch: `git push origin feat/xxxx`
+6. submit`pull request`
 
 ## Git Contribution submission specification
 
-- reference [vue](https://github.com/vuejs/vue/blob/dev/.github/COMMIT_CONVENTION.md) specification ([Angular](https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-angular))
-
-  - `feat` Add new features
-  - `fix` Fix the problem/BUG
-  - `style` The code style is related and does not affect the running result
-  - `perf` Optimization/performance improvement
-  - `refactor` Refactor
-  - `revert` Undo edit
-  - `test` Test related
-  - `docs` Documentation/notes
-  - `chore` Dependency update/scaffolding configuration modification etc.
-  - `workflow` Workflow improvements
-  - `ci` Continuous integration
-  - `types` Type definition file changes
-  - `wip` In development
+- details in .github/commit-template
 
 ## Related warehouse
 

+ 8 - 27
README.zh-CN.md

@@ -1,8 +1,5 @@
-
-
 **中文** | [English](./README.md)
 
-
 ## 特性
 
 - **最新技术栈**:使用 Vue3/vite2 等前端前沿技术开发
@@ -13,7 +10,6 @@
 - **权限** 内置完善的动态路由权限生成方案
 - **组件** 二次封装了多个常用的组件
 
-
 ## 准备
 
 - [node](http://nodejs.org/) 和 [git](https://git-scm.com/) -项目开发环境
@@ -33,13 +29,13 @@
 
 pnpm install
 
-```
+````
 
 - 运行
 
 ```bash
 pnpm serve
-```
+````
 
 - 打包
 
@@ -47,7 +43,6 @@ pnpm serve
 pnpm build
 ```
 
-
 ## 更新日志
 
 [CHANGELOG](./CHANGELOG.zh_CN.md)
@@ -64,28 +59,15 @@ pnpm build
 **Pull Request:**
 
 1. Fork 代码!
-2. 创建自己的分支: `git checkout -b feat/xxxx`
-3. 提交你的修改: `git commit -am 'feat(function): add xxxxx'`
-4. 推送您的分支: `git push origin feat/xxxx`
-5. 提交`pull request`
+2. 设置提交模板: `git config commit.template .github/commit-template`
+3. 创建自己的分支: `git checkout -b feat/xxxx`
+4. 提交你的修改: `git commit -am 'feat(function): add xxxxx'`
+5. 推送您的分支: `git push origin feat/xxxx`
+6. 提交`pull request`
 
 ## Git 贡献提交规范
 
-- 参考 [vue](https://github.com/vuejs/vue/blob/dev/.github/COMMIT_CONVENTION.md) 规范 ([Angular](https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-angular))
-
-  - `feat` 增加新功能
-  - `fix` 修复问题/BUG
-  - `style` 代码风格相关无影响运行结果的
-  - `perf` 优化/性能提升
-  - `refactor` 重构
-  - `revert` 撤销修改
-  - `test` 测试相关
-  - `docs` 文档/注释
-  - `chore` 依赖更新/脚手架配置修改等
-  - `workflow` 工作流改进
-  - `ci` 持续集成
-  - `types` 类型定义文件更改
-  - `wip` 开发中
+- 参考模板.github/commit-template
 
 ## 浏览器支持
 
@@ -106,7 +88,6 @@ pnpm build
 - [vite-plugin-compression](https://github.com/anncwb/vite-plugin-compression) - 用于打包输出.gz|.brotil 文件
 - [vite-plugin-svg-icons](https://github.com/anncwb/vite-plugin-svg-icons) - 用于快速生成 svg 雪碧图
 
-
 ## 感谢
 
 <img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png" alt="JetBrains Logo (Main) logo." height='120'>

+ 0 - 1
package.json

@@ -78,7 +78,6 @@
     "vue": "^3.3.4",
     "vue-i18n": "^9.6.4",
     "vue-json-pretty": "^2.2.4",
-    "vue-mky-svg": "^0.1.7",
     "vue-router": "^4.2.3",
     "vue-seamless-scroll": "^1.1.23",
     "vue-types": "^5.1.0",

+ 157 - 0
pnpm-lock.yaml

@@ -252,6 +252,9 @@ importers:
       vite-plugin-mock:
         specifier: ^2.9.6
         version: 2.9.8(mockjs@1.1.0)(vite@4.5.1)
+      vite-plugin-top-level-await:
+        specifier: ^1.4.1
+        version: 1.4.1(rollup@3.29.4)(vite@4.5.1)
       vue-tsc:
         specifier: ^1.8.4
         version: 1.8.26(typescript@5.3.3)
@@ -2475,6 +2478,18 @@ packages:
       rollup: 3.29.4
     dev: true
 
+  /@rollup/plugin-virtual@3.0.2(rollup@3.29.4):
+    resolution: {integrity: sha512-10monEYsBp3scM4/ND4LNH5Rxvh3e/cVeL3jWTgZ2SrQ+BmUoQcopVQvnaMcOnykb1VkxUFuDAN+0FnpTFRy2A==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+    peerDependenciesMeta:
+      rollup:
+        optional: true
+    dependencies:
+      rollup: 3.29.4
+    dev: true
+
   /@rollup/pluginutils@4.2.1:
     resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==}
     engines: {node: '>= 8.0.0'}
@@ -2658,6 +2673,129 @@ packages:
       '@sinonjs/commons': 1.8.6
     dev: false
 
+  /@swc/core-darwin-arm64@1.4.2:
+    resolution: {integrity: sha512-1uSdAn1MRK5C1m/TvLZ2RDvr0zLvochgrZ2xL+lRzugLlCTlSA+Q4TWtrZaOz+vnnFVliCpw7c7qu0JouhgQIw==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@swc/core-darwin-x64@1.4.2:
+    resolution: {integrity: sha512-TYD28+dCQKeuxxcy7gLJUCFLqrwDZnHtC2z7cdeGfZpbI2mbfppfTf2wUPzqZk3gEC96zHd4Yr37V3Tvzar+lQ==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@swc/core-linux-arm-gnueabihf@1.4.2:
+    resolution: {integrity: sha512-Eyqipf7ZPGj0vplKHo8JUOoU1un2sg5PjJMpEesX0k+6HKE2T8pdyeyXODN0YTFqzndSa/J43EEPXm+rHAsLFQ==}
+    engines: {node: '>=10'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@swc/core-linux-arm64-gnu@1.4.2:
+    resolution: {integrity: sha512-wZn02DH8VYPv3FC0ub4my52Rttsus/rFw+UUfzdb3tHMHXB66LqN+rR0ssIOZrH6K+VLN6qpTw9VizjyoH0BxA==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@swc/core-linux-arm64-musl@1.4.2:
+    resolution: {integrity: sha512-3G0D5z9hUj9bXNcwmA1eGiFTwe5rWkuL3DsoviTj73TKLpk7u64ND0XjEfO0huVv4vVu9H1jodrKb7nvln/dlw==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@swc/core-linux-x64-gnu@1.4.2:
+    resolution: {integrity: sha512-LFxn9U8cjmYHw3jrdPNqPAkBGglKE3tCZ8rA7hYyp0BFxuo7L2ZcEnPm4RFpmSCCsExFH+LEJWuMGgWERoktvg==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@swc/core-linux-x64-musl@1.4.2:
+    resolution: {integrity: sha512-dp0fAmreeVVYTUcb4u9njTPrYzKnbIH0EhH2qvC9GOYNNREUu2GezSIDgonjOXkHiTCvopG4xU7y56XtXj4VrQ==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@swc/core-win32-arm64-msvc@1.4.2:
+    resolution: {integrity: sha512-HlVIiLMQkzthAdqMslQhDkoXJ5+AOLUSTV6fm6shFKZKqc/9cJvr4S8UveNERL9zUficA36yM3bbfo36McwnvQ==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@swc/core-win32-ia32-msvc@1.4.2:
+    resolution: {integrity: sha512-WCF8faPGjCl4oIgugkp+kL9nl3nUATlzKXCEGFowMEmVVCFM0GsqlmGdPp1pjZoWc9tpYanoXQDnp5IvlDSLhA==}
+    engines: {node: '>=10'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@swc/core-win32-x64-msvc@1.4.2:
+    resolution: {integrity: sha512-oV71rwiSpA5xre2C5570BhCsg1HF97SNLsZ/12xv7zayGzqr3yvFALFJN8tHKpqUdCB4FGPjoP3JFdV3i+1wUw==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@swc/core@1.4.2:
+    resolution: {integrity: sha512-vWgY07R/eqj1/a0vsRKLI9o9klGZfpLNOVEnrv4nrccxBgYPjcf22IWwAoaBJ+wpA7Q4fVjCUM8lP0m01dpxcg==}
+    engines: {node: '>=10'}
+    requiresBuild: true
+    peerDependencies:
+      '@swc/helpers': ^0.5.0
+    peerDependenciesMeta:
+      '@swc/helpers':
+        optional: true
+    dependencies:
+      '@swc/counter': 0.1.3
+      '@swc/types': 0.1.5
+    optionalDependencies:
+      '@swc/core-darwin-arm64': 1.4.2
+      '@swc/core-darwin-x64': 1.4.2
+      '@swc/core-linux-arm-gnueabihf': 1.4.2
+      '@swc/core-linux-arm64-gnu': 1.4.2
+      '@swc/core-linux-arm64-musl': 1.4.2
+      '@swc/core-linux-x64-gnu': 1.4.2
+      '@swc/core-linux-x64-musl': 1.4.2
+      '@swc/core-win32-arm64-msvc': 1.4.2
+      '@swc/core-win32-ia32-msvc': 1.4.2
+      '@swc/core-win32-x64-msvc': 1.4.2
+    dev: true
+
+  /@swc/counter@0.1.3:
+    resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==}
+    dev: true
+
+  /@swc/types@0.1.5:
+    resolution: {integrity: sha512-myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw==}
+    dev: true
+
   /@tootallnate/once@1.1.2:
     resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==}
     engines: {node: '>= 6'}
@@ -12870,6 +13008,11 @@ packages:
     hasBin: true
     dev: false
 
+  /uuid@9.0.1:
+    resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
+    hasBin: true
+    dev: true
+
   /v8-compile-cache-lib@3.0.1:
     resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
 
@@ -13026,6 +13169,20 @@ packages:
       - supports-color
     dev: true
 
+  /vite-plugin-top-level-await@1.4.1(rollup@3.29.4)(vite@4.5.1):
+    resolution: {integrity: sha512-hogbZ6yT7+AqBaV6lK9JRNvJDn4/IJvHLu6ET06arNfo0t2IsyCaon7el9Xa8OumH+ESuq//SDf8xscZFE0rWw==}
+    peerDependencies:
+      vite: '>=2.8'
+    dependencies:
+      '@rollup/plugin-virtual': 3.0.2(rollup@3.29.4)
+      '@swc/core': 1.4.2
+      uuid: 9.0.1
+      vite: 4.5.1(@types/node@20.5.1)(less@4.2.0)(sass@1.69.5)
+    transitivePeerDependencies:
+      - '@swc/helpers'
+      - rollup
+    dev: true
+
   /vite@4.5.1(@types/node@20.10.5):
     resolution: {integrity: sha512-AXXFaAJ8yebyqzoNB9fu2pHoo/nWX+xZlaRwoeYUxEqBO+Zj4msE5G+BhGBll9lYEKv9Hfks52PAF2X7qDYXQA==}
     engines: {node: ^14.18.0 || >=16.0.0}

+ 1 - 1
src/api/sys/monitor.ts

@@ -86,7 +86,7 @@ export function getMonitorSite(params: MonitorSiteParams, mode: ErrorMessageMode
 }
 
 /** 测点操作内嵌的iframe地址 */
-export const monitorSiteOperationUrl = 'http://82.157.13.146:18224/valkyrja/';
+export const monitorSiteOperationUrl = 'http://172.16.253.23:91/valkyrja/';
 
 /** 发送测点操作指令 */
 export function postMonitorOperation(el: Window, params: MonitorSiteOperationParams) {

+ 2 - 2
src/router/guard/permissionGuard.ts

@@ -8,7 +8,6 @@ import { useUserStoreWithOut } from '@/store/modules/user';
 import { PAGE_NOT_FOUND_ROUTE } from '@/router/routes/basic';
 
 import { RootRoute } from '@/router/routes';
-import { getToken } from '@/utils/auth';
 
 const LOGIN_PATH = PageEnum.BASE_LOGIN;
 
@@ -51,8 +50,9 @@ export function createPermissionGuard(router: Router) {
     }
     // token or user does not exist
     if (!token) {
+      debugger;
       // You can access without permission. You need to set the routing meta.ignoreAuth to true
-      if (to.query['auto'] === 'true') {
+      if (to.query['autoLogin'] == '1') {
         // 自动登录
         const userStore = useUserStoreWithOut();
         await userStore.autoLogin();

+ 80 - 198
src/views/vent/fire/fireHome/index.vue

@@ -5,102 +5,85 @@
       <iframe src="http://82.157.13.146:18224/valkyrja" width="100%" height="100%" frameborder="0"></iframe>
     </div> -->
     <div class="main-container">
-
-      <transition name="fade" mode="out-in">
-        <div class="left-area" v-if="isShow">
-          <!-- 左上区域 -->
-          <div class="left-t">
-            <div class="tcontent-area">
-              <div class="tcontent-l">
-                <div>全矿井</div>
-                <div>监测区域</div>
-              </div>
-              <div class="tcontent-c">
-                <div style="margin-bottom: 10px; color: #1fb3f7; font-size: 24px">低风险</div>
-                <div style="color: #fff; font-size: 14px">自燃倾向性等级 : 容易自燃</div>
-              </div>
-              <div class="tcontent-r">火灾风险</div>
+      <div class="left-area">
+        <!-- 左上区域 -->
+        <div class="left-t">
+          <div class="tcontent-area">
+            <div class="tcontent-l">
+              <div>全矿井</div>
+              <div>监测区域</div>
             </div>
-          </div>
-          <!-- 左中区域 -->
-          <div class="left-c">
-            <DanelBd :moduleName="'工作面风险监测'" :contentStyle="{ contentH: '430px' }">
-              <workJc :heightT="'30%'" :heightB="'70%'" :echartData="echartDataWork" :cardData="cardData" />
-            </DanelBd>
-          </div>
-          <!-- 左下区域 -->
-          <div class="left-b">
-            <DanelBd :moduleName="'密闭采空区监测系统'" :contentStyle="{ contentH: '170px' }" commonTitle="selected"
-              :selectValue="areaCodeMb" :selectList="selectListMb" @changeSelect="changeSelect">
-              <emptyJc :emptyData="emptyData" />
-            </DanelBd>
-          </div>
-          <!-- 左底部区域 -->
-          <div class="left-f">
-            <DanelBd :moduleName="'GIS重点区域风险监测'" :contentStyle="{ contentH: '0px' }" commonTitle="switchs" />
+            <div class="tcontent-c">
+              <div style="margin-bottom: 10px; color: #1fb3f7; font-size: 24px">低风险</div>
+              <div style="color: #fff; font-size: 14px">自燃倾向性等级 : 容易自燃</div>
+            </div>
+            <div class="tcontent-r">火灾风险</div>
           </div>
         </div>
-      </transition>
-
-
-
-      <div :class="isShow ? 'center-area' : 'center-area1'">
-        <div :class="isShow ? 'center-t' : 'center-t1'">
-          <div class="center-scalc" @click="getScalc">
-            <img src="../../../../assets/images/scalc.png" alt="">
-          </div>
+        <!-- 左中区域 -->
+        <div class="left-c">
+          <DanelBd :moduleName="'工作面风险监测'" :contentStyle="{ contentH: '430px' }">
+            <workJc :heightT="'30%'" :heightB="'70%'" :echartData="echartDataWork" :cardData="cardData" />
+          </DanelBd>
+        </div>
+        <!-- 左下区域 -->
+        <div class="left-b">
+          <DanelBd :moduleName="'密闭采空区监测系统'" :contentStyle="{ contentH: '170px' }" commonTitle="selected"
+           :selectValue="areaCodeMb" :selectList="selectListMb" @changeSelect="changeSelect">
+            <emptyJc :emptyData="emptyData" />
+          </DanelBd>
+        </div>
+        <!-- 左底部区域 -->
+        <div class="left-f">
+          <DanelBd :moduleName="'GIS重点区域风险监测'" :contentStyle="{ contentH: '0px' }" commonTitle="switchs" />
+        </div>
+      </div>
+      <div class="center-area">
+        <div class="center-t">
           <iframe src="http://82.157.13.146:18224/valkyrja/" width="100%" height="100%" frameborder="0"></iframe>
         </div>
-        <transition name="fade" mode="out-in">
-          <div class="center-b" v-if="isShow">
-            <DanelBd :moduleName="'工作面束管监测'" :selectValue="pointCode" :moduleSelect="moduleSelect"
-              :contentStyle="{ contentH: '289px' }" commonTitle="selected" :selectList="selectList"
-              @changeSelect="changeSelect">
-              <fiberBunbleJc :bunbleData="bunbleData" />
-            </DanelBd>
-          </div>
-        </transition>
-
+        <div class="center-b">
+          <DanelBd :moduleName="'工作面束管监测'" :selectValue="pointCode" :moduleSelect="moduleSelect" :contentStyle="{ contentH: '289px' }"
+            commonTitle="selected" :selectList="selectList" @changeSelect="changeSelect">
+            <fiberBunbleJc :bunbleData="bunbleData" />
+          </DanelBd>
+        </div>
       </div>
-      <transition name="fade" mode="out-in">
-        <div class="right-area" v-if="isShow">
-          <!-- 右上区域 -->
-          <div class="right-t">
-            <DanelBd :moduleName="''" :contentStyle="{ contentH: '121px' }">
-              <systemJc />
-            </DanelBd>
-          </div>
-          <!-- 右中区域 -->
-          <div class="right-c">
-            <DanelBd :moduleName="'带式输送机防灭火监控系统'" :contentStyle="{ contentH: '180px' }" commonTitle="selected"
-              :selectList="selectListDs" :selectValue="dsCode" @changeSelect="changeSelect">
-              <outFireJc :outFireData="outFireData" />
-            </DanelBd>
-          </div>
-          <!-- 右下区域 -->
-          <div class="right-b">
-            <DanelBd :moduleName="'变电硐室防灭火监控系统'" :contentStyle="{ contentH: '180px' }" commonTitle="selected"
-              :selectList="selectListBd" :selectValue="pointCodeBd" @changeSelect="changeSelect">
-              <substationJc :echartDatas="echartDatas" />
-            </DanelBd>
-          </div>
-          <!-- 右底部区域 -->
-          <div class="right-f">
-            <DanelBd :moduleName="'安全监控系统'" :contentStyle="{ contentH: '215px' }" commonTitle="selected"
-              :selectList="selectListAq" :selectValue="pointCodeAq" @changeSelect="changeSelect">
-              <safetyJc :safetyHead="safetyHead" :safetyList="safetyList" />
-            </DanelBd>
-          </div>
+      <div class="right-area">
+        <!-- 右上区域 -->
+        <div class="right-t">
+          <DanelBd :moduleName="''" :contentStyle="{ contentH: '121px' }">
+            <systemJc />
+          </DanelBd>
         </div>
-      </transition>
-
+        <!-- 右中区域 -->
+        <div class="right-c">
+          <DanelBd :moduleName="'带式输送机防灭火监控系统'" :contentStyle="{ contentH: '180px' }" commonTitle="selected"
+            :selectList="selectListDs" :selectValue="dsCode" @changeSelect="changeSelect">
+            <outFireJc :outFireData="outFireData" />
+          </DanelBd>
+        </div>
+        <!-- 右下区域 -->
+        <div class="right-b">
+          <DanelBd :moduleName="'变电硐室防灭火监控系统'" :contentStyle="{ contentH: '180px' }" commonTitle="selected"
+            :selectList="selectListBd" :selectValue="pointCodeBd" @changeSelect="changeSelect">
+            <substationJc :echartDatas="echartDatas" />
+          </DanelBd>
+        </div>
+        <!-- 右底部区域 -->
+        <div class="right-f">
+          <DanelBd :moduleName="'安全监控系统'" :contentStyle="{ contentH: '215px' }" commonTitle="selected"
+            :selectList="selectListAq" :selectValue="pointCodeAq" @changeSelect="changeSelect">
+            <safetyJc :safetyHead="safetyHead" :safetyList="safetyList" />
+          </DanelBd>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, onMounted, onUnmounted } from 'vue'
-import Vodal from 'vodal'
+import { ref, reactive, onMounted,onUnmounted } from 'vue'
 import DanelBd from '../../common/danelBd.vue';
 import workJc from './components/workJc.vue';
 import emptyJc from './components/emptyJc.vue';
@@ -117,9 +100,6 @@ let moduleSelect = reactive([
 
 ])
 
-
-//是否显示左侧区域和右侧区域
-let isShow = ref(true)
 let areaCode = ref('')
 let pointCode = ref('')
 let areaCodeMb = ref('')
@@ -160,12 +140,6 @@ let selectListAq = reactive<any[]>([
 let safetyHead = reactive<any[]>([])
 let safetyList = reactive<any[]>([])
 
-//隐藏和显示左右侧区域
-function getScalc() {
-  isShow.value = !isShow.value
-
-}
-
 // https获取监测数据
 let timer: null | NodeJS.Timeout = null;
 function getMonitor() {
@@ -253,8 +227,8 @@ async function getFireAreaInfoListMb() {
     dataMb.forEach(m => {
       selectListMb.push({ label: m.areaName, value: m.areaCode })
     })
-
-    areaCodeMb.value = areaCodeMb.value ? areaCodeMb.value : selectListMb[0]['value']
+   
+    areaCodeMb.value =areaCodeMb.value ?  areaCodeMb.value : selectListMb[0]['value']
     //获取密闭监测实时信息
     getMbRealDataList()
   }
@@ -266,7 +240,7 @@ async function getMbRealDataList() {
   console.log(res, '密闭监测实时信息')
   emptyData.length = 0
   res.forEach(el => {
-    emptyData.push({ label: el.name, val: el.currentValue, unit: el.unit },)
+    emptyData.push({ label: el.name, val: el.currentValue,unit:el.unit },)
   })
 }
 
@@ -301,7 +275,7 @@ async function getSgjcRealDataByPointCodeList() {
         val1: el.position,
         label2: '时间',
         val2: el.time,
-        unit: el.unit
+        unit:el.unit
       })
     })
   }
@@ -320,16 +294,16 @@ async function getFireAreaInfoListDs() {
       selectListDs.push({ label: el.areaName, value: el.areaName })
     })
 
-    dsCode.value = dsCode.value ? dsCode.value : selectListDs[0].value
+    dsCode.value=dsCode.value ? dsCode.value : selectListDs[0].value
     let dataName = dataDs.filter(v => v.areaName == dsCode.value)[0]
     outFireData.push(
-      { title: '光钎预警', val: dataName.infoTypeTwo.maxTemperature, dw: '℃', label: '最高温度' },
-      { title: '一氧化碳预警', val: dataName.infoTypeTwo.returnAirCornerCO, dw: 'ppm', label: '最高浓度' },
-      { title: '烟雾预警', val: dataName.infoTypeTwo.hazard, dw: '', label: '状态' },
-      { title: '火焰预警', val: '--', dw: '', label: '状态' },
-      { title: '喷粉阀门', val: '--', dw: '', label: '开关量' },
-    )
-
+        { title: '光钎预警', val: dataName.infoTypeTwo.maxTemperature, dw: '℃', label: '最高温度' },
+        { title: '一氧化碳预警', val: dataName.infoTypeTwo.returnAirCornerCO, dw: 'ppm', label: '最高浓度' },
+        { title: '烟雾预警', val: dataName.infoTypeTwo.hazard, dw: '', label: '状态' },
+        { title: '火焰预警', val: '--', dw: '', label: '状态' },
+        { title: '喷粉阀门', val: '--', dw: '', label: '开关量' },
+      )
+   
   }
 }
 
@@ -357,7 +331,7 @@ async function getInfosByAreaCodeList() {
         value: el.pointCode
       })
     })
-    pointCodeBd.value = pointCodeBd.value ? pointCodeBd.value : selectListBd[0].value
+    pointCodeBd.value =pointCodeBd.value ? pointCodeBd.value : selectListBd[0].value
     //获取光钎测温图表数据
     getGxcwHistoryDataByPointCodeList()
   }
@@ -624,82 +598,10 @@ onUnmounted(() => {
       width: calc(100% - 814px);
 
       .center-t {
-        position: relative;
         width: 100%;
         height: 60%;
         margin-bottom: 15px;
         overflow: hidden;
-
-        .center-scalc {
-          position: absolute;
-          top: 10px;
-          left: 10px;
-          width: 50px;
-          height: 50px;
-          background-color: rgb(30 58 117 / 41.8%);
-
-          img {
-            position: absolute;
-            top: 50%;
-            left: 50%;
-            width: 37px;
-            height: 41px;
-            transform: translate(-50%, -50%);
-            cursor: pointer;
-
-            &:hover {
-              width: 43px;
-              height: 47px;
-              background-color: rgb(100 228 185 / 6.27%);
-            }
-          }
-        }
-      }
-
-      .center-b {
-        width: 100%;
-        height: calc(40% - 15px);
-      }
-    }
-
-    .center-area1 {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: space-between;
-      width: 100%;
-
-      .center-t1 {
-        position: relative;
-        width: 100%;
-        height: 100%;
-        margin-bottom: 15px;
-        overflow: hidden;
-
-        .center-scalc {
-          position: absolute;
-          top: 10px;
-          left: 10px;
-          width: 50px;
-          height: 50px;
-          background-color: rgb(30 58 117 / 41.8%);
-
-          img {
-            position: absolute;
-            top: 50%;
-            left: 50%;
-            width: 37px;
-            height: 41px;
-            transform: translate(-50%, -50%);
-            cursor: pointer;
-
-            &:hover {
-              width: 43px;
-              height: 47px;
-              background-color: rgb(100 228 185 / 6.27%);
-            }
-          }
-        }
       }
 
       .center-b {
@@ -735,25 +637,5 @@ onUnmounted(() => {
       }
     }
   }
-
-  /* fade.css */
-  .fade-enter-active {
-    transition:opacity 2.5s linear;
-
-    /* 设置过渡时间为1秒 */
-  }
-
-  .fade-leave-active {
-    transition:  opacity 0.5s linear;
-
-    /* 设置过渡时间为1秒 */
-  }
-
-  .fade-enter,
-  .fade-leave-to {
-    opacity: 0;
-
-    /* 初始状态为不可见 */
-  }
 }
 </style>

+ 16 - 12
src/views/vent/fire/fireZhuj/index.vue

@@ -1,21 +1,25 @@
 <template>
   <div class="fireZhuj">
-    <iframe src="http://172.16.253.25:8090/FireZhuj/monitor" width="100%" height="100%" frameborder="0"></iframe>
+    <iframe
+      src="http://172.16.253.25:8090/FireZhuj/monitor"
+      width="100%"
+      height="100%"
+      frameborder="0"
+    ></iframe>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, onMounted } from 'vue'
-
+  import { ref, reactive, onMounted } from 'vue';
 </script>
 
 <style lang="less" scoped>
-.fireZhuj {
-  position: relative;
-  width: calc(100% - 20px);
-  // height: calc(100vh - 82px);
-  height: 863px;
-  margin: 50px 10px 15px;
-  background: #282828;
-}
-</style>
+  .fireZhuj {
+    position: relative;
+    width: calc(100% - 20px);
+    // height: calc(100vh - 82px);
+    height: 863px;
+    margin: 50px 10px 15px;
+    background: #282828;
+  }
+</style>