update 调整大屏各个模块参数及样式

src/components/body-d-right/oneR.vue

@@ -43,7 +43,7 @@
                     </div>
                     <div class="con-item">
                         <span>发生地点：</span>
-                        <span>{{ userInfo?.address }}</span>
+                        <span>{{ userInfo?.address || userInfo?.gpsErrorMsg }}</span>
                     </div>
                 </div>
             </template>
@@ -59,7 +59,12 @@
     import { getMonitorList } from '/@/components/body-d-right/right.api.ts';
     import { Map } from '/@/assets/mapUtils/map.ts';
     import { caching, useSession } from '/@/hooks/autoRefresh/caching.ts';
+    import { DataType } from '/@/utils/settings.ts';
 
+    const props = defineProps({
+        setting: Object,
+    });
+    const emit = defineEmits(['emit-view-detail']);
     const router = useRouter();
     const { setSession, getSession } = useSession();
     const { RIGHT_KEY1 } = caching;
@@ -105,7 +110,7 @@
 
     async function getScrollList() {
         try {
-            const { code, result } = await getMonitorList({ pageSize: 10, pageNo: 1 });
+            const { code, result } = await getMonitorList({ pageSize: 10, pageNo: 1, orgCode: props.setting?.orgCode });
             if (code == 200) {
                 setSession(RIGHT_KEY1, JSON.stringify(result.records));
                 scrollList.value = result.records;
@@ -125,7 +130,12 @@
     }
 
     function viewDetail() {
-        router.push({ path: '/secondScreen' });
+        if (props.setting.dataType == DataType.xian) {
+            router.push({ path: '/secondScreen' });
+        }
+        if (props.setting.dataType == DataType.yinChuan) {
+            emit('emit-view-detail');
+        }
     }
 </script>
 <style scoped lang="less">
@@ -222,7 +232,7 @@
 <style lang="less">
     .dialog-con {
         background-color: #00152b;
-        border: 1px solid #129bff;
+        //border: 1px solid #129bff;
         /*
 antd表格样式
 */
@@ -268,4 +278,4 @@ antd表格样式
             background-color: rgba(30, 115, 194, 0.3);
         }
     }
-</style>
+</style>

src/components/body-d-right/threeR.vue

@@ -10,7 +10,7 @@
     </div>
 </template>
 <script setup lang="ts">
-    import PublicTitle from '../publicTitle.vue';
+    import PublicTitle from '/@/components/publicTitle.vue';
 </script>
 <style scoped lang="less">
     .inner {
@@ -37,8 +37,8 @@
             position: absolute;
             content: attr(data-text);
             color: #fff;
-            bottom: 0px;
-            left: 0px;
+            bottom: 0;
+            left: 0;
             width: 100%;
             text-align: left;
             padding-left: 10px;
@@ -60,4 +60,4 @@
             background-size: 100% 100%;
         }
     }
-</style>
+</style>

src/components/body-d-right/twoR.vue

@@ -7,7 +7,7 @@
 <script setup lang="ts">
     import { ref, unref, onMounted } from 'vue';
     import * as echarts from 'echarts';
-    import PublicTitle from '../publicTitle.vue';
+    import PublicTitle from '/@/components/publicTitle.vue';
     import { getHealthDataList } from '/@/components/body-d-right/right.api';
     import { useSpin } from '/@/components/body-d-left/bodyLeftHooks.ts';
     import { ringOption, useHealth } from '/@/components/body-d-right/bodyRightHooks.ts';
@@ -59,4 +59,4 @@
         margin: 0 auto;
         height: calc(100% - 40px);
     }
-</style>
+</style>