diff --git a/.env b/.env index 21f69fa..5ad47bc 100644 --- a/.env +++ b/.env @@ -1,5 +1,5 @@ # 标题 -VITE_APP_TITLE=智慧生态管理系统 +VITE_APP_TITLE=智慧生态系统 # 项目本地运行端口号 VITE_PORT=9980 diff --git a/.eslintrc.js b/.eslintrc.js index b28255c..d354d46 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -7,6 +7,7 @@ module.exports = defineConfig({ node: true, es6: true }, + globals:{ "qq": true,}, parser: 'vue-eslint-parser', parserOptions: { parser: '@typescript-eslint/parser', diff --git a/index.html b/index.html index af49d1e..290cd5d 100644 --- a/index.html +++ b/index.html @@ -139,5 +139,9 @@ + + +
+ diff --git a/src/api/enterprises/index.ts b/src/api/enterprises/index.ts index b1001f7..2b9f5c5 100644 --- a/src/api/enterprises/index.ts +++ b/src/api/enterprises/index.ts @@ -9,12 +9,14 @@ export interface EnterprisesVO { region: string // 企业所属区域 enterprisesName: string // 企业名称 address: string // 企业地址 + enterprisesStatus//企业状态 contactName: string // 环保负责人姓名 environmentalContactPhone: string // 企业环保负责人联系电话 registrationNumber: string // 企业注册号 introduction: string // 企业图文介绍 establishmentDate: Date // 企业成立时间 gpsLocation: string // 企业经纬度 + signRadius:string//签到半径 managerDeptId: number // 管理部门 } @@ -26,7 +28,7 @@ export const EnterprisesApi = { }, // 查询企业详情 - getEnterprises: async (id: number) => { + getEnterprises: async (id: any) => { return await request.get({ url: `/system/enterprise/get?id=` + id }) }, @@ -34,6 +36,10 @@ export const EnterprisesApi = { createEnterprises: async (data: EnterprisesVO) => { return await request.post({ url: `/system/enterprise/create`, data }) }, + // PC新增企业 + pccreateEnterprises: async (data: EnterprisesVO) => { + return await request.post({ url: `/system/enterprise/pccreate`, data }) + }, // 修改企业 updateEnterprises: async (data: EnterprisesVO) => { diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts index 0a440f6..365db18 100644 --- a/src/api/system/user/index.ts +++ b/src/api/system/user/index.ts @@ -25,6 +25,12 @@ export const getUserPage = (params: PageParam) => { return request.get({ url: '/system/user/page', params }) } + +// 查询专管员用户管理列表 +export const getPcUserPage = (params: PageParam) => { + return request.get({ url: '/system/user/pcpage', params }) +} + // 查询所有用户列表 export const getAllUser = () => { return request.get({ url: '/system/user/all' }) diff --git a/src/layout/components/Logo/src/Logo.vue b/src/layout/components/Logo/src/Logo.vue index c26d34c..6493520 100644 --- a/src/layout/components/Logo/src/Logo.vue +++ b/src/layout/components/Logo/src/Logo.vue @@ -75,7 +75,7 @@ watch( src="@/assets/imgs/logo.png" />
- - - -
- - - -
-
- {{ t('workplace.welcome') }} {{ username }} {{ t('workplace.happyDay') }} -
-
- {{ t('workplace.toady') }}，20℃ - 32℃！ -
-
-
- - -
-
-
{{ t('workplace.project') }}
- -
- -
-
{{ t('workplace.toDo') }}
- -
- -
-
{{ t('workplace.access') }}
- -
-
- - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- - - - - - -
- - {{ item.name }} -
-
{{ t(item.message) }}
-
- {{ item.personal }} - {{ formatTime(item.time, 'yyyy-MM-dd') }} -
- - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - {{ item.name }} - -
- - - - - - - -
-
- - - -
-
- - {{ item.type }} : {{ item.title }} - -
-
- {{ formatTime(item.date, 'yyyy-MM-dd') }} -
-
-
- -
- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/enterprises/index.vue b/src/views/enterprises/index.vue index 182b4e8..30d3793 100644 --- a/src/views/enterprises/index.vue +++ b/src/views/enterprises/index.vue @@ -79,11 +79,39 @@ /> + + + + + + + 搜索 重置 - - 新增 + + 新增 导出 @@ -96,7 +124,7 @@ - +