Merge branch 'ft' into 'main_dev'

fix: 修改Teambition上的问题

See merge request yunteng/thingskit-front!630

@@ -83,12 +83,11 @@
           chartsInstance[key!] = echarts.init(
           chartsInstance[key!] = echarts.init(
             document.getElementById(`chartPie${key}`) as HTMLElement
             document.getElementById(`chartPie${key}`) as HTMLElement
           );
           );
-          console.log('11', skinName.value);
           const option = {
           const option = {
             backgroundColor: skinName.value,
             backgroundColor: skinName.value,
             tooltip: {
             tooltip: {
               trigger: 'item',
               trigger: 'item',
-              formatter: `${legendKey}设备${((value! / total!) * 100).toFixed(2)}%`,
+              formatter: `${legendKey}设备${((!value ? 0 : value! / total!) * 100).toFixed(2)}%`,
             },
             },
             graphic: [
             graphic: [
               {
               {
@@ -113,7 +112,7 @@
                   normal: {
                   normal: {
                     show: true,
                     show: true,
                     position: 'outer',
                     position: 'outer',
-                    formatter: `${legendKey}${((value! / total!) * 100).toFixed(2)}%`,
+                    formatter: `${legendKey}${((!value ? 0 : value! / total!) * 100).toFixed(2)}%`,
                     borderWidth: 5,
                     borderWidth: 5,
                     borderRadius: 0,
                     borderRadius: 0,
                     padding: [90, -30],
                     padding: [90, -30],
@@ -124,9 +123,6 @@
             ],
             ],
           };
           };
           chartsInstance[key!].setOption(option);
           chartsInstance[key!].setOption(option);
-          // chartsInstance[key!].setOption({
-          //   backgroundColor: skinName,
-          // });
         }
         }
       });
       });
 
 

@@ -44,7 +44,7 @@
     },
     },
   });
   });
 
 
-  const [registerModal, { openModal }] = useModal();
+  const [registerModal, { openModal, closeModal }] = useModal();
 
 
   const handleViewDetail = (record: Record<'eventValue', Recordable>) => {
   const handleViewDetail = (record: Record<'eventValue', Recordable>) => {
     outputData.value = JSON.stringify(record.eventValue, null, 2);
     outputData.value = JSON.stringify(record.eventValue, null, 2);
@@ -61,7 +61,7 @@
       </span>
       </span>
     </template>
     </template>
   </BasicTable>
   </BasicTable>
-  <BasicModal title="输出参数" @register="registerModal">
+  <BasicModal title="输出参数" @register="registerModal" @ok="closeModal">
     <Input.TextArea v-model:value="outputData" :autosize="true" />
     <Input.TextArea v-model:value="outputData" :autosize="true" />
   </BasicModal>
   </BasicModal>
 </template>
 </template>