diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 213df9a..7222b8c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,7 +5,6 @@ settings: excludeLinksFromLockfile: false importers: - .: dependencies: '@ant-design/colors': @@ -290,7 +289,6 @@ importers: version: 1.8.22(typescript@5.2.2) packages: - '@aashutoshrathi/word-wrap@1.2.6': resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==} engines: {node: '>=0.10.0'} @@ -5565,7 +5563,6 @@ packages: resolution: {integrity: sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==} snapshots: - '@aashutoshrathi/word-wrap@1.2.6': {} '@ampproject/remapping@2.2.1': @@ -11558,4 +11555,4 @@ snapshots: zrender@5.6.1: dependencies: - tslib: 2.3.0 + tslib: 2.3.0 \ No newline at end of file diff --git a/src/api/system/unit/Company.ts b/src/api/system/config/Company.ts similarity index 95% rename from src/api/system/unit/Company.ts rename to src/api/system/config/Company.ts index 5ab9f7d..316b9c4 100644 --- a/src/api/system/unit/Company.ts +++ b/src/api/system/config/Company.ts @@ -2,15 +2,14 @@ import { defHttp } from '@/utils/http/axios' export interface CompanyVO { id?: number + num: number// 集团序号 name: string // 集团名称 short: string // 集团简称 - status: number // 状态 createTime: Date // 创建时间 } export interface CompanyPageReqVO { name?: string - status?: number } // 查询集团列表 diff --git a/src/views/exa/HistoryLine.vue b/src/views/exa/HistoryLine.vue index b028ba0..c0c850a 100644 --- a/src/views/exa/HistoryLine.vue +++ b/src/views/exa/HistoryLine.vue @@ -3,6 +3,7 @@ import type { Ref } from 'vue' import { onMounted, ref, watch } from 'vue' import type { YAXisOption } from 'echarts/types/dist/shared' import moment from 'moment' +import { Empty } from 'ant-design-vue' import { useECharts } from '@/hooks/web/useECharts' import { propTypes } from '@/utils/propTypes' @@ -85,7 +86,7 @@ watch( x: '2%', y: '5%', x2: '2%', - y2: '30%', + y2: '10%', containLabel: false, // width: {totalWidth} - x - x2, // height: {totalHeight} - y - y2, @@ -185,5 +186,9 @@ watch( diff --git a/src/views/exa/config/HistoryModal.vue b/src/views/exa/config/HistoryModal.vue index d9b71a4..69c9b2e 100644 --- a/src/views/exa/config/HistoryModal.vue +++ b/src/views/exa/config/HistoryModal.vue @@ -80,10 +80,10 @@ async function handleSubmitR() { diff --git a/src/views/exa/config/index.vue b/src/views/exa/config/index.vue index 792e131..582805b 100644 --- a/src/views/exa/config/index.vue +++ b/src/views/exa/config/index.vue @@ -1,5 +1,6 @@