重构

src/main.js

@@ -106,7 +106,7 @@ Vue.use(EleForm, {
   //文件上传设置
   'upload-file': {
     // 上传地址
-    action: 'http://172.16.90.11:8080/common/upload',
+    action: 'http://172.16.90.11:8080/common/uploadac',
     responseFn(response, file) {
       if (response.code === 500) {
         this.$message({ showClose: true, message: response.msg, type: 'error' })

src/views/activiti/formEdit/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <iframe  src="http://localhost:8082/" frameborder="0" width="100%"
+    <iframe  src="http://172.16.90.11:8082/" frameborder="0" width="100%"
              height="100%" ></iframe>
   </div>
 </template>

src/views/activiti/model/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <iframe  src="http://localhost:8081" frameborder="0" width="100%"
+    <iframe  src="http://172.16.90.11:8081" frameborder="0" width="100%"
              height="100%" ></iframe>
   </div>
 </template>

src/views/login.vue

@@ -188,7 +188,7 @@
         cookiePassword: '',
         loginForm: {
           username: 'admin',
-          password: 'admin123',
+          password: '',
           rememberMe: false,
           code: '',
           uuid: ''

src/views/oa/leaveNew/index.vue

@@ -30,6 +30,8 @@
       </el-table-column>
       <el-table-column label="模型key" prop="modelKey"/>
       <el-table-column label="表单名称" prop="fName"/>
+      <el-table-column label="创建人" prop="createUser"/>
+      <el-table-column label="创建部门" prop="createDept"/>
       <el-table-column label="创建时间" prop="createTime"/>
       <el-table-column label="操作" align="center">
         <template slot-scope="scope">
@@ -109,7 +111,7 @@
       <addEnterprise  ref="addEnterprise"/>
     </el-dialog>
     <!--显示流程图标签-->
-      <el-dialog :title="activitiImg.title" :visible.sync="activitiImg.open" width="1000px">
+      <el-dialog :title="activitiImg.title" :visible.sync="activitiImg.open" width="100">
         <el-image :src="activitiImg.src"></el-image>
       </el-dialog>
   </div>

src/views/oa/pendingNew/index.vue

@@ -26,6 +26,7 @@
       <el-table-column label="任务id" prop="taskId"/>
       <el-table-column label="任务名称" prop="taskName"/>
       <el-table-column label="外置表单" prop="formKey"/>
+      <el-table-column label="部署id" prop="processDefinitionId"/>
       <el-table-column label="流程id" prop="instanceId"/>
       <el-table-column label="操作" align="center">
         <template slot-scope="scope">