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/.env.dev b/.env.dev index dc7d250..ff47476 100644 --- a/.env.dev +++ b/.env.dev @@ -4,7 +4,7 @@ NODE_ENV=production VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn' +VITE_BASE_URL='http://localhost:48080' # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务 VITE_UPLOAD_TYPE=server @@ -31,7 +31,7 @@ VITE_OUT_DIR=dist VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn' # 验证码的开关 -VITE_APP_CAPTCHA_ENABLE=true +VITE_APP_CAPTCHA_ENABLE=false # GoView域名 VITE_GOVIEW_URL='http://127.0.0.1:3000' \ No newline at end of file diff --git a/.env.prod b/.env.prod index ff67210..35f39a1 100644 --- a/.env.prod +++ b/.env.prod @@ -28,7 +28,7 @@ VITE_BASE_PATH=/ VITE_OUT_DIR=dist-prod # 商城H5会员端域名 -VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn' +VITE_MALL_H5_DOMAIN='http://127.0.0.1:3000' # GoView域名 VITE_GOVIEW_URL='http://127.0.0.1:3000' \ No newline at end of file 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/login/index.ts b/src/api/login/index.ts index 10f67c5..a4feea9 100644 --- a/src/api/login/index.ts +++ b/src/api/login/index.ts @@ -7,6 +7,8 @@ export interface SmsCodeVO { scene: number } + + export interface SmsLoginVO { mobile: string code: string @@ -72,10 +74,19 @@ export const socialAuthRedirect = (type: number, redirectUri: string) => { } // 获取验证图片以及 token export const getCode = (data: any) => { - debugger return request.postOriginal({ url: 'system/captcha/get', data }) } +// 获取登陆图片 +export const getCodeWebPic = (data: any) => { + return request.post({ url: 'system/auth/web_code_login', data }) +} + +// 根据扫码生产的uuuid 进行登陆 +export const qrLoginCode = (data: any) => { + return request.post({ url: 'system/auth/social-qr-login-openid', data }) +} + // 滑动或者点选验证 export const reqCheck = (data: any) => { return request.postOriginal({ url: 'system/captcha/check', data }) diff --git a/src/api/system/maxkb/index.ts b/src/api/system/maxkb/index.ts new file mode 100644 index 0000000..a1b272f --- /dev/null +++ b/src/api/system/maxkb/index.ts @@ -0,0 +1,7 @@ +import request from '@/config/axios' + +// 推送maxkb知识库 +export const pushWeb = async (data:any) => { + return await request.post({ url: '/system/maxkb/pushWeb',data }) +} + 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/Login/Login.vue b/src/views/Login/Login.vue index b2ff380..d101085 100644 --- a/src/views/Login/Login.vue +++ b/src/views/Login/Login.vue @@ -51,8 +51,7 @@ > - - + diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue index 193f478..b08d1e9 100644 --- a/src/views/Login/components/LoginForm.vue +++ b/src/views/Login/components/LoginForm.vue @@ -92,13 +92,13 @@ - + - {{ t('login.otherLogin') }} + + diff --git a/src/views/Login/components/QrCodeForm.vue b/src/views/Login/components/QrCodeForm.vue index 2670d00..b1c6cd0 100644 --- a/src/views/Login/components/QrCodeForm.vue +++ b/src/views/Login/components/QrCodeForm.vue @@ -5,7 +5,10 @@ - + + + Converted Image + {{ t('login.qrcode') }} @@ -18,13 +21,90 @@ diff --git a/src/views/enterprises/components/SelectUser.vue b/src/views/enterprises/components/SelectUser.vue new file mode 100644 index 0000000..89c031e --- /dev/null +++ b/src/views/enterprises/components/SelectUser.vue @@ -0,0 +1,138 @@ + + + + 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 @@ - +