diff --git a/src/views/checkManage/order/addModal.vue b/src/views/checkManage/order/addModal.vue index bacc320..76b3a9e 100644 --- a/src/views/checkManage/order/addModal.vue +++ b/src/views/checkManage/order/addModal.vue @@ -3,15 +3,15 @@ - - + + - - + + @@ -22,21 +22,30 @@ + + diff --git a/src/views/onlineAnalysis/arguments/api.ts b/src/views/onlineAnalysis/arguments/api.ts new file mode 100644 index 0000000..8cc6196 --- /dev/null +++ b/src/views/onlineAnalysis/arguments/api.ts @@ -0,0 +1,28 @@ +import { ID, IDS } from '@/api/base'; +import { defHttp } from '@/utils/http/axios'; + +enum Api { + root = '/air/partsInfo', + list = '/air/partsInfo/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/onlineAnalysis/arguments/data.ts b/src/views/onlineAnalysis/arguments/data.ts new file mode 100644 index 0000000..826e573 --- /dev/null +++ b/src/views/onlineAnalysis/arguments/data.ts @@ -0,0 +1,39 @@ +import { BasicColumn } from '@/components/Table'; +import { FormSchema } from '@/components/Form'; + +export const formSchemas: FormSchema[] = []; + +export const columns: BasicColumn[] = [ + { + title: '站点', + dataIndex: 'station', + }, + { + title: '监测项目', + dataIndex: 'monitorProject', + }, + { + title: '参数名称', + dataIndex: 'arguments', + }, + { + title: '发现时间', + dataIndex: 'foundDate', + }, + { + title: '监理人员', + dataIndex: 'monitorPerson', + }, + { + title: '监理单位', + dataIndex: 'monitorCompany', + }, + { + title: '运维单位', + dataIndex: 'ioCompany', + }, + { + title: '备注', + dataIndex: 'remark', + }, +]; diff --git a/src/views/onlineAnalysis/arguments/index.vue b/src/views/onlineAnalysis/arguments/index.vue new file mode 100644 index 0000000..3013b12 --- /dev/null +++ b/src/views/onlineAnalysis/arguments/index.vue @@ -0,0 +1,53 @@ + + + + + diff --git a/src/views/onlineAnalysis/io/addModal.vue b/src/views/onlineAnalysis/io/addModal.vue new file mode 100644 index 0000000..ec1837f --- /dev/null +++ b/src/views/onlineAnalysis/io/addModal.vue @@ -0,0 +1,218 @@ + + + + + diff --git a/src/views/onlineAnalysis/io/api.ts b/src/views/onlineAnalysis/io/api.ts new file mode 100644 index 0000000..8cc6196 --- /dev/null +++ b/src/views/onlineAnalysis/io/api.ts @@ -0,0 +1,28 @@ +import { ID, IDS } from '@/api/base'; +import { defHttp } from '@/utils/http/axios'; + +enum Api { + root = '/air/partsInfo', + list = '/air/partsInfo/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/onlineAnalysis/io/data.ts b/src/views/onlineAnalysis/io/data.ts new file mode 100644 index 0000000..d53bd88 --- /dev/null +++ b/src/views/onlineAnalysis/io/data.ts @@ -0,0 +1,52 @@ +import { BasicColumn } from '@/components/Table'; +import { FormSchema } from '@/components/Form'; + +export const formSchemas: FormSchema[] = []; + +export const columns: BasicColumn[] = [ + { + title: '站点', + dataIndex: 'station', + }, + { + title: '监测项目', + dataIndex: 'monitorProject', + }, + { + title: '故障开始时间', + dataIndex: 'faultStartDate', + }, + { + title: '故障结束时间', + dataIndex: 'faulteEndDate', + }, + { + title: '运维响应时间', + dataIndex: 'ioResponseDate', + }, + { + title: '响应时间跨度', + dataIndex: 'responseDuration', + }, + + { + title: '故障时间跨度', + dataIndex: 'faultDuration', + }, + { + title: '监理人员', + dataIndex: 'monitorPerson', + }, + { + title: '监理单位', + dataIndex: 'monitorCompany', + }, + { + title: '运维单位', + dataIndex: 'ioCompany', + }, + { + title: '备注', + dataIndex: 'remark', + }, +]; diff --git a/src/views/onlineAnalysis/io/index.vue b/src/views/onlineAnalysis/io/index.vue new file mode 100644 index 0000000..97426ef --- /dev/null +++ b/src/views/onlineAnalysis/io/index.vue @@ -0,0 +1,53 @@ + + + + + diff --git a/src/views/onlineAnalysis/net/api.ts b/src/views/onlineAnalysis/net/api.ts new file mode 100644 index 0000000..c3fbffd --- /dev/null +++ b/src/views/onlineAnalysis/net/api.ts @@ -0,0 +1,32 @@ +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', +} + +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(',')}` }); +} + +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 new file mode 100644 index 0000000..b5f7621 --- /dev/null +++ b/src/views/onlineAnalysis/net/data.ts @@ -0,0 +1,67 @@ +import { BasicColumn } from '@/components/Table'; +import { FormSchema } from '@/components/Form'; + +export const formSchemas: FormSchema[] = [ + { + field: 'area', + label: '所在区域', + component: 'Select', + componentProps: { + options: [], + }, + }, + { + field: 'monitorCompany', + label: '监理公司', + component: 'Select', + componentProps: { + options: [ + { + value: '宁波国研信息科技有限公司', + }, + ], + }, + }, +]; + +export const columns: BasicColumn[] = [ + { + title: '站点', + dataIndex: 'station', + }, + { + title: '所属区域', + dataIndex: 'area', + }, + { + title: '状态', + dataIndex: 'status', + }, + { + title: '运维单位', + dataIndex: 'ioCompany', + }, + { + title: '本月应收数据', + dataIndex: 'planIncome', + }, + { + title: '本月实收数据', + dataIndex: 'actualIncome', + }, + { + title: '数据完整率', + dataIndex: 'completionRate', + customRender({ record }) { + if(record.actualIncome){ + return record.actualIncome/record.planIncome; + } + return null; + + }, + }, + { + title: '监理单位', + dataIndex: 'monitorCompany', + }, +]; diff --git a/src/views/onlineAnalysis/net/index.vue b/src/views/onlineAnalysis/net/index.vue new file mode 100644 index 0000000..9a75c19 --- /dev/null +++ b/src/views/onlineAnalysis/net/index.vue @@ -0,0 +1,69 @@ + + + + + diff --git a/src/views/onlineAnalysis/zero/addModal.vue b/src/views/onlineAnalysis/zero/addModal.vue new file mode 100644 index 0000000..0e4511b --- /dev/null +++ b/src/views/onlineAnalysis/zero/addModal.vue @@ -0,0 +1,234 @@ + + + + + diff --git a/src/views/onlineAnalysis/zero/api.ts b/src/views/onlineAnalysis/zero/api.ts new file mode 100644 index 0000000..8cc6196 --- /dev/null +++ b/src/views/onlineAnalysis/zero/api.ts @@ -0,0 +1,28 @@ +import { ID, IDS } from '@/api/base'; +import { defHttp } from '@/utils/http/axios'; + +enum Api { + root = '/air/partsInfo', + list = '/air/partsInfo/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/onlineAnalysis/zero/data.ts b/src/views/onlineAnalysis/zero/data.ts new file mode 100644 index 0000000..31baf3f --- /dev/null +++ b/src/views/onlineAnalysis/zero/data.ts @@ -0,0 +1,59 @@ +import { BasicColumn } from '@/components/Table'; +import { FormSchema } from '@/components/Form'; + +export const formSchemas: FormSchema[] = []; + +export const columns: BasicColumn[] = [ + { + title: '站点', + dataIndex: 'station', + }, + { + title: '所属区域', + dataIndex: 'area', + }, + { + title: '监测项目', + dataIndex: 'monitorProject', + }, + { + title: '上次校零校准时间', + dataIndex: 'toZeroDate', + }, + { + title: '时间跨度', + dataIndex: 'duration', + }, + { + title: '核查开始日期', + dataIndex: 'checkStartDate', + }, + { + title: '核查结束日期', + dataIndex: 'checkEndDate', + }, + { + title: '实际校零校准次数', + dataIndex: 'actualTimes', + }, + { + title: '应校零校准次数', + dataIndex: 'planTimes', + }, + { + title: '监理人员', + dataIndex: 'monitorPerson', + }, + { + title: '监理单位', + dataIndex: 'monitorCompany', + }, + { + title: '环保知情人', + dataIndex: 'insider', + }, + { + title: '备注', + dataIndex: 'remark', + }, +]; diff --git a/src/views/onlineAnalysis/zero/index.vue b/src/views/onlineAnalysis/zero/index.vue new file mode 100644 index 0000000..569ef7e --- /dev/null +++ b/src/views/onlineAnalysis/zero/index.vue @@ -0,0 +1,53 @@ + + + + + diff --git a/src/views/station/device/data.ts b/src/views/station/device/data.ts index 2ee6c93..dc96498 100644 --- a/src/views/station/device/data.ts +++ b/src/views/station/device/data.ts @@ -19,7 +19,7 @@ export const formSchemas: FormSchema[] = [ }, }, { - field: 'superviseCompany', + field: 'monitorCompany', label: '监理公司', component: 'Select', componentProps: { diff --git a/src/views/station/info/data.ts b/src/views/station/info/data.ts index 6287f1f..dfbd712 100644 --- a/src/views/station/info/data.ts +++ b/src/views/station/info/data.ts @@ -61,7 +61,7 @@ export const columns: BasicColumn[] = [ }, { title: '监理公司', - dataIndex: 'superviseCompany', + dataIndex: 'monitorCompany', }, { title: '状态', diff --git a/src/views/station/info/detailDrawer.vue b/src/views/station/info/detailDrawer.vue index f550ca3..974f11e 100644 --- a/src/views/station/info/detailDrawer.vue +++ b/src/views/station/info/detailDrawer.vue @@ -42,7 +42,7 @@ -
监理公司:{{ detail.superviseCompany }}
+
监理公司:{{ detail.monitorCompany }}
@@ -68,7 +68,7 @@ latitude: '', ioCompany: '', ioPerson: '', - superviseCompany: '', + monitorCompany: '', status: null, }); diff --git a/src/views/stationCheck/checkOrder/data.ts b/src/views/stationCheck/checkOrder/data.ts index cc7068c..28f7b2a 100644 --- a/src/views/stationCheck/checkOrder/data.ts +++ b/src/views/stationCheck/checkOrder/data.ts @@ -40,7 +40,7 @@ export const columns: BasicColumn[] = [ }, { title: '监理类型', - dataIndex: 'superviseType', + dataIndex: 'monitorType', }, { title: '核查人员', diff --git a/src/views/stationCheck/particulate/index.vue b/src/views/stationCheck/particulate/index.vue index 1fe5301..9a965ea 100644 --- a/src/views/stationCheck/particulate/index.vue +++ b/src/views/stationCheck/particulate/index.vue @@ -4,6 +4,12 @@ + diff --git a/src/views/stationCheck/standby/addModal.vue b/src/views/stationCheck/standby/addModal.vue index 20153b8..0585926 100644 --- a/src/views/stationCheck/standby/addModal.vue +++ b/src/views/stationCheck/standby/addModal.vue @@ -41,7 +41,7 @@ @@ -52,7 +52,7 @@ diff --git a/src/views/stationCheck/standby/api.ts b/src/views/stationCheck/standby/api.ts index 45da049..8cc6196 100644 --- a/src/views/stationCheck/standby/api.ts +++ b/src/views/stationCheck/standby/api.ts @@ -3,7 +3,7 @@ import { defHttp } from '@/utils/http/axios'; enum Api { root = '/air/partsInfo', - list = '/air/partsInfo/lis', + list = '/air/partsInfo/list', } export function list(params: any) {