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
+
+
+
+
+ Document
+
+
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index dc5fccd..d1cce7d 100644
--- a/pages.json
+++ b/pages.json
@@ -331,6 +331,10 @@
"path" : "pages/map/map",
"style" : {}
},
+ {
+ "path" : "pages/map/mapPro",
+ "style" : {}
+ },
{
"path": "pages/application/high-risk-work/home",
"style": {}
diff --git a/pages/application/accesscontrol/carmanage/deptapproval/detail.vue b/pages/application/accesscontrol/carmanage/deptapproval/detail.vue
index f97d80d..318b426 100644
--- a/pages/application/accesscontrol/carmanage/deptapproval/detail.vue
+++ b/pages/application/accesscontrol/carmanage/deptapproval/detail.vue
@@ -312,7 +312,7 @@ export default {
chooseLocation() {
var _this = this
uni.navigateTo({
- url: '/pages/map/map',
+ url: '/pages/map/mapPro',
events: {
// 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) {
diff --git a/pages/application/accesscontrol/carmanage/depttoexamine/detail.vue b/pages/application/accesscontrol/carmanage/depttoexamine/detail.vue
index 1e9d00a..9ed9375 100644
--- a/pages/application/accesscontrol/carmanage/depttoexamine/detail.vue
+++ b/pages/application/accesscontrol/carmanage/depttoexamine/detail.vue
@@ -315,7 +315,7 @@ export default {
chooseLocation() {
var _this = this
uni.navigateTo({
- url: '/pages/map/map',
+ url: '/pages/map/mapPro',
events: {
// 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) {
diff --git a/pages/application/accesscontrol/carmanage/sceneconfirm/detail.vue b/pages/application/accesscontrol/carmanage/sceneconfirm/detail.vue
index 9c9544e..9ce3f8e 100644
--- a/pages/application/accesscontrol/carmanage/sceneconfirm/detail.vue
+++ b/pages/application/accesscontrol/carmanage/sceneconfirm/detail.vue
@@ -315,7 +315,7 @@ export default {
chooseLocation() {
var _this = this
uni.navigateTo({
- url: '/pages/map/map',
+ url: '/pages/map/mapPro',
events: {
// 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) {
diff --git a/pages/application/accesscontrol/outsidersmanage/deptapproval/detail.vue b/pages/application/accesscontrol/outsidersmanage/deptapproval/detail.vue
index 57e64ac..e90c405 100644
--- a/pages/application/accesscontrol/outsidersmanage/deptapproval/detail.vue
+++ b/pages/application/accesscontrol/outsidersmanage/deptapproval/detail.vue
@@ -263,7 +263,7 @@ export default {
chooseLocation() {
var _this = this
uni.navigateTo({
- url: '/pages/map/map',
+ url: '/pages/map/mapPro',
events: {
// 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) {
diff --git a/pages/application/accesscontrol/outsidersmanage/depttoexamine/detail.vue b/pages/application/accesscontrol/outsidersmanage/depttoexamine/detail.vue
index 4056b8e..679de9f 100644
--- a/pages/application/accesscontrol/outsidersmanage/depttoexamine/detail.vue
+++ b/pages/application/accesscontrol/outsidersmanage/depttoexamine/detail.vue
@@ -265,7 +265,7 @@ export default {
chooseLocation() {
var _this = this
uni.navigateTo({
- url: '/pages/map/map',
+ url: '/pages/map/mapPro',
events: {
// 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) {
diff --git a/pages/application/accesscontrol/outsidersmanage/sceneconfirm/detail.vue b/pages/application/accesscontrol/outsidersmanage/sceneconfirm/detail.vue
index 41e9646..7ab27f4 100644
--- a/pages/application/accesscontrol/outsidersmanage/sceneconfirm/detail.vue
+++ b/pages/application/accesscontrol/outsidersmanage/sceneconfirm/detail.vue
@@ -290,7 +290,7 @@ export default {
chooseLocation() {
var _this = this
uni.navigateTo({
- url: '/pages/map/map',
+ url: '/pages/map/mapPro',
events: {
// 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) {
diff --git a/pages/application/eight-assignments/hotwork/apply/detail.vue b/pages/application/eight-assignments/hotwork/apply/detail.vue
index c64e747..250c1ab 100644
--- a/pages/application/eight-assignments/hotwork/apply/detail.vue
+++ b/pages/application/eight-assignments/hotwork/apply/detail.vue
@@ -1605,7 +1605,7 @@
chooseLocation() {
var _this = this
uni.navigateTo({
- url: '/pages/map/map',
+ url: '/pages/map/mapPro',
events: {
// 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) {
diff --git a/pages/application/eight-assignments/super-hotwork/detail.vue b/pages/application/eight-assignments/super-hotwork/detail.vue
index b674210..ddc6680 100644
--- a/pages/application/eight-assignments/super-hotwork/detail.vue
+++ b/pages/application/eight-assignments/super-hotwork/detail.vue
@@ -1161,7 +1161,7 @@
chooseLocation() {
var _this = this
uni.navigateTo({
- url: '/pages/map/map',
+ url: '/pages/map/mapPro',
events: {
// 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) {
diff --git a/pages/application/fire-management/hidden-trouble-app/exclude-form.vue b/pages/application/fire-management/hidden-trouble-app/exclude-form.vue
index 9514d50..2c6c8a3 100644
--- a/pages/application/fire-management/hidden-trouble-app/exclude-form.vue
+++ b/pages/application/fire-management/hidden-trouble-app/exclude-form.vue
@@ -1426,7 +1426,7 @@ export default {
showMapModal() {
var _this = this
uni.navigateTo({
- url: '/pages/map/map',
+ url: '/pages/map/mapPro',
events: {
// 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function(e) {
diff --git a/pages/application/fire-management/hidden-trouble-app/other-hidden-add.vue b/pages/application/fire-management/hidden-trouble-app/other-hidden-add.vue
index b14b125..4d8bddf 100644
--- a/pages/application/fire-management/hidden-trouble-app/other-hidden-add.vue
+++ b/pages/application/fire-management/hidden-trouble-app/other-hidden-add.vue
@@ -1286,7 +1286,7 @@
showMapModal() {
var _this = this
uni.navigateTo({
- url: '/pages/map/map',
+ url: '/pages/map/mapPro',
events: {
// 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) {
diff --git a/pages/application/hidden-danger-management/hidden-danger-add/hidden-danger-add.vue b/pages/application/hidden-danger-management/hidden-danger-add/hidden-danger-add.vue
index f1ab6c9..0cf6314 100644
--- a/pages/application/hidden-danger-management/hidden-danger-add/hidden-danger-add.vue
+++ b/pages/application/hidden-danger-management/hidden-danger-add/hidden-danger-add.vue
@@ -1220,7 +1220,7 @@
showMapModal() {
var _this = this
uni.navigateTo({
- url: '/pages/map/map',
+ url: '/pages/map/mapPro',
events: {
// 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) {
diff --git a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-edit.vue b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-edit.vue
index b65ce08..8de43ae 100644
--- a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-edit.vue
+++ b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-edit.vue
@@ -1212,7 +1212,7 @@
showMapModal() {
var _this = this
uni.navigateTo({
- url: '/pages/map/map',
+ url: '/pages/map/mapPro',
events: {
// 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) {
diff --git a/pages/application/hidden-trouble-investigation/hidden-trouble-app/exclude-form.vue b/pages/application/hidden-trouble-investigation/hidden-trouble-app/exclude-form.vue
index cba3ba8..f97ce06 100644
--- a/pages/application/hidden-trouble-investigation/hidden-trouble-app/exclude-form.vue
+++ b/pages/application/hidden-trouble-investigation/hidden-trouble-app/exclude-form.vue
@@ -1305,7 +1305,7 @@
showMapModal() {
var _this = this
uni.navigateTo({
- url: '/pages/map/map',
+ url: '/pages/map/mapPro',
events: {
// 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) {
diff --git a/pages/application/hidden-trouble-investigation/hidden-trouble-app/other-hidden-add.vue b/pages/application/hidden-trouble-investigation/hidden-trouble-app/other-hidden-add.vue
index 3c5c960..6310220 100644
--- a/pages/application/hidden-trouble-investigation/hidden-trouble-app/other-hidden-add.vue
+++ b/pages/application/hidden-trouble-investigation/hidden-trouble-app/other-hidden-add.vue
@@ -1190,7 +1190,7 @@
showMapModal() {
var _this = this
uni.navigateTo({
- url: '/pages/map/map',
+ url: '/pages/map/mapPro',
events: {
// 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) {
diff --git a/pages/application/high-risk-work/blind-work/apply/detail.vue b/pages/application/high-risk-work/blind-work/apply/detail.vue
index a070c69..e6d8bee 100644
--- a/pages/application/high-risk-work/blind-work/apply/detail.vue
+++ b/pages/application/high-risk-work/blind-work/apply/detail.vue
@@ -530,7 +530,7 @@ export default {
chooseLocation() {
var _this = this
uni.navigateTo({
- url: '/pages/map/map',
+ url: '/pages/map/mapPro',
events: {
// 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) {
diff --git a/pages/application/high-risk-work/electricity/apply/detail.vue b/pages/application/high-risk-work/electricity/apply/detail.vue
index 56e0af5..aab4e49 100644
--- a/pages/application/high-risk-work/electricity/apply/detail.vue
+++ b/pages/application/high-risk-work/electricity/apply/detail.vue
@@ -897,17 +897,12 @@
showMapModal() {
var _this = this
uni.navigateTo({
- url: '/pages/map/map',
+ url: '/pages/map/mapPro',
events: {
// 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) {
- // console.log(e.data)
- // console.info(e.data.longitue)
_this.$set( _this.pd, 'WORK_LONGITUDE', e.data.longitue )
_this.$set( _this.pd, 'WORK_LATITUDE', e.data.latitude )
- // _this.pd.WORK_LONGITUDE = e.data.longitue;
- // _this.pd.WORK_LATITUDE = e.data.latitude;
- // console.info(_this.pd)
}
},
})
diff --git a/pages/application/high-risk-work/high-work/high-work-apply/high-work-apply-detail.vue b/pages/application/high-risk-work/high-work/high-work-apply/high-work-apply-detail.vue
index efdca6d..49e8b44 100644
--- a/pages/application/high-risk-work/high-work/high-work-apply/high-work-apply-detail.vue
+++ b/pages/application/high-risk-work/high-work/high-work-apply/high-work-apply-detail.vue
@@ -994,15 +994,12 @@
showMapModal() {
var _this = this
uni.navigateTo({
- url: '/pages/map/map',
+ url: '/pages/map/mapPro',
events: {
// 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) {
- // console.log(e.data)
- // console.info(e.data.longitue)
_this.pd.WORK_LONGITUDE = e.data.longitue;
_this.pd.WORK_LATITUDE = e.data.latitude;
- // console.info(_this.pd)
}
},
})
diff --git a/pages/application/high-risk-work/lifting-safety-work/apply/detail.vue b/pages/application/high-risk-work/lifting-safety-work/apply/detail.vue
index c80eac2..e2a7ee6 100644
--- a/pages/application/high-risk-work/lifting-safety-work/apply/detail.vue
+++ b/pages/application/high-risk-work/lifting-safety-work/apply/detail.vue
@@ -716,7 +716,7 @@ export default {
chooseLocation() {
var _this = this
uni.navigateTo({
- url: '/pages/map/map',
+ url: '/pages/map/mapPro',
events: {
// 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) {
diff --git a/pages/application/high-risk-work/limited-space/apply/detail.vue b/pages/application/high-risk-work/limited-space/apply/detail.vue
index 0155a0c..ff45f56 100644
--- a/pages/application/high-risk-work/limited-space/apply/detail.vue
+++ b/pages/application/high-risk-work/limited-space/apply/detail.vue
@@ -742,7 +742,7 @@ export default {
showMapModal() {
var _this = this
uni.navigateTo({
- url: '/pages/map/map',
+ url: '/pages/map/mapPro',
events: {
// 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) {
diff --git a/pages/application/key-project-management/AI-warning/detail.vue b/pages/application/key-project-management/AI-warning/detail.vue
index 02c58c0..4a067c1 100644
--- a/pages/application/key-project-management/AI-warning/detail.vue
+++ b/pages/application/key-project-management/AI-warning/detail.vue
@@ -1158,7 +1158,7 @@
showMapModal() {
var _this = this
uni.navigateTo({
- url: '/pages/map/map',
+ url: '/pages/map/mapPro',
events: {
// 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function(e) {
diff --git a/pages/application/key-project-management/hidden-management/detail.vue b/pages/application/key-project-management/hidden-management/detail.vue
index 0e3486c..7c7941d 100644
--- a/pages/application/key-project-management/hidden-management/detail.vue
+++ b/pages/application/key-project-management/hidden-management/detail.vue
@@ -7,176 +7,176 @@
-
-
- 隐患照片
-
-
-
-
-
-
-
-
-
-
-
- 隐患视频
-
-
-
-
-
-
-
-
-
-
- 隐患描述
-
-
-
- 隐患部位
-
- {{ hiddenForm.HIDDENPART }}
-
-
-
- 隐患级别
-
- {{ hiddenForm.HIDDENLEVEL_NAME }}
-
-
-
- 隐患类型
-
- {{ hiddenForm.HIDDENTYPE_NAME }}
-
-
-
- 隐患处置:
- 限期整改
-
-
- 整改期限:
- {{ hiddenForm.RECTIFICATIONDEADLINE }}
-
-
-
- 整改部门:
-
-
- {{ hiddenForm.RECTIFICATIONDEPT_NAME }}
-
-
-
- 整改人:
- {{ hiddenForm.RECTIFICATIONOR_NAME }}
-
-
- 整改时间:
- {{ hiddenForm.RECTIFICATIONTIME }}
-
-
-
- 整改照片
-
-
-
-
-
-
-
-
-
-
- 验收时间:
-
- {{hiddenForm.CHECKTIME}}
-
-
-
- 验收照片
-
-
- {{hiddenForm.ysImgs.length}}/4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 处罚信息
-
-
-
- 处罚原因:
- {{ punishForm.REASON }}
-
-
- 处罚金额:
- {{ punishForm.AMOUT }}元
-
-
- 被处罚单位:
- {{ punishForm.UNITS_NAME }}
-
-
- 被处罚人:
- {{ punishForm.PERSON_NAME }}
-
-
- 下发人:
- {{ punishForm.CREATOR_NAME }}
-
-
- 下发处罚时间:
- {{ punishForm.DATE }}
-
-
-
- 罚款缴纳单
-
-
-
-
-
-
-
-
-
-
- 是否缴纳罚款:
- {{punishForm.HANDLED === '1' ? '已缴' : '未缴' }}
-
-
- 处罚处理人:
- {{punishForm.PERSON_NAME}}
-
-
- 处罚处理时间:
- {{punishForm.HANLDE_TIME}}
-
-
+
+
+ 隐患照片
+
+
+
+
+
+
+
+
+
+
+
+ 隐患视频
+
+
+
+
+
+
+
+
+
+
+ 隐患描述
+
+
+
+ 隐患部位
+
+ {{ hiddenForm.HIDDENPART }}
+
+
+
+ 隐患级别
+
+ {{ hiddenForm.HIDDENLEVEL_NAME }}
+
+
+
+ 隐患类型
+
+ {{ hiddenForm.HIDDENTYPE_NAME }}
+
+
+
+ 隐患处置:
+ 限期整改
+
+
+ 整改期限:
+ {{ hiddenForm.RECTIFICATIONDEADLINE }}
+
+
+
+ 整改部门:
+
+
+ {{ hiddenForm.RECTIFICATIONDEPT_NAME }}
+
+
+
+ 整改人:
+ {{ hiddenForm.RECTIFICATIONOR_NAME }}
+
+
+ 整改时间:
+ {{ hiddenForm.RECTIFICATIONTIME }}
+
+
+
+ 整改照片
+
+
+
+
+
+
+
+
+
+
+ 验收时间:
+
+ {{hiddenForm.CHECKTIME}}
+
+
+
+ 验收照片
+
+
+ {{hiddenForm.ysImgs.length}}/4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 处罚信息
+
+
+
+ 处罚原因:
+ {{ punishForm.REASON }}
+
+
+ 处罚金额:
+ {{ punishForm.AMOUT }}元
+
+
+ 被处罚单位:
+ {{ punishForm.UNITS_NAME }}
+
+
+ 被处罚人:
+ {{ punishForm.PERSON_NAME }}
+
+
+ 下发人:
+ {{ punishForm.CREATOR_NAME }}
+
+
+ 下发处罚时间:
+ {{ punishForm.DATE }}
+
+
+
+ 罚款缴纳单
+
+
+
+
+
+
+
+
+
+
+ 是否缴纳罚款:
+ {{punishForm.HANDLED === '1' ? '已缴' : '未缴' }}
+
+
+ 处罚处理人:
+ {{punishForm.PERSON_NAME}}
+
+
+ 处罚处理时间:
+ {{punishForm.HANLDE_TIME}}
+
+
@@ -223,7 +223,7 @@ export default {
ysImgs:[],
CHECKTIME :formatDate(new Date(), 'yyyy-MM-dd hh:mm')
},
- punishForm:{},
+ punishForm:{},
videoSrc:'',
modalShow:false,
todayDate:formatDate(new Date(), 'yyyy-MM-dd hh:mm'),
@@ -256,15 +256,22 @@ export default {
uni.hideLoading();//结束加载中动画
if (res.data != null) {
this.hiddenForm = res.data.pd
- if(res.data.pd.punishForm){
- this.punishForm = res.data.pd.punishForm
- }else{
- this.punishForm = null;
- }
+ if(res.data.pd.punishForm){
+ this.punishForm = res.data.pd.punishForm
+ }else{
+ this.punishForm = null;
+ }
}
}
})
},
+ viewImagePunish(e) {
+ let files = [];
+ files.push(this.baseImgPath + this.punishForm.HANDLE_IMG)
+ uni.previewImage({
+ urls: files
+ });
+ },
ViewImage(e) {
let files = [];
for (var i = 0; i < this.hiddenForm.hiddenImgs.length; i++) {
@@ -294,18 +301,18 @@ export default {
this.$forceUpdate();//强制刷新
},
ViewImage2(e) {
- let files =[];
- for(var i=0;i
.dy-title-flex{
- font-weight: bold;
- font-size: 35upx;
+ font-weight: bold;
+ font-size: 35upx;
}
diff --git a/pages/application/key-project-management/safety-environmental-inspection/detail.vue b/pages/application/key-project-management/safety-environmental-inspection/detail.vue
index e59584d..62b6e19 100644
--- a/pages/application/key-project-management/safety-environmental-inspection/detail.vue
+++ b/pages/application/key-project-management/safety-environmental-inspection/detail.vue
@@ -1409,7 +1409,7 @@
showMapModal() {
var _this = this
uni.navigateTo({
- url: '/pages/map/map',
+ url: '/pages/map/mapPro',
events: {
// 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function(e) {
diff --git a/pages/application/safety-environmental-inspection/apply/detail.vue b/pages/application/safety-environmental-inspection/apply/detail.vue
index 6a0757a..fc3b78d 100644
--- a/pages/application/safety-environmental-inspection/apply/detail.vue
+++ b/pages/application/safety-environmental-inspection/apply/detail.vue
@@ -1240,7 +1240,7 @@ export default {
showMapModal() {
var _this = this
uni.navigateTo({
- url: '/pages/map/map',
+ url: '/pages/map/mapPro',
events: {
// 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) {
diff --git a/pages/basics/risk-distribution/risk-distribution-detail.vue b/pages/basics/risk-distribution/risk-distribution-detail.vue
index 4b5242f..522c53e 100644
--- a/pages/basics/risk-distribution/risk-distribution-detail.vue
+++ b/pages/basics/risk-distribution/risk-distribution-detail.vue
@@ -212,7 +212,7 @@
showMapModal() {
var _this = this
uni.navigateTo({
- url: '/pages/map/map',
+ url: '/pages/map/mapPro',
events: {
// 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) {