diff --git a/.env.development b/.env.development index 3a2a9f5..002785a 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统11 VITE_APP_ENV = 'development' # 开发环境 -VITE_APP_BASE_API = '/dev-api' +VITE_APP_BASE_API = 'http://192.168.2.23:8001' # 应用访问路径 例如使用前缀 /admin/ VITE_APP_CONTEXT_PATH = '/' diff --git a/src/api/customerManagement/index.ts b/src/api/customerManagement/index.ts new file mode 100644 index 0000000..d2f390b --- /dev/null +++ b/src/api/customerManagement/index.ts @@ -0,0 +1,42 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { customerManagementForm, customerManagementQuery, customerManagementVO, customerManagementInfoVO } from './types'; +/** + * 查询用户客户列表 + * @param query + */ +export const customerUser = (query: customerManagementQuery): AxiosPromise => { + return request({ + url: '/api/customers/customer', + method: 'get', + params: query + }); +}; +// *********新增客户************* +export const addCustomer = (data: any): AxiosPromise => { + return request({ + url: '/api/customers/addCustomer', + method: 'post', + data: data + }); +}; + +// 修改 +export const updateCustomer = (data: any): AxiosPromise => { + return request({ + url: '/api/customers/updateCustomer', + method: 'put', + data + }) +} +// 删除 +export const deleteCustomer = (ids: any): AxiosPromise => { + return request({ + url: '/api/customers/deleteCustomer', + method: 'delete', + data: ids + }) +} + +export default { customerUser, addCustomer, updateCustomer, deleteCustomer } + diff --git a/src/api/customerManagement/types.ts b/src/api/customerManagement/types.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/api/equipmentManagement/device/index.ts b/src/api/equipmentManagement/device/index.ts new file mode 100644 index 0000000..672910d --- /dev/null +++ b/src/api/equipmentManagement/device/index.ts @@ -0,0 +1,49 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { deviceForm, deviceQuery, deviceVO } from './types'; +/** + * 查询设备列表 + * @param query + */ +export const deviceList = (query: deviceQuery): AxiosPromise => { + return request({ + url: '/api/device', + method: 'get', + params: query + }); +}; +// *********新增设备列表************* +export const addDevice = (data: any): AxiosPromise => { + return request({ + url: '/api/device/add', + method: 'post', + data: data + }); +}; + +// 修改 +export const updateDevice = (data: any): AxiosPromise => { + return request({ + url: '/api/device/update', + method: 'put', + data + }) +} +// 删除 +export const deleteDevice = (ids: any): AxiosPromise => { + return request({ + url: '/api/device/delete', + method: 'delete', + data: ids + }) +} +// 设备下拉框 +export const deviceTypeAll=()=> { + return request({ + url: '/api/deviceType/all', + method: 'get', + + }) +} +export default { deviceList, addDevice, updateDevice, deleteDevice,deviceTypeAll } + diff --git a/src/api/equipmentManagement/device/types.ts b/src/api/equipmentManagement/device/types.ts new file mode 100644 index 0000000..8eac5f5 --- /dev/null +++ b/src/api/equipmentManagement/device/types.ts @@ -0,0 +1,8 @@ +export interface deviceQuery extends PageQuery { + deviceName: string; + deviceMac: string; + deviceImei: string; + deviceType: string; + deviceStatus: string; + +} \ No newline at end of file diff --git a/src/api/equipmentManagement/deviceType/index.ts b/src/api/equipmentManagement/deviceType/index.ts new file mode 100644 index 0000000..67a798a --- /dev/null +++ b/src/api/equipmentManagement/deviceType/index.ts @@ -0,0 +1,42 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { deviceTypeForm, deviceTypeQuery, deviceTypeVO } from './types'; +/** + * 查询设备类型 + * @param query + */ +export const deviceType = (query: deviceTypeQuery): AxiosPromise => { + return request({ + url: '/api/deviceType', + method: 'get', + params: query + }); +}; +// *********新增设备类型************* +export const addDeviceType = (data: any): AxiosPromise => { + return request({ + url: '/api/deviceType/add', + method: 'post', + data: data + }); +}; + +// 修改 +export const updateDeviceType = (data: any): AxiosPromise => { + return request({ + url: '/api/deviceType/update', + method: 'put', + data + }) +} +// 删除 +export const deleteDeviceType = (ids: any): AxiosPromise => { + return request({ + url: '/api/deviceType/delete', + method: 'delete', + data: ids + }) +} + +export default { deviceType, addDeviceType, updateDeviceType, deleteDeviceType } + diff --git a/src/api/equipmentManagement/deviceType/types.ts b/src/api/equipmentManagement/deviceType/types.ts new file mode 100644 index 0000000..f121c29 --- /dev/null +++ b/src/api/equipmentManagement/deviceType/types.ts @@ -0,0 +1,4 @@ +export interface deviceTypeQuery extends PageQuery { + typeName: string; + +} \ No newline at end of file diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss index e38c703..46eebfb 100644 --- a/src/assets/styles/element-ui.scss +++ b/src/assets/styles/element-ui.scss @@ -134,7 +134,7 @@ /* 当 el-form 的 inline 属性为 true 时 */ /* 设置 label 的宽度默认为 68px */ .el-form--inline .el-form-item__label { - width: 68px; + // width: 68px; } /* 设置 el-select 的宽度默认为 240px */ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index efb1ae3..2d1a644 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -28,7 +28,7 @@ - + +
@@ -109,6 +109,8 @@ const newNotice = ref(0); const { proxy } = getCurrentInstance() as ComponentInternalInstance; const userId = ref(userStore.userId); + + const companyName = ref(undefined); const tenantList = ref([]); // 是否切换了租户 @@ -159,7 +161,7 @@ const toggleSideBar = () => { }; const logout = async () => { - await ElMessageBox.confirm('确定注销并退出系统吗？', '提示', { + await ElMessageBox.confirm('确定要退出系统吗？', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' diff --git a/src/views/customerManagement/index.vue b/src/views/customerManagement/index.vue new file mode 100644 index 0000000..264b0d2 --- /dev/null +++ b/src/views/customerManagement/index.vue @@ -0,0 +1,319 @@ + + + diff --git a/src/views/equipmentManagement/deviceType/index.vue b/src/views/equipmentManagement/deviceType/index.vue new file mode 100644 index 0000000..4ef64bb --- /dev/null +++ b/src/views/equipmentManagement/deviceType/index.vue @@ -0,0 +1,313 @@ + + + diff --git a/src/views/equipmentManagement/devices/index.vue b/src/views/equipmentManagement/devices/index.vue new file mode 100644 index 0000000..2d0aa84 --- /dev/null +++ b/src/views/equipmentManagement/devices/index.vue @@ -0,0 +1,440 @@ + + +