1

- 调整摘要卡片的布局和间距
- 添加悬停动画效果和渐变边框
- 改进数值显示样式和默认值处理
- 增强图标视觉效果和交互反馈

.env.development

@@ -8,10 +8,15 @@ VITE_APP_ENV = 'development'
 VITE_APP_BASE_API = 'http://192.168.110.209:8899'
 # VITE_APP_BASE_API = 'http://58.17.134.85:8899'
 # GO开发环境
-VITE_APP_BASE_API_GO = 'http://192.168.110.188:8919'
+VITE_APP_BASE_API_GO = 'http://xny.yj-3d.com:7464'
+# VITE_APP_BASE_API_GO = 'http://192.168.110.188:8919'
+
+# ws
+VITE_APP_BASE_WS_API = 'ws://192.168.110.149:8899/resource/websocket'
+# EARTH
+VITE_APP_BASE_EARTH_API = "http://192.168.110.2:8895"
 
 # 无人机接口地址
-
 VITE_APP_BASE_DRONE_API = 'http://58.17.134.85:9512'
 
 # 应用访问路径 例如使用前缀 /admin/

.env.production

@@ -15,8 +15,9 @@ VITE_APP_SNAILJOB_ADMIN = '/snail-job'
 
 # 生产环境
 # GO生产环境
-VITE_APP_BASE_API_GO = 'http://58.17.134.85:7363'
+VITE_APP_BASE_API_GO = 'http://58.17.134.85:7464'
 VITE_APP_BASE_API = 'http://xny.yj-3d.com:8899'
+VITE_APP_BASE_EARTH_API = "http://192.168.110.2:8895"
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip

absolute/path/to/index.vue

@@ -0,0 +1 @@
+

package.json

@@ -34,7 +34,7 @@
     "date-fns": "^4.1.0",
     "diagram-js": "12.3.0",
     "didi": "9.0.2",
-    "echarts": "5.5.0",
+    "echarts": "^5.5.0",
     "echarts-gl": "^2.0.9",
     "element-plus": "2.8.8",
     "esbuild": "^0.25.0",

public/vite.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

src/api/cory/contactnotice/index.ts

@@ -16,6 +16,17 @@ export const listContactnotice = (query?: ContactnoticeQuery): AxiosPromise<Cont
   });
 };
 
+/**
+ * 根据项目id查询项目班组班组长信息列表
+ * @param projectId
+ */
+export const listProjectTeamForeman = (projectId: string | number): AxiosPromise<any[]> => {
+  return request({
+    url: '/project/projectTeam/listForeman/' + projectId,
+    method: 'get'
+  });
+};
+
 /**
  * 查询联系单详细
  * @param id

src/api/design/received/index.ts

@@ -24,3 +24,11 @@ export const exportWord = (params) => {
     method: 'post'
   });
 };
+// 导出模版
+export const exportExcel = (params) => {
+  return request({
+    url: '/design/collect/exportExcel',
+    method: 'post',
+    params: params
+  });
+};

src/api/design/volumeCatalog/index.ts

@@ -127,6 +127,17 @@ export const majorList = (params) => {
     params: params
   });
 };
+/**
+ * 获取人员列表
+ * @param query
+ */
+export const copyUserList = (params) => {
+  return request({
+    url: '/design/volumeCatalog/copyUserList',
+    method: 'get',
+    params: params
+  });
+};
 /**
  * 获取二维码信息
  * @param query

src/api/enterpriseLarge/index.ts

@@ -0,0 +1,44 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+
+/**
+ * 查询企业关键指标
+ */
+
+export const keyIndex = () => {
+  return request({
+    url: '/enterprise/big/screen/keyIndex',
+    method: 'get'
+  });
+};
+
+/**
+ * 每个项目的出勤人数
+ */
+
+export const projectAttendanceCount = () => {
+  return request({
+    url: '/enterprise/big/screen/projectAttendanceCount',
+    method: 'get'
+  });
+};
+/**
+ * 人数统计
+ */
+
+export const peopleCount = () => {
+  return request({
+    url: '/enterprise/big/screen/peopleCount',
+    method: 'get'
+  });
+};
+/**
+ * 出勤人数统计
+ */
+
+export const allAttendanceCount = () => {
+  return request({
+    url: '/enterprise/big/screen/allAttendanceCount',
+    method: 'get'
+  });
+};

src/api/equipment/index.ts

@@ -0,0 +1,111 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { EquipmentVO, EquipmentForm, EquipmentQuery } from '@/api/equipment/types';
+
+/**
+ * 查询GPS设备详细列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listEquipment = (query?: EquipmentQuery): AxiosPromise<EquipmentVO[]> => {
+  return request({
+    url: '/gps/equipment/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询GPS设备详细详细
+ * @param id
+ */
+export const getEquipment = (id: string | number): AxiosPromise<EquipmentVO> => {
+  return request({
+    url: '/gps/equipment/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增GPS设备详细
+ * @param data
+ */
+export const addEquipment = (data: EquipmentForm) => {
+  return request({
+    url: '/gps/equipment',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改GPS设备详细
+ * @param data
+ */
+export const updateEquipment = (data: EquipmentForm) => {
+  return request({
+    url: '/gps/equipment',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除GPS设备详细
+ * @param id
+ */
+export const delEquipment = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/gps/equipment/' + id,
+    method: 'delete'
+  });
+};
+
+export const bindUser = (data) => {
+  return request({
+    url: '/gps/equipment/bindManmachine',
+    method: 'post',
+    data: data
+  });
+};
+
+export const getUserId = (projectId) => {
+  return request({
+    url: '/gps/equipment/userList',
+    method: 'get',
+
+    params: { projectId }
+  });
+};
+export const gethistroyUser = (data) => {
+  return request({
+    url: '/gps/equipment/getUserList',
+    method: 'get',
+    params: data
+  });
+};
+
+// 解除绑定接口定义（确保使用POST方法并正确传递data）
+export function getRemoveBind(data: { id: number; clientId: string }) {
+  return request({
+    url: '/gps/equipment/unbindManmachine',
+    method: 'post',
+    data: data
+  });
+}
+
+export function getProjectId() {
+  return request({
+    url: 'gps/equipment/getProjectList',
+    method: 'get'
+  });
+}
+
+export const getFootNote = (data) => {
+  return request({
+    url: 'gps/equipmentSon/getList',
+    method: 'get',
+    params: data
+  });
+};

src/api/equipment/types.ts

@@ -0,0 +1,174 @@
+export interface EquipmentVO {
+  /**
+   *
+   */
+  id: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId: string | number;
+
+  /**
+   * 用户id
+   */
+  userId: string | number;
+
+  /**
+   * 设备标识
+   */
+  clientId: string | number;
+
+  /**
+   * 设备名称
+   */
+  deviceName: string;
+
+  /**
+   * 是否使用UDP协议：0=否，1=是
+   */
+  udp: number;
+
+  /**
+   * 远程连接地址（IP:端口）
+   */
+  remoteAddressStr: string;
+
+  /**
+   * 连接创建时间
+   */
+  creationTime: number;
+
+  /**
+   * 最后活动时间
+   */
+  lastAccessedTime: number;
+
+  /**
+   * 是否已注册：0=未注册，1=已注册
+   */
+  registered: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+}
+
+export interface EquipmentForm extends BaseEntity {
+  /**
+   *
+   */
+  id?: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 用户id
+   */
+  userId?: string | number;
+
+  /**
+   * 设备标识
+   */
+  clientId?: string | number;
+
+  /**
+   * 设备名称
+   */
+  deviceName?: string;
+
+  /**
+   * 是否使用UDP协议：0=否，1=是
+   */
+  udp?: number;
+
+  /**
+   * 远程连接地址（IP:端口）
+   */
+  remoteAddressStr?: string;
+
+  /**
+   * 连接创建时间
+   */
+  creationTime?: number;
+
+  /**
+   * 最后活动时间
+   */
+  lastAccessedTime?: number;
+
+  /**
+   * 是否已注册：0=未注册，1=已注册
+   */
+  registered?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+}
+
+export interface EquipmentQuery extends PageQuery {
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+  /**
+   * 是否绑定
+   */
+  type?: string | number;
+
+  /**
+   * 展示用户/设备数据：1=用户数据，0=设备数据
+   */
+  gpsType?: string | number;
+
+  /**
+   * 用户id
+   */
+  userId?: string | number;
+
+  /**
+   * 设备标识
+   */
+  clientId?: string | number;
+
+  /**
+   * 设备名称
+   */
+  deviceName?: string;
+
+  /**
+   * 是否使用UDP协议：0=否，1=是
+   */
+  udp?: number;
+
+  /**
+   * 远程连接地址（IP:端口）
+   */
+  remoteAddressStr?: string;
+
+  /**
+   * 连接创建时间
+   */
+  creationTime?: number;
+
+  /**
+   * 最后活动时间
+   */
+  lastAccessedTime?: number;
+
+  /**
+   * 是否已注册：0=未注册，1=已注册
+   */
+  registered?: number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}

src/api/gis/index.ts

@@ -1,4 +1,5 @@
 import request from '@/utils/request-go';
+import request1 from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import {
   QualityVO,
@@ -172,7 +173,7 @@ export const getweatherList = (): AxiosPromise<weatherVO[]> => {
  */
 
 export const getSafetyDay = (id?: string): AxiosPromise<safetyDayVO> => {
-  return request({
+  return request1({
     url: '/project/project/safetyDay/' + id,
     method: 'get'
   });

src/api/largeScreen/index.ts

@@ -98,3 +98,18 @@ export const cashTotal = () => {
     method: 'get'
   });
 };
+//安全天数
+export const getSafetyDay = (projectId) => {
+  return request({
+    url: '/money/big/screen/safetyDay/' + projectId,
+    method: 'get'
+  });
+};
+
+//安全天数
+export const getWeather = (projectId) => {
+  return request({
+    url: '/money/big/screen/weather/' + projectId,
+    method: 'get'
+  });
+};

src/api/login.ts

@@ -129,10 +129,10 @@ export function getGoToken(): AxiosPromise<any> {
     data: {
       status: 'yjdsj',
       verifyCode: '1111',
+      // username: 'admin',
+      // password: 'zmkg@2023A'
       username: 'admin',
-      password: 'zmkg@2023A'
+      password: 'zmkg@2023C'
-      // username: 'admin1',
-      // password: 'zmkg@2023C'
     }
   });
 }

src/api/machinery/machinery/index.ts

@@ -1,63 +1,45 @@
-import request from '@/utils/request';
+import request from '@/utils/request-go';
-import { AxiosPromise } from 'axios';
+// 查询机械列表
-import { MachineryForm, MachineryQuery, MachineryVO } from '@/api/machinery/machinery/types';
+export function listBusMachinery(query: object) {
-
-/**
- * 查询机械列表
- * @param query
- * @returns {*}
- */
-
-export const listMachinery = (query?: MachineryQuery): AxiosPromise<MachineryVO[]> => {
   return request({
-    url: '/machinery/machinery/list',
+    url: '/zm/api/v1/system/busMachinery/list',
     method: 'get',
     params: query
   });
-};
+}
-
+// 查询机械详细
-/**
+export function getBusMachinery(id: number) {
- * 查询机械详细
- * @param id
- */
-export const getMachinery = (id: string | number): AxiosPromise<MachineryVO> => {
   return request({
-    url: '/machinery/machinery/' + id,
+    url: '/zm/api/v1/system/busMachinery/get',
-    method: 'get'
+    method: 'get',
+    params: {
+      id: id.toString()
+    }
   });
-};
+}
-
+// 新增机械
-/**
+export function addBusMachinery(data: object) {
- * 新增机械
- * @param data
- */
-export const addMachinery = (data: MachineryForm): AxiosPromise<string | number> => {
   return request({
-    url: '/machinery/machinery',
+    url: '/zm/api/v1/system/busMachinery/add',
     method: 'post',
     data: data
   });
-};
+}
-
+// 修改机械
-/**
+export function updateBusMachinery(data: object) {
- * 修改机械
- * @param data
- */
-export const updateMachinery = (data: MachineryForm) => {
   return request({
-    url: '/machinery/machinery',
+    url: '/zm/api/v1/system/busMachinery/edit',
     method: 'put',
     data: data
   });
-};
+}
-
+// 删除机械
-/**
+export function delBusMachinery(ids: number[]) {
- * 删除机械
- * @param id
- */
-export const delMachinery = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/machinery/machinery/' + id,
+    url: '/zm/api/v1/system/busMachinery/delete',
-    method: 'delete'
+    method: 'delete',
+    data: {
+      ids: ids
+    }
   });
-};
+}

src/api/machinery/machineryDetail/index.ts

@@ -1,63 +1,45 @@
-import request from '@/utils/request';
+import request from '@/utils/request-go';
-import { AxiosPromise } from 'axios';
+// 查询机械详情列表
-import { MachineryDetailForm, MachineryDetailQuery, MachineryDetailVO } from '@/api/machinery/machineryDetail/types';
+export function listBusMachineryDetail(query: object) {
-
-/**
- * 查询机械详情列表
- * @param query
- * @returns {*}
- */
-
-export const listMachineryDetail = (query?: MachineryDetailQuery): AxiosPromise<MachineryDetailVO[]> => {
   return request({
-    url: '/machinery/machineryDetail/list',
+    url: '/zm/api/v1/system/busMachineryDetail/list',
     method: 'get',
     params: query
   });
-};
+}
-
+// 查询机械详情详细
-/**
+export function getBusMachineryDetail(id: number) {
- * 查询机械详情详细
- * @param id
- */
-export const getMachineryDetail = (id: string | number): AxiosPromise<MachineryDetailVO> => {
   return request({
-    url: '/machinery/machineryDetail/' + id,
+    url: '/zm/api/v1/system/busMachineryDetail/get',
-    method: 'get'
+    method: 'get',
+    params: {
+      id: id.toString()
+    }
   });
-};
+}
-
+// 新增机械详情
-/**
+export function addBusMachineryDetail(data: object) {
- * 新增机械详情
- * @param data
- */
-export const addMachineryDetail = (data: MachineryDetailForm): AxiosPromise<string | number> => {
   return request({
-    url: '/machinery/machineryDetail',
+    url: '/zm/api/v1/system/busMachineryDetail/add',
     method: 'post',
     data: data
   });
-};
+}
-
+// 修改机械详情
-/**
+export function updateBusMachineryDetail(data: object) {
- * 修改机械详情
- * @param data
- */
-export const updateMachineryDetail = (data: MachineryDetailForm) => {
   return request({
-    url: '/machinery/machineryDetail',
+    url: '/zm/api/v1/system/busMachineryDetail/edit',
     method: 'put',
     data: data
   });
-};
+}
-
+// 删除机械详情
-/**
+export function delBusMachineryDetail(ids: number[]) {
- * 删除机械详情
- * @param id
- */
-export const delMachineryDetail = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/machinery/machineryDetail/' + id,
+    url: '/zm/api/v1/system/busMachineryDetail/delete',
-    method: 'delete'
+    method: 'delete',
+    data: {
+      ids: ids
+    }
   });
-};
+}

src/api/materials/company/index.ts

@@ -1,4 +1,5 @@
-import request from '@/utils/request-go';
+import requestGo from '@/utils/request-go';
+import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { CompanyForm, CompanyQuery, CompanyVO } from '@/api/materials/company/types';
 
@@ -9,11 +10,23 @@ import { CompanyForm, CompanyQuery, CompanyVO } from '@/api/materials/company/ty
  */
 
 export const listCompany = (query?: CompanyQuery): AxiosPromise<CompanyVO[]> => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busCompany/list',
     method: 'get',
     params: query
   });
+}; /**
+ * 查询材料提供商
+ * @param query
+ * @returns {*}
+ */
+
+export const supplierInputGet = (query?) => {
+  return request({
+    url: '/supplierInput/supplierInput/getList',
+    method: 'get',
+    params: query
+  });
 };
 
 /**

src/api/materials/materialIssue/index.ts

@@ -75,3 +75,11 @@ export const inventoryList = (id: any) => {
     method: 'get'
   });
 };
+
+//获取材料表信息
+export const getMaterialInfo = (id: any) => {
+  return request({
+    url: '/materials/materials/listByFormCode/' + id,
+    method: 'get'
+  });
+};

src/api/materials/materialOutbound/index.ts

@@ -0,0 +1,27 @@
+import request from '@/utils/request';
+
+//获取出库材料得列表
+export const outboundMaterials = (query?: any) => {
+  return request({
+    url: '/materials/materials/listRelevancy',
+    method: 'get',
+    params: query
+  });
+};
+//新增出库
+export const addOutbound = (data?: any) => {
+  return request({
+    url: '/materials/materialsInventory',
+    method: 'post',
+    data
+  });
+};
+
+//获取材料列表
+export const getMaterialsList = (query?: any) => {
+  return request({
+    url: '/materials/materials/list',
+    method: 'get',
+    params: query
+  });
+};

src/api/materials/materialReceive/types.ts

@@ -53,7 +53,6 @@ export interface MaterialReceiveVO {
    * 备注
    */
   remark: string;
-
 }
 
 export interface MaterialReceiveForm extends BaseEntity {
@@ -156,11 +155,13 @@ export interface MaterialReceiveForm extends BaseEntity {
    * 备注
    */
   remark?: string;
-
+  /**
+   * 附件
+   */
+  attachmentId?: string | number;
 }
 
 export interface MaterialReceiveQuery extends PageQuery {
-
   /**
    * 项目id
    */
@@ -206,6 +207,3 @@ export interface MaterialReceiveQuery extends PageQuery {
    */
   params?: any;
 }
-
-
-

src/api/materials/materials/index.ts

@@ -1,4 +1,5 @@
-import request from '@/utils/request-go';
+import requestGo from '@/utils/request-go';
+import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { MaterialsForm, MaterialsQuery, MaterialsVO } from '@/api/materials/materials/types';
 
@@ -8,7 +9,7 @@ import { MaterialsForm, MaterialsQuery, MaterialsVO } from '@/api/materials/mate
  * @returns {*}
  */
 export const listMaterials = (query?: MaterialsQuery): AxiosPromise<MaterialsVO[]> => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busEquipmentMaterials/list',
     method: 'get',
     params: query
@@ -20,7 +21,7 @@ export const listMaterials = (query?: MaterialsQuery): AxiosPromise<MaterialsVO[
  * @param id
  */
 export const getMaterials = (id: string | number): AxiosPromise<MaterialsVO> => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busEquipmentMaterials/get',
     method: 'get',
     params: {

src/api/materials/materialsInventory/index.ts

@@ -1,4 +1,5 @@
-import request from '@/utils/request-go';
+import requestGo from '@/utils/request-go';
+import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { MaterialsInventoryForm, MaterialsInventoryQuery, MaterialsInventoryVO } from '@/api/materials/materialsInventory/types';
 
@@ -9,7 +10,7 @@ import { MaterialsInventoryForm, MaterialsInventoryQuery, MaterialsInventoryVO }
  */
 
 export const listMaterialsInventory = (query?: MaterialsInventoryQuery): AxiosPromise<MaterialsInventoryVO[]> => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busEquipmentMaterialsInventory/excellist',
     method: 'get',
     params: query
@@ -61,3 +62,13 @@ export const delMaterialsInventory = (id: string | number | Array<string | numbe
     method: 'delete'
   });
 };
+
+//获取新的列表数据
+export const getLedgerList = (query?: any) => {
+  return request({
+    url: '/materials/materials/listUseDetail',
+    method: 'get',
+    params: query
+  });
+};
+//导出

src/api/materials/materialsUseRecord/types.ts

@@ -33,7 +33,6 @@ export interface MaterialsUseRecordVO {
    * 备注
    */
   remark: string;
-
 }
 
 export interface MaterialsUseRecordForm extends BaseEntity {
@@ -71,11 +70,9 @@ export interface MaterialsUseRecordForm extends BaseEntity {
    * 备注
    */
   remark?: string;
-
 }
 
 export interface MaterialsUseRecordQuery extends PageQuery {
-
   /**
    * 项目ID
    */
@@ -105,7 +102,5 @@ export interface MaterialsUseRecordQuery extends PageQuery {
    * 日期范围参数
    */
   params?: any;
+  materialsId?: string | number;
 }
-
-
-

src/api/mechanical/mechanicalrewriting/index.ts

@@ -0,0 +1,72 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { MechanicalrewritingVO, MechanicalrewritingForm, MechanicalrewritingQuery } from '@/api/mechanical/mechanicalrewriting/types';
+
+/**
+ * 查询机械台账列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listMechanicalrewriting = (query?: MechanicalrewritingQuery): AxiosPromise<MechanicalrewritingVO[]> => {
+  return request({
+    url: '/mechanical/mechanicalrewriting/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询机械台账详细
+ * @param id
+ */
+export const getMechanicalrewriting = (id: string | number): AxiosPromise<MechanicalrewritingVO> => {
+  return request({
+    url: '/mechanical/mechanicalrewriting/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增机械台账
+ * @param data
+ */
+export const addMechanicalrewriting = (data: MechanicalrewritingForm) => {
+  return request({
+    url: '/mechanical/mechanicalrewriting',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改机械台账
+ * @param data
+ */
+export const updateMechanicalrewriting = (data: MechanicalrewritingForm) => {
+  return request({
+    url: '/mechanical/mechanicalrewriting',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除机械台账
+ * @param id
+ */
+export const delMechanicalrewriting = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/mechanical/mechanicalrewriting/' + id,
+    method: 'delete'
+  });
+};
+
+//获取类型
+export const getType = (query?: any) => {
+  return request({
+    url: '/mechanical/mechanicaltype/getTree',
+    method: 'get',
+    params: query
+  });
+};

src/api/mechanical/mechanicalrewriting/types.ts

@@ -0,0 +1,306 @@
+export interface MechanicalrewritingVO {
+  /**
+   * 自增ID
+   */
+  id: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId: string | number;
+
+  /**
+   * 班组名称
+   */
+  teamName: string;
+
+  /**
+   * 设备名称
+   */
+  devicename: string;
+
+  /**
+   * 设备类型
+   */
+  deviceType: string;
+
+  /**
+   * 设备编号
+   */
+  deviceNumber: string;
+
+  /**
+   * 入场日期
+   */
+  entryTime: string;
+
+  /**
+   * 规格型号
+   */
+  specification: string;
+
+  /**
+   * 生产能力
+   */
+  production: string;
+
+  /**
+   * 车牌号码
+   */
+  plateNumber: string;
+
+  /**
+   * 设备管理员
+   */
+  deviceKeeper: string;
+
+  /**
+   * 车辆行驶证
+   */
+  drivingLicence: string;
+
+  /**
+   * 新旧程度
+   */
+  degree: string;
+
+  /**
+   * 车辆容量
+   */
+  vehicleCapacity: string;
+
+  /**
+   * 车辆净重
+   */
+  suttle: string;
+
+  /**
+   * 铭牌
+   */
+  nameplate: string;
+
+  /**
+   * 合格证书
+   */
+  qualification: string;
+
+  /**
+   * 设备照片
+   */
+  equipmentPhoto: string;
+
+  /**
+   * 检验报告
+   */
+  verificationReport: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface MechanicalrewritingForm extends BaseEntity {
+  /**
+   * 自增ID
+   */
+  id?: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 班组名称
+   */
+  teamName?: string;
+
+  /**
+   * 设备名称
+   */
+  devicename?: string;
+
+  /**
+   * 设备类型
+   */
+  deviceType?: string;
+
+  /**
+   * 设备编号
+   */
+  deviceNumber?: string;
+
+  /**
+   * 入场日期
+   */
+  entryTime?: string;
+
+  /**
+   * 规格型号
+   */
+  specification?: string;
+
+  /**
+   * 生产能力
+   */
+  production?: string;
+
+  /**
+   * 车牌号码
+   */
+  plateNumber?: string;
+
+  /**
+   * 设备管理员
+   */
+  deviceKeeper?: string;
+
+  /**
+   * 车辆行驶证
+   */
+  drivingLicence?: string;
+
+  /**
+   * 新旧程度
+   */
+  degree?: string;
+
+  /**
+   * 车辆容量
+   */
+  vehicleCapacity?: string;
+
+  /**
+   * 车辆净重
+   */
+  suttle?: string;
+
+  /**
+   * 铭牌
+   */
+  nameplate?: string;
+
+  /**
+   * 合格证书
+   */
+  qualification?: string;
+
+  /**
+   * 设备照片
+   */
+  equipmentPhoto?: string;
+
+  /**
+   * 检验报告
+   */
+  verificationReport?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface MechanicalrewritingQuery extends PageQuery {
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 班组名称
+   */
+  teamName?: string;
+
+  /**
+   * 设备名称
+   */
+  devicename?: string;
+
+  /**
+   * 设备类型
+   */
+  deviceType?: string;
+
+  /**
+   * 设备编号
+   */
+  deviceNumber?: string;
+
+  /**
+   * 入场日期
+   */
+  entryTime?: string;
+
+  /**
+   * 规格型号
+   */
+  specification?: string;
+
+  /**
+   * 生产能力
+   */
+  production?: string;
+
+  /**
+   * 车牌号码
+   */
+  plateNumber?: string;
+
+  /**
+   * 设备管理员
+   */
+  deviceKeeper?: string;
+
+  /**
+   * 车辆行驶证
+   */
+  drivingLicence?: string;
+
+  /**
+   * 新旧程度
+   */
+  degree?: string;
+
+  /**
+   * 车辆容量
+   */
+  vehicleCapacity?: string;
+
+  /**
+   * 车辆净重
+   */
+  suttle?: string;
+
+  /**
+   * 铭牌
+   */
+  nameplate?: string;
+
+  /**
+   * 合格证书
+   */
+  qualification?: string;
+
+  /**
+   * 设备照片
+   */
+  equipmentPhoto?: string;
+
+  /**
+   * 检验报告
+   */
+  verificationReport?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/mechanical/mechanicaltype/index.ts

@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { MechanicaltypeVO, MechanicaltypeForm, MechanicaltypeQuery } from '@/api/mechanical/mechanicaltype/types';
+
+/**
+ * 查询设备类型列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listMechanicaltype = (query?: MechanicaltypeQuery): AxiosPromise<MechanicaltypeVO[]> => {
+  return request({
+    url: '/mechanical/mechanicaltype/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询设备类型详细
+ * @param id
+ */
+export const getMechanicaltype = (id: string | number): AxiosPromise<MechanicaltypeVO> => {
+  return request({
+    url: '/mechanical/mechanicaltype/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增设备类型
+ * @param data
+ */
+export const addMechanicaltype = (data: MechanicaltypeForm) => {
+  return request({
+    url: '/mechanical/mechanicaltype',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改设备类型
+ * @param data
+ */
+export const updateMechanicaltype = (data: MechanicaltypeForm) => {
+  return request({
+    url: '/mechanical/mechanicaltype',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除设备类型
+ * @param id
+ */
+export const delMechanicaltype = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/mechanical/mechanicaltype/' + id,
+    method: 'delete'
+  });
+};

src/api/mechanical/mechanicaltype/types.ts

@@ -0,0 +1,129 @@
+export interface MechanicaltypeVO {
+  /**
+   * 自增ID
+   */
+  id: string | number;
+
+  /**
+   * 编码
+   */
+  code: string;
+
+  /**
+   * 父编码
+   */
+  pcode: string;
+
+  /**
+   * 大
+   */
+  largeclass: string;
+
+  /**
+   * 中
+   */
+  middleclass: string | number;
+
+  /**
+   * 子类
+   */
+  subclass: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 全名
+   */
+  fullName: string;
+  /**
+   * 类型
+   */
+  deviceType?: string;
+}
+
+export interface MechanicaltypeForm extends BaseEntity {
+  /**
+   * 自增ID
+   */
+  id?: string | number;
+
+  /**
+   * 编码
+   */
+  code?: string;
+
+  /**
+   * 父编码
+   */
+  pcode?: string;
+
+  /**
+   * 大
+   */
+  largeclass?: string;
+
+  /**
+   * 中
+   */
+  middleclass?: string | number;
+
+  /**
+   * 子类
+   */
+  subclass?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 全名
+   */
+  fullName?: string;
+
+  /**
+   * 类型
+   */
+  deviceType?: string;
+}
+
+export interface MechanicaltypeQuery extends PageQuery {
+  /**
+   * 编码
+   */
+  code?: string;
+
+  /**
+   * 父编码
+   */
+  pcode?: string;
+
+  /**
+   * 大
+   */
+  largeclass?: string;
+
+  /**
+   * 中
+   */
+  middleclass?: string | number;
+
+  /**
+   * 子类
+   */
+  subclass?: string;
+
+  /**
+   * 全名
+   */
+  fullName?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}

src/api/out/monthPlan/index.ts

@@ -8,7 +8,7 @@ import { MonthPlanVO, MonthPlanForm, MonthPlanQuery } from '@/api/out/monthPlan/
  * @returns {*}
  */
 
-export const listMonthPlan = (query?: MonthPlanQuery): AxiosPromise<MonthPlanVO[]> => {
+export const listMonthPlan = (query?: any) => {
   return request({
     url: '/out/monthPlan/list',
     method: 'get',
@@ -93,7 +93,7 @@ export const isSubmit = (id): AxiosPromise => {
  */
 export const getMonthInfo = (query): AxiosPromise<MonthPlanVO> => {
   return request({
-    url: '/out/monthPlan/monthInfo',
+    url: '/out/monthPlan/monthInfo/' + query.id,
     method: 'get',
     params: query
   });

src/api/outputApi/index.ts

@@ -0,0 +1,43 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+
+/**
+ * 查询项目数据
+ * @param query
+ * @returns {*}
+ */
+
+export const projectProgress = (query?: any): any => {
+  return request({
+    url: '/enterprise/big/screen/projectProgress',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 产值
+ * @param query
+ * @returns {*}
+ */
+
+export const outpuProgress = (query?: any): any => {
+  return request({
+    url: '/enterprise/big/screen/projectProgressCapacity',
+    method: 'get',
+    params: query
+  });
+};
+/**
+ * 预警
+ * @param query
+ * @returns {*}
+ */
+
+export const earlyWarning = (query?: any): any => {
+  return request({
+    url: '/enterprise/big/screen/riskEarlyWarning',
+    method: 'get',
+    params: query
+  });
+};

src/api/progress/progressCategory/index.ts

@@ -8,10 +8,11 @@ import { ProgressCategoryVO, ProgressCategoryForm, ProgressCategoryQuery } from
  * @returns {*}
  */
 
-export const listProgressCategory = (id?: string | number): AxiosPromise<any[]> => {
+export const listProgressCategory = (parentId?: string | number,name?:string): AxiosPromise<any[]> => {
   return request({
-    url: '/progress/progressCategory/listByParent/' + id,
+    url: '/progress/progressCategory/listByParent',
-    method: 'get'
+    method: 'get',
+    params:{parentId,name}
   });
 };
 

src/api/progress/progressCategoryTemplate/index.ts

@@ -78,9 +78,10 @@ export const getTabList = (id: string) => {
  * @param parentId
  * @returns {*}
  */
-export const listProgressCategoryTemplateByParent = (parentId: string | number): AxiosPromise<ProgressCategoryTemplateVO[]> => {
+export const listProgressCategoryTemplateByParent = (parentId: string | number,name:string): AxiosPromise<ProgressCategoryTemplateVO[]> => {
   return request({
-    url: '/progress/progressCategoryTemplate/listByParent/' + parentId,
+    url: '/progress/progressCategoryTemplate/listByParent' ,
-    method: 'get'
+    method: 'get',
+    params:{parentId,name}
   });
 };

src/api/project/constructionUser/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-go';
+import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import {
   ConstructionUserForm,
@@ -23,7 +23,7 @@ import requestGo from '@/utils/request-go';
  */
 
 export const listConstructionMonth = (query?: ConstructionMonthQuery): AxiosPromise<AttendanceMonthVO[]> => {
-  return request({
+  return requestGo({
     url: '/zm/api/wxApplet/wxApplet/busAttendance/byOpenId',
     method: 'get',
     params: query
@@ -62,7 +62,7 @@ export const listConstructionUserInTeam = (query?: ConstructionUserQuery): Axios
  * @param id
  */
 export const getConstructionUser = (id: string | number): AxiosPromise<ConstructionUserVO> => {
-  return request({
+  return requestGo({
     url: '/zm/api/wxApplet/wxApplet/busConstructionUser/getDetails?id=' + id,
     method: 'get'
   });
@@ -73,7 +73,7 @@ export const getConstructionUser = (id: string | number): AxiosPromise<Construct
  * @param data
  */
 export const transferConstructionUser = (data: skipType) => {
-  return request({
+  return requestGo({
     url: '/zm/api/wxApplet/wxApplet/busConstructionUser/changePay',
     method: 'put',
     data: data
@@ -84,7 +84,7 @@ export const transferConstructionUser = (data: skipType) => {
  * 查询项目以及项目下的分包公司列表
  */
 export const getProjectContractorList = () => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/sysProject/list?pageNum=1&pageSize=1000',
     method: 'get'
   });
@@ -95,7 +95,7 @@ export const getProjectContractorList = () => {
  * @param data
  */
 export const addConstructionUser = (data: ConstructionUserForm): AxiosPromise<string | number> => {
-  return request({
+  return requestGo({
     url: '/zm/api/wxApplet/wxApplet/busConstructionUser/add',
     method: 'post',
     data: data
@@ -107,7 +107,7 @@ export const addConstructionUser = (data: ConstructionUserForm): AxiosPromise<st
  * @param data
  */
 export const updateConstructionUser = (data: ConstructionUserForm) => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busConstructionUser/pcEdit',
     method: 'put',
     data: data
@@ -119,7 +119,7 @@ export const updateConstructionUser = (data: ConstructionUserForm) => {
  * @param id
  */
 export const delConstructionUser = (data) => {
-  return request({
+  return requestGo({
     url: '/zm/api/wxApplet/wxApplet/busConstructionUser/delete',
     method: 'delete',
     data
@@ -131,7 +131,7 @@ export const delConstructionUser = (data) => {
  * @param data
  */
 export const updateConstructionUserStatus = (data: ConstructionUserStatusForm) => {
-  return request({
+  return requestGo({
     url: '/zm/api/wxApplet/wxApplet/busConstructionUser/changeState',
     method: 'delete',
     data: data
@@ -143,7 +143,7 @@ export const updateConstructionUserStatus = (data: ConstructionUserStatusForm) =
  * @param data
  */
 export const updateConstructionUserPlayCardStatus = (data: ConstructionUserPlayCardForm) => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busConstructionUser/oneClickOpen',
     method: 'put',
     data: data
@@ -155,7 +155,7 @@ export const updateConstructionUserPlayCardStatus = (data: ConstructionUserPlayC
  * @param data
  */
 export const updateConstructionUserPlayCardOneStatus = (data: ConstructionUserPlayCardForm) => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busConstructionUser/clockingCondition',
     method: 'put',
     data: data
@@ -167,7 +167,7 @@ export const updateConstructionUserPlayCardOneStatus = (data: ConstructionUserPl
  * @param data
  */
 export const updateConstructionUserSalary = (data: ConstructionUserSalaryForm) => {
-  return request({
+  return requestGo({
     url: '/zm/api/wxApplet/wxApplet/busConstructionUser/payEdit',
     method: 'put',
     data: data
@@ -179,7 +179,7 @@ export const updateConstructionUserSalary = (data: ConstructionUserSalaryForm) =
  * @param query
  */
 export const getConstructionUserExit = (query: ConstructionUserExitForm) => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busConstructionUser/departureRecord',
     method: 'post',
     data: query
@@ -191,7 +191,7 @@ export const getConstructionUserExit = (query: ConstructionUserExitForm) => {
  * @param query
  */
 export const dowloadConstructionUserTemplate = (query: ConstructionUserTemplateForm) => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busConstructionUser/templateExport',
     method: 'get',
     params: query
@@ -208,7 +208,7 @@ export const dowloadConstructionUserTemplate = (query: ConstructionUserTemplateF
  * @param data
  */
 export const delConstructionUserMember = (data: ConstructionUserMembeForm) => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busConstructionUser/departure',
     method: 'post',
     data
@@ -226,3 +226,30 @@ export const importConstructionUserInfo = (file: string) => {
     data: { file }
   });
 };
+
+// 获取项目列表
+export const ProjectList = (query) => {
+  return request({
+    url: '/contractor/constructionUser/projectList',
+    method: 'get',
+    params: query
+  });
+};
+
+// 获取班组列表
+export const TeamList = (query) => {
+  return request({
+    url: '/contractor/constructionUser/teamList',
+    method: 'get',
+    params: query
+  });
+};
+
+// 班组分配
+export const TeamDistribution = (data) => {
+  return request({
+    url: '/contractor/constructionUser/addTeam',
+    method: 'post',
+    data: data
+  });
+};

src/api/project/constructionUser/types.ts

@@ -182,6 +182,8 @@ export interface ConstructionUserVO {
    * 创建时间
    */
   createTime: string;
+
+  sysUserId: string | number;
 }
 export interface skipType {
   /**

src/api/project/constructionUserFile/index.ts

@@ -23,7 +23,7 @@ export const listConstructionUserFile = (query?: ConstructionUserFileQuery): Axi
  */
 export const setConstructionUserFile = (data: ConstructionUserFileForm): AxiosPromise<string | number> => {
   return request({
-    url: '/project/constructionUserFile/save',
+    url: '/contractor/constructionUserFile/save',
     method: 'post',
     data
   });
@@ -35,7 +35,7 @@ export const setConstructionUserFile = (data: ConstructionUserFileForm): AxiosPr
  */
 export const delConstructionUserFile = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/project/constructionUserFile/' + id,
+    url: '/contractor/constructionUserFile/' + id,
     method: 'delete'
   });
 };

src/api/project/project/index.ts

@@ -196,3 +196,71 @@ export const changeProject = (id: string | number) => {
     method: 'get'
   });
 };
+/**
+ * 打卡规则
+ * @param id
+ */
+export const attendanceRuleEdit = (data) => {
+  return request({
+    url: '/project/attendanceRule',
+    method: 'put',
+    data
+  });
+};
+/**
+ * 打卡规则
+ * @param id
+ */
+export const attendanceRuleAdd = (data) => {
+  return request({
+    url: '/project/attendanceRule',
+    method: 'post',
+    data
+  });
+};
+/**
+ * 获取规则
+ * @param id
+ */
+export const byProjectIdDetail = (id) => {
+  return request({
+    url: '/project/attendanceRule/byProjectId/' + id,
+    method: 'get'
+  });
+};
+
+// 新增项目打卡范围
+export const addAttendanceRange = (data) => {
+  return request({
+    url: '/project/projectPunchrange',
+    method: 'post',
+    data
+  });
+};
+
+// 删除项目打卡范围
+export const delAttendanceRange = (id) => {
+  return request({
+    url: '/project/projectPunchrange/' + id,
+    method: 'delete'
+  });
+};
+
+
+// 修改项目打卡范围
+export const updateAttendanceRange = (data) => {
+  return request({
+    url: '/project/projectPunchrange',
+    method: 'put',
+    data
+  });
+};
+
+// 查询项目打卡范围列表
+export const getAttendanceRangeList = (data) => {
+  return request({
+    url: '/project/projectPunchrange/list',
+    method: 'get',
+    params: data
+  });
+};

src/api/project/projectTeam/types.ts

@@ -55,6 +55,11 @@ export interface ProjectTeamForm extends BaseEntity {
    * 备注
    */
   remark?: string;
+  
+  /**
+   * 创建时间
+   */
+  punchRangeList?: [];
 }
 
 export interface ProjectTeamQuery extends PageQuery {

src/api/projectScreen/index.ts

@@ -0,0 +1,102 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+
+// 查询生项目天气
+export const getScreenWeather = (projectId: number | string) => {
+  return request({
+    url: '/project/big/screen/weather/' + projectId,
+    method: 'get'
+  });
+};
+
+// 查询项目安全天数
+export const getScreenSafetyDay = (projectId: number | string) => {
+  return request({
+    url: '/project/big/screen/safetyDay/' + projectId,
+    method: 'get'
+  });
+};
+
+// 查询项目公告
+export const getScreenNews = (projectId: number | string) => {
+  return request({
+    url: '/project/big/screen/news/' + projectId,
+    method: 'get'
+  });
+};
+
+// 查询项目土地统计
+export const getScreenLand = (projectId: number | string) => {
+  return request({
+    url: '/project/big/screen/' + projectId,
+    method: 'get'
+  });
+};
+
+// 查询项目形象进度
+export const getScreenImgProcess = (projectId: number | string) => {
+  return request({
+    url: '/project/big/screen/imageProgress/' + projectId,
+    method: 'get'
+  });
+};
+
+// 查询项目人员情况
+export const getScreenPeople = (projectId: number | string) => {
+  return request({
+    url: '/project/big/screen/people/' + projectId,
+    method: 'get'
+  });
+};
+
+// 查询项目AI安全巡检
+export const getScreenSafetyInspection = (projectId: number | string) => {
+  return request({
+    url: '/project/big/screen/safetyInspection/',
+    method: 'get',
+    params: {
+      projectId
+    }
+  });
+};
+
+// 查询项目概况
+export const getScreenGeneralize = (projectId: number | string) => {
+  return request({
+    url: '/project/big/screen/generalize/' + projectId,
+    method: 'get'
+  });
+};
+
+// 获取gps数据
+export const getGps = (projectId) => {
+  return request({
+    url: '/project/big/screen/getClientList/' + projectId,
+    method: 'get'
+  });
+};
+// 选中列表
+export const getSelectList = (params) => {
+  return request({
+    url: '/project/big/screen/getList',
+    method: 'get',
+    params
+  });
+};
+// 设置选中
+export const setSelect = (data) => {
+  return request({
+    url: '/project/big/screen/setList',
+    method: 'post',
+    data
+  });
+};
+
+// 获取模型列表
+export const getModelList = (params) => {
+  return request({
+    url: '/yjearth4.0/api/v1/source/list',
+    method: 'get',
+    params
+  });
+};

src/api/projectScreen/types.ts

@@ -0,0 +1,5 @@
+export interface TableQuery extends PageQuery {
+  tableName: string;
+  tableComment: string;
+  dataName: string;
+}

src/api/quality/qualityConstructionLog/index.ts

@@ -1,4 +1,5 @@
-import request from '@/utils/request-go';
+import requestGo from '@/utils/request-go';
+import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { QualityConstructionLogVO, QualityConstructionLogForm, QualityConstructionLogQuery } from '@/api/quality/qualityConstructionLog/types';
 
@@ -9,7 +10,7 @@ import { QualityConstructionLogVO, QualityConstructionLogForm, QualityConstructi
  */
 
 export const listQualityConstructionLog = (query?: QualityConstructionLogQuery): AxiosPromise<QualityConstructionLogVO[]> => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busConstructionLog/list',
     method: 'get',
     params: query
@@ -21,8 +22,8 @@ export const listQualityConstructionLog = (query?: QualityConstructionLogQuery):
  * @param id
  */
 export const getQualityConstructionLog = (id: string | number): AxiosPromise<QualityConstructionLogVO> => {
-  return request({
+  return requestGo({
-    url: 'zm/api/v1/system/busConstructionLog/get',
+    url: '/zm/api/v1/system/busConstructionLog/get',
     method: 'get',
     params: { id }
   });
@@ -57,7 +58,7 @@ export const updateQualityConstructionLog = (data: QualityConstructionLogForm) =
  * @param id
  */
 export const delQualityConstructionLog = (id: string | number | Array<string | number>) => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busConstructionLog/delete',
     method: 'delete',
     data: { ids: id }

src/api/safety/questionBank/index.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { QuestionBankVO, QuestionBankForm, QuestionBankQuery } from '@/api/safety/questionBank/types';
+import { QuestionBankVO, QuestionBankForm, QuestionBankQuery } from '@/api/safety/wgzQuestionBank/types';
 
 /**
  * 查询题库列表
@@ -10,7 +10,7 @@ import { QuestionBankVO, QuestionBankForm, QuestionBankQuery } from '@/api/safet
 
 export const listQuestionBank = (query?: QuestionBankQuery): AxiosPromise<QuestionBankVO[]> => {
   return request({
-    url: '/safety/questionBank/list',
+    url: '/safety/wgzQuestionBank/list',
     method: 'get',
     params: query
   });
@@ -22,7 +22,7 @@ export const listQuestionBank = (query?: QuestionBankQuery): AxiosPromise<Questi
  */
 export const getQuestionBank = (id: string | number): AxiosPromise<QuestionBankVO> => {
   return request({
-    url: '/safety/questionBank/' + id,
+    url: '/safety/wgzQuestionBank/' + id,
     method: 'get'
   });
 };
@@ -33,7 +33,7 @@ export const getQuestionBank = (id: string | number): AxiosPromise<QuestionBankV
  */
 export const addQuestionBank = (data: QuestionBankForm) => {
   return request({
-    url: '/safety/questionBank',
+    url: '/safety/wgzQuestionBank',
     method: 'post',
     data: data
   });
@@ -45,7 +45,7 @@ export const addQuestionBank = (data: QuestionBankForm) => {
  */
 export const updateQuestionBank = (data: QuestionBankForm) => {
   return request({
-    url: '/safety/questionBank',
+    url: '/safety/wgzQuestionBank',
     method: 'put',
     data: data
   });
@@ -57,7 +57,7 @@ export const updateQuestionBank = (data: QuestionBankForm) => {
  */
 export const delQuestionBank = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/safety/questionBank/' + id,
+    url: '/safety/wgzQuestionBank/' + id,
     method: 'delete'
   });
 };

src/api/safety/questionUserAnswer/index.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { QuestionUserAnswerVO, QuestionUserAnswerForm, QuestionUserAnswerQuery } from '@/api/safety/questionUserAnswer/types';
+import { QuestionUserAnswerVO, QuestionUserAnswerForm, QuestionUserAnswerQuery } from '@/api/safety/wgzQuestionSave/types';
 
 /**
  * 查询用户试卷存储列表
@@ -10,7 +10,7 @@ import { QuestionUserAnswerVO, QuestionUserAnswerForm, QuestionUserAnswerQuery }
 
 export const listQuestionUserAnswer = (query?: QuestionUserAnswerQuery): AxiosPromise<QuestionUserAnswerVO[]> => {
   return request({
-    url: '/safety/questionUserAnswer/list',
+    url: '/safety/wgzQuestionSave/list',
     method: 'get',
     params: query
   });
@@ -22,7 +22,7 @@ export const listQuestionUserAnswer = (query?: QuestionUserAnswerQuery): AxiosPr
  */
 export const getQuestionUserAnswer = (id: string | number): AxiosPromise<QuestionUserAnswerVO> => {
   return request({
-    url: '/safety/questionUserAnswer/' + id,
+    url: '/safety/wgzQuestionSave/' + id,
     method: 'get'
   });
 };
@@ -33,7 +33,7 @@ export const getQuestionUserAnswer = (id: string | number): AxiosPromise<Questio
  */
 export const addQuestionUserAnswer = (data: QuestionUserAnswerForm) => {
   return request({
-    url: '/safety/questionUserAnswer',
+    url: '/safety/wgzQuestionSave',
     method: 'post',
     data: data
   });
@@ -45,7 +45,7 @@ export const addQuestionUserAnswer = (data: QuestionUserAnswerForm) => {
  */
 export const updateQuestionUserAnswer = (data: QuestionUserAnswerForm) => {
   return request({
-    url: '/safety/questionUserAnswer',
+    url: '/safety/wgzQuestionSave',
     method: 'put',
     data: data
   });
@@ -57,7 +57,7 @@ export const updateQuestionUserAnswer = (data: QuestionUserAnswerForm) => {
  */
 export const delQuestionUserAnswer = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/safety/questionUserAnswer/' + id,
+    url: '/safety/wgzQuestionSave/' + id,
     method: 'delete'
   });
 };
@@ -68,7 +68,7 @@ export const delQuestionUserAnswer = (id: string | number | Array<string | numbe
  */
 export const uploadQuestionUserAnswer = (data: any) => {
   return request({
-    url: '/safety/questionUserAnswer/upload/zip',
+    url: '/safety/wgzQuestionSave/upload/zip',
     method: 'post',
     data: data
   });

src/api/safety/questionsCategory/index.ts

@@ -10,7 +10,7 @@ import { QuestionsCategoryVO, QuestionsCategoryForm, QuestionsCategoryQuery } fr
 
 export const listQuestionsCategory = (query?: QuestionsCategoryQuery): AxiosPromise<QuestionsCategoryVO[]> => {
   return request({
-    url: '/safety/questionsCategory/list',
+    url: '/safety/wzgQuestionCategory/list',
     method: 'get',
     params: query
   });
@@ -22,7 +22,7 @@ export const listQuestionsCategory = (query?: QuestionsCategoryQuery): AxiosProm
  */
 export const getQuestionsCategory = (id: string | number): AxiosPromise<QuestionsCategoryVO> => {
   return request({
-    url: '/safety/questionsCategory/' + id,
+    url: '/safety/wzgQuestionCategory' + id,
     method: 'get'
   });
 };
@@ -33,7 +33,7 @@ export const getQuestionsCategory = (id: string | number): AxiosPromise<Question
  */
 export const addQuestionsCategory = (data: QuestionsCategoryForm) => {
   return request({
-    url: '/safety/questionsCategory',
+    url: '/safety/wzgQuestionCategory',
     method: 'post',
     data: data
   });
@@ -45,7 +45,7 @@ export const addQuestionsCategory = (data: QuestionsCategoryForm) => {
  */
 export const updateQuestionsCategory = (data: QuestionsCategoryForm) => {
   return request({
-    url: '/safety/questionsCategory',
+    url: '/safety/wzgQuestionCategory',
     method: 'put',
     data: data
   });
@@ -57,7 +57,7 @@ export const updateQuestionsCategory = (data: QuestionsCategoryForm) => {
  */
 export const delQuestionsCategory = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/safety/questionsCategory/' + id,
+    url: '/safety/wzgQuestionCategory' + id,
     method: 'delete'
   });
 };

src/api/safety/questionsConfig/index.ts

@@ -22,7 +22,7 @@ export const listQuestionsConfig = (query?: QuestionsConfigQuery): AxiosPromise<
  */
 export const getQuestionsConfig = (id: string | number): AxiosPromise<QuestionsConfigVO> => {
   return request({
-    url: '/safety/questionsConfig/' + id,
+    url: '/safety/wzgQuestionsConfiguration/' + id,
     method: 'get'
   });
 };
@@ -45,7 +45,7 @@ export const addQuestionsConfig = (data: QuestionsConfigForm) => {
  */
 export const updateQuestionsConfig = (data: QuestionsConfigForm) => {
   return request({
-    url: '/safety/questionsConfig',
+    url: '/safety/wzgQuestionsConfiguration',
     method: 'put',
     data: data
   });

src/api/safety/safetyWeeklyReport/index.ts

@@ -1,4 +1,5 @@
-import request from '@/utils/request-go';
+import requestGo from '@/utils/request-go';
+import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { SafetyWeeklyReportForm, SafetyWeeklyReportQuery, SafetyWeeklyReportVO } from '@/api/safety/safetyWeeklyReport/types';
 
@@ -9,7 +10,7 @@ import { SafetyWeeklyReportForm, SafetyWeeklyReportQuery, SafetyWeeklyReportVO }
  */
 
 export const listSafetyWeeklyReport = (query?: SafetyWeeklyReportQuery): AxiosPromise<SafetyWeeklyReportVO[]> => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busWeeklySecurityReport/list',
     method: 'get',
     params: query
@@ -21,9 +22,12 @@ export const listSafetyWeeklyReport = (query?: SafetyWeeklyReportQuery): AxiosPr
  * @param id
  */
 export const getSafetyWeeklyReport = (id: string | number): AxiosPromise<SafetyWeeklyReportVO> => {
-  return request({
+  return requestGo({
-    url: '/safety/safetyWeeklyReport/' + id,
+    url: '/zm/api/v1/system/busWeeklySecurityReport/get',
-    method: 'get'
+    method: 'get',
+    params: {
+      id
+    }
   });
 };
 
@@ -32,7 +36,7 @@ export const getSafetyWeeklyReport = (id: string | number): AxiosPromise<SafetyW
  * @param data
  */
 export const addSafetyWeeklyReport = (data: SafetyWeeklyReportForm) => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busWeeklySecurityReport/add',
     method: 'post',
     data: data
@@ -56,7 +60,7 @@ export const updateSafetyWeeklyReport = (data: SafetyWeeklyReportForm) => {
  * @param id
  */
 export const delSafetyWeeklyReport = (id: string | number | Array<string | number>) => {
-  return request({
+  return requestGo({
     url: '/zm/api/v1/system/busWeeklySecurityReport/delete',
     method: 'delete',
     data: { ids: id }

src/api/supplierInput/supplierInput/index.ts

@@ -61,3 +61,22 @@ export const delSupplierInput = (id: string | number | Array<string | number>) =
     method: 'delete'
   });
 };
+//导入供商入库
+export const leadingIn = (formData: FormData, projectId) => {
+  return request({
+    url: '/supplierInput/supplierInput/import?projectId=' + projectId,
+    method: 'post',
+    data: formData,
+
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  });
+};
+//导入供商出库
+export const leadingOut = () => {
+  return request({
+    url: '/supplierInput/supplierInput/export',
+    method: 'post'
+  });
+};

src/api/system/landTransfer/landTransferLedger/index.ts

@@ -79,3 +79,26 @@ export const landTransferLedgerCount = (id: string | number | Array<string | num
     method: 'get'
   });
 };
+
+export const addSonLandTransferLedger = (data) => {
+  return request({
+    url: '/land/landTransferLedger/children/add',
+    method: 'post',
+    data: data
+  });
+};
+
+export const listSonLandTransferLedger = (query) => {
+  return request({
+    url: '/land/landTransferLedger/children/list',
+    method: 'get',
+    params: query
+  });
+};
+// api/yourApiModule.js
+export const listallCountValue = (projectId) => {
+  return request({
+    url: '/land/landTransferLedger/allCountValue/' + projectId,
+    method: 'get'
+  });
+};

src/api/system/landTransfer/landTransferLedger/types.ts

@@ -4,6 +4,11 @@ export interface LandTransferLedgerVO {
    */
   id: string | number;
 
+  /**
+   * 父级ID
+   */
+  parentId: string | number;
+
   /**
    * 项目ID
    */
@@ -83,7 +88,6 @@ export interface LandTransferLedgerVO {
    * 下一步策略
    */
   nextStrategy: string;
-
 }
 
 export interface LandTransferLedgerForm extends BaseEntity {
@@ -92,6 +96,11 @@ export interface LandTransferLedgerForm extends BaseEntity {
    */
   id?: string | number;
 
+  /**
+   * 父级ID
+   */
+  parentId: string | number;
+
   /**
    * 项目ID
    */
@@ -171,11 +180,9 @@ export interface LandTransferLedgerForm extends BaseEntity {
    * 下一步策略
    */
   nextStrategy?: string;
-
 }
 
 export interface LandTransferLedgerQuery extends PageQuery {
-
   /**
    * 项目ID
    */
@@ -261,6 +268,3 @@ export interface LandTransferLedgerQuery extends PageQuery {
    */
   params?: any;
 }
-
-
-

src/api/system/menu/index.ts

@@ -20,18 +20,20 @@ export const getMenu = (menuId: string | number): AxiosPromise<MenuVO> => {
 };
 
 // 查询菜单下拉树结构
-export const treeselect = (): AxiosPromise<MenuTreeOption[]> => {
+export const treeselect = (params?: any): AxiosPromise<MenuTreeOption[]> => {
   return request({
     url: '/system/menu/treeselect',
-    method: 'get'
+    method: 'get',
+    params
   });
 };
 
 // 根据角色ID查询菜单下拉树结构
-export const roleMenuTreeselect = (roleId: string | number): AxiosPromise<RoleMenuTree> => {
+export const roleMenuTreeselect = (roleId: string | number, params?: any): AxiosPromise<RoleMenuTree> => {
   return request({
     url: '/system/menu/roleMenuTreeselect/' + roleId,
-    method: 'get'
+    method: 'get',
+    params
   });
 };
 

src/api/system/oss/index.ts

@@ -31,3 +31,20 @@ export function delOss(ossId: string | number | Array<string | number>) {
 export function downLoadOss(ossId: { id?: string | number; idList?: string | number | Array<string | number> }, url: string, fileName: string) {
   return download(url, ossId, fileName);
 }
+
+//识别身份证
+export function recognizeidCard(data: any, type: any) {
+  return request({
+    url: '/contractor/constructionUser/idCard?idCardSide=' + type,
+    method: 'post',
+    data: data
+  });
+}
+//识别银行卡
+export function recognizeBankCard(data: any) {
+  return request({
+    url: '/contractor/constructionUser/bankCard',
+    method: 'post',
+    data: data
+  });
+}

src/api/system/role/index.ts

@@ -147,10 +147,11 @@ export const authUserSelectAll = (data: any) => {
   });
 };
 // 根据角色ID查询部门树结构
-export const deptTreeSelect = (roleId: string | number): AxiosPromise<RoleDeptTree> => {
+export const deptTreeSelect = (roleId: string | number, params?) => {
   return request({
     url: '/system/role/deptTree/' + roleId,
-    method: 'get'
+    method: 'get',
+    params
   });
 };
 

src/api/workflow/task/types.ts

@@ -31,6 +31,7 @@ export interface FlowTaskVO {
   version?: string;
   applyNode?: boolean;
   buttonList?: buttonList[];
+  projectName?: string;
 }
 
 export interface buttonList {

src/api/workflow/workflowCommon/index.ts

@@ -12,7 +12,8 @@ export default {
         businessId: routerJumpVo.businessId,
         type: routerJumpVo.type,
         planMonth: routerJumpVo.planMonth,
-        taskId: routerJumpVo.taskId
+        taskId: routerJumpVo.taskId,
+        projectName: routerJumpVo.projectName
       }
     });
   }

src/api/workflow/workflowCommon/types.ts

@@ -4,6 +4,7 @@ export interface RouterJumpVo {
   type: string;
   formCustom: string;
   formPath: string;
+  projectName?: string;
 }
 
 export interface StartProcessBo {

src/components/FileUpload/index.vue

@@ -53,7 +53,7 @@
               style="margin-top: 10px"
               v-for="(file, index) in fileList"
               :key="file.uid"
-              class="el-upload-list__item upload-list__item-content"
+              class="el-upload-list__item ele-upload-list__item-content"
               v-if="autoUpload"
             >
               <el-link :href="`${file.url}`" :underline="false" target="_blank">
@@ -208,6 +208,7 @@ watch(
       });
     } else {
       fileList.value = [];
+
       return [];
     }
   },
@@ -225,7 +226,12 @@ watch(
 );
 // 上传前校检格式和大小
 const handleBeforeUpload = (file: any) => {
-  if (!validateFile(file)) return false;
+  if (!validateFile(file)) {
+    if (props.isGo) {
+      fileList.value = [];
+    }
+    return false;
+  }
   proxy?.$modal.loading('正在上传文件，请稍候...');
   number.value++;
   return true;
@@ -265,7 +271,6 @@ interface UploadFileWithOssId extends UploadFile {
 }
 
 const handleUploadSuccess = (res: any, file: UploadFileWithOssId) => {
-  console.log('🚀 ~ handleUploadSuccess ~ res:', res.code);
   if (res.code === 200 || res.code === 0) {
     console.log('上传成功');
     // 上传成功，不管 data 是否为空
@@ -276,6 +281,9 @@ const handleUploadSuccess = (res: any, file: UploadFileWithOssId) => {
     });
   } else {
     console.log('失败', res);
+    if (props.isGo) {
+      fileList.value = [];
+    }
 
     number.value--;
     proxy?.$modal.closeLoading();
@@ -299,7 +307,7 @@ const handleChange = (file: any, filelist: any) => {
     }
   }
   // 记录 status = 'ready' 的文件
-  if (file.status === 'ready') {
+  if (file.status === 'ready' && !props.isConstruction) {
     pendingFiles.value.push(file);
     fileList.value = pendingFiles.value;
   }
@@ -310,8 +318,6 @@ const handleChange = (file: any, filelist: any) => {
 
 // 删除文件
 const handleRemove = (file: any, fileList: any) => {
-  console.log(11);
-
   emit('handleRemove', file, fileList);
 };
 
@@ -329,12 +335,15 @@ const handleDelete = async (index: string | number, type?: string) => {
       delOss(index);
       fileList.value = fileList.value.filter((f) => f.ossId !== index);
     } else {
+      if (!props.isGo) {
         let ossId = fileList.value[index].ossId;
         delOss(ossId);
+      }
       index = parseInt(index as string);
       fileList.value.splice(index, 1);
     }
   } finally {
+    // fileList.value = [];
     emit('handleRemove');
     emit('update:modelValue', listToString(fileList.value));
   }

src/components/ImageUpload/index.vue

@@ -41,11 +41,12 @@
 </template>
 
 <script setup lang="ts">
-import { listByIds, delOss } from '@/api/system/oss';
+import { listByIds, delOss, recognizeidCard, recognizeBankCard } from '@/api/system/oss';
 import { OssVO } from '@/api/system/oss/types';
 import { propTypes } from '@/utils/propTypes';
 import { globalHeaders } from '@/utils/request';
 import { compressAccurately } from 'image-conversion';
+import { bool } from 'vue-types';
 
 const props = defineProps({
   modelValue: {
@@ -63,24 +64,39 @@ const props = defineProps({
     type: Boolean,
     default: true
   },
+  isGo: {
+    type: Boolean,
+    default: false
+  },
+  // 图片上传路径
+  action: {
+    type: String,
+    default: ''
+  },
   // 是否支持压缩，默认否
   compressSupport: {
     type: Boolean,
     default: false
   },
   // 压缩目标大小，单位KB。默认300KB以上文件才压缩，并压缩至300KB以内
-  compressTargetSize: propTypes.number.def(300)
+  compressTargetSize: propTypes.number.def(300),
+  idCardType: {
+    type: String,
+    default: ''
+  }
 });
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const emit = defineEmits(['update:modelValue']);
+const emit = defineEmits(['update:modelValue', 'success']);
 const number = ref(0);
 const uploadList = ref<any[]>([]);
 const dialogImageUrl = ref('');
 const dialogVisible = ref(false);
 
-const baseUrl = import.meta.env.VITE_APP_BASE_API;
+const baseUrl = props.isGo ? import.meta.env.VITE_APP_BASE_API_GO : import.meta.env.VITE_APP_BASE_API;
-const uploadImgUrl = ref(baseUrl + '/resource/oss/upload'); // 上传的图片服务器地址
+const uploadImgUrl = ref(baseUrl + (props.action ? props.action : '/resource/oss/upload')); // 上传的图片服务器地址
+console.log('🚀 ~ uploadImgUrl:', uploadImgUrl.value, baseUrl, props.action);
+
 const headers = ref(globalHeaders());
 
 const fileList = ref<any[]>([]);
@@ -121,7 +137,7 @@ watch(
 );
 
 /** 上传前loading加载 */
-const handleBeforeUpload = (file: any) => {
+const handleBeforeUpload = async (file: any) => {
   let isImg = false;
   if (props.fileType.length) {
     let fileExtension = '';
@@ -169,10 +185,32 @@ const handleExceed = () => {
 };
 
 // 上传成功回调
-const handleUploadSuccess = (res: any, file: UploadFile) => {
+const handleUploadSuccess = async (res: any, file: UploadFile) => {
   if (res.code === 200) {
     uploadList.value.push({ name: res.data.fileName, url: res.data.url, ossId: res.data.ossId });
     uploadedSuccessfully();
+    if (props.idCardType) {
+      const formData = new FormData();
+      formData.append('file', file.raw); // 假设后端接收的字段名为file
+      if (props.idCardType === 'front' || props.idCardType === 'back') {
+        const res = await recognizeidCard(formData, props.idCardType);
+        if (res.code === 200) {
+          proxy?.$modal.msgSuccess('身份证识别成功');
+          emit('success', res.data);
+        } else {
+          proxy?.$modal.msgError('身份证识别失败');
+        }
+      }
+      if (props.idCardType === 'bank') {
+        const res = await recognizeBankCard(formData);
+        if (res.code === 200) {
+          proxy?.$modal.msgSuccess('银行卡识别成功');
+          emit('success', res.data);
+        } else {
+          proxy?.$modal.msgError('银行卡识别失败');
+        }
+      }
+    }
   } else {
     number.value--;
     proxy?.$modal.closeLoading();
@@ -201,6 +239,7 @@ const uploadedSuccessfully = () => {
     fileList.value = fileList.value.filter((f) => f.url !== undefined).concat(uploadList.value);
     uploadList.value = [];
     number.value = 0;
+    console.log(listToString(fileList.value));
     emit('update:modelValue', listToString(fileList.value));
     proxy?.$modal.closeLoading();
   }

src/components/Process/approvalButton.vue

@@ -1,4 +1,5 @@
 <template>
+  <div>
     <div style="display: flex; justify-content: space-between">
       <div>
         <el-button v-if="submitButtonShow" :loading="props.buttonLoading" type="info" @click="submitForm('draft')">暂存</el-button>
@@ -11,6 +12,8 @@
         <el-button style="float: right" @click="goBack()">返回</el-button>
       </div>
     </div>
+    <h3 v-if="props.projectName" class="text-lg font-semibold text-gray-800">项目名称：{{ props.projectName }}</h3>
+  </div>
 </template>
 <script setup lang="ts">
 import { propTypes } from '@/utils/propTypes';
@@ -22,7 +25,8 @@ const props = defineProps({
   status: propTypes.string.def(''),
   pageType: propTypes.string.def(''),
   buttonLoading: propTypes.bool.def(false),
-  id: propTypes.string.def('') || propTypes.number.def()
+  id: propTypes.string.def('') || propTypes.number.def(),
+  projectName: propTypes.string.def('')
 });
 const emits = defineEmits(['submitForm', 'approvalVerifyOpen', 'handleApprovalRecord']);
 //暂存，提交

src/components/TopNav/index.vue

@@ -170,8 +170,6 @@ onMounted(() => {
 //分页
 const getWaitingList = () => {
   pageByTaskWait({ pageNum: 1, pageSize: 10 }).then((resp) => {
-    console.log(resp);
-
     total.value = resp.total;
   });
 };

src/components/bigUploader/index.vue

@@ -51,7 +51,7 @@ const instance = axios.create({
 });
 import sign from '@/utils/sign.js';
 import { getGoToken } from '@/utils/auth';
-const BASE_URL = 'http://58.17.134.85:8919';
+const BASE_URL = 'http://58.17.134.85:8920';
 const acceptConfig = ['.zip', '.rar']; //文件
 // const acceptConfig = {
 // 	// image: ['gif', 'jpg', 'jpeg', 'png', 'bmp', 'webp'],

src/components/uploadImg/index.vue

@@ -0,0 +1,244 @@
+<template>
+  <div class="up-img" v-if="limit > 1">
+    <el-upload
+      v-model:file-list="dataFileList"
+      :limit="limit"
+      :action="action"
+      :multiple="multiple"
+      :list-type="listType"
+      :on-success="handleAvatarSuccess"
+      :on-preview="handlePictureCardPreview"
+      :on-remove="handleRemove"
+      :on-exceed="handleExceed"
+      :before-upload="beforeAvatarUpload"
+      :data="dataParam"
+      :name="fileName"
+      :headers="headers"
+      ref="elUploadRef"
+    >
+      <el-icon><Plus /></el-icon>
+    </el-upload>
+    <el-dialog v-model="dialogVisible">
+      <img w-full :src="dialogImageUrl" alt="Preview Image" />
+    </el-dialog>
+  </div>
+  <div v-else>
+    <div class="up-img">
+      <el-upload
+        ref="elUploadRef"
+        v-model:file-list="dataFileList"
+        :limit="limit"
+        class="avatar-uploader"
+        :action="action"
+        :show-file-list="false"
+        :on-success="handleAvatarSuccess"
+        :before-upload="beforeAvatarUpload"
+        :on-preview="handlePictureCardPreview"
+        :on-remove="handleRemove"
+        :on-exceed="handleExceed"
+        :data="dataParam"
+        :name="fileName"
+        :headers="headers"
+      >
+        <img v-if="imageUrl" :src="imageUrl" class="avatar" />
+        <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+      </el-upload>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent, ref, computed, getCurrentInstance, reactive, toRefs } from 'vue';
+import type { UploadProps, UploadUserFile, UploadInstance } from 'element-plus';
+import { ElMessage, genFileId } from 'element-plus';
+import _ from 'lodash';
+import sign from '@/utils/sign.js';
+export default defineComponent({
+  name: 'uploadImg',
+  props: {
+    action: { type: String, default: '' }, //上传地址
+    name: { type: String, default: 'file' }, //上传文件类型
+    limit: { type: Number, default: 1 }, //上传最大数量
+    method: { type: String, default: 'post' }, //设置上传请求方法
+    multiple: { type: Boolean, default: true }, //是否支持多选文件
+    showFileList: { type: Boolean, default: true }, //是否显示已上传文件列表
+    drag: { type: Boolean, default: false }, //是否启用拖拽上传
+    accept: { type: String, default: '' }, //接受上传的文件类型格式
+    disabled: { type: Boolean, default: false }, //是否是否禁止上传
+    listType: { type: String, default: 'picture-card' }, //是否启用拖拽上传
+    uploadSize: { type: Number, default: 100 }, //上传文件大小
+    modelValue: {
+      type: Array,
+      default: function () {
+        return [];
+      }
+    },
+    uploadData: { type: Object, default: {} },
+    fileName: {
+      type: String,
+      default: 'file'
+    }
+  },
+  setup(props, { emit }) {
+    const baseURL: string | undefined | boolean = import.meta.env.VITE_APP_BASE_API_GO;
+    const { proxy } = getCurrentInstance() as any;
+    const token = proxy?.$cache.local.get('goToken');
+    const dialogImageUrl = ref('');
+    const elUploadRef = ref<UploadInstance>();
+    const dialogVisible = ref(false);
+    const imageUrl = ref('');
+    const state = reactive({
+      fileName: props.fileName
+    });
+    const headers = reactive({
+      Authorization: 'Bearer ' + token,
+      ...sign({ token: token, ...props.uploadData })
+    });
+    const dataParam = reactive({
+      token: token,
+      ...props.uploadData
+    });
+    let uploadedFile: Array<any> = [];
+    const dataFileList = computed({
+      get: () => {
+        let value: Array<UploadUserFile> = (props.modelValue as UploadUserFile[]) || [];
+        if (value.length) {
+          value.map((item: UploadUserFile) => {
+            if (item.url) {
+              // item.url = proxy.getUpFileUrl(item.url);
+            }
+            return item;
+          });
+        }
+        uploadedFile = _.cloneDeep(value);
+        return value;
+      },
+      set: (val) => {
+        emit('uploadData', val);
+      }
+    });
+    const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+      if (rawFile.type.substring(0, 5) !== 'image') {
+        ElMessage.error('请上传图片文件');
+        return false;
+      } else if (rawFile.size / 1024 / 1024 > props.uploadSize) {
+        ElMessage.error('上传文件超过' + props.uploadSize + 'M');
+        return false;
+      }
+      return true;
+    };
+    const handleRemove: UploadProps['onRemove'] = (file) => {
+      uploadedFile.splice(
+        uploadedFile.findIndex((item: any) => item.uid === file.uid),
+        1
+      );
+      setDataFileList();
+    };
+    const handleExceed = (files) => {
+      elUploadRef.value!.clearFiles();
+      const file = files[0];
+      file.uid = genFileId();
+      elUploadRef.value!.handleStart(file);
+      elUploadRef.value!.submit();
+      // ElMessage.error('最多可上传' + props.limit + '个文件,已超出最大限制数。');
+    };
+    const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
+      dialogImageUrl.value = uploadFile.url!;
+      dialogVisible.value = true;
+    };
+    const handleAvatarSuccess: UploadProps['onSuccess'] = (response, uploadFile) => {
+      emit('uploadImageAuth', response); //返回认证的数据
+      if (props.limit == 1) {
+        uploadedFile = [];
+        imageUrl.value = URL.createObjectURL(uploadFile.raw!);
+      }
+      uploadedFile = uploadedFile.filter((item: UploadUserFile) => {
+        return item.raw?.uid != uploadFile.raw?.uid;
+      });
+      if (response.code === 0) {
+        // if (response.data.name) {
+        // 	uploadedFile.push({
+        // 		// 单图
+        // 		name: response.data.name,
+        // 		url: response.data.path,
+        // 		fileType: response.data.type,
+        // 		size: response.data.size,
+        // 	});
+        // } else {
+        // 	console.log(response.data);
+        // 	if (response.data.list) {
+        // 		uploadedFile.push({
+        // 			// 多图
+        // 			name: response.data.list[0].name,
+        // 			url: response.data.list[0].path,
+        // 			fileType: response.data.list[0].type,
+        // 			size: response.data.list[0].size,
+        // 		});
+        // 		return;
+        // 	}
+        uploadedFile.push({
+          // 多图
+          name: response.data[0].name,
+          url: response.data[0].path,
+          fileType: response.data[0].type,
+          size: response.data[0].size
+        });
+        // }
+
+        setDataFileList();
+      } else {
+        ElMessage.error(response.message);
+        imageUrl.value = '';
+      }
+      emit('uploadImageAuth1', uploadedFile); //返回认证的数据
+    };
+    const setDataFileList = () => {
+      dataFileList.value = uploadedFile;
+    };
+    return {
+      dataFileList,
+      imageUrl,
+      baseURL,
+      dialogVisible,
+      dialogImageUrl,
+      handleExceed,
+      beforeAvatarUpload,
+      handleRemove,
+      handlePictureCardPreview,
+      handleAvatarSuccess,
+      dataParam,
+      headers,
+      elUploadRef,
+      ...toRefs(state)
+    };
+  }
+});
+</script>
+
+<style scoped>
+.up-img :deep(.avatar-uploader .avatar) {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+.up-img :deep(.avatar-uploader .el-upload) {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.up-img :deep(.avatar-uploader .el-upload:hover) {
+  border-color: var(--el-color-primary);
+}
+
+.up-img :deep(.el-icon.avatar-uploader-icon) {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>

src/layout/components/Sidebar/SidebarItem.vue

@@ -7,6 +7,7 @@
           <template #title>
             <span class="menu-title" :title="hasTitle(onlyOneChild.meta.title)">{{ onlyOneChild.meta.title }}</span>
             <span class="bage" v-if="onlyOneChild.meta?.title == '我的待办' && total > 0">{{ total }}</span>
+            <span class="bage" v-if="onlyOneChild.meta?.title == '我的抄送' && totalChao > 0">{{ totalChao }}</span>
           </template>
         </el-menu-item>
       </app-link>
@@ -16,7 +17,7 @@
       <template v-if="item.meta" #title>
         <svg-icon :icon-class="item.meta ? item.meta.icon : ''" />
         <span class="menu-title" :title="hasTitle(item.meta?.title)">{{ item.meta?.title }}</span>
-        <!-- <span class="bage" v-if="item.meta?.title == '我的任务' && total >= 0">{{ total }}</span> -->
+        <span class="bage" v-if="item.meta?.title == '我的任务' && total + totalChao > 0">{{ total + totalChao }}</span>
       </template>
 
       <sidebar-item
@@ -36,7 +37,7 @@ import { isExternal } from '@/utils/validate';
 import AppLink from './Link.vue';
 import { getNormalPath } from '@/utils/ruoyi';
 import { RouteRecordRaw } from 'vue-router';
-import { pageByTaskWait } from '@/api/workflow/task';
+import { pageByTaskWait, pageByTaskCopy } from '@/api/workflow/task';
 import useUserStore from '@/store/modules/user';
 import useNoticeStore from '@/store/modules/notice';
 const userStore = useUserStore();
@@ -56,21 +57,28 @@ const props = defineProps({
   }
 });
 const total = ref(0);
+const totalChao = ref(0);
 onMounted(() => {
   if (onlyOneChild.value.meta?.title == '我的待办' || props.item.meta?.title == '我的任务') {
-    console.log(44444444);
     getWaitingList();
+    getChaoList();
+  }
+  if (onlyOneChild.value.meta?.title == '我的抄送') {
+    getChaoList();
   }
 });
 // 获取我的待办
-//分页
 const getWaitingList = () => {
   pageByTaskWait({ pageNum: 1, pageSize: 10 }).then((resp) => {
-    console.log(resp);
-
     total.value = resp.total;
   });
 };
+// 获取我的抄送
+const getChaoList = () => {
+  pageByTaskCopy({ pageNum: 1, pageSize: 10 }).then((resp) => {
+    totalChao.value = resp.total;
+  });
+};
 const onlyOneChild = ref<any>({});
 
 const hasOneShowingChild = (parent: RouteRecordRaw, children?: RouteRecordRaw[]) => {
@@ -123,9 +131,7 @@ const hasTitle = (title: string | undefined): string => {
 watch(
   () => noticeStore.state.value.notices,
   (newVal) => {
-    if (onlyOneChild.value.meta?.title == '我的待办') {
+    if (onlyOneChild.value.meta?.title == '我的待办' || props.item.meta?.title == '我的任务') {
-      console.log(121212121);
-
       let time = setTimeout(() => {
         getWaitingList();
         clearTimeout(time);