diff --git a/pages/login/login.vue b/pages/login/login.vue index 66ecb23..6e43530 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -34,7 +34,7 @@ + @click.stop="isShowPassword"> @@ -88,6 +88,10 @@ }; }, methods: { + isShowPassword(){ + this.showPassword = !this.showPassword; + console.log(this.showPassword) + }, gotoback() { // uni.navigateBack({ // delta: 1 diff --git a/pages/projectEnd/civilConstruction/exposureFence/detail.vue b/pages/projectEnd/civilConstruction/exposureFence/detail.vue index 28a9014..0b12b87 100644 --- a/pages/projectEnd/civilConstruction/exposureFence/detail.vue +++ b/pages/projectEnd/civilConstruction/exposureFence/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/civilConstruction/exposureFence/index.vue b/pages/projectEnd/civilConstruction/exposureFence/index.vue index 6cfc0ba..528b77a 100644 --- a/pages/projectEnd/civilConstruction/exposureFence/index.vue +++ b/pages/projectEnd/civilConstruction/exposureFence/index.vue @@ -18,7 +18,7 @@ - diff --git a/pages/projectEnd/civilConstruction/sceneMeeting/detail.vue b/pages/projectEnd/civilConstruction/sceneMeeting/detail.vue index 38f388b..e25db87 100644 --- a/pages/projectEnd/civilConstruction/sceneMeeting/detail.vue +++ b/pages/projectEnd/civilConstruction/sceneMeeting/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/civilConstruction/sceneMeeting/index.vue b/pages/projectEnd/civilConstruction/sceneMeeting/index.vue index 57613e3..1094793 100644 --- a/pages/projectEnd/civilConstruction/sceneMeeting/index.vue +++ b/pages/projectEnd/civilConstruction/sceneMeeting/index.vue @@ -18,7 +18,7 @@ - diff --git a/pages/projectEnd/civilConstruction/thematicActivities/detail.vue b/pages/projectEnd/civilConstruction/thematicActivities/detail.vue index 29198a8..49def7f 100644 --- a/pages/projectEnd/civilConstruction/thematicActivities/detail.vue +++ b/pages/projectEnd/civilConstruction/thematicActivities/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/civilConstruction/thematicActivities/index.vue b/pages/projectEnd/civilConstruction/thematicActivities/index.vue index 5a8a826..a31617e 100644 --- a/pages/projectEnd/civilConstruction/thematicActivities/index.vue +++ b/pages/projectEnd/civilConstruction/thematicActivities/index.vue @@ -18,7 +18,7 @@ - diff --git a/pages/projectEnd/controlPointGrading/noticeInspectionTesting/detail.vue b/pages/projectEnd/controlPointGrading/noticeInspectionTesting/detail.vue index 1fe2446..baf7d93 100644 --- a/pages/projectEnd/controlPointGrading/noticeInspectionTesting/detail.vue +++ b/pages/projectEnd/controlPointGrading/noticeInspectionTesting/detail.vue @@ -596,7 +596,7 @@ controlPointLevelListUp() { return controlPointLevelId => { const findMap = this.controlPointLevelList - .filter(item => controlPointLevelId.includes(item.id.toString())) + .filter(item => controlPointLevelId.includes(item.id)) .map(item => item.controlPointLevelName); return findMap.length > 0 ? findMap.join('、') : '--'; }; diff --git a/pages/projectEnd/guidancePartyBuilding/attackGroup/detail.vue b/pages/projectEnd/guidancePartyBuilding/attackGroup/detail.vue index f60a33a..fca22af 100644 --- a/pages/projectEnd/guidancePartyBuilding/attackGroup/detail.vue +++ b/pages/projectEnd/guidancePartyBuilding/attackGroup/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/attackGroup/index.vue b/pages/projectEnd/guidancePartyBuilding/attackGroup/index.vue index ebb74a9..73d4dce 100644 --- a/pages/projectEnd/guidancePartyBuilding/attackGroup/index.vue +++ b/pages/projectEnd/guidancePartyBuilding/attackGroup/index.vue @@ -37,7 +37,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/constructionActivitie/detail.vue b/pages/projectEnd/guidancePartyBuilding/constructionActivitie/detail.vue index 24407f9..eb486da 100644 --- a/pages/projectEnd/guidancePartyBuilding/constructionActivitie/detail.vue +++ b/pages/projectEnd/guidancePartyBuilding/constructionActivitie/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/constructionActivitie/index.vue b/pages/projectEnd/guidancePartyBuilding/constructionActivitie/index.vue index 7764406..b7ce4ef 100644 --- a/pages/projectEnd/guidancePartyBuilding/constructionActivitie/index.vue +++ b/pages/projectEnd/guidancePartyBuilding/constructionActivitie/index.vue @@ -37,7 +37,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/constructionAgreement/detail.vue b/pages/projectEnd/guidancePartyBuilding/constructionAgreement/detail.vue index d149529..91aa8b2 100644 --- a/pages/projectEnd/guidancePartyBuilding/constructionAgreement/detail.vue +++ b/pages/projectEnd/guidancePartyBuilding/constructionAgreement/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/constructionAgreement/index.vue b/pages/projectEnd/guidancePartyBuilding/constructionAgreement/index.vue index aeb0677..b9081db 100644 --- a/pages/projectEnd/guidancePartyBuilding/constructionAgreement/index.vue +++ b/pages/projectEnd/guidancePartyBuilding/constructionAgreement/index.vue @@ -37,7 +37,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/constructionScheme/detail.vue b/pages/projectEnd/guidancePartyBuilding/constructionScheme/detail.vue index b47b793..45152e8 100644 --- a/pages/projectEnd/guidancePartyBuilding/constructionScheme/detail.vue +++ b/pages/projectEnd/guidancePartyBuilding/constructionScheme/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/constructionScheme/index.vue b/pages/projectEnd/guidancePartyBuilding/constructionScheme/index.vue index 149a1e3..89cb4b4 100644 --- a/pages/projectEnd/guidancePartyBuilding/constructionScheme/index.vue +++ b/pages/projectEnd/guidancePartyBuilding/constructionScheme/index.vue @@ -37,7 +37,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/demonstrationPost/detail.vue b/pages/projectEnd/guidancePartyBuilding/demonstrationPost/detail.vue index 447534d..be2f8fa 100644 --- a/pages/projectEnd/guidancePartyBuilding/demonstrationPost/detail.vue +++ b/pages/projectEnd/guidancePartyBuilding/demonstrationPost/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/demonstrationPost/index.vue b/pages/projectEnd/guidancePartyBuilding/demonstrationPost/index.vue index f3f9dc9..a38f193 100644 --- a/pages/projectEnd/guidancePartyBuilding/demonstrationPost/index.vue +++ b/pages/projectEnd/guidancePartyBuilding/demonstrationPost/index.vue @@ -37,7 +37,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/learningWorld/detail.vue b/pages/projectEnd/guidancePartyBuilding/learningWorld/detail.vue index 6c3acda..54db189 100644 --- a/pages/projectEnd/guidancePartyBuilding/learningWorld/detail.vue +++ b/pages/projectEnd/guidancePartyBuilding/learningWorld/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/learningWorld/index.vue b/pages/projectEnd/guidancePartyBuilding/learningWorld/index.vue index 39b69ff..b2aaed0 100644 --- a/pages/projectEnd/guidancePartyBuilding/learningWorld/index.vue +++ b/pages/projectEnd/guidancePartyBuilding/learningWorld/index.vue @@ -37,7 +37,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/pioneerModel/detail.vue b/pages/projectEnd/guidancePartyBuilding/pioneerModel/detail.vue index d9483f2..a6254fb 100644 --- a/pages/projectEnd/guidancePartyBuilding/pioneerModel/detail.vue +++ b/pages/projectEnd/guidancePartyBuilding/pioneerModel/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/pioneerModel/index.vue b/pages/projectEnd/guidancePartyBuilding/pioneerModel/index.vue index 72f7ac2..c5c4884 100644 --- a/pages/projectEnd/guidancePartyBuilding/pioneerModel/index.vue +++ b/pages/projectEnd/guidancePartyBuilding/pioneerModel/index.vue @@ -37,7 +37,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/publicizReport/detail.vue b/pages/projectEnd/guidancePartyBuilding/publicizReport/detail.vue index 6fdae49..f1b1e79 100644 --- a/pages/projectEnd/guidancePartyBuilding/publicizReport/detail.vue +++ b/pages/projectEnd/guidancePartyBuilding/publicizReport/detail.vue @@ -13,6 +13,7 @@ diff --git a/pages/projectEnd/guidancePartyBuilding/publicizReport/index.vue b/pages/projectEnd/guidancePartyBuilding/publicizReport/index.vue index 9888471..e958862 100644 --- a/pages/projectEnd/guidancePartyBuilding/publicizReport/index.vue +++ b/pages/projectEnd/guidancePartyBuilding/publicizReport/index.vue @@ -39,6 +39,7 @@ diff --git a/pages/projectEnd/guidancePartyBuilding/thematicActivitie/detail.vue b/pages/projectEnd/guidancePartyBuilding/thematicActivitie/detail.vue index a930cd9..40ff958 100644 --- a/pages/projectEnd/guidancePartyBuilding/thematicActivitie/detail.vue +++ b/pages/projectEnd/guidancePartyBuilding/thematicActivitie/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/thematicActivitie/index.vue b/pages/projectEnd/guidancePartyBuilding/thematicActivitie/index.vue index 34510f4..80ae99b 100644 --- a/pages/projectEnd/guidancePartyBuilding/thematicActivitie/index.vue +++ b/pages/projectEnd/guidancePartyBuilding/thematicActivitie/index.vue @@ -37,7 +37,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/trademark/detail.vue b/pages/projectEnd/guidancePartyBuilding/trademark/detail.vue index 3e17c32..d13ee6c 100644 --- a/pages/projectEnd/guidancePartyBuilding/trademark/detail.vue +++ b/pages/projectEnd/guidancePartyBuilding/trademark/detail.vue @@ -11,7 +11,7 @@ - diff --git a/pages/projectEnd/guidancePartyBuilding/trademark/index.vue b/pages/projectEnd/guidancePartyBuilding/trademark/index.vue index f0e2019..20c27cb 100644 --- a/pages/projectEnd/guidancePartyBuilding/trademark/index.vue +++ b/pages/projectEnd/guidancePartyBuilding/trademark/index.vue @@ -37,7 +37,7 @@ - diff --git a/pages/projectEnd/projectIndex/appSettings.vue b/pages/projectEnd/projectIndex/appSettings.vue index 33c46df..2be925f 100644 --- a/pages/projectEnd/projectIndex/appSettings.vue +++ b/pages/projectEnd/projectIndex/appSettings.vue @@ -4,12 +4,12 @@ - - - 应用中心 - - - + + + 应用中心 + + + @@ -49,20 +49,22 @@ - - - - - - + + + + + + {{ item.appName || item.moduleName }} + + + - - {{ item.appName || item.moduleName }} - - @@ -190,19 +192,19 @@ const res = that.$recursiveSearch(that.haveModuleList, item.path) // // console.log(5555555, res); // debugger - return res ? true :false + return res ? true : false }); } }) }, - onClickDelete(row){ + onClickDelete(row) { const findIndex = this.commonModuleIdsList.findIndex(item => item.moduleId == row.moduleId); - if(findIndex > -1) { + if (findIndex > -1) { this.commonModuleIdsList.splice(findIndex, 1); this.saveAppUserModules(); } }, - onClickAdd(row){ + onClickAdd(row) { console.log(1111111, row.moduleId, row) delete row.menuList this.commonModuleIdsList.push(row); @@ -452,7 +454,7 @@ url: '../../carViolation/pageIndex' }) break - + case 'standardSchedule': uni.navigateTo({ url: '../standardSchedule/index', @@ -539,7 +541,7 @@ url: '../../projectEnd/pipelineWelding/index' }) break - + case 'guidancePartyBuilding': uni.navigateTo({ url: '../../projectEnd/guidancePartyBuilding/index' @@ -633,7 +635,7 @@ return (row) => { const findIndex = this.commonModuleIdsList.findIndex(item => item.moduleId == row.moduleId); // console.log(findIndex, row.moduleId, this.commonModuleIdsList) - return findIndex > -1 ? false: true + return findIndex > -1 ? false : true } } } @@ -644,6 +646,7 @@ .inner_active { opacity: 0.2; } + .imageAdd { width: 28rpx; height: 28rpx; @@ -654,6 +657,7 @@ top: 16rpx; right: 50rpx; } + .imageDelete { width: 28rpx; height: 28rpx; @@ -816,13 +820,13 @@ .projectIndexPage { - :deep( .uni-scroll-view-content ){ + :deep(.uni-scroll-view-content) { background-image: url(@/static/bthgIcon/prjectIndex_bg3.png); background-repeat: no-repeat; background-size: 100%; } - :deep( .headerBox ){ + :deep(.headerBox) { background-color: transparent; border-bottom: none; } diff --git a/pages/projectEnd/projectIndex/projectIndex.vue b/pages/projectEnd/projectIndex/projectIndex.vue index 813ade5..2491b07 100644 --- a/pages/projectEnd/projectIndex/projectIndex.vue +++ b/pages/projectEnd/projectIndex/projectIndex.vue @@ -1255,6 +1255,13 @@ // uni.navigateTo({ // url: '../scan/saoSao?data=' + res.result // }) + if(res.result.includes('http://')) { + uni.showToast({ + icon: 'none', + title: '请使用微信扫一扫打开!' + }) + return + } uni.navigateTo({ url: `${res.result}` }) diff --git a/pages/projectEnd/workflowTable/waterElectricityRecordSettlement/detail.vue b/pages/projectEnd/workflowTable/waterElectricityRecordSettlement/detail.vue index cbb58f1..6ba2280 100644 --- a/pages/projectEnd/workflowTable/waterElectricityRecordSettlement/detail.vue +++ b/pages/projectEnd/workflowTable/waterElectricityRecordSettlement/detail.vue @@ -10,9 +10,9 @@ - + 日期时间区间: {{detailData.dateBegin ? detailData.dateBegin : ""}} - {{ detailData.dateEnd ? detailData.dateEnd : '' }} @@ -118,9 +118,9 @@ 水用量记录及结算说明:{{detailData.waterConsumptionRecordAndSettlementInstruction}} - + 承包商负责人: @@ -129,10 +129,10 @@ 承包商负责人日期:{{detailData.contractorResponsiblePersonDate}} - + 施工管理部负责人: diff --git a/pages/projectEnd/workflowTable/waterElectricityRecordSettlement/index.vue b/pages/projectEnd/workflowTable/waterElectricityRecordSettlement/index.vue index 20c41bc..7066248 100644 --- a/pages/projectEnd/workflowTable/waterElectricityRecordSettlement/index.vue +++ b/pages/projectEnd/workflowTable/waterElectricityRecordSettlement/index.vue @@ -9,7 +9,7 @@ - + @@ -28,14 +28,14 @@ --> - + 承包商 @@ -152,7 +152,7 @@ }, getWorkList() { let data = { - num: this.searchName, + contractorName: this.searchName, pageNo: this.pageNo, pageSize: this.pageSize, projectSn: this.projectSn diff --git a/pages/videoManage/playVideo.vue b/pages/videoManage/playVideo.vue index ded86cc..53d9b23 100644 --- a/pages/videoManage/playVideo.vue +++ b/pages/videoManage/playVideo.vue @@ -45,9 +45,11 @@ videoFlag: false, typeName: "", videoConfig:{}, + projectSn:"", }; }, onLoad(options) { + this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn; //videoType 1萤石云,2乐橙,3ISC,4大华,5宇视,6国标 // this.url = options.url this.videoInfo=uni.getStorageSync('videoInfo') diff --git a/static/bthgIcon/gdhj_icon.png b/static/bthgIcon/gdhj_icon.png index d91696d..4da4e4a 100644 Binary files a/static/bthgIcon/gdhj_icon.png and b/static/bthgIcon/gdhj_icon.png differ diff --git a/utils/request.js b/utils/request.js index 72bd11f..d635d00 100644 --- a/utils/request.js +++ b/utils/request.js @@ -100,7 +100,8 @@ function baseRequest(url, params, method, options, isToast = false) { // let BaseUrl = uni.getStorageSync("ipPort") || app.config.globalProperties.url_config // let BaseUrl = createApp().app.config.globalProperties.url_config - let BaseUrl = creprocess.env.NODE_ENV === 'development' ? 'http://192.168.34.221:9111/' : 'http://jxj.zhgdyun.com:18000/' + // let BaseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.34.221:9111/' : 'http://jxj.zhgdyun.com:18000/' + let BaseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.34.221:9111/' : "http://219.147.96.219:9809/" // 包头线上地址(正式) console.log(BaseUrl, 777888) uni.request({ url: BaseUrl + url,