Compare commits

..

No commits in common. "2b9cc8c8650cad1f76cd1e3140407c0c5d39df87" and "5ecbede1d3fa747f33b93e2b62c7a0e18045c409" have entirely different histories.

6 changed files with 47 additions and 105 deletions

View File

@ -3,9 +3,9 @@
<cu-custom bgColor="bg-gradual-blueness" :isBack="true" :isRingt="true">
<block slot="backText">返回</block>
<block slot="content">检查项目列表</block>
<!-- <block slot="right">
<block slot="right">
<view @tap.stop="openAuth('CAMERA')">扫描</view>
</block>-->
</block>
</cu-custom>
<scroll-view scroll-y>
<view class="spot-list">

View File

@ -245,12 +245,10 @@
var content = res.data.varList;
for(var i=0;i<content.length;i++){
/*if(content[i].checkCount==0){
this.list.push(content[i]);
this.totalList.push(content[i]);
}*/
if(content[i].checkCount==0){
this.list.push(content[i]);
this.totalList.push(content[i]);
}
/*else{
this.list1.push(content[i]);
this.totalList.push(content[i]);

View File

@ -88,7 +88,7 @@ import {
if (res.data.pd) {
uni.hideLoading();
_this.form = res.data.pd;
console.log("111",_this.form)
console.log(_this.form)
_this.$set(_this.form, 'REVIEW_RESULT', '');
}
}

View File

@ -628,7 +628,6 @@ import {
triggered: false,
count: {},
totalList: [],
hiddenList: [],
SURVEY_ID: '',
IS_PUBLISH: '',
isGoodsEdit: false, //
@ -1284,52 +1283,6 @@ import {
}, 2000);
}
})
uni.request({
url: basePath + '/app/hiddenDangerCheckStandardCustom/checkList',
method: 'POST',
dataType: 'json',
header: {
'Content-type': 'application/x-www-form-urlencoded'
},
data: {
USER_NAME: loginUser.NAME,
CHECK_DEPARTMENT_ID: loginUser.DEPARTMENT_ID,
IS_MAIN: loginUser.ISMAIN,
CORPINFO_ID: loginUser.CORPINFO_ID,
USER_ID: loginUser.USER_ID,
},
success: (res) => {
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() {
@ -1446,15 +1399,9 @@ import {
for (var i = 0; i < _this.totalList.length; i++) {
if (_this.totalList[i].LISTMANAGER_ID == listId) {
flag = true;
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;
}
}
if (!flag) {
uni.showToast({
@ -1534,11 +1481,6 @@ import {
// 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

View File

@ -81,6 +81,7 @@
</view>
<view>
<text>{{item.TITLE}}</text>
</view>
</view>
@ -174,8 +175,8 @@
tabCur :0,
}
},
mounted(e){
this.getData();
let that=this;
let CustomBar = this.CustomBar;
@ -236,8 +237,6 @@
}
},
getData() {
this.getPcData();
this.getTxData();
var _this = this;
uni.showLoading({
title: '请稍候'
@ -270,6 +269,7 @@
}
});
},
getPcData() {
var _this = this;
uni.showLoading({
@ -337,12 +337,16 @@
});
},
//
goToDetail(e) {
},
goToTxDetail(e){
uni.navigateTo({
url: '/pages/news/notice-list-detail?id='+e+'&type=1',
});
},
goToPcDetail(e){
console.log(e)
if(this.TabCur == 0) {
uni.navigateTo({
url: '/pages/news/notice-list-detail?id='+e+'&type=0',
@ -384,7 +388,6 @@
duration: 1500
});
_this.getQuery()
this.getTxData();
},
fail: (err) => {
uni.hideLoading();

View File

@ -49,9 +49,7 @@
this.type =e.type;
this.id=e.id;
this.getData();
},
onShow(){
this.getData();
console.log(e)
},
methods: {
getData() {
@ -63,6 +61,7 @@
if("1"==_this.type){
url = basePath + '/app/notice/goEditForPc'
}
console.log("1111",_this.id)
uni.request({
url:url,
method: 'POST',