diff --git a/src/api/safety/safetyWeeklyReport/index.ts b/src/api/safety/safetyWeeklyReport/index.ts index 4177b4d..7bc80db 100644 --- a/src/api/safety/safetyWeeklyReport/index.ts +++ b/src/api/safety/safetyWeeklyReport/index.ts @@ -22,9 +22,12 @@ export const listSafetyWeeklyReport = (query?: SafetyWeeklyReportQuery): AxiosPr * @param id */ export const getSafetyWeeklyReport = (id: string | number): AxiosPromise => { - return request({ - url: '/safety/safetyWeeklyReport/' + id, - method: 'get' + return requestGo({ + url: '/zm/api/v1/system/busWeeklySecurityReport/get', + method: 'get', + params: { + id + } }); }; diff --git a/src/views/quality/onlineListquality/comm/documentsDetail/index.vue b/src/views/quality/onlineListquality/comm/documentsDetail/index.vue index 67baaef..dfedaab 100644 --- a/src/views/quality/onlineListquality/comm/documentsDetail/index.vue +++ b/src/views/quality/onlineListquality/comm/documentsDetail/index.vue @@ -69,7 +69,7 @@ export default defineComponent({ }; const init = (obj) => { let documentKey = obj.id.toString() + new Date().getTime(); - window['$HOSTSRC'] = 'ws://xny.yj-3d.com:8899/ws'; + window['$HOSTSRC'] = 'ws://58.17.134.85:8920/ws'; let baseURL = window['$HOSTSRC'].replace('ws:', 'http:').replace('/ws', ''); let url = baseURL + obj.filenPathCoding.replaceAll('+', ' '); let type = obj.suffix; diff --git a/src/views/safety/safetyWeeklyReport/component/add.vue b/src/views/safety/safetyWeeklyReport/component/add.vue new file mode 100644 index 0000000..4083477 --- /dev/null +++ b/src/views/safety/safetyWeeklyReport/component/add.vue @@ -0,0 +1,110 @@ + + + diff --git a/src/views/safety/safetyWeeklyReport/component/documentsDetail/index.vue b/src/views/safety/safetyWeeklyReport/component/documentsDetail/index.vue new file mode 100644 index 0000000..5d5fbaa --- /dev/null +++ b/src/views/safety/safetyWeeklyReport/component/documentsDetail/index.vue @@ -0,0 +1,186 @@ + + + diff --git a/src/views/safety/safetyWeeklyReport/component/documentsEdit/index.vue b/src/views/safety/safetyWeeklyReport/component/documentsEdit/index.vue new file mode 100644 index 0000000..8340034 --- /dev/null +++ b/src/views/safety/safetyWeeklyReport/component/documentsEdit/index.vue @@ -0,0 +1,187 @@ + + + diff --git a/src/views/safety/safetyWeeklyReport/component/icon/full.png b/src/views/safety/safetyWeeklyReport/component/icon/full.png new file mode 100644 index 0000000..973cf14 Binary files /dev/null and b/src/views/safety/safetyWeeklyReport/component/icon/full.png differ diff --git a/src/views/safety/safetyWeeklyReport/component/icon/suo.png b/src/views/safety/safetyWeeklyReport/component/icon/suo.png new file mode 100644 index 0000000..80f2233 Binary files /dev/null and b/src/views/safety/safetyWeeklyReport/component/icon/suo.png differ diff --git a/src/views/safety/safetyWeeklyReport/component/model.ts b/src/views/safety/safetyWeeklyReport/component/model.ts new file mode 100644 index 0000000..90873c4 --- /dev/null +++ b/src/views/safety/safetyWeeklyReport/component/model.ts @@ -0,0 +1,58 @@ +export interface BusWeeklySecurityReportTableColumns { + id:number; // 主键ID + projectId:number; // 项目ID + projectName:string; // 项目名称 + scope:string; // 周期范围 + scopeEnd:string; // 周期范围结束 + path:string; // 文件位置 + createBy:string; // 创建者 + updateBy:string; // 更新者 + createdAt:string; // 创建时间 +} + + +export interface BusWeeklySecurityReportInfoData { + id:number|undefined; // 主键ID + projectId:number|undefined; // 项目ID + projectName:string|undefined; // 项目名称 + scope:string|undefined; // 周期范围 + scopeEnd:string|undefined; // 周期范围结束 + path:string|undefined; // 文件位置 + createBy:string|undefined; // 创建者 + updateBy:string|undefined; // 更新者 + createdAt:string|undefined; // 创建时间 + updatedAt:string|undefined; // 更新时间 + deletedAt:string|undefined; // 删除时间 +} + + +export interface BusWeeklySecurityReportTableDataState { + ids:any[]; + tableData: { + data: Array; + total: number; + loading: boolean; + param: { + pageNum: number; + pageSize: number; + id: number|undefined; + projectId: number|undefined; + projectName: string|undefined; + scope: string|undefined; + scopeEnd: string|undefined; + path: string|undefined; + createBy: string|undefined; + updateBy: string|undefined; + createdAt: string|undefined; + dateRange: string[]; + }; + }; +} + + +export interface BusWeeklySecurityReportEditState{ + loading:boolean; + isShowDialog: boolean; + formData:BusWeeklySecurityReportInfoData; + rules: object; +} \ No newline at end of file diff --git a/src/views/safety/safetyWeeklyReport/index.vue b/src/views/safety/safetyWeeklyReport/index.vue index 96e8429..bfbd96c 100644 --- a/src/views/safety/safetyWeeklyReport/index.vue +++ b/src/views/safety/safetyWeeklyReport/index.vue @@ -1,104 +1,95 @@ - - +