diff --git a/src/api/common/index.ts b/src/api/common/index.ts new file mode 100644 index 0000000..da54042 --- /dev/null +++ b/src/api/common/index.ts @@ -0,0 +1,13 @@ +import { defHttp } from '@/utils/http/axios'; + +enum Api { + getHangzhouRegions = '/air/stationInfo/getHangzhouRegions', + getStationList = '/air/deviceInfo/getStationList', +} + +export function getStationList() { + return defHttp.get({ url: Api.getStationList }); +} +export function getHangzhouRegions() { + return defHttp.get({ url: Api.getHangzhouRegions }); +} \ No newline at end of file diff --git a/src/components/registerGlobComp.ts b/src/components/registerGlobComp.ts index 5a8e591..251b592 100644 --- a/src/components/registerGlobComp.ts +++ b/src/components/registerGlobComp.ts @@ -1,8 +1,9 @@ import type { App } from 'vue'; -import { Button } from './Button'; -import { Input, Layout } from 'ant-design-vue'; +// import { Button } from './Button'; +// import { Input, Layout } from 'ant-design-vue'; import VXETable from 'vxe-table'; +import Antd from 'ant-design-vue'; export function registerGlobComp(app: App) { - app.use(Input).use(Button).use(Layout).use(VXETable); + app.use(Antd).use(VXETable); } diff --git a/src/views/checkManage/order/addModal.vue b/src/views/checkManage/order/addModal.vue new file mode 100644 index 0000000..bacc320 --- /dev/null +++ b/src/views/checkManage/order/addModal.vue @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/checkManage/order/api.ts b/src/views/checkManage/order/api.ts new file mode 100644 index 0000000..5889322 --- /dev/null +++ b/src/views/checkManage/order/api.ts @@ -0,0 +1,28 @@ +import { ID, IDS } from '@/api/base'; +import { defHttp } from '@/utils/http/axios'; + +enum Api { + root = 'air/stationInfo', + list = 'air/stationInfo/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/checkManage/order/data.ts b/src/views/checkManage/order/data.ts new file mode 100644 index 0000000..c48ebe8 --- /dev/null +++ b/src/views/checkManage/order/data.ts @@ -0,0 +1,35 @@ +import { BasicColumn } from '@/components/Table'; +import { FormSchema } from '@/components/Form'; + +export const formSchemas: FormSchema[] = []; + +export const columns: BasicColumn[] = [ + { + title: '工单编号', + dataIndex: 'orderNum', + }, + { + title: '工作日期', + dataIndex: 'workDate', + }, + { + title: '子站名称', + dataIndex: 'station', + }, + { + title: '子站状态', + dataIndex: 'status', + }, + { + title: '所属区域', + dataIndex: 'area', + }, + { + title: '监理类型', + dataIndex: 'monitorType', + }, + { + title: '监理公司', + dataIndex: 'monitorCompany', + }, +]; diff --git a/src/views/checkManage/order/index.vue b/src/views/checkManage/order/index.vue new file mode 100644 index 0000000..971e1c5 --- /dev/null +++ b/src/views/checkManage/order/index.vue @@ -0,0 +1,53 @@ + + + + + 新增 + + + + + + + + + diff --git a/src/views/checkManage/plan/addModal.vue b/src/views/checkManage/plan/addModal.vue new file mode 100644 index 0000000..8d4c86c --- /dev/null +++ b/src/views/checkManage/plan/addModal.vue @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/checkManage/plan/api.ts b/src/views/checkManage/plan/api.ts new file mode 100644 index 0000000..88889c4 --- /dev/null +++ b/src/views/checkManage/plan/api.ts @@ -0,0 +1,28 @@ +import { ID, IDS } from '@/api/base'; +import { defHttp } from '@/utils/http/axios'; + +enum Api { + root = '/air/stationInfo', + list = '/air/stationInfo/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/checkManage/plan/data.ts b/src/views/checkManage/plan/data.ts new file mode 100644 index 0000000..0901d7a --- /dev/null +++ b/src/views/checkManage/plan/data.ts @@ -0,0 +1,43 @@ +import { BasicColumn } from '@/components/Table'; +import { FormSchema } from '@/components/Form'; + +export const formSchemas: FormSchema[] = []; + +export const columns: BasicColumn[] = [ + { + title: '计划号', + dataIndex: 'planNum', + }, + { + title: '计划日期', + dataIndex: 'planDate', + }, + { + title: '子站名称', + dataIndex: 'station', + }, + { + title: '子站状态', + dataIndex: 'status', + }, + { + title: '所属区域', + dataIndex: 'area', + }, + { + title: '运维公司', + dataIndex: 'ioCompany', + }, + { + title: '运维人员', + dataIndex: 'ioPerson', + }, + { + title: '监理类型', + dataIndex: 'monitorType', + }, + { + title: '监理公司', + dataIndex: 'monitorCompany', + }, +]; diff --git a/src/views/checkManage/plan/index.vue b/src/views/checkManage/plan/index.vue new file mode 100644 index 0000000..d794726 --- /dev/null +++ b/src/views/checkManage/plan/index.vue @@ -0,0 +1,53 @@ + + + + + 新增 + + + + + + + + + diff --git a/src/views/station/device/api.ts b/src/views/station/device/api.ts index 1b81e22..c3fbffd 100644 --- a/src/views/station/device/api.ts +++ b/src/views/station/device/api.ts @@ -1,22 +1,15 @@ -import { ID, IDS, commonExport } from '@/api/base'; +import { ID, IDS } from '@/api/base'; import { defHttp } from '@/utils/http/axios'; enum Api { - root = '/platform/matrialInfo', - list = '/platform/matrialInfo/list', - tree = '/platform/projectCategoryPoint/queryAll', - export = '/workflow/leave/export', + 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 tree() { - return defHttp.get({ url: Api.tree }); -} -export function exportExcel(data: any) { - return commonExport(Api.export, data); -} export function getInfo(id: ID) { return defHttp.get({ url: `${Api.root}/${id}` }); @@ -34,3 +27,6 @@ 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/station/device/data.ts b/src/views/station/device/data.ts index a19a6cd..2ee6c93 100644 --- a/src/views/station/device/data.ts +++ b/src/views/station/device/data.ts @@ -3,46 +3,68 @@ import { FormSchema } from '@/components/Form'; export const formSchemas: FormSchema[] = [ { - field: 'name', - label: '名称', - component: 'Input', + field: 'area', + label: '所在区域', + component: 'Select', componentProps: { - placeholder: '请输入', + options: [], + }, + }, + { + field: 'station', + label: '站点', + component: 'Select', + componentProps: { + options: [], + }, + }, + { + field: 'superviseCompany', + label: '监理公司', + component: 'Select', + componentProps: { + options: [{ + value:'宁波国研信息科技有限公司' + }], }, }, ]; export const columns: BasicColumn[] = [ { - title: '名称', - dataIndex: 'name', + title: '站点', + dataIndex: 'station', }, { - title: '规格', - dataIndex: 'standards', + title: '所属区域', + dataIndex: 'area', }, { - title: '单价(元)', - dataIndex: 'price', + title: '设备名称', + dataIndex: 'device', }, { - title: '数量', - dataIndex: 'amount', + title: '设备型号', + dataIndex: 'model', }, { - title: '单位', - dataIndex: 'unit', + title: '生产厂家', + dataIndex: 'manufacturer', }, { - title: '状态', - dataIndex: 'status', + title: '生产日期', + dataIndex: 'manufactureDate', }, { - title: '创建日期', - dataIndex: 'createTime', + title: '序列号', + dataIndex: 'number', }, { - title: '备注', - dataIndex: 'remark', + title: '检测物', + dataIndex: 'testSubstance', + }, + { + title: '状态', + dataIndex: 'status', }, ]; diff --git a/src/views/station/device/index.vue b/src/views/station/device/index.vue index ca26ac0..5e4ebd2 100644 --- a/src/views/station/device/index.vue +++ b/src/views/station/device/index.vue @@ -1,41 +1,39 @@ - - 故障上报 - - 派遣 - 详情 + + 删除 + - - - diff --git a/src/views/station/info/api.ts b/src/views/station/info/api.ts index 1b81e22..88889c4 100644 --- a/src/views/station/info/api.ts +++ b/src/views/station/info/api.ts @@ -1,22 +1,14 @@ -import { ID, IDS, commonExport } from '@/api/base'; +import { ID, IDS } from '@/api/base'; import { defHttp } from '@/utils/http/axios'; enum Api { - root = '/platform/matrialInfo', - list = '/platform/matrialInfo/list', - tree = '/platform/projectCategoryPoint/queryAll', - export = '/workflow/leave/export', + root = '/air/stationInfo', + list = '/air/stationInfo/list', } export function list(params: any) { return defHttp.get({ url: Api.list, params }); } -export function tree() { - return defHttp.get({ url: Api.tree }); -} -export function exportExcel(data: any) { - return commonExport(Api.export, data); -} export function getInfo(id: ID) { return defHttp.get({ url: `${Api.root}/${id}` }); diff --git a/src/views/station/info/detailDrawer.vue b/src/views/station/info/detailDrawer.vue index 3a000e5..f550ca3 100644 --- a/src/views/station/info/detailDrawer.vue +++ b/src/views/station/info/detailDrawer.vue @@ -76,10 +76,10 @@ const visible = ref(false); const showDrawer = async (id) => { visible.value = true; - // const data = await getInfo(id); - // for (let i in detail) { - // detail[i] = data[i]; - // } + const data = await getInfo(id); + for (let i in detail) { + detail[i] = data[i]; + } console.log(detail); }; diff --git a/src/views/station/info/index.vue b/src/views/station/info/index.vue index d0ad9ab..d24c277 100644 --- a/src/views/station/info/index.vue +++ b/src/views/station/info/index.vue @@ -4,7 +4,7 @@ - 基本信息 + 基本信息 @@ -24,9 +24,10 @@ import { formSchemas, columns } from './data'; import detailDrawer from './detailDrawer.vue'; import { ref } from 'vue'; - import { useRouter } from 'vue-router'; + import { useGo } from '@/hooks/web/usePage'; + import {getHangzhouRegions} from '@/api/common/index' defineOptions({ name: 'info' }); - + import { PageEnum } from '@/enums/pageEnum'; const [registerTable, { reload }] = useTable({ title: '子站信息管理', api: list, @@ -53,16 +54,21 @@ }, }); //新增编辑弹窗 - // //详情,跳转 const detailDrawerRef = ref(); const showDrawer = (id: any) => { detailDrawerRef.value.showDrawer(id); }; - const { push } = useRouter(); + const go = useGo(); const handleCheck = (id: any) => { - push({ name: 'device',query:{stationID:id} }); + go({ path: '/stationCheck/checkOrder' as PageEnum, query: { stationId:id } }); }; + //下拉框 + const getHangzhouOptions =async()=>{ + const res = await getHangzhouRegions() + formSchemas[0].componentProps.options = res + } + getHangzhouOptions() diff --git a/src/views/station/device/addModal.vue b/src/views/station/test/addModal.vue similarity index 100% rename from src/views/station/device/addModal.vue rename to src/views/station/test/addModal.vue diff --git a/src/views/station/test/api.ts b/src/views/station/test/api.ts new file mode 100644 index 0000000..1b81e22 --- /dev/null +++ b/src/views/station/test/api.ts @@ -0,0 +1,36 @@ +import { ID, IDS, commonExport } from '@/api/base'; +import { defHttp } from '@/utils/http/axios'; + +enum Api { + root = '/platform/matrialInfo', + list = '/platform/matrialInfo/list', + tree = '/platform/projectCategoryPoint/queryAll', + export = '/workflow/leave/export', +} + +export function list(params: any) { + return defHttp.get({ url: Api.list, params }); +} +export function tree() { + return defHttp.get({ url: Api.tree }); +} +export function exportExcel(data: any) { + return commonExport(Api.export, data); +} + +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/station/test/data.ts b/src/views/station/test/data.ts new file mode 100644 index 0000000..a19a6cd --- /dev/null +++ b/src/views/station/test/data.ts @@ -0,0 +1,48 @@ +import { BasicColumn } from '@/components/Table'; +import { FormSchema } from '@/components/Form'; + +export const formSchemas: FormSchema[] = [ + { + field: 'name', + label: '名称', + component: 'Input', + componentProps: { + placeholder: '请输入', + }, + }, +]; + +export const columns: BasicColumn[] = [ + { + title: '名称', + dataIndex: 'name', + }, + { + title: '规格', + dataIndex: 'standards', + }, + { + title: '单价(元)', + dataIndex: 'price', + }, + { + title: '数量', + dataIndex: 'amount', + }, + { + title: '单位', + dataIndex: 'unit', + }, + { + title: '状态', + dataIndex: 'status', + }, + { + title: '创建日期', + dataIndex: 'createTime', + }, + { + title: '备注', + dataIndex: 'remark', + }, +]; diff --git a/src/views/station/test/index.vue b/src/views/station/test/index.vue new file mode 100644 index 0000000..ca26ac0 --- /dev/null +++ b/src/views/station/test/index.vue @@ -0,0 +1,88 @@ + + + + + 故障上报 + + + + 派遣 + 详情 + + + + + + + + + + + + diff --git a/src/views/stationCheck/checkOrder/api.ts b/src/views/stationCheck/checkOrder/api.ts new file mode 100644 index 0000000..c116261 --- /dev/null +++ b/src/views/stationCheck/checkOrder/api.ts @@ -0,0 +1,28 @@ +import { ID, IDS } from '@/api/base'; +import { defHttp } from '@/utils/http/axios'; + +enum Api { + root = '/air/managementInfo', + list = '/air/managementInfo/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/stationCheck/checkOrder/data.ts b/src/views/stationCheck/checkOrder/data.ts new file mode 100644 index 0000000..cc7068c --- /dev/null +++ b/src/views/stationCheck/checkOrder/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: 'checkTime', + }, + { + title: '子站名称', + dataIndex: 'station', + }, + { + title: '所属区域', + dataIndex: 'area', + }, + { + title: '状态', + dataIndex: 'status', + }, + { + title: '监理类型', + dataIndex: 'superviseType', + }, + { + title: '核查人员', + dataIndex: 'checkPerson', + }, + { + title: '核查得分', + dataIndex: 'checkScore', + }, +]; diff --git a/src/views/stationCheck/checkOrder/detailDrawer.vue b/src/views/stationCheck/checkOrder/detailDrawer.vue new file mode 100644 index 0000000..3f60e2e --- /dev/null +++ b/src/views/stationCheck/checkOrder/detailDrawer.vue @@ -0,0 +1,103 @@ + + + + + + + 子站名称:{{ detail.station }} + + + 核查时间:{{ detail.checkTime }} + + + + + 运维公司:{{ detail.ioCompany }} + + + 核查人员:{{ detail.checkPerson }} + + + + + 所在区域:{{ detail.area }} + + + 核查得分:{{ detail.checkScore }} + + + + + + + + + diff --git a/src/views/stationCheck/checkOrder/index.vue b/src/views/stationCheck/checkOrder/index.vue new file mode 100644 index 0000000..9aec1bd --- /dev/null +++ b/src/views/stationCheck/checkOrder/index.vue @@ -0,0 +1,75 @@ + + + + + + 详情 + + + + 详情 + + + + + + + + + + diff --git a/src/views/stationCheck/particulate/addModal.vue b/src/views/stationCheck/particulate/addModal.vue new file mode 100644 index 0000000..fae263e --- /dev/null +++ b/src/views/stationCheck/particulate/addModal.vue @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/stationCheck/particulate/api.ts b/src/views/stationCheck/particulate/api.ts new file mode 100644 index 0000000..0c7b4de --- /dev/null +++ b/src/views/stationCheck/particulate/api.ts @@ -0,0 +1,28 @@ +import { ID, IDS } from '@/api/base'; +import { defHttp } from '@/utils/http/axios'; + +enum Api { + root = '/air/dataManagementInfo', + list = '/air/dataManagementInfo/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/stationCheck/particulate/data.ts b/src/views/stationCheck/particulate/data.ts new file mode 100644 index 0000000..e72d5c1 --- /dev/null +++ b/src/views/stationCheck/particulate/data.ts @@ -0,0 +1,47 @@ +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: 'ioCompany', + }, + { + title: '开始时间', + dataIndex: 'startDate', + }, + { + title: '结束时间', + dataIndex: 'endDate', + }, + { + title: '监测项目', + dataIndex: 'monitorProject', + }, + { + title: '自动监测(mg/m³)', + dataIndex: 'autoMonitor', + }, + { + title: '手动监测(mg/m³)', + dataIndex: 'handleMonitor', + }, + { + title: '相对误差', + dataIndex: 'difference', + }, + { + title: '结论', + dataIndex: 'result', + }, +]; diff --git a/src/views/stationCheck/particulate/index.vue b/src/views/stationCheck/particulate/index.vue new file mode 100644 index 0000000..1fe5301 --- /dev/null +++ b/src/views/stationCheck/particulate/index.vue @@ -0,0 +1,53 @@ + + + + + 新增 + + + + + + + + + diff --git a/src/views/stationCheck/standby/addModal.vue b/src/views/stationCheck/standby/addModal.vue new file mode 100644 index 0000000..20153b8 --- /dev/null +++ b/src/views/stationCheck/standby/addModal.vue @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/stationCheck/standby/api.ts b/src/views/stationCheck/standby/api.ts new file mode 100644 index 0000000..45da049 --- /dev/null +++ b/src/views/stationCheck/standby/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/lis', +} + +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/stationCheck/standby/data.ts b/src/views/stationCheck/standby/data.ts new file mode 100644 index 0000000..3f4ee74 --- /dev/null +++ b/src/views/stationCheck/standby/data.ts @@ -0,0 +1,35 @@ +import { BasicColumn } from '@/components/Table'; +import { FormSchema } from '@/components/Form'; + +export const formSchemas: FormSchema[] = []; + +export const columns: BasicColumn[] = [ + { + title: '品名', + dataIndex: 'name', + }, + { + title: '类型', + dataIndex: 'type', + }, + { + title: '型号', + dataIndex: 'model', + }, + { + title: '数量', + dataIndex: 'amount', + }, + { + title: '入库日期', + dataIndex: 'indate', + }, + { + title: '运维公司', + dataIndex: 'ioCompany', + }, + { + title: '监理公司', + dataIndex: 'monitorCompany', + }, +]; diff --git a/src/views/stationCheck/standby/index.vue b/src/views/stationCheck/standby/index.vue new file mode 100644 index 0000000..eece78f --- /dev/null +++ b/src/views/stationCheck/standby/index.vue @@ -0,0 +1,53 @@ + + + + + 新增 + + + + + + + + +