Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
dimengzhe 3 years ago
parent
commit
f9bd14520c
  1. 4
      anrui-system-ui/src/views/flow/doneList.vue
  2. 4
      anrui-system-ui/src/views/flow/todoList.vue

4
anrui-system-ui/src/views/flow/doneList.vue

@ -271,8 +271,8 @@
}
selectUrl(this.selectUrl_list).then((response) => {
if (response.code === '200') {
this.url = 'http://localhost:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
// this.url = 'http://120.46.131.15' + response.data.url + '?data=' + JSON.stringify(parameter_list) + '&token=' + getStorage()
// this.url = 'http://localhost:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
this.url = 'http://120.46.131.15' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
} else {
this.$notify({
title: '提示',

4
anrui-system-ui/src/views/flow/todoList.vue

@ -327,8 +327,8 @@ export default {
}
selectUrl(this.selectUrl_list).then((response) => {
if (response.code === '200') {
this.url = 'http://localhost:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
// this.url = 'http://120.46.131.15' + response.data.url + '?data=' + JSON.stringify(parameter_list) + '&token=' + getStorage()
// this.url = 'http://localhost:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
this.url = 'http://120.46.131.15' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
console.log('已办拼接url:',this.url)
} else {
this.$notify({

Loading…
Cancel
Save