Browse Source

模型切换

AaronBruin 2 months ago
parent
commit
db684a6f97

BIN
src/assets/logo/logo.png


+ 1 - 1
src/components/layout_/index.vue

@@ -40,7 +40,7 @@ const appStore = useAppStore()
       position: absolute;
       top: 0;
       background: rgba(#3b90d7, 0.03);
-      backdrop-filter: blur(10px);
+      // backdrop-filter: blur(10px);
     }
 
     &_left {

+ 19 - 22
src/layout/components/AppMain.vue

@@ -8,8 +8,8 @@
       <!-- </transition> -->
     </router-view>
     <iframe-toggle />
-    <!-- <iframe id="myIframe" :src="srcUrl" style="width: 100%;height: 100%;" frameborder="0" @mousemove="handleScroll"
-      @load="onLoad"></iframe> -->
+    <iframe id="myIframe" :src="srcUrl" style="width: 100%;height: 100%;" frameborder="0" @mousemove="handleScroll"
+      @load="onLoad"></iframe>
   </section>
 </template>
 
@@ -18,29 +18,26 @@ import iframeToggle from "./IframeToggle/index"
 import useTagsViewStore from '@/store/modules/tagsView'
 const route = useRoute()
 const tagsViewStore = useTagsViewStore()
-const srcUrl = 'http://192.168.11.59:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTUdp'
+const srcUrl = 'http://192.168.11.68:9191/ViewRun?T_ViewID=41rwFKnP9R7DAQXGYkz2S8Vcba3qTUdp'
 onMounted(() => {
   addIframe()
 })
-
-const onLoad = () => {
-  let num = 1
-  // console.log('----------------------加载完成');
-  // 向 iframe 发送消息
-  const iframe = document.getElementById("myIframe");
-  iframe.contentWindow.postMessage(
-    `window.iot3d.ParkSwitch(${num});`,
-    "*" // 必须与 iframe 的域名一致
-  );
-  if (num == 0) {
-    num = 1
-  } else {
-    num = 0
-  }
-}
-function handleScroll() {
-  console.log('Iframe scrolled!');
-}
+// const onLoad = () => {
+//   let num = 1
+//   const iframe = document.getElementById("myIframe");
+//   iframe.contentWindow.postMessage(
+//     `window.iot3d.ParkSwitch(${num});`,
+//     "*"
+//   );
+//   if (num == 0) {
+//     num = 1
+//   } else {
+//     num = 0
+//   }
+// }
+// function handleScroll() {
+//   console.log('Iframe scrolled!');
+// }
 watch(() => route, (newVal) => {
   addIframe()
 }, { deep: true, immediate: true } // 开启深度监听

+ 16 - 0
src/layout/components/Sidebar/index.vue

@@ -158,6 +158,22 @@ function goBack(event) {
   } else {
     router.push({ path: path || "/" });
   }
+  switchModel(event)
+}
+function switchModel(params) {
+  let num = 0
+  if (params == '/') {
+    num = 0
+  } else if (params == 'lighting') {
+    num = 1
+  } else if (params == 'elevator') {
+    num = 2
+  }
+  const iframe = document.getElementById("myIframe");
+  iframe.contentWindow.postMessage(
+    `window.iot3d.ParkSwitch(${num});`,
+    "*"
+  );
 }
 const timeTag = ref(null)
 const isLongPress = ref(false);

+ 6 - 3
src/views/system/broadcast/modules/deviceList.vue

@@ -141,9 +141,12 @@ const onMouseleave = () => {
 
 .view_item {
     flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
+    // display: flex;
+    // align-items: center;
+    // justify-content: flex-start;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
     color: #ffffff;
 }
 

+ 6 - 3
src/views/system/broadcast/modules/eventList.vue

@@ -177,9 +177,12 @@ const onMouseleave = () => {
 
 .view_item {
     flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
+    // display: flex;
+    // align-items: center;
+    // justify-content: flex-start;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
     color: #ffffff;
 }
 

+ 6 - 3
src/views/system/broadcast/modules/sameDay.vue

@@ -173,9 +173,12 @@ const onMouseleave = () => {
 
 .view_item {
     flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
+    // display: flex;
+    // align-items: center;
+    // justify-content: flex-start;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
     color: #ffffff;
 }
 

+ 7 - 4
src/views/system/building/equipment.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="page">
         <div class="header-view">
-            <div class="view_item" v-for="(item, index) in headerList">{{ item }}</div>
+            <div class="view_item" v-for="(item, index) in headerList" :key="index">{{ item }}</div>
         </div>
         <div class="warning-view">
             <div class="scroll-view" ref="scrollViewRef" @mouseenter="onMouseenter" @mouseleave="onMouseleave">
@@ -120,9 +120,12 @@ const onMouseleave = () => {
 
 .view_item {
     flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
+    // display: flex;
+    // align-items: center;
+    // justify-content: flex-start;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
 }
 
 .warning-view {

+ 6 - 3
src/views/system/building/groupControl.vue

@@ -120,9 +120,12 @@ const onMouseleave = () => {
 
 .view_item {
     flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
+    // display: flex;
+    // align-items: center;
+    // justify-content: flex-start;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
     color: #ffffff;
 }
 

+ 6 - 3
src/views/system/building/incident.vue

@@ -119,9 +119,12 @@ const onMouseleave = () => {
 
 .view_item {
     flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
+    // display: flex;
+    // align-items: center;
+    // justify-content: flex-start;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
 }
 
 .warning-view {

+ 1 - 2
src/views/system/elevator/modules/running.vue

@@ -1,7 +1,6 @@
 <template>
     <div class="_running">
-        <HeadlineTag value="实时设备统计"></HeadlineTag>
-
+        <HeadlineTag value="电梯设备统计"></HeadlineTag>
         <div class="_running_mains">
             <div class="_running_mains_left">
                 <dv-decoration-9 style="width:150px;height:150px;">

+ 6 - 3
src/views/system/lighting/modules/deviceList.vue

@@ -172,9 +172,12 @@ const onMouseleave = () => {
 
 .view_item {
     flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
+    // display: flex;
+    // align-items: center;
+    // justify-content: flex-start;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
 }
 
 .warning-view {

+ 6 - 3
src/views/system/lighting/modules/eventList.vue

@@ -175,9 +175,12 @@ const onMouseleave = () => {
 
 .view_item {
     flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
+    // display: flex;
+    // align-items: center;
+    // justify-content: flex-start;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
 }
 
 .warning-view {

+ 6 - 3
src/views/system/message/modules/sameDay.vue

@@ -206,9 +206,12 @@ const onMouseleave = () => {
 
 .view_item {
     flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
+    // display: flex;
+    // align-items: center;
+    // justify-content: flex-start;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
     color: #ffffff;
 }
 

+ 9 - 7
src/views/system/passageway/access.vue

@@ -3,7 +3,7 @@
         <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">
-                    <div class="_eventList_mains_item_text">
+                    <div class="_eventList_mains_item_text view_item">
                         <div :class="item.State === 0 ? '_warning' : '_success'"
                             class="_eventList_mains_item_text_flag">
                         </div>
@@ -11,9 +11,11 @@
                             {{ item.Name }}
                         </el-text>
                     </div>
-                    <el-text class="w-150px mb-2" :class="item.State == 0 ? 'blue_title' : 'green_title'">{{ item.State
-                        == 0 ? '出' : '入' }}</el-text>
-                    <el-text class="w-150px mb-2" truncated style="color: white;">
+                    <el-text class="w-150px mb-2 view_item" style="justify-content: center;"
+                        :class="item.State == 0 ? 'blue_title' : 'green_title'">
+                        {{ item.State == 0 ? '出' : '入' }}
+                    </el-text>
+                    <el-text class="w-150px mb-2 view_item" truncated style="color: white;justify-content: flex-end;">
                         {{ item.Date }}
                     </el-text>
                 </div>
@@ -162,9 +164,9 @@ const onMouseleave = () => {
 
 .view_item {
     flex: 1;
-    // display: flex;
-    // align-items: center;
-    // justify-content: flex-start;
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;

+ 6 - 3
src/views/system/tenement/modules/eventList.vue

@@ -188,9 +188,12 @@ const onMouseleave = () => {
 
 .view_item {
     flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
+    // display: flex;
+    // align-items: center;
+    // justify-content: flex-start;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
     color: #ffffff;
 }
 

+ 6 - 3
src/views/system/tenement/modules/tiring.vue

@@ -191,9 +191,12 @@ const onMouseleave = () => {
 
 .view_item {
     flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
+    // display: flex;
+    // align-items: center;
+    // justify-content: flex-start;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
     color: #ffffff;
 }
 

+ 6 - 3
src/views/system/video/modules/eventList.vue

@@ -194,9 +194,12 @@ const onMouseleave = () => {
 
 .view_item {
     flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
+    // display: flex;
+    // align-items: center;
+    // justify-content: flex-start;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
 }
 
 .warning-view {

+ 6 - 3
src/views/system/visitor/register.vue

@@ -164,9 +164,12 @@ const onMouseleave = () => {
 
 .view_item {
     flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
+    // display: flex;
+    // align-items: center;
+    // justify-content: flex-start;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
 }
 
 .warning-view {

+ 6 - 3
src/views/system/visitor/swiping.vue

@@ -164,9 +164,12 @@ const onMouseleave = () => {
 
 .view_item {
     flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
+    // display: flex;
+    // align-items: center;
+    // justify-content: flex-start;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
 }
 
 .warning-view {