Merge branch 'tcy' of http://192.168.110.2:3000/taoge_xiaodi/maintenance_system

调整系统图中所有文字元素的字体大小以改善显示效果

.env.development

@@ -1,11 +1,11 @@
 # 页面标题
-VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统
+VITE_APP_TITLE = 新能源场站智慧运维平台
 
 # 开发环境配置
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.209:8899'
+VITE_APP_BASE_API = 'http://192.168.110.149:18899'
 
 # 应用访问路径 例如使用前缀 /admin/
 VITE_APP_CONTEXT_PATH = '/'

.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统
+VITE_APP_TITLE = 新能源场站智慧运维平台
 
 # 生产环境配置
 VITE_APP_ENV = 'production'

.eslintrc-auto-import.json

@@ -17,6 +17,8 @@
     "MaybeRefOrGetter": true,
     "PropType": true,
     "Ref": true,
+    "Slot": true,
+    "Slots": true,
     "VNode": true,
     "WritableComputedRef": true,
     "acceptHMRUpdate": true,
@@ -35,6 +37,7 @@
     "createInjectionState": true,
     "createPinia": true,
     "createReactiveFn": true,
+    "createRef": true,
     "createReusableTemplate": true,
     "createSharedComposable": true,
     "createTemplatePromise": true,
@@ -315,9 +318,6 @@
     "watchThrottled": true,
     "watchTriggerable": true,
     "watchWithFilter": true,
-    "whenever": true,
+    "whenever": true
-    "Slot": true,
-    "Slots": true,
-    "createRef": true
   }
 }

index.html

@@ -6,7 +6,7 @@
     <meta name="renderer" content="webkit" />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
     <link rel="icon" href="/favicon.ico" />
-    <title>RuoYi-Vue-Plus多租户管理系统</title>
+    <title>煤科运维平台</title>
     <!--[if lt IE 11
       ]><script>
         window.location.href = '/html/ie.html';

package.json

@@ -1,8 +1,8 @@
 {
   "$schema": "https://json.schemastore.org/package",
-  "name": "ruoyi-vue-plus",
+  "name": "新能源场站智慧运维平台",
   "version": "5.4.1-2.4.1",
-  "description": "RuoYi-Vue-Plus多租户管理系统",
+  "description": "新能源场站智慧运维平台",
   "author": "LionLi",
   "license": "MIT",
   "type": "module",
@@ -29,7 +29,10 @@
     "axios": "1.8.4",
     "crypto-js": "4.2.0",
     "echarts": "5.6.0",
+    "echarts-gl": "^2.0.9",
+    "echarts-liquidfill": "^3.1.0",
     "element-plus": "2.9.8",
+    "ezuikit-js": "^8.1.10",
     "file-saver": "2.0.5",
     "highlight.js": "11.9.0",
     "image-conversion": "2.1.1",

public/assets/svg/delete.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12" fill="none"><path d="M10.0923 2.25614C10.3323 2.25614 10.5303 2.29614 10.6863 2.37614C10.8423 2.45614 10.9663 2.55614 11.0583 2.67614C11.1503 2.79614 11.2143 2.92614 11.2503 3.06614C11.2863 3.20614 11.3043 3.33614 11.3043 3.45614C11.3043 3.51214 11.3023 3.55614 11.2983 3.58814C11.2943 3.62014 11.2923 3.64814 11.2923 3.67214L11.2923 3.74414L10.5003 3.74414L10.5003 10.0441C10.5003 10.2041 10.4683 10.3581 10.4043 10.5061C10.3403 10.6541 10.2483 10.7841 10.1283 10.8961C10.0083 11.0081 9.86228 11.0981 9.69028 11.1661C9.51828 11.2341 9.32028 11.2681 9.09628 11.2681L3.74428 11.2681C3.53628 11.2681 3.34028 11.2361 3.15628 11.1721C2.97229 11.1081 2.81428 11.0181 2.68228 10.9021C2.55028 10.7861 2.44628 10.6461 2.37028 10.4821C2.29428 10.3181 2.25628 10.1321 2.25628 9.92414L2.25628 3.74414L1.51228 3.74414C1.50428 3.73614 1.50028 3.71614 1.50028 3.68414C1.49228 3.64414 1.48828 3.52014 1.48828 3.31214C1.48828 3.20814 1.51228 3.09214 1.56028 2.96414C1.60828 2.83614 1.68028 2.71814 1.77628 2.61014C1.87228 2.50214 1.99628 2.41214 2.14828 2.34014C2.30028 2.26814 2.48028 2.23214 2.68828 2.23214L3.75628 2.23214L3.75628 1.50014C3.75628 1.29214 3.82828 1.11414 3.97228 0.966141C4.11628 0.818141 4.29228 0.744141 4.50028 0.744141L8.25628 0.744141C8.53628 0.744141 8.73028 0.818141 8.83828 0.966141C8.94628 1.11414 9.00028 1.29214 9.00028 1.50014L9.00028 2.24414C9.16828 2.25214 9.34828 2.25614 9.54028 2.25614L10.0923 2.25614ZM4.50028 2.25614L8.25628 2.25614L8.25628 1.50014L4.50028 1.50014L4.50028 2.25614ZM4.12828 9.85214C4.38428 9.85214 4.51228 9.68814 4.51228 9.36014L4.51228 3.79214L3.76828 3.79214L3.76828 9.36014C3.76828 9.52814 3.79429 9.65214 3.84628 9.73214C3.89828 9.81214 3.99229 9.85214 4.12828 9.85214ZM6.39628 9.84014C6.53228 9.84014 6.62428 9.80214 6.67228 9.72614C6.72028 9.65014 6.74428 9.52814 6.74428 9.36014L6.74428 3.79214L6.00028 3.79214L6.00028 9.36014C6.00028 9.68014 6.13228 9.84014 6.39628 9.84014ZM8.65228 9.81614C8.79628 9.81614 8.89228 9.77814 8.94028 9.70214C8.98828 9.62614 9.01228 9.50414 9.01228 9.33614L9.01228 3.79214L8.25628 3.79214L8.25628 9.33614C8.25628 9.65614 8.38828 9.81614 8.65228 9.81614Z"   fill="#186DF5" ></path></svg>

public/assets/svg/download.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12" fill="none"><path d="M9.71435 10.4777L2.22855 10.4777C1.40179 10.4777 0.731445 9.80755 0.731445 8.98058L0.731445 7.10912C0.731445 6.90247 0.899128 6.7349 1.10565 6.7349L1.85435 6.7349C2.06101 6.7349 2.22855 6.90247 2.22855 7.10912L2.22855 8.23203C2.22855 8.64549 2.56367 8.98059 2.97711 8.98059L8.96579 8.98059C9.37924 8.98059 9.71435 8.64549 9.71435 8.23203L9.71435 7.10912C9.71435 6.90247 9.8819 6.7349 10.0887 6.7349L10.8372 6.7349C11.0439 6.7349 11.2115 6.90247 11.2115 7.10912L11.2115 8.98059C11.2115 9.80755 10.5413 10.4777 9.71435 10.4777ZM2.92875 3.13454C3.08016 2.98313 3.32585 2.98313 3.47728 3.13454L5.22302 4.8803L5.22302 1.11169C5.22302 0.905035 5.39062 0.737305 5.59723 0.737305L6.34579 0.737305C6.55249 0.737305 6.72015 0.905035 6.72015 1.11169L6.72015 4.8803L8.4659 3.13454C8.61733 2.98313 8.86289 2.98313 9.01431 3.13454L9.56289 3.68319C9.71432 3.83462 9.71432 4.08015 9.56289 4.23171L6.47159 7.32305C6.45822 7.33639 6.21771 7.48341 5.9757 7.48352C5.73105 7.48364 5.48493 7.33654 5.47156 7.32305L2.38011 4.23171C2.22868 4.08014 2.22868 3.83462 2.38011 3.68319L2.92875 3.13454Z"   fill="#186DF5" ></path></svg>

public/assets/svg/huanyuan.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 32 32" fill="none"><path d="M17.9776 16.1268L21.269 12.8125L21.269 13.6583C21.269 14.4614 21.9287 15.1097 22.7318 15.1097C23.535 15.1097 24.1833 14.4614 24.1833 13.6583L24.1833 9.26969C24.1833 8.46651 23.535 7.81826 22.7318 7.81826L18.3433 7.81826C17.5401 7.81826 16.8918 8.46651 16.8918 9.26969C16.8918 10.0728 17.5401 10.7325 18.3433 10.7325L19.189 10.7325L15.8747 14.024C15.8578 14.0412 15.845 14.0631 15.829 14.0811C15.8129 14.0991 15.7984 14.1195 15.7833 14.1383C15.7681 14.157 15.7518 14.1759 15.7376 14.1954C15.7233 14.2149 15.7165 14.2324 15.7033 14.2525C15.69 14.2727 15.6813 14.3003 15.669 14.3211C15.6567 14.3419 15.6233 14.3684 15.6233 14.3897C15.6233 14.411 15.6004 14.425 15.6004 14.4468C15.6004 14.4687 15.5661 14.4817 15.5661 14.504C15.5661 14.5263 15.5433 14.5612 15.5433 14.584C15.5433 14.6067 15.509 14.6295 15.509 14.6525C15.509 14.6756 15.4976 14.6863 15.4976 14.7097C15.4976 14.7331 15.4861 14.766 15.4861 14.7897C15.4861 14.8134 15.4633 14.8458 15.4633 14.8697C15.4633 14.8935 15.4518 14.9028 15.4518 14.9268C15.4518 14.9508 15.4518 14.9828 15.4518 15.0068C15.4518 15.0309 15.4518 15.0513 15.4518 15.0754C15.4518 15.0995 15.4518 15.1199 15.4518 15.144C15.4518 15.1681 15.4518 15.2 15.4518 15.224C15.4518 15.248 15.4633 15.2687 15.4633 15.2925C15.4633 15.3164 15.4861 15.3374 15.4861 15.3611C15.4861 15.3848 15.4976 15.4177 15.4976 15.4411C15.4976 15.4645 15.509 15.4752 15.509 15.4983C15.509 15.5214 15.5433 15.5441 15.5433 15.5668C15.5433 15.5895 15.5661 15.6245 15.5661 15.6468C15.5661 15.6691 15.6004 15.6821 15.6004 15.704C15.6004 15.7258 15.6233 15.7512 15.6233 15.7725C15.6233 15.7939 15.6567 15.8089 15.669 15.8297C15.6813 15.8505 15.69 15.8781 15.7033 15.8983C15.7165 15.9184 15.7233 15.9359 15.7376 15.9554C15.7518 15.9749 15.7681 15.9938 15.7833 16.0125C15.7984 16.0313 15.8129 16.0517 15.829 16.0697C15.845 16.0877 15.8578 16.1097 15.8747 16.1268C16.4588 16.6964 17.408 16.6964 17.9776 16.1268ZM8.12613 25.3268L12.5147 25.3268C13.3179 25.3268 13.9661 24.6786 13.9661 23.8754C13.9661 23.0722 13.3179 22.4125 12.5147 22.4125L11.669 22.4125L15.0176 19.0754C15.5871 18.5059 15.5871 17.5681 15.0176 16.984C15.0004 16.9671 14.9898 16.9429 14.9718 16.9268C14.9539 16.9108 14.9334 16.8963 14.9147 16.8811C14.8959 16.866 14.877 16.8611 14.8576 16.8468C14.8381 16.8326 14.8205 16.8144 14.8004 16.8011C14.7803 16.7878 14.7526 16.7677 14.7318 16.7554C14.7111 16.7431 14.6846 16.7211 14.6633 16.7211C14.6419 16.7211 14.628 16.6983 14.6061 16.6983C14.5843 16.6983 14.5599 16.664 14.5376 16.664C14.5153 16.664 14.4917 16.6411 14.469 16.6411C14.4463 16.6411 14.4235 16.6183 14.4004 16.6183C14.3773 16.6183 14.3553 16.5954 14.3318 16.5954C14.3085 16.5954 14.2869 16.584 14.2633 16.584C14.2396 16.584 14.2186 16.5725 14.1947 16.5725C14.1709 16.5725 14.1501 16.5611 14.1261 16.5611C14.1021 16.5611 14.0702 16.5497 14.0461 16.5497C14.022 16.5497 14.0017 16.5497 13.9776 16.5497C13.9535 16.5497 13.9331 16.5497 13.909 16.5497C13.8849 16.5497 13.853 16.5611 13.829 16.5611C13.805 16.5611 13.7843 16.5725 13.7604 16.5725C13.7366 16.5725 13.7155 16.584 13.6918 16.584C13.6682 16.584 13.6352 16.5954 13.6118 16.5954C13.5885 16.5954 13.5778 16.6183 13.5547 16.6183C13.5316 16.6183 13.4974 16.6411 13.4747 16.6411C13.452 16.6411 13.4284 16.664 13.4061 16.664C13.3838 16.664 13.3708 16.6983 13.349 16.6983C13.3271 16.6983 13.3018 16.7211 13.2804 16.7211C13.2591 16.7211 13.2326 16.7431 13.2118 16.7554C13.1911 16.7677 13.1749 16.7878 13.1547 16.8011C13.1346 16.8144 13.117 16.8326 13.0976 16.8468C13.0781 16.8611 13.0592 16.866 13.0404 16.8811C13.0217 16.8963 13.0013 16.9108 12.9833 16.9268C12.9653 16.9429 12.9548 16.9671 12.9376 16.984L9.58899 20.3325L9.58899 19.4868C9.58899 18.6837 8.92929 18.0354 8.12613 18.0354C7.32296 18.0354 6.6747 18.6837 6.6747 19.4868L6.6747 23.8754C6.6747 24.6786 7.32296 25.3268 8.12613 25.3268ZM25.6576 3.42969L5.20042 3.42969C3.59406 3.42969 2.28613 4.73762 2.28613 6.34397L2.28613 26.8011C2.28613 28.4075 3.59406 29.7154 5.20042 29.7154L25.6576 29.7154C27.2639 29.7154 28.5718 28.4075 28.5718 26.8011L28.5718 6.34397C28.5718 4.73762 27.2639 3.42969 25.6576 3.42969ZM25.6576 26.8011L5.20042 26.8011L5.20042 6.34397L25.6576 6.34397L25.6576 26.8011Z"   fill="#FFFFFF" ></path></svg>

public/assets/svg/play.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12" fill="none"><path d="M9.1496 5.57504L3.34961 1.97504C3.0246 1.77505 2.59961 2.02504 2.59961 2.40004L2.59961 9.60005C2.59961 9.97505 3.0246 10.225 3.34961 10.0251L9.12461 6.42505C9.4746 6.25004 9.4746 5.75005 9.1496 5.57504Z"   fill="#186DF5" ></path></svg>

public/assets/svg/quanpin.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 32 32" fill="none"><path d="M11.9501 11.3874L11.9501 8.01232C11.9501 7.4532 11.4799 7 10.9 7C10.3199 7 9.84997 7.4532 9.84997 8.01232L9.84997 10.7125L7.05011 10.7125C6.46998 10.7125 6 11.1657 6 11.7248C6 12.2842 6.46998 12.7373 7.05011 12.7373L10.5499 12.7373C11.3231 12.7373 11.9501 12.133 11.9501 11.3874ZM11.9501 21.5125L11.9501 24.8873C11.9501 25.4467 11.4799 25.8999 10.9 25.8999C10.3199 25.8999 9.84997 25.4467 9.84997 24.8873L9.84997 22.1874L7.05011 22.1874C6.46998 22.1874 6 21.7342 6 21.1748C6 20.6157 6.46998 20.1622 7.05011 20.1622L10.5499 20.1622C11.3231 20.1622 11.9501 20.7668 11.9501 21.5125ZM19.65 21.5125L19.65 24.8873C19.65 25.4467 20.12 25.8999 20.7001 25.8999C21.2799 25.8999 21.7499 25.4467 21.7499 24.8873L21.7499 22.1874L24.55 22.1874C25.1298 22.1874 25.6001 21.7342 25.6001 21.1748C25.6001 20.6157 25.1299 20.1622 24.55 20.1622L21.0499 20.1622C20.2767 20.1622 19.65 20.7668 19.65 21.5125ZM19.65 11.3874L19.65 8.01232C19.65 7.4532 20.12 7 20.7001 7C21.2799 7 21.7499 7.4532 21.7499 8.01232L21.7499 10.7125L24.55 10.7125C25.1298 10.7125 25.6001 11.1657 25.6001 11.7248C25.6001 12.2842 25.1299 12.7373 24.55 12.7373L21.0499 12.7373C20.2767 12.7373 19.65 12.133 19.65 11.3874Z" stroke="rgba(255, 255, 255, 1)" stroke-width="0.8"      fill="#FFFFFF" ></path><path d="M2 27.2998L2 5.69984C2 4.20862 3.25368 3 4.80014 3L27.2001 3C28.7465 3 30 4.20862 30 5.69984L30 27.2998C30 28.791 28.7465 30 27.2001 30L4.80014 30C3.25368 30 2 28.791 2 27.2998ZM27.2001 5.02491L4.80014 5.02491C4.30497 5.02491 4.10016 5.22265 4.10016 5.69984L4.10016 27.2998C4.10016 27.7773 4.30497 27.9751 4.80014 27.9751L27.9 27.9751L27.9 5.69984C27.9 5.22265 27.695 5.02491 27.2001 5.02491Z" stroke="rgba(255, 255, 255, 1)" stroke-width="0.8"      fill="#FFFFFF" ></path></svg>

src/api/devicePreset/index.ts

@@ -0,0 +1,75 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DevicePresetVO, DevicePresetForm, DevicePresetQuery } from '@/api/camera/devicePreset/types';
+
+/**
+ * 查询摄像头预置位列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDevicePreset = (query?: DevicePresetQuery): AxiosPromise<DevicePresetVO[]> => {
+  return request({
+    url: '/ops/devicePreset/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询摄像头预置位详细
+ * @param id
+ */
+export const getDevicePreset = (id: string | number): AxiosPromise<DevicePresetVO> => {
+  return request({
+    url: '/ops/devicePreset/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增摄像头预置位
+ * @param data
+ */
+export const addDevicePreset = (data: DevicePresetForm) => {
+  return request({
+    url: '/ops/devicePreset',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改摄像头预置位
+ * @param data
+ */
+export const updateDevicePreset = (data: DevicePresetForm) => {
+  return request({
+    url: '/ops/devicePreset',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除摄像头预置位
+ * @param id
+ */
+export const delDevicePreset = (data: any) => {
+  return request({
+    url: '/ops/devicePreset/delYzd',
+    method: 'delete',
+    data: [data]
+  });
+};
+/**
+ * 调用摄像头预置位
+ * @param data
+ */
+export const callDevicePreset = (data: DevicePresetForm) => {
+  return request({
+    url: '/ops/devicePreset/callYzd',
+    method: 'post',
+    data: data
+  });
+};

src/api/devicePreset/types.ts

@@ -0,0 +1,86 @@
+export interface DevicePresetVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * 设备序列号
+   */
+  deviceSerial: string;
+
+  /**
+   * 通道号
+   */
+  channelNo: number;
+
+  /**
+   * 预置点序号
+   */
+  presetIndex: number;
+
+  /**
+   * 预置点
+   */
+  presetName: string;
+
+}
+
+export interface DevicePresetForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 设备序列号
+   */
+  deviceSerial?: string;
+
+  /**
+   * 通道号
+   */
+  channelNo?: number;
+
+  /**
+   * 预置点序号
+   */
+  presetIndex?: number;
+
+  /**
+   * 预置点
+   */
+  presetName?: string;
+
+}
+
+export interface DevicePresetQuery extends PageQuery {
+
+  /**
+   * 设备序列号
+   */
+  deviceSerial?: string;
+
+  /**
+   * 通道号
+   */
+  channelNo?: number;
+
+  /**
+   * 预置点序号
+   */
+  presetIndex?: number;
+
+  /**
+   * 预置点
+   */
+  presetName?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/large/index.ts

@@ -0,0 +1,33 @@
+import request from '@/utils/request';
+
+// 查询图表总数据
+export function getPowerStationOverview() {
+  return request({
+    url: '/ops/ginlong/api/getPowerStationOverview',
+    method: 'get'
+  });
+}
+//能源收益
+export function getStationMonthOverview(params: any) {
+  return request({
+    url: '/ops/ginlong/api/getStationMonthOverview',
+    method: 'get',
+    params
+  });
+}
+//能源收益
+export function getInverterListOverview(params: any) {
+  return request({
+    url: '/ops/ginlong/api/getInverterListOverview',
+    method: 'get',
+    params
+  });
+}
+//警告
+export function getAlarmListOverview(params?: any) {
+  return request({
+    url: '/ops/ginlong/api/getAlarmListOverview',
+    method: 'get',
+    params
+  });
+}

src/api/login.ts

@@ -115,7 +115,7 @@ export function getTenantList(isToken: boolean): AxiosPromise<TenantInfo> {
 //获取用户项目信息
 export function getUserProject(): AxiosPromise<UserProject[]> {
   return request({
-    url: '/project/projectRelevancy/login/list',
+    url: '/system/project/projectRelevancy/login/list',
     method: 'get'
   });
 }

src/api/project/attendance/echarts.ts

@@ -1,63 +0,0 @@
-const grid = {
-  left: 100,
-  right: 100,
-  top: 30,
-  bottom: 50
-};
-
-const color = ['#4FD6A9', '#409EFF', '#ECF5FF', '#FFC069'];
-const titleList = [
-  { name: '全勤人数', color: '#fff' },
-  { name: '半勤人数', color: '#fff' },
-  { name: '缺勤人数', color: '#000' },
-  { name: '请假人数', color: '#000' }
-];
-
-// export const echartsConfig = (ref: any, list?: any) => {
-//   const commandstatsIntance = echarts.init(ref, 'macarons');
-// };
-
-export const option = (list?: any) => {
-  const attendanceArray = list.map((item) => item.attendance);
-  const halfAttendanceArray = list.map((item) => item.halfAttendance);
-  const absenteeismArray = list.map((item) => item.absenteeism);
-  const leaveArray = list.map((item) => item.leave);
-
-  const rawData = [attendanceArray, halfAttendanceArray, absenteeismArray, leaveArray];
-  const series: any = titleList.map((item, sid) => {
-    return {
-      name: item.name,
-      type: 'bar',
-      stack: 'total',
-      barWidth: '25',
-      label: {
-        show: true,
-        color: item.color,
-        fontSize: 10,
-        formatter: function (params) {
-          return params.value > 0 ? params.value : '';
-        }
-      },
-      data: rawData[sid]
-    };
-  });
-  const data = list.map((item) => item.clockDate);
-  const option = {
-    legend: {
-      selectedMode: false,
-      right: 0
-    },
-    grid,
-    yAxis: {
-      type: 'value',
-      show: false
-    },
-    xAxis: {
-      type: 'category',
-      data
-    },
-    series,
-    color
-  };
-  return option;
-};

src/api/project/attendance/index.ts

@@ -1,99 +0,0 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import {
-  AttendanceVO,
-  AttendanceForm,
-  AttendanceQuery,
-  AttendanceTwoWeekQuery,
-  AttendanceTwoWeekVO,
-  AttendanceMonthVO,
-  AttendanceMonthQuery
-} from '@/api/project/attendance/types';
-
-/**
- * 查询考勤列表
- * @param query
- * @returns {*}
- */
-
-export const listAttendance = (query?: AttendanceQuery): AxiosPromise<AttendanceVO[]> => {
-  return request({
-    url: '/contractor/constructionUser/list/attendance/total',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询近两周考勤列表
- * @param query
- * @returns {*}
- */
-
-export const listAttendanceTwoWeek = (query?: AttendanceTwoWeekQuery): AxiosPromise<AttendanceTwoWeekVO[]> => {
-  return request({
-    url: '/project/attendance/list/clockDate/twoWeek',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询施工人员月份考勤列表
- * @param query
- * @returns {*}
- */
-
-export const listAttendanceMonth = (query?: AttendanceMonthQuery): AxiosPromise<AttendanceMonthVO[]> => {
-  return request({
-    url: '/project/attendance/list/month/byUserId',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询考勤详细
- * @param id
- */
-export const getAttendance = (id: string | number): AxiosPromise<AttendanceVO> => {
-  return request({
-    url: '/project/attendance/' + id,
-    method: 'get'
-  });
-};
-
-/**
- * 新增考勤
- * @param data
- */
-export const addAttendance = (data: AttendanceForm) => {
-  return request({
-    url: '/project/attendance',
-    method: 'post',
-    data: data
-  });
-};
-
-/**
- * 修改考勤
- * @param data
- */
-export const updateAttendance = (data: AttendanceForm) => {
-  return request({
-    url: '/project/attendance',
-    method: 'put',
-    data: data
-  });
-};
-
-/**
- * 删除考勤
- * @param id
- */
-export const delAttendance = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/project/attendance/' + id,
-    method: 'delete'
-  });
-};

src/api/project/attendance/types.ts

@@ -1,210 +0,0 @@
-export interface AttendanceVO {
-  /**
-   * 人员姓名
-   */
-  userName: string;
-
-  id?: string | number;
-
-  /**
-   * 人员id
-   */
-
-  /**
-   * 上班打卡时间
-   */
-  onClockTime: string;
-
-  /**
-   * 下班打卡时间
-   */
-  offClockTime: string;
-
-  /**
-   * 打卡日期
-   */
-  clockDate: string;
-
-  /**
-   * 1正常,2迟到,3早退,4缺勤,5补卡
-   */
-  clockStatus: string;
-
-  /**
-   * 上下班（1上班,2下班）
-   */
-  commuter: string;
-
-  /**
-   * 备注
-   */
-  remark: string;
-}
-
-export interface AttendanceTwoWeekQuery {
-  projectId?: string | number;
-}
-
-export interface AttendanceMonthQuery {
-  userId: string | number;
-  clockMonth?: string;
-}
-
-export interface AttendanceMonthVO {
-  id: string | number;
-  clockDate: string;
-  status: string;
-  attendanceList?: monthList[];
-  clockList?: clockObject;
-}
-
-interface clockObject {
-  downClockTime?: string;
-  downClockPic?: string;
-  upClockTime?: string;
-  upClockPic?: string;
-}
-
-interface monthList {
-  commuter: string;
-  clockTime: string;
-  clockStatus: string;
-}
-
-export interface AttendanceTwoWeekVO {
-  /**
-   * 出勤人数
-   */
-  attendance: string;
-
-  /**
-   * 半勤人数
-
-   */
-  halfAttendance: string;
-
-  /**
-   * 打卡日期
-   */
-  clockDate: string;
-
-  /**
-   * 缺勤人数
-
-   */
-  absenteeism: string;
-}
-
-export interface AttendanceForm extends BaseEntity {
-  /**
-   * 主键id
-   */
-  id?: string | number;
-
-  /**
-   * 人员id
-   */
-  userId?: string | number;
-  typeOfWork?: string;
-  teamId?: string;
-  clockDate?: string;
-
-  /**
-   * 人脸照
-   */
-  facePic?: string;
-
-  /**
-   * 项目id
-   */
-  projectId?: string | number;
-
-  /**
-   * 上班打卡时间
-   */
-  onClockTime?: string;
-
-  /**
-   * 下班打卡时间
-   */
-  offClockTime?: string;
-
-  /**
-   * 打卡日期
-   */
-  clockDate?: string;
-
-  /**
-   * 1正常,2迟到,3早退,4缺勤,5补卡
-   */
-  clockStatus?: string;
-
-  /**
-   * 代打人员id
-   */
-  pinchUserId?: string | number;
-
-  /**
-   * 多次打卡时间记录
-   */
-  clockRecord?: string;
-
-  /**
-   * 上下班（1上班,2下班）
-   */
-  commuter?: string;
-
-  /**
-   * 日薪
-   */
-  dailyWage?: number;
-
-  /**
-   * 经度
-   */
-  lng?: string;
-
-  /**
-   * 纬度
-   */
-  lat?: string;
-
-  /**
-   * 备注
-   */
-  remark?: string;
-}
-
-export interface AttendanceQuery extends PageQuery {
-  /**
-   * 人员姓名
-   */
-  userName?: string;
-
-  /**
-   * 项目id
-   */
-  projectId?: string | number;
-  typeOfWork?: string | number;
-  teamId?: string | number;
-
-  /**
-   * 打卡日期
-   */
-  clockDate?: string;
-
-  /**
-   * 1正常,2迟到,3早退,4缺勤,5补卡
-   */
-  clockStatus?: string;
-
-  /**
-   * 上下班（1上班,2下班）
-   */
-  commuter?: string;
-
-  /**
-   * 日期范围参数
-   */
-  params?: any;
-}

src/api/project/attendanceRecords/index.ts

@@ -1,63 +0,0 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { AttendanceVO, AttendanceForm, AttendanceQuery } from '@/api/project/attendance/types';
-
-/**
- * 查询考勤列表
- * @param query
- * @returns {*}
- */
-
-export const listAttendance = (query?: AttendanceQuery): AxiosPromise<AttendanceVO[]> => {
-  return request({
-    url: '/project/attendance/list',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询考勤详细
- * @param id
- */
-export const getAttendance = (id: string | number): AxiosPromise<AttendanceVO> => {
-  return request({
-    url: '/project/attendance/' + id,
-    method: 'get'
-  });
-};
-
-/**
- * 新增考勤
- * @param data
- */
-export const addAttendance = (data: AttendanceForm) => {
-  return request({
-    url: '/project/attendance',
-    method: 'post',
-    data: data
-  });
-};
-
-/**
- * 修改考勤
- * @param data
- */
-export const updateAttendance = (data: AttendanceForm) => {
-  return request({
-    url: '/project/attendance',
-    method: 'put',
-    data: data
-  });
-};
-
-/**
- * 删除考勤
- * @param id
- */
-export const delAttendance = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/project/attendance/' + id,
-    method: 'delete'
-  });
-};

src/api/project/attendanceRecords/types.ts

@@ -1,146 +0,0 @@
-export interface AttendanceVO {
-  /**
-   * 人员姓名
-   */
-  userName: string;
-
-  /**
-   * 上班打卡时间
-   */
-  onClockTime: string;
-
-  /**
-   * 下班打卡时间
-   */
-  offClockTime: string;
-
-  /**
-   * 打卡日期
-   */
-  clockDate: string;
-
-  /**
-   * 1正常,2迟到,3早退,4缺勤,5补卡
-   */
-  clockStatus: string;
-
-  /**
-   * 上下班（1上班,2下班）
-   */
-  commuter: string;
-
-  /**
-   * 备注
-   */
-  remark: string;
-}
-
-export interface AttendanceForm extends BaseEntity {
-  /**
-   * 主键id
-   */
-  id?: string | number;
-
-  /**
-   * 人员id
-   */
-  userId?: string | number;
-
-  /**
-   * 人脸照
-   */
-  facePic?: string;
-
-  /**
-   * 项目id
-   */
-  projectId?: string | number;
-
-  /**
-   * 上班打卡时间
-   */
-  onClockTime?: string;
-
-  /**
-   * 下班打卡时间
-   */
-  offClockTime?: string;
-
-  /**
-   * 打卡日期
-   */
-  clockDate?: string;
-
-  /**
-   * 1正常,2迟到,3早退,4缺勤,5补卡
-   */
-  clockStatus?: string;
-
-  /**
-   * 代打人员id
-   */
-  pinchUserId?: string | number;
-
-  /**
-   * 多次打卡时间记录
-   */
-  clockRecord?: string;
-
-  /**
-   * 上下班（1上班,2下班）
-   */
-  commuter?: string;
-
-  /**
-   * 日薪
-   */
-  dailyWage?: number;
-
-  /**
-   * 经度
-   */
-  lng?: string;
-
-  /**
-   * 纬度
-   */
-  lat?: string;
-
-  /**
-   * 备注
-   */
-  remark?: string;
-}
-
-export interface AttendanceQuery extends PageQuery {
-  /**
-   * 人员姓名
-   */
-  userName?: string;
-  teamId?: string | number;
-
-  /**
-   * 项目id
-   */
-  projectId?: string | number;
-
-  /**
-   * 打卡日期
-   */
-  clockDate?: string;
-
-  /**
-   * 1正常,2迟到,3早退,4缺勤,5补卡
-   */
-  clockStatus?: string;
-
-  /**
-   * 上下班（1上班,2下班）
-   */
-  commuter?: string;
-
-  /**
-   * 日期范围参数
-   */
-  params?: any;
-}

src/api/project/constructionBlacklist/index.ts

@@ -1,63 +0,0 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { ConstructionBlacklistVO, ConstructionBlacklistForm, ConstructionBlacklistQuery } from '@/api/project/constructionBlacklist/types';
-
-/**
- * 查询黑名单列表
- * @param query
- * @returns {*}
- */
-
-export const listConstructionBlacklist = (query?: ConstructionBlacklistQuery): AxiosPromise<ConstructionBlacklistVO[]> => {
-  return request({
-    url: '/project/constructionBlacklist/list',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询黑名单详细
- * @param id
- */
-export const getConstructionBlacklist = (id: string | number): AxiosPromise<ConstructionBlacklistVO> => {
-  return request({
-    url: '/project/constructionBlacklist/' + id,
-    method: 'get'
-  });
-};
-
-/**
- * 新增黑名单
- * @param data
- */
-export const addConstructionBlacklist = (data: ConstructionBlacklistForm) => {
-  return request({
-    url: '/project/constructionBlacklist',
-    method: 'post',
-    data: data
-  });
-};
-
-/**
- * 修改黑名单
- * @param data
- */
-export const updateConstructionBlacklist = (data: ConstructionBlacklistForm) => {
-  return request({
-    url: '/project/constructionBlacklist',
-    method: 'put',
-    data: data
-  });
-};
-
-/**
- * 删除黑名单
- * @param id
- */
-export const delConstructionBlacklist = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/project/constructionBlacklist/' + id,
-    method: 'delete'
-  });
-};

src/api/project/constructionBlacklist/types.ts

@@ -1,69 +0,0 @@
-export interface ConstructionBlacklistVO {
-  /**
-   * id
-   */
-  id: string | number;
-  /**
-   * 名字
-   */
-  userName: string;
-
-  /**
-   * 身份证号码
-   */
-  sfzNumber: string;
-
-  /**
-   * 备注
-   */
-  remark: string;
-}
-
-export interface ConstructionBlacklistForm extends BaseEntity {
-  /**
-   * 项目id
-   */
-  projectId?: string | number;
-
-  /**
-   * 用户id
-   */
-  userId?: string | number;
-
-  /**
-   * 备注
-   */
-  remark?: string;
-}
-
-export interface ConstructionBlacklistQuery extends PageQuery {
-  /**
-   * 主键id
-   */
-  id?: string | number;
-
-  /**
-   * 项目id
-   */
-  projectId?: string | number;
-
-  /**
-   * 用户id
-   */
-  userId?: string | number;
-
-  /**
-   * 名字
-   */
-  userName?: string;
-
-  /**
-   * 身份证号码
-   */
-  sfzNumber?: string;
-
-  /**
-   * 日期范围参数
-   */
-  params?: any;
-}

src/api/project/constructionUser/index.ts

@@ -1,205 +0,0 @@
-import request, { download } from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import {
-  ConstructionUserForm,
-  ConstructionUserQuery,
-  ConstructionUserVO,
-  skipType,
-  ConstructionUserStatusForm,
-  ConstructionUserPlayCardForm,
-  ConstructionUserSalaryForm,
-  ConstructionUserExitForm,
-  ConstructionUserTemplateForm,
-  ConstructionUserMembeForm,
-  ConstructionMonthQuery
-} from '@/api/project/constructionUser/types';
-import { AttendanceMonthVO } from '../attendance/types';
-
-/**
- * 查询施工人员月份考勤列表
- * @param query
- * @returns {*}
- */
-
-export const listConstructionMonth = (query?: ConstructionMonthQuery): AxiosPromise<AttendanceMonthVO[]> => {
-  return request({
-    url: '/contractor/constructionUser/list/attendance/month',
-    method: 'get',
-    params: query
-  });
-};
-/**
- * 查询施工人员列表
- * @param query
- * @returns {*}
- */
-
-export const listConstructionUser = (query?: ConstructionUserQuery): AxiosPromise<ConstructionUserVO[]> => {
-  return request({
-    url: '/contractor/constructionUser/list',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询施工人员详细
- * @param id
- */
-export const getConstructionUser = (id: string | number): AxiosPromise<ConstructionUserVO> => {
-  return request({
-    url: '/contractor/constructionUser/' + id,
-    method: 'get'
-  });
-};
-
-/**
- * 人员迁移
- * @param data
- */
-export const transferConstructionUser = (data: skipType) => {
-  return request({
-    url: '/contractor/constructionUser/change/project',
-    method: 'put',
-    data: data
-  });
-};
-
-/**
- * 查询项目以及项目下的分包公司列表
- */
-export const getProjectContractorList = () => {
-  return request({
-    url: '/project/project/list/project/contractorList',
-    method: 'get'
-  });
-};
-
-/**
- * 新增施工人员
- * @param data
- */
-export const addConstructionUser = (data: ConstructionUserForm): AxiosPromise<string | number> => {
-  return request({
-    url: '/contractor/constructionUser',
-    method: 'post',
-    data: data
-  });
-};
-
-/**
- * 修改施工人员
- * @param data
- */
-export const updateConstructionUser = (data: ConstructionUserForm) => {
-  return request({
-    url: '/contractor/constructionUser',
-    method: 'put',
-    data: data
-  });
-};
-
-/**
- * 删除施工人员
- * @param id
- */
-export const delConstructionUser = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/contractor/constructionUser/' + id,
-    method: 'delete'
-  });
-};
-
-/**
- * 修改施工人员在职状态
- * @param data
- */
-export const updateConstructionUserStatus = (data: ConstructionUserStatusForm) => {
-  return request({
-    url: '/contractor/constructionUser/batch/status',
-    method: 'put',
-    data: data
-  });
-};
-
-/**
- * 根据项目id批量修改施工人员打卡状态
- * @param data
- */
-export const updateConstructionUserPlayCardStatus = (data: ConstructionUserPlayCardForm) => {
-  return request({
-    url: '/contractor/constructionUser/batch/clock',
-    method: 'put',
-    data: data
-  });
-};
-
-/**
- * 修改施工人员打卡状态
- * @param data
- */
-export const updateConstructionUserPlayCardOneStatus = (data: ConstructionUserPlayCardForm) => {
-  return request({
-    url: '/contractor/constructionUser/clock',
-    method: 'put',
-    data: data
-  });
-};
-
-/**
- * 修改施工人员工资
- * @param data
- */
-export const updateConstructionUserSalary = (data: ConstructionUserSalaryForm) => {
-  return request({
-    url: '/contractor/constructionUser/salary',
-    method: 'put',
-    data: data
-  });
-};
-
-/**
- * 查询施工人员入退场记录
- * @param query
- */
-export const getConstructionUserExit = (query: ConstructionUserExitForm) => {
-  return request({
-    url: '/contractor/constructionUserExit/list',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 下载施工人员文件存储模板
- * @param query
- */
-export const dowloadConstructionUserTemplate = (query: ConstructionUserTemplateForm) => {
-  let { projectId } = query;
-  const fileName = projectId + '_project.zip';
-  return download('/contractor/constructionUserFile/exportFileTemplate', query, fileName);
-};
-
-/**
- * 施工人员退场
- * @param data
- */
-export const delConstructionUserMember = (data: ConstructionUserMembeForm) => {
-  return request({
-    url: '/contractor/projectTeamMember/',
-    method: 'delete',
-    data
-  });
-};
-
-/**
- * 上传施工人员文件压缩包，批量导入存储施工人员文件
- * @param data
- */
-export const importConstructionUserInfo = (file: string) => {
-  return request({
-    url: '/contractor/constructionUserFile/upload/zip',
-    method: 'post',
-    data: { file }
-  });
-};

src/api/project/constructionUser/types.ts

@@ -1,605 +0,0 @@
-import { ContractorVO } from '@/api/project/contractor/types';
-import { ProjectTeamVO } from '@/api/project/projectTeam/types';
-import { S } from 'node_modules/vite/dist/node/types.d-aGj9QkWt';
-
-export interface ConstructionUserVO {
-  /**
-   * 主键id
-   */
-  id: string | number;
-
-  /**
-   * 微信id
-   */
-  openid: string | number;
-
-  /**
-   * 微信名称
-   */
-  nickName: string;
-
-  /**
-   * 人脸照
-   */
-  facePic: string;
-
-  /**
-   * 人脸照url
-   */
-  facePicUrl: string;
-
-  /**
-   * 人员姓名
-   */
-  userName: string;
-
-  /**
-   * 项目id
-   */
-  projectId: string | number;
-
-  /**
-   * 分包公司id
-   */
-  contractorId: string | number;
-
-  /**
-   * 分包公司
-   */
-  contractorVo: ContractorVO;
-
-  /**
-   * 班组id
-   */
-  teamId: string | number;
-
-  /**
-   * 班组
-   */
-  teamVo: ProjectTeamVO;
-
-  /**
-   * 状态（0在职 1离职）
-   */
-  status: number;
-
-  /**
-   * 是否代打
-   */
-  isPinch: number;
-
-  /**
-   * 联系电话
-   */
-  phone: string;
-
-  /**
-   * 0:保密 1:男 2女
-   */
-  sex: number;
-
-  /**
-   * 民族
-   */
-  nation: string;
-
-  /**
-   * 身份证正面照片
-   */
-  sfzFrontPic: string;
-
-  /**
-   * 身份证背面照片
-   */
-  sfzBackPic: string;
-
-  /**
-   * 身份证号码
-   */
-  sfzNumber: string;
-
-  /**
-   * 身份证有效开始期
-   */
-  sfzStart: string;
-
-  /**
-   * 身份证有效结束期
-   */
-  sfzEnd: string;
-
-  /**
-   * 身份证地址
-   */
-  sfzSite: string;
-
-  /**
-   * 身份证出生日期
-   */
-  sfzBirth: string;
-
-  /**
-   * 籍贯
-   */
-  nativePlace: string;
-
-  /**
-   * 银行卡图片
-   */
-  yhkPic: string;
-
-  /**
-   * 银行卡号
-   */
-  yhkNumber: string;
-
-  /**
-   * 开户行
-   */
-  yhkOpeningBank: string;
-
-  /**
-   * 持卡人
-   */
-  yhkCardholder: string;
-
-  /**
-   * 工种(字典type_of_work)
-   */
-  typeOfWork: number;
-
-  /**
-   * 特种工作证图片
-   */
-  specialWorkPic: string;
-
-  /**
-   * 打卡(0启用打卡 1禁止打卡)
-   */
-  clock: number;
-
-  /**
-   * 入场时间
-   */
-  entryDate: string;
-
-  /**
-   * 离场时间
-   */
-  leaveDate: string;
-
-  /**
-   * 薪水
-   */
-  salary: number;
-
-  /**
-   * 备注
-   */
-  remark: string;
-
-  /**
-   * 创建时间
-   */
-  createTime: string;
-}
-export interface skipType {
-  /**
-   * 项目id
-   */
-  projectId: string | number;
-
-  /**
-   * 分包id
-   */
-  contractorId: string | number;
-  id: string | number;
-}
-
-export interface ConstructionMonthQuery {
-  /**
-   * id
-   */
-  userId: string | number;
-
-  /**
-   * 打卡月份
-
-    */
-  clockMonth?: string | number;
-}
-
-export interface ConstructionUserMembeForm {
-  /**
-   * 用户id
-   */
-  id: string | number;
-  /**
-   * 用户姓名
-   */
-  userName: string | number;
-  /**
-   * 文件路径
-   */
-  filePath: string;
-  /**
-   * 备注
-   */
-  remark: string | number;
-}
-
-export interface ConstructionUserTemplateForm {
-  /**
-   * 项目id
-   */
-  projectId: string | number;
-}
-
-export interface ConstructionUserExitForm {
-  /**
-   * userId
-   */
-  userId: number | string;
-}
-
-export interface ConstructionUserSalaryForm {
-  /**
-   * 列表
-   */
-  id: number | string;
-
-  /**
-   * 工资
-   */
-  salary?: number | string;
-}
-
-export interface ConstructionUserPlayCardForm {
-  /**
-   * 项目
-   */
-  projectId?: string | number;
-  /**
-   * 用户id
-   */
-  id?: string | number;
-  /**
-   * 打卡状态
-   */
-  clock: number | string;
-}
-
-export interface skipOptionType {
-  /**
-   * 名称
-   */
-  projectName: string | number;
-
-  /**
-   * id
-   */
-  id: string | number;
-  /**
-   * 子项
-   */
-  contractorList: Array<skipTeamType>;
-}
-export interface skipTeamType {
-  /**
-   * 名称
-   */
-  name: string | number;
-
-  /**
-   * id
-   */
-  id: string | number;
-}
-
-export interface ConstructionUserForm extends BaseEntity {
-  /**
-   * 主键id
-   */
-  id?: string | number;
-
-  /**
-   * 微信id
-   */
-  openid?: string | number;
-
-  /**
-   * 微信名称
-   */
-  nickName?: string;
-
-  /**
-   * 人脸照
-   */
-  facePic?: string;
-
-  /**
-   * 人员姓名
-   */
-  userName?: string;
-
-  /**
-   * 项目id
-   */
-  projectId?: string | number;
-
-  /**
-   * 分包公司id
-   */
-  contractorId?: string | number;
-  /**
-   * 结算方式
-   */
-  wageMeasureUnit?: string | number;
-
-  /**
-   * 班组id
-   */
-  teamId?: string | number;
-
-  /**
-   * 状态（0在职 1离职）
-   */
-  status?: number;
-
-  /**
-   * 是否代打
-   */
-  isPinch?: number;
-
-  /**
-   * 联系电话
-   */
-  phone?: string;
-
-  /**
-   * 0:保密 1:男 2女
-   */
-  sex?: number;
-
-  /**
-   * 民族
-   */
-  nation?: string;
-
-  /**
-   * 身份证正面照片
-   */
-  sfzFrontPic: string;
-
-  /**
-   * 身份证背面照片
-   */
-  sfzBackPic: string;
-
-  /**
-   * 身份证号码
-   */
-  sfzNumber?: string;
-
-  /**
-   * 身份证有效开始期
-   */
-  sfzStart?: string;
-
-  /**
-   * 身份证有效结束期
-   */
-  sfzEnd?: string;
-
-  /**
-   * 身份证地址
-   */
-  sfzSite?: string;
-
-  /**
-   * 身份证出生日期
-   */
-  sfzBirth?: string;
-
-  /**
-   * 籍贯
-   */
-  nativePlace?: string;
-
-  /**
-   * 银行卡图片
-   */
-  yhkPic: string;
-
-  /**
-   * 银行卡号
-   */
-  yhkNumber?: string;
-
-  /**
-   * 开户行
-   */
-  yhkOpeningBank?: string;
-
-  /**
-   * 持卡人
-   */
-  yhkCardholder?: string;
-
-  /**
-   * 工种(字典type_of_work)
-   */
-  typeOfWork?: number;
-
-  /**
-   * 特种工作证图片
-   */
-  specialWorkPic: string;
-
-  /**
-   * 打卡(0启用打卡 1禁止打卡)
-   */
-  clock?: number;
-
-  /**
-   * 入场时间
-   */
-  entryDate?: string;
-
-  /**
-   * 离场时间
-   */
-  leaveDate?: string;
-
-  /**
-   * 薪水
-   */
-  salary?: number;
-
-  /**
-   * 备注
-   */
-  remark?: string;
-}
-
-export interface ConstructionUserStatusForm {
-  status: number | string;
-  idList: Array<string | number>;
-}
-
-export interface ConstructionUserQuery extends PageQuery {
-  /**
-   * 微信id
-   */
-  openid?: string | number;
-
-  /**
-   * 微信名称
-   */
-  nickName?: string;
-
-  /**
-   * 人员姓名
-   */
-  userName?: string;
-
-  /**
-   * 项目id
-   */
-  projectId?: string | number;
-
-  /**
-   * 分包公司id
-   */
-  contractorId?: string | number;
-
-  /**
-   * 班组id
-   */
-  teamId?: string | number;
-
-  /**
-   * 不在班组id
-   */
-  notTeamId?: string | number;
-
-  /**
-   * 状态（0在职 1离职）
-   */
-  status?: number;
-
-  /**
-   * 是否代打
-   */
-  isPinch?: number;
-
-  /**
-   * 联系电话
-   */
-  phone?: string;
-
-  /**
-   * 0:保密 1:男 2女
-   */
-  sex?: number;
-
-  /**
-   * 民族
-   */
-  nation?: string;
-
-  /**
-   * 身份证号码
-   */
-  sfzNumber?: string;
-
-  /**
-   * 身份证有效开始期
-   */
-  sfzStart?: string;
-
-  /**
-   * 身份证有效结束期
-   */
-  sfzEnd?: string;
-
-  /**
-   * 身份证地址
-   */
-  sfzSite?: string;
-
-  /**
-   * 身份证出生日期
-   */
-  sfzBirth?: string;
-
-  /**
-   * 籍贯
-   */
-  nativePlace?: string;
-
-  /**
-   * 银行卡号
-   */
-  yhkNumber?: string;
-
-  /**
-   * 开户行
-   */
-  yhkOpeningBank?: string;
-
-  /**
-   * 持卡人
-   */
-  yhkCardholder?: string;
-
-  /**
-   * 工种(字典type_of_work)
-   */
-  typeOfWork?: number;
-
-  /**
-   * 打卡(0启用打卡 1禁止打卡)
-   */
-  clock?: number;
-
-  /**
-   * 入场时间
-   */
-  entryDate?: string;
-
-  /**
-   * 离场时间
-   */
-  leaveDate?: string;
-
-  /**
-   * 薪水
-   */
-  salary?: number;
-
-  /**
-   * 日期范围参数
-   */
-  params?: any;
-}

src/api/project/constructionUserFile/index.ts

@@ -1,40 +0,0 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { ConstructionUserFileVO, ConstructionUserFileForm, ConstructionUserFileQuery } from '@/api/project/constructionUserFile/types';
-
-/**
- * 查询施工人员文件存储列表
- * @param query
- * @returns {*}
- */
-
-export const listConstructionUserFile = (query?: ConstructionUserFileQuery): AxiosPromise<ConstructionUserFileVO[]> => {
-  return request({
-    url: '/project/constructionUserFile/list',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询施工人员文件存储详细
- * @param data
- */
-export const setConstructionUserFile = (data: ConstructionUserFileForm): AxiosPromise<string | number> => {
-  return request({
-    url: '/project/constructionUserFile/save',
-    method: 'post',
-    data
-  });
-};
-
-/**
- * 删除施工人员文件存储
- * @param id
- */
-export const delConstructionUserFile = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/project/constructionUserFile/' + id,
-    method: 'delete'
-  });
-};

src/api/project/constructionUserFile/types.ts

@@ -1,137 +0,0 @@
-export interface ConstructionUserFileVO {
-  /**
-   * 主键id
-   */
-  id: string | number;
-
-  /**
-   * 用户id
-   */
-  userId: string | number;
-
-  /**
-   * 文件类型
-   */
-  fileType: string;
-
-  /**
-   * 文件名称
-   */
-  fileName: string;
-
-  /**
-   * 文件路径
-   */
-  path: string;
-
-  /**
-   * 备注
-   */
-  remark: string;
-}
-
-export interface ConstructionUserExitVO {
-  /**
-   * 主键id
-   */
-  id: string | number;
-
-  /**
-   * 用户id
-   */
-  userId: string | number;
-  /**
-   * 文件路径地址
-   */
-  pathUrl: Array<string>;
-
-  /**
-   * 身份证号码
-
-   */
-  sfzNumber: string;
-
-  /**
-   * 项目id
-   */
-  projectId: string;
-  /**
-   * 班组id
-   */
-  teamId: string;
-  /**
-   * 入场时间
-
-   */
-  entryDate: string;
-  /**
-   * 退场时间
-
-   */
-  leaveDate: string;
-
-  /**
-   * 退场文件
-
-   */
-  path: string;
-
-  /**
-   * 备注
-   */
-  remark: string;
-}
-
-export interface ConstructionUserFileForm extends BaseEntity {
-  /**
-   * 用户id
-   */
-  userId?: string | number;
-
-  /**
-   * 文件类型
-   */
-  fileList?: Array<fileListType>;
-}
-
-interface fileListType {
-  fileId: string | number;
-  fileType: string | number;
-}
-
-export interface ConstructionUserFileQuery {
-  /**
-   * 主键id
-   */
-  id?: string | number;
-
-  /**
-   * 用户id
-   */
-  userId?: string | number;
-
-  /**
-   * 文件类型
-   */
-  fileType?: string;
-
-  /**
-   * 文件名称
-   */
-  fileName?: string;
-
-  /**
-   * 文件路径
-   */
-  path?: string;
-
-  /**
-   * 备注
-   */
-  remark?: string;
-
-  /**
-   * 日期范围参数
-   */
-  params?: any;
-}

src/api/project/contractor/index.ts

@@ -1,63 +0,0 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { ContractorForm, ContractorQuery, ContractorVO } from '@/api/project/contractor/types';
-
-/**
- * 查询分包单位列表
- * @param query
- * @returns {*}
- */
-
-export const listContractor = (query?: ContractorQuery): AxiosPromise<ContractorVO[]> => {
-  return request({
-    url: '/contractor/contractor/list',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询分包单位详细
- * @param id
- */
-export const getContractor = (id: string | number): AxiosPromise<ContractorVO> => {
-  return request({
-    url: '/contractor/contractor/' + id,
-    method: 'get'
-  });
-};
-
-/**
- * 新增分包单位
- * @param data
- */
-export const addContractor = (data: ContractorForm): AxiosPromise<string | number> => {
-  return request({
-    url: '/contractor/contractor',
-    method: 'post',
-    data: data
-  });
-};
-
-/**
- * 修改分包单位
- * @param data
- */
-export const updateContractor = (data: ContractorForm) => {
-  return request({
-    url: '/contractor/contractor',
-    method: 'put',
-    data: data
-  });
-};
-
-/**
- * 删除分包单位
- * @param id
- */
-export const delContractor = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/contractor/contractor/' + id,
-    method: 'delete'
-  });
-};

src/api/project/contractor/types.ts

@@ -1,147 +0,0 @@
-export interface ContractorVO {
-  /**
-   * 主键id
-   */
-  id: string | number;
-
-  /**
-   * 公司名称
-   */
-  name: string;
-
-  /**
-   * 负责人
-   */
-  principal: string;
-
-  /**
-   * 负责人联系电话
-   */
-  principalPhone: string;
-
-  /**
-   * 管理人
-   */
-  custodian: string;
-
-  /**
-   * 管理人联系电话
-   */
-  custodianPhone: string;
-  /**
-   * 分包类型
-   */
-  contractorType?: string;
-
-  /**
-   * 公司相关文件
-   */
-  fileMap: Record<string, string>;
-
-  /**
-   * 备注
-   */
-  remark: string;
-
-  /**
-   * 创建时间
-   */
-  createTime: string;
-}
-
-export interface ContractorForm extends BaseEntity {
-  /**
-   * 主键id
-   */
-  id?: string | number;
-  /**
-   * 供应商id
-   */
-  supplierId?: string | number;
-  /**
-   * 供应商
-   */
-  supplier?: string;
-
-  /**
-   * 主键id
-   */
-  projectId?: string | number;
-
-  /**
-   * 公司名称
-   */
-  name?: string;
-
-  /**
-   * 负责人
-   */
-  principal?: string;
-
-  /**
-   * 负责人联系电话
-   */
-  principalPhone?: string;
-
-  /**
-   * 管理人
-   */
-  custodian?: string;
-
-  /**
-   * 管理人联系电话
-   */
-  custodianPhone?: string;
-  /**
-   * 分包类型
-   */
-  contractorType?: string;
-  /**
-   * 公司相关文件
-   */
-  fileMap: Record<string, string | number>;
-
-  /**
-   * 备注
-   */
-  remark?: string;
-}
-
-export interface ContractorQuery extends PageQuery {
-  /**
-   * 公司名称
-   */
-  name?: string;
-
-  /**
-   * 负责人
-   */
-  principal?: string;
-  /**
-   * 项目id
-   */
-  projectId: string | number;
-  /**
-   * 负责人联系电话
-   */
-  principalPhone?: string;
-
-  /**
-   * 管理人
-   */
-  custodian?: string;
-
-  /**
-   * 管理人联系电话
-   */
-  custodianPhone?: string;
-  /**
-   * 分包类型
-   */
-  contractorType?: string;
-
-  /**
-   * 日期范围参数
-   */
-  params?: any;
-}

src/api/project/contractorMaterial/contractorMaterialRecord/index.ts

@@ -1,63 +0,0 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { ContractorMaterialRecordVO, ContractorMaterialRecordForm, ContractorMaterialRecordQuery } from '@/api/contractor/contractorMaterialRecord/types';
-
-/**
- * 查询分包方物料记录列表
- * @param query
- * @returns {*}
- */
-
-export const listContractorMaterialRecord = (query?: ContractorMaterialRecordQuery): AxiosPromise<ContractorMaterialRecordVO[]> => {
-  return request({
-    url: '/contractor/contractorMaterialRecord/list',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询分包方物料记录详细
- * @param id
- */
-export const getContractorMaterialRecord = (id: string | number): AxiosPromise<ContractorMaterialRecordVO> => {
-  return request({
-    url: '/contractor/contractorMaterialRecord/' + id,
-    method: 'get'
-  });
-};
-
-/**
- * 新增分包方物料记录
- * @param data
- */
-export const addContractorMaterialRecord = (data: ContractorMaterialRecordForm) => {
-  return request({
-    url: '/contractor/contractorMaterialRecord',
-    method: 'post',
-    data: data
-  });
-};
-
-/**
- * 修改分包方物料记录
- * @param data
- */
-export const updateContractorMaterialRecord = (data: ContractorMaterialRecordForm) => {
-  return request({
-    url: '/contractor/contractorMaterialRecord',
-    method: 'put',
-    data: data
-  });
-};
-
-/**
- * 删除分包方物料记录
- * @param id
- */
-export const delContractorMaterialRecord = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/contractor/contractorMaterialRecord/' + id,
-    method: 'delete'
-  });
-};

src/api/project/contractorMaterial/contractorMaterialRecord/types.ts

@@ -1,141 +0,0 @@
-export interface ContractorMaterialRecordVO {
-  /**
-   * 主键id
-   */
-  id: string | number;
-
-  /**
-   * 项目id
-   */
-  projectId: string | number;
-
-  /**
-   * 分包方id
-   */
-  contractorId: string | number;
-
-  /**
-   * 物料id
-   */
-  contractorMaterialId: string | number;
-
-  /**
-   * 记录类型(1到货计划 2使用情况)
-   */
-  recordType: string;
-
-  /**
-   * 记录时间
-   */
-  recordTime: string;
-
-  /**
-   * 数量
-   */
-  recordNumber: number;
-
-  /**
-   * 剩余数量(到货 使用)
-   */
-  remainingNumber: number;
-
-  /**
-   * 使用位置或构件部位(使用情况)
-   */
-  usedPosition: string;
-
-  /**
-   * 相关附件
-   */
-  file: string;
-
-  /**
-   * 备注
-   */
-  remark: string;
-
-}
-
-export interface ContractorMaterialRecordForm extends BaseEntity {
-  /**
-   * 主键id
-   */
-  id?: string | number;
-
-  /**
-   * 物料id
-   */
-  contractorMaterialId?: string | number;
-
-  /**
-   * 记录类型(1到货计划 2使用情况)
-   */
-  recordType?: string;
-
-  /**
-   * 记录时间
-   */
-  recordTime?: string;
-
-  /**
-   * 数量
-   */
-  recordNumber?: number;
-
-  /**
-   * 剩余数量(到货 使用)
-   */
-  remainingNumber?: number;
-
-  /**
-   * 使用位置或构件部位(使用情况)
-   */
-  usedPosition?: string;
-
-  /**
-   * 相关附件
-   */
-  file?: string;
-
-  /**
-   * 备注
-   */
-  remark?: string;
-
-}
-
-export interface ContractorMaterialRecordQuery extends PageQuery {
-
-  /**
-   * 项目id
-   */
-  projectId?: string | number;
-
-  /**
-   * 分包方id
-   */
-  contractorId?: string | number;
-
-  /**
-   * 物料id
-   */
-  contractorMaterialId?: string | number;
-
-  /**
-   * 记录类型(1到货计划 2使用情况)
-   */
-  recordType?: string;
-
-  /**
-   * 使用位置或构件部位(使用情况)
-   */
-  usedPosition?: string;
-
-    /**
-     * 日期范围参数
-     */
-    params?: any;
-}
-
-
-

src/api/project/contractorMaterial/index.ts

@@ -1,63 +0,0 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { ContractorMaterialVO, ContractorMaterialForm, ContractorMaterialQuery } from '@/api/project/contractorMaterial/types';
-
-/**
- * 查询分包方物料列表
- * @param query
- * @returns {*}
- */
-
-export const listContractorMaterial = (query?: ContractorMaterialQuery): AxiosPromise<ContractorMaterialVO[]> => {
-  return request({
-    url: '/contractor/contractorMaterial/list',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询分包方物料详细
- * @param id
- */
-export const getContractorMaterial = (id: string | number): AxiosPromise<ContractorMaterialVO> => {
-  return request({
-    url: '/contractor/contractorMaterial/' + id,
-    method: 'get'
-  });
-};
-
-/**
- * 新增分包方物料
- * @param data
- */
-export const addContractorMaterial = (data: ContractorMaterialForm) => {
-  return request({
-    url: '/contractor/contractorMaterial',
-    method: 'post',
-    data: data
-  });
-};
-
-/**
- * 修改分包方物料
- * @param data
- */
-export const updateContractorMaterial = (data: ContractorMaterialForm) => {
-  return request({
-    url: '/contractor/contractorMaterial',
-    method: 'put',
-    data: data
-  });
-};
-
-/**
- * 删除分包方物料
- * @param id
- */
-export const delContractorMaterial = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/contractor/contractorMaterial/' + id,
-    method: 'delete'
-  });
-};

src/api/project/contractorMaterial/types.ts

@@ -1,126 +0,0 @@
-export interface ContractorMaterialVO {
-  /**
-   * 分包方id
-   */
-  contractorId: string | number;
-
-  /**
-   * 物料名称
-   */
-  materialName: string;
-
-  /**
-   * 物料类型
-   */
-  materialType: string;
-
-  /**
-   * 物料型号
-   */
-  materialModel: string;
-
-  /**
-   * 物料数量
-   */
-  materialNumber: number;
-
-  /**
-   * 物料单位
-   */
-  materialUnit: string;
-
-  /**
-   * 文件
-   */
-  file: string;
-
-  /**
-   * 备注
-   */
-  remark: string;
-
-}
-
-export interface ContractorMaterialForm extends BaseEntity {
-  /**
-   * 主键id
-   */
-  id?: string | number;
-
-  /**
-   * 项目id
-   */
-  projectId?: string | number;
-
-  /**
-   * 分包方id
-   */
-  contractorId?: string | number;
-
-  /**
-   * 物料名称
-   */
-  materialName?: string;
-
-  /**
-   * 物料类型
-   */
-  materialType?: string;
-
-  /**
-   * 物料型号
-   */
-  materialModel?: string;
-
-  /**
-   * 物料单位
-   */
-  materialUnit?: string;
-
-  /**
-   * 文件
-   */
-  file?: string;
-
-  /**
-   * 备注
-   */
-  remark?: string;
-
-}
-
-export interface ContractorMaterialQuery extends PageQuery {
-
-  /**
-   * 项目id
-   */
-  projectId?: string | number;
-
-  /**
-   * 分包方id
-   */
-  contractorId?: string | number;
-
-  /**
-   * 物料名称
-   */
-  materialName?: string;
-
-  /**
-   * 物料类型
-   */
-  materialType?: string;
-
-  /**
-   * 物料型号
-   */
-  materialModel?: string;
-
-    /**
-     * 日期范围参数
-     */
-    params?: any;
-}
-
-
-

src/api/project/contractorTool/contractorToolEntry/index.ts

@@ -1,63 +0,0 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { ContractorToolEntryVO, ContractorToolEntryForm, ContractorToolEntryQuery } from '@/api/contractor/contractorToolEntry/types';
-
-/**
- * 查询分包方工器具进场列表
- * @param query
- * @returns {*}
- */
-
-export const listContractorToolEntry = (query?: ContractorToolEntryQuery): AxiosPromise<ContractorToolEntryVO[]> => {
-  return request({
-    url: '/contractor/contractorToolRecord/list',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询分包方工器具进场详细
- * @param id
- */
-export const getContractorToolEntry = (id: string | number): AxiosPromise<ContractorToolEntryVO> => {
-  return request({
-    url: '/contractor/contractorToolRecord/' + id,
-    method: 'get'
-  });
-};
-
-/**
- * 新增分包方工器具进场
- * @param data
- */
-export const addContractorToolEntry = (data: ContractorToolEntryForm) => {
-  return request({
-    url: '/contractor/contractorToolRecord',
-    method: 'post',
-    data: data
-  });
-};
-
-/**
- * 修改分包方工器具进场
- * @param data
- */
-export const updateContractorToolEntry = (data: ContractorToolEntryForm) => {
-  return request({
-    url: '/contractor/contractorToolRecord',
-    method: 'put',
-    data: data
-  });
-};
-
-/**
- * 删除分包方工器具进场
- * @param id
- */
-export const delContractorToolEntry = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/contractor/contractorToolRecord/' + id,
-    method: 'delete'
-  });
-};

src/api/project/contractorTool/contractorToolEntry/types.ts

@@ -1,156 +0,0 @@
-export interface ContractorToolEntryVO {
-  /**
-   * 主键id
-   */
-  id: string | number;
-
-  /**
-   * 项目id
-   */
-  projectId: string | number;
-
-  /**
-   * 分包方id
-   */
-  contractorId: string | number;
-
-  /**
-   * 分包方工器具id
-   */
-  contractorToolId: string | number;
-
-  /**
-   * 进场工器具数量
-   */
-  toolNumber: string;
-
-  /**
-   * 检测编号
-   */
-  checkNum: string;
-
-  /**
-   * 检测部门
-   */
-  checkDept: string;
-
-  /**
-   * 检测时间
-   */
-  checkTime: string;
-
-  /**
-   * 合格证
-   */
-  certificate: string;
-
-  /**
-   * 备注
-   */
-  remark: string;
-
-  /**
-   * 进场时间
-   */
-  entryTime: string;
-
-}
-
-export interface ContractorToolEntryForm extends BaseEntity {
-  /**
-   * 主键id
-   */
-  id?: string | number;
-
-  /**
-   * 分包方工器具id
-   */
-  contractorToolId?: string | number;
-
-  /**
-   * 进场工器具数量
-   */
-  toolNumber?: string;
-
-  /**
-   * 检测编号
-   */
-  checkNum?: string;
-
-  /**
-   * 检测部门
-   */
-  checkDept?: string;
-
-  /**
-   * 检测时间
-   */
-  checkTime?: string;
-
-  /**
-   * 合格证
-   */
-  certificate?: string;
-
-  /**
-   * 备注
-   */
-  remark?: string;
-
-  /**
-   * 进场时间
-   */
-  entryTime?: string;
-  /**
-   * 类型
-   */
-  recordType?: string;
-   /**
-   * 工器具数量
-   */
-   recordNumber?: number;
-}
-
-export interface ContractorToolEntryQuery extends PageQuery {
-
-  /**
-   * 项目id
-   */
-  projectId?: string | number;
-
-  /**
-   * 分包方id
-   */
-  contractorId?: string | number;
-
-  /**
-   * 分包方工器具id
-   */
-  contractorToolId?: string | number;
-
-  /**
-   * 进场工器具数量
-   */
-  toolNumber?: string;
-
-  /**
-   * 检测编号
-   */
-  checkNum?: string;
-  /**
-   * 类型
-   */
-  recordType?: string;
-  /**
-   * 检测部门
-   */
-  checkDept?: string;
-
-    /**
-     * 日期范围参数
-     */
-    params?: any;
-}
-
-
-

src/api/project/contractorTool/index.ts

@@ -1,63 +0,0 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { ContractorToolVO, ContractorToolForm, ContractorToolQuery } from '@/api/project/contractorTool/types';
-
-/**
- * 查询分包方工器具列表
- * @param query
- * @returns {*}
- */
-
-export const listContractorTool = (query?: ContractorToolQuery): AxiosPromise<ContractorToolVO[]> => {
-  return request({
-    url: '/contractor/contractorTool/list',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询分包方工器具详细
- * @param id
- */
-export const getContractorTool = (id: string | number): AxiosPromise<ContractorToolVO> => {
-  return request({
-    url: '/contractor/contractorTool/' + id,
-    method: 'get'
-  });
-};
-
-/**
- * 新增分包方工器具
- * @param data
- */
-export const addContractorTool = (data: ContractorToolForm) => {
-  return request({
-    url: '/contractor/contractorTool',
-    method: 'post',
-    data: data
-  });
-};
-
-/**
- * 修改分包方工器具
- * @param data
- */
-export const updateContractorTool = (data: ContractorToolForm) => {
-  return request({
-    url: '/contractor/contractorTool',
-    method: 'put',
-    data: data
-  });
-};
-
-/**
- * 删除分包方工器具
- * @param id
- */
-export const delContractorTool = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/contractor/contractorTool/' + id,
-    method: 'delete'
-  });
-};

src/api/project/contractorTool/types.ts

@@ -1,136 +0,0 @@
-export interface ContractorToolVO {
-  /**
-   * 主键id
-   */
-  id: string | number;
-
-  /**
-   * 项目id
-   */
-  projectId: string | number;
-
-  /**
-   * 分包方id
-   */
-  contractorId: string | number;
-
-  /**
-   * 工具名称
-   */
-  toolName: string;
-
-  /**
-   * 工具类型
-   */
-  toolType: string;
-
-  /**
-   * 工具型号
-   */
-  toolModel: string;
-
-  /**
-   * 工具数量
-   */
-  toolNumber: string;
-
-  /**
-   * 备注
-   */
-  remark: string;
-
-  /**
-   * 创建时间
-   */
-  createTime: string;
-
-}
-
-export interface ContractorToolForm extends BaseEntity {
-  /**
-   * 主键id
-   */
-  id?: string | number;
-
-  /**
-   * 项目id
-   */
-  projectId?: string | number;
-
-  /**
-   * 分包方id
-   */
-  contractorId?: string | number;
-
-  /**
-   * 工具名称
-   */
-  toolName?: string;
-
-  /**
-   * 工具类型
-   */
-  toolType?: string;
-
-  /**
-   * 工具型号
-   */
-  toolModel?: string;
-
-  /**
-   * 工具数量
-   */
-  toolNumber?: string;
-
-  /**
-   * 文件
-   */
-  file?: string;
-
-  /**
-   * 备注
-   */
-  remark?: string;
-
-}
-
-export interface ContractorToolQuery extends PageQuery {
-
-  /**
-   * 项目id
-   */
-  projectId?: string | number;
-
-  /**
-   * 分包方id
-   */
-  contractorId?: string | number;
-
-  /**
-   * 工具名称
-   */
-  toolName?: string;
-
-  /**
-   * 工具类型
-   */
-  toolType?: string;
-
-  /**
-   * 工具型号
-   */
-  toolModel?: string;
-
-  /**
-   * 工具数量
-   */
-  toolNumber?: string;
-
-    /**
-     * 日期范围参数
-     */
-    params?: any;
-}
-
-
-

src/api/project/leave/index.ts

@@ -1,76 +0,0 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { LeaveVO, LeaveForm, LeaveQuery } from '@/api/project/leave/types';
-import { AuditReissueCardForm } from '../reissueCard/types';
-
-/**
- * 查询施工人员请假申请列表
- * @param query
- * @returns {*}
- */
-
-export const listLeave = (query?: LeaveQuery): AxiosPromise<LeaveVO[]> => {
-  return request({
-    url: '/project/leave/list',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询施工人员请假申请详细
- * @param id
- */
-export const getLeave = (id: string | number): AxiosPromise<LeaveVO> => {
-  return request({
-    url: '/project/leave/' + id,
-    method: 'get'
-  });
-};
-
-/**
- * 新增施工人员请假申请
- * @param data
- */
-export const addLeave = (data: LeaveForm) => {
-  return request({
-    url: '/project/leave',
-    method: 'post',
-    data: data
-  });
-};
-
-/**
- * 修改施工人员请假申请
- * @param data
- */
-export const updateLeave = (data: LeaveForm) => {
-  return request({
-    url: '/project/leave',
-    method: 'put',
-    data: data
-  });
-};
-
-/**
- * 删除施工人员请假申请
- * @param id
- */
-export const delLeave = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/project/leave/' + id,
-    method: 'delete'
-  });
-};
-
-/**
- * 管理员审核施工人员请假申请
- * @param data
- */
-export const AuditReissueCard = (data: AuditReissueCardForm) => {
-  return request({
-    url: '/project/leave/review/manager',
-    method: 'put',
-    data: data
-  });
-};

src/api/project/leave/types.ts

@@ -1,206 +0,0 @@
-export interface LeaveVO {
-  /**
-   * 申请人名字
-   */
-  userName: string;
-  id?: string | number;
-  /**
-   * 申请请假说明
-   */
-  userExplain: string;
-  status?: string;
-  /**
-   * 请假申请时间
-   */
-  userTime: string;
-
-  /**
-   * 请假类型（1事假 2病假）
-   */
-  leaveType: string;
-
-  /**
-   * 请假开始时间
-   */
-  startTime: string;
-
-  /**
-   * 请假结束时间
-   */
-  endTime: string;
-
-  /**
-   * 班组长名字
-   */
-  gangerName: string;
-
-  /**
-   * 班组长意见（1未读 2同意 3拒绝）
-   */
-  gangerOpinion: string;
-
-  /**
-   * 班组长说明
-   */
-  gangerExplain: string;
-
-  /**
-   * 班组长操作时间
-   */
-  gangerTime: string;
-
-  /**
-   * 管理员意见（1未读 2同意 3拒绝）
-   */
-  managerOpinion: string;
-
-  /**
-   * 管理员说明
-   */
-  managerExplain: string;
-
-  /**
-   * 管理员操作时间
-   */
-  managerTime: string;
-
-  /**
-   * 备注
-   */
-  remark: string;
-  managerName?: string;
-}
-
-export interface LeaveForm extends BaseEntity {
-  /**
-   * 主键id
-   */
-  id?: string | number;
-
-  /**
-   * 申请人id
-   */
-  userId?: string | number;
-
-  /**
-   * 申请人名字
-   */
-  userName?: string;
-
-  /**
-   * 申请请假说明
-   */
-  userExplain?: string;
-
-  /**
-   * 请假申请时间
-   */
-  userTime?: string;
-
-  /**
-   * 请假类型（1事假 2病假）
-   */
-  leaveType?: string;
-
-  /**
-   * 请假开始时间
-   */
-  startTime?: string;
-
-  /**
-   * 请假结束时间
-   */
-  endTime?: string;
-
-  /**
-   * 班组长
-   */
-  gangerId?: string | number;
-
-  /**
-   * 班组长名字
-   */
-  gangerName?: string;
-
-  /**
-   * 班组长意见（1未读 2同意 3拒绝）
-   */
-  gangerOpinion?: string;
-
-  /**
-   * 班组长说明
-   */
-  gangerExplain?: string;
-
-  /**
-   * 班组长操作时间
-   */
-  gangerTime?: string;
-
-  /**
-   * 管理员意见（1未读 2同意 3拒绝）
-   */
-  managerOpinion?: string;
-
-  /**
-   * 管理员说明
-   */
-  managerExplain?: string;
-
-  /**
-   * 管理员操作时间
-   */
-  managerTime?: string;
-
-  /**
-   * 项目id
-   */
-  projectId?: string | number;
-
-  /**
-   * 班组id
-   */
-  teamId?: string | number;
-
-  /**
-   * 备注
-   */
-  remark?: string;
-}
-
-export interface LeaveQuery extends PageQuery {
-  /**
-   * 申请人名字
-   */
-  userName?: string;
-
-  /**
-   * 请假类型（1事假 2病假）
-   */
-  leaveType?: string;
-
-  /**
-   * 班组长意见（1未读 2同意 3拒绝）
-   */
-  gangerOpinion?: string;
-
-  /**
-   * 管理员意见（1未读 2同意 3拒绝）
-   */
-  managerOpinion?: string;
-
-  /**
-   * 项目id
-   */
-  projectId?: string | number;
-
-  /**
-   * 班组id
-   */
-  teamId?: string | number;
-
-  /**
-   * 日期范围参数
-   */
-  params?: any;
-}

src/api/project/project/index.ts

@@ -10,7 +10,7 @@ import { childProjectQuery, ProjectForm, ProjectQuery, ProjectVO } from '@/api/p
 
 export const listProject = (query?: ProjectQuery): AxiosPromise<ProjectVO[]> => {
   return request({
-    url: '/project/project/list',
+    url: '/system/project/project/list',
     method: 'get',
     params: query
   });
@@ -24,7 +24,7 @@ export const listProject = (query?: ProjectQuery): AxiosPromise<ProjectVO[]> =>
 
 export const listDXFProject = (id: string | number): AxiosPromise<any> => {
   return request({
-    url: '/project/projectFile/json/' + id,
+    url: '/system/project/projectFile/json/' + id,
     method: 'get'
   });
 };
@@ -35,7 +35,7 @@ export const listDXFProject = (id: string | number): AxiosPromise<any> => {
  */
 export const getProject = (id: string | number): AxiosPromise<ProjectVO> => {
   return request({
-    url: '/project/project/' + id,
+    url: '/system/project/project/' + id,
     method: 'get'
   });
 };
@@ -46,7 +46,7 @@ export const getProject = (id: string | number): AxiosPromise<ProjectVO> => {
  */
 export const addProject = (data: ProjectForm): AxiosPromise<string | number> => {
   return request({
-    url: '/project/project',
+    url: '/system/project/project',
     method: 'post',
     data: data
   });
@@ -58,7 +58,7 @@ export const addProject = (data: ProjectForm): AxiosPromise<string | number> =>
  */
 export const updateProject = (data: ProjectForm) => {
   return request({
-    url: '/project/project',
+    url: '/system/project/project',
     method: 'put',
     data: data
   });
@@ -70,7 +70,7 @@ export const updateProject = (data: ProjectForm) => {
  */
 export const upLoadProjectDXF = (data: any) => {
   return request({
-    url: '/project/projectFile/upload/dxf',
+    url: '/system/project/projectFile/upload/dxf',
     method: 'post',
     data: data
   });
@@ -147,7 +147,7 @@ export const addInverter = (data: any) => {
  */
 export const delProject = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/project/project/' + id,
+    url: '/system/project/project/' + id,
     method: 'delete'
   });
 };
@@ -158,7 +158,7 @@ export const delProject = (id: string | number | Array<string | number>) => {
  */
 export const addChildProject = (data: childProjectQuery) => {
   return request({
-    url: '/project/project/sub',
+    url: '/system/project/project/sub',
     method: 'post',
     data: data
   });
@@ -170,7 +170,7 @@ export const addChildProject = (data: childProjectQuery) => {
  */
 export const getChildProject = (id: string | number): AxiosPromise<childProjectQuery[]> => {
   return request({
-    url: '/project/project/list/sub/' + id,
+    url: '/system/project/project/list/sub/' + id,
     method: 'get'
   });
 };
@@ -181,7 +181,7 @@ export const getChildProject = (id: string | number): AxiosPromise<childProjectQ
  */
 export const uploadProjectFile = (data: any) => {
   return request({
-    url: '/project/project/save/tender/file',
+    url: '/system/project/project/save/tender/file',
     method: 'put',
     data: data
   });
@@ -193,7 +193,7 @@ export const uploadProjectFile = (data: any) => {
  */
 export const changeProject = (id: string | number) => {
   return request({
-    url: '/project/project/changeProject/' + id,
+    url: '/system/project/project/changeProject/' + id,
     method: 'get'
   });
 };