fix：修改报表配置

@@ -18,7 +18,6 @@ import { reportEditDetailPage } from '/@/api/report/reportManager';
 const heightNum = ref(800);
 const tableData: any = ref([]);
 const [registerTable] = useTable({
-  title: '执行设备及属性',
   columns: viewDeviceColumn,
   showIndexColumn: false,
   clickToRowSelect: false,

@@ -26,12 +26,14 @@
             icon: 'clarity:note-edit-line',
             auth: 'api:yt:report:update',
             onClick: handleCreateOrEdit.bind(null, record),
+            ifShow: record.status === 0,
           },
           {
             label: '删除',
             icon: 'ant-design:delete-outlined',
             auth: 'api:yt:report:delete',
             color: 'error',
+            ifShow: record.status === 0,
             popConfirm: {
               title: '是否确认删除',
               confirm: handleDeleteOrBatchDelete.bind(null, record),

+.wrapper {
+  margin: 60px;
+  display: grid;
+  justify-content: space-between;
+  grid-template-columns: repeat(2, 400px);
+  grid-gap: 40px;
+  grid-template-rows: 400px 400px;
+}
+
+.inner {
+  width: 400px;
+  height: 400px;
+}
+
+.item {
+  text-align: center;
+  font-size: 200%;
+  color: #fff;
+}

@@ -2,21 +2,25 @@
   <div>
     <BasicModal
       v-bind="$attrs"
-      width="55rem"
+      width="60rem"
       :height="heightNum"
       @register="register"
       title="报表趋势图"
-      @cancel="handleCancel"
       :showOkBtn="false"
     >
-      <div ref="chartRef" :style="{ height, width }"></div>
+      <div class="wrapper">
+        <div class="inner item" v-for="(item, index) in chartData" :key="index">
+          <p style="display: none">{{ item }}</p>
+          <div :id="`chart${index}`" :style="{ height, width }"></div>
+        </div>
+      </div>
     </BasicModal>
   </div>
 </template>
 <script setup lang="ts">
-  import { ref, PropType, Ref, nextTick } from 'vue';
+  import { ref, PropType, nextTick } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { useECharts } from '/@/hooks/web/useECharts';
+  import * as echarts from 'echarts';
 
   defineProps({
     width: {
@@ -25,67 +29,78 @@
     },
     height: {
       type: String as PropType<string>,
-      default: 'calc(100vh - 378px)',
+      default: '400px',
     },
   });
   defineEmits(['register']);
+
   const heightNum = ref(800);
-  const chartRef = ref<HTMLDivElement | null>(null);
-  const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>);
+  const chartData = ref([1, 2, 3, 4]);
   const [register] = useModalInner((data) => {
     console.log(data);
+    //TODO待服务端返回值
     nextTick(() => {
-      setOptions({
-        title: {
-          text: '报表趋势图',
-        },
-        tooltip: {
-          trigger: 'axis',
-        },
-        legend: {
-          data: ['CO', 'CO2'],
-        },
-        toolbox: {},
-        grid: {
-          left: '3%',
-          right: '4%',
-          bottom: '3%',
-          containLabel: true,
-        },
-        xAxis: {
-          type: 'category',
-          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
-          boundaryGap: false,
-        },
-        yAxis: {
-          type: 'value',
-          boundaryGap: false,
-        },
-        series: [
-          {
-            name: 'CO',
-            type: 'line',
-            stack: 'Total',
-            data: [150, 230, 224, 218, 135, 147, 260],
+      chartData.value.forEach((_, index) => {
+        let myChart = echarts.init(document.getElementById(`chart${index}`) as HTMLElement);
+        let myOption = {
+          title: {
+            text: '报表趋势图',
+            subtext: `图${index + 1}`,
+            left: 'left',
+          },
+          tooltip: {
+            trigger: 'axis',
+          },
+          legend: {
+            data: ['CO', 'CO2', 'Temp'],
+            top: '20px',
           },
-          {
-            name: 'CO2',
-            type: 'line',
-            stack: 'Total',
-            data: [15, 23, 22, 28, 15, 17, 20],
+          toolbox: {},
+          grid: {
+            left: '3%',
+            right: '4%',
+            bottom: '3%',
+            containLabel: true,
           },
-        ],
+          xAxis: {
+            type: 'category',
+            data: ['1', '2', '3', '4', '5', '6', '7'],
+            boundaryGap: false,
+          },
+          yAxis: {
+            type: 'value',
+            boundaryGap: false,
+          },
+          series: [
+            {
+              name: 'CO',
+              type: 'line',
+              stack: 'Total',
+              data: [150, 230, 224, 218, 135, 147, 260],
+            },
+            {
+              name: 'CO2',
+              type: 'line',
+              stack: 'Total',
+              data: [15, 23, 22, 28, 15, 17, 20],
+            },
+            {
+              name: 'Temp',
+              type: 'line',
+              stack: 'Total',
+              data: [15, 23, 22, 28, 15, 17, 20],
+            },
+          ],
+        };
+        myChart.setOption(myOption);
+        //自适应
+        window.addEventListener('resize', () => {
+          myChart.resize();
+        });
       });
     });
   });
-
-  const handleCancel = () => {};
 </script>
-<style>
-  .video-sty {
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
+<style lang="less" scoped>
+  @import url('./ReportPreviewModal.less');
 </style>

@@ -30,6 +30,14 @@ export const columns: BasicColumn[] = [
     },
   },
   {
+    title: '执行状态',
+    dataIndex: 'status',
+    width: 120,
+    format: (_text: string, record: Recordable) => {
+      return record.status === 1 ? '成功' : record.status === 0 ? '失败' : '进行中';
+    },
+  },
+  {
     title: '执行日期',
     dataIndex: 'executeTime',
     width: 180,
@@ -57,11 +65,11 @@ export const searchFormSchema: FormSchema[] = [
       options: [
         {
           label: '进行中',
-          value: 1,
+          value: 2,
         },
         {
           label: '成功',
-          value: 0,
+          value: 1,
         },
         {
           label: '失败',

@@ -3,7 +3,9 @@
     <BasicTable :clickToRowSelect="false" @register="registerTable" :searchInfo="searchInfo">
       <template #toolbar>
         <Authority value="api:yt:reportExport:export">
-          <a-button type="primary" @click="exportCharts"> 导出报表 </a-button>
+          <Popconfirm title="您确定要导出报表数据吗？" ok-text="确定" cancel-text="取消" @confirm="exportCharts()">
+            <a-button type="primary"> 导出报表 </a-button>
+          </Popconfirm>
         </Authority>
         <Authority value="api:yt:reportExport:delete">
           <Popconfirm title="您确定要批量删除数据" ok-text="确定" cancel-text="取消" @confirm="handleDeleteOrBatchDelete(null)">
@@ -14,17 +16,12 @@
       <template #action="{ record }">
         <TableAction :actions="[
           {
-            label: '查看',
+            label: '报表查看',
             icon: 'clarity:note-edit-line',
             auth: 'api:yt:reportExport:get',
             onClick: handleView.bind(null, record),
           },
           {
-            label: '导出报表',
-            icon: 'clarity:note-edit-line',
-            auth: 'api:yt:reportExport:export',
-          },
-          {
             label: '删除',
             icon: 'ant-design:delete-outlined',
             auth: 'api:yt:reportExport:delete',
@@ -51,15 +48,15 @@ import { Popconfirm } from 'ant-design-vue';
 import { useModal } from '/@/components/Modal';
 import ReportPreviewModal from './ReportPreviewModal.vue';
 import {
-  exportPage,
+  // exportPage,
   deleteExportManage
 } from '/@/api/export/exportManager';
 
 const searchInfo = reactive<Recordable>({});
 
-const [registerTable, { reload, setProps }] = useTable({
+const [registerTable, { reload, setProps, setTableData }] = useTable({
   title: '报表导出列表',
-  api: exportPage,
+  // api: exportPage,
   columns,
   showIndexColumn: false,
   clickToRowSelect: false,
@@ -92,6 +89,17 @@ const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatch
 
 nextTick(() => {
   setProps(selectionOptions);
+  setTableData([
+    {
+      reportConfigName: '1',
+      organizationName: '2',
+      dataCompare: 1,
+      executeWay: 1,
+      executeTime: 1,
+      status: 2
+    }
+  ])
+
 });
 
 const [registerModal, { openModal }] = useModal();