diff --git a/api/index.js b/api/index.js index 15043e9..eb37a8a 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,10 @@ 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 setKeyProjectsState = (params) => post("/app/keyProjects/updateState", 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/hybrid/html/js/uni.webview.1.5.4.js b/hybrid/html/js/uni.webview.1.5.4.js new file mode 100644 index 0000000..271a163 --- /dev/null +++ b/hybrid/html/js/uni.webview.1.5.4.js @@ -0,0 +1 @@ +!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e=e||self).uni=n()}(this,(function(){"use strict";try{var e={};Object.defineProperty(e,"passive",{get:function(){!0}}),window.addEventListener("test-passive",null,e)}catch(e){}var n=Object.prototype.hasOwnProperty;function i(e,i){return n.call(e,i)}var t=[];function r(){return window.__dcloud_weex_postMessage||window.__dcloud_weex_}var o=function(e,n){var i={options:{timestamp:+new Date},name:e,arg:n};if(r()){if("postMessage"===e){var o={data:[n]};return window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessage(o):window.__dcloud_weex_.postMessage(JSON.stringify(o))}var a={type:"WEB_INVOKE_APPSERVICE",args:{data:i,webviewIds:t}};window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessageToService(a):window.__dcloud_weex_.postMessageToService(JSON.stringify(a))}if(!window.plus)return window.parent.postMessage({type:"WEB_INVOKE_APPSERVICE",data:i,pageId:""},"*");if(0===t.length){var d=plus.webview.currentWebview();if(!d)throw new Error("plus.webview.currentWebview() is undefined");var s=d.parent(),w="";w=s?s.id:d.id,t.push(w)}if(plus.webview.getWebviewById("__uniapp__service"))plus.webview.postMessageToUniNView({type:"WEB_INVOKE_APPSERVICE",args:{data:i,webviewIds:t}},"__uniapp__service");else{var u=JSON.stringify(i);plus.webview.getLaunchWebview().evalJS('UniPlusBridge.subscribeHandler("'.concat("WEB_INVOKE_APPSERVICE",'",').concat(u,",").concat(JSON.stringify(t),");"))}},a={navigateTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;o("navigateTo",{url:encodeURI(n)})},navigateBack:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.delta;o("navigateBack",{delta:parseInt(n)||1})},switchTab:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;o("switchTab",{url:encodeURI(n)})},reLaunch:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;o("reLaunch",{url:encodeURI(n)})},redirectTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;o("redirectTo",{url:encodeURI(n)})},getEnv:function(e){r()?e({nvue:!0}):window.plus?e({plus:!0}):e({h5:!0})},postMessage:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};o("postMessage",e.data||{})}},d=/uni-app/i.test(navigator.userAgent),s=/Html5Plus/i.test(navigator.userAgent),w=/complete|loaded|interactive/;var u=window.my&&navigator.userAgent.indexOf(["t","n","e","i","l","C","y","a","p","i","l","A"].reverse().join(""))>-1;var g=window.swan&&window.swan.webView&&/swan/i.test(navigator.userAgent);var v=window.qq&&window.qq.miniProgram&&/QQ/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var c=window.tt&&window.tt.miniProgram&&/toutiaomicroapp/i.test(navigator.userAgent);var m=window.wx&&window.wx.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var p=window.qa&&/quickapp/i.test(navigator.userAgent);var f=window.ks&&window.ks.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var l=window.tt&&window.tt.miniProgram&&/Lark|Feishu/i.test(navigator.userAgent);var _=window.jd&&window.jd.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var E=window.xhs&&window.xhs.miniProgram&&/xhsminiapp/i.test(navigator.userAgent);for(var h,P=function(){window.UniAppJSBridge=!0,document.dispatchEvent(new CustomEvent("UniAppJSBridgeReady",{bubbles:!0,cancelable:!0}))},b=[function(e){if(d||s)return window.__dcloud_weex_postMessage||window.__dcloud_weex_?document.addEventListener("DOMContentLoaded",e):window.plus&&w.test(document.readyState)?setTimeout(e,0):document.addEventListener("plusready",e),a},function(e){if(m)return window.WeixinJSBridge&&window.WeixinJSBridge.invoke?setTimeout(e,0):document.addEventListener("WeixinJSBridgeReady",e),window.wx.miniProgram},function(e){if(v)return window.QQJSBridge&&window.QQJSBridge.invoke?setTimeout(e,0):document.addEventListener("QQJSBridgeReady",e),window.qq.miniProgram},function(e){if(u){document.addEventListener("DOMContentLoaded",e);var n=window.my;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){if(g)return document.addEventListener("DOMContentLoaded",e),window.swan.webView},function(e){if(c)return document.addEventListener("DOMContentLoaded",e),window.tt.miniProgram},function(e){if(p){window.QaJSBridge&&window.QaJSBridge.invoke?setTimeout(e,0):document.addEventListener("QaJSBridgeReady",e);var n=window.qa;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){if(f)return window.WeixinJSBridge&&window.WeixinJSBridge.invoke?setTimeout(e,0):document.addEventListener("WeixinJSBridgeReady",e),window.ks.miniProgram},function(e){if(l)return document.addEventListener("DOMContentLoaded",e),window.tt.miniProgram},function(e){if(_)return window.JDJSBridgeReady&&window.JDJSBridgeReady.invoke?setTimeout(e,0):document.addEventListener("JDJSBridgeReady",e),window.jd.miniProgram},function(e){if(E)return window.xhs.miniProgram},function(e){return document.addEventListener("DOMContentLoaded",e),a}],y=0;y + + + + + 地图 + + + + +
+ + + + diff --git a/pages.json b/pages.json index 250c628..5346b89 100644 --- a/pages.json +++ b/pages.json @@ -469,6 +469,12 @@ "navigationBarTitleText": "地图" } }, + { + "path" : "pages/map/mapPro", + "style" : { + "navigationBarTitleText": "地图" + } + }, { "path": "pages/information/index/index", "style": { @@ -602,6 +608,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..f36f529 100644 --- a/pages/key-project-management/key-project-out/list.vue +++ b/pages/key-project-management/key-project-out/list.vue @@ -16,7 +16,7 @@ {{ item.CORP_NAME }} - + 属地:{{item.prvinceName}}-{{item.cityName}}-{{item.countryName}} @@ -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..ecaa265 --- /dev/null +++ b/pages/key-project-management/positioning_management/keyProjectApply.vue @@ -0,0 +1,145 @@ + + + + + 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/pages/key-project-management/safety-environmental-inspection/list.vue b/pages/key-project-management/safety-environmental-inspection/list.vue index fcccb90..4687c7f 100644 --- a/pages/key-project-management/safety-environmental-inspection/list.vue +++ b/pages/key-project-management/safety-environmental-inspection/list.vue @@ -66,8 +66,8 @@ export default { list: [], } }, - onLoad() { - this.CORPINFO_ID = this.$route.query.CORPINFO_ID + onLoad(e) { + this.CORPINFO_ID = e.CORPINFO_ID }, onShow() { this.resetList() @@ -84,8 +84,7 @@ export default { showCount: this.pageSize, currentPage: this.currentPage, CORPINFO_ID: this.CORPINFO_ID, - UserId: this.userInfo.USER_ID, - STATE:'1' + UserId: this.userInfo.USER_ID }); this.list = [...this.list,...resData.varList]; this.totalPage = resData.page.totalPage; diff --git a/pages/map/mapPro.vue b/pages/map/mapPro.vue new file mode 100644 index 0000000..af4de65 --- /dev/null +++ b/pages/map/mapPro.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/pages/safety-environmental-inspection/initiate/detail.vue b/pages/safety-environmental-inspection/initiate/detail.vue index 5be1a19..953debe 100644 --- a/pages/safety-environmental-inspection/initiate/detail.vue +++ b/pages/safety-environmental-inspection/initiate/detail.vue @@ -903,7 +903,7 @@ export default { showMapModal() { let _this = this uni.navigateTo({ - url: '/pages/map/map', + url: '/pages/map/mapPro', events: { acceptDataFromOpenedPage: function (e) { _this.hiddenForm.LONGITUDE = e.data.longitue; 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}