徐强 / eej · 提交

转到一个项目

作者 xuqiang
提交 563fde7deb702e841ee7e75cd642cccae25529e3 1 个父辈 fd6b584c

提交

内嵌 并排对比
正在显示 5 个修改的文件 包含 334 行增加 和 234 行删除
... ... @@ -12,9 +12,12 @@
</view>
</view>
</view>
<view class="subCheckWrap" v-if="item.show" v-for="(subItem,subIndex) in item.subKeyList" :key="subIndex">
<view class="subCheckWrap" :id="'check_'+subItem.id" v-if="item.show" v-for="(subItem,subIndex) in item.subKeyList" :key="subIndex">
<navigator class="subCheckItem" :url="'/pages/index/license/checkDetail?param='+subItem.param+'&companyid='+companyid" hover-class="none">
{{subIndex+1+'.'}}{{subItem.title}}
<view style="display: flex;align-items: center;">
<image class="jcnrImg" v-if="subItem.saved == 1" src="../static/image/icon_complete2.png" mode=""></image>
{{subIndex+1+'.'}}{{subItem.title}}
</view>
<view class="subCheckRight">
{{subItem.name}}
<image src="../static/image/icon_arrow.png" mode=""></image>
... ... @@ -67,6 +70,7 @@
.bottomRight image{width: 32rpx;height: 32rpx;}
.subCheckWrap{padding: 0 32rpx 0 64rpx;}
.subCheckWrap .subCheckItem{display: flex;justify-content: space-between;align-items: center;height: 96rpx;color: #646566;font-size: 28rpx;}
.subCheckItem .jcnrImg{width: 40rpx;height: 40rpx;margin-right: 10rpx;}
.subCheckItem .subCheckRight{display: flex;align-items: center;}
.subCheckRight image{width: 32rpx;height: 32rpx;}
</style>
... ...
... ... @@ -23,7 +23,7 @@
ref="region"
>选择地区</w-picker>
<view class="factoryList">
<navigator class="factoryItem" v-for="(item,index) in list" :key="index" :url="'factoryDetail?factoryName='+item.OWNERCOMPANY+'&companyid='+item.companyid" hover-class="none">
<navigator class="factoryItem" v-for="(item,index) in list" :key="index" :url="'factoryDetail?companyid='+item.companyid" hover-class="none">
<view class="factoryLeft">
<view class="factoryNum">
{{index + 1}}
... ... @@ -77,6 +77,13 @@
computed:{
...mapState(["keyword"])
},
onBackPress(e){
console.log('用户操作返回',e)
uni.switchTab({
url:'../index'
})
return true
},
onReady() {
if(this.keyword != ''){
uni.setNavigationBarTitle({
... ...
... ... @@ -111,14 +111,16 @@
},
onLoad(option){
this.param = JSON.parse(option.param)
console.log('this.param',this.param)
this.companyId = option.companyid
},
onShow() {
//企业状态查询
uni.request({
url:this.apiUrl + 'license/getCompany',
data:{companyId:this.companyId},
method:'get',
success: (res) => {
console.log('归档状态查询',res)
this.companyInfo = res.data.data
}
})
... ... @@ -961,7 +963,6 @@
}
]
}
//废水-排口
if(this.param.code == 'fs_pk'){
this.checkList = [
... ... @@ -1021,7 +1022,7 @@
keyList:[
{
title:'三.监测内容',
show:false,
show:this.param.checkId ? true : false,
pdoType:'1',
organization:0,
type:'airpull',
... ... @@ -1059,7 +1060,6 @@
}
]
}
//废水-排口-监测内容
if(this.param.code == 'fs_pk_jcnr'){
this.checkList = [
... ... @@ -1069,7 +1069,6 @@
}
]
}
//废气
if(this.param.code == 'fq'){
this.checkList = [
... ... @@ -1614,7 +1613,23 @@
}
this.getData()
},
onBackPress(e) {
console.log('用户操作返回',e);
if(this.param.code == 'fs_pk'){
uni.redirectTo({
url:'checkDetail?param='+JSON.stringify({code:'fs'})+'&companyid='+this.companyId
})
return true;
}
if(this.param.code == 'fs'){
uni.redirectTo({
url:'factoryDetail?companyid='+this.companyId
})
return true;
}
},
onReady() {
//基本情况
if(this.param.code == 'jbqk'){
uni.setNavigationBarTitle({
... ... @@ -1693,7 +1708,6 @@
method:'get',
data:{companyId:this.companyId,type:this.param.type},
success: (res) => {
console.log('打印测试数据',res)
for(var k = 0; k < this.checkList.length; k ++){
if(this.checkList[k].tempType == 'radio'){
for(var i = 0; i < this.checkList[k].keyList.length; i++){
... ... @@ -1740,7 +1754,6 @@
case 'fs' : code = 'fs_pk'; break;
default : code = 'fq_pc'; break;
}
console.log('code',code)
this.getPkInfo(keyList,type,code)
}
... ... @@ -1748,7 +1761,6 @@
if(this.checkList[i].tempType == 'radio' && (this.param.code == 'swrqk' || this.param.code == 'dqwrqk')){
var check = this.checkList[i]
var type = this.param.code == 'swrqk' ? '21' : '22'
console.log('type',type)
uni.request({
url:this.apiUrl + 'license/otherInfo',
method:'get',
... ... @@ -1790,7 +1802,6 @@
method:'get',
data:{companyId:this.companyId,pdoId:this.param.pdoId},
success: (res) => {
console.log('水污染情况-排口',res)
for(var k = 0; k < this.checkList.length; k ++){
if(this.checkList[k].tempType == 'radio'){
for(var i = 0; i < this.checkList[k].keyList.length; i++){
... ... @@ -1934,7 +1945,6 @@
method:'get',
data:{companyId:this.companyId,pdoCd:this.param.pdoCd},
success: (res) => {
console.log('噪声排放',res)
for(var k = 0; k < this.checkList.length; k ++){
if(this.checkList[k].tempType == 'radio'){
for(var i = 0; i < this.checkList[k].keyList.length; i++){
... ... @@ -1954,7 +1964,6 @@
}
if(res.data.data.noisevalue.length > 0){
for(var k = 0; k < 2; k ++){
console.log(res.data.data.noisevalue[k])
this.checkList[1].keyList[0].subKeyList.push({
ID:res.data.data.noisevalue[k].ID,
FIELDCN:res.data.data.noisevalue[k].FIELDCN,
... ... @@ -2039,65 +2048,7 @@
//废水-排口
if(this.param.code == 'fs_pk'){
uni.request({
url:this.apiUrl + 'license/selfWater',
method:'get',
data:{companyId:this.companyId,pdoId:this.param.pdoId},
success: (res) => {
console.log('废水-排口',res)
for(var k = 0; k < this.checkList.length; k ++){
if(this.checkList[k].tempType == 'radio'){
for(var i = 0; i < this.checkList[k].keyList.length; i++){
for(var j = 0; j < res.data.data.length; j ++){
if(this.checkList[k].keyList[i].title == res.data.data[j].FIELDCN){
this.checkList[k].keyList[i].id = res.data.data[j].ID
if(res.data.data[j].FILEDSTATICS){
this.checkList[k].keyList[i].check = parseInt(res.data.data[j].FILEDSTATICS)
}else{
this.checkList[k].keyList[i].check = -1
}
if(res.data.data[j].IMGS){
this.checkList[k].keyList[i].moreInfo.IMGS = res.data.data[j].IMGS
}
if(res.data.data[j].NOTE){
this.checkList[k].keyList[i].moreInfo.NOTE = res.data.data[j].NOTE
}
if(res.data.data[j].LON){
this.checkList[k].keyList[i].moreInfo.LON = res.data.data[j].LON
this.checkList[k].keyList[i].moreInfo.LAT = res.data.data[j].LAT
}
break;
}
}
}
}
if(this.checkList[k].tempType == 'check'){
for(var i = 0; i < this.checkList[k].keyList.length; i++){
for(var j = 0; j < res.data.data.length; j ++){
if(this.checkList[k].keyList[i].title == '三.监测内容' && res.data.data[j].FIELDCN =='监测内容'){
var keyList = this.checkList[k].keyList[i]
uni.request({
url:this.apiUrl + 'license/selfMonitInfo',
method:'get',
data:{id:res.data.data[j].ID},
success: (res) => {
for(var l = 0; l < res.data.data.length; l ++){
keyList.subKeyList.push({
title:res.data.data[l].FIELDCN,
param:JSON.stringify({id:res.data.data[l].ID,code:'fs_pk_jcnr',navBarTitle:res.data.data[l].FIELDCN}),
name:res.data.data[l].CONTENT
})
}
}
})
break
}
}
}
}
}
}
})
this.getFsPkInfo()
}
//废水-排口-监测内容
... ... @@ -2237,10 +2188,119 @@
},
async getFsPkInfo(){
var jcnrId = ''
var keyList = {}
var reqRet = await this.reqFsPk()
console.log('获取废水排口页信息',reqRet)
for(var k = 0; k < this.checkList.length; k ++){
if(this.checkList[k].tempType == 'radio'){
for(var i = 0; i < this.checkList[k].keyList.length; i++){
for(var j = 0; j < reqRet.dataList.length; j ++){
if(this.checkList[k].keyList[i].title == reqRet.dataList[j].FIELDCN){
this.checkList[k].keyList[i].id = reqRet.dataList[j].ID
if(reqRet.dataList[j].FILEDSTATICS){
this.checkList[k].keyList[i].check = parseInt(reqRet.dataList[j].FILEDSTATICS)
}else{
this.checkList[k].keyList[i].check = -1
}
if(reqRet.dataList[j].IMGS){
this.checkList[k].keyList[i].moreInfo.IMGS = reqRet.dataList[j].IMGS
}
if(reqRet.dataList[j].NOTE){
this.checkList[k].keyList[i].moreInfo.NOTE = reqRet.dataList[j].NOTE
}
if(reqRet.dataList[j].LON){
this.checkList[k].keyList[i].moreInfo.LON = reqRet.dataList[j].LON
this.checkList[k].keyList[i].moreInfo.LAT = reqRet.dataList[j].LAT
}
break;
}
}
}
}
if(this.checkList[k].tempType == 'check'){
for(var i = 0; i < this.checkList[k].keyList.length; i++){
for(var j = 0; j < reqRet.dataList.length; j ++){
if(this.checkList[k].keyList[i].title == '三.监测内容' && reqRet.dataList[j].FIELDCN =='监测内容'){
jcnrId = reqRet.dataList[j].ID
keyList = this.checkList[k].keyList[i]
break
}
}
}
}
}
console.log('监测内容Id是',jcnrId,keyList)
var jcnrRet = await this.reqJcnr(jcnrId)
console.log('监测内容是',jcnrRet)
for(var l = 0; l < jcnrRet.dataList.length; l ++){
keyList.subKeyList.push({
id:jcnrRet.dataList[l].ID,
title:jcnrRet.dataList[l].FIELDCN,
param:JSON.stringify({
id:jcnrRet.dataList[l].ID,
code:'fs_pk_jcnr',
navBarTitle:jcnrRet.dataList[l].FIELDCN,
parCode:this.param.code,
parPdoCd:this.param.pdoCd,
parPdoId:this.param.pdoId,
parType:this.param.type
}),
name:jcnrRet.dataList[l].CONTENT,
saved:jcnrRet.dataList[l].SAVED
})
}
setTimeout(()=>{
if(this.param.hasOwnProperty("checkId")){
this.toHref(this.param.checkId)
}
},500)
},
reqFsPk(){
return new Promise((reslove,reject) => {
uni.request({
url:this.apiUrl + 'license/selfWater',
method:'get',
data:{companyId:this.companyId,pdoId:this.param.pdoId},
success: (res) => {
reslove({dataList:res.data.data})
}
})
})
},
reqJcnr(id){
return new Promise((reslove,reject) => {
uni.request({
url:this.apiUrl + 'license/selfMonitInfo',
method:'get',
data:{id:id},
success: (res) => {
reslove({dataList:res.data.data})
/* for(var l = 0; l < res.data.data.length; l ++){
keyList.subKeyList.push({
id:res.data.data[l].ID,
title:res.data.data[l].FIELDCN,
param:JSON.stringify({
id:res.data.data[l].ID,
code:'fs_pk_jcnr',
navBarTitle:res.data.data[l].FIELDCN,
parCode:this.param.code,
parPdoCd:this.param.pdoCd,
parPdoId:this.param.pdoId,
parType:this.param.type
}),
name:res.data.data[l].CONTENT,
saved:res.data.data[l].SAVED
})
} */
}
})
})
},
async getPkInfo(keyList,type,code){
var res = await this.reqPkInfo(keyList)
for(var l = 0; l < res.data.data.length; l ++){
console.log('参数',JSON.stringify({type:type,pdoId:res.data.data[l].ID,pdoCd:res.data.data[l].PDO_CD,code:code}))
keyList.subKeyList.push({
title:res.data.data[l].PDO_NM,
param:JSON.stringify({type:type,pdoId:res.data.data[l].ID,pdoCd:res.data.data[l].PDO_CD,code:code}),
... ... @@ -2371,7 +2431,6 @@
thKeyList:(await this.getSubKeyList(subKeyObj.ID)).thKeyList
}
keyList.subKeyList.push(subKey)
console.log('keyList.subKeyList',keyList.subKeyList)
},
getSubKeyList(id){
return new Promise((resolve,reject) => {
... ... @@ -2401,7 +2460,6 @@
uni.showLoading({
title:'保存中...'
})
console.log('this.param.code',this.param.code)
//全部保存状态
var allSaveStatus = true
... ... @@ -2448,8 +2506,6 @@
}
}
}
console.log('saveParam',saveParam)
console.log('saveBaseParam',saveBaseParam)
if(saveParam.length == 0 && saveBaseParam.length == 0){
uni.showToast({
title:'请选择检查项',
... ... @@ -2458,25 +2514,25 @@
uni.hideLoading()
}
uni.request({
url:this.apiUrl + 'license/updateSelfMonitInfo',
url:this.apiUrl + 'license/baseinfoupdate',
method:'post',
data:saveParam,
data:saveBaseParam,
success: (res) => {
this.check_zxjc()
uni.hideLoading()
uni.showToast({
title:'保存成功'
})
}
})
uni.request({
url:this.apiUrl + 'license/baseinfoupdate',
url:this.apiUrl + 'license/updateSelfMonitInfo',
method:'post',
data:saveBaseParam,
data:saveParam,
success: (res) => {
this.check_zxjc()
}
})
uni.hideLoading()
uni.showToast({
title:'保存成功'
})
}
//废水-排口-检测内容（已检查）
... ... @@ -2529,7 +2585,6 @@
if(this.checkList[i].keyList[j].moreInfo.IMGS.length > 0){
this.returnImgs(this.checkList[i].keyList[j].moreInfo)
}
console.log('转码后的moreInfo',this.checkList[i].keyList[j].moreInfo)
if(check != -1){
saveParam.push({
filedstatic:check.toString(),
... ... @@ -2554,7 +2609,6 @@
uni.hideLoading()
return
}
console.log('saveParam',saveParam)
uni.request({
url:this.apiUrl + 'license/baseinfoupdate',
method:'post',
... ... @@ -2589,7 +2643,7 @@
data:{},
method:'post',
success:(res)=>{
console.log('步骤保存',res)
}
})
}else if(this.param.code == 'fs_pk'){
... ... @@ -2664,9 +2718,17 @@
this.check_cwhj()
uni.hideLoading()
}
uni.navigateBack({
delta:1
})
if(this.param.code == 'fs_pk_jcnr'){
uni.navigateTo({
url:'/pages/index/license/checkDetail?param='+JSON.stringify({checkId:this.param.id,type:this.param.parType,pdoId:this.param.parPdoId,pdoCd:this.param.parPdoCd,code:this.param.parCode})+'&companyid='+this.companyId
})
}else{
uni.navigateBack({
delta:1
})
}
},
async returnImgs(moreInfo){
for(var j = 0; j < moreInfo.IMGS.length; j ++){
... ... @@ -2683,131 +2745,170 @@
})
},
//自行检测检查是否全部保存
check_zxjc(){
async check_zxjc(){
let allSaveStatus = true
var checkDataList = {
dataList1:[],
dataList2:[]
}
var dataList2 = []
var dataList3 = []
//废水有组织排口
this.zxjc_pc(0,0,1,'license/selfWater')
var reqList1 = await this.getReqList1(0,0,1)
for(var i = 0; i < reqList1.dataList.length; i ++){
var reqList2 = await this.getReqList2(reqList1.dataList[i],'license/selfWater')
this.checkDataList.dataList1 = this.checkDataList.dataList1.concat(reqList2.otherList)
dataList2 = dataList2.concat(reqList2.dataList)
}
for(var i = 0; i < dataList2.length; i ++){
var reqList3 = await this.getReqList3(dataList2[i])
dataList3 = dataList3.concat(reqList3.dataList)
}
for(var i = 0; i < dataList3.length; i ++){
var reqList4 = await this.getReqList4(dataList3[i])
this.checkDataList.dataList2 = this.checkDataList.dataList2.concat(reqList4.dataList)
}
//废气有组织排口
this.zxjc_pc(1,0,1,'license/selfGas')
dataList2 = []
dataList3 = []
var reqList1 = await this.getReqList1(1,0,1)
for(var i = 0; i < reqList1.dataList.length; i ++){
var reqList2 = await this.getReqList2(reqList1.dataList[i],'license/selfGas')
this.checkDataList.dataList1 = this.checkDataList.dataList1.concat(reqList2.otherList)
dataList2 = dataList2.concat(reqList2.dataList)
}
for(var i = 0; i < dataList2.length; i ++){
var reqList3 = await this.getReqList3(dataList2[i])
dataList3 = dataList3.concat(reqList3.dataList)
}
for(var i = 0; i < dataList3.length; i ++){
var reqList4 = await this.getReqList4(dataList3[i])
this.checkDataList.dataList2 = this.checkDataList.dataList2.concat(reqList4.dataList)
}
//废气无组织排口
this.zxjc_pc(1,1,1,'license/selfGas')
setTimeout(() => {
try{
this.checkDataList.dataList1.forEach(item =>{
console.log(item)
if(!item.hasOwnProperty("FILEDSTATICS")){
throw Error()
}
})
this.checkDataList.dataList2.forEach(item =>{
console.log(item)
if(!item.hasOwnProperty("FILEDSTATICS")){
throw Error()
}
})
}catch(err){
allSaveStatus = false
}
console.log('=================================allSaveStatus',allSaveStatus)
if(allSaveStatus){
uni.request({
url:this.apiUrl + 'license/updateStep?companyId='+this.companyId+'&step=3',
data:{},
method:'post',
success:(res)=>{
}
})
}
},1000)
dataList2 = []
dataList3 = []
var reqList1 = await this.getReqList1(1,1,1)
for(var i = 0; i < reqList1.dataList.length; i ++){
var reqList2 = await this.getReqList2(reqList1.dataList[i],'license/selfGas')
this.checkDataList.dataList1 = this.checkDataList.dataList1.concat(reqList2.otherList)
dataList2 = dataList2.concat(reqList2.dataList)
}
for(var i = 0; i < dataList2.length; i ++){
var reqList3 = await this.getReqList3(dataList2[i])
dataList3 = dataList3.concat(reqList3.dataList)
}
for(var i = 0; i < dataList3.length; i ++){
var reqList4 = await this.getReqList4(dataList3[i])
this.checkDataList.dataList2 = this.checkDataList.dataList2.concat(reqList4.dataList)
}
try{
this.checkDataList.dataList1.forEach(item =>{
if(!item.hasOwnProperty("FILEDSTATICS")){
throw Error()
}
})
this.checkDataList.dataList2.forEach(item =>{
if(!item.hasOwnProperty("FILEDSTATICS")){
throw Error()
}
})
}catch(err){
allSaveStatus = false
}
if(allSaveStatus){
uni.request({
url:this.apiUrl + 'license/updateStep?companyId='+this.companyId+'&step=3',
data:{},
method:'post',
success:(res)=>{
}
})
}
},
check_zxjc_wait(checkParam){
getReqList1(pdoType,organization,selfmonitor){
return new Promise((reslove,reject) => {
for(var m = 0; m < checkParam.length; m++){
var subUrl = checkParam[m].subUrl
console.log('subUrl',subUrl)
// 废水 - 有组织排口
uni.request({
url:this.apiUrl + 'license/pdos',
method:'get',
//pdoType：排口类型，0 水，1 空气，2 固体排放物
//selfmonitor：0.非自行监测排口，1.自行监测排口
//organization：0.有组织排口 1.无组织排口
data:{
companyId:this.companyId,
pdoType:checkParam[m].pdoType,
organization:checkParam[m].organization,
selfmonitor:checkParam[m].selfmonitor
},
success: (res) => {
for(var i = 0; i < res.data.data.length; i ++){
console.log('checkParam',checkParam,res.data.data)
// 废水、废气 - 有组织排口 - 排口检查项
uni.request({
url:this.apiUrl + subUrl,
method:'get',
data:{companyId:this.companyId,pdoId:res.data.data[i].ID},
success: (res) => {
for(var j = 0; j < res.data.data.length; j ++){
if(res.data.data[j].FIELDCN =='监测内容'){
// 废水、废气 - 有组织排口 - 检测内容
uni.request({
url:this.apiUrl + 'license/selfMonitInfo',
method:'get',
data:{id:res.data.data[j].ID},
success: (res) => {
for(var k = 0; k < res.data.data.length; k ++){
console.log(res.data.data[k])
uni.request({
url:this.apiUrl + 'license/selfMonitValue',
method:'get',
data:{id:res.data.data[k].ID},
success: (res) => {
for(var l = 0; l < res.data.data.length; l ++){
if(!res.data.data[l].hasOwnProperty("FILEDSTATICS")){
reslove({allSaveStatus:false})
}
}
}
})
}
}
})
}else{
if(!res.data.data[j].hasOwnProperty("FILEDSTATICS")){
reslove({allSaveStatus:false})
}
}
}
}
})
uni.request({
url:this.apiUrl + 'license/pdos',
method:'get',
//pdoType：排口类型，0 水，1 空气，2 固体排放物
//selfmonitor：0.非自行监测排口，1.自行监测排口
//organization：0.有组织排口 1.无组织排口
data:{
companyId:this.companyId,
pdoType:pdoType,
organization:organization,
selfmonitor:selfmonitor
},
success: (res) => {
reslove({dataList:res.data.data})
}
})
})
},
getReqList2(item,subUrl){
return new Promise((reslove,reject) => {
uni.request({
url:this.apiUrl + subUrl,
data:{companyId:this.companyId,pdoId:item.ID},
method:'get',
success: (res) => {
let otherList = []
let dataList = []
res.data.data.forEach(item => {
if(item.FIELDCN != '监测内容'){
otherList.push(item)
}else{
dataList.push(item)
}
}
})
}
})
reslove({otherList:otherList,dataList:dataList})
}
})
})
},
getReqList3(item){
return new Promise((reslove,reject) => {
uni.request({
url:this.apiUrl + 'license/selfMonitInfo',
data:{id:item.ID},
method:'get',
success: (res) => {
reslove({dataList:res.data.data})
}
})
})
},
getReqList4(item){
return new Promise((reslove,reject) => {
uni.request({
url:this.apiUrl + 'license/selfMonitValue',
data:{id:item.ID},
method:'get',
success: (res) => {
reslove({dataList:res.data.data})
}
})
})
},
//产污环节对应排放口及其排放数量
async check_cwhj(){
//水污染情况
var swr_qtpk_ret = await this.check_qtpk('21')
console.log('check_swrqk_qtpk之后执行',swr_qtpk_ret)
//水污染情况-有组织排口
var swr_yzzpk_ret = await this.check_gtfw(0,0,0,'license/waterpull')
console.log('swr_yzzpk_ret之后执行',swr_yzzpk_ret)
//大气污染情况
var dqwr_qtpk_ret = await this.check_qtpk('22')
console.log('check_swrqk_qtpk之后执行',dqwr_qtpk_ret)
//大气污染情况-有组织排口
var dqwr_yzzpk_ret = await this.check_gtfw(1,0,0,'license/airpull')
console.log('dqwr_yzzpk_ret之后执行',dqwr_yzzpk_ret)
//噪声排放
var zspf_ret = await this.check_zspf()
console.log('zspf_ret之后执行',zspf_ret)
//固体废物排放
var gtfw_ret = await this.check_gtfw(2,0,0,'license/solidpull')
console.log('gtfw_ret之后执行',gtfw_ret)
if(swr_qtpk_ret.allSaveStatus && swr_yzzpk_ret.allSaveStatus && dqwr_qtpk_ret.allSaveStatus && dqwr_yzzpk_ret.allSaveStatus && zspf_ret.allSaveStatus && gtfw_ret.allSaveStatus){
uni.request({
url:this.apiUrl + 'license/updateStep?companyId='+this.companyId+'&step=2',
... ... @@ -2831,7 +2932,6 @@
method:'get',
success: (res) => {
res.data.data.forEach(item => {
console.log(item)
if(!item.hasOwnProperty("FILEDSTATICS")){
reslove({allSaveStatus:false})
}
... ... @@ -2855,14 +2955,12 @@
success: (res) => {
res.data.data.noisebase.forEach(item => {
if(item.FIELDCN != '生产时段' && item.FIELDCN != '排放限值'){
console.log(item)
if(!item.hasOwnProperty("FILEDSTATICS")){
reslove({allSaveStatus:false})
}
}
})
res.data.data.noisevalue.forEach(item => {
console.log(item)
if(!item.hasOwnProperty("FILEDSTATICS")){
reslove({allSaveStatus:false})
}
... ... @@ -2908,11 +3006,9 @@
data:{companyId:this.companyId,pdoId:pdoId},
method:'get',
success: (res_pk) => {
console.log('res_pk',res_pk)
if(res_pk.data.data.hasOwnProperty("solidbase")){
res_pk.data.data.solidbase.forEach(item => {
if(item.FIELDCN != '名称及产量'){
console.log(item)
if(!item.hasOwnProperty("FILEDSTATICS")){
reslove({allSaveStatus:false})
}
... ... @@ -2922,7 +3018,6 @@
if(res_pk.data.data.hasOwnProperty("solidwrw")){
res_pk.data.data.solidwrw.forEach(item => {
if(item.FIELDCN != '名称及产量'){
console.log(item)
if(!item.hasOwnProperty("FILEDSTATICS")){
reslove({allSaveStatus:false})
}
... ... @@ -2932,7 +3027,6 @@
if(res_pk.data.data.hasOwnProperty("base")){
res_pk.data.data.base.forEach(item => {
if(item.FIELDCN != '受纳自然水体' && item.FIELDCN != '污染物种类'){
console.log(item)
if(!item.hasOwnProperty("FILEDSTATICS")){
reslove({allSaveStatus:false})
}
... ... @@ -2941,7 +3035,6 @@
}
if(res_pk.data.data.hasOwnProperty("snst")){
res_pk.data.data.snst.forEach(item => {
console.log(item)
if(!item.hasOwnProperty("FILEDSTATICS")){
reslove({allSaveStatus:false})
}
... ... @@ -2949,7 +3042,6 @@
}
if(res_pk.data.data.hasOwnProperty("wrw")){
res_pk.data.data.wrw.forEach(item => {
console.log(item)
if(!item.hasOwnProperty("FILEDSTATICS")){
reslove({allSaveStatus:false})
}
... ... @@ -2958,7 +3050,6 @@
if(res_pk.data.data.hasOwnProperty("airbase")){
res_pk.data.data.airbase.forEach(item => {
if(item.FIELDCN != '污染物种类'){
console.log(item)
if(!item.hasOwnProperty("FILEDSTATICS")){
reslove({allSaveStatus:false})
}
... ... @@ -2967,7 +3058,6 @@
}
if(res_pk.data.data.hasOwnProperty("airwrw")){
res_pk.data.data.airwrw.forEach(item => {
console.log(item)
if(!item.hasOwnProperty("FILEDSTATICS")){
reslove({allSaveStatus:false})
}
... ... @@ -3042,32 +3132,11 @@
return new Promise((reslove,reject)=>{
})
/* return new Promise((reslove,reject) => {
uni.request({
url:this.apiUrl + subUrl,
data:{companyId:this.companyId,pdoId:pdoId},
method:'get',
success: (res_pk) => {
res_pk.data.data.forEach(item => {
if(item.FIELDCN != '监测内容'){
console.log(item)
if(!item.hasOwnProperty("FILEDSTATICS")){
reslove({allSaveStatus:false})
}
}else{
this.jcx_jcnr(item.ID)
}
})
}
})
}) */
},
//自行监测-排口、厂界-检查项-监测内容
async jcx_jcnr(id){
var jcx_jcnr_req = await this.jcx_jcnr_req(id)
console.log('jcx_jcnr_req',jcx_jcnr_req)
return jcx_jcnr_req
},
jcx_jcnr_req(id){
... ... @@ -3079,7 +3148,6 @@
success: (res_pk) => {
res_pk.data.data.forEach(item => {
var jcnr_check = this.jcnr_check(item.ID)
console.log('jcnr_check',jcnr_check)
})
}
})
... ... @@ -3088,7 +3156,6 @@
//自行监测-排口、厂界-检查项-监测内容
async jcnr_check(id){
var jcnr_check_req = await this.jcnr_check_req(id)
console.log('jcnr_check_req',jcnr_check_req)
return jcnr_check_req
},
jcnr_check_req(id){
... ... @@ -3099,7 +3166,6 @@
method:'get',
success: (res_pk) => {
res_pk.data.data.forEach(item => {
console.log(item)
if(!item.hasOwnProperty("FILEDSTATICS")){
reslove({allSaveStatus:false})
return
... ... @@ -3111,6 +3177,14 @@
}
})
})
},
toHref(id) {
uni.createSelectorQuery().select('#check_'+id).boundingClientRect(function(rects){
uni.pageScrollTo({
scrollTop: rects.top,
duration: 300
})
}).exec();
}
}
}
... ...
... ... @@ -201,6 +201,13 @@
return true
}
},
onBackPress(e) {
console.log('用户操作返回',e)
uni.redirectTo({
url:'check'
})
return true
},
onShow() {
this.getData()
},
... ... @@ -236,9 +243,7 @@
url:'../../login/login'
})
}
uni.setNavigationBarTitle({
title: option.factoryName //这是修改后的导航栏文字
})
},
methods: {
getData(){
... ... @@ -250,6 +255,9 @@
success: (res) => {
console.log('归档状态查询',res)
this.companyInfo = res.data.data
uni.setNavigationBarTitle({
title: this.companyInfo.OWNERCOMPANY //这是修改后的导航栏文字
})
}
})
uni.request({
... ...
... ... @@ -5,6 +5,7 @@ const store=new Vuex.Store({
state:{
attrVal:[],//detailAttr里的valindex [0,0]
attrTxt:'请选择商品规格尺寸',
checkId:'',
keyword:'',
isLogin:0,
userinfo:uni.getStorageSync('userinfo')?JSON.parse(uni.getStorageSync('userinfo')):{}
... ... @@ -16,6 +17,12 @@ const store=new Vuex.Store({
defaultKeyword(state){
state.keyword=''
},
setCheckId(state,data){
state.checkId=data.checkId
},
defaultCheckId(state){
state.checkId=''
},
setAttr(state,data){
state.attrVal=data.attrVal
state.attrTxt=data.attrTxt
... ...