Merge branch 'lrh' of yinet2020/YinetOASystemWeb into master

src/views/activiti/modeler/index.vue

@@ -203,21 +203,19 @@
       },
       /** 编辑按钮操作 */
       handleUpdate(row) {
+        this.src = process.env.VUE_APP_BASE_API + '/modeler/activiti/index?modelId=' + row.id
         this.editOpen = true
-        // this.src = '/activiti/modeler/design/index'
-        this.src = process.env.VUE_APP_BASE_API + '/modules/WorkFlow/Activiti/index.html?modelId=' + row.id
       },
       /** 提交按钮 */
       submitForm: function() {
         addModeler(this.form).then(response => {
           if (response.code === 200) {
             this.msgSuccess('新增成功')
-            this.addOpen = false
             this.getList()
             setTimeout(() => {
               this.editOpen = true
-              this.src = 'http://192.168.1.20:8080/modeleredit/modeler.html?modelId=' + response.data
-              // this.src = '/activiti/modeler/design/index'
+              this.src = process.env.VUE_APP_BASE_API + '/modeler/activiti/index?modelId=' + response.data
+              this.addOpen = false
             }, 1 * 700)
           }
         })