Browse Source

子系统 模型切换优化

AaronBruin 1 month ago
parent
commit
3873494122

+ 2 - 2
.env.development

@@ -1,8 +1,8 @@
 # 页面标题
-VITE_APP_TITLE = IBMS楼宇集成管理平台
+VITE_APP_TITLE = IBMS楼宇集成数据大屏
 
 # 开发环境配置
 VITE_APP_ENV = 'development'
 
-# IBMS楼宇集成管理平台/开发环境
+# IBMS楼宇集成数据大屏/开发环境
 VITE_APP_BASE_API = '/dev-api'

+ 2 - 2
.env.production

@@ -1,10 +1,10 @@
 # 页面标题
-VITE_APP_TITLE = IBMS楼宇集成管理平台
+VITE_APP_TITLE = IBMS楼宇集成数据大屏
 
 # 生产环境配置
 VITE_APP_ENV = 'production'
 
-# IBMS楼宇集成管理平台/生产环境
+# IBMS楼宇集成数据大屏/生产环境
 VITE_APP_BASE_API = '/prod-api'
 
 # 是否在打包时开启压缩,支持 gzip 和 brotli

+ 2 - 2
.env.staging

@@ -1,10 +1,10 @@
 # 页面标题
-VITE_APP_TITLE = IBMS楼宇集成管理平台
+VITE_APP_TITLE = IBMS楼宇集成数据大屏
 
 # 生产环境配置
 VITE_APP_ENV = 'staging'
 
-# IBMS楼宇集成管理平台/生产环境
+# IBMS楼宇集成数据大屏/生产环境
 VITE_APP_BASE_API = '/stage-api'
 
 # 是否在打包时开启压缩,支持 gzip 和 brotli

+ 1 - 1
README.md

@@ -1,4 +1,4 @@
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">IBMS楼宇集成管理平台 v1.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">IBMS楼宇集成数据大屏 v1.0</h1>
 <h4 align="center">基于SpringBoot+Vue3前后端分离的Java快速开发框架</h4>
 ## 前端运行
 

+ 1 - 1
index.html

@@ -7,7 +7,7 @@
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <link rel="icon" href="/IBMS.png">
-  <title>IBMS楼宇集成管理平台</title>
+  <title>IBMS楼宇集成数据大屏</title>
   <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
   <style>
     html,

+ 1 - 1
package.json

@@ -1,7 +1,7 @@
 {
   "name": "ibms",
   "version": "3.8.9",
-  "description": "IBMS楼宇集成管理平台",
+  "description": "IBMS楼宇集成数据大屏",
   "author": "IBMS",
   "license": "MIT",
   "type": "module",

+ 27 - 23
src/layout/components/AppMain.vue

@@ -8,10 +8,10 @@
       <!-- </transition> -->
     </router-view>
     <iframe-toggle />
-    <!-- <iframe id="myIframe" :src="srcUrl" style="width: 100%;height: 100%;" frameborder="0"
-      v-show="pathUrl == '/index'"></iframe>
+    <iframe id="myIframe" :src="srcUrl" style="width: 100%;height: 100%;" frameborder="0"
+      v-show="pathUrl == '/index' || pathUrl == '/system/building'"></iframe>
     <iframe id="myIframeil" :src="srcUrl1" style="width: 100%;height: 100%;" frameborder="0"
-      v-if="pathUrl != '/index' && pathShow"></iframe> -->
+      v-if="pathUrl != '/index' && pathShow || pathShow && pathUrl != '/system/lighting'"></iframe>
   </section>
 </template>
 
@@ -22,7 +22,7 @@ const route = useRoute()
 const tagsViewStore = useTagsViewStore()
 const pathUrl = ref('')
 const pathShow = ref(false)
-const srcUrl = 'http://192.168.11.38:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTUdp'
+const srcUrl = 'http://117.187.233.165:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTUd1'
 const srcUrl1 = ref('')
 onMounted(() => {
   addIframe()
@@ -45,54 +45,58 @@ onMounted(() => {
 // }
 watch(() => route, (newVal) => {
   pathUrl.value = newVal.path
-  console.log(pathUrl.value, 998);
-  if (pathUrl.value == '/system/building') {
-    // 楼宇自控
-    srcUrl1.value = 'http://192.168.11.38:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTUd1'
-  } else if (pathUrl.value == '/system/lighting') {
+  if (pathUrl.value == '/system/lighting') {
     // 照明系统
-    srcUrl1.value = 'http://192.168.11.38:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTUd3'
+    srcUrl1.value = 'http://117.187.233.165:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTUd3'
   } else if (pathUrl.value == '/system/elevator') {
     // 电梯系统
-    srcUrl1.value = 'http://192.168.11.38:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTUd2'
+    srcUrl1.value = 'http://117.187.233.165:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTUd2'
   } else if (pathUrl.value == '/system/broadcast') {
     // 公共广播
-    srcUrl1.value = 'http://192.168.11.38:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTU12'
+    srcUrl1.value = 'http://117.187.233.165:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTU12'
   } else if (pathUrl.value == '/system/tenement') {
     // 物业管理
-    srcUrl1.value = 'http://192.168.11.38:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTU13'
+    srcUrl1.value = 'http://117.187.233.165:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTU13'
   } else if (pathUrl.value == '/system/message') {
     // 信息发布
-    srcUrl1.value = 'http://192.168.11.38:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTUd8'
+    srcUrl1.value = 'http://117.187.233.165:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTUd8'
   } else if (pathUrl.value == '/system/energy') {
     // 能源管理
-    srcUrl1.value = 'http://192.168.11.38:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTUd4'
+    srcUrl1.value = 'http://117.187.233.165:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTUd4'
   } else if (pathUrl.value == '/system/video') {
     // 视频监控
-    srcUrl1.value = 'http://192.168.11.38:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTUd5'
+    srcUrl1.value = 'http://117.187.233.165:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTUd5'
   } else if (pathUrl.value == '/system/intruderalarm') {
     // 入侵报警
-    srcUrl1.value = 'http://192.168.11.38:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTUd6'
+    srcUrl1.value = 'http://117.187.233.165:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTUd6'
   } else if (pathUrl.value == '/system/passageway') {
     // 出入口控制
-    srcUrl1.value = 'http://192.168.11.38:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTU15'
+    srcUrl1.value = 'http://117.187.233.165:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTU15'
   } else if (pathUrl.value == '/system/inspection') {
     // 电子巡查
-    srcUrl1.value = 'http://192.168.11.38:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTUd7'
+    srcUrl1.value = 'http://117.187.233.165:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTUd7'
   } else if (pathUrl.value == '/system/visitor') {
     // 访客系统
-    srcUrl1.value = 'http://192.168.11.38:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTU11'
+    srcUrl1.value = 'http://117.187.233.165:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTU11'
   } else if (pathUrl.value == '/system/passengerFlow') {
     // 客流统计
-    srcUrl1.value = 'http://192.168.11.38:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTU10'
+    srcUrl1.value = 'http://117.187.233.165:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTU10'
   } else if (pathUrl.value == '/system/entranceguard') {
     // 门禁系统
-    srcUrl1.value = 'http://192.168.11.38:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTUd9'
+    srcUrl1.value = 'http://117.187.233.165:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTUd9'
   } else if (pathUrl.value == '/system/receptiondesk') {
     // 会议系统
-    srcUrl1.value = 'http://192.168.11.38:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTU14'
+    srcUrl1.value = 'http://117.187.233.165:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTU14'
   }
   pathShow.value = true
+  if (pathUrl.value == '/system/building') {
+    // 楼宇自控
+    pathShow.value = false
+    // srcUrl1.value = 'http://117.187.233.165:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTUd1'
+  } else if (pathUrl.value == '/index' || pathUrl.value == '/') {
+    pathShow.value = false
+  }
+  console.log(pathUrl.value, 998);
   addIframe()
 }, { deep: true, immediate: true } // 开启深度监听
 )

+ 2 - 2
src/views/login.vue

@@ -41,7 +41,7 @@
       </div>
       <!--  底部  -->
       <div class="el-login-footer">
-        <span>Copyright © 2018-2025 ruoyi.vip All Rights Reserved.</span>
+        <span>Copyright © 2018-2025 ibms.vip All Rights Reserved.</span>
       </div>
       <particle style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;"></particle>
     </div>
@@ -162,7 +162,7 @@ onMounted(() => {
 
 .login_box {
   position: absolute;
-  top: 15%;
+  top: 25%;
   display: flex;
   justify-content: center;
   align-items: center;

+ 2 - 2
src/views/system/building/index.vue

@@ -25,7 +25,7 @@
             <template #right>
                 <div class="right_spection">
                     <div class="operation_spection">
-                        <HeadlineTag type="right" value="运行统计"></HeadlineTag>
+                        <HeadlineTag type="right" value="设备运行统计"></HeadlineTag>
                         <div class="box_arch">
                             <div class="image_tubbiness">
                                 <div class="work_num">{{ leftData.DeviceCount || 0 }}</div>
@@ -34,7 +34,7 @@
                             <div class="right_content">
                                 <div class="work_week">
                                     <div class="color_line_xj" style="background-color: rgb(21, 213, 21);"></div>
-                                    <span>运行状态:</span>{{ leftData.RunState || 0 }}
+                                    <span>正常状态:</span>{{ leftData.RunState || 0 }}
                                 </div>
                                 <div class="work_week">
                                     <div class="color_line_xj" style="background-color: rgb(196, 127, 19);"></div>

+ 1 - 1
src/views/system/dynamicEnvironment/modules/deviceList.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="_deviceList">
-        <HeadlineTag value="设备列表" style="flex-shrink: 0;"></HeadlineTag>
+        <HeadlineTag type="right" value="设备列表" style="flex-shrink: 0;"></HeadlineTag>
         <div class="point_box" style="margin-top: 10px;">
             <el-input v-model="value" placeholder="按巡查点名称搜索" />
         </div>

+ 1 - 1
src/views/system/wastewater/modules/consume.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="_running">
-        <HeadlineTag value="设备统计"></HeadlineTag>
+        <HeadlineTag type="right" value="设备统计"></HeadlineTag>
         <div class="_running_mains">
             <div class="_running_mains_left" id="videoWidth" :style="{ '--heightRun': heightVideo + 'px' }">
                 <div class="_running_mains_left_tuan"></div>

+ 1 - 1
src/views/system/wastewater/modules/running.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="_eventList">
-        <HeadlineTag value="水泵运行状态列表" style="flex-shrink: 0;"></HeadlineTag>
+        <HeadlineTag type="right" value="水泵运行状态列表" style="flex-shrink: 0;"></HeadlineTag>
         <div class="scroll-view" ref="scrollViewRef" @mouseenter="onMouseenter" @mouseleave="onMouseleave">
             <div ref="listRef" class="list" v-for="(p, n) in count" :key="n">
                 <div class="item" v-for="(item, index) in data" :key="index">

+ 1 - 1
src/views/system/wirelessIntercom/modules/consume.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="_running">
-        <HeadlineTag value="设备统计"></HeadlineTag>
+        <HeadlineTag type="right" value="设备统计"></HeadlineTag>
         <div class="_running_mains">
             <div class="_running_mains_left" id="videoWidth" :style="{ '--heightRun': heightVideo + 'px' }">
                 <div class="_running_mains_left_tuan"></div>

+ 1 - 1
src/views/system/wirelessIntercom/modules/running.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="_eventList">
-        <HeadlineTag value="无线对讲设备信息" style="flex-shrink: 0;"></HeadlineTag>
+        <HeadlineTag type="right" value="无线对讲设备信息" style="flex-shrink: 0;"></HeadlineTag>
         <div class="scroll-view" ref="scrollViewRef" @mouseenter="onMouseenter" @mouseleave="onMouseleave">
             <div ref="listRef" class="list" v-for="(p, n) in count" :key="n">
                 <div class="item" v-for="(item, index) in data" :key="index">