diff --git a/src/views/map/dialog/hotworkFirst.vue b/src/views/map/dialog/hotworkFirst.vue index 7678907..8084bfc 100644 --- a/src/views/map/dialog/hotworkFirst.vue +++ b/src/views/map/dialog/hotworkFirst.vue @@ -141,13 +141,23 @@ 接受交底人 -
+
签字: - - {{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }} + + {{ item.APPROVAL_SIGNATURE_TIME }}
+ + + + + + + + + + 监护人 @@ -273,6 +283,7 @@ export default { imgList: [], imgList1: [], otherProtectiveMeasures: [], + acceptConfessList: [], confessList: [] } }, @@ -320,6 +331,11 @@ export default { this.confessList.push(item) } }) + data.pd.acceptConfessList.forEach(item => { + if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') { + this.acceptConfessList.push(item) + } + }) for (let i = 0; i < data.measuresList.length; i++) { // 将字符串转成数组 const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('') diff --git a/static/config.js b/static/config.js index d26df72..fc72a21 100644 --- a/static/config.js +++ b/static/config.js @@ -1,7 +1,7 @@ // eslint-disable-next-line no-unused-vars const config = { - weburl: 'http://192.168.0.45:8082/', // 前台地址 - httpurl: 'http://192.168.151.43:8092/', // 后台地址 + weburl: 'http://192.168.0.49:8092/', // 前台地址 + httpurl: 'http://192.168.0.49:8092/', // 后台地址 qyurl: 'http://192.168.0.45:8080/', // 企业前台 fileUrl: 'http://192.168.192.201:8991/file/', // 附件服务器地址 publicKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2zCyUYSD0pNrbtaYdvGfHfWoRV+fo/2N9O2PLLz/jZvMkigkq4eAq4JO+Ek0wDHI9WxP6iTSLYCHhIOs9CQTPvyldJFm8riZtQZlBTD8Plkb3rjrgwTqbBi3w3+HKYdkSvGFXJIdSOPbpXnj5BzN8vlVaybs24R/vpUzG9178lwIDAQAB',