fix: BUG修改
This commit is contained in:
kun
parent
4eb29cfc97
commit
92a700d3d4
8
main.js
8
main.js
@ -85,13 +85,13 @@ if (process.env.NODE_ENV === 'development') {
|
||||
// Vue.prototype.url_config = 'http://10.168.1.105:11111/' // 线上地址
|
||||
// Vue.prototype.url_config = 'http://10.168.1.104:11111/' // 线上地址
|
||||
// Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢线上地址（弃用）
|
||||
Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢线上地址
|
||||
// Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢线上测试地址
|
||||
// Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢线上地址
|
||||
Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢线上测试地址
|
||||
// Vue.prototype.url_config = 'http://182.90.224.237:51234/' // 百色三标段
|
||||
// Vue.prototype.url_config = 'http://192.168.34.221:9111/' // 百色三标段
|
||||
// Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
|
||||
Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
|
||||
// Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
|
||||
// Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
|
||||
Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
|
||||
// Vue.prototype.work_url = 'http://192.168.34.139:5173' // 工作流地址
|
||||
// Vue.prototype.url_config = 'http://182.90.224.147:100/' //演示平台
|
||||
// Vue.prototype.url_config ='http://124.71.178.44:8012/' // 河南
|
||||
|
||||
@ -441,6 +441,15 @@
|
||||
this.contractList = res.result.contractList; //合同
|
||||
this.physicalsList = res.result.physicalsList; //体检列表
|
||||
this.safeEducationList = res.result.safeEducationList; //安全教育
|
||||
// 修改工号和身份证展示格式
|
||||
if(this.workerInfo.idCard){
|
||||
let str = "***************"
|
||||
this.workerInfo.idCard = this.workerInfo.idCard.substring(0,3)+str+this.workerInfo.idCard.substring(16)
|
||||
}
|
||||
if(this.workerInfo.attendanceNumber){
|
||||
let str = "***************"
|
||||
this.workerInfo.attendanceNumber = this.workerInfo.attendanceNumber.substring(0,3)+str+this.workerInfo.attendanceNumber.substring(16)
|
||||
}
|
||||
if (this.workerInfo) {
|
||||
this.setCodeColor(this.workerInfo.safeScore)
|
||||
} else {
|
||||
|
||||
@ -758,6 +758,18 @@
|
||||
}
|
||||
})
|
||||
},
|
||||
dealFalseCheck(arr){
|
||||
arr.map(item => {
|
||||
if(item.children){
|
||||
item.checked = false;
|
||||
item.orChecked = false;
|
||||
this.dealFalseCheck(item.children)
|
||||
} else {
|
||||
item.checked = false;
|
||||
item.orChecked = false;
|
||||
}
|
||||
})
|
||||
},
|
||||
//确定选中--回显
|
||||
checkPointBtn(val, type) {
|
||||
this.form.level = ''
|
||||
@ -1422,6 +1434,23 @@
|
||||
this.subsectionIndex = -1
|
||||
this.subentryIndex = -1
|
||||
this.changePeopleIndex = null
|
||||
// 重置检查部位
|
||||
this.dealFalseCheck(this.checkPointList);
|
||||
this.$refs.locationTree._reTreeList();
|
||||
// 分包单位数据拿取
|
||||
this.subpackageLsit = []
|
||||
// 整改人数据拿取
|
||||
this.personUpdateList = []
|
||||
let index = this.personList.findIndex(item => {
|
||||
return item.userId == this.userInfo.userId;
|
||||
})
|
||||
if (index != -1) {
|
||||
this.verifyManIndex = index;
|
||||
this.form.verifyManId = this.personList[index].userId;
|
||||
} else {
|
||||
this.defaultAuditPerson = this.userInfo.realName;
|
||||
this.form.verifyManId = this.userInfo.userId;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -758,6 +758,18 @@
|
||||
}
|
||||
})
|
||||
},
|
||||
dealFalseCheck(arr){
|
||||
arr.map(item => {
|
||||
if(item.children){
|
||||
item.checked = false;
|
||||
item.orChecked = false;
|
||||
this.dealFalseCheck(item.children)
|
||||
} else {
|
||||
item.checked = false;
|
||||
item.orChecked = false;
|
||||
}
|
||||
})
|
||||
},
|
||||
//确定选中--回显
|
||||
checkPointBtn(val, type) {
|
||||
this.form.level = ''
|
||||
@ -786,6 +798,9 @@
|
||||
this.form.changeId = val[0].dutyId;
|
||||
this.notifier = val[0].intendanceNames;
|
||||
this.form.notifyPerson = val[0].intendanceIds;
|
||||
// 重置检查部位
|
||||
this.dealFalseCheck(this.checkPointList);
|
||||
this.$refs.locationTree._reTreeList();
|
||||
// 分包单位数据拿取
|
||||
this.subpackageLsit = val[0].enterpriseInfos
|
||||
// 整改人数据拿取
|
||||
@ -1422,6 +1437,20 @@
|
||||
this.subsectionIndex = -1
|
||||
this.subentryIndex = -1
|
||||
this.changePeopleIndex = null
|
||||
// 分包单位数据拿取
|
||||
this.subpackageLsit = []
|
||||
// 整改人数据拿取
|
||||
this.personUpdateList = []
|
||||
let index = this.personList.findIndex(item => {
|
||||
return item.userId == this.userInfo.userId;
|
||||
})
|
||||
if (index != -1) {
|
||||
this.verifyManIndex = index;
|
||||
this.form.verifyManId = this.personList[index].userId;
|
||||
} else {
|
||||
this.defaultAuditPerson = this.userInfo.realName;
|
||||
this.form.verifyManId = this.userInfo.userId;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -49,7 +49,7 @@
|
||||
<uni-icons @click="deleteImg(item)" class="deleteImg" type="clear" size="24">
|
||||
</uni-icons>
|
||||
</view>
|
||||
<view class="addImgBox" @click="selectImg" v-if="fileList.length<5">
|
||||
<view class="addImgBox" @click="selectImg" v-if="fileList.length<1">
|
||||
<image src="/static/icon-add.png" class="icon-add"></image>
|
||||
</view>
|
||||
</view>
|
||||
@ -79,25 +79,29 @@
|
||||
form: {
|
||||
alarmDetails: "", //异常详情
|
||||
alarmImage: "", //异常图片
|
||||
inPointName: "巡检点", //巡检点名称
|
||||
inPointName: "", //巡检点名称
|
||||
inPointId: 0, //巡检点名称
|
||||
posiTion: "777563", // 巡检点位置
|
||||
createUserName: "创建人", //创建人
|
||||
createData: "创建时间", //创建时间
|
||||
posiTion: "", // 巡检点位置
|
||||
createUserName: "", //创建人
|
||||
createData: "", //创建时间
|
||||
templateList: [],
|
||||
status: 1,
|
||||
|
||||
},
|
||||
fileList: [],
|
||||
status: false,
|
||||
saoData: "",
|
||||
longitude: 0,
|
||||
latitude: 0,
|
||||
sendData: ""
|
||||
}
|
||||
},
|
||||
onLoad(e) {
|
||||
this.checkOpenGPSServiceByAndroid()
|
||||
console.log(e.data,'我的测试数据')
|
||||
this.sendData = JSON.parse(e.data);
|
||||
uni.showLoading({
|
||||
title: "获取数据中"
|
||||
})
|
||||
this.getnow(e.data)
|
||||
},
|
||||
methods: {
|
||||
@ -126,6 +130,7 @@
|
||||
}
|
||||
},
|
||||
getnow(Val) {
|
||||
let that = this;
|
||||
uni.getLocation({
|
||||
// type: 'wgs84',
|
||||
type: 'gcj02',
|
||||
@ -194,13 +199,23 @@
|
||||
|
||||
// }
|
||||
})
|
||||
this.form.inPointName = data.checkingPointName
|
||||
this.form.createUserName = data.createUserName
|
||||
this.form.posiTion = data.position
|
||||
this.form.inPointId = data.checkingPointId
|
||||
this.form.templateList = JSON.parse(data.template)
|
||||
console.log('this.form.templateList 数据 ' + JSON.parse(data.template)[0].title);
|
||||
|
||||
this.sendRequest({
|
||||
url: "xmgl/checkingPoint/queryById",
|
||||
data: {
|
||||
id: data.checkingPointId
|
||||
},
|
||||
method: "GET",
|
||||
success(res) {
|
||||
console.log('responseData-----------', res);
|
||||
let responseData = res.result || {};
|
||||
that.form.inPointName = responseData.checkingPointName
|
||||
that.form.createUserName = responseData.createUserName
|
||||
that.form.posiTion = responseData.position
|
||||
that.form.inPointId = responseData.checkingPointId
|
||||
that.form.templateList = JSON.parse(responseData.template)
|
||||
uni.hideLoading()
|
||||
}
|
||||
})
|
||||
},
|
||||
fail: function(msg) {
|
||||
console.log("获取位置失败", msg)
|
||||
@ -270,12 +285,12 @@
|
||||
data: {
|
||||
alarmDetails: this.form.alarmDetails,
|
||||
alarmImage: JSON.stringify(this.fileList),
|
||||
checkingPointId: this.form.inPointId,
|
||||
// checkingPointId: this.form.inPointId,
|
||||
checkingPointName: this.form.inPointName,
|
||||
checkingPointUserId: userInfo.userId,
|
||||
checkingPointUserName: userInfo.account,
|
||||
createDate: "",
|
||||
id: 0,
|
||||
checkingPointId: this.sendData?this.sendData.checkingPointId:"",
|
||||
position: this.form.posiTion,
|
||||
status: this.form.status,
|
||||
template: JSON.stringify(this.form.templateList),
|
||||
@ -306,6 +321,19 @@
|
||||
},
|
||||
//确定提交
|
||||
addBtn() {
|
||||
if(!this.form.alarmDetails && this.form.status == 2){
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: "异常详情不能为空",
|
||||
confirmColor: '#ee6666', //确定字体颜色
|
||||
showCancel: false, //没有取消按钮的弹框
|
||||
buttonText: '确定',
|
||||
success: function(res) {
|
||||
|
||||
},
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (this.form.templateList.length >= 1) {
|
||||
let check = true
|
||||
this.form.templateList.forEach(res => {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user