diff --git a/api/index.js b/api/index.js index 62e9184..57bffa0 100644 --- a/api/index.js +++ b/api/index.js @@ -12,13 +12,13 @@ export const getSafetyenvironmentalList = (params) => post("/app/safetyenvironme export const getSafetyenvironmentalCheckList = (params) => post("/app/safetyenvironmental/checkList/v2", params) //获取安全环保检查列表(隐患指派及验收) export const getpleadList = (params) => post("/app/safetyenvironmental/pleadList", params) //获取安全环保检查列表 export const getSafetyenvironmentalGoEdit = (params) => post("/app/safetyenvironmental/goEdit", params) //安全环保检查明细信息 -export const setSafetyenvironmentalAdd = (params) => post("/app/safetyenvironmental/add", params) //新增安全环保检查 +export const setSafetyenvironmentalAdd = (params) => post("/app/safetyenvironmental/add1", params) //新增安全环保检查 export const setSafetyenvironmentalAdd_plus = (params) => upload("/app/safetyenvironmental/add", params) //新增安全环保检查 -export const setSafetyenvironmentalEdit = (params) => post("/app/safetyenvironmental/edit", params) //修改安全环保检查 +export const setSafetyenvironmentalEdit = (params) => post("/app/safetyenvironmental/edit1", params) //修改安全环保检查 export const setSafetyenvironmentalEdit_plus = (params) => upload("/app/safetyenvironmental/edit", params) //修改安全环保检查 export const setSafetyenvironmentalGoEdit = (params) => post("/app/safetyenvironmental/goEdit", params) //修改安全环保检查 export const getSafetyenvironmentalRedPoint = (params) => post("/app/safetyenvironmental/countCheck", params) //修改安全环保检查 -export const setSafetyenvironmentalExplain = (params) => post("/app/safetyenvironmental/explain", params) //申辩 +export const setSafetyenvironmentalExplain = (params) => uploads("/app/safetyenvironmental/explain", params) //申辩 export const setSafetyenvironmentalFlow = (params) => post("/app/safetyenvironmental/showFlowChart", params) //申辩 export const setImgFilesAdd = (params) => uploads("/app/imgfiles/uploadFile", params) //上传图片 export const setImgFilesListAdd = (params) => uploads("/app/imgfiles/uploadFileList", params) //上传图片 @@ -148,6 +148,7 @@ export const findHiddenDetailMessage = (params) => post("/app/hidden/evaluation/ export const getKeyProjectsVideoList = (params) => post("/app/keyProjects/videomanagerList", params); // 获取重点工程的视频列表 export const loginVideoPlat = (params) => videoApiGet("/api/v1/login", params); // 登录视频监控平台 export const getPlatVideoPlay = (params) => videoApiGet("/api/v1/stream/start", params); // 获取视频监控平台播放地址 + export const setRefreshToken = (params) => - post("/sys/refreshToken", { loading: false, ...params }); + post("/sys/refreshToken", { loading: false, ...params }); // 刷新token // 结束 diff --git a/pages/branch-information-management/branch-office/detail.vue b/pages/branch-information-management/branch-office/detail.vue index 600c589..9a41858 100644 --- a/pages/branch-information-management/branch-office/detail.vue +++ b/pages/branch-information-management/branch-office/detail.vue @@ -45,7 +45,7 @@ - {{ item.NAME }} + {{ item.name }} 部门级别:{{ item.LEVEL_NAME }} @@ -56,7 +56,7 @@ 部门主管领导:{{ item.LEADER_CHARGE_NAME || '' }} - 是否监管部门:{{ item.ISSUPERVISE == '0' ? '否' : '是' }} + 是否监管部门:{{ item.issupervise == '0' ? '否' : '是' }} 是否安监部门:是 是否消防部门:是 diff --git a/pages/branch-self-report/index/inspection-records-detail-list.vue b/pages/branch-self-report/index/inspection-records-detail-list.vue index cf558b6..2a829d9 100644 --- a/pages/branch-self-report/index/inspection-records-detail-list.vue +++ b/pages/branch-self-report/index/inspection-records-detail-list.vue @@ -78,6 +78,7 @@ export default { let resData = await getInspectionReportListManageRecordsList({ KEYWORDS: this.KEYWORDS, CORPINFO_ID: this.CORPINFO_ID, + SELECT_CORPINFO_ID: this.CORPINFO_ID, LISTMANAGER_ID: this.LISTMANAGER_ID, TYPE: this.TYPE, showCount: this.pageSize, diff --git a/pages/branch-self-report/index/inspection-records.vue b/pages/branch-self-report/index/inspection-records.vue index 88348f3..c6061f0 100644 --- a/pages/branch-self-report/index/inspection-records.vue +++ b/pages/branch-self-report/index/inspection-records.vue @@ -184,6 +184,7 @@ export default { this.popupShow = false let resData = await getInspectionReportListManageList({ CORPINFO_ID: this.CORPINFO_ID, + SELECT_CORPINFO_ID: this.CORPINFO_ID, KEYWORDS: this.KEYWORDS, DEPARTMENT_ID: this.DEPT, USER_ID: this.USER_ID, diff --git a/pages/hidden-danger-review/evaluation/list.vue b/pages/hidden-danger-review/evaluation/list.vue index 7546f37..2f4e4ec 100644 --- a/pages/hidden-danger-review/evaluation/list.vue +++ b/pages/hidden-danger-review/evaluation/list.vue @@ -650,6 +650,7 @@ export default { SOURCE: this.SOURCE, EVALUATIONCONFIG_ID: this.EVALUATIONCONFIG_ID, CORPINFO_ID: this.CORPINFO_ID, + SELECT_CORPINFO_ID: this.CORPINFO_ID, TYPE: this.TYPE }); this.list = [...this.list,...resData.varList]; diff --git a/pages/login/login.vue b/pages/login/login.vue index a9324d1..22545c6 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -35,6 +35,7 @@ import {getUserInfo, submitLogin} from '../../api/index' import updateVersion from '../../utils/updateVersion' import { encrypt } from "@/utils/aes_secret" +import dayjs from "dayjs" export default { mixins:[updateVersion], diff --git a/pages/risk-level-control/risk-management/detail-list.vue b/pages/risk-level-control/risk-management/detail-list.vue index f0d2d15..e8519bf 100644 --- a/pages/risk-level-control/risk-management/detail-list.vue +++ b/pages/risk-level-control/risk-management/detail-list.vue @@ -77,10 +77,8 @@