diff --git a/.env.development b/.env.development index cd182d8..2bd86fc 100644 --- a/.env.development +++ b/.env.development @@ -9,9 +9,9 @@ VITE_APP_ENV='development' # 开发环境 VITE_APP_BASE_API='/dev-api' # # 开发环境 接口代理地址 -#VITE_APP_PROXY_API='http://192.168.1.222:8080' +VITE_APP_PROXY_API='http://192.168.1.222:8080' # 开发环境 接口代理地址 -VITE_APP_PROXY_API='http://192.168.1.6:8080' +#VITE_APP_PROXY_API='http://192.168.1.6:8080' # 图片基础地址 VITE_IMG_URL='http://192.168.1.222:8080' diff --git a/src/api/system/InspectionRecord/type.ts b/src/api/system/InspectionRecord/type.ts index 08e98bc..d6de531 100644 --- a/src/api/system/InspectionRecord/type.ts +++ b/src/api/system/InspectionRecord/type.ts @@ -82,8 +82,8 @@ export interface RecordQuery extends PageQuery { */ taskName?: string; - taskTimeBegin?: ''; - taskTimeEnd?: ''; + taskTimeBegin?: string; + taskTimeEnd?: string; } export interface DetailsVo { diff --git a/src/api/system/SdbCashier/index.ts b/src/api/system/SdbCashier/index.ts index ca08c58..7fc356f 100644 --- a/src/api/system/SdbCashier/index.ts +++ b/src/api/system/SdbCashier/index.ts @@ -84,9 +84,11 @@ export const billPrint = (data: { 'detailsIds': string[]; 'residentId': string } export const getAllAccount = ( data = {} ): AxiosPromise<{ - /** 总金额 */ + /** 原始金额之和（应收+优惠） */ + originalAmount: string; + /** 总 应收金额 */ 'receivableAmount': string; - /** 总实收金额 */ + /** 总已收金额 */ 'receivedAmount': string; /** 总优惠金额 */ 'discountAmount': string; diff --git a/src/api/system/SdbElectricityDevice/index.ts b/src/api/system/SdbElectricityDevice/index.ts index 5fd84b6..38c1225 100644 --- a/src/api/system/SdbElectricityDevice/index.ts +++ b/src/api/system/SdbElectricityDevice/index.ts @@ -96,3 +96,63 @@ export const ElectricityDeviceUnbind = (deviceCode: string) => { method: 'PUT' }); }; +/** + * 充值 + */ +export const ElectricityDeviceRecharge = (data: { 'deviceCode': string; 'amount': number }) => { + return request({ + url: '/electricityDevice/recharge', + method: 'POST', + data + }); +}; +/** + * 设置电表价格 + */ +export const setElectricityDevicePrice = (data: { 'deviceCode': string; 'price': number }) => { + return request({ + url: '/electricityDevice/setPrice', + method: 'POST', + data + }); +}; +/** + * 设置电表开关状态 + */ +export const setElectricityDeviceSwitchStatus = (data: { 'deviceCode': string; 'status': number }) => { + return request({ + url: '/electricityDevice/controlSwitch', + method: 'POST', + data + }); +}; +/** + * 电表数据上传 + */ +export const updateElectricityDeviceData = (data: { 'deviceCode': string }) => { + return request({ + url: '/electricityDevice/triggerReport', + method: 'POST', + data + }); +}; + +/** + * 上传电表设备 + */ +export const uploadElectricityDevices = (data: FormData) => { + return request({ + url: '/electricityDevice/importData', + method: 'POST', + data + }); +}; +/** + * 获取模板设备 + */ +export const getElectricityDeviceFormartValue = () => { + return request({ + url: '/electricityDevice/importTemplate', + method: 'POST' + }); +}; diff --git a/src/api/system/SdbElectricityDevice/type.ts b/src/api/system/SdbElectricityDevice/type.ts index c08eb31..e25c945 100644 --- a/src/api/system/SdbElectricityDevice/type.ts +++ b/src/api/system/SdbElectricityDevice/type.ts @@ -25,11 +25,30 @@ export interface ElectricityDeviceVO { * */ url: string; + /** + * 电价 + */ + price: number | null; /** * */ openid: string; + + electricityRecord?: { + 'id': string; + 'deviceCode': string; + 'totalEnergy': string; + 'readTime': string; + 'balance': string; + 'status': number; + 'event': string; + 'rangeTime': string; + 'rangeFee': number; + 'price': number | null; + 'type': number | null; + 'updateTime': string | null; + }; } export interface ElectricityDeviceForm extends BaseEntity { diff --git a/src/api/system/Tmaterial/type.ts b/src/api/system/Tmaterial/type.ts index 1f5c33a..ca29f5d 100644 --- a/src/api/system/Tmaterial/type.ts +++ b/src/api/system/Tmaterial/type.ts @@ -18,6 +18,7 @@ export interface MaterialVO { * 规格型号* */ model: string; + villageId: string; /** * 计量单位 diff --git a/src/api/system/report/dailyFeeReport/type.ts b/src/api/system/report/dailyFeeReport/type.ts index bb4fa23..1cea109 100644 --- a/src/api/system/report/dailyFeeReport/type.ts +++ b/src/api/system/report/dailyFeeReport/type.ts @@ -17,7 +17,7 @@ export type Datum = { houseName: string; payTime: string; propertyOffsetAmount: string; - remark: null; + remark: string; residentName: string; transferAmount: string; unionPayAmount: string; diff --git a/src/api/workflow/index.ts b/src/api/workflow/index.ts index 11253df..98190a2 100644 --- a/src/api/workflow/index.ts +++ b/src/api/workflow/index.ts @@ -1,4 +1,5 @@ import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; /** * 查询小区概况 @@ -335,7 +336,16 @@ type LifeIndices = { * 查询 快捷入口 * @returns {*} */ -export const getQuicklyshortcut = (query?: {}) => { +export const getQuicklyshortcut = (query?: {}): AxiosPromise< + { + id: string; + menuId: string; + menuName: string; + menuPath: string; + menuIcon: string; + sortOrder: number; + }[] +> => { return request({ url: '/workSpace/shortcut/list', method: 'GET', diff --git a/src/components/Holder/CarUser.vue b/src/components/Holder/CarUser.vue index 22917d2..970a000 100644 --- a/src/components/Holder/CarUser.vue +++ b/src/components/Holder/CarUser.vue @@ -273,7 +273,6 @@ defineExpose({ parkingId: id }) as BillUserlist ); - console.log(multipleSelection.value); } else { multipleSelection.value = []; } diff --git a/src/components/Holder/complainUser.vue b/src/components/Holder/complainUser.vue index 07f0b90..a1740ca 100644 --- a/src/components/Holder/complainUser.vue +++ b/src/components/Holder/complainUser.vue @@ -222,7 +222,6 @@ function handleSelectionChange(selection: tableType[]) { const uniqueMap = new Map(); finalSelection.forEach((item) => uniqueMap.set(item.id, item)); multipleSelection.value = Array.from(uniqueMap.values()); - console.log(multipleSelection.value.map((item) => item.id)); } else { // --- 单选逻辑 --- if (selection.length > 0) { diff --git a/src/components/Holder/index.vue b/src/components/Holder/index.vue index 20f69b6..0dc08df 100644 --- a/src/components/Holder/index.vue +++ b/src/components/Holder/index.vue @@ -301,7 +301,6 @@ defineExpose({ ...queryParams.value, ...params }; - console.log(queryParams.value); getList(); dialog.value.dialogVisible = true; } diff --git a/src/components/Holder/material.vue b/src/components/Holder/material.vue index 99c21a0..22e6dc1 100644 --- a/src/components/Holder/material.vue +++ b/src/components/Holder/material.vue @@ -32,6 +32,7 @@ + @@ -77,6 +78,10 @@ const props = defineProps({ isMultiple: { type: Boolean, default: false + }, + isHidden: { + type: Boolean, + default: true } }); diff --git a/src/components/Holder/repairUser.vue b/src/components/Holder/repairUser.vue index 0bb4491..536407d 100644 --- a/src/components/Holder/repairUser.vue +++ b/src/components/Holder/repairUser.vue @@ -236,8 +236,6 @@ function handleSelectionChange(selection: tableType[]) { multipleSelection.value = []; } } - - console.log('handleSelectionChange', selection); } // 重置查询 function resetQuery() { diff --git a/src/components/QuarterSelect/index.vue b/src/components/QuarterSelect/index.vue index 9301237..fa8f946 100644 --- a/src/components/QuarterSelect/index.vue +++ b/src/components/QuarterSelect/index.vue @@ -67,7 +67,6 @@ const currentYear = ref(initYear); // 输入框展示文本 const displayText = computed(() => { if (!props.modelValue) return ''; - console.log(props.modelValue, props.modelValue.trim().split('-')); const [y, q] = props.modelValue.split('-').map(Number); return `${y}年${q}季度`; }); diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue index a11159b..a990929 100644 --- a/src/layout/components/Sidebar/SidebarItem.vue +++ b/src/layout/components/Sidebar/SidebarItem.vue @@ -2,10 +2,11 @@
-