Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 2 years ago
parent
commit
a1a5613256
  1. 5
      supervise-portal-ui/src/views/flow/havereadList.vue
  2. 4
      supervise-portal-ui/src/views/flow/tobereadList.vue

5
supervise-portal-ui/src/views/flow/havereadList.vue

@ -251,8 +251,8 @@ export default {
} }
selectUrl(this.selectUrl_list).then((response) => { selectUrl(this.selectUrl_list).then((response) => {
if (response.success && response.data.url !== '') { if (response.success && response.data.url !== '') {
// this.url = 'http://192.168.1.103:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) // this.url = 'http://127.0.0.1:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
this.url = 'http://anrui.yyundong.com' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) this.url = 'http://jg.yyundong.com/' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
// this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) // this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
} else if (response.success && response.data.url === '') { } else if (response.success && response.data.url === '') {
this.$notify({ this.$notify({
@ -270,6 +270,7 @@ export default {
}) })
} }
}) })
console.log(this.url, 99999)
this.getFlowRecordList(row.procInsId, row.procDefId) this.getFlowRecordList(row.procInsId, row.procDefId)
this.centerDialogVisible = true this.centerDialogVisible = true
}, },

4
supervise-portal-ui/src/views/flow/tobereadList.vue

@ -242,8 +242,8 @@ export default {
} }
selectUrl(this.selectUrl_list).then((response) => { selectUrl(this.selectUrl_list).then((response) => {
if (response.success && response.data.url !== '') { if (response.success && response.data.url !== '') {
// this.url = 'http://192.168.1.103:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) // this.url = 'http://127.0.0.1:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
this.url = 'http://anrui.yyundong.com' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) this.url = 'http://jg.yyundong.com/' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
// this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) // this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
} else if (response.success && response.data.url === '') { } else if (response.success && response.data.url === '') {
this.$notify({ this.$notify({

Loading…
Cancel
Save