wangpeng
/
integrated_traffic_uniapp
forked from integrated_whb/UniApp_integrated_whb
1
0
Fork 0
Code Pull Requests Activity

Compare commits

base: wangpeng:2b9cc8c8650cad1f76cd1e3140407c0c5d39df87
Branches Tags
wangpeng:dev
wangpeng:master
..
compare: wangpeng:5ecbede1d3fa747f33b93e2b62c7a0e18045c409
Branches Tags
wangpeng:dev
wangpeng:master

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

6 changed files with 47 additions and 105 deletions
Show Stats Expand all files Collapse all files

4
pages/application/hidden-danger-check-standard/custom/list-item.vue
View File

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

6
pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-uncheck.vue
View File

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

2
pages/basics/basic-info/confirm.vue
View File

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

124
pages/basics/home.vue
View File

@ -628,7 +628,6 @@ import {
triggered: false, triggered: false,
count: {}, count: {},
totalList: [], totalList: [],
hiddenList: [],
SURVEY_ID: '', SURVEY_ID: '',
IS_PUBLISH: '', IS_PUBLISH: '',
isGoodsEdit: false, // 是否加载编辑后的数据 isGoodsEdit: false, // 是否加载编辑后的数据
@ -1284,52 +1283,6 @@ import {
}, 2000); }, 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() { getHiddenRoll() {
@ -1446,13 +1399,7 @@ import {
for (var i = 0; i < _this.totalList.length; i++) { for (var i = 0; i < _this.totalList.length; i++) {
if (_this.totalList[i].LISTMANAGER_ID == listId) { if (_this.totalList[i].LISTMANAGER_ID == listId) {
flag = true; flag = true;
if(_this.totalList[i].PERIOD) { _this.goToList({listId: _this.totalList[i].LISTMANAGER_ID, listName: _this.totalList[i].NAME});
_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; break;
} }
} }
@ -1507,45 +1454,40 @@ import {
// }); // });
// // _this.goToList({listId:_this.totalList[i].LISTMANAGER_ID,listName:_this.totalList[i].NAME}); // // _this.goToList({listId:_this.totalList[i].LISTMANAGER_ID,listName:_this.totalList[i].NAME});
// } // }
// }); // });
// }, // },
//跳转事件 //跳转事件
goToexclude(e) { goToexclude(e) {
this.$emit('setInit', true); this.$emit('setInit', true);
uni.navigateTo({ uni.navigateTo({
url: '/pages/basics/hidden-danger-exclude/exclude-list', url: '/pages/basics/hidden-danger-exclude/exclude-list',
}); });
}, },
goToDanger(e) { goToDanger(e) {
this.$emit('setInit', true); this.$emit('setInit', true);
uni.navigateTo({ uni.navigateTo({
url: '/pages/basics/danger-exclude/danger-exclude-list', url: '/pages/basics/danger-exclude/danger-exclude-list',
}); });
}, },
toSetinit(e) { toSetinit(e) {
this.$emit('setInit', true); this.$emit('setInit', true);
}, },
//跳转事件 //跳转事件
goToList(e) { goToList(e) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-spot?listId=' + e.listId + '&listName=' + e.listName url: '/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-spot?listId=' + e.listId + '&listName=' + e.listName
}); });
// uni.navigateTo({ // uni.navigateTo({
// url: '/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-list?listId='+e.listId+'&listName='+e.listName // url: '/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-list?listId='+e.listId+'&listName='+e.listName
// }); // });
}, },
goTohidden(e) { goToFace(userId) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/application/hidden-danger-check-standard/custom/list-item?listId=' + e.listId + '&listName=' + e.listName url: '/pages/basics/recognitionFace/index?userId=' + userId
}); });
},
goToFace(userId) {
uni.navigateTo({
url: '/pages/basics/recognitionFace/index?userId=' + userId
});
}
} }
} }
}
</script> </script>
<style> <style>
.status_bar { .status_bar {

11
pages/news/home.vue
View File

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

5
pages/news/notice-list-detail.vue
View File

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