From 28108b65ae7367d9acd157402bc2e3a1c6e6d57f Mon Sep 17 00:00:00 2001 From: zhaohongyu Date: Thu, 5 Dec 2024 11:34:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?20241205=20=E9=80=82=E9=85=8D=E9=9A=90?= =?UTF-8?q?=E6=82=A3=E6=9D=A5=E6=BA=90=E5=A2=9E=E5=8A=A0=E7=82=B9=E6=A3=80?= =?UTF-8?q?=E9=9A=90=E6=82=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/general-hidden-management/general-hidden/detail.vue | 1 + pages/general-hidden-management/ignore-hidden/detail.vue | 3 +++ pages/key-project-management/hidden-management/list.vue | 1 + .../larger-hidden-management/detail.vue | 3 +++ .../major-hidden-management/detail.vue | 3 +++ .../inspector-archives/acceptance.vue | 1 + 6 files changed, 12 insertions(+) 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/hidden-management/list.vue b/pages/key-project-management/hidden-management/list.vue index d6b1bbf..075c6c4 100644 --- a/pages/key-project-management/hidden-management/list.vue +++ b/pages/key-project-management/hidden-management/list.vue @@ -146,6 +146,7 @@ export default { 2: "AI报警(企业端)", 4: "安全环保检查(监管端)", 5: "安全环保检查(企业端)", + 8: "点检隐患", }, state: { 1: "未整改", diff --git a/pages/larger-major-hidden-management/larger-hidden-management/detail.vue b/pages/larger-major-hidden-management/larger-hidden-management/detail.vue index 2ed9796..57e32c0 100644 --- a/pages/larger-major-hidden-management/larger-hidden-management/detail.vue +++ b/pages/larger-major-hidden-management/larger-hidden-management/detail.vue @@ -17,6 +17,9 @@ + diff --git a/pages/larger-major-hidden-management/major-hidden-management/detail.vue b/pages/larger-major-hidden-management/major-hidden-management/detail.vue index 4a16039..370e15b 100644 --- a/pages/larger-major-hidden-management/major-hidden-management/detail.vue +++ b/pages/larger-major-hidden-management/major-hidden-management/detail.vue @@ -17,6 +17,9 @@ + diff --git a/pages/safety-environmental-inspection/inspector-archives/acceptance.vue b/pages/safety-environmental-inspection/inspector-archives/acceptance.vue index 4c98ac3..0574fd2 100644 --- a/pages/safety-environmental-inspection/inspector-archives/acceptance.vue +++ b/pages/safety-environmental-inspection/inspector-archives/acceptance.vue @@ -14,6 +14,7 @@ + From 94c4f55ecbb3b7114c543c0a3272285922bf2ae6 Mon Sep 17 00:00:00 2001 From: shanao <178391389@qq.com> Date: Wed, 8 Jan 2025 16:08:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=9B=9E=E9=80=80=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E3=80=90{=E5=8E=BB=E9=99=A4=E7=BB=9F=E4=B8=80=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E4=BF=AE=E6=94=B9}=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 1 - 1 file changed, 1 deletion(-) diff --git a/main.js b/main.js index 629e5d1..558e461 100644 --- a/main.js +++ b/main.js @@ -2,7 +2,6 @@ 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' From ec55a2b248ec0da130eadbaf6c658be2d3b37014 Mon Sep 17 00:00:00 2001 From: shanao <178391389@qq.com> Date: Wed, 8 Jan 2025 16:21:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?Revert=20"1.=E7=BC=93=E5=AD=98=E4=B8=AD?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E9=99=84=E4=BB=B6=E5=9C=B0=E5=9D=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E9=94=99=E8=AF=AF"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8a0ca55b4316d94b5017fb63109db11fec90bf69. --- App.vue | 1 - manifest.json | 25 +++++++++++++------------ pages/login/login.vue | 2 +- store/index.js | 2 +- utils/request.js | 5 +++-- utils/tools.js | 2 +- 6 files changed, 19 insertions(+), 18 deletions(-) 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/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/login/login.vue b/pages/login/login.vue index 0fbb5e7..329fa1a 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -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' diff --git a/store/index.js b/store/index.js index 6b893c0..35d8f88 100644 --- a/store/index.js +++ b/store/index.js @@ -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: { diff --git a/utils/request.js b/utils/request.js index 415a3dc..cfedc77 100644 --- a/utils/request.js +++ b/utils/request.js @@ -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) { diff --git a/utils/tools.js b/utils/tools.js index c58a95b..cbbb82b 100644 --- a/utils/tools.js +++ b/utils/tools.js @@ -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) From b226670f103939a6e4a22bf42b096a16c1fcf9ee Mon Sep 17 00:00:00 2001 From: shanao <178391389@qq.com> Date: Thu, 9 Jan 2025 14:53:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=9B=9E=E9=80=80=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E3=80=90=E5=8E=BB=E9=99=A4=E7=BB=9F=E4=B8=80=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/index.js | 18 +++---- main.js | 1 + .../AI-warning/detail.vue | 5 +- .../hidden-management/view.vue | 14 +++--- .../penalty-management/viewHidden.vue | 12 ++--- .../detail.vue | 32 +++++++------ pages/mine/promise/sign.vue | 21 +++------ .../initiate/detail.vue | 47 ++++++++----------- .../inspector-archives/acceptance.vue | 12 ++--- .../inspector-confirms/detail.vue | 18 ++----- pages/super-hot/safety-director/detail.vue | 24 ++++------ pages/super-hot/security-committee/detail.vue | 13 +++-- 12 files changed, 95 insertions(+), 122 deletions(-) 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 @@