diff --git a/App.vue b/App.vue index 0d82820..1d4b2e1 100644 --- a/App.vue +++ b/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') 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/manifest.json b/manifest.json index c76dda1..2e526d6 100644 --- a/manifest.json +++ b/manifest.json @@ -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" : [ - "", - "", - "", - "", - "", + "", "", "", + "", "", - "", - "", + "", "", - "", "", - "", + "", + "", + "", + "", + "", + "", + "", "" ], "minSdkVersion" : 21, diff --git a/pages/general-hidden-management/general-hidden/detail.vue b/pages/general-hidden-management/general-hidden/detail.vue index 1ae00a0..c5f68a6 100644 --- a/pages/general-hidden-management/general-hidden/detail.vue +++ b/pages/general-hidden-management/general-hidden/detail.vue @@ -14,6 +14,7 @@ + diff --git a/pages/general-hidden-management/ignore-hidden/detail.vue b/pages/general-hidden-management/ignore-hidden/detail.vue index b594c41..ddf1b61 100644 --- a/pages/general-hidden-management/ignore-hidden/detail.vue +++ b/pages/general-hidden-management/ignore-hidden/detail.vue @@ -26,6 +26,9 @@ + 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 @@