同步

.env.development

@@ -1,62 +1,68 @@
 # 页面标题
-VITE_APP_TITLE=智慧物业后台管理系统
+VITE_APP_TITLE =  智慧物业后台管理系统
 
-VITE_APP_LOGO_TITLE=智慧物业后台管理系统
+VITE_APP_LOGO_TITLE = 智慧物业后台管理系统
 
 # 开发环境配置
-VITE_APP_ENV='development'
+VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API='/dev-api'
+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.0.239:8080'
 # 图片基础地址
-VITE_IMG_URL='http://192.168.1.222:8080'
+VITE_IMG_URL = 'http://192.168.1.222:8080'
 
 # 应用访问路径 例如使用前缀 /admin/
-VITE_APP_CONTEXT_PATH='/'
+VITE_APP_CONTEXT_PATH = '/'
 
 # 监控地址
-VITE_APP_MONITOR_ADMIN='http://192.168.1.215/admin/applications'
+VITE_APP_MONITOR_ADMIN = 'http://192.168.1.215/admin/applications'
+
 
 # SnailJob 控制台地址
-VITE_APP_SNAILJOB_ADMIN='http://192.168.1.215/snail-job'
+VITE_APP_SNAILJOB_ADMIN = 'http://192.168.1.215/snail-job'
 
-VITE_APP_PORT=5174
+VITE_APP_PORT = 5173
 
 # 登录成功跳转地址
 # VITE_LOGIN_BACK_URL = '/equipment/WaterDevice'
-VITE_LOGIN_BACK_URL='/index'
+VITE_LOGIN_BACK_URL = '/index'
 # 工作台正式内容:false 假内容：true
-VITE_LOGIN_BACK_URL_WORKBENCH_TRUE=false
+VITE_LOGIN_BACK_URL_WORKBENCH_TRUE= true
 # 是否展示工作台
-VITE_APP_SHOW_WORK_PLATFORM=true
+VITE_APP_SHOW_WORK_PLATFORM = true
 
-# 地图类型  天地图 WGS84 高德地图 GCJ02, 高德地图 需要在高德地图官网申请key
+
-VITE_APP_MAP_TYPE='WGS84'
+# 地图类型 天地图 or 高德地图 天地图 WGS84 高德地图 GCJ02, 高德地图 需要在高德地图官网申请key
+# 高德地图 GCJ02
+# 天地图 WGS84
+VITE_APP_MAP_TYPE = 'GCJ02'
 
 # 高德地图key 建议放入环境变量中，避免泄露
-VITE_GCJ02_KEY_GD='8e302fe1be5f4db62bc734db23dca149'
+VITE_GCJ02_KEY_GD = '8e302fe1be5f4db62bc734db23dca149'
-VITE_GCJ02_JS_CODE_GD='09534b3534d8da53968529a9ce164118'
+VITE_GCJ02_JS_CODE_GD = '09534b3534d8da53968529a9ce164118'
 
 # 天地图key 建议放入环境变量中，避免泄露
-VITE_TIANDITU_KEY='f71689f9e22158947ebf64ad95e0a595'
+VITE_TIANDITU_KEY = 'f71689f9e22158947ebf64ad95e0a595'
+VITE_TIANDITU_JS_CODE = ''
+
 
 # 接口加密功能开关(如需关闭 后端也必须对应关闭)
-VITE_APP_ENCRYPT=true
+VITE_APP_ENCRYPT = true
 # 接口加密传输 RSA 公钥与后端解密私钥对应 如更换需前后端一同更换
-VITE_APP_RSA_PUBLIC_KEY='MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ=='
+VITE_APP_RSA_PUBLIC_KEY = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ=='
 # 接口响应解密 RSA 私钥与后端加密公钥对应 如更换需前后端一同更换
-VITE_APP_RSA_PRIVATE_KEY='MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAmc3CuPiGL/LcIIm7zryCEIbl1SPzBkr75E2VMtxegyZ1lYRD+7TZGAPkvIsBcaMs6Nsy0L78n2qh+lIZMpLH8wIDAQABAkEAk82Mhz0tlv6IVCyIcw/s3f0E+WLmtPFyR9/WtV3Y5aaejUkU60JpX4m5xNR2VaqOLTZAYjW8Wy0aXr3zYIhhQQIhAMfqR9oFdYw1J9SsNc+CrhugAvKTi0+BF6VoL6psWhvbAiEAxPPNTmrkmrXwdm/pQQu3UOQmc2vCZ5tiKpW10CgJi8kCIFGkL6utxw93Ncj4exE/gPLvKcT+1Emnoox+O9kRXss5AiAMtYLJDaLEzPrAWcZeeSgSIzbL+ecokmFKSDDcRske6QIgSMkHedwND1olF8vlKsJUGK3BcdtM8w4Xq7BpSBwsloE='
+VITE_APP_RSA_PRIVATE_KEY = 'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAmc3CuPiGL/LcIIm7zryCEIbl1SPzBkr75E2VMtxegyZ1lYRD+7TZGAPkvIsBcaMs6Nsy0L78n2qh+lIZMpLH8wIDAQABAkEAk82Mhz0tlv6IVCyIcw/s3f0E+WLmtPFyR9/WtV3Y5aaejUkU60JpX4m5xNR2VaqOLTZAYjW8Wy0aXr3zYIhhQQIhAMfqR9oFdYw1J9SsNc+CrhugAvKTi0+BF6VoL6psWhvbAiEAxPPNTmrkmrXwdm/pQQu3UOQmc2vCZ5tiKpW10CgJi8kCIFGkL6utxw93Ncj4exE/gPLvKcT+1Emnoox+O9kRXss5AiAMtYLJDaLEzPrAWcZeeSgSIzbL+ecokmFKSDDcRske6QIgSMkHedwND1olF8vlKsJUGK3BcdtM8w4Xq7BpSBwsloE='
 
 # 客户端id
-VITE_APP_CLIENT_ID='e5cd7e4891bf95d1d19206ce24a7b32e'
+VITE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e'
 
 # websocket 开关 默认使用sse推送
-VITE_APP_WEBSOCKET=false
+VITE_APP_WEBSOCKET = false
 
 # sse 开关
-VITE_APP_SSE=true
+VITE_APP_SSE = true
 

.env.production

@@ -1,58 +1,60 @@
 # 页面标题
-VITE_APP_TITLE=智慧物业后台管理系统
+VITE_APP_TITLE =  智慧物业后台管理系统
 
-VITE_APP_LOGO_TITLE=智慧物业后台管理系统
+VITE_APP_LOGO_TITLE = 智慧物业后台管理系统
 # 生产环境配置
-VITE_APP_ENV='production'
+VITE_APP_ENV = 'production'
 
 # 应用访问路径 例如使用前缀 /admin/
-VITE_APP_CONTEXT_PATH='/'
+VITE_APP_CONTEXT_PATH = '/'
 
 # 监控地址
-VITE_APP_MONITOR_ADMIN='/admin/applications'
+VITE_APP_MONITOR_ADMIN = '/admin/applications'
 
 # SnailJob 控制台地址
-VITE_APP_SNAILJOB_ADMIN='/snail-job'
+VITE_APP_SNAILJOB_ADMIN = '/snail-job'
 
 # 生产环境
-# VITE_APP_BASE_API = 'https://wuyeapi.bugtc.com'
+VITE_APP_BASE_API = 'https://wuyeapi.bugtc.com'
-VITE_APP_BASE_API='https://wuyeapi.ckdzkj.com'
+# VITE_APP_BASE_API = 'http://192.168.0.222:8080'
-#VITE_APP_BASE_API='http://192.168.1.198'
+
 # 登录成功跳转地址
 # VITE_LOGIN_BACK_URL = '/equipment/WaterDevice'
-VITE_LOGIN_BACK_URL='/index'
+VITE_LOGIN_BACK_URL = '/index'
 # 工作台正式内容:false 假内容：true
-VITE_LOGIN_BACK_URL_WORKBENCH_TRUE=false
+VITE_LOGIN_BACK_URL_WORKBENCH_TRUE= true
 # 是否展示工作台
-VITE_APP_SHOW_WORK_PLATFORM=true
+VITE_APP_SHOW_WORK_PLATFORM = true
 
-# 地图类型  天地图 WGS84 高德地图 GCJ02, 高德地图 需要在高德地图官网申请key
+
-VITE_APP_MAP_TYPE='GCJ02'
+# 地图类型 天地图 or 高德地图 天地图 WGS84 高德地图 GCJ02, 高德地图 需要在高德地图官网申请key
+# 高德地图 GCJ02
+# 天地图 WGS84
+VITE_APP_MAP_TYPE = 'GCJ02'
 
 # 高德地图key 建议放入环境变量中，避免泄露
-VITE_GCJ02_KEY_GD='8e302fe1be5f4db62bc734db23dca149'
+VITE_GCJ02_KEY_GD = '8e302fe1be5f4db62bc734db23dca149'
-VITE_GCJ02_JS_CODE_GD='09534b3534d8da53968529a9ce164118'
+VITE_GCJ02_JS_CODE_GD = '09534b3534d8da53968529a9ce164118'
+
 
-# 天地图key 建议放入环境变量中，避免泄露
-VITE_TIANDITU_KEY='f71689f9e22158947ebf64ad95e0a595'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 # VITE_BUILD_COMPRESS = gzip
 
-VITE_APP_PORT=80
+VITE_APP_PORT = 80
 
 # 接口加密功能开关(如需关闭 后端也必须对应关闭)
-VITE_APP_ENCRYPT=true
+VITE_APP_ENCRYPT = true
 # 接口加密传输 RSA 公钥与后端解密私钥对应 如更换需前后端一同更换
-VITE_APP_RSA_PUBLIC_KEY='MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ=='
+VITE_APP_RSA_PUBLIC_KEY = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ=='
 # 接口响应解密 RSA 私钥与后端加密公钥对应 如更换需前后端一同更换
-VITE_APP_RSA_PRIVATE_KEY='MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAmc3CuPiGL/LcIIm7zryCEIbl1SPzBkr75E2VMtxegyZ1lYRD+7TZGAPkvIsBcaMs6Nsy0L78n2qh+lIZMpLH8wIDAQABAkEAk82Mhz0tlv6IVCyIcw/s3f0E+WLmtPFyR9/WtV3Y5aaejUkU60JpX4m5xNR2VaqOLTZAYjW8Wy0aXr3zYIhhQQIhAMfqR9oFdYw1J9SsNc+CrhugAvKTi0+BF6VoL6psWhvbAiEAxPPNTmrkmrXwdm/pQQu3UOQmc2vCZ5tiKpW10CgJi8kCIFGkL6utxw93Ncj4exE/gPLvKcT+1Emnoox+O9kRXss5AiAMtYLJDaLEzPrAWcZeeSgSIzbL+ecokmFKSDDcRske6QIgSMkHedwND1olF8vlKsJUGK3BcdtM8w4Xq7BpSBwsloE='
+VITE_APP_RSA_PRIVATE_KEY = 'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAmc3CuPiGL/LcIIm7zryCEIbl1SPzBkr75E2VMtxegyZ1lYRD+7TZGAPkvIsBcaMs6Nsy0L78n2qh+lIZMpLH8wIDAQABAkEAk82Mhz0tlv6IVCyIcw/s3f0E+WLmtPFyR9/WtV3Y5aaejUkU60JpX4m5xNR2VaqOLTZAYjW8Wy0aXr3zYIhhQQIhAMfqR9oFdYw1J9SsNc+CrhugAvKTi0+BF6VoL6psWhvbAiEAxPPNTmrkmrXwdm/pQQu3UOQmc2vCZ5tiKpW10CgJi8kCIFGkL6utxw93Ncj4exE/gPLvKcT+1Emnoox+O9kRXss5AiAMtYLJDaLEzPrAWcZeeSgSIzbL+ecokmFKSDDcRske6QIgSMkHedwND1olF8vlKsJUGK3BcdtM8w4Xq7BpSBwsloE='
 
 # 客户端id
-VITE_APP_CLIENT_ID='e5cd7e4891bf95d1d19206ce24a7b32e'
+VITE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e'
 
 # websocket 开关 默认使用sse推送
-VITE_APP_WEBSOCKET=false
+VITE_APP_WEBSOCKET = false
 
 # sse 开关
-VITE_APP_SSE=true
+VITE_APP_SSE = true

.gitignore

@@ -29,6 +29,8 @@ tests/e2e/reports
 selenium-debug.log
 
 # Editor directories and files
+.idea
+.vscode
 *.suo
 *.ntvs*
 *.njsproj

package.json

@@ -30,8 +30,7 @@
     "@vueuse/core": "14.2.1",
     "animate.css": "4.1.1",
     "await-to-js": "3.0.0",
-    "axios": "1.15.2",
+    "axios": "1.13.6",
-    "big.js": "^7.0.1",
     "crypto-js": "4.2.0",
     "echarts": "6.0.0",
     "element-china-area-data": "^6.1.0",
@@ -52,20 +51,16 @@
     "vue-json-pretty": "2.6.0",
     "vue-router": "5.0.3",
     "vue-types": "6.0.0",
-    "vue3-print-nb": "^0.1.4",
     "vuedraggable": "^4.1.0",
-    "vxe-table": "4.18.1",
+    "vxe-table": "4.18.1"
-    "xlsx-js-style": "^1.2.0"
   },
   "devDependencies": {
     "@iconify/json": "^2.2.448",
-    "@types/big.js": "^7.0.0",
     "@types/crypto-js": "4.2.2",
     "@types/file-saver": "^2.0.7",
     "@types/js-cookie": "3.0.6",
     "@types/node": "^25.4.0",
     "@types/nprogress": "0.2.3",
-    "@types/xlsx": "^0.0.35",
     "@unocss/preset-attributify": "66.6.6",
     "@unocss/preset-icons": "66.6.6",
     "@unocss/preset-uno": "66.6.6",
@@ -88,7 +83,7 @@
     "unplugin-icons": "23.0.1",
     "unplugin-vue-components": "31.0.0",
     "unplugin-vue-setup-extend-plus": "1.0.1",
-    "vite": "8.0.5",
+    "vite": "7.3.1",
     "vite-plugin-svg-icons-ng": "^1.5.2",
     "vite-plugin-vue-devtools": "8.0.7",
     "vite-plugin-zip-pack": "^1.2.4",

src/App.vue

@@ -8,6 +8,7 @@
 import { useSettingsStore } from '@/store/modules/settings';
 import { handleThemeStyle } from '@/utils/theme';
 import { useAppStore } from '@/store/modules/app';
+import { useDictStore } from './store/modules/dict';
 
 const appStore = useAppStore();
 onMounted(() => {

src/api/login.ts

@@ -80,7 +80,7 @@ export function getCodeImg(): AxiosPromise<VerifyCodeResult> {
 /**
  * 第三方登录
  */
-export function callback(data: LoginData) {
+export function callback(data: LoginData): AxiosPromise<any> {
   const LoginData = {
     ...data,
     clientId: clientId,

src/api/system/Activity/type.ts

@@ -1,26 +1,38 @@
 export interface ActivityVO {
-  'id': string;
+  /**
-  'villageId': string;
+   * 活动管理表id
-  'title': string;
+   */
-  'author': string;
+  id: string | number;
-  'content': string;
+
-  'status': string;
+  /**
-  'pageViews': number;
+   * 标题
-  'createName': string;
+   */
-  'coverImage': string;
+  title: string;
-  'startTime': string;
+
-  'endTime': string;
+  /**
-  'applyDeadline': string;
+   * 作者
-  'signinStartTime': string;
+   */
-  'signinEndTime': string;
+  author: string;
-  'address': string;
+
-  'quota': number;
+  /**
-  'appliedCount': number;
+   * 内容
-  'organizer': string;
+   */
-  'contactName': string;
+  content: string;
-  'contactPhone': string;
+
-  'pointsReward': number;
+  /**
-  'requirements': string;
+   * 发布状态 0未发布 1已发布
+   */
+  status: string;
+
+  /**
+   * 浏览量
+   */
+  pageViews: number;
+
+  /**
+   * 创建者姓名
+   */
+  createName: string;
 }
 
 export interface ActivityForm extends BaseEntity {

src/api/system/Banner/index.ts

@@ -65,7 +65,6 @@ export const delBanner = (id: string | number | Array<string | number>) => {
 /**
  * 改变Banner图管理 状态
  * @param id
- * @param status
  */
 export const switchBanner = (id: string, status: string) => {
   return request({

src/api/system/Banner/type.ts

@@ -47,6 +47,11 @@ export interface BannerForm extends BaseEntity {
    */
   byOrder?: number;
   link: string;
+
+  /**
+   * 小区id
+   */
+  villageId?: string;
 }
 
 export interface BannerQuery extends PageQuery {

src/api/system/ChargeType/index.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { ChargeTypeVO, ChargeTypeForm, ChargeTypeQuery, ChargeTypeRelationQuery } from './type';
+import { ChargeTypeVO, ChargeTypeForm, ChargeTypeQuery } from './type';
 
 /**
  * 查询收费类型列表
@@ -61,37 +61,3 @@ export const delChargeType = (id: string | number | Array<string | number>) => {
     method: 'delete'
   });
 };
-
-/**
- * 查询收费类型关联列表
- * @param query
- */
-export const getChargeTypeRelation = (query?: ChargeTypeRelationQuery) => {
-  return request({
-    url: '/chargeType/relation/list',
-    method: 'get'
-  });
-};
-
-/**
- * 新增收费类型关联
- * @param data
- */
-export const addChargeTypeRelation = (data: ChargeTypeRelationQuery) => {
-  return request({
-    url: '/chargeType/relation',
-    method: 'POST',
-    data: data
-  });
-};
-/**
- * 新增收费类型关联
- * @param data
- */
-export const editChargeTypeRelation = (data: ChargeTypeRelationQuery) => {
-  return request({
-    url: '/chargeType/relation',
-    method: 'PUT',
-    data: data
-  });
-};

src/api/system/ChargeType/type.ts

@@ -2,7 +2,7 @@ export interface ChargeTypeVO {
   /**
    * 收费类型表id
    */
-  id: string;
+  id: string | number;
 
   /**
    * 收费类型名称
@@ -64,20 +64,3 @@ export interface ChargeType2Query extends PageQuery {
    */
   params?: any;
 }
-
-
-
-
-export interface  ChargeTypeRelationQuery {
-  /**
-   * 主收费类型表id
-   */
-  masterTypeId?: string;
-  /**
-   * 子收费类型表id
-   */
-  slaveTypeIds?: string;
-  id?: string;
-  // 状态 0启用 1停用
-  status?: string;
-}

src/api/system/ComplainType/type.ts

@@ -2,7 +2,7 @@ export interface ComplaintTypeVO {
   /**
    * 投诉类型管理表id
    */
-  id: string;
+  id: string | number;
 
   /**
    * 投诉类型名称
@@ -13,21 +13,43 @@ export interface ComplaintTypeVO {
    * 状态 0 启用 1停用
    */
   status: string;
+
+  /**
+   * 创建人名称
+   */
+  createNam: string;
+
+  /**
+   * 创建时间
+   */
+  creaateTime: string;
 }
 
 export interface ComplaintTypeForm extends BaseEntity {
   /**
    * 投诉类型管理表id
    */
-  id?: string;
+  id?: string | number;
-  /**
+
-   * 状态 0 启用 1停用
-   */
-  status?: string;
   /**
    * 投诉类型名称
    */
   name?: string;
+
+  /**
+   * 状态 0 启用 1停用
+   */
+  status?: string;
+
+  /**
+   * 创建人名称
+   */
+  createNam?: string;
+
+  /**
+   * 创建时间
+   */
+  creaateTime?: string;
 }
 
 export interface ComplaintTypeQuery extends PageQuery {
@@ -40,4 +62,19 @@ export interface ComplaintTypeQuery extends PageQuery {
    * 状态 0 启用 1停用
    */
   status?: string;
+
+  /**
+   * 创建人名称
+   */
+  createNam?: string;
+
+  /**
+   * 创建时间
+   */
+  creaateTime?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
 }

src/api/system/Complaint/index.ts

@@ -20,7 +20,7 @@ export const listComplaint = (query?: ComplaintQuery): AxiosPromise<ComplaintVO[
  * 查询投诉管理详细
  * @param id
  */
-export const getComplaint = (id: string): AxiosPromise<ComplaintVO> => {
+export const getComplaint = (id: string | number): AxiosPromise<ComplaintVO> => {
   return request({
     url: '/complaint/' + id,
     method: 'get'

src/api/system/Complaint/type.ts

@@ -30,7 +30,7 @@ export interface ComplaintVO {
   problemIamgeUrl: string;
 
   /**
-   * 投诉状态 0 待处理 1 已处理
+   * 投诉状态 0待处理 1处理中 2已处理
    */
   status: string;
 
@@ -48,8 +48,6 @@ export interface ComplaintVO {
    * 处理描述
    */
   handleContent: string;
-
-  problemImageUrl: string;
 }
 
 export interface ComplaintForm extends BaseEntity {
@@ -81,7 +79,7 @@ export interface ComplaintForm extends BaseEntity {
   /**
    * 问题照片url
    */
-  problemImageUrl?: string;
+  problemIamgeUrl?: string;
 
   /**
    * 投诉状态 0待处理 1处理中 2已处理
@@ -128,7 +126,7 @@ export interface ComplaintQuery extends PageQuery {
   /**
    * 问题照片url
    */
-  problemImageUrl?: string;
+  problemIamgeUrl?: string;
 
   /**
    * 投诉状态 0待处理 1处理中 2已处理

src/api/system/Decoration/type.ts

@@ -13,8 +13,7 @@ export interface DecorationVO {
    * 所属房屋id
    */
   houseId: string | number;
-  buildingId: string;
+
-  unitNoId: string;
   /**
    * 申请人姓名
    */

src/api/system/HandleLog/index.ts

@@ -61,10 +61,3 @@ export const delHandleLog = (id: string | number | Array<string | number>) => {
     method: 'delete'
   });
 };
-export const uploadAttachments = (files: FormData) => {
-  return request({
-    url: '/handleLog/uploadAttachments',
-    method: 'post',
-    data: files
-  });
-};

src/api/system/HandleLog/type.ts

@@ -28,28 +28,6 @@ export interface HandleLogVO {
    * 办事地点
    */
   handlePosition: string;
-
-  handleLogFileList: FileVO[];
-}
-
-export interface FileVO {
-  /**
-   * 文件id
-   */
-  id: string | number;
-
-  /**
-   * 文件名
-   */
-  fileName: string;
-
-  /**
-   * 文件路径
-   */
-  filePath: string;
-
-  'handleLogId': string;
-  'ossId': string;
 }
 
 export interface HandleLogForm extends BaseEntity {

src/api/system/Inspection/index.ts

@@ -14,13 +14,6 @@ export const listItem = (query?: Request): AxiosPromise<any[]> => {
     params: query
   });
 };
-export const overview = (query?: Request): AxiosPromise<any[]> => {
-  return request({
-    url: '/inspection/data/generate/overview',
-    method: 'POST',
-    params: query
-  });
-};
 export interface Request {
   /**
    * 进行中的任务数
@@ -80,56 +73,10 @@ export interface Request {
  * @returns {*}
  */
 
-export const list_statapi = (query?: { queryDateBegin: string; queryDateEnd: string }): AxiosPromise<any[]> => {
+export const list_statapi = (query?: { taskTimeBegin: string; taskTimeEnd: string }): AxiosPromise<any[]> => {
   return request({
     url: '/inspection/data/role/stat',
     method: 'get',
     params: query
   });
 };
-
-export type exportPageApiQuery = {
-  /**
-   * 数据类型：1-日报 / 2-周报 / 3-月报
-   */
-  dataType?: string;
-  /**
-   * 页码
-   */
-  pageNum: number;
-  /**
-   * 每页条数
-   */
-  pageSize: number;
-  /**
-   * 查询开始日期
-   */
-  queryDateBegin?: string;
-  /**
-   * 查询结束日期
-   */
-  queryDateEnd?: string;
-  /**
-   * 日期
-   */
-  statDate?: string;
-};
-
-type exportAllApiQuery = Omit<exportPageApiQuery, 'pageSize' | 'pageNum'>;
-/** 导出当前页 数据api */
-export const exportPageApi = (data: exportPageApiQuery): AxiosPromise<any[]> => {
-  return request({
-    url: '/inspection/data/export/page',
-    method: 'POST',
-    data
-  });
-};
-
-/** 导出 所有 数据api */
-export const exportAllApi = (data: exportAllApiQuery): AxiosPromise<any[]> => {
-  return request({
-    url: '/inspection/data/export',
-    method: 'POST',
-    data
-  });
-};

src/api/system/InspectionPlan/index.ts

@@ -8,7 +8,7 @@ import { PlanVO, PlanForm, PlanQuery } from '@/api/system/InspectionPlan/type';
  * @returns {*}
  */
 
-export const listPlan = (query: PlanQuery | {} = {}): AxiosPromise<PlanVO[]> => {
+export const listPlan = (query?: PlanQuery): AxiosPromise<PlanVO[]> => {
   return request({
     url: '/inspection/plan/list',
     method: 'get',
@@ -70,6 +70,6 @@ export const changePlanStatus = (id: string, status: string) => {
   return request({
     url: '/inspection/plan/changeStatus',
     method: 'put',
-    params: { id, status }
+    data: { id, status }
   });
 };

src/api/system/InspectionPlan/type.ts

@@ -3,12 +3,17 @@ export interface PlanVO {
    * 主键ID
    */
   id: string | number;
-  inspectorIds: string;
+
   /**
    * 巡检计划名称
    */
   planName: string;
 
+  /**
+   * 巡检人员ID，多个用逗号分隔
+   */
+  inspectorIds: string;
+
   /**
    * 执行周期，如：开始日期-结束日期
    */
@@ -27,12 +32,7 @@ export interface PlanVO {
   /**
    * 巡检设置：0-必须拍照，1-可以跳检
    */
-  inspectSetting: number;
+  inspectSetting: string;
-  inspectSettingDict: {
-    dictLabel: string;
-    dictValue: string;
-    listClass: string;
-  };
 
   /**
    * 计划路线，多个用逗号分隔
@@ -53,11 +53,7 @@ export interface PlanVO {
    * 执行周期具体日期
    */
   executeDay: string;
-  executeDayList: {
+
-    dictLabel: string;
-    dictValue: string;
-    listClass: string;
-  }[];
   /** 巡检人员信息 */
   inspectorList: {
     'userId': string;
@@ -110,7 +106,7 @@ export interface PlanForm extends BaseEntity {
   /**
    * 巡检设置：0-必须拍照，1-可以跳检
    */
-  inspectSetting?: number;
+  inspectSetting?: string;
 
   /**
    * 计划路线，多个用逗号分隔

src/api/system/InspectionPoint/index.ts

@@ -64,7 +64,6 @@ export const delPoint = (id: string | number | Array<string | number>) => {
 /**
  * 修改巡检点状态
  * @param id
- * @param status
  */
 export const changePointStatus = (id: string, status: string) => {
   return request({

src/api/system/InspectionPoint/type.ts

@@ -2,7 +2,7 @@ export interface PointVO {
   /**
    * 主键ID
    */
-  id: string;
+  id: string | number;
 
   /**
    * 巡检点名称
@@ -17,7 +17,7 @@ export interface PointVO {
   /**
    * 所属路线ID
    */
-  routeId: string;
+  routeId: string | number;
 
   /**
    * 巡检点位置（经纬度），格式：经度,纬度

src/api/system/InspectionRecord/index.ts

@@ -19,15 +19,11 @@ export const listRecord = (query?: RecordQuery): AxiosPromise<RecordVO[]> => {
 /**
  * 查询巡检记录主详细
  * @param id
- * @param date
  */
-export const getRecord = (id: string, date?: string): AxiosPromise<RecordVO> => {
+export const getRecord = (id: string | number): AxiosPromise<RecordVO> => {
   return request({
     url: '/inspection/record/' + id,
-    method: 'get',
+    method: 'get'
-    params: {
-      date
-    }
   });
 };
 

src/api/system/InspectionRecord/type.ts

@@ -3,7 +3,7 @@ export interface RecordVO {
   actualStartTime?: string;
   createByName?: string;
   createTime?: string;
-  details?: DetailsVo[];
+  details?: [];
   id?: string;
   inspectorId?: number;
   inspectorName?: string;
@@ -12,7 +12,7 @@ export interface RecordVO {
   remark?: string;
   routeId?: string;
   routeName?: string;
-  status?: string;
+  status?: number;
   statusLabel?: null;
   taskName?: string;
   taskTime?: string;
@@ -81,23 +81,4 @@ export interface RecordQuery extends PageQuery {
    * 任务名称
    */
   taskName?: string;
-
-  taskTimeBegin?: string;
-  taskTimeEnd?: string;
-}
-
-export interface DetailsVo {
-  'id': string;
-  'taskId': string;
-  'pointId': string;
-  'pointName': string;
-  'location': string;
-  'checkTime': string;
-  'checkResult': string;
-  'photos': string;
-  'sortNo': string;
-  'remark': string;
-  'imgUrl': string;
-  'status': string;
-  photoslist?: string[];
 }

src/api/system/InspectionRoute/index.ts

@@ -8,7 +8,7 @@ import { RouteVO, RouteForm, RouteQuery } from './type';
  * @returns {*}
  */
 
-export const listRoute = (query: RouteQuery | {} = {}): AxiosPromise<RouteVO[]> => {
+export const listRoute = (query?: RouteQuery): AxiosPromise<RouteVO[]> => {
   return request({
     url: '/inspection/route/list',
     method: 'get',
@@ -20,7 +20,7 @@ export const listRoute = (query: RouteQuery | {} = {}): AxiosPromise<RouteVO[]>
  * 查询巡检路线详细
  * @param id
  */
-export const getRoute = (id: string): AxiosPromise<RouteVO> => {
+export const getRoute = (id: string | number): AxiosPromise<RouteVO> => {
   return request({
     url: '/inspection/route/' + id,
     method: 'get'

src/api/system/InspectionRoute/type.ts

@@ -4,7 +4,7 @@ export interface RouteVO {
   /**
    * 主键ID
    */
-  id: string;
+  id: string | number;
 
   /**
    * 巡检路线名称
@@ -70,7 +70,7 @@ export interface RouteForm extends BaseEntity {
   /**
    * 主键ID
    */
-  id?: string;
+  id?: string | number;
 
   /**
    * 巡检路线名称

src/api/system/InspectionTask/type.ts

@@ -106,8 +106,6 @@ export interface TaskQuery extends PageQuery {
    * 巡检任务名称
    */
   taskName?: string;
-  taskTimeBegin?: string;
-  taskTimeEnd?: string;
 
   /**
    * 关联巡检计划ID

src/api/system/Notification/index.ts

@@ -15,7 +15,7 @@ export interface NotificationVo {
  * @returns {*}
  */
 
-export const getNotificationList = (query): AxiosPromise<NotificationVo[]> => {
+export const getNotificationList = (query): AxiosPromise<NoticeVO[]> => {
   return request({
     url: '/notification/list',
     method: 'get',
@@ -25,16 +25,16 @@ export const getNotificationList = (query): AxiosPromise<NotificationVo[]> => {
 
 /**
  * 消息通知 已读
+ * @param query
  * @returns {*}
- * @param ids
  */
 
-export const ReadNotificationByID = (ids: string[]) => {
+export const ReadNotificationByID = (id: string) => {
   return request({
     url: '/notification/read',
     method: 'POST',
     data: {
-      id: ids
+      id
     }
   });
 };

src/api/system/ParkingCost/index.ts

@@ -61,61 +61,3 @@ export const delParkingCost = (id: string | number | Array<string | number>) =>
     method: 'delete'
   });
 };
-
-export type Request = {
-  /**
-   * 区域id
-   */
-  areaId?: string;
-  /**
-   * 0 审核中 1 审核通过 2 审核不通过
-   */
-  checkStatus?: string;
-  /**
-   * 添加者姓名，sys_user nickname
-   */
-  createName?: string;
-  /**
-   * id车位管理表
-   */
-  id?: string;
-  /**
-   * 车位面积（单位㎡）
-   */
-  parkingArea?: number;
-  /**
-   * 车位编号
-   */
-  parkingCode?: string;
-  /**
-   * 车位楼层
-   */
-  parkingFloor?: string;
-  /**
-   * 车位状态 0 闲置 1自用 2出租
-   */
-  parkingStatus?: string;
-  /**
-   * 备注
-   */
-  remark?: string;
-  /**
-   * 住户id
-   */
-  residentId?: string;
-  /**
-   * 所属小区id
-   */
-  villageId?: string;
-};
-/**
- * 查询停车缴费 车位列表
- * @param {Request} queryParams
- */
-export const getParkingCostCarAreaApi = (queryParams: Request) => {
-  return request({
-    url: '/parkingCost/parkingList',
-    method: 'get',
-    params: queryParams
-  });
-};

src/api/system/Payment/index.ts

@@ -6,154 +6,22 @@ import { AxiosPromise } from 'axios';
  * @param query
  * @returns {*}
  */
-export type IncomeStatsResponse = {
+
-  'totalDue': string;
+export const income_statsApi = (
-  'totalPaid': string;
+  datetime?: string
-  'totalUnpaid': string;
+): Promise<{
-  'paidPercentage': string;
+  'totalResident': number;
-  'payWx': number;
+  'totalHouse': number;
-  'payZfb': number;
+  'totalParking': number;
-  'payOffline': number;
+  'totalDevice': number;
-  'totalPay': number;
+  'totalMaterial': number;
-  'feeTypeStats': feeTypeStats[];
+  'totalComplaint': number;
-  'dailyStats': {
+}> => {
-    'statDate': string;
-    'totalDue': string;
-    'totalPaid': string;
-    'totalUnpaid': string;
-  }[];
-};
-export type feeTypeStats = {
-  'feeType': number;
-  'feeName': string;
-  'totalDue': string;
-  'totalPaid': string;
-  'totalUnpaid': string;
-  'paidPercentage': string;
-};
-export const income_statsApi = (datetime?: string): AxiosPromise<IncomeStatsResponse> => {
   return request({
     url: '/api/analysis/income/stats',
     method: 'get',
     params: {
-      startDate: datetime
+      datetime: datetime
-    }
-  });
-};
-
-export interface sourceType {
-  'totalPayable': string;
-  'totalReceived': string;
-  'totalPending': string;
-  'parkingFee': string;
-  'parkingFeePercent': string;
-  'propertyFee': string;
-  'propertyFeePercent': string;
-  'utilityFee': string;
-  'utilityFeePercent': string;
-  'shopRent': string;
-  'shopRentPercent': string;
-  'repairFee': string;
-  'repairFeePercent': string;
-  'garbageFee': string;
-  'garbageFeePercent': string;
-}
-// 收入来源
-export const income_scourcApi = (datetime?: string): AxiosPromise<sourceType> => {
-  return request({
-    url: '/api/analysis/income/source',
-    method: 'get',
-    params: {
-      date: datetime
-    }
-  });
-};
-
-export interface PayMentMethod {
-  'wechatAmount': string;
-  'wechatPercent': string;
-  'alipayAmount': string;
-  'alipayPercent': string;
-  'yidangAmount': string;
-  'yidangPercent': string;
-  'cashAmount': string;
-  'cashPercent': string;
-  'unionPayAmount': string;
-  'unionPayPercent': string;
-  'transferAmount': string;
-  'transferPercent': string;
-  'depositOffsetAmount': string;
-  'depositOffsetAmountPercent': string;
-  'propertyOffsetAmount': string;
-  'propertyOffsetAmountPercent': string;
-}
-// 缴费方式
-export const payment_methodApi = (datetime?: string): AxiosPromise<PayMentMethod> => {
-  return request({
-    url: '/api/analysis/income/payment_method',
-    method: 'get',
-    params: {
-      date: datetime
-    }
-  });
-};
-
-export interface Arrears_distrubution {
-  month: number;
-  amount: string;
-}
-// 欠费分布
-export const arrears_distributionApi = (
-  datetime?: string
-): AxiosPromise<{
-  items: Arrears_distrubution[];
-}> => {
-  return request({
-    url: '/api/analysis/income/arrears_distribution',
-    method: 'get',
-    params: {
-      date: datetime
-    }
-  });
-};
-export interface payment_sourceType {
-  'miniProgramAmount': string;
-  'miniProgramPercent': string;
-  'mobileAppAmount': string;
-  'mobileAppPercent': string;
-  'offlineAmount': string;
-  'offlinePercent': string;
-}
-// 缴费来源分析
-export const payment_sourceApi = (datetime?: string): AxiosPromise<payment_sourceType> => {
-  return request({
-    url: '/api/analysis/income/payment_source',
-    method: 'get',
-    params: {
-      date: datetime
-    }
-  });
-};
-
-export interface payment_trendType {
-  'date': string;
-  'paidAmount': string;
-  'unpaidAmount': string;
-}
-
-// 缴费走势分析
-export const payment_trendApi = (
-  startDate?: string,
-  endDate?: string
-): AxiosPromise<{
-  items: payment_trendType[];
-}> => {
-  return request({
-    url: '/api/analysis/income/payment_trend',
-    method: 'get',
-    params: {
-      startDate,
-      endDate
     }
   });
 };

src/api/system/Personnel/index.ts

@@ -8,17 +8,17 @@ import { AxiosPromise } from 'axios';
  */
 
 export const user_movein_list = (query?: {
-  dateTime: string;
+  datetime: string;
-}): AxiosPromise<{
+}): Promise<{
-  'villageId': string;
+  'totalResident': number;
-  'villageName': string;
   'totalHouse': number;
-  'occupiedHouse': number;
+  'totalParking': number;
-  'occupancyRate': string;
+  'totalDevice': number;
-  'occupancyCount': number;
+  'totalMaterial': number;
+  'totalComplaint': number;
 }> => {
   return request({
-    url: '/api/analysis/occupancy/stats',
+    url: '/workSpace/totalList',
     method: 'get',
     params: query
   });
@@ -31,7 +31,7 @@ export const user_movein_list = (query?: {
  */
 
 export const get_movein_user_type = (query?: {
-  dateTime: string;
+  datetime: string;
 }): Promise<{
   'owner': string;
   'ownerRate': string;
@@ -39,7 +39,7 @@ export const get_movein_user_type = (query?: {
   'tenantRate': string;
   'relatives': string;
   'relativeRate': string;
-  'otherType': string;
+  'other': string;
   'otherRate': string;
   'totalResident': string;
 }> => {
@@ -56,7 +56,7 @@ export const get_movein_user_type = (query?: {
  */
 
 export const get_movein_user_sex = (query?: {
-  dateTime: string;
+  datetime: string;
 }): Promise<{
   'man': number;
   'woman': number;
@@ -77,34 +77,16 @@ export const get_movein_user_sex = (query?: {
  */
 
 export const get_movein_moveout_list = (query?: {
-  date: string;
+  datetime: string;
-}): AxiosPromise<
+}): Promise<
   {
     'date': string;
-    'moveInCount': number;
+    'inCount': number;
-    'moveOutCount': number;
+    'outCount': number;
-    'totalCount': number;
   }[]
 > => {
   return request({
-    url: '/api/analysis/resident/moveInOutStats',
+    url: '/residentDailyStat/selectTotal',
-    method: 'get',
-    params: query
-  });
-};
-
-export const get_person_age = (query?: {
-  dateTime: string;
-}): AxiosPromise<
-  {
-    'date': string;
-    'moveInCount': number;
-    'moveOutCount': number;
-    'totalCount': number;
-  }[]
-> => {
-  return request({
-    url: '/gender/personAge',
     method: 'get',
     params: query
   });

src/api/system/Repair/type.ts

@@ -1,32 +1,65 @@
 export interface RepairVO {
-  'id': string;
+  /**
-  'houseId': string;
+   * 报修管理表id
-  'maintenanceItemId': number;
+   */
-  'maintenanceItemName': number;
+  id: string | number;
-  'problem': string;
+
-  'residentId': string;
+  /**
-  'residentName': string;
+   * 关联房屋id
-  'phone': string;
+   */
-  'orderDate': string;
+  houseId: string | number;
-  'problemImageUrl': string;
+
-  'problemStatus': string;
+  /**
-  'repairDes': string;
+   * 维修项目id
-  'repairImageUrl': string;
+   */
-  'repairId': string;
+  maintenanceItemId: string | number;
-  'repairName': string;
+
-  'houseName': string;
+  /**
-  'item': string;
+   * 问题描述
-  'projectType': number;
+   */
-  'updateTime': string;
+  problem: string;
-  'projectTypeStr': string;
+
-  'repairIsCheck': string;
+  /**
-  'manageIsCheck': string;
+   * 报修人id(住户表id)
-  'isCheckStr': number;
+   */
-  'repairPhone': number;
+  residentId: string;
-  'repairRoleName': number;
+
-  'repairStatus': string;
+  /**
-  repairUserId: string;
+   * 手机号码
-  'createTime': string;
+   */
+  phone: number;
+
+  /**
+   * 预约日期
+   */
+  orderDate: string;
+
+  /**
+   * 问题图片地址
+   */
+  problemImageUrl: string;
+
+  /**
+   * 0 已提交 1已分配  2维修中 3维修完成
+   */
+  problemStatus: string;
+
+  /**
+   * 维修描述
+   */
+  repairDes: string;
+
+  /**
+   * 维修图片url
+   */
+  repairImageUrl: string;
+
+  /**
+   * 维修人员id
+   */
+  repairId: string;
+  /** 名称（小区名-楼栋名-单元号-房间号） */
+  name?: string;
 }
 
 export interface RepairForm extends BaseEntity {
@@ -58,7 +91,7 @@ export interface RepairForm extends BaseEntity {
   /**
    * 手机号码
    */
-  phone?: string;
+  phone?: number;
 
   /**
    * 预约日期
@@ -135,7 +168,7 @@ export interface RepairQuery extends PageQuery {
   /**
    * 手机号码
    */
-  phone?: string;
+  phone?: number;
 
   /**
    * 预约日期

src/api/system/RepairProject/index.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { RepairProjectVO, RepairProjectForm, RepairProjectQuery, RepairProjectQueryNoPage } from './type';
+import { RepairProjectVO, RepairProjectForm, RepairProjectQuery } from './type';
 
 /**
  * 查询报修维修项目管理列表
@@ -67,7 +67,7 @@ export const delRepairProject = (id: string | number | Array<string | number>) =
  * @returns {*}
  */
 
-export const gettreelistRepairProject = (query?: RepairProjectQueryNoPage): AxiosPromise<RepairProjectVO[]> => {
+export const gettreelistRepairProject = (query?: RepairProjectQuery): AxiosPromise<RepairProjectVO[]> => {
   return request({
     url: '/repairProject/treeList',
     method: 'get',

src/api/system/RepairProject/type.ts

@@ -23,7 +23,7 @@ export interface RepairProjectVO {
    * 项目层级 0，1
    */
   projectLevel: number;
-  children?: RepairProjectVO[];
+  children?: [];
   /**
    * 排序 （数越小越靠前）
    */
@@ -33,9 +33,6 @@ export interface RepairProjectVO {
    * 状态 0启用 1停用
    */
   status: string;
-
-  disabled?: boolean;
-  // children?: RepairProjectVO[];
 }
 
 export interface RepairProjectForm extends BaseEntity {
@@ -73,6 +70,26 @@ export interface RepairProjectForm extends BaseEntity {
    * 状态 0启用 1停用
    */
   status?: string;
+
+  /**
+   * 创建时间
+   */
+  cretaeTime?: string;
+
+  /**
+   * 创建者
+   */
+  createBy?: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime?: string;
+
+  /**
+   * 更新者
+   */
+  updateBy?: number;
 }
 
 export interface RepairProjectQuery extends PageQuery {
@@ -105,35 +122,9 @@ export interface RepairProjectQuery extends PageQuery {
    * 状态 0启用 1停用
    */
   status?: string;
-}
+
-export interface RepairProjectQueryNoPage {
+  /**
-  /**
+   * 日期范围参数
-   * 维修项目名
+   */
-   */
+  params?: any;
-  projectName?: string;
-
-  /**
-   * 父级项目id
-   */
-  parentId?: string;
-
-  /**
-   * 项目类型 0公共报修 1个人报修
-   */
-  projectType?: string;
-
-  /**
-   * 项目层级 0，1
-   */
-  projectLevel?: number;
-
-  /**
-   * 排序 （数越小越靠前）
-   */
-  sortOrder?: number;
-
-  /**
-   * 状态 0启用 1停用
-   */
-  status?: string;
 }

src/api/system/SdbBill/index.ts

@@ -93,12 +93,11 @@ export type BillUserlist = {
   'houseNo': string;
   'residentId': string;
   'buildingId': string;
-  'parkingId': string;
 };
 /**
  * 查询业主列表
- * @param query
+ * @param data
- * @param query
+ * @returns {*}
  */
 export const queryResidentList_holder = (query: { pageNum: number; pageSize: number }): AxiosPromise<BillUserlist[]> => {
   return request({
@@ -110,8 +109,8 @@ export const queryResidentList_holder = (query: { pageNum: number; pageSize: num
 
 /**
  * 查询车位业主列表
- * @param query
+ * @param data
- * @param query
+ * @returns {*}
  */
 export const queryResidentList_Cars = (query: { pageNum: number; pageSize: number }): AxiosPromise<BillUserlist[]> => {
   return request({
@@ -120,13 +119,3 @@ export const queryResidentList_Cars = (query: { pageNum: number; pageSize: numbe
     params: query
   });
 };
-/**
- * 生成账单
- */
-export const manualGenerateApi = (data: { billId: string; chargePeriod: string; yearMonths?: string[]; year?: string[] }) => {
-  return request({
-    url: '/bill/manualGenerate',
-    method: 'POST',
-    data
-  });
-};

src/api/system/SdbBill/type.ts

@@ -3,7 +3,6 @@ export interface BillVO {
    * 账单管理表id
    */
   id: string;
-  billName: string;
 
   /**
    * 账单编号
@@ -20,13 +19,9 @@ export interface BillVO {
    * 收费范围 0全体业主 1部分业主
    */
   chargeScope: string;
-  /**
-   * 按季度收费时，指定季度起始年月列表，格式 "yyyy-MM"，如 ["2026-01", "2026-04", "2026-07"]
-   */
-  periodCalcType: string;
 
   /**
-   * 收费周期 0年 1月 2日 3 季度 4永久；为空时取账单配置
+   * 收费周期 0年 1月  2日
    */
   chargePeriod: string;
 
@@ -54,8 +49,6 @@ export interface BillVO {
    * 创建时间
    */
   cerateTime: string;
-
-  parkingIds: string[];
 }
 
 export interface BillForm extends BaseEntity {
@@ -111,7 +104,7 @@ export interface BillForm extends BaseEntity {
   /**
    * 创建时间
    */
-  createTime?: string;
+  cerateTime?: string;
 }
 
 export interface BillQuery extends PageQuery {

src/api/system/SdbCashier/index.ts

@@ -10,8 +10,8 @@ export type cashlist = {
 
 /**
  * 查询住户列表
+ * @param post
  * @returns {*}
- * @param data
  */
 export const cashQuery = (data: { residentName?: string; queryType: number }): AxiosPromise<cashlist[]> => {
   return request({
@@ -22,18 +22,9 @@ export const cashQuery = (data: { residentName?: string; queryType: number }): A
 };
 
 export type billlistType = {
-  /**
-   * 类型 0 物业费 1 车位管理费 2 垃圾处理费 3 租金 4 押金
-   */
-  detailsType: string;
-  unitNoId: string;
-  needPayAmount: string; // 需要支付金额
-  actualAccount: string; // 实际支付金额
-  singleDiscountAmount: string; // 单笔优惠金额
   'villageId': string;
   'residentId': string;
   'houseId': string;
-  'detailsId': string;
   'houseName': string;
   'parkingId': string;
   'parkingName': string;
@@ -47,17 +38,14 @@ export type billlistType = {
   'endDate': string;
   'money': string;
   'payStatus': string;
-  'remark': string;
   amount: string;
-  residentName: string;
 };
-
 /**
  * 查询账单列表
+ * @param post
  * @returns {*}
- * @param data
  */
-export const billQuery = (data: { residentId?: string; payStatus?: '0' | '1' }): AxiosPromise<billlistType[]> => {
+export const billQuery = (data: { residentId?: string; payStatus: '0' | '1' }): AxiosPromise<billlistType[]> => {
   return request({
     url: '/cash/billList',
     method: 'post',
@@ -71,67 +59,3 @@ export const billEdit = (data: { 'detailsId': string[]; 'payType': string; 'payS
     data: data
   });
 };
-
-// 打印票据
-export const billPrint = (data: { 'detailsIds': string[]; 'residentId': string }): AxiosPromise<BillPrintType> => {
-  return request({
-    url: '/cash/print',
-    method: 'post',
-    data: data
-  });
-};
-// 查询所有账单总金额
-export const getAllAccount = (
-  data = {}
-): AxiosPromise<{
-  /** 原始金额之和（应收+优惠） */
-  originalAmount: string;
-  /** 总 应收金额 */
-  'receivableAmount': string;
-  /** 总已收金额 */
-  'receivedAmount': string;
-  /** 总优惠金额 */
-  'discountAmount': string;
-  /** 未收金额 */
-  'unpaidAmount': string;
-}> => {
-  return request({
-    url: '/cash/billAmountSummary',
-    method: 'post',
-    data: data
-  });
-};
-
-// 删除账单
-export const billDelete = (ids: string | string[]) => {
-  return request({
-    url: `/cash/bill/${ids}`,
-    method: 'DELETE'
-  });
-};
-
-export type BillPrintType = {
-  'totalAccount': string;
-  'residentName': string;
-  'payTypeSummary'?: {
-    'payType': string;
-    'payAmount': string;
-  }[];
-  'detailsList': {
-    'detailsId': string;
-    'chargeItemName': string;
-    'billName': string;
-    'detailsTime': string;
-    'useCount': string;
-    'account': string;
-    'payType': string;
-    'singleDiscountAmount': string;
-    'actualAccount': string;
-    'remark': string;
-  }[];
-  'printDate': string;
-  totalDiscountAmount?: string;
-  totalActualAccount?: string;
-  'HouseName': string;
-  'title': string;
-};

src/api/system/SdbChargeItem/index.ts

@@ -64,7 +64,7 @@ export const delChargeItem = (id: string | number | Array<string | number>) => {
 
 /**
  *  启停 收费项目
- * @param data
+ * @param id
  */
 export const changChargeItem = (data: { id: string; status: string }) => {
   return request({

src/api/system/SdbChargeItem/type.ts

@@ -12,10 +12,9 @@ export interface ChargeItemVO {
    * 收费类型
    */
   typeId: string;
-  itemName: string;
 
   /**
-   * 计费方式 0单次收费 1 周期收费 2 仪表收费
+   * 计费方式 0单次收费 1周期收费 2仪表收费
    */
   billingMethod: string;
 
@@ -53,10 +52,6 @@ export interface ChargeItemVO {
    * 小区id
    */
   villageId: string;
-  /**
-   * 状态 0正常 1停用
-   */
-  status: string;
 }
 
 export interface ChargeItemForm extends BaseEntity {

src/api/system/SdbElectricityDevice/index.ts

@@ -64,7 +64,7 @@ export const delElectricityDevice = (id: string | number | Array<string | number
 
 /**
  * 生成条形码
- * @param data
+ * @param id
  */
 export const ElectricityDeviceMakerQrcode = (data: { deviceCode: string; id: string }[]) => {
   return request({
@@ -76,7 +76,7 @@ export const ElectricityDeviceMakerQrcode = (data: { deviceCode: string; id: str
 
 /**
  * 获取设备指定时间段的用电量
- * @param data
+ * @param id
  */
 export const getElectricityDeviceTimeRangeUsedWater = (data: { deviceCode: string; 'startTime': string; 'endTime': string }) => {
   return request({
@@ -85,74 +85,3 @@ export const getElectricityDeviceTimeRangeUsedWater = (data: { deviceCode: strin
     data
   });
 };
-
-/**
- * 电表解绑房屋
- * @param { string } deviceCode
- */
-export const ElectricityDeviceUnbind = (deviceCode: string) => {
-  return request({
-    url: `/electricityDevice/unbind/${deviceCode}`,
-    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'
-  });
-};

src/api/system/SdbElectricityDevice/type.ts

@@ -25,30 +25,11 @@ export interface ElectricityDeviceVO {
    *
    */
   url: string;
-  /**
-   * 电价
-   */
-  price: number | null;
 
   /**
    *
    */
   openid: string;
-
-  electricityRecord?: {
-    'id': string;
-    'deviceCode': string;
-    'totalEnergy': string;
-    'readTime': string;
-    'balance': string;
-    'status': string;
-    'event': string;
-    'rangeTime': string;
-    'rangeFee': number;
-    'price': number | null;
-    'type': number | null;
-    'updateTime': string | null;
-  };
 }
 
 export interface ElectricityDeviceForm extends BaseEntity {

src/api/system/SdbTopupRecord/index.ts

@@ -89,16 +89,10 @@ export const getTopupRecordByDate = (query: {
     params: query
   });
 };
-
+/** 导出 所有设备的 充值记录 */
-/** 查询所有电表充值记录 */
+export const exportTopupRecordByDate = (query: { startTime?: string; endTime?: string }): AxiosPromise<TopupRecordList[]> => {
-export const getElectricityTopupRecordByDate = (query: {
-  startTime?: string;
-  endTime?: string;
-  pageSize: number;
-  pageNum: number;
-}): AxiosPromise<TopupRecordList[]> => {
   return request({
-    url: '/topupRecord/electricity/list',
+    url: '/topupRecord/water/export',
     method: 'get',
     params: query
   });

src/api/system/SdbWaterDevice/index.ts

@@ -64,7 +64,7 @@ export const delWaterDevice = (id: string | number | Array<string | number>) =>
 
 /**
  * 获取设备指定时间段的用水量
- * @param data
+ * @param id
  */
 export const getWaterDeviceTimeRangeUsedWater = (data: { deviceCode: string; 'startTime': string; 'endTime': string }) => {
   return request({
@@ -76,7 +76,7 @@ export const getWaterDeviceTimeRangeUsedWater = (data: { deviceCode: string; 'st
 
 /**
  * 生成条形码
- * @param data
+ * @param id
  */
 export const WaterDeviceMakerQrcode = (data: { deviceCode: string; id: string }[]) => {
   return request({
@@ -87,7 +87,7 @@ export const WaterDeviceMakerQrcode = (data: { deviceCode: string; id: string }[
 };
 /**
  * 更新固件
- * @param data
+ * @param id
  */
 export const WaterDeviceUpdateBin = (data: { deviceCodes: string[]; urlA: string; urlB: string }) => {
   return request({
@@ -107,14 +107,3 @@ export const latestRecord = (deviceCodes: string) => {
     method: 'GET'
   });
 };
-
-/**
- * 解绑设备绑定的房屋
- * @param deviceCode
- */
-export const waterDeviceUnbind = (deviceCode: string) => {
-  return request({
-    url: `/waterDevice/unbind/${deviceCode}`,
-    method: 'PUT'
-  });
-};

src/api/system/Tmaterial/type.ts

@@ -18,7 +18,6 @@ export interface MaterialVO {
    * 规格型号*
    */
   model: string;
-  villageId: string;
 
   /**
    * 计量单位

src/api/system/Tstock/index.ts

@@ -17,8 +17,8 @@ export const listStock = (query?: any): AxiosPromise<any[]> => {
 
 /**
  * 查询 库存查询 详情
+ * @param query
  * @returns {*}
- * @param id
  */
 
 export const listStockMain = (id?: string): AxiosPromise<any[]> => {

src/api/system/Tsupplier/index.ts

@@ -8,7 +8,7 @@ import { SupplierVO, SupplierForm, SupplierQuery } from './type';
  * @returns {*}
  */
 
-export const listSupplier = (query: SupplierQuery | {} = {}): AxiosPromise<SupplierVO[]> => {
+export const listSupplier = (query?: SupplierQuery): AxiosPromise<SupplierVO[]> => {
   return request({
     url: '/warehouse/supplier/list',
     method: 'get',

src/api/system/Tsupplier/type.ts

@@ -33,7 +33,6 @@ export interface SupplierVO {
    * 备注
    */
   remark: string;
-  villageId: string;
 }
 
 export interface SupplierForm extends BaseEntity {

src/api/system/Twarehouse/type.ts

@@ -88,6 +88,11 @@ export interface WarehouseQuery extends PageQuery {
    */
   warehouseName?: string;
 
+  /**
+   * 仓库归属id*（关联com_village）
+   */
+  villageId?: string;
+
   /**
    * 联系人*
    */

src/api/system/cars/index.ts

@@ -64,28 +64,12 @@ export const delCar = (id: string | number | Array<string | number>) => {
 
 /**
  * 删除车辆图片
- * @param format
+ * @param id
  */
-export const uploadCar = (format: FormData) => {
+export const uploadCar = (formdata: FormData) => {
   return request({
     url: '/car/uploadImage',
     method: 'POST',
-    data: format
+    data: formdata
-  });
-};
-
-export interface AppUserList {
-  'user_id': string;
-  'user_name': string;
-  'user_phone': string;
-}
-/**
- * 获取用户端app-用户
- *  */
-export const getAppUser = (data): AxiosPromise<AppUserList[]> => {
-  return request({
-    url: '/car/getAppUserList',
-    method: 'GET',
-    params: data
   });
 };

src/api/system/community/type.ts

@@ -4,9 +4,9 @@ export interface communitylist_rows_type {
   villageCode: string;
   address: string;
   houseUse: number | null;
-  villageArea: string;
+  villageArea: number;
   remark: string;
-  parkingSpaceCount: string;
+  parkingSpaceCount: number;
   villageImageUrl: string;
   city: string;
   status: '0' | '1';

src/api/system/dept/index.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { DeptForm, DeptQuery, DeptVO } from './types';
+import { DeptForm, DeptQuery, DeptTreeVO, DeptVO } from './types';
 
 // 查询部门列表
 export const listDept = (query?: DeptQuery) => {

src/api/system/equipment/archive/type.ts

@@ -19,7 +19,6 @@ export interface DeviceVO {
    * 设备编号
    */
   deviceCode: string;
-  shelfLife: string;
 
   /**
    * 设备型号

src/api/system/house/index.ts

@@ -5,11 +5,11 @@ import { addBuildingType, addHouseType, BuildingUnit, BuildingVo } from './type'
 // 楼栋---------------------------------------------------------------------------------------
 
 /** 根据 小区id 和 类型   查询楼栋信息 */
-export function getBuildinglistAPI(query = {}): AxiosPromise<BuildingVo[]> {
+export function getBuildinglistAPI(): AxiosPromise<BuildingVo[]> {
   return request({
     url: '/building/byVillage',
     method: 'get',
-    params: query
+    params: {}
   });
 }
 /** 获取所有楼栋 */
@@ -118,7 +118,7 @@ export interface Data {
   billResidentList: BillResidentList[];
   chargeItemList: string[];
   house: House;
-  parkingList: Parking[];
+  parking: Parking;
   residentList: ResidentList[];
   storeroom: Storeroom;
 }
@@ -134,20 +134,16 @@ export interface BillResidentList {
 }
 
 export interface House {
-  'buildingName': string;
+  buildingName: string;
-  'unitNoName': string;
+  floorNo: number;
-  'houseId': string;
+  houseArea: string;
-  'houseType': string;
+  houseId: number;
-  'houseNo': string;
+  houseNo: string;
-  'houseArea': string;
+  houseType: string;
-  'floorNo': number;
+  internalArea: string;
-  'unitNoId': string;
+  shareArea: string;
-  'villageName': string;
+  unitNoName: string;
-  'villageId': string;
+  villageName: string;
-  'buildingId': string;
-
-  internalArea?: string;
-  shareArea?: string;
 }
 
 export interface ResidentList {
@@ -170,8 +166,6 @@ export interface Storeroom {
   remark: string;
   unitNoId: string;
   unitNo: number;
-
-  unitNoName: string;
 }
 
 export interface Parking {

src/api/system/house/type.ts

@@ -90,6 +90,5 @@ export interface addHouseType {
   'shareArea': string;
   'houseType': string;
   'storeroomId': string;
-  'parkingId'?: string;
+  'parkingId': string;
-  'parkingIds': string[];
 }

src/api/system/houseRental/index.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { HouseRentalVO, HouseRentalForm, HouseRentalQuery, HouseRentalSigningVO } from '@/api/system/houseRental/type';
+import { HouseRentalVO, HouseRentalForm, HouseRentalQuery } from '@/api/system/houseRental/type';
 
 /**
  * 查询房屋租赁管理列表
@@ -74,58 +74,16 @@ interface uploadHouseImagetype {
   }[];
   'error': string[];
 }
-export const uploadHouseImage = (formData: FormData): AxiosPromise<uploadHouseImagetype> => {
+export const uploadHouseImage = (formdata: FormData): AxiosPromise<uploadHouseImagetype> => {
   return request({
     url: '/houseRental/uploadImages',
     method: 'POST',
-    data: formData
+    data: formdata
   });
 };
-export const getHouseOwnUser = (
+export const getHouseOwnUser = (houseId: string): AxiosPromise<uploadHouseImagetype> => {
-  houseId: string
-): AxiosPromise<{
-  floorNo: number;
-  houseArea: number;
-  ownerName: string;
-}> => {
   return request({
     url: `/houseRental/ownerName/${houseId}`,
     method: 'GET'
   });
 };
-
-/**
- * 房屋租赁管理 改变状态 0：下架 1：上架
- * @param houseId
- * */
-export const changeHouseRedientStatus = (houseId: string): AxiosPromise<uploadHouseImagetype> => {
-  return request({
-    url: `/houseRental/changeStatus/${houseId}`,
-    method: 'PUT'
-  });
-};
-
-/**
- * 房屋租赁管理 签约
- * @param data
- */
-export const HouseRedientSign = (data: HouseRentalSigningVO): AxiosPromise<uploadHouseImagetype> => {
-  return request({
-    url: `/houseRental/sign`,
-    method: 'POST',
-    data: data
-  });
-};
-
-/**
- * 房屋租赁管理 签约上传
- * @param url
- * @param data
- */
-export const HouseRedientSignUpload = (url: string, data: FormData) => {
-  return request({
-    url: url,
-    method: 'POST',
-    data: data
-  });
-};

src/api/system/houseRental/type.ts

@@ -2,7 +2,7 @@ export interface HouseRentalVO {
   /**
    * id  房屋租赁表id
    */
-  id: string;
+  id: string | number;
 
   /**
    * 租户姓名
@@ -57,7 +57,7 @@ export interface HouseRentalVO {
   /**
    * 手机号
    */
-  phone: string;
+  phone: number;
 
   /**
    * 微信
@@ -72,7 +72,7 @@ export interface HouseRentalVO {
   /**
    * 房屋id
    */
-  houseId: string;
+  houseId: number;
   /**
    * 房屋用途
    */
@@ -88,53 +88,83 @@ export interface HouseRentalVO {
   pubTime: string;
   houseImageUrls: string[];
   facilitieslist: string[];
-  signingList?: HouseRentalSigningVO[];
 }
 
 export interface HouseRentalForm extends BaseEntity {
-  id: string;
-  houseId: string;
-  rentalName: string; // 租户姓名
-  rent: string; // 租金
-  houseFace: string; // 房屋朝向
-  rentalType: string; //  整租合租
-  phone: string; //手机号
-  houseArea: number; // 房屋面积
-  floorNo: number; //楼层号
-  inTime: string; //入住时间
-  facilities: string; //房屋设施
-  houseImageUrl: string; //房屋图片
-  supInfo: string; //补充租房信息
-  vx: string; //微信
-  houseUse?: string; //房屋用途
-  rentalStatus: number; //租赁状态
-  buildingId: string; //楼栋id
-  unitNoId: string; //单元id
-  email: string; //邮箱
   /**
-   * 小区id
+   * id  房屋租赁表id
    */
-  villageId?: string;
+  id?: string | number;
-}
+
-export interface HouseRentalSigningVO {
+  /**
-  rentAmount: string | number;
+   * 租户姓名
-  depositAmount: string | number;
+   */
-  'id': string;
+  rentalName?: string;
-  'rentalId': string;
+
-  'contractNo': string;
+  /**
-  'tenantName': string;
+   * 租金 单位元
-  'tenantPhone': string;
+   */
-  'chargeMode': string;
+  rent?: number;
-  'chargeStandard': string;
+
-  'contractName': string;
+  /**
-  'contractStatus': string;
+   * 0 整租 1 合租
-  'leaseStartDate': string;
+   */
-  'leaseEndDate': string;
+  rentalType?: string;
-  'houseId': string;
+
-  contractUrl: string;
+  /**
-  'villageId': string;
+   * 房屋朝向
-  'remark': string;
+   */
-  'createTime': string;
+  houseFace?: string;
+
+  /**
+   * 房屋面积
+   */
+  houseArea?: number;
+
+  /**
+   * 楼层号
+   */
+  floorNo?: number;
+
+  /**
+   * 入住时间
+   */
+  inTime?: string;
+
+  /**
+   * 房屋设施（“，”隔开）
+   */
+  facilities?: string;
+
+  /**
+   * 房屋照片url( "," 隔开)
+   */
+  houseImageUrl?: string;
+
+  /**
+   * 补充租房信息
+   */
+  supInfo?: string;
+
+  /**
+   * 手机号
+   */
+  phone?: number;
+
+  /**
+   * 微信
+   */
+  vx?: string;
+
+  /**
+   * 邮箱
+   */
+  email?: string;
+
+  /**
+   * 房屋id
+   */
+  houseId?: string | number;
 }
 
 export interface HouseRentalQuery extends PageQuery {

src/api/system/houseUse/index.ts

@@ -15,7 +15,7 @@ export const listHouseUseType = (query?: HouseUseTypeQuery): AxiosPromise<HouseU
     params: query
   });
 };
-export const listHouseUseType_add_house = (query?: HouseUseTypeQuery | {}): AxiosPromise<HouseUseTypeVO[]> => {
+export const listHouseUseType_add_house = (query?: HouseUseTypeQuery): AxiosPromise<HouseUseTypeVO[]> => {
   return request({
     url: '/houseUseType/getList',
     method: 'get',

src/api/system/oss/index.ts

@@ -12,7 +12,7 @@ export function listOss(query: OssQuery): AxiosPromise<OssVO[]> {
 }
 
 // 查询OSS对象基于id串
-export function listByIds(ossId: string): AxiosPromise<OssVO[]> {
+export function listByIds(ossId: string | number): AxiosPromise<OssVO[]> {
   return request({
     url: '/resource/oss/listByIds/' + ossId,
     method: 'get'

src/api/system/parking/index.ts

@@ -63,7 +63,7 @@ export const delParking = (id: string | number | Array<string | number>) => {
 };
 /**
  * 改变车位审核装填
- * @param data
+ * @param id
  */
 export const getParkingReview = (data: { id: string; propertyReviewFeedback: string; propertyStatus: number }) => {
   return request({
@@ -88,7 +88,6 @@ export const getParkingReviewInfo = (id: string) => {
 /**
  * 查询小区内车位列表
  * @param { string } villageid
- * @param { string } houseId
  * @returns {*}
  */
 
@@ -102,25 +101,3 @@ export const GetVillageListParking = (villageid: string, houseId: string = undef
     }
   });
 };
-
-/**
- * 查询 车位持有人信息
- * @returns {*}
- * @param residentId
- */
-export const getParkingResidentInfo = (
-  residentId: string
-): AxiosPromise<{
-  id: '';
-  name: '';
-  type: '';
-  status: '';
-  idCard: '';
-  phone: '';
-  houseName: '';
-}> => {
-  return request({
-    url: `/car/holder/${residentId}`,
-    method: 'GET'
-  });
-};

src/api/system/post/Questionnaire/index.ts

@@ -53,47 +53,11 @@ export const updateQuestionnaire = (data: QuestionnaireForm) => {
 
 /**
  * 删除问卷调查
- * @param ids
+ * @param id
- * @param vailid
- * @param ids
- * @param vailid
  */
-export const delQuestionnaire = (ids: string | string[], vailid: boolean = true) => {
+export const delQuestionnaire = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/questionnaire/' + ids + '?isValid=' + vailid,
+    url: '/questionnaire/' + id,
-    method: 'delete',
+    method: 'delete'
-    headers: {
-      silentError: 'true'
-    }
-  });
-};
-/**
- * 查询问卷调查回答列表
- */
-export const getQuestionnaireAnswer = (
-  {
-    pageSize,
-    pageNum,
-    questionnaireId
-  }
-) => {
-  return request({
-    url: '/questionnaireAnswer/list',
-    method: 'GET',
-    params: {
-      pageSize,
-      pageNum,
-      questionnaireId,
-      answerStatus: '1'
-    }
-  });
-};
-/**
- * 查询问卷调查回答详情
- */
-export const getQuestionnaireAnswerMain = (id: string) => {
-  return request({
-    url: '/questionnaireAnswer/' + id,
-    method: 'GET'
   });
 };

src/api/system/post/Questionnaire/type.ts

@@ -51,7 +51,7 @@ export interface QuestionnaireForm extends BaseEntity {
   /**
    * 问卷ID
    */
-  id?: string;
+  id?: string | number;
 
   /**
    * 所属小区id
@@ -158,7 +158,7 @@ export interface QuestionComponentItem {
 }
 
 export interface QuestionComponentnaireForm {
-  id?: string;
+  id?: string | number | null;
   title: string;
   description?: string;
   content: QuestionComponentItem[];

src/api/system/report/LeaseManagementDetails/index.ts

@@ -1,20 +0,0 @@
-import request from '@/utils/request';
-import {
-  leaseManagementDetailChargeTypesResponse,
-  leaseManagementDetailRequest,
-  leaseManagementDetailResponse
-} from '@/api/system/report/LeaseManagementDetails/type';
-
-export const getLeaseManagementDetailList = (data?: leaseManagementDetailRequest): Promise<leaseManagementDetailResponse> => {
-  return request({
-    url: '/leaseManagementDetail/list',
-    method: 'POST',
-    data: data
-  });
-};
-export const getLeaseManagementDetailChargeTypesList = (): Promise<leaseManagementDetailChargeTypesResponse> => {
-  return request({
-    url: '/leaseManagementDetail/chargeTypes',
-    method: 'POST'
-  });
-};

src/api/system/report/LeaseManagementDetails/type.ts

@@ -1,203 +0,0 @@
-export type leaseManagementDetailRequest = {
-  /**
-   * 面积
-   */
-  areaSize?: string;
-  /**
-   * 收费模式多选
-   */
-  chargeModes?: string[];
-  /**
-   * 收费标准多选
-   */
-  chargeStandards?: string[];
-  /**
-   * 按收费类型筛选应收/已收/未收金额区间
-   */
-  chargeTypeFilters?: ChargeTypeFilter[];
-  /**
-   * 租赁起始日-开始
-   */
-  leaseStartDateBegin?: string;
-  /**
-   * 租赁起始日-结束
-   */
-  leaseStartDateEnd?: string;
-  /**
-   * 承租方
-   */
-  lessee?: string;
-  /**
-   * 当前页码
-   */
-  pageNum: number;
-  /**
-   * 每页条数
-   */
-  pageSize: number;
-  /**
-   * 手机号
-   */
-  phone?: string;
-  /**
-   * 房号
-   */
-  roomNumber?: string;
-  /**
-   * 小区多选
-   */
-  villageIds?: number[];
-
-  leaseEndDateBegin?: string;
-  leaseEndDateEnd?: string;
-};
-
-export type ChargeTypeFilter = {
-  /**
-   * 收费类型名称
-   */
-  chargeTypeName?: string;
-  /**
-   * 收费类型ID
-   */
-  chargeTypeId?: string;
-  /**
-   * 应收上限
-   */
-  receivableMax?: string;
-  /**
-   * 应收下限
-   */
-  receivableMin?: string;
-  /**
-   * 已收上限
-   */
-  receivedMax: string;
-  /**
-   * 已收下限
-   */
-  receivedMin: string;
-  /**
-   * 未收上限
-   */
-  uncollectedMax: string;
-  /**
-   * 未收下限
-   */
-  uncollectedMin: string;
-};
-
-export type leaseManagementDetailResponse = {
-  /**
-   * 收费类型
-   */
-  chargeItems: ChargeItem[];
-  code: number;
-  msg: string;
-  /**
-   * 当前页明细行数据
-   */
-  rows: Row[];
-  /**
-   * 总记录数
-   */
-  total: number;
-};
-
-export type ChargeItem = {
-  /**
-   * 收费类型ID
-   */
-  chargeTypeId: string;
-  /**
-   * 收费类型名称
-   */
-  chargeTypeName: string;
-};
-
-export type Row = {
-  /**
-   * 小区名称
-   */
-  area: string;
-  /**
-   * 面积（㎡）
-   */
-  areaSize: string;
-  /**
-   * 小区ID
-   */
-  buildingId: string;
-  /**
-   * 收费模式
-   */
-  chargeMode: string;
-  /**
-   * 收费标准
-   */
-  chargeStandard: string;
-  /**
-   * 房屋ID
-   */
-  houseId: string;
-  /**
-   * 签约记录ID
-   */
-  id: string;
-  /**
-   * 租赁终止日
-   */
-  leaseEndDate: string;
-  /**
-   * 租赁起始日
-   */
-  leaseStartDate: string;
-  /**
-   * 承租方
-   */
-  lessee: string;
-  /**
-   * 电话
-   */
-  phone: string;
-  /**
-   * 各收费类型应收
-   */
-  receivableAmounts: { [key: string]: any };
-  /**
-   * 各收费类型已收
-   */
-  receivedAmounts: { [key: string]: any };
-  /**
-   * 房号
-   */
-  roomNumber: string;
-  /**
-   * 各收费类型未收
-   */
-  uncollectedAmounts: { [key: string]: any };
-  [property: string]: any;
-};
-
-export type leaseManagementDetailChargeTypesResponse = {
-  code: number;
-  data: Datum[];
-  msg: string;
-};
-
-export type Datum = {
-  chargeTypeId: string;
-  chargeTypeName: string;
-};
-
-// 0000000000000000
-export interface queryParamsType extends leaseManagementDetailRequest {
-  chargeTypeFilters: chargeTypeFiltersType[];
-}
-
-export interface chargeTypeFiltersType extends ChargeTypeFilter {
-  receivable?: string;
-  uncollected?: string;
-  received?: string;
-  chargeTypeName?: string;
-}

src/api/system/report/aging/index.ts

@@ -1,20 +0,0 @@
-import request from '@/utils/request';
-import { AgingListResponse, OwnerArrearsDetailVo } from '@/api/system/report/aging/type';
-import { AxiosPromise } from 'axios';
-
-export const getAgingList = (query): Promise<AgingListResponse> => {
-  return request({
-    url: '/agingAnalysis/summary',
-    method: 'get',
-    params: query
-  });
-};
-
-
-export const getDetailList = (query): Promise<AgingListResponse> => {
-  return request({
-    url: '/agingAnalysis/detail',
-    method: 'get',
-    params: query
-  });
-};

src/api/system/report/aging/type.ts

@@ -1,74 +0,0 @@
-export interface AgingListResponse {
-  total: number;
-  rows: AgingSummary[];
-  summary: AgingSummary;
-  code: number;
-  msg: string;
-}
-
-export interface AgingSummary {
-  amountLe6: string;
-  amountM6To12: string;
-  amountOver5: string;
-  amountY1To2: string;
-  amountY2To3: string;
-  amountY3To4: string;
-  amountY4To5: string;
-  cutoffPeriod: string;
-  houseTypeName: string;
-  totalAmount: string;
-  villageName: string;
-}
-// 明细    ---------------------------------
-/**
- * 业主欠费明细视图对象
- *
- * OwnerArrearsDetailVo
- */
-export type OwnerArrearsDetailVo = {
-  /**
-   * 区域（小区名称）
-   */
-  area?: string;
-  /**
-   * 欠费月数
-   */
-  arrearsMonths?: number;
-  /**
-   * 应账账期（如：20170101-20171231）
-   */
-  billPeriod?: string;
-  /**
-   * 客户（业主姓名）
-   */
-  customerName?: string;
-  /**
-   * 垃圾清运费
-   */
-  garbageFee?: number;
-  /**
-   * 房号
-   */
-  houseNo?: string;
-  /**
-   * 其他费用合计
-   */
-  otherFee?: number;
-  /**
-   * 联系电话
-   */
-  phone?: string;
-  /**
-   * 物业费
-   */
-  propertyFee?: number;
-  /**
-   * 序号
-   */
-  serialNumber?: number;
-  /**
-   * 金额合计
-   */
-  totalAmount?: number;
-  [property: string]: any;
-};

src/api/system/report/arrears/arrears.ts

@@ -1,18 +0,0 @@
-import request from '@/utils/request';
-import { ArrearsDetailQuery, ArrearsListResponse, ArrearsQuery, OwnerArrearsDetailVo } from '@/api/system/report/arrears/type';
-import { AxiosPromise } from 'axios';
-
-export const getArrearsList = (query?: ArrearsQuery): Promise<ArrearsListResponse> => {
-  return request({
-    url: '/outstandingFeeSummary/list',
-    method: 'get',
-    params: query
-  });
-};
-export const getArrearsDetails = (query?: ArrearsDetailQuery): AxiosPromise<OwnerArrearsDetailVo[]> => {
-  return request({
-    url: '/outstandingFeeSummary/ownerArrearsDetail',
-    method: 'get',
-    params: query
-  });
-};

src/api/system/report/arrears/type.ts

@@ -1,113 +0,0 @@
-
-export interface ArrearsQuery extends PageQuery {
-  /**
-   * 视图类型：
-   * 1 - 维度一（收费类型为行）
-   * 2 - 维度二（房屋类型为行）
-   * */
-  viewType: number;
-  chargeItemId?: string;
-  houseUseId?: string;
-  villageId?: string;
-}
-
-export interface ArrearsListResponse {
-  code: number;
-  msg: string;
-  data: ArrearsVO[];
-}
-
-export interface ArrearsVO extends ArrearsType1, ArrearsType2 {
-  'villageName': string;
-  'totalAmount': string;
-}
-
-
-export interface ArrearsType1 {
-  'chargeItemName'?: string;
-  'houseTypeAmounts'?: {
-    [key: string]: string;
-  };
-}
-
-export interface ArrearsType2 {
-  'houseTypeName'?: string;
-  'chargeItemAmounts'?: {
-    [key: string]: string;
-  };
-}
-
-export interface ArrearsDetailQuery extends PageQuery {
-  /**
-   * 客户姓名（模糊查询）
-   */
-  customerName?: string;
-  /**
-   * 结束时间
-   */
-  endTime?: string;
-  /**
-   * 房号（模糊查询）
-   */
-  houseNo?: string;
-  /**
-   * 联系电话（模糊查询）
-   */
-  phone?: string;
-  /**
-   * 开始时间
-   */
-  startTime?: string;
-}
-/**
- * 业主欠费明细视图对象
- *
- * OwnerArrearsDetailVo
- */
-export type OwnerArrearsDetailVo = {
-  /**
-   * 区域（小区名称）
-   */
-  area?: string;
-  /**
-   * 欠费月数
-   */
-  arrearsMonths?: number;
-  /**
-   * 应账账期（如：20170101-20171231）
-   */
-  billPeriod?: string;
-  /**
-   * 各收费类型金额（key: 收费类型名称, value: 金额）
-   */
-  chargeItemAmounts?: MapBigDecimal;
-  /**
-   * 客户（业主姓名）
-   */
-  customerName?: string;
-  /**
-   * 房号
-   */
-  houseNo?: string;
-  /**
-   * 联系电话
-   */
-  phone?: string;
-  /**
-   * 序号
-   */
-  serialNumber?: number | string;
-  /**
-   * 金额合计
-   */
-  totalAmount?: number;
-};
-
-/**
- * 各收费类型金额（key: 收费类型名称, value: 金额）
- *
- * MapBigDecimal
- */
-export type MapBigDecimal = {
-  [property: string]: number;
-};

src/api/system/report/arrearsTrend/index.ts

@@ -1,9 +0,0 @@
-import request from '@/utils/request';
-
-export const getArrearsTend = (query) => {
-  return request({
-    url: '/propertyFeeTrend/arrearsTrend',
-    method: 'get',
-    params: query
-  });
-};

src/api/system/report/businessDailyReport/index.ts

@@ -1,54 +0,0 @@
-import request from '@/utils/request';
-import { Response } from '@/api/system/report/businessDailyReport/type';
-
-/**
- * 按小区统计
- * @param query
- * @returns
- * */
-export const getBusinessDailyReport = (query): Promise<Response> => {
-  return request({
-    url: '/businessDailyReport/village',
-    method: 'get',
-    params: query
-  });
-};
-/**
- * 按小区统计导出
- * @param query
- * @returns
- * */
-export const getBusinessDailyReportExport = (query): Promise<Response> => {
-  return request({
-    url: '/businessDailyReport/village/export',
-    method: 'get',
-    params: query
-  });
-};
-
-
-
-/**
- * 按收费项目统计
- * @param query
- * @returns
- * */
-export const getBusinessDailyReportChargeItem = (query): Promise<Response> => {
-  return request({
-    url: '/businessDailyReport/chargeItem',
-    method: 'get',
-    params: query
-  });
-};
-/**
- * 按收费项目统计导出
- * @param query
- * @returns
- * */
-export const getBusinessDailyReportChargeItemExport = (query): Promise<Response> => {
-  return request({
-    url: '/businessDailyReport/chargeItem/export',
-    method: 'get',
-    params: query
-  });
-};

src/api/system/report/businessDailyReport/type.ts

@@ -1,77 +0,0 @@
-export type Response = {
-  code: number;
-  msg: string;
-  /**
-   * 支付方式
-   */
-  payTypes: PayType[];
-  /**
-   * 数据列表
-   */
-  rows: RowsType[];
-  /**
-   * 合计行
-   */
-  summary: Summary;
-  total: number;
-};
-
-export type RowsType = Row | RowVillage;
-
-export type Row = {
-  /**
-   * 收费项目ID
-   */
-  chargeItemId: string;
-  /**
-   * 收费项目名称
-   */
-  chargeItemName: string;
-  /**
-   * 各支付方式金额
-   */
-  payAmounts: { [key: string]: string };
-  /**
-   * 合计金额
-   */
-  totalAmount: string;
-};
-
-export type RowVillage = {
-  /**
-   * 各支付方式金额
-   */
-  payAmounts?: { [key: string]: string };
-  /**
-   * 合计金额
-   */
-  totalAmount?: number;
-  /**
-   * 小区ID
-   */
-  villageId?: number;
-  /**
-   * 小区名称
-   */
-  villageName?: string;
-};
-
-export type PayType = {
-  /**
-   * 支付方式编码
-   */
-  payType: string;
-  /**
-   * 支付方式名称
-   */
-  payTypeName: string;
-};
-/**
- * 合计行
- */
-export type Summary = {
-  chargeItemId: null;
-  chargeItemName: string;
-  payAmounts: { [key: string]: string };
-  totalAmount: string;
-};

src/api/system/report/chargeTrend/index.ts

@@ -1,9 +0,0 @@
-import request from '@/utils/request';
-
-export const getChargeTend = (query)=> {
-  return request({
-    url: '/propertyFeeTrend/chargeTrend',
-    method: 'get',
-    params: query
-  });
-};

src/api/system/report/dailyFeeReport/index.ts

@@ -1,18 +0,0 @@
-import request from '@/utils/request';
-import { FilterResponse, Response } from '@/api/system/report/dailyFeeReport/type';
-
-export const getDailyFeeReportList = (data = {}): Promise<Response> => {
-  return request({
-    url: '/dailyFeeReport/list',
-    method: 'POST',
-    data: data
-  });
-};
-// 获取动态查询数据
-export const getDailyFeeReportDynamicList = (data = {}): Promise<FilterResponse> => {
-  return request({
-    url: '/dailyFeeReport/filters',
-    method: 'GET',
-    data: data
-  });
-};

src/api/system/report/dailyFeeReport/type.ts

@@ -1,44 +0,0 @@
-export type Response = {
-  code: number;
-  rows: Datum[];
-  total: number;
-  msg: string;
-};
-
-export type Datum = {
-  alipayAmount: string;
-  cashAmount: string;
-  chargeTypeAmounts: ChargeTypeAmounts;
-  deposit: string;
-  depositAmount: string;
-  discountAmount: string;
-  electricFee: string;
-  handler: null | string;
-  houseName: string;
-  payTime: string;
-  propertyOffsetAmount: string;
-  remark: string;
-  residentName: string;
-  transferAmount: string;
-  unionPayAmount: string;
-  waterFee: string;
-  wechatAmount: string;
-  yiDangFuAmount: string;
-};
-
-export type ChargeTypeAmounts = {
-  [property: string]: {
-    amount?: string;
-    endDate?: string;
-    startDate?: string;
-  };
-};
-
-export type FilterResponse = {
-  code: number;
-  data: {
-    'chargeTypeId': string;
-    'chargeTypeName': string;
-  }[];
-  msg: string;
-};

src/api/system/report/monthFeeReport/index.ts

@@ -1,10 +0,0 @@
-import request from '@/utils/request';
-import { MonthFeeReportQueryForm, Response } from '@/api/system/report/monthFeeReport/type';
-
-export const getMonthFeeReportList = (data: MonthFeeReportQueryForm = {}): Promise<Response> => {
-  return request({
-    url: '/chargeMonthlyReport/list',
-    method: 'GET',
-    params: data
-  });
-};

src/api/system/report/monthFeeReport/type.ts

@@ -1,75 +0,0 @@
-
-export type MonthFeeReportQueryForm = {
-  /**
-   * 房屋用途类型
-   */
-  buildingIds?: string;
-  /**
-   * 月收费率区间
-   */
-  monthRate?: string;
-  /**
-   * 本月应收区间
-   */
-  monthReceivable?: string;
-  /**
-   * 本月未收区间
-   */
-  monthUnpaid?: string;
-  /**
-   * 当前页码
-   */
-  pageNum?: number;
-  /**
-   * 每页条数
-   */
-  pageSize?: number;
-  /**
-   * 综合欠收区间
-   */
-  totalArrears?: string;
-  /**
-   * 综合预收区间
-   */
-  totalPrepaid?: string;
-  /**
-   * 小区ID
-   */
-  villageId?: string;
-  /**
-   * 年收费率区间
-   */
-  yearRate?: string;
-  /**
-   * 本年应收区间
-   */
-  yearReceivable?: string;
-  /**
-   * 本年未收区间
-   */
-  yearUnpaid?: string;
-};
-export type Response = {
-  code: number;
-  msg: string;
-  rows: Row[];
-  total: number;
-};
-
-export type Row = {
-  buildingId: BuildingId;
-  buildingName: string;
-  monthRate: string;
-  monthReceivable: string;
-  monthReceived: string;
-  monthUnpaid: string;
-  totalArrears: string;
-  totalPrepaid: string;
-  yearRate: string;
-  yearReceivable: string;
-  yearReceived: string;
-  yearUnpaid: string;
-  [property: string]: any;
-};
-
-export type BuildingId = number | string;

src/api/system/report/paidInExpenses/index.ts

@@ -1,10 +0,0 @@
-import request from '@/utils/request';
-import { Response } from '@/api/system/report/paidInExpensesReceivable/type';
-
-export const getPaidInExpensesList = (data): Promise<Response> => {
-  return request({
-    url: '/paidInExpenses/list',
-    method: 'POST',
-    data: data
-  });
-};

src/api/system/report/paidInExpenses/type.ts

@@ -1,29 +0,0 @@
-export type Response = {
-  code: number;
-  data: Data;
-  msg: string;
-};
-
-export type Data = {
-  chargeTypes: string[];
-  details: Detail[];
-  total: Total;
-};
-
-export type Detail = {
-  amounts: DetailAmounts;
-  name: string;
-  sequence: string;
-  total: string;
-};
-
-export type DetailAmounts = {
-  [property: string]: string;
-};
-
-export type Total = {
-  amounts: DetailAmounts;
-  name: string;
-  sequence: string;
-  total: string;
-};

src/api/system/report/paidInExpensesReceivable/index.ts

@@ -1,10 +0,0 @@
-import request from '@/utils/request';
-import { Response } from '@/api/system/report/paidInExpensesReceivable/type';
-
-export const getPaidInExpensesReceivableList = (data): Promise<Response> => {
-  return request({
-    url: '/paidInExpenses/receivable/list',
-    method: 'POST',
-    data: data
-  });
-};

src/api/system/report/paidInExpensesReceivable/type.ts

@@ -1,29 +0,0 @@
-export type Response = {
-  code: number;
-  data: Data;
-  msg: string;
-};
-
-export type Data = {
-  chargeTypes: string[];
-  details: Detail[];
-  total: Total;
-};
-
-export type Detail = {
-  amounts: DetailAmounts;
-  name: string;
-  sequence: string;
-  total: string;
-};
-
-export type DetailAmounts = {
-  [property: string]: string;
-};
-
-export type Total = {
-  amounts: DetailAmounts;
-  name: string;
-  sequence: string;
-  total: string;
-};

src/api/system/report/prepaidBalance/index.ts

@@ -1,10 +0,0 @@
-import request from '@/utils/request';
-import { Request, Response } from '@/api/system/report/prepaidBalance/type';
-
-export const getPrepaidBalanceList = (query: Request): Promise<Response> => {
-  return request({
-    url: '/prepaidBalance/summary',
-    method: 'GET',
-    params: query
-  });
-};

src/api/system/report/prepaidBalance/type.ts

@@ -1,83 +0,0 @@
-export type Request = {
-  /**
-   * 收费类型ID
-   */
-  chargeTypeId?: string;
-  /**
-   * 房屋类型ID
-   */
-  houseUseTypeId?: string;
-  /**
-   * 当前页数
-   */
-  pageNum?: number;
-  /**
-   * 分页大小
-   */
-  pageSize?: number;
-  /**
-   * 小区ID
-   */
-  villageId?: string;
-};
-
-export type Response = {
-  /**
-   * 动态收费项目列头
-   */
-  chargeItems: ChargeItem[];
-  code: number;
-  msg: string;
-  /**
-   * 汇总数据行列表
-   */
-  rows: Row[];
-  /**
-   * 全部合计行
-   */
-  summary: Summary;
-  /**
-   * 总记录数
-   */
-  total: number;
-};
-
-export type ChargeItem = {
-  /**
-   * 收费项目名称
-   */
-  chargeItemName: string;
-  /**
-   * 收费类型ID
-   */
-  chargeTypeId: number;
-};
-
-export type Row = {
-  /**
-   * 各收费项目预收余额
-   */
-  chargeItemAmounts?: { [key: string]: any };
-  /**
-   * 房屋类型名称
-   */
-  houseTypeName?: string;
-  /**
-   * 合计金额
-   */
-  totalAmount?: number;
-  /**
-   * 小区名称
-   */
-  villageName?: string;
-};
-
-/**
- * 全部合计行
- */
-export type Summary = {
-  chargeItemAmounts: { [key: string]: string };
-  houseTypeName: string;
-  totalAmount: number;
-  villageName: string;
-};

src/api/system/report/prepaidBalanceDetail/index.ts

@@ -1,10 +0,0 @@
-import request from '@/utils/request';
-import { Request, Response } from '@/api/system/report/prepaidBalance/type';
-
-export const getPrepaidBalanceDetailList = (query: Request): Promise<Response> => {
-  return request({
-    url: '/prepaidBalance/detail',
-    method: 'GET',
-    params: query
-  });
-};

src/api/system/report/prepaidBalanceDetail/type.ts

@@ -1,83 +0,0 @@
-export type Request = {
-  /**
-   * 收费类型ID
-   */
-  chargeTypeId?: string;
-  /**
-   * 房屋类型ID
-   */
-  houseUseTypeId?: string;
-  /**
-   * 当前页数
-   */
-  pageNum?: number;
-  /**
-   * 分页大小
-   */
-  pageSize?: number;
-  /**
-   * 小区ID
-   */
-  villageId?: string;
-};
-
-export type Response = {
-  /**
-   * 动态收费项目列头
-   */
-  chargeItems: ChargeItem[];
-  code: number;
-  msg: string;
-  /**
-   * 汇总数据行列表
-   */
-  rows: Row[];
-  /**
-   * 全部合计行
-   */
-  summary: Summary;
-  /**
-   * 总记录数
-   */
-  total: number;
-};
-
-export type ChargeItem = {
-  /**
-   * 收费项目名称
-   */
-  chargeItemName: string;
-  /**
-   * 收费类型ID
-   */
-  chargeTypeId: number;
-};
-
-export type Row = {
-  /**
-   * 各收费项目预收余额
-   */
-  chargeItemAmounts?: { [key: string]: any };
-  /**
-   * 房屋类型名称
-   */
-  houseTypeName?: string;
-  /**
-   * 合计金额
-   */
-  totalAmount?: number;
-  /**
-   * 小区名称
-   */
-  villageName?: string;
-};
-
-/**
- * 全部合计行
- */
-export type Summary = {
-  chargeItemAmounts: { [key: string]: string };
-  houseTypeName: string;
-  totalAmount: number;
-  villageName: string;
-};

src/api/system/resident/index.ts

@@ -1,13 +1,14 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { ResidentVO, ResidentForm, ResidentQuery } from '@/api/system/residentReviewProcess/resident/type';
+import { ResidentVO, ResidentForm, ResidentQuery } from '@/api/system/resident/type';
 
 /**
  * 查询住户管理列表
  * @param query
  * @returns {*}
  */
-export const listResident = (query?: ResidentQuery | {}): AxiosPromise<ResidentVO[]> => {
+
+export const listResident = (query?: ResidentQuery): AxiosPromise<ResidentVO[]> => {
   return request({
     url: '/resident/list',
     method: 'get',
@@ -63,6 +64,7 @@ export const delResident = (id: string | number | Array<string | number>) => {
 
 /**
  * 添加住户管理-上传身份证
+ * @param id
  */
 export const UploadidCardApi = () => {
   return request({

src/api/system/resident/type.ts

@@ -2,11 +2,8 @@ export interface ResidentVO {
   /**
    * 主键  住户管理id
    */
-  userId: string;
+  userId: string | number;
   id: string;
-  unitNoId: string;
-  idCardType: string;
-  ownerRelationship: string;
   /**
    * 住户编号
    */
@@ -16,22 +13,21 @@ export interface ResidentVO {
    * 姓名
    */
   name: string;
-  nickName: string;
 
   /**
-   * 0 业主  1 租户
+   * 0业主  1租户
    */
   type: string;
 
   /**
-   * 0 男性 1 女性
+   * 0 男性 1女性
    */
   gender: string;
 
   /**
    * 身份证号
    */
-  idCard: string;
+  idCard: string | number;
 
   /**
    * 手机号码
@@ -46,7 +42,7 @@ export interface ResidentVO {
   /**
    * 楼栋id
    */
-  buildingId: string;
+  buildingId: string | number;
 
   /**
    * 房屋表id
@@ -78,22 +74,11 @@ export interface ResidentVO {
 }
 
 export interface ResidentForm extends BaseEntity {
-  /**
-   * 年龄
-   */
-  age?: number;
   /**
    * 主键  住户管理id
    */
-  userId?: string;
+  userId?: string | number;
-  unitNoId?: string;
+
-  /**
-   * 证件类型
-   * 0 身份证
-   * 1 护照
-   * 2 港澳通行证
-   */
-  idCardType?: string;
   /**
    * 住户编号
    */
@@ -105,22 +90,22 @@ export interface ResidentForm extends BaseEntity {
   name?: string;
 
   /**
-   * 0 业主
+   * 0业主
-   * 1 亲属
+   * 1亲属
-   * 2 租户
+   * 2租户
-   * 3 朋友
+   * 3朋友
    */
   ownerRelationship?: string;
 
   /**
-   * 0 男性 1 女性
+   * 0 男性 1女性
    */
   gender?: string;
 
   /**
    * 身份证号
    */
-  idCard?: string;
+  idCard?: string | number;
 
   /**
    * 手机号码
@@ -135,7 +120,7 @@ export interface ResidentForm extends BaseEntity {
   /**
    * 楼栋id
    */
-  buildingId?: string;
+  buildingId?: string | number;
 
   /**
    * 房屋表id
@@ -168,24 +153,17 @@ export interface ResidentQuery extends PageQuery {
    * 日期范围参数
    */
   date?: any;
+
   /**
-   * 房屋名称
+   * 0业主
-   */
+   * 1亲属
-  houseName?: string;
+   * 2租户
-  /**
+   * 3朋友
-   * 姓名
-   */
-  name?: string;
-  /**
-   * 0 业主
-   * 1 亲属
-   * 2 租户
-   * 3 朋友
    */
   ownerRelationship?: string;
   /**
    * 住户状态
-   * 0 审核中 1 已认证
+   * 0审核中 1 已认证
    */
   status?: string;
 

src/api/system/residentReviewProcess/type.ts

@@ -0,0 +1,140 @@
+export interface ResidentReviewProcessVO {
+  /**
+   * 住户审核表
+   */
+  id: string | number;
+
+  /**
+   * 住户表id
+   */
+  residentId: string | number;
+
+  /**
+   * 提交时间
+   */
+  submitTime: string;
+
+  /**
+   * 提交状态  0未提交  1已提交
+   */
+  submitStatus: number;
+
+  /**
+   * 物业审核时间
+   */
+  propertyTime: string;
+
+  /**
+   * 物业审核状态 0 待审核 1审核通过 2审核未通过
+   */
+  propertyStatus: number;
+
+  /**
+   * 物业审核意见
+   */
+  propertyReviewFeedback: string;
+
+  /**
+   * 认证时间
+   */
+  certificationTime: string;
+
+  /**
+   * 认证状态 0未认证 1已认证
+   */
+  certificationStatus: number;
+}
+
+export interface ResidentReviewProcessForm extends BaseEntity {
+  /**
+   * 住户审核表
+   */
+  id?: string | number;
+
+  /**
+   * 住户表id
+   */
+  residentId?: string | number;
+
+  /**
+   * 提交时间
+   */
+  submitTime?: string;
+
+  /**
+   * 提交状态  0未提交  1已提交
+   */
+  submitStatus?: number;
+
+  /**
+   * 物业审核时间
+   */
+  propertyTime?: string;
+
+  /**
+   * 物业审核状态 0 待审核 1审核通过 2审核未通过
+   */
+  propertyStatus?: number;
+
+  /**
+   * 物业审核意见
+   */
+  propertyReviewFeedback?: string;
+
+  /**
+   * 认证时间
+   */
+  certificationTime?: string;
+
+  /**
+   * 认证状态 0未认证 1已认证
+   */
+  certificationStatus?: number;
+}
+
+export interface ResidentReviewProcessQuery extends PageQuery {
+  /**
+   * 住户表id
+   */
+  residentId?: string | number;
+
+  /**
+   * 提交时间
+   */
+  submitTime?: string;
+
+  /**
+   * 提交状态  0未提交  1已提交
+   */
+  submitStatus?: number;
+
+  /**
+   * 物业审核时间
+   */
+  propertyTime?: string;
+
+  /**
+   * 物业审核状态 0 待审核 1审核通过 2审核未通过
+   */
+  propertyStatus?: number;
+
+  /**
+   * 物业审核意见
+   */
+  propertyReviewFeedback?: string;
+
+  /**
+   * 认证时间
+   */
+  certificationTime?: string;
+
+  /**
+   * 认证状态 0未认证 1已认证
+   */
+  certificationStatus?: number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}

src/api/system/revenueNotice/index.ts

@@ -1,63 +0,0 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { RevenueNoticeVO, RevenueNoticeForm, RevenueNoticeQuery } from './type';
-
-/**
- * 查询公区收益通知列表
- * @param query
- * @returns {*}
- */
-
-export const listRevenueNotice = (query?: RevenueNoticeQuery): AxiosPromise<RevenueNoticeVO[]> => {
-  return request({
-    url: '/revenueNotice/list',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询公区收益通知详细
- * @param noticeId
- */
-export const getRevenueNotice = (noticeId: string | number): AxiosPromise<RevenueNoticeVO> => {
-  return request({
-    url: '/revenueNotice/' + noticeId,
-    method: 'get'
-  });
-};
-
-/**
- * 新增公区收益通知
- * @param data
- */
-export const addRevenueNotice = (data: RevenueNoticeForm) => {
-  return request({
-    url: '/revenueNotice',
-    method: 'post',
-    data: data
-  });
-};
-
-/**
- * 修改公区收益通知
- * @param data
- */
-export const updateRevenueNotice = (data: RevenueNoticeForm) => {
-  return request({
-    url: '/revenueNotice',
-    method: 'put',
-    data: data
-  });
-};
-
-/**
- * 删除公区收益通知
- * @param noticeId
- */
-export const delRevenueNotice = (noticeId: string | number | Array<string | number>) => {
-  return request({
-    url: '/revenueNotice/' + noticeId,
-    method: 'delete'
-  });
-};

src/api/system/revenueNotice/type.ts

@@ -1,140 +0,0 @@
-export interface RevenueNoticeVO {
-  /**
-   * 公告ID
-   */
-  noticeId: string | number;
-
-  /**
-   * 公告标题
-   */
-  noticeTitle: string;
-
-  /**
-   * 公告内容
-   */
-  noticeContent: string;
-
-  /**
-   * 作者
-   */
-  author: string;
-
-  /**
-   * 紧急程度 0=普通 1=紧急 2=非常紧急
-   */
-  urgencyLevel: number;
-
-  /**
-   * 发布状态 0=草稿 1=已发布
-   */
-  publishStatus: number;
-
-  /**
-   * 发布人
-   */
-  publishBy: string;
-
-  /**
-   * 发布日期
-   */
-  publishTime: string;
-
-  /**
-   * 所属小区id
-   */
-  villageId: string | number;
-}
-
-export interface RevenueNoticeForm extends BaseEntity {
-  /**
-   * 公告ID
-   */
-  noticeId?: string | number;
-
-  /**
-   * 公告标题
-   */
-  noticeTitle?: string;
-
-  /**
-   * 公告内容
-   */
-  noticeContent?: string;
-
-  /**
-   * 作者
-   */
-  author?: string;
-
-  /**
-   * 紧急程度 0=普通 1=紧急 2=非常紧急
-   */
-  urgencyLevel?: number;
-
-  /**
-   * 发布状态 0=草稿 1=已发布
-   */
-  publishStatus?: number;
-
-  /**
-   * 发布人
-   */
-  publishBy?: string;
-
-  /**
-   * 发布日期
-   */
-  publishTime?: string;
-
-  /**
-   * 所属小区id
-   */
-  villageId?: string | number;
-}
-
-export interface RevenueNoticeQuery extends PageQuery {
-  /**
-   * 公告标题
-   */
-  noticeTitle?: string;
-
-  /**
-   * 公告内容
-   */
-  noticeContent?: string;
-
-  /**
-   * 作者
-   */
-  author?: string;
-
-  /**
-   * 紧急程度 0=普通 1=紧急 2=非常紧急
-   */
-  urgencyLevel?: number;
-
-  /**
-   * 发布状态 0=草稿 1=已发布
-   */
-  publishStatus?: number;
-
-  /**
-   * 发布人
-   */
-  publishBy?: string;
-
-  /**
-   * 发布日期
-   */
-  publishTime?: string;
-
-  /**
-   * 所属小区id
-   */
-  villageId?: string | number;
-
-  /**
-   * 日期范围参数
-   */
-  params?: any;
-}

src/api/system/storeroom/index.ts

@@ -63,8 +63,8 @@ export const delStoreroom = (id: string | number | Array<string | number>) => {
 };
 /**
  * 查询小区内储藏室管理列表
+ * @param query
  * @returns {*}
- * @param data
  */
 
 export const GetVillagelistStoreroom = (

src/api/system/storeroom/types.ts

@@ -13,9 +13,6 @@ export interface StoreroomVO {
    * 单元号
    */
   unitNoId: string | number;
-  /**
-   *  单元名
-   */
   unitName: string;
 
   /**

src/api/system/user/index.ts

@@ -212,11 +212,10 @@ export const deptTreeSelect = (): AxiosPromise<DeptTreeVO[]> => {
 /**
  * 查询用户 根据不同的角色key
  */
-export const getUserByRoleKey = (data: { roleKey: string; pageSize?: number; pageNum?: number; phonenumber?: string; nickName?: string }) => {
+export const getUserByRoleKey = (roleKey: string = 'repair'): AxiosPromise<any> => {
   return request({
-    url: '/system/user/list/byRoleKey',
+    url: '/system/user/list/byRoleKey?roleKey=' + roleKey,
-    method: 'get',
+    method: 'get'
-    params: data
   });
 };
 

src/api/system/version/index.ts

@@ -1,78 +0,0 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { VersionVO, VersionForm, VersionQuery } from './type';
-
-/**
- * 查询版本列表
- * @param query
- * @returns {*}
- */
-
-export const listVersion = (query?: VersionQuery): AxiosPromise<VersionVO[]> => {
-  return request({
-    url: '/api/app/list',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询版本详细
- * @param id
- */
-export const getVersion = (id: string | number): AxiosPromise<VersionVO> => {
-  return request({
-    url: '/system/version/' + id,
-    method: 'get'
-  });
-};
-
-/**
- * 新增版本
- * @param data
- */
-export const addVersion = (data: VersionForm) => {
-  return request({
-    url: '/api/app/release',
-    method: 'post',
-    data: data
-  });
-};
-
-/**
- * 修改版本
- * @param data
- */
-export const updateVersion = (data: VersionForm) => {
-  return request({
-    url: '/system/version',
-    method: 'put',
-    data: data
-  });
-};
-
-/**
- * 删除版本
- * @param id
- */
-export const delVersion = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/system/version/' + id,
-    method: 'delete'
-  });
-};
-
-/** 获取过往版本 */
-export const getPastVersion = (platform: string, appChannel: string) => {
-  return request({
-    url: `/api/app/getPastVersion?platform=${platform}&appChannel=${appChannel}`,
-    method: 'get',
-  });
-};
-/** 切换版本启停 */
-export const switchVersion = (id: string, status: string) => {
-  return request({
-    url: `/api/app/switchStatus/${id}/${status}`,
-    method: 'get'
-  });
-};

src/api/system/version/type.ts

@@ -1,169 +0,0 @@
-export interface VersionVO {
-  /**
-   *
-   */
-  id: string | number;
-
-  /**
-   * ios/android
-   */
-  platform: string;
-
-  /**
-   * 版本号（递增）
-   */
-  versionCode: number;
-
-  /**
-   * 版本名称（1.2.0）
-   */
-  versionName: string;
-
-  /**
-   * 最低支持版本
-   */
-  minVersionCode: number;
-
-  /**
-   * optional/force
-   * optional-可选更新，
-   * force-强制更新
-   */
-  updateType: string;
-
-  /**
-   * 升级方式
-   * apk-安装包更新，wgt-热更新
-   */
-  method: string;
-
-  /**
-   * 下载地址
-   */
-  downloadUrl: string;
-
-  /**
-   * 更新日志
-   */
-  releaseNotes: string;
-
-  /**
-   * 文件大小(MB)
-   */
-  fileSize: string;
-
-  /**
-   * 0-禁用 1-启用
-   */
-  status: string;
-
-  /**
-   * 更新app端
-   */
-  channel: string;
-}
-
-export interface VersionForm extends BaseEntity {
-  /**
-   * 更新app端
-   * butler 管家端
-   * resident 业主端
-   */
-  appChannel: string;
-  /**
-   *
-   */
-  id?: string | number;
-
-  /**
-   * ios/android
-   */
-  platform?: string;
-
-  /**
-   * 版本号（递增）
-   */
-  versionCode?: number;
-
-  /**
-   * 版本名称（1.2.0）
-   */
-  versionName?: string;
-
-  /**
-   * 最低支持版本
-   */
-  minVersionCode?: string;
-
-  /**
-   * optional/force
-   * optional-可选更新，force-强制更新
-   */
-  updateType?: string;
-  method?: string;
-
-  /**
-   * 下载地址
-   */
-  downloadUrl?: string;
-
-  /**
-   * 更新日志
-   */
-  releaseNotes?: string;
-
-  /**
-   * 文件大小(MB)
-   */
-  fileSize?: string;
-
-  /**
-   * 0-禁用 1-启用
-   */
-  status?: number;
-  channel?: string;
-}
-
-export interface VersionQuery extends PageQuery {
-  /**
-   * ios/android
-   */
-  platform?: string;
-
-  /**
-   * 版本号（递增）
-   */
-  versionCode?: number;
-
-  /**
-   * 版本名称（1.2.0）
-   */
-  versionName?: string;
-
-  /**
-   * optional/force
-   */
-  updateType?: string;
-
-  /**
-   * 下载地址
-   */
-  downloadUrl?: string;
-
-  /**
-   * 0-禁用 1-启用
-   */
-  status?: number;
-
-  /**
-   * 更
-   */
-  channel?: string;
-
-  /**
-   * 更新app端
-   * butler 管家端
-   * resident 业主端
-   */
-  appChannel: string;
-}

src/api/workflow/index.ts

@@ -3,8 +3,8 @@ import { AxiosPromise } from 'axios';
 
 /**
  * 查询小区概况
+ * @param query
  * @returns {*}
- * @param villageId
  */
 export const workSpaceTotalListApi = (
   villageId: string
@@ -26,8 +26,8 @@ export const workSpaceTotalListApi = (
 };
 /**
  * 查询近一周报修趋势
+ * @param query
  * @returns {*}
- * @param villageId
  */
 export const workSpaceRepairTrendListApi = (
   villageId: string
@@ -47,11 +47,12 @@ export const workSpaceRepairTrendListApi = (
 };
 /**
  * 查询近一周收入趋势
+ * @param query
  * @returns {*}
- * @param villageId
  */
 export const workSpaceIncomeTrendListApi = (
-  villageId: string
+  villageId: string,
+  type: number
 ): Promise<
   {
     date: string;
@@ -62,63 +63,15 @@ export const workSpaceIncomeTrendListApi = (
     url: '/workSpace/last7DaysIncomeTrend',
     method: 'GET',
     params: {
-      villageId: villageId
+      villageId: villageId,
+      type: type
     }
   });
 };
-/**
- * 收费率统计
- * @returns {*}
- */
-export const paymentRateApi = (
-  startDate: string,
-  endDate: string
-): Promise<{
-  data: {
-    'receivableAmount': string;
-    'receivablePercent': string;
-    'receivedAmount': string;
-    'receivedPercent': string;
-    'unpaidAmount': string;
-    'unpaidPercent': string;
-  };
-}> => {
-  return request({
-    url: '/workSpace/paymentRate',
-    method: 'GET',
-    params: {
-      startDate: startDate,
-      endDate: endDate
-    }
-  });
-};
-
-/**
- * 查询近一周支出趋势
- * @returns {*}
- * @param villageId
- */
-export const workSpaceOutcomeTrendListApi = (
-  villageId: string
-): Promise<
-  {
-    date: string;
-    expenditure: string;
-  }[]
-> => {
-  return request({
-    url: '/workSpace/last7DaysExpenditureTrend',
-    method: 'GET',
-    params: {
-      villageId: villageId
-    }
-  });
-};
-
 /**
  * 查询当日天气
+ * @param query
  * @returns {*}
- * @param city
  */
 export const workSpaceWeatherApi = (city: string): Promise<reponseType> => {
   const url = 'https://uapis.cn/api/v1/misc/weather?city=' + city + '&lang=zh';
@@ -334,29 +287,20 @@ type LifeIndices = {
 
 /**
  *  查询 快捷入口
+ * @param query
  * @returns {*}
  */
-export const getQuicklyshortcut = (query?: {}): AxiosPromise<
+export const getQuicklyshortcut = () => {
-  {
-    id: string;
-    menuId: string;
-    menuName: string;
-    menuPath: string;
-    menuIcon: string;
-    sortOrder: number;
-  }[]
-> => {
   return request({
     url: '/workSpace/shortcut/list',
-    method: 'GET',
+    method: 'GET'
-    params: query
   });
 };
 
 /**
  *  添加 快捷入口
+ * @param query
  * @returns {*}
- * @param data
  */
 export const addQuicklyshortcut = (data) => {
   return request({
@@ -368,8 +312,8 @@ export const addQuicklyshortcut = (data) => {
 
 /**
  * 删除 快捷入口
+ * @param query
  * @returns {*}
- * @param id
  */
 export const delQuicklyshortcut = (id) => {
   return request({

src/api/workflow/spel/types.ts

@@ -33,6 +33,7 @@ export interface SpelVO {
    * 备注
    */
   remark?: string;
+
 }
 
 export interface SpelForm extends BaseEntity {
@@ -70,9 +71,11 @@ export interface SpelForm extends BaseEntity {
    * 备注
    */
   remark?: string;
+
 }
 
 export interface SpelQuery extends PageQuery {
+
   /**
    * 组件名称
    */
@@ -98,8 +101,11 @@ export interface SpelQuery extends PageQuery {
    */
   status?: string;
 
-  /**
+    /**
-   * 日期范围参数
+     * 日期范围参数
-   */
+     */
-  params?: any;
+    params?: any;
 }
+
+
+

src/api/workflow/task/index.ts

@@ -181,8 +181,8 @@ export const currentTaskAllUser = (taskId: string | number) => {
 
 /**
  * 获取下一节点写
- * @param data
+ * @param data参数
- * @param data
+ * @returns
  */
 export const getNextNodeList = (data: any): any => {
   return request({
@@ -194,8 +194,8 @@ export const getNextNodeList = (data: any): any => {
 
 /**
  * 催办任务
- * @param data
+ * @param data参数
- * @param data
+ * @returns
  */
 export const urgeTask = (data: any): any => {
   return request({

src/assets/icons/svg/app.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1780369458112" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9273" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M271.958852 64.00158c-115.276539 0-208.874831 93.670541-208.874831 208.950693C63.084021 388.337184 156.628127 481.899353 272.016651 481.899353h144.894925c35.347715 0 63.918494-28.762239 63.918495-64.106342V272.894474c-0.01445-115.36685-93.500757-208.892893-208.871219-208.892894zM416.875452 417.793011v0.025288a0.932009 0.932009 0 0 1 0.043349 0.144497H272.016651a145.241719 145.241719 0 1 1 144.858801-145.06471v144.894925zM416.897127 542.227083H272.016651c-115.370462 0-208.896506 93.515206-208.896506 208.885668 0 115.276539 93.562168 208.892893 208.856769 208.892893 115.370462 0 208.856769-93.529656 208.856769-208.900118v-144.894925c-0.018062-35.351327-28.592454-63.983518-63.936556-63.983518z m-0.021675 208.874831a144.721528 144.721528 0 0 1-88.483079 133.504905C310.564987 892.145979 291.59607 895.884854 272.016651 895.884854c-19.564969 0-38.519436-3.738874-56.354047-11.28526A144.880476 144.880476 0 0 1 272.016651 606.167252h144.920212a0.093923 0.093923 0 0 0-0.043349 0v144.920212zM751.101914 542.227083h-144.894925A63.965456 63.965456 0 0 0 542.227083 606.206989v144.894925c0 115.370462 93.515206 208.896506 208.885668 208.896506 115.276539 0 208.892893-93.60913 208.892893-208.885669-0.003612-115.370462-93.533269-208.885668-208.90373-208.885668zM884.686293 807.448736a144.927437 144.927437 0 0 1-278.519041-56.354047V606.167252h144.920212A144.996074 144.996074 0 0 1 884.686293 807.448736zM606.206989 481.899353h144.894925c115.370462 0 208.896506-93.562168 208.896506-208.950693 0-115.276539-93.60913-208.921793-208.885669-208.921792-115.370462 0-208.885668 93.497144-208.885668 208.867606v144.894925c0 35.347715 28.632191 64.109954 63.979906 64.109954z m-0.039737-209.004879A144.949112 144.949112 0 1 1 751.101914 417.959184H606.167252a0.520191 0.520191 0 0 1 0-0.144498V272.894474z" fill="" p-id="9274"></path></svg>