diff --git a/pages.json b/pages.json index aaddc7b..ec08c67 100644 --- a/pages.json +++ b/pages.json @@ -747,6 +747,22 @@ "path": "pages/application/key-project-management/safety-environmental-inspection/list", "style": {} }, + { + "path": "pages/application/key-project-management/positioning_management/index", + "style": {} + }, + { + "path": "pages/application/key-project-management/positioning_management/keyProjectApply", + "style": {} + }, + { + "path": "pages/application/key-project-management/positioning_management/list", + "style": {} + }, + { + "path": "pages/application/key-project-management/positioning_management/videoView", + "style": {} + }, { "path": "pages/application/key-project-management/safety-environmental-inspection/detail-list", "style": {} @@ -865,6 +881,14 @@ "style": {} }, + { + "path": "pages/application/safetymeeting/index", + "style": {} + }, + { + "path": "pages/application/safetymeeting/info", + "style": {} + }, { "path" : "pages/my/updateSignature/index", "style" : {} diff --git a/pages/application/hidden-danger-check-standard/custom/list-item-check-list.vue b/pages/application/hidden-danger-check-standard/custom/list-item-check-list.vue index a8850d7..df1a9a7 100644 --- a/pages/application/hidden-danger-check-standard/custom/list-item-check-list.vue +++ b/pages/application/hidden-danger-check-standard/custom/list-item-check-list.vue @@ -76,7 +76,8 @@ permissionID:'', noClick:true, buttonloading: false, - listId:'', + listId: '', + CHECK_ITEM: '', listName:'', baoBaoType:'', list: [], @@ -85,6 +86,7 @@ } }, onLoad(e){ + this.CHECK_ITEM = e.CHECK_ITEM this.listId=e.listId; this.listName=e.listName; this.baoBaoType=e.baoBaoType @@ -114,6 +116,7 @@ }, data: { CUSTOM_ID: _this.listId, + CHECK_ITEM: _this.CHECK_ITEM, USER_NAME : loginUser.NAME, CORPINFO_ID:loginUser.CORPINFO_ID, USER_ID:loginUser.USER_ID, diff --git a/pages/application/hidden-danger-check-standard/custom/list-item.vue b/pages/application/hidden-danger-check-standard/custom/list-item.vue index 1c05dca..31f337f 100644 --- a/pages/application/hidden-danger-check-standard/custom/list-item.vue +++ b/pages/application/hidden-danger-check-standard/custom/list-item.vue @@ -161,9 +161,7 @@ uni.navigateTo({ url: '/pages/application/hidden-danger-check-standard/custom/list-item-check-list?CHECK_ITEM=' + e.CHECK_ITEM + "&listId=" + this.listId + '&listName=' + this.listName + - "&CHECKRECORD_ID=" + (this.CHECKRECORD_ID ? this.CHECKRECORD_ID : '') + "&baoBaoType=" + - this - .baoBaoType + "&CHECKRECORD_ID=" + (this.CHECKRECORD_ID ? this.CHECKRECORD_ID : '') + "&baoBaoType=" + this.baoBaoType }); } // uni.navigateTo({ diff --git a/pages/application/key-project-management/index/index.vue b/pages/application/key-project-management/index/index.vue index cb08df3..0477f37 100644 --- a/pages/application/key-project-management/index/index.vue +++ b/pages/application/key-project-management/index/index.vue @@ -11,6 +11,15 @@ 重点工程管理 + + + + {{count.GC_COUNT}} + + + 重点工程管理 + + diff --git a/pages/application/key-project-management/positioning_management/index.vue b/pages/application/key-project-management/positioning_management/index.vue new file mode 100644 index 0000000..5e9c8fc --- /dev/null +++ b/pages/application/key-project-management/positioning_management/index.vue @@ -0,0 +1,276 @@ + + + + + + diff --git a/pages/application/key-project-management/positioning_management/keyProjectApply.vue b/pages/application/key-project-management/positioning_management/keyProjectApply.vue new file mode 100644 index 0000000..86b82c9 --- /dev/null +++ b/pages/application/key-project-management/positioning_management/keyProjectApply.vue @@ -0,0 +1,192 @@ + + + + + diff --git a/pages/application/key-project-management/positioning_management/list.vue b/pages/application/key-project-management/positioning_management/list.vue new file mode 100644 index 0000000..87c514c --- /dev/null +++ b/pages/application/key-project-management/positioning_management/list.vue @@ -0,0 +1,205 @@ + + + + + diff --git a/pages/application/key-project-management/positioning_management/videoView.vue b/pages/application/key-project-management/positioning_management/videoView.vue new file mode 100644 index 0000000..bed31a3 --- /dev/null +++ b/pages/application/key-project-management/positioning_management/videoView.vue @@ -0,0 +1,112 @@ + + + + + diff --git a/pages/application/safety-environmental-inspection/inspector/detail.vue b/pages/application/safety-environmental-inspection/inspector/detail.vue index 5fc3c9a..df8d3ab 100644 --- a/pages/application/safety-environmental-inspection/inspector/detail.vue +++ b/pages/application/safety-environmental-inspection/inspector/detail.vue @@ -137,7 +137,6 @@ - 核实结果: @@ -572,7 +571,6 @@ } }) }, - changeStartDate(e) { this.form.INSPECTION_TIME_START = e this.$forceUpdate();//强制刷新 diff --git a/pages/application/safetymeeting/index.vue b/pages/application/safetymeeting/index.vue new file mode 100644 index 0000000..d85136d --- /dev/null +++ b/pages/application/safetymeeting/index.vue @@ -0,0 +1,256 @@ + + + + + diff --git a/pages/application/safetymeeting/info.vue b/pages/application/safetymeeting/info.vue new file mode 100644 index 0000000..62a5175 --- /dev/null +++ b/pages/application/safetymeeting/info.vue @@ -0,0 +1,306 @@ + + + + + diff --git a/pages/basics/home.vue b/pages/basics/home.vue index debf268..2052fbd 100644 --- a/pages/basics/home.vue +++ b/pages/basics/home.vue @@ -188,7 +188,7 @@ 设备巡检 - + @@ -196,7 +196,7 @@ 安全例会 - +