From 421ef2bc5e6db35370df616562b2eb5b5cfeb42f Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Mon, 18 Dec 2023 17:15:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E6=92=AD?= =?UTF-8?q?=E6=94=BE=E8=A7=86=E9=A2=91=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/index.js | 9 +- pages.json | 24 ++++ .../hidden-management/list.vue | 4 +- pages/key-project-management/index/index.vue | 14 +- .../key-project-out/list.vue | 1 + .../penalty-management/list.vue | 4 +- .../positioning_management/index.vue | 132 ++++++++++++++++++ .../keyProjectApply.vue | 117 ++++++++++++++++ .../positioning_management/list.vue | 122 ++++++++++++++++ .../positioning_management/videoView.vue | 90 ++++++++++++ utils/request.js | 45 +++++- 11 files changed, 548 insertions(+), 14 deletions(-) create mode 100644 pages/key-project-management/positioning_management/index.vue create mode 100644 pages/key-project-management/positioning_management/keyProjectApply.vue create mode 100644 pages/key-project-management/positioning_management/list.vue create mode 100644 pages/key-project-management/positioning_management/videoView.vue diff --git a/api/index.js b/api/index.js index 15043e9..bf359bc 100644 --- a/api/index.js +++ b/api/index.js @@ -1,4 +1,4 @@ -import {post, upload, uploads} 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)//获取动火列表 @@ -107,4 +107,9 @@ export const getReceivePromiseList = (params) => post("/app/corppromise/receiveP export const getPromiseView = (params) => post("/app/corppromise/goEdit", params); // 查看承诺书 export const setPromiseIsRead = (params) => post("/app/corppromise/editIsRead", params); // 承诺书设置阅读状态 export const editHiddenIspunish = (params) => post("/app/keyprojectcheck/editHiddenIspunish", params); // 修改隐患信息 -export const getPERSONNELMANAGEMENTID = (params) => post("/app/keyProjects/goEdit", params); // 重点工程默认回显负责人 \ No newline at end of file +export const getPERSONNELMANAGEMENTID = (params) => post("/app/keyProjects/goEdit", params); // 重点工程默认回显负责人 +export const getKeyProjectsView = (params) => post("/app/keyProjects/getOutsourced", params); // 获取重点工程详详细信息 +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); // 获取视频监控平台播放地址 \ No newline at end of file diff --git a/pages.json b/pages.json index 250c628..f305616 100644 --- a/pages.json +++ b/pages.json @@ -602,6 +602,30 @@ "navigationBarTitleText": "处罚管理隐患详情" } }, + { + "path": "pages/key-project-management/positioning_management/index", + "style": { + "navigationBarTitleText": "重点工程管理" + } + }, + { + "path": "pages/key-project-management/positioning_management/keyProjectApply", + "style": { + "navigationBarTitleText": "重点工程信息" + } + }, + { + "path": "pages/key-project-management/positioning_management/list", + "style": { + "navigationBarTitleText": "视频列表" + } + }, + { + "path": "pages/key-project-management/positioning_management/videoView", + "style": { + "navigationBarTitleText": "播放视频" + } + }, { "path": "pages/mine/promise/sign", "style": { diff --git a/pages/key-project-management/hidden-management/list.vue b/pages/key-project-management/hidden-management/list.vue index de59467..84de198 100644 --- a/pages/key-project-management/hidden-management/list.vue +++ b/pages/key-project-management/hidden-management/list.vue @@ -166,8 +166,8 @@ export default { onShow() { this.resetList() }, - onLoad() { - this.CORPINFO_ID = this.$route.query.CORPINFO_ID + onLoad(e) { + this.CORPINFO_ID = e.CORPINFO_ID }, computed: { userInfo() { diff --git a/pages/key-project-management/index/index.vue b/pages/key-project-management/index/index.vue index ab6e43f..f3e9afc 100644 --- a/pages/key-project-management/index/index.vue +++ b/pages/key-project-management/index/index.vue @@ -24,12 +24,17 @@ baseList: [] } }, - onLoad() { - this.CORPINFO_ID = this.$route.query.CORPINFO_ID + onLoad(e) { + this.CORPINFO_ID = e.CORPINFO_ID + console.log(this.CORPINFO_ID); }, onShow(event) { this.baseList = [{ + title: '重点工程管理', + url: '/pages/key-project-management/positioning_management/index'+ '?CORPINFO_ID='+this.CORPINFO_ID, + }, + { title: '安全环保检查管理', url: '/pages/key-project-management/safety-environmental-inspection/list'+ '?CORPINFO_ID='+this.CORPINFO_ID, }, @@ -66,8 +71,9 @@ loginUserId: this.userInfo.USER_ID, CORPINFO_ID: this.CORPINFO_ID }) - this.$set(this.baseList[1], 'NUM', resData.pd.HIDDEN_COUNT) - this.$set(this.baseList[2], 'NUM', resData.pd.CF_COUNT) + this.$set(this.baseList[0], 'NUM', resData.pd.GC_COUNT) + this.$set(this.baseList[2], 'NUM', resData.pd.HIDDEN_COUNT) + this.$set(this.baseList[3], 'NUM', resData.pd.CF_COUNT) } }, } diff --git a/pages/key-project-management/key-project-out/list.vue b/pages/key-project-management/key-project-out/list.vue index d676d63..c3d0729 100644 --- a/pages/key-project-management/key-project-out/list.vue +++ b/pages/key-project-management/key-project-out/list.vue @@ -90,6 +90,7 @@ export default { this.getData() }, fnNavigatorDetail(CORPINFO_ID){ + console.log(CORPINFO_ID) // 重点工程 // 安全环保检查管理 uni.$u.route({ diff --git a/pages/key-project-management/penalty-management/list.vue b/pages/key-project-management/penalty-management/list.vue index 77e0bcd..0a42e48 100644 --- a/pages/key-project-management/penalty-management/list.vue +++ b/pages/key-project-management/penalty-management/list.vue @@ -129,8 +129,8 @@ export default { onShow() { this.resetList() }, - onLoad() { - this.CORPINFO_ID = this.$route.query.CORPINFO_ID + onLoad(e) { + this.CORPINFO_ID = e.CORPINFO_ID }, computed: { userInfo() { diff --git a/pages/key-project-management/positioning_management/index.vue b/pages/key-project-management/positioning_management/index.vue new file mode 100644 index 0000000..7fbf261 --- /dev/null +++ b/pages/key-project-management/positioning_management/index.vue @@ -0,0 +1,132 @@ + + + + + diff --git a/pages/key-project-management/positioning_management/keyProjectApply.vue b/pages/key-project-management/positioning_management/keyProjectApply.vue new file mode 100644 index 0000000..e07f342 --- /dev/null +++ b/pages/key-project-management/positioning_management/keyProjectApply.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/pages/key-project-management/positioning_management/list.vue b/pages/key-project-management/positioning_management/list.vue new file mode 100644 index 0000000..e429d17 --- /dev/null +++ b/pages/key-project-management/positioning_management/list.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/pages/key-project-management/positioning_management/videoView.vue b/pages/key-project-management/positioning_management/videoView.vue new file mode 100644 index 0000000..d6d65df --- /dev/null +++ b/pages/key-project-management/positioning_management/videoView.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/utils/request.js b/utils/request.js index cfb1482..6965ede 100644 --- a/utils/request.js +++ b/utils/request.js @@ -1,6 +1,7 @@ -// let requestPath = 'http://192.168.0.45:8092/'; -// let requestPath = 'http://192.168.0.31:8992/qa-regulatory-gwj/'; // 后台请求地址https://skqhdg.porthebei.com:9004/qa-prevention-gwj/ -export var requestPath = 'https://skqhdg.porthebei.com:9005/qa-regulatory-gwj/'; // 后台请求地址 +// let requestPath = 'http://192.168.0.47:8092/'; +let requestPath = 'http://192.168.151.34:8092/'; // 后台请求地址https://skqhdg.porthebei.com:9004/qa-prevention-gwj/ +// export var requestPath = 'https://skqhdg.porthebei.com:9005/qa-regulatory-gwj/'; // 后台请求地址 +let videoApiPath = 'https://arqsp.qhdsafety.com:10010'; // 视频平台后台请求地址 function post(url, data) { return new Promise((resolve, reject) => { if (data && data.loading !== false) { @@ -132,4 +133,40 @@ function uploads(url, data) { function setBasePath(url, data) { requestPath = url } -export {post, upload, uploads,setBasePath} + +function videoApiGet(url, data) { + return new Promise((resolve, reject) => { + if (data && data.loading !== false) { + uni.showLoading({ + title: '加载中' + }); + } + uni.request({ + url: videoApiPath + url + (data.token?`?token=${data.token}`:''), + data: { + ...data + }, + method: 'GET', + header: { + 'Content-type': 'application/json' + }, + success: (res) => { + uni.hideLoading(); + resolve(res.data) + }, + fail: (err) => { + if (data && data.loading !== false) { + uni.hideLoading(); + } + uni.showToast({ + title: '网络错误请重试', + icon: 'none', + duration: 2000 + }); + reject(err) + } + }); + }) +} + +export {post, upload, uploads,setBasePath,videoApiGet}