diff --git a/components/custom/check-action.vue b/components/custom/check-action.vue index 6cf7e9c..6083e43 100644 --- a/components/custom/check-action.vue +++ b/components/custom/check-action.vue @@ -59,10 +59,19 @@ // beforeCreate() KO // beforeMount() mounted() OK created() { - //wyw 没有驳回接口 - // this.isBtnRefuseDisable = (this.__page__.options.refuseApi == null || this.__page__.options.refuseApi == - // undefined || this.__page__.options.refuseApi == 'undefined') ? true : false - this.localIsBtnRefuseDisable = (this.$route.query.refuseApi == null || this.$route.query.refuseApi == undefined || this.$route.query.refuseApi == 'undefined') ? true : false + if (this.refuseApi) { + this.localIsBtnRefuseDisable = false + } else { + const pages = getCurrentPages() + const currentPage = pages[pages.length - 1] + const query = currentPage.options || {} + this.localIsBtnRefuseDisable = !(query.refuseApi && query.refuseApi !== 'undefined') + } + }, + mounted() { + if (this.$route && this.$route.query) { + this.localIsBtnRefuseDisable = !(this.$route.query.refuseApi && this.$route.query.refuseApi !== 'undefined') + } }, watch: { isBtnRefuseDisable(newValue) { diff --git a/manifest.json b/manifest.json index 56d1d11..3c24098 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "矿山安全生产标准化系统", - "appid" : "__UNI__BBB1077", + "appid" : "__UNI__DE7034E", //BBB1077 "description" : "厦钨矿山安全app", "versionName" : "1.0.001", "versionCode" : 10001, @@ -118,7 +118,7 @@ "description" : "该插件封装了保利威底层播放器，是云直播和云点播插件必须的附属插件", "platforms" : "Android,iOS", "url" : "https://ext.dcloud.net.cn/plugin?id=4798", - "android_package_name" : "uni.UNI03C19A0", + "android_package_name" : "uni.UNIDE7034E", "ios_bundle_id" : "", "isCloud" : true, "bought" : 1, @@ -132,7 +132,7 @@ "description" : "polyv保利威视频云点播软件组件，支持聊天弹幕、视频加密、多码率、去广告等，还支持视频多维数据统计，适用于教学录播、产品介绍片、视频门户等", "platforms" : "Android,iOS", "url" : "https://ext.dcloud.net.cn/plugin?id=2802", - "android_package_name" : "uni.UNI03C19A0", + "android_package_name" : "uni.UNIDE7034E", "ios_bundle_id" : "", "isCloud" : true, "bought" : 1, diff --git a/package-lock.json b/package-lock.json index 8bac0a9..4bda95d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "mes-app", + "name": "mh-safe-app", "version": "1.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "mes-app", + "name": "mh-safe-app", "version": "1.0.0", "license": "ISC", "dependencies": { diff --git a/pages/apply/subPages/FO2/jobActivityFinish.vue b/pages/apply/subPages/FO2/jobActivityFinish.vue index 1ed9fa1..02b4219 100644 --- a/pages/apply/subPages/FO2/jobActivityFinish.vue +++ b/pages/apply/subPages/FO2/jobActivityFinish.vue @@ -558,7 +558,7 @@ if (details.Nav_Files && details.Nav_Files.length > 0) { for (let j = 0; j < details.Nav_Files.length; j++) { strconfirmFiles.push({ - url: config.uni_app_web_local_api_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, + url: config.uni_app_web_source_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, name:details.Nav_Files[j].Nav_ImgFile.FILE_NAME }) details.confirmFiles = strconfirmFiles @@ -583,7 +583,7 @@ if (details.Nav_Files && details.Nav_Files.length > 0) { for (let j = 0; j < details.Nav_Files.length; j++) { strconfirmFiles.push({ - url: config.uni_app_web_local_api_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, + url: config.uni_app_web_source_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, name:details.Nav_Files[j].Nav_ImgFile.FILE_NAME }) details.flowFiles = strconfirmFiles @@ -608,7 +608,7 @@ if (details.Nav_Files && details.Nav_Files.length > 0) { for (let j = 0; j < details.Nav_Files.length; j++) { strconfirmFiles.push({ - url: config.uni_app_web_local_api_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, + url: config.uni_app_web_source_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, name:details.Nav_Files[j].Nav_ImgFile.FILE_NAME }) details.dealFiles = strconfirmFiles diff --git a/pages/apply/subPages/FO2/jobActivityShow.vue b/pages/apply/subPages/FO2/jobActivityShow.vue index b786ce9..a0ec74c 100644 --- a/pages/apply/subPages/FO2/jobActivityShow.vue +++ b/pages/apply/subPages/FO2/jobActivityShow.vue @@ -551,7 +551,7 @@ if (details.Nav_Files && details.Nav_Files.length > 0) { for (let j = 0; j < details.Nav_Files.length; j++) { strconfirmFiles.push({ - url: config.uni_app_web_local_api_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, + url: config.uni_app_web_source_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, name:details.Nav_Files[j].Nav_ImgFile.FILE_NAME }) details.confirmFiles = strconfirmFiles @@ -576,7 +576,7 @@ if (details.Nav_Files && details.Nav_Files.length > 0) { for (let j = 0; j < details.Nav_Files.length; j++) { strconfirmFiles.push({ - url: config.uni_app_web_local_api_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, + url: config.uni_app_web_source_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, name:details.Nav_Files[j].Nav_ImgFile.FILE_NAME }) details.flowFiles = strconfirmFiles @@ -601,7 +601,7 @@ if (details.Nav_Files && details.Nav_Files.length > 0) { for (let j = 0; j < details.Nav_Files.length; j++) { strconfirmFiles.push({ - url: config.uni_app_web_local_api_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, + url: config.uni_app_web_source_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, name:details.Nav_Files[j].Nav_ImgFile.FILE_NAME }) details.dealFiles = strconfirmFiles diff --git a/pages/apply/subPages/FO2/jobEdit.vue b/pages/apply/subPages/FO2/jobEdit.vue index d6e5f1b..22c7dea 100644 --- a/pages/apply/subPages/FO2/jobEdit.vue +++ b/pages/apply/subPages/FO2/jobEdit.vue @@ -68,7 +68,7 @@ - + diff --git a/pages/apply/subPages/FO2/jobEdit1.vue b/pages/apply/subPages/FO2/jobEdit1.vue index cc83385..e6a60f2 100644 --- a/pages/apply/subPages/FO2/jobEdit1.vue +++ b/pages/apply/subPages/FO2/jobEdit1.vue @@ -59,7 +59,7 @@ - + diff --git a/pages/apply/subPages/FO2/jobEventShow.vue b/pages/apply/subPages/FO2/jobEventShow.vue index d2b8ed3..1e12929 100644 --- a/pages/apply/subPages/FO2/jobEventShow.vue +++ b/pages/apply/subPages/FO2/jobEventShow.vue @@ -470,7 +470,7 @@ if (details.Nav_Files && details.Nav_Files.length > 0) { for (let j = 0; j < details.Nav_Files.length; j++) { strconfirmFiles.push({ - url: config.uni_app_web_local_api_url + details.Nav_Files[j] + url: config.uni_app_web_source_url + details.Nav_Files[j] .Nav_ImgFile.FILE_PATH, name: details.Nav_Files[j].Nav_ImgFile.FILE_NAME }) @@ -496,7 +496,7 @@ if (details.Nav_Files && details.Nav_Files.length > 0) { for (let j = 0; j < details.Nav_Files.length; j++) { strconfirmFiles.push({ - url: config.uni_app_web_local_api_url + details.Nav_Files[j] + url: config.uni_app_web_source_url + details.Nav_Files[j] .Nav_ImgFile.FILE_PATH, name: details.Nav_Files[j].Nav_ImgFile.FILE_NAME }) @@ -522,7 +522,7 @@ if (details.Nav_Files && details.Nav_Files.length > 0) { for (let j = 0; j < details.Nav_Files.length; j++) { strconfirmFiles.push({ - url: config.uni_app_web_local_api_url + details.Nav_Files[j] + url: config.uni_app_web_source_url + details.Nav_Files[j] .Nav_ImgFile.FILE_PATH, name: details.Nav_Files[j].Nav_ImgFile.FILE_NAME }) diff --git a/pages/apply/subPages/FO2/jobOutsourceEdit.vue b/pages/apply/subPages/FO2/jobOutsourceEdit.vue index 7fc2288..094077b 100644 --- a/pages/apply/subPages/FO2/jobOutsourceEdit.vue +++ b/pages/apply/subPages/FO2/jobOutsourceEdit.vue @@ -72,7 +72,7 @@ - + diff --git a/pages/apply/subPages/FO2/jobOutsourceShow.vue b/pages/apply/subPages/FO2/jobOutsourceShow.vue index 3446c0e..46c6bc0 100644 --- a/pages/apply/subPages/FO2/jobOutsourceShow.vue +++ b/pages/apply/subPages/FO2/jobOutsourceShow.vue @@ -62,7 +62,7 @@ - + diff --git a/pages/apply/subPages/FO2/jobShow.vue b/pages/apply/subPages/FO2/jobShow.vue index 0974462..7e18c03 100644 --- a/pages/apply/subPages/FO2/jobShow.vue +++ b/pages/apply/subPages/FO2/jobShow.vue @@ -64,7 +64,7 @@ - + diff --git a/pages/apply/subPages/FO2/preOperSchShow.vue b/pages/apply/subPages/FO2/preOperSchShow.vue index ee70b6f..5e6097a 100644 --- a/pages/apply/subPages/FO2/preOperSchShow.vue +++ b/pages/apply/subPages/FO2/preOperSchShow.vue @@ -116,7 +116,7 @@ if (res.Nav_PreOperSchFile && res.Nav_PreOperSchFile.length > 0) { for (let i = 0; i < res.Nav_PreOperSchFile.length; i++) { strUserFiles.push({ - url: config.uni_app_web_local_api_url+res.Nav_PreOperSchFile[i].Nav_ImgFile.FILE_PATH, + url: config.uni_app_web_source_url+res.Nav_PreOperSchFile[i].Nav_ImgFile.FILE_PATH, name:res.Nav_PreOperSchFile[i].Nav_ImgFile.FILE_NAME }) } diff --git a/pages/apply/subPages/HM2/filePublishEdit.vue b/pages/apply/subPages/HM2/filePublishEdit.vue index d83f260..bae69eb 100644 --- a/pages/apply/subPages/HM2/filePublishEdit.vue +++ b/pages/apply/subPages/HM2/filePublishEdit.vue @@ -286,7 +286,7 @@ if (details.Nav_Files && details.Nav_Files.length > 0) { for (let j = 0; j < details.Nav_Files.length; j++) { strconfirmFiles.push({ - url: config.uni_app_web_local_api_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, + url: config.uni_app_web_source_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, name:details.Nav_Files[j].Nav_ImgFile.FILE_NAME }) details.files = strconfirmFiles @@ -326,7 +326,7 @@ if (details.Nav_Files && details.Nav_Files.length > 0) { for (let j = 0; j < details.Nav_Files.length; j++) { strconfirmFiles.push({ - url: config.uni_app_web_local_api_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, + url: config.uni_app_web_source_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, name:details.Nav_Files[j].Nav_ImgFile.FILE_NAME }) details.files = strconfirmFiles @@ -366,7 +366,7 @@ if (details.Nav_Files && details.Nav_Files.length > 0) { for (let j = 0; j < details.Nav_Files.length; j++) { strconfirmFiles.push({ - url: config.uni_app_web_local_api_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, + url: config.uni_app_web_source_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, name:details.Nav_Files[j].Nav_ImgFile.FILE_NAME }) details.files = strconfirmFiles diff --git a/pages/apply/subPages/HM2/filePublishShow.vue b/pages/apply/subPages/HM2/filePublishShow.vue index c881d14..d92e852 100644 --- a/pages/apply/subPages/HM2/filePublishShow.vue +++ b/pages/apply/subPages/HM2/filePublishShow.vue @@ -236,7 +236,7 @@ if (details.Nav_Files && details.Nav_Files.length > 0) { for (let j = 0; j < details.Nav_Files.length; j++) { strconfirmFiles.push({ - url: config.uni_app_web_local_api_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, + url: config.uni_app_web_source_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, name:details.Nav_Files[j].Nav_ImgFile.FILE_NAME }) details.files = strconfirmFiles @@ -279,7 +279,7 @@ if (details.Nav_Files && details.Nav_Files.length > 0) { for (let j = 0; j < details.Nav_Files.length; j++) { strconfirmFiles.push({ - url: config.uni_app_web_local_api_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, + url: config.uni_app_web_source_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, name:details.Nav_Files[j].Nav_ImgFile.FILE_NAME }) details.files = strconfirmFiles @@ -322,7 +322,7 @@ if (details.Nav_Files && details.Nav_Files.length > 0) { for (let j = 0; j < details.Nav_Files.length; j++) { strconfirmFiles.push({ - url: config.uni_app_web_local_api_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, + url: config.uni_app_web_source_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, name:details.Nav_Files[j].Nav_ImgFile.FILE_NAME }) details.files = strconfirmFiles diff --git a/pages/apply/subPages/HM2/jobTaskAnalyzeShow.vue b/pages/apply/subPages/HM2/jobTaskAnalyzeShow.vue index 21d6c64..1f1fd16 100644 --- a/pages/apply/subPages/HM2/jobTaskAnalyzeShow.vue +++ b/pages/apply/subPages/HM2/jobTaskAnalyzeShow.vue @@ -193,7 +193,7 @@ if (res.Data.Nav_AnalyzeFiles && res.Data.Nav_AnalyzeFiles.length > 0) { for (let i = 0; i < res.Data.Nav_AnalyzeFiles.length; i++) { strUserFiles.push({ - url: config.uni_app_web_local_api_url+res.Data.Nav_AnalyzeFiles[i].Nav_ImgFile.FILE_PATH, + url: config.uni_app_web_source_url+res.Data.Nav_AnalyzeFiles[i].Nav_ImgFile.FILE_PATH, name:res.Data.Nav_AnalyzeFiles[i].Nav_ImgFile.FILE_NAME }) } diff --git a/pages/apply/subPages/HM2/jobTaskCrucialShow.vue b/pages/apply/subPages/HM2/jobTaskCrucialShow.vue index 3d42dd2..660356e 100644 --- a/pages/apply/subPages/HM2/jobTaskCrucialShow.vue +++ b/pages/apply/subPages/HM2/jobTaskCrucialShow.vue @@ -208,7 +208,7 @@ if (details.Nav_Files && details.Nav_Files.length > 0) { for (let j = 0; j < details.Nav_Files.length; j++) { strconfirmFiles.push({ - url: config.uni_app_web_local_api_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, + url: config.uni_app_web_source_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, name:details.Nav_Files[j].Nav_ImgFile.FILE_NAME }) details.files = strconfirmFiles diff --git a/pages/apply/subPages/HM2/jobTaskIdentityShow.vue b/pages/apply/subPages/HM2/jobTaskIdentityShow.vue index 3132a29..768b850 100644 --- a/pages/apply/subPages/HM2/jobTaskIdentityShow.vue +++ b/pages/apply/subPages/HM2/jobTaskIdentityShow.vue @@ -156,7 +156,7 @@ if (res.Data.Nav_Files && res.Data.Nav_Files.length > 0) { for (let i = 0; i < res.Data.Nav_Files.length; i++) { strUserFiles.push({ - url: config.uni_app_web_local_api_url+res.Data.Nav_Files[i].Nav_ImgFile.FILE_PATH, + url: config.uni_app_web_source_url+res.Data.Nav_Files[i].Nav_ImgFile.FILE_PATH, name:res.Data.Nav_Files[i].Nav_ImgFile.FILE_NAME }) } diff --git a/pages/apply/subPages/HM2/jobTaskLicenseShow.vue b/pages/apply/subPages/HM2/jobTaskLicenseShow.vue index e8e26b8..54d651d 100644 --- a/pages/apply/subPages/HM2/jobTaskLicenseShow.vue +++ b/pages/apply/subPages/HM2/jobTaskLicenseShow.vue @@ -216,7 +216,7 @@ if (details.Nav_Files && details.Nav_Files.length > 0) { for (let j = 0; j < details.Nav_Files.length; j++) { strconfirmFiles.push({ - url: config.uni_app_web_local_api_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, + url: config.uni_app_web_source_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, name:details.Nav_Files[j].Nav_ImgFile.FILE_NAME }) details.files = strconfirmFiles diff --git a/pages/apply/subPages/HM2/jobTaskOrdinaryShow.vue b/pages/apply/subPages/HM2/jobTaskOrdinaryShow.vue index e7f01ed..160b9c4 100644 --- a/pages/apply/subPages/HM2/jobTaskOrdinaryShow.vue +++ b/pages/apply/subPages/HM2/jobTaskOrdinaryShow.vue @@ -190,7 +190,7 @@ if (details.Nav_Files && details.Nav_Files.length > 0) { for (let j = 0; j < details.Nav_Files.length; j++) { strconfirmFiles.push({ - url: config.uni_app_web_local_api_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, + url: config.uni_app_web_source_url+ details.Nav_Files[j].Nav_ImgFile.FILE_PATH, name:details.Nav_Files[j].Nav_ImgFile.FILE_NAME }) details.files = strconfirmFiles diff --git a/pages/apply/subPages/HM2/sysLibShow.vue b/pages/apply/subPages/HM2/sysLibShow.vue index 25e0a57..310b080 100644 --- a/pages/apply/subPages/HM2/sysLibShow.vue +++ b/pages/apply/subPages/HM2/sysLibShow.vue @@ -116,7 +116,7 @@ if (res.Nav_Files && res.Nav_Files.length > 0) { for (let i = 0; i < res.Nav_Files.length; i++) { strUserFiles.push({ - url: config.uni_app_web_local_api_url+res.Nav_Files[i].Nav_ImgFile.FILE_PATH, + url: config.uni_app_web_source_url+res.Nav_Files[i].Nav_ImgFile.FILE_PATH, name:res.Nav_Files[i].Nav_ImgFile.FILE_NAME }) } diff --git a/pages/apply/subPages/SCPT/changeImplementShow.vue b/pages/apply/subPages/SCPT/changeImplementShow.vue index d987a14..481dcb3 100644 --- a/pages/apply/subPages/SCPT/changeImplementShow.vue +++ b/pages/apply/subPages/SCPT/changeImplementShow.vue @@ -165,7 +165,7 @@ if (res.Nav_Files && res.Nav_Files.length > 0) { for (let i = 0; i < res.Nav_Files.length; i++) { strUserFiles.push({ - url: config.uni_app_web_local_api_url+res.Nav_Files[i].Nav_ImgFile.FILE_PATH, + url: config.uni_app_web_source_url+res.Nav_Files[i].Nav_ImgFile.FILE_PATH, name:res.Nav_Files[i].Nav_ImgFile.FILE_NAME }) }