From 835e152d9289003980bbda0b207ea44bebcf4c09 Mon Sep 17 00:00:00 2001 From: wbc <942429426@qq.com> Date: Mon, 7 Jul 2025 17:22:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=BB=B4=E7=8A=B6=E6=80=81=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/views/ioManage/register/api.ts | 27 ++++ src/views/ioManage/register/data.ts | 53 ++++++++ src/views/ioManage/register/index.vue | 69 ++++++++++ src/views/onlineAnalysis/net/api.ts | 9 +- src/views/onlineAnalysis/net/data.ts | 9 +- src/views/onlineAnalysis/zero/api.ts | 4 +- src/views/situation/index.vue | 135 +++++++++++++++++++ src/views/station/info/detailDrawer.vue | 6 +- src/views/stationCheck/particulate/index.vue | 7 +- 10 files changed, 303 insertions(+), 17 deletions(-) create mode 100644 src/views/ioManage/register/api.ts create mode 100644 src/views/ioManage/register/data.ts create mode 100644 src/views/ioManage/register/index.vue create mode 100644 src/views/situation/index.vue diff --git a/package.json b/package.json index b9b3a04..f80a45f 100644 --- a/package.json +++ b/package.json @@ -68,6 +68,7 @@ } }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@ant-design/icons-vue": "7.0.1", "@iconify/iconify": "3.1.1", "@logicflow/core": "1.2.26", diff --git a/src/views/ioManage/register/api.ts b/src/views/ioManage/register/api.ts new file mode 100644 index 0000000..bc965f3 --- /dev/null +++ b/src/views/ioManage/register/api.ts @@ -0,0 +1,27 @@ +import { ID, IDS } from '@/api/base'; +import { defHttp } from '@/utils/http/axios'; + +enum Api { + root = '/air/webSiteNetDataAnalysis', + list = '/air/webSiteNetDataAnalysis/list', +} + +export function list(params: any) { + return defHttp.get({ url: Api.list, params }); +} + +export function getInfo(id: ID) { + return defHttp.get({ url: `${Api.root}/${id}` }); +} + +export function add(data: any) { + return defHttp.post({ url: Api.root, data }); +} + +export function update(data: any) { + return defHttp.put({ url: Api.root, data }); +} + +export function removeByIds(ids: IDS) { + return defHttp.deleteWithMsg({ url: `${Api.root}/${ids.join(',')}` }); +} diff --git a/src/views/ioManage/register/data.ts b/src/views/ioManage/register/data.ts new file mode 100644 index 0000000..ca528b8 --- /dev/null +++ b/src/views/ioManage/register/data.ts @@ -0,0 +1,53 @@ +import { BasicColumn } from '@/components/Table'; +import { FormSchema } from '@/components/Form'; + +export const formSchemas: FormSchema[] = [ + { + field: 'area', + label: '所在区域', + component: 'Select', + componentProps: { + options: [], + }, + }, + { + field: '[startDate, endDate]', + label: '签到时间', + component: 'RangePicker', + componentProps: { + format: 'YYYY-MM-DD', + valueFormat: 'YYYY-MM-DD', + }, + }, +]; + +export const columns: BasicColumn[] = [ + { + title: '站点名称', + dataIndex: 'station', + }, + { + title: '所属区域', + dataIndex: 'area', + }, + { + title: '人员性质', + dataIndex: 'attribute', + }, + { + title: '人员姓名', + dataIndex: 'person', + }, + { + title: '所属公司', + dataIndex: 'company', + }, + { + title: '签到时间', + dataIndex: 'registerTime', + }, + { + title: '签到类型', + dataIndex: 'registerType', + }, +]; diff --git a/src/views/ioManage/register/index.vue b/src/views/ioManage/register/index.vue new file mode 100644 index 0000000..2a5fceb --- /dev/null +++ b/src/views/ioManage/register/index.vue @@ -0,0 +1,69 @@ + + + + + diff --git a/src/views/onlineAnalysis/net/api.ts b/src/views/onlineAnalysis/net/api.ts index c3fbffd..bc965f3 100644 --- a/src/views/onlineAnalysis/net/api.ts +++ b/src/views/onlineAnalysis/net/api.ts @@ -2,9 +2,8 @@ import { ID, IDS } from '@/api/base'; import { defHttp } from '@/utils/http/axios'; enum Api { - root = '/air/deviceInfo', - list = '/air/deviceInfo/list', - getStationList = '/air/deviceInfo/getStationList', + root = '/air/webSiteNetDataAnalysis', + list = '/air/webSiteNetDataAnalysis/list', } export function list(params: any) { @@ -26,7 +25,3 @@ export function update(data: any) { export function removeByIds(ids: IDS) { return defHttp.deleteWithMsg({ url: `${Api.root}/${ids.join(',')}` }); } - -export function getStationList() { - return defHttp.get({ url: Api.getStationList }); -} \ No newline at end of file diff --git a/src/views/onlineAnalysis/net/data.ts b/src/views/onlineAnalysis/net/data.ts index b5f7621..baf02ac 100644 --- a/src/views/onlineAnalysis/net/data.ts +++ b/src/views/onlineAnalysis/net/data.ts @@ -41,6 +41,10 @@ export const columns: BasicColumn[] = [ title: '运维单位', dataIndex: 'ioCompany', }, + { + title: '最新数据时间', + dataIndex: 'lastTimeS', + }, { title: '本月应收数据', dataIndex: 'planIncome', @@ -53,11 +57,10 @@ export const columns: BasicColumn[] = [ title: '数据完整率', dataIndex: 'completionRate', customRender({ record }) { - if(record.actualIncome){ - return record.actualIncome/record.planIncome; + if (record.actualIncome) { + return record.actualIncome / record.planIncome; } return null; - }, }, { diff --git a/src/views/onlineAnalysis/zero/api.ts b/src/views/onlineAnalysis/zero/api.ts index 8cc6196..faf11b5 100644 --- a/src/views/onlineAnalysis/zero/api.ts +++ b/src/views/onlineAnalysis/zero/api.ts @@ -2,8 +2,8 @@ import { ID, IDS } from '@/api/base'; import { defHttp } from '@/utils/http/axios'; enum Api { - root = '/air/partsInfo', - list = '/air/partsInfo/list', + root = '/air/zeroAdjustmentAnalysis', + list = '/air/zeroAdjustmentAnalysis/list', } export function list(params: any) { diff --git a/src/views/situation/index.vue b/src/views/situation/index.vue new file mode 100644 index 0000000..e84225f --- /dev/null +++ b/src/views/situation/index.vue @@ -0,0 +1,135 @@ + + + + diff --git a/src/views/station/info/detailDrawer.vue b/src/views/station/info/detailDrawer.vue index 974f11e..5e46a99 100644 --- a/src/views/station/info/detailDrawer.vue +++ b/src/views/station/info/detailDrawer.vue @@ -16,7 +16,7 @@ -
站点地址：{{ detail.station }}
+
站点地址：{{ detail.address }}
 @@ -63,13 +63,13 @@ //抽屉详情 let detail = reactive({ area: '', - station: '', + address: '', longitude: '', latitude: '', ioCompany: '', ioPerson: '', monitorCompany: '', - status: null, + status: '', }); // 打开抽屉的方法 diff --git a/src/views/stationCheck/particulate/index.vue b/src/views/stationCheck/particulate/index.vue index 9a965ea..d9a1ddf 100644 --- a/src/views/stationCheck/particulate/index.vue +++ b/src/views/stationCheck/particulate/index.vue @@ -6,8 +6,11 @@