diff --git a/api/index.js b/api/index.js
index e7fc243..9c655ec 100644
--- a/api/index.js
+++ b/api/index.js
@@ -1,4 +1,4 @@
-import {post, upload, uploads,videoApiGet} from "@/utils/request";
+import {post, upload, uploads,videoApiGet} from "../utils/request";
export const submitLogin = (params) => post("/admin/check", params) // 登录
export const getHotWorkListByState = (params) => post("/app/hotworkapplication/list", params)//获取动火列表
@@ -12,13 +12,17 @@ export const getSafetyenvironmentalCheckList = (params) => post("/app/safetyenvi
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_plus = (params) => post("/app/safetyenvironmental/add", params) //新增安全环保检查
+export const setSafetyenvironmentalAdd_plus = (params) => upload("/app/safetyenvironmental/add", params) //新增安全环保检查
export const setSafetyenvironmentalEdit = (params) => post("/app/safetyenvironmental/edit", params) //修改安全环保检查
-export const setSafetyenvironmentalEdit_plus = (params) => post("/app/safetyenvironmental/edit", 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 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) //上传图片
+export const setVideoAdd = (params) => upload("/app/imgfiles/add", params) //上传视频
+export const setImgFilesAddVideo = (params) => uploads("/app/imgfiles/addVideo", params) //上传视频
export const getHiddenRegion = (params) => post("/app/hiddenRegion/gerRegionList", {loading: false, ...params}) //获取隐患部位
export const getInspectedDepartment = (params) => post("/app/corpDepartment/listTreeCorpDept", {loading: false, ...params}) //获取被检查部门
export const getInspectionDepartment = (params) => post("/app/corpDepartment/listTreeManageAndCorp", {loading: false, ...params}) //获取检查部门
@@ -27,7 +31,7 @@ export const getHiddenLevel = () => post("/app/dictionaries/listSelectTree", {lo
export const getHiddenType = () => post("/app/dictionaries/listSelectTree", {loading: false, DICTIONARIES_ID: '3babc15144444bdc8d763d0af2bdfff6'}) //获取隐患类型
export const getInspectionType = () => post("/app/dictionaries/listSelectTree", {loading: false, DICTIONARIES_ID: '60e6481d96e44a5390ff5c347c4d1ffe'}) //获取检查类型
export const getSafetyenvironmentalinspectorList = (params) => post("/app/safetyenvironmentalinspector/list", params) //安全环保检查检查人确认列表
-export const setSafetyenvironmentalVerify = (params) => post("/app/safetyenvironmentalinspector/verify", params) //安全环保检查检查人确认
+export const setSafetyenvironmentalVerify = (params) => upload("/app/safetyenvironmentalinspector/verify", params) //安全环保检查检查人确认
export const getCorpInfoList = (params) => post("/app/corpinfo/listRetrieval", params) //分公司信息列表
export const getCorpInfoGoEdit = (params) => post("/app/corpinfo/goMessage", params) //分公司信息查看
export const getCorpInfoPersonregistration = (params) => post("/AppUser/personregistration", params) //分公司信息查看入职从业人员登记
@@ -43,7 +47,7 @@ export const getDepartmentLevel = () => post("/app/dictionaries/getLevels", {loa
export const getCheckCycle = () => post("/app/dictionaries/getLevels", {loading: false, DICTIONARIES_ID: 'f60cf0e8315b4993b6d6049dd29f2ba5'}) //获取排查周期
export const getListType = () => post("/app/dictionaries/getLevels", {loading: false, DICTIONARIES_ID: '4a3d0d99b0ea4e268c11dd0b18866917'}) //获取清单类型
export const approveHotWorkSupervision = (params) => post("/app/hotworkapplication/editOpinion", params) //特级动火 安全监督部初审
-export const approveHotWorkSupervisionAndFfile = (params) => post("/app/hotworkapplication/editOpinion", params) //特级动火 安全监督部初审 增加签字附件
+export const approveHotWorkSupervisionAndFfile = (params) => upload("/app/hotworkapplication/editOpinion", params) //特级动火 安全监督部初审 增加签字附件
export const getInspectionReportCorpInfoList = (params) => post("/app/inspectionReport/corpinfo/list", params) //获取所有的分公司自查自报记录
export const getInspectionReportListManageList = (params) => post("/app/inspectionReport/listManage/list", params) //分公司的清单记录
export const getInspectionReportListManageRecordsList = (params) => post("/app/inspectionReport/listManage/records/list", params) //已检查信息与超期未检查记录
@@ -97,7 +101,7 @@ export const setKeyProjectsAIWarningAdd = (params) => post("/app/aiwarning/edit"
export const getkeyprojectcount = (params) => post("/app/keyprojectcheck/keyProjectCount", params); // 重点工程统计
export const getPromiseUnsigned = (params) => post("/app/corppromise/ISSIGN", params); // 获取是否有需要签字的承诺书
export const getPromiseInfo = (params) => post("/app/corppromise/promise", params); // 获取需要签字的承诺书信息
-export const setPromiseSign = (params) => post("/app/corppromise/editpeople", params); // 承诺书提交签字
+export const setPromiseSign = (params) => upload("/app/corppromise/editpeople", params); // 承诺书提交签字
export const getMyPromiseList = (params) => post("/app/corppromise/promiseV2list", params); // 获取我的承诺列表
export const getReceivePromiseList = (params) => post("/app/corppromise/receiveV2PromiseList", params); // 获取接收承诺列表
export const getPromiseView = (params) => post("/app/corppromise/goEdit", params); // 查看承诺书
@@ -143,6 +147,4 @@ 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 fileUpload = (params) => upload("/app/file/upload", params);
-export const fileUploads = (params) => uploads("/app/file/uploads", params);
// 结束
diff --git a/main.js b/main.js
index 558e461..629e5d1 100644
--- a/main.js
+++ b/main.js
@@ -2,6 +2,7 @@ import Vue from 'vue'
import store from './store'
import App from './App'
import uView from 'uview-ui'
+
import empty from '@/components/empty/empty.vue'
import uniTable from '@/components/uni-table/uni-table/uni-table.vue'
import uniTbody from '@/components/uni-table/uni-tbody/uni-tbody.vue'
diff --git a/pages/key-project-management/AI-warning/detail.vue b/pages/key-project-management/AI-warning/detail.vue
index 6f10f99..996b307 100644
--- a/pages/key-project-management/AI-warning/detail.vue
+++ b/pages/key-project-management/AI-warning/detail.vue
@@ -226,14 +226,17 @@
<script>
import {
getKeyProjectsListAllPersonnel,
+ getHiddenLevel,
getHiddenType,
getKeyProjectsListAllUnits,
getInspectionDepartment,
getInspectionType,
getInspectors,
+ setImgFilesAdd,
setKeyProjectsAIWarningAdd,
+ setVideoAdd,
getKeyProjectsAIWarningView
-} from "@/api";
+} from "../../../api";
export default {
data() {
diff --git a/pages/key-project-management/hidden-management/view.vue b/pages/key-project-management/hidden-management/view.vue
index 7102d46..fe8c973 100644
--- a/pages/key-project-management/hidden-management/view.vue
+++ b/pages/key-project-management/hidden-management/view.vue
@@ -184,7 +184,7 @@
</template>
<script>
-import {fileUpload, getKeyProjectsCheckCheck, getKeyProjectsCheckHiddenView} from "@/api";
+import {getKeyProjectsCheckCheck, getKeyProjectsCheckHiddenView, setImgFilesAdd} from "../../../api";
export default {
data() {
@@ -323,15 +323,13 @@ export default {
})
},
async fnSetImgFilesAdd(imgFiles, FOREIGN_KEY,TYPE) {
- return await fileUpload({
- filePath: imgFiles,
- name: "file",
+ return await setImgFilesAdd({
+ files: imgFiles,
formData: {
- foreignKey: FOREIGN_KEY,
- corpInfoId: this.$store.getters.getUserInfo.CORPINFO_ID,
- type: TYPE,
+ FOREIGN_KEY,
+ TYPE
},
- loading: false
+ loading:false
})
},
},
diff --git a/pages/key-project-management/penalty-management/viewHidden.vue b/pages/key-project-management/penalty-management/viewHidden.vue
index 5cfee79..2421bdd 100644
--- a/pages/key-project-management/penalty-management/viewHidden.vue
+++ b/pages/key-project-management/penalty-management/viewHidden.vue
@@ -177,7 +177,7 @@
</template>
<script>
-import {fileUpload, getKeyProjectsCheckCheck, getKeyProjectsCheckHiddenView} from "@/api";
+import {getKeyProjectsCheckCheck, getKeyProjectsCheckHiddenView, setImgFilesAdd} from "../../../api";
export default {
data() {
@@ -310,13 +310,11 @@ export default {
})
},
async fnSetImgFilesAdd(imgFiles, FOREIGN_KEY, TYPE) {
- return await fileUpload({
- filePath: imgFiles,
- name: "file",
+ return await setImgFilesAdd({
+ files: imgFiles,
formData: {
- foreignKey: FOREIGN_KEY,
- corpInfoId: this.$store.getters.getUserInfo.CORPINFO_ID,
- type: TYPE,
+ FOREIGN_KEY,
+ TYPE
},
loading: false
})
diff --git a/pages/key-project-management/safety-environmental-inspection/detail.vue b/pages/key-project-management/safety-environmental-inspection/detail.vue
index a025ac4..bc43875 100644
--- a/pages/key-project-management/safety-environmental-inspection/detail.vue
+++ b/pages/key-project-management/safety-environmental-inspection/detail.vue
@@ -312,10 +312,12 @@ import {
getInspectionDepartment,
getInspectionType,
getInspectors,
+ setImgFilesAdd,
setKeyProjectsCheckAdd,
+ setVideoAdd,
getKeyProjectsCheckView,
- getPERSONNELMANAGEMENTID, fileUpload
-} from "@/api";
+ getPERSONNELMANAGEMENTID
+} from "../../../api";
export default {
data() {
@@ -649,25 +651,25 @@ export default {
})
},
async fnSetImgFilesAdd(imgFiles, FOREIGN_KEY, TYPE) {
- return await fileUpload({
- filePath: imgFiles,
- name: "file",
+ return await setImgFilesAdd({
+ files: imgFiles,
formData: {
- foreignKey: FOREIGN_KEY,
- corpInfoId: this.$store.getters.getUserInfo.CORPINFO_ID,
- type: TYPE,
+ FOREIGN_KEY,
+ TYPE
},
- loading:false
+ loading: false
})
},
async fnSetVideoAdd(filePath, FOREIGN_KEY) {
- return await fileUpload({
- filePath: filePath,
- name: "file",
+ return await setVideoAdd({
+ filePath,
+ name: 'FFILE',
formData: {
- foreignKey: FOREIGN_KEY,
- corpInfoId: this.$store.getters.getUserInfo.CORPINFO_ID,
- type: 102,
+ FOREIGN_KEY,
+ TYPE: 102,
+ CORPINFO_ID: this.userInfo.CORPINFO_ID,
+ // CORPINFO_ID: this.CORPINFO_ID,
+
},
loading: false
})
diff --git a/pages/mine/promise/sign.vue b/pages/mine/promise/sign.vue
index cb871cc..898eca1 100644
--- a/pages/mine/promise/sign.vue
+++ b/pages/mine/promise/sign.vue
@@ -54,7 +54,7 @@
<script>
import sign from "../../../components/sign/sign";
-import {fileUpload, getPromiseInfo, setPromiseSign} from "../../../api";
+import {getPromiseInfo, setPromiseSign} from "../../../api";
export default {
components: {
@@ -98,20 +98,13 @@ export default {
})
return
}
- let res = await fileUpload({
- filePath: this.info.FILEPATH,
- name: "file",
- formData: {
- foreignKey: this.userInfo.USER_ID,
- corpInfoId: this.userInfo.CORPINFO_ID,
- type: 117,
- },
- loading: false
- })
await setPromiseSign({
- ...this.info,
- CORPINFO_ID: this.userInfo.CORPINFO_ID,
- attachmentPath: res.data.filePath
+ filePath: this.info.FILEPATH,
+ name: 'FFILE',
+ formData: {
+ ...this.info,
+ CORPINFO_ID: this.userInfo.CORPINFO_ID
+ },
})
uni.showToast({
title: '添加成功',
diff --git a/pages/safety-environmental-inspection/initiate/detail.vue b/pages/safety-environmental-inspection/initiate/detail.vue
index 30b0bc2..9f6ade4 100644
--- a/pages/safety-environmental-inspection/initiate/detail.vue
+++ b/pages/safety-environmental-inspection/initiate/detail.vue
@@ -390,7 +390,6 @@
<script>
import {
- fileUpload,
getDeptUser,
getHiddenLevel,
getHiddenRegion,
@@ -400,9 +399,11 @@ import {
getInspectionType,
getInspectors,
getSafetyenvironmentalGoEdit,
+ setImgFilesAdd,
setSafetyenvironmentalAdd, setSafetyenvironmentalAdd_plus,
- setSafetyenvironmentalEdit, setSafetyenvironmentalEdit_plus
-} from "@/api";
+ setSafetyenvironmentalEdit, setSafetyenvironmentalEdit_plus,
+ setVideoAdd
+} from "../../../api";
export default {
data() {
@@ -766,18 +767,10 @@ export default {
}
let resData
if (this.form.INSPECTION_USER_SIGN_IMG) {
- let res = await fileUpload({
- filePath: this.form.INSPECTION_USER_SIGN_IMG,
- name: "file",
- formData: {
- foreignKey: this.$store.getters.getUserInfo.USER_ID,
- corpInfoId: this.$store.getters.getUserInfo.CORPINFO_ID,
- type: 126,
- },
- loading: false
- })
-
let params = {
+ filePath: this.form.INSPECTION_USER_SIGN_IMG,
+ name: 'FFILE',
+ formData: {
...this.form,
INSPECTION_ORIGINATOR_ID: this.userInfo.USER_ID,
INSPECTION_STATUS: '1',
@@ -788,8 +781,8 @@ export default {
INSPECTORJSON: JSON.stringify(this.form.inspectorList),
SITUATIONJSON: JSON.stringify(this.form.situationList),
HIDDENJSON: JSON.stringify(this.form.hiddenList),
- CONFIRM_MESSAGE_SIGN_ROUTE: res.date.filePath,
loading: false
+ }
}
resData = this.INSPECTION_ID ? await setSafetyenvironmentalEdit_plus(params) : await setSafetyenvironmentalAdd_plus(params)
} else {
@@ -852,15 +845,13 @@ export default {
console.log('ok')
}
}
- return await fileUpload({
- filePath: imgFiles,
- name: "file",
+ return await setImgFilesAdd({
+ files: imgFiles,
formData: {
- foreignKey: FOREIGN_KEY,
- corpInfoId: this.$store.getters.getUserInfo.CORPINFO_ID,
- type: 3,
+ FOREIGN_KEY,
+ TYPE: '3'
},
- loading:false
+ loading: false
})
},
async fnSetVideoAdd(filePath, FOREIGN_KEY) {
@@ -869,13 +860,13 @@ export default {
console.log('ok')
}
}
- return await fileUpload({
- filePath: filePath,
- name: "file",
+ return await setVideoAdd({
+ filePath,
+ name: 'FFILE',
formData: {
- foreignKey: FOREIGN_KEY,
- corpInfoId: this.$store.getters.getUserInfo.CORPINFO_ID,
- type: 102,
+ FOREIGN_KEY,
+ TYPE: 102,
+ CORPINFO_ID: this.userInfo.CORPINFO_ID,
},
loading: false
})
diff --git a/pages/safety-environmental-inspection/inspector-archives/acceptance.vue b/pages/safety-environmental-inspection/inspector-archives/acceptance.vue
index e3a26e4..0574fd2 100644
--- a/pages/safety-environmental-inspection/inspector-archives/acceptance.vue
+++ b/pages/safety-environmental-inspection/inspector-archives/acceptance.vue
@@ -451,7 +451,7 @@
<script>
-import {fileUpload, getHiddenGoEdit, setFinalCheck} from "@/api";
+import {getHiddenGoEdit, setFinalCheck, setImgFilesAdd, setVideoAdd} from "../../../api";
export default {
data() {
@@ -623,13 +623,11 @@ export default {
},
async fnSetVideoAdd(imgFiles) {
console.log(imgFiles)
- return await fileUpload({
- filePath: imgFiles,
- name: "file",
+ return await setImgFilesAdd({
+ files: imgFiles,
formData: {
- foreignKey: this.HIDDEN_ID,
- corpInfoId: this.$store.getters.getUserInfo.CORPINFO_ID,
- type: 50,
+ FOREIGN_KEY: this.HIDDEN_ID,
+ TYPE: '50'
},
loading: false
})
diff --git a/pages/safety-environmental-inspection/inspector-confirms/detail.vue b/pages/safety-environmental-inspection/inspector-confirms/detail.vue
index b5e5976..3f8d2a7 100644
--- a/pages/safety-environmental-inspection/inspector-confirms/detail.vue
+++ b/pages/safety-environmental-inspection/inspector-confirms/detail.vue
@@ -282,7 +282,7 @@
</template>
<script>
-import {fileUpload, getSafetyenvironmentalGoEdit, setSafetyenvironmentalVerify} from "../../../api";
+import {getSafetyenvironmentalGoEdit, setSafetyenvironmentalVerify} from "../../../api";
import sign from "../../../components/sign/sign";
export default {
@@ -391,18 +391,10 @@ export default {
}
}
console.log(this.form.INSPECTION_USER_SIGN_IMG)
- // INSPECTION_USER_SIGN_IMG
- let res = await fileUpload({
- filePath: this.form.INSPECTION_USER_SIGN_IMG,
- name: "file",
- formData: {
- foreignKey: this.INSPECTION_ID,
- corpInfoId: this.$store.getters.getUserInfo.CORPINFO_ID,
- type: 127,
- },
- loading: false
- })
await setSafetyenvironmentalVerify({
+ filePath: this.form.INSPECTION_USER_SIGN_IMG,
+ name: 'FFILE',
+ formData: {
INSPECTION_STATUS,
INSPECTION_ID: this.INSPECTION_ID,
INSPECTION_INSPECTOR_ID: this.INSPECTION_INSPECTOR_ID,
@@ -411,7 +403,7 @@ export default {
INSPECTION_USER_SIGN_TIME: uni.$u.timeFormat(new Date(), 'yyyy-mm-dd hh:MM'),
ACTION_USER_ID: this.userInfo.USER_ID,
ACTION_ID: this.userInfo.USER_ID,
- NSPECTION_USER_SIGN_IMG: res.data.filePath
+ },
})
uni.showToast({
title: '核查成功',
diff --git a/pages/super-hot/safety-director/detail.vue b/pages/super-hot/safety-director/detail.vue
index 8ac6747..665045c 100644
--- a/pages/super-hot/safety-director/detail.vue
+++ b/pages/super-hot/safety-director/detail.vue
@@ -284,12 +284,12 @@
<script>
import {
- approveHotWorkSupervisionAndFfile, fileUpload,
+ approveHotWorkSupervisionAndFfile,
getDept,
getDeptUser,
getHotWorkGoEdit,
getImgfilesListByKeyAndType
-} from "@/api";
+} from "../../../api";
import sign from "../../../components/sign/sign";
export default {
@@ -384,24 +384,16 @@ export default {
return false
}
}
- let res = await fileUpload({
- filePath: this.form.safetyDirectorSign,
- name: "file",
- formData: {
- foreignKey: this.userInfo.USER_ID,
- corpInfoId: this.userInfo.CORPINFO_ID,
- type: 130,
- },
- loading: false
- })
- await approveHotWorkSupervisionAndFfile({
+ let formData = {
'TYPE': this.form.TYPE,
'HOTWORKAPPLICATION_ID': this.HOTWORKAPPLICATION_ID,
'STATE': '37',
'loginUserId': this.userInfo.USER_ID,
- 'CORPINFO_ID': this.userInfo.CORPINFO_ID,
- 'AUTOGRAPH': res.data.filePath
- })
+ 'CORPINFO_ID': this.userInfo.CORPINFO_ID
+ }
+ let rePD = {'filePath': this.form.safetyDirectorSign, name: 'FFILE', 'formData': formData}
+
+ await approveHotWorkSupervisionAndFfile({...rePD})
uni.$u.route({
type: 'navigateBack'
})
diff --git a/pages/super-hot/security-committee/detail.vue b/pages/super-hot/security-committee/detail.vue
index f14695d..ba4c1b2 100644
--- a/pages/super-hot/security-committee/detail.vue
+++ b/pages/super-hot/security-committee/detail.vue
@@ -279,7 +279,7 @@ import {
getDept,
getDeptUser,
approveHotWorkSupervision,
- fileUploads
+ setImgFilesListAdd
} from '../../../api/index'
export default {
@@ -439,11 +439,14 @@ export default {
})
}
let formData1 = {
- 'type': imgType,
- 'foreignKey': this.HOTWORKAPPLICATION_ID,
- 'corpInfoId': this.userInfo.CORPINFO_ID,
+ 'TYPE': imgType,
+ 'FOREIGN_KEY': this.HOTWORKAPPLICATION_ID,
+ 'CORPINFO_ID': this.userInfo.CORPINFO_ID,
}
- await fileUploads({files: imgFiles1, formData: formData1})
+ await setImgFilesListAdd({files: imgFiles1, formData: formData1})
+ },
+ goBack() {
+
}
},
}