update: 大屏接口

src/components/body-d-left/left.api.ts

@@ -7,6 +7,8 @@ export enum Api {
     complaint = '/health-emergency/emergency/tblHelpCenter/sicknessTypeStatistic',
     orderDetail = '/health-emergency/emergency/order/list',
     listCustom = '/health-watch/watch/watchMonitorData/listCustom',
+
+    listCustomNew = 'health-watch/watch/watchMonitorData/largeScreen/listCustom',
 }
 
 //获取全部部门
@@ -21,3 +23,4 @@ export const getDetail = (params: any) => get(Api.getDetail, params);
 export const getOrderDetail = (params: any) => get(Api.orderDetail, params);
 //副屏预警查看详情
 export const getEarlyWarningDetail = (params: any) => get(Api.listCustom, params);
+export const getEarlyWarningDetailNew = (params: any) => get(Api.listCustomNew, params);

src/components/item-d/pieCharts.ts

@@ -1,8 +1,8 @@
 // 步数
-import {visibleChartLabel} from "/@/utils/utils.ts";
+import { visibleChartLabel } from '/@/utils/utils.ts';
 
 export function screenPie(chartData) {
-    const data = visibleChartLabel(chartData)
+    const data = visibleChartLabel(chartData);
     return {
         color: ['#B750BE', '#6C63F0', '#3AACFF', '#ED589D', '#FB466C'],
         tooltip: {
@@ -24,7 +24,7 @@ export function screenPie(chartData) {
                 color: '#ffffff',
                 fontSize: 16,
             },
-            selectedMode: false
+            selectedMode: false,
         },
         series: [
             {
@@ -35,13 +35,14 @@ export function screenPie(chartData) {
                 label: {
                     show: true,
                     position: 'outside',
+                    formatter: '{c}人次',
                     color: '#ffffff',
                     fontSize: 14,
                 },
                 labelLine: {
                     show: true,
                     length: 6,
-                    length2: 10,
+                    length2: 30,
                     minTurnAngle: 120,
                 },
                 data: data,
@@ -52,7 +53,7 @@ export function screenPie(chartData) {
 
 //左侧圆
 export function circleRing(chartData, total, color) {
-    const data = visibleChartLabel(chartData)
+    const data = visibleChartLabel(chartData);
     return {
         color: color,
         tooltip: {
@@ -74,7 +75,7 @@ export function circleRing(chartData, total, color) {
                 color: '#ffffff',
                 fontSize: 16,
             },
-            selectedMode: false
+            selectedMode: false,
         },
         series: [
             {
@@ -95,18 +96,18 @@ export function circleRing(chartData, total, color) {
                 label: {
                     show: true,
                     position: 'outside',
-                    formatter: '{d}%',
+                    formatter: '{d}%\n{c}人次',
                     color: '#ffffff',
                     fontSize: 14,
                 },
                 labelLine: {
                     show: true,
-                    length: 4,
-                    length2: 12,
+                    length: 6,
+                    length2: 30,
                     minTurnAngle: 120,
                 },
                 data: data,
             },
         ],
     };
-}
+}

src/components/secondaryScreen/commonApi.ts

@@ -7,6 +7,7 @@ export enum Api {
     sleepApi = '/health-watch/watch/watchData/getSleep',
     stepApi = '/health-watch/watch/watchData/getSdc',
     listCustom = 'health-watch/watch/watchMonitorData/listCustom',
+    listCustomNew = 'health-watch/watch/watchMonitorData/largeScreen/listCustom',
 }
 
 // 单位-
@@ -24,3 +25,4 @@ export const getStep = (params: any) => post(Api.stepApi, params);
 
 //副屏-预警
 export const getCustom = (params: any) => get(Api.listCustom, params);
+export const getCustomNew = (params: any) => get(Api.listCustomNew, params);

src/components/secondaryScreen/screen-right/threeR.vue

@@ -26,14 +26,14 @@
             </a-table>
         </div>
         <!--预警查看详情-->
-        <EarlyWarningDialog ref="earlyWarningRef" />
+        <EarlyWarningDialog ref="earlyWarningRef" :org-codes="orgCode" />
     </div>
 </template>
 <script lang="ts" setup>
     import { onUnmounted, ref, watch } from 'vue';
     import PublicTitle from '/@/components/publicTitle.vue';
     import EarlyWarningDialog from '/@/views/components/earlyWarningDialog.vue';
-    import { getCustom, getMonitorList } from '/@/components/secondaryScreen/commonApi.ts';
+    import { getCustom, getCustomNew, getMonitorList } from '/@/components/secondaryScreen/commonApi.ts';
     import { monitorColumns } from '/@/components/secondaryScreen/screen-right/screenRightHooks.ts';
     import $bus from '/@/utils/bus.ts';
     import { earlyWarning } from '/@/utils/busConstant.ts';
@@ -64,7 +64,7 @@
     function handlePoliceDetail(record) {
         $bus.emit(earlyWarning, record);
     }
-
+    const threeCodes = ref();
     watch(
         props,
         () => {
@@ -75,7 +75,12 @@
         },
         { immediate: true, deep: true }
     );
-
+    watch(
+        () => props.orgCode,
+        () => {
+            threeCodes.value = props.orgCode;
+        }
+    );
     onUnmounted(() => {
         window.removeEventListener('resize', setHeight);
     });
@@ -89,7 +94,8 @@
     async function init(page) {
         try {
             const { pageSize } = pagination.value;
-            const { code, result } = await getCustom({ pageSize, pageNo: page, orgCode: props.orgCode });
+            // const { code, result } = await getCustom({ pageSize, pageNo: page, orgCode: props.orgCode });
+            const { code, result } = await getCustomNew({ pageSize, pageNo: page, orgCodes: props.orgCode });
             if (code == 200) {
                 setSession(PAGE2_RIGHT3, JSON.stringify({ page, result }));
                 setValue(result, page);

src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue

@@ -31,6 +31,7 @@
             type: Function,
         },
         apiParams: {
+            type: Object,
             default: () => {},
         },
         afterFetch: {

src/components/secondaryScreen/secondMap/secondMap.vue

@@ -12,12 +12,21 @@
             <div v-show="isShow" :class="className" class="footer-data" style="--moveUp: 20px; --moveDown: -80px">
                 <div
                     v-for="item in footerList"
-                    :style="{ cursor: item.key == 'allotDeviceNum' ? 'pointer' : 'default' }"
+                    :style="{
+                        cursor: item.key == 'allotDeviceNum' ? 'pointer' : 'default',
+                    }"
                     class="col-item nowrap"
                     @click="openWatchList(item)"
                 >
                     <div class="col-text">{{ item?.name }}</div>
-                    <div :title="item.value" class="col-value nowrap">{{ item?.value }}</div>
+                    <div
+                        :title="item.value"
+                        class="col-value nowrap"
+                        :style="{
+                            color: item.key == 'allotDeviceNum' ? '#0098fa' : '#fff',
+                        }"
+                        >{{ item?.value }}</div
+                    >
                 </div>
             </div>
             <div
@@ -103,7 +112,7 @@
                     async (val) => {
                         let params = {
                             orgCodeLeaf: val.orgCode,
-                            orgCode: null,
+                            orgCode: props.orgCode,
                         };
                         const { code, result } = await footerApi(params);
                         if (code == 200) {