Merge remote-tracking branch 'origin/pet' into pet
commit
f12c278111
1
App.vue
1
App.vue
|
@ -3,7 +3,6 @@ export default {
|
|||
onLaunch: function () {
|
||||
console.log('App Launch')
|
||||
this.isLogin()
|
||||
this.$store.dispatch('setfilePath', 'https://skqhdg.porthebei.com:9004/file/');
|
||||
},
|
||||
onShow: function () {
|
||||
console.log('App Show')
|
||||
|
|
18
api/index.js
18
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);
|
||||
// 结束
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"name" : "秦港双控-监管端",
|
||||
"appid" : "__UNI__DB65C6B",
|
||||
"appid" : "__UNI__2AFFD9C",
|
||||
"description" : "秦港双控-监管端",
|
||||
"versionName" : "01.00.55",
|
||||
"versionCode" : 55,
|
||||
"versionName" : "01.00.44",
|
||||
"versionCode" : 42,
|
||||
"transformPx" : false,
|
||||
/* 5+App特有相关
|
||||
android:value="uni.UN5E8A412|__UNI__DB65C6B|124611200205|common" */
|
||||
|
@ -33,20 +33,21 @@
|
|||
/* android打包配置 */
|
||||
"android" : {
|
||||
"permissions" : [
|
||||
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
|
||||
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
|
||||
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
|
||||
"<uses-feature android:name=\"android.hardware.camera\"/>",
|
||||
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
|
||||
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
|
||||
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
|
||||
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
|
||||
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
|
||||
"<uses-feature android:name=\"android.hardware.camera\"/>",
|
||||
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
|
||||
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
|
||||
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
|
||||
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
|
||||
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
|
||||
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
|
||||
],
|
||||
"minSdkVersion" : 21,
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
<template v-else-if="form.SOURCE=='4'">安全环保检查(监管端)</template>
|
||||
<template v-else-if="form.SOURCE=='5'">安全环保检查(企业端)</template>
|
||||
<template v-else-if="form.SOURCE=='6'">消防检查</template>
|
||||
<template v-else-if="form.SOURCE=='8'">点检隐患</template>
|
||||
</view>
|
||||
</u-cell>
|
||||
<u-cell>
|
||||
|
|
|
@ -26,6 +26,9 @@
|
|||
<template v-else-if="form.SOURCE=='6'">
|
||||
消防检查
|
||||
</template>
|
||||
<template v-else-if="form.SOURCE=='8'">
|
||||
点检隐患
|
||||
</template>
|
||||
</view>
|
||||
</u-cell>
|
||||
<u-cell>
|
||||
|
|
|
@ -226,14 +226,17 @@
|
|||
<script>
|
||||
import {
|
||||
getKeyProjectsListAllPersonnel,
|
||||
getHiddenLevel,
|
||||
getHiddenType,
|
||||
getKeyProjectsListAllUnits,
|
||||
getInspectionDepartment,
|
||||
getInspectionType,
|
||||
getInspectors,
|
||||
setImgFilesAdd,
|
||||
setKeyProjectsAIWarningAdd,
|
||||
setVideoAdd,
|
||||
getKeyProjectsAIWarningView
|
||||
} from "@/api";
|
||||
} from "../../../api";
|
||||
|
||||
export default {
|
||||
data() {
|
||||
|
|
|
@ -146,6 +146,7 @@ export default {
|
|||
2: "AI报警(企业端)",
|
||||
4: "安全环保检查(监管端)",
|
||||
5: "安全环保检查(企业端)",
|
||||
8: "点检隐患",
|
||||
},
|
||||
state: {
|
||||
1: "未整改",
|
||||
|
|
|
@ -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
|
||||
})
|
||||
},
|
||||
},
|
||||
|
|
|
@ -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
|
||||
})
|
||||
|
|
|
@ -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
|
||||
})
|
||||
|
|
|
@ -17,6 +17,9 @@
|
|||
<template v-else-if="form.SOURCE=='3'">
|
||||
清单排查
|
||||
</template>
|
||||
<template v-else-if="form.SOURCE=='8'">
|
||||
点检隐患
|
||||
</template>
|
||||
</view>
|
||||
</u-cell>
|
||||
<u-cell>
|
||||
|
|
|
@ -17,6 +17,9 @@
|
|||
<template v-else-if="form.SOURCE=='3'">
|
||||
清单排查
|
||||
</template>
|
||||
<template v-else-if="form.SOURCE=='8'">
|
||||
点检隐患
|
||||
</template>
|
||||
</view>
|
||||
</u-cell>
|
||||
<u-cell>
|
||||
|
|
|
@ -96,7 +96,7 @@ export default {
|
|||
const keydataVal = jsencrypt.encrypt('qdkjchina' + this.form.userName + ',qd,' + this.form.userPwd)
|
||||
let resData = await submitLogin({'KEYDATA':keydataVal});
|
||||
await this.$store.dispatch('setUserInfo', resData);
|
||||
// await this.$store.dispatch('setfilePath', '');
|
||||
await this.$store.dispatch('setfilePath', '');
|
||||
uni.$u.route({
|
||||
url: '/pages/index/index',
|
||||
type: 'reLaunch'
|
||||
|
|
|
@ -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: '添加成功',
|
||||
|
|
|
@ -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
|
||||
})
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
<template v-else-if="data.SOURCE == '3'">清单排查</template>
|
||||
<template v-else-if="data.SOURCE == '4'">安全环保检查(监管端)</template>
|
||||
<template v-else-if="data.SOURCE == '5'">安全环保检查(企业端)</template>
|
||||
<template v-else-if="data.SOURCE == '8'">点检隐患</template>
|
||||
</view>
|
||||
</u-cell>
|
||||
<u-cell>
|
||||
|
@ -450,7 +451,7 @@
|
|||
|
||||
<script>
|
||||
|
||||
import {fileUpload, getHiddenGoEdit, setFinalCheck} from "@/api";
|
||||
import {getHiddenGoEdit, setFinalCheck, setImgFilesAdd, setVideoAdd} from "../../../api";
|
||||
|
||||
export default {
|
||||
data() {
|
||||
|
@ -622,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
|
||||
})
|
||||
|
|
|
@ -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: '核查成功',
|
||||
|
|
|
@ -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'
|
||||
})
|
||||
|
|
|
@ -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() {
|
||||
|
||||
}
|
||||
},
|
||||
}
|
||||
|
|
|
@ -32,7 +32,7 @@ const store = new Vuex.Store({
|
|||
} ,
|
||||
setfilePath(state, filePath) {
|
||||
// state.filePath = 'https://skqhdg.porthebei.com:9004/file/'
|
||||
state.filePath = filePath
|
||||
state.filePath = 'https://wwag.qhdsafety.com/file/'
|
||||
}
|
||||
},
|
||||
actions: {
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
|
||||
export var requestPath = 'https://skqhdg.porthebei.com:9005/qa-regulatory-gwj/'; // 后台请求地址
|
||||
// export var requestPath = 'http://192.168.0.100:8092/';
|
||||
// export var requestPath = 'https://skqhdg.porthebei.com:9005/qa-regulatory-gwj/'; // 后台请求地址
|
||||
export var requestPath = 'http://192.168.0.100:8092/';
|
||||
|
||||
let videoApiPath = 'https://arqsp.qhdsafety.com:10010'; // 视频平台后台请求地址
|
||||
import store from '../store/index'
|
||||
function post(url, data) {
|
||||
|
|
|
@ -22,7 +22,7 @@ export function formatDate(date, fmt) {
|
|||
}
|
||||
}
|
||||
|
||||
export const filePath = 'https://skqhdg.porthebei.com:9004/file/'
|
||||
export const filePath = 'https://wwag.qhdsafety.com/file/'
|
||||
|
||||
function padLeftZero(str) {
|
||||
return ('00' + str).substr(str.length)
|
||||
|
|
Loading…
Reference in New Issue