diff --git a/src/components/registerGlobComp.ts b/src/components/registerGlobComp.ts index 5a8e591..1c800b6 100644 --- a/src/components/registerGlobComp.ts +++ b/src/components/registerGlobComp.ts @@ -1,8 +1,7 @@ import type { App } from 'vue'; -import { Button } from './Button'; -import { Input, Layout } from 'ant-design-vue'; +import Antd from 'ant-design-vue'; import VXETable from 'vxe-table'; export function registerGlobComp(app: App) { - app.use(Input).use(Button).use(Layout).use(VXETable); + app.use(Antd).use(VXETable); } diff --git a/src/main.ts b/src/main.ts index 1c4c808..cf7db7c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -4,7 +4,6 @@ import '@/components/VxeTable/src/css/index.scss'; import 'ant-design-vue/dist/reset.css'; // Register icon sprite import 'virtual:svg-icons-register'; - import { createApp } from 'vue'; import { registerGlobComp } from '@/components/registerGlobComp'; @@ -20,7 +19,6 @@ import App from './App.vue'; async function bootstrap() { const app = createApp(App); - // Configure store // 配置 store setupStore(app); diff --git a/src/views/achievement/achievementOverall/index.vue b/src/views/achievement/achievementOverall/index.vue new file mode 100644 index 0000000..644f55f --- /dev/null +++ b/src/views/achievement/achievementOverall/index.vue @@ -0,0 +1,992 @@ + + + + diff --git a/src/views/achievement/achievementType/index.vue b/src/views/achievement/achievementType/index.vue new file mode 100644 index 0000000..589b644 --- /dev/null +++ b/src/views/achievement/achievementType/index.vue @@ -0,0 +1,38 @@ + + + + diff --git a/src/views/achievement/achievementType/secondTab.vue b/src/views/achievement/achievementType/secondTab.vue new file mode 100644 index 0000000..616a385 --- /dev/null +++ b/src/views/achievement/achievementType/secondTab.vue @@ -0,0 +1,172 @@ + + + + diff --git a/src/views/achievement/goalDistrict/index.vue b/src/views/achievement/goalDistrict/index.vue new file mode 100644 index 0000000..4918472 --- /dev/null +++ b/src/views/achievement/goalDistrict/index.vue @@ -0,0 +1,190 @@ + + + + diff --git a/src/views/achievement/goalTimes/index.vue b/src/views/achievement/goalTimes/index.vue new file mode 100644 index 0000000..b481717 --- /dev/null +++ b/src/views/achievement/goalTimes/index.vue @@ -0,0 +1,166 @@ + + + + diff --git a/src/views/pollution/manage/api.ts b/src/views/pollution/manage/api.ts new file mode 100644 index 0000000..90a5083 --- /dev/null +++ b/src/views/pollution/manage/api.ts @@ -0,0 +1,58 @@ +import { ID, IDS, PageQuery, commonExport } from '@/api/base'; +import { defHttp } from '@/utils/http/axios'; +import { Dayjs } from 'dayjs'; + +enum Api { + root = '/workflow/leave', + list = '/workflow/leave/list', + export = '/workflow/leave/export', +} + +export interface Leave { + id: string; + leaveType: string; + startDate: string; + endDate: string; + leaveDays: number; + remark: string; + processInstanceVo?: any; + dateTime?: [string, string] | [Dayjs, Dayjs]; +} + +export interface Resp { + createDept: number; + createBy: number; + createTime: string; + updateBy: number; + updateTime: string; + id: string; + leaveType: string; + startDate: string; + endDate: string; + leaveDays: number; + remark?: any; +} + +export function list(params?: PageQuery) { + return defHttp.get({ url: Api.list, params }); +} + +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/pollution/manage/index.vue b/src/views/pollution/manage/index.vue new file mode 100644 index 0000000..644f55f --- /dev/null +++ b/src/views/pollution/manage/index.vue @@ -0,0 +1,992 @@ + + + + diff --git a/src/views/pollution/manage/manage.data.ts b/src/views/pollution/manage/manage.data.ts new file mode 100644 index 0000000..8247d7d --- /dev/null +++ b/src/views/pollution/manage/manage.data.ts @@ -0,0 +1,32 @@ +import { BasicColumn } from '@/components/Table'; +import { FormSchema } from '@/components/Form'; + +export const formSchemas: FormSchema[] = [ + { + label: '项目名称', + field: 'projectName', + component: 'Input', + componentProps: { + placeholder: '输入项目名称', + }, + }, +]; + +export const columns: BasicColumn[] = [ + { + title: '项目时期', + dataIndex: 'projectDate', + }, + { + title: '项目名称', + dataIndex: 'projectName', + }, + { + title: '规划投资(万元)', + dataIndex: 'planInvest', + }, + { + title: '实际投资(万元)', + dataIndex: 'acualInvest', + }, +]; diff --git a/src/views/pollution/manage/table.vue b/src/views/pollution/manage/table.vue new file mode 100644 index 0000000..10ed0d8 --- /dev/null +++ b/src/views/pollution/manage/table.vue @@ -0,0 +1,89 @@ + + + + + diff --git a/vite.config.ts b/vite.config.ts index 272c777..f6fbce9 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -17,7 +17,7 @@ export default defineApplicationConfig({ server: { proxy: { '/basic-api': { - target: 'http://localhost:8080', + target: 'http://10.1.21.250:8083', changeOrigin: true, ws: true, rewrite: (path) => path.replace(new RegExp(`^/basic-api`), ''),