Merge branch 'sqy_dev' into 'main'

'fix:修复设备详情线上地图铆钉不显示,首页告警数更改'

See merge request huang/yun-teng-iot-front!104

 <template>
   <div>
-    <p class="center" v-if="alarmList.length">告警数</p>
     <div ref="chartRef" :style="{ height, width }" v-show="alarmList.length"></div>
     <div v-show="!alarmList.length"><Empty /></div>
   </div>
@@ -24,6 +23,10 @@
   const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>);
 
   onMounted(() => {
+    let alarmTotal = 0;
+    for (const item of props.alarmList) {
+      alarmTotal += Number(item[1]);
+    }
     setOptions({
       tooltip: {
         trigger: 'axis',
@@ -34,7 +37,11 @@
         bottom: '3%',
         containLabel: true,
       },
-
+      legend: {
+        data: ['告警数'],
+        left: 'center',
+        formatter: (name) => `${name} ${alarmTotal}`,
+      },
       xAxis: {
         type: 'time',
       },
@@ -56,6 +63,10 @@
   watch(
     () => props.alarmList,
     (newValue) => {
+      let alarmTotal = 0;
+      for (const item of props.alarmList) {
+        alarmTotal += Number(item[1]);
+      }
       setOptions({
         tooltip: {
           trigger: 'axis',
@@ -66,7 +77,11 @@
           bottom: '3%',
           containLabel: true,
         },
-
+        legend: {
+          data: ['告警数'],
+          left: 'center',
+          formatter: (name) => `${name} ${alarmTotal}`,
+        },
         xAxis: {
           type: 'time',
         },

 <template>
   <div>
-    <p class="center" v-if="dataPointList.length">消息量</p>
     <div ref="chartRef" :style="{ height, width }" v-show="dataPointList.length"></div>
     <div v-show="!dataPointList.length"><Empty /></div>
   </div>

@@ -6,6 +6,7 @@
     @cancel="handleCancel"
     @ok="handleOk"
     centered
+    :canFullscreen="false"
   >
     <BasicForm @register="registerForm" />
   </BasicModal>

@@ -38,6 +38,8 @@
   import { useModal } from '/@/components/Modal';
   import ManageDeviceTokenModal from '../modal/ManageDeviceTokenModal.vue';
   import { getDeviceToken } from '/@/api/device/deviceManager';
+  import wz from '/@/assets/images/wz.png';
+
   export default defineComponent({
     components: {
       Image,
@@ -62,7 +64,7 @@
         const BMap = (window as any).BMap;
         if (!wrapEl) return;
         const map = new BMap.Map(wrapEl);
-        let myIcon = new BMap.Icon('/src/assets/images/wz.png', new BMap.Size(20, 30));
+        let myIcon = new BMap.Icon(wz, new BMap.Size(20, 30));
 
         const point = new BMap.Point(Number(longitude), Number(latitude));
         var content = `我在 ${address}`;