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 31f337f..d418757 100644
--- a/pages/application/hidden-danger-check-standard/custom/list-item.vue
+++ b/pages/application/hidden-danger-check-standard/custom/list-item.vue
@@ -3,9 +3,9 @@
返回
检查项目列表
-
+
diff --git a/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-uncheck.vue b/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-uncheck.vue
index 3a29d43..e86350a 100644
--- a/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-uncheck.vue
+++ b/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-uncheck.vue
@@ -245,10 +245,12 @@
var content = res.data.varList;
for(var i=0;i {
+ if ("success" == res.data.result) {
+ uni.hideLoading();
+ var content = res.data.varList;
+ for (var i = 0; i < content.length; i++) {
+ if (content[i].checkCount == 0) {
+ this.totalList.push(content[i]);
+ } else {
+ this.totalList.push(content[i]);
+ }
+ }
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: '系统异常',
+ duration: 2000
+ });
+ }
+ },
+ fail: (res) => {
+ uni.showToast({
+ icon: 'none',
+ title: "服务器正在升级,请稍后再试。",
+ duration: 2000
+ });
+ setTimeout(function () {
+ plus.runtime.quit();
+ }, 2000);
+ }
+ })
},
// 获得滚动隐患
getHiddenRoll() {
@@ -1399,7 +1446,13 @@ import {
for (var i = 0; i < _this.totalList.length; i++) {
if (_this.totalList[i].LISTMANAGER_ID == listId) {
flag = true;
- _this.goToList({listId: _this.totalList[i].LISTMANAGER_ID, listName: _this.totalList[i].NAME});
+ if(_this.totalList[i].PERIOD) {
+ _this.goToList({listId: _this.totalList[i].LISTMANAGER_ID, listName: _this.totalList[i].NAME});
+ break;
+ }
+ } else if (_this.totalList[i].CUSTOM_ID == listId) {
+ flag = true;
+ _this.goTohidden({listId: _this.totalList[i].CUSTOM_ID, listName: _this.totalList[i].NAME});
break;
}
}
@@ -1454,40 +1507,45 @@ import {
// });
// // _this.goToList({listId:_this.totalList[i].LISTMANAGER_ID,listName:_this.totalList[i].NAME});
// }
- // });
- // },
- //跳转事件
- goToexclude(e) {
- this.$emit('setInit', true);
- uni.navigateTo({
- url: '/pages/basics/hidden-danger-exclude/exclude-list',
- });
- },
- goToDanger(e) {
- this.$emit('setInit', true);
- uni.navigateTo({
- url: '/pages/basics/danger-exclude/danger-exclude-list',
- });
- },
- toSetinit(e) {
- this.$emit('setInit', true);
- },
- //跳转事件
- goToList(e) {
- uni.navigateTo({
- url: '/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-spot?listId=' + e.listId + '&listName=' + e.listName
- });
- // uni.navigateTo({
- // url: '/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-list?listId='+e.listId+'&listName='+e.listName
- // });
- },
- goToFace(userId) {
- uni.navigateTo({
- url: '/pages/basics/recognitionFace/index?userId=' + userId
- });
+ // });
+ // },
+ //跳转事件
+ goToexclude(e) {
+ this.$emit('setInit', true);
+ uni.navigateTo({
+ url: '/pages/basics/hidden-danger-exclude/exclude-list',
+ });
+ },
+ goToDanger(e) {
+ this.$emit('setInit', true);
+ uni.navigateTo({
+ url: '/pages/basics/danger-exclude/danger-exclude-list',
+ });
+ },
+ toSetinit(e) {
+ this.$emit('setInit', true);
+ },
+ //跳转事件
+ goToList(e) {
+ uni.navigateTo({
+ url: '/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-spot?listId=' + e.listId + '&listName=' + e.listName
+ });
+ // uni.navigateTo({
+ // url: '/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-list?listId='+e.listId+'&listName='+e.listName
+ // });
+ },
+ goTohidden(e) {
+ uni.navigateTo({
+ url: '/pages/application/hidden-danger-check-standard/custom/list-item?listId=' + e.listId + '&listName=' + e.listName
+ });
+ },
+ goToFace(userId) {
+ uni.navigateTo({
+ url: '/pages/basics/recognitionFace/index?userId=' + userId
+ });
+ }
}
}
-}