diff --git a/package.json b/package.json index 1b6a2f4..cd12d40 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "js-md5": "^0.8.3", "jsencrypt": "3.3.2", "jszip": "^3.10.1", + "leaflet": "^1.9.4", "lodash": "^4.17.21", "md5": "^2.3.0", "mitt": "^3.0.1", @@ -54,6 +55,7 @@ "ol": "^10.5.0", "pinia": "2.2.6", "proj4": "^2.19.3", + "proj4leaflet": "^1.0.2", "screenfull": "6.0.2", "spark-md5": "^3.0.2", "vue": "3.5.13", diff --git a/src/api/safety/recognizeRecord/types.ts b/src/api/safety/recognizeRecord/types.ts index ea92de7..de53933 100644 --- a/src/api/safety/recognizeRecord/types.ts +++ b/src/api/safety/recognizeRecord/types.ts @@ -1,4 +1,5 @@ export interface RecognizeRecordVO { + id: any; /** * 设备名称 */ @@ -32,7 +33,6 @@ export interface RecognizeRecordVO { * 创建时间 */ createTime: string; - } export interface RecognizeRecordForm extends BaseEntity { @@ -79,22 +79,23 @@ export interface RecognizeRecordForm extends BaseEntity { /** * 故障描述 */ - describe?: string; + description?: string; /** * 备注 */ remark?: string; - } export interface RecognizeRecordQuery extends PageQuery { - /** * 项目id */ projectId?: string | number; - + /** + * 故障描述 + */ + description?: string; /** * 设备名称 */ @@ -115,11 +116,8 @@ export interface RecognizeRecordQuery extends PageQuery { */ createTime?: string; - /** - * 日期范围参数 - */ - params?: any; + /** + * 日期范围参数 + */ + params?: any; } - - - diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts index ee66383..1822c91 100644 --- a/src/api/system/user/index.ts +++ b/src/api/system/user/index.ts @@ -209,6 +209,18 @@ export const deptTreeSelect = (): AxiosPromise => { }); }; +/** + * 新增用户文件关联 + * @param data 文件关联数据 + */ +export const uploadCertList = (data: { userId: string | number; fileId: string }) => { + return request({ + url: '/system/userFile', + method: 'post', + data: data + }); +}; + export default { listUser, getUser, diff --git a/src/api/system/user/types.ts b/src/api/system/user/types.ts index 0787372..4bdca11 100644 --- a/src/api/system/user/types.ts +++ b/src/api/system/user/types.ts @@ -46,6 +46,7 @@ export interface UserVO extends BaseEntity { postIds: any; roleId: any; admin: boolean; + filePath?: string; } /** @@ -65,6 +66,7 @@ export interface UserForm { remark?: string; postIds: string[]; roleIds: string[]; + filePath?: string; } export interface UserInfoVO { diff --git a/src/router/index.ts b/src/router/index.ts index 5eb2888..3e6195b 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -106,7 +106,7 @@ export const constantRoutes: RouteRecordRaw[] = [ }, { path: '/progress/progressPaper', - component: () => import('@/views/progress/progressPaper/index.vue'), + component: () => import('@/views/progress/progressPaper/test.vue'), hidden: true }, { diff --git a/src/views/progress/progressPaper/test.vue b/src/views/progress/progressPaper/test.vue new file mode 100644 index 0000000..8919648 --- /dev/null +++ b/src/views/progress/progressPaper/test.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/views/safety/recognizeRecord/index.vue b/src/views/safety/recognizeRecord/index.vue index 5c6af09..869e995 100644 --- a/src/views/safety/recognizeRecord/index.vue +++ b/src/views/safety/recognizeRecord/index.vue @@ -89,8 +89,8 @@ - - + + @@ -147,7 +147,7 @@ const initFormData: RecognizeRecordForm = { violationType: undefined, picture: undefined, num: undefined, - describe: undefined, + description: undefined, remark: undefined }; const data = reactive>({ diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index fdbc5ad..7c6b983 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -112,7 +112,7 @@ - + @@ -257,7 +260,7 @@ - + + + + + + +