wangtao 2 years ago
parent
commit
8bf90b6b2e
34 changed files with 2092 additions and 960 deletions
  1. 7 1
      src/App.vue
  2. 1 2
      src/components/Breadcrumb/index.vue
  3. 2 20
      src/layout/components/Navbar.vue
  4. 0 1
      src/permission.js
  5. 3 3
      src/store/modules/permission.js
  6. 8 8
      src/views/activiti/definition/index.vue
  7. 7 7
      src/views/activiti/task/index.vue
  8. 120 0
      src/views/business/Middleware/bpmn/1.js
  9. 897 0
      src/views/business/Middleware/bpmn/customModeler copy.vue
  10. 765 619
      src/views/business/Middleware/bpmn/customModeler.vue
  11. 13 26
      src/views/business/Middleware/bpmn/executionLog.vue
  12. 12 12
      src/views/business/Middleware/bpmn/executionRecord.vue
  13. 69 73
      src/views/business/Middleware/bpmn/index.vue
  14. 6 6
      src/views/business/Middleware/functionalInterface/index.vue
  15. 6 6
      src/views/business/Middleware/hostEquipment/index.vue
  16. 10 10
      src/views/business/Middleware/subsystem/index.vue
  17. 9 9
      src/views/monitor/job/index.vue
  18. 10 10
      src/views/monitor/job/log.vue
  19. 10 10
      src/views/monitor/logininfor/index.vue
  20. 10 10
      src/views/monitor/online/index.vue
  21. 11 11
      src/views/monitor/operlog/index.vue
  22. 10 10
      src/views/system/config/index.vue
  23. 11 11
      src/views/system/dept/index.vue
  24. 10 10
      src/views/system/dict/data.vue
  25. 9 9
      src/views/system/dict/index.vue
  26. 11 11
      src/views/system/menu/index.vue
  27. 9 9
      src/views/system/notice/index.vue
  28. 10 10
      src/views/system/post/index.vue
  29. 5 5
      src/views/system/role/index.vue
  30. 9 9
      src/views/system/user/index.vue
  31. 8 8
      src/views/tool/gen/index.vue
  32. 11 11
      src/views/workflow/leave/index.vue
  33. 10 10
      src/views/workflow/leave/leaveAll.vue
  34. 3 3
      vue.config.js

+ 7 - 1
src/App.vue

@@ -34,11 +34,17 @@ export default  {
 
 /* bpmn */
 /* 数据库 */
-  .bpmn-icon-data-store { 
+  .bpmn-icon-data-store {
     display: none !important;
   }
   /* 图标 */
   .bjs-powered-by{
     display: none !important;
   }
+ .el-table__body-wrapper::-webkit-scrollbar-thumb{
+   background:#D7000F !important;
+ }
+ .el-form-item{
+   margin-bottom:20px;
+ }
 </style>

+ 1 - 2
src/components/Breadcrumb/index.vue

@@ -1,14 +1,13 @@
 <template>
   <el-breadcrumb class="app-breadcrumb" separator="/">
     <transition-group name="breadcrumb">
-      <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
+      <el-breadcrumb-item v-for="(item,index) in levelList" :key="index">
         <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
         <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
       </el-breadcrumb-item>
     </transition-group>
   </el-breadcrumb>
 </template>
-
 <script>
 import pathToRegexp from 'path-to-regexp'
 

+ 2 - 20
src/layout/components/Navbar.vue

@@ -1,38 +1,20 @@
 <template>
   <div class="navbar">
     <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
-
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
-
     <div class="right-menu">
       <template v-if="device!=='mobile'">
         <span class="date" >{{date}}</span>
         <search id="header-search" class="right-menu-item" />
-
-        <!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">
-          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
-          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip> -->
-
-        <screenfull id="screenfull" class="right-menu-item hover-effect" />
-
-        <!-- <el-tooltip content="布局大小" effect="dark" placement="bottom">
-          <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip> -->
-
       </template>
-
-      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
+      <div class="avatar-container right-menu-item hover-effect">
         <div class="avatar-wrapper">
           {{$store.state.user.nickName}}
         </div>
         <div class="logout"  @click="logout">
           <span>安全退出</span>
         </div>
-      </el-dropdown>
+      </div>
     </div>
   </div>
 </template>

+ 0 - 1
src/permission.js

@@ -14,7 +14,6 @@ router.beforeEach((to, from, next) => {
     if (getToken()) {
         /* has token*/
         if (to.path === '/login') {
-            console.log(3)
             NProgress.done()
         } else {
             if (store.getters.roles.length === 0) {

+ 3 - 3
src/store/modules/permission.js

@@ -69,7 +69,7 @@ const permission = {
                             children: [{
                                 component: "business/Middleware/bpmn",
                                 hidden: false,
-                                meta: { title: "流程图", icon: "工作流程图", noCache: true, link: null },
+                                meta: { title: "场景配置", icon: "工作流程图", noCache: true, link: null },
                                 name: "Middleware/bpmn",
                                 path: "Middleware/bpmn",
                             }]
@@ -81,7 +81,7 @@ const permission = {
                             children: [{
                                 component: "business/Middleware/bpmn/customModeler",
                                 hidden: true,
-                                meta: { title: "流程图绘制", icon: "international", noCache: true, link: null },
+                                meta: { title: "场景配置绘制", icon: "international", noCache: true, link: null },
                                 name: "Middleware/bpmn/customModeler",
                                 path: "Middleware/bpmn/customModeler",
                             }]
@@ -93,7 +93,7 @@ const permission = {
                             children: [{
                                 component: "business/Middleware/bpmn/executionRecord",
                                 hidden: false,
-                                meta: { title: "历史流程图执行记录", icon: "log", noCache: true, link: null },
+                                meta: { title: "场景配置执行记录", icon: "log", noCache: true, link: null },
                                 name: "Middleware/bpmn/executionRecord",
                                 path: "Middleware/bpmn/executionRecord",
                             }]

+ 8 - 8
src/views/activiti/definition/index.vue

@@ -52,19 +52,19 @@
 
 
     <el-table v-loading="loading" :data="Modeler">
-      <el-table-column label="流程ID" align="center" prop="id"/>
-      <el-table-column label="流程KEY" align="center" prop="key"/>
-      <el-table-column label="流程名称" align="center" prop="name"/>
-      <el-table-column label="版本" align="center" prop="version"/>
-      <el-table-column label="部署时间" align="center" prop="deploymentTime"/>
-      <el-table-column label="部署ID" align="center" prop="deploymentId"/>
+      <el-table-column label="流程ID" align="left" prop="id"/>
+      <el-table-column label="流程KEY" align="left" prop="key"/>
+      <el-table-column label="流程名称" align="left" prop="name"/>
+      <el-table-column label="版本" align="left" prop="version"/>
+      <el-table-column label="部署时间" align="left" prop="deploymentTime"/>
+      <el-table-column label="部署ID" align="left" prop="deploymentId"/>
 
-      <el-table-column label="状态" align="center" prop="suspendState">
+      <el-table-column label="状态" align="left" prop="suspendState">
         <template slot-scope="scope">
           <span>{{ scope.row.suspendState!=1?'挂起':'激活'}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

+ 7 - 7
src/views/activiti/task/index.vue

@@ -3,14 +3,14 @@
 
 
     <el-table v-loading="loading" :data="tastList">
-      <!--      <el-table-column label="流程ID" align="center" prop="id"/>-->
-      <el-table-column label="流程名称" align="center" prop="instanceName"/>
-      <el-table-column label="任务节点名称" align="center" prop="name"/>
-      <el-table-column label="任务状态" align="center" prop="status"/>
-      <el-table-column label="办理人" align="center" prop="assignee"/>
-      <el-table-column label="创建时间" align="center" prop="createdDate"/>
+      <!--      <el-table-column label="流程ID" align="left" prop="id"/>-->
+      <el-table-column label="流程名称" align="left" prop="instanceName"/>
+      <el-table-column label="任务节点名称" align="left" prop="name"/>
+      <el-table-column label="任务状态" align="left" prop="status"/>
+      <el-table-column label="办理人" align="left" prop="assignee"/>
+      <el-table-column label="创建时间" align="left" prop="createdDate"/>
 
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

+ 120 - 0
src/views/business/Middleware/bpmn/1.js

@@ -0,0 +1,120 @@
+// const arr = [{
+//     "name": "人员同步、门禁权限",
+//     "nodeId": [{
+//             "id": 1,
+//             "name": "人员同步",
+//             "beenName": "centerNodeJob",
+//             "beenMethod": "personExecute",
+//             "nodeDescribe": "人员信息同步",
+//             "params": "[{\"name\":\"blurry\",\"describe\":\"用户名称/手机号\",\"value\":\"\"},{\"name\":\"deptName\",\"describe\":\"部门\",\"value\":\"\"}]",
+//             "nodeType": null,
+//             "assignee": null,
+//             "createTime": null,
+//             "createBy": null,
+//             "updateTime": null,
+//             "updateBy": null,
+//             "parentId": 0,
+//             "label": "人员同步"
+//         },
+//         {
+//             "id": 2,
+//             "name": "门禁系统/冷机房指纹",
+//             "beenName": "fpJob",
+//             "beenMethod": "execute",
+//             "nodeDescribe": "负一楼制冷机房指纹",
+//             "params": "[{\"name\":\"doorVOS\",\"describe\":\"设备列表信息\",\"value\":[{\"deviceId\":\"419401616\",\"deviceName\":\"负1F控制器4\",\"deviceType\":1,\"doorId\":1,\"doorName\":\"负1F制冷机房指纹\"}]}]",
+//             "nodeType": null,
+//             "assignee": null,
+//             "createTime": null,
+//             "createBy": null,
+//             "updateTime": null,
+//             "updateBy": null,
+//             "parentId": 5,
+//             "label": "门禁系统/冷机房指纹"
+//         },
+//         {
+//             "id": 3,
+//             "name": "门禁系统/后勤门厅指纹",
+//             "beenName": "fpJob",
+//             "beenMethod": "execute",
+//             "nodeDescribe": "负1F后勤门厅指纹",
+//             "params": "[{\"name\":\"doorVOS\",\"describe\":\"设备列表信息\",\"value\":[{\"deviceId\":\"419401616\",\"deviceName\":\"负1F控制器4\",\"deviceType\":1,\"doorId\":2,\"doorName\":\"负1F后勤门厅指纹\"}]}]",
+//             "nodeType": null,
+//             "assignee": null,
+//             "createTime": null,
+//             "createBy": null,
+//             "updateTime": null,
+//             "updateBy": null,
+//             "parentId": 5,
+//             "label": "门禁系统/后勤门厅指纹"
+//         },
+//         {
+//             "id": 4,
+//             "name": "门禁系统/后勤门厅指纹",
+//             "beenName": "fpJob",
+//             "beenMethod": "execute",
+//             "nodeDescribe": "负1F后勤门厅指纹",
+//             "params": "[{\"name\":\"doorVOS\",\"describe\":\"设备列表信息\",\"value\":[{\"deviceId\":\"419401616\",\"deviceName\":\"负1F控制器4\",\"deviceType\":1,\"doorId\":2,\"doorName\":\"负1F后勤门厅指纹\"}]}]",
+//             "nodeType": null,
+//             "assignee": null,
+//             "createTime": null,
+//             "createBy": null,
+//             "updateTime": null,
+//             "updateBy": null,
+//             "parentId": 5,
+//             "label": "门禁系统/后勤门厅指纹"
+//         }
+//     ],
+//     "describe1": "用户名称/手机号",
+//     "describe2": "部门",
+//     "blurry": "李颖",
+//     "deptName": "非物业",
+//     "procedefKey": "Activity_069tygh"
+// }]
+// let bpmnForm = {
+//     name: "场景管理",
+//     procdefDescribe: "描述",
+//     runCron: "01 02 09 ? * *",
+//     runStatus: false,
+// }
+
+// let params = {}
+// params.runStatus = bpmnForm.runStatus
+// params.name = bpmnForm.name
+// params.procdefDescribe = bpmnForm.procdefDescribe
+// params.procedefKey = bpmnForm.procedefKey
+//     // params.resourceName =  this.xml.xml;
+// params.nodes = []
+// params.runCron = undefined
+// params.id = undefined
+// params.runCron = bpmnForm.runCron
+// for (let i = 0; i < arr.length; i++) {
+//     for (let a = 0; a < arr[i].nodeId.length; a++) {
+//         params.nodes[a] = {}
+//         params.nodes[a].name = arr[i].name
+//         params.nodes[a].procedefKey = arr[i].procedefKey
+//         params.nodes[a].nodeId = undefined
+//         params.nodes[a].nodeId = arr[i].nodeId[a].id
+//         params.nodes[a].param = {}
+//         let data = JSON.parse(arr[i].nodeId[a].params)
+//         for (let b = 0; b < data.length; b++) {
+//             if (data[b].name === "blurry") {
+//                 params.nodes[a].param.blurry = arr[i].blurry
+//             } else if (data[b].name === "deptName") {
+//                 params.nodes[a].param.deptName = arr[i].deptName
+//             } else {
+//                 params.nodes[a].param[data[0].name] = data[0].value
+//             }
+//         }
+
+
+//     }
+// }
+// for (let i = 0; i < params.nodes.length; i++) {
+//     params.nodes[i].param = JSON.stringify(params.nodes[i].param)
+// }
+
+
+var fruits = [];
+fruits.push("Kiwi");
+console.log(fruits.length)

+ 897 - 0
src/views/business/Middleware/bpmn/customModeler copy.vue

@@ -0,0 +1,897 @@
+<template>
+    <div class="app-container">
+        <div class="containers">
+            <div class="canvas" ref="canvas"></div>
+            <ul class="buttons">
+                <li>
+                    <a href="javascript:" class="active" ref="saveXML" title="保存为bpmn"
+                    >保存为bpmn</a
+                    >
+                </li>
+                <li>
+                    <a href="javascript:" class="active" ref="saveSvg" title="保存为svg"
+                    >保存为svg</a
+                    >
+                </li>
+                <li>
+                    <a
+                    href="javascript:"
+                    class="active"
+                    @click="handlerUndo"
+                    title="撤销操作"
+                    >撤销</a
+                    >
+                </li>
+                <li>
+                    <a
+                    href="javascript:"
+                    class="active"
+                    @click="handlerRedo"
+                    title="恢复操作"
+                    >恢复</a
+                    >
+                </li>
+                <li>
+                    <a
+                    href="javascript:"
+                    class="active"
+                    @click="handlerZoom(0.1)"
+                    title="放大"
+                    >放大</a
+                    >
+                </li>
+                <li>
+                    <a
+                    href="javascript:"
+                    class="active"
+                    @click="handlerZoom(-0.1)"
+                    title="缩小"
+                    >缩小</a
+                    >
+                </li>
+                <li>
+                    <a
+                    href="javascript:"
+                    class="active"
+                    @click="handlerZoom(0)"
+                    title="还原"
+                    >还原</a
+                    >
+                </li>
+                <li>
+                    <el-button type="primary" @click="submitBpmn" v-if="!loading" title="提交流程图">提 交</el-button>
+                    <el-button :loading="loading" type="primary" @click="submitBpnm" v-else>提交中...</el-button>
+                </li>
+            </ul>
+        </div>
+         <!-- 添加或修改节点参数配置对话框 -->
+        <el-dialog  :title="title" :visible.sync="serviceTask" width="600px" append-to-body :before-close="cancel" :close-on-click-modal="false" :show-close="showClo">
+            <el-form ref="form" :model="formData" :rules="rules" label-width="120px" >
+                <el-row :gutter="20">
+                    <el-col :span="24" >
+                        <el-form-item label="节点名称" prop="name" >
+                          <el-input v-model.trim="formData.name" placeholder="请输入节点名称"  @input="onInput" maxlength="30" show-word-limit  />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="执行" prop="nodeId">
+                          <treeselect v-model="formData.nodeId" :options="dataOptions" :show-count="true" placeholder="请选择执行场景"   />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24" v-if="status">
+                        <el-form-item :label="formData.param.describe" prop="describe" >
+                        <el-input v-model.trim="formData.param.value" :placeholder="'请输入' + formData.param.describe"  @input="onInput"  show-word-limit  />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm" v-if="!loading">确 定</el-button>
+                <el-button :loading="loading" type="primary" @click="submitForm" v-else>提交中...</el-button>
+                <el-button @click="cancel" plain>取 消</el-button>
+            </div>
+        </el-dialog>
+        <!-- 流程图提交对话框 -->
+        <el-dialog  :title="title" :visible.sync="openBpmn" width="600px" append-to-body :before-close="cancel" :close-on-click-modal="false" :show-close="showClo">
+            <el-form ref="form2" :model="bpmnForm" :rules="rules2" label-width="100px" >
+                <el-row :gutter="20">
+                    <el-col :span="24" >
+                        <el-form-item label="流程图名称" prop="name" >
+                        <el-input v-model.trim="bpmnForm.name" placeholder="请输入流程图名称"  @input="onInput" maxlength="30" show-word-limit  />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24" >
+                        <el-form-item label="流程图描述" prop="procdefDescribe" >
+                        <el-input type="textarea" v-model.trim="bpmnForm.procdefDescribe" placeholder="请输入流程图描述"  @input="onInput" maxlength="60" show-word-limit  />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24" >
+                      <!-- <el-form-item label="执行时间" prop="bpmnForm.runCron" >
+                        <el-popover v-model="runCronClose">
+                            <cron @change="changeCron" @close="runCronClose=false" i18n="cn"/>
+                            <el-input slot="reference" v-model="bpmnForm.runCron" placeholder="定时策略" @click="runCronClose=true"/>
+                        </el-popover>
+                      </el-form-item> -->
+                      <el-form-item style="margin-top: -10px;">
+                        <cron v-if="showCronBox" v-model="bpmnForm.runCron" ></cron>
+                      </el-form-item>
+                      <el-form-item label="执行时间" prop="runCron">
+                        <el-input v-model="bpmnForm.runCron" auto-complete="off" placeholder="请输入执行时间" readonly>
+                            <el-button slot="append" v-if="!showCronBox" icon="el-icon-arrow-up" @click="showCronBox = true" title="打开图形配置"></el-button>
+                            <el-button slot="append" v-else icon="el-icon-arrow-down" @click="showCronBox = false" title="关闭图形配置"></el-button>
+                        </el-input>
+                      </el-form-item>
+                      <el-form-item label="运行状态" prop="runStatus">
+                        <el-switch
+                          v-model="bpmnForm.runStatus"
+                          @change="handleStatusChange">
+                        </el-switch>
+                      </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitBpnmForm" v-if="!loading">确 定</el-button>
+                <el-button :loading="loading" type="primary" @click="submitBpnmForm" v-else>提交中...</el-button>
+                <el-button @click="cancelBpnm">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script>
+// 引入相关的依赖
+// import {cron} from 'vue-cron'
+import cron from '@/components/cron'
+import { xmlStr } from "@/mock/xmlStrPreview2";
+import { CustomModeler } from "@/components/customBpmn";
+import Treeselect from "@riophae/vue-treeselect";
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { getBpmnZkNodeList, getBpmnZkNodeTreeList, addBpmnZkNode, updataBpmnZkNode,
+getBpmnZkReNodeProcdefTreeList, getBpmnZkReNodeProcdefCheckedTreeList,
+getBpmnZkReProcdefList, addBpmnZkReProcdef, updataBpmnZkReProcdef, delBpmnZkReProcdef, getBpmnZkReNodeProcdefListByPorcedfId} from "@/api/business/Middleware/bpmn";
+import store from "../../../../store";
+// import { unset } from '../../../../../public/bpmnjs';
+export default {
+  name: "",
+  components: { Treeselect, cron },
+  data() {
+    return {
+      describe:undefined,
+      //cron
+        showCronBox: false,
+        // form: {
+        //   cronExpression: ''
+        // },
+      showClo:false,
+      bpmnModeler: null,
+      container: null,
+      canvas: null,
+      scale: 1,
+      userTask: false,
+      serviceTask: false,
+      scriptTask: false,
+      sequenceFlow: "",
+      formData: {
+        name: "",
+        nodeId:undefined,
+        param:{
+          name:undefined,
+          describe:undefined,
+          value:undefined
+        },
+        xlStatus:undefined,
+      },
+      //节点树选项
+      dataOptions: [],
+
+      data:undefined,
+      openBpmn:false,
+      // 节点表单校验
+      rules: {
+        name: [
+          { required: true, message: "节点名称不能为空", trigger: "blur" }
+        ],
+        nodeId: [
+          { required: true, message: "场景不能为空", trigger: ["blur",'change'] }
+        ],
+      },
+      bpmnForm: {//流程图弹框提交信息
+        name: undefined,
+        procdefDescribe:undefined,
+        runCron:'',
+        runStatus:false
+      },
+      runCronClose:false,
+      // 流程图表单校验
+      rules2: {
+        name: [
+          { required: true, message: "流程描述名称不能为空", trigger: "blur" }
+        ],
+        procdefDescribe: [
+          { required: true, message: "流程图描述不能为空", trigger: ["blur",'change'] }
+        ],
+        runCron: [
+          { required: true, message: "执行时间不能为空", trigger: ["blur",'change'] }
+        ],
+        // runStatus: [
+        //   { required: true, message: "运行状态不能为空", trigger: ["blur",'change'] }
+        // ],
+
+      },
+      loading:false,
+      bpmnData:[], //待提交数据,
+      bpmnDataNumber:0,
+      bpmnTitle:undefined,//待提交流程图名称
+      bpmnNodeId:undefined,// 弹框打开时节点Id
+      xml:undefined,
+      serviceTaskStatus:false,
+      checkedKeys:[],//流程图返回节点
+      bpmnDataFH:[],//流程图返回一级信息
+
+      status:false,
+      msg:[],
+      tree:[],//下拉数据集
+      waitSubmitList:{
+        wrap:undefined,
+      },//待提交所有节点组成参数
+      nowDate:new Date().getTime(),
+      value:undefined,//节点value有值时缓存节点参数
+      nodeFail:true, //节点信息提交被rule条件阻断时,用作确定按钮阻断input出现
+      execTime:'',
+      cronPopover:false,
+      nodeKey:undefined,
+      nodeStorage:undefined, //由于判断节点下拉显示
+      title:undefined
+    };
+  },
+  created(){
+    this.getNodeTree()
+  },
+  mounted() {
+    //修改数据获取
+    if(this.$route.query.name){
+      //流程图信息查询
+      this.title = "修改"
+      getBpmnZkReProcdefList({name:this.$route.query.name,current: 1,size: 20}).then(res=>{
+        this.bpmnDataFH = res.data.records[0]
+        console.log(this.bpmnDataFH)
+        this.init()
+      })
+      //流程图关联节点信息查询
+      getBpmnZkReNodeProcdefListByPorcedfId({procdefId:this.$route.query.id}).then(res=>{
+        this.bpmnData = res.data
+        let arr = []
+        let data = res.data
+        for(let i = 0;i<data.length;i++){
+          arr[i] = {
+            param:{
+              value:undefined,
+              name:undefined
+            },
+            name:undefined,
+            xlStatus:false,
+            nodeId:undefined,
+            procedefKey:undefined
+          }
+          arr[i].param = JSON.parse(data[i].params)[0]
+          arr[i].nodeId = data[i].id
+          arr[i].name = data[i].runName
+          arr[i].procedefKey = data[i].procedefKey
+          arr[i].params = JSON.parse(data[i].params)[0]
+          if(data[i].runParam){
+            if(JSON.parse(data[i].runParam) !='{}'){
+              let name = arr[i].param.name
+              let value = JSON.parse(data[i].runParam)[name]
+              arr[i].param.value = value
+              if(data[i].params){
+                if(!JSON.parse(data[i].params)[0].value && arr[i].param.value){
+                  arr[i].xlStatus= true
+                }
+              }
+            }
+          }else{
+            arr.param = JSON.parse(data[i].params)[0]
+          }
+        }
+        this.bpmnData = arr
+        console.log(this.bpmnData)
+      })
+    }else{
+      this.title = "新增"
+      this.init()
+    }
+  },
+  // 方法集合
+  methods: {
+    handleStatusChange(){
+      console.log(this.bpmnForm.runStatus)
+    },
+    //表达式
+    changeCron(val){
+        this.bpmnForm.runCron = val
+    },
+    //强制el-input刷新
+    onInput(){
+        this.$forceUpdate();
+    },
+    //渲染流程图
+    init() {
+      // 获取到属性ref为“canvas”的dom节点
+      const canvas = this.$refs.canvas;
+      // 建模
+      this.bpmnModeler = new CustomModeler({
+        container: canvas,
+        additionalModules: [
+          {
+            // 禁止编辑label
+            labelEditingProvider: ["value", ""]
+          }
+        ]
+      });
+      this.createNewDiagram();
+
+    },
+    //渲染执行
+    async createNewDiagram() {
+      let that = this
+      try {
+        //编辑或默认视图
+        if(that.bpmnDataFH.resourceName){
+          var result = await this.bpmnModeler.importXML(that.bpmnDataFH.resourceName);
+        }else{
+          var result = await this.bpmnModeler.importXML(xmlStr);
+        }
+
+        // 上传
+        const { warnings } = result;
+        this.data = result.warnings
+
+        this.success();
+      } catch (err) {
+        // console.log(err.message, err.warnings);
+      }
+    },
+    success() {
+      this.addBpmnListener();
+      this.addModelerListener();
+      this.addEventBusListener();
+    },
+
+
+    // 渲染组件
+        addModelerListener() {
+          const bpmnjs = this.bpmnModeler;
+          const that = this;
+          // 这里我是用了一个forEach给modeler上添加要绑定的事件
+          const events = [
+            "shape.added",
+            "shape.move.end",
+            "shape.removed",
+            "connect.end",
+            "connect.move"
+          ];
+          events.forEach(function(event) {
+            that.bpmnModeler.on(event, e => {
+              //console.log(1,event, e,that.data );
+              var elementRegistry = bpmnjs.get("elementRegistry");
+              var shape = e.element ? elementRegistry.get(e.element.id) : e.shape;
+              if(event == "shape.added"){
+                let data =  {
+                  name: "",
+                  nodeId:undefined,
+                  param:{
+                    name:undefined,
+                    describe:undefined,
+                    value:undefined,
+                  },
+                  xlStatus:false,
+                  procedefKey:undefined
+                }
+                data.procedefKey = shape.id
+                that.bpmnData.push(data)
+                //console.log('新创建节点:',shape.id,"bpmnData数组:",that.bpmnData);
+              }
+              if(event == "shape.removed"){
+                for(let i =0;i<that.bpmnData.length;i++){
+                  if(shape.id == that.bpmnData[i].procedefKey){
+                    that.bpmnData.splice(i,1)
+                  }
+                }
+                console.log(that.bpmnData)
+              }
+
+            });
+          });
+        },
+
+        // 下载
+        async addBpmnListener() {
+          const that = this;
+          const downloadLink = this.$refs.saveXML;
+          const downloadSvgLink = this.$refs.saveSvg;
+
+          async function opscoffee() {
+            try {
+              const result = await that.saveSVG();
+              const { svg } = result;
+
+              that.setEncoded(downloadSvgLink, "ops-coffee.svg", svg);
+            } catch (err) {
+              console.log(err);
+            }
+
+            try {
+              const result = await that.saveXML();
+              const { xml } = result;
+
+              that.setEncoded(downloadLink, "ops-coffee.bpmn", xml);
+            } catch (err) {
+              console.log(err);
+            }
+          }
+
+          opscoffee();
+          this.bpmnModeler.on("commandStack.changed", opscoffee);
+        },
+        async saveSVG(done) {
+          try {
+            const result = await this.bpmnModeler.saveSVG(done);
+            return result;
+          } catch (err) {
+            console.log(err);
+          }
+        },
+        async saveXML(done) {
+          try {
+            const result = await this.bpmnModeler.saveXML({ format: true }, done);
+            this.xml = result
+            // console.log(this.xml)
+            return result;
+          } catch (err) {
+            console.log(err);
+          }
+        },
+        setEncoded(link, name, data) {
+          const encodedData = encodeURIComponent(data);
+
+          if (data) {
+            link.href = "data:application/bpmn20-xml;charset=UTF-8," + encodedData;
+            link.download = name;
+          }
+        },
+        handlerRedo() {
+          this.bpmnModeler.get("commandStack").redo();
+        },
+        handlerUndo() {
+          this.bpmnModeler.get("commandStack").undo();
+        },
+        handlerZoom(radio) {
+          const newScale = !radio ? 1.0 : this.scale + radio;
+          this.bpmnModeler.get("canvas").zoom(newScale);
+
+          this.scale = newScale;
+        },
+        addEventBusListener() {
+          const that = this;
+          const eventBus = this.bpmnModeler.get("eventBus");
+          const modeling = this.bpmnModeler.get("modeling");
+          const elementRegistry = this.bpmnModeler.get("elementRegistry");
+
+          eventBus.on("element.click", function(e) {
+            // console.log(
+            //   "点击了element",
+            //   e.element.businessObject.id,
+            //   e.element.businessObject.$type,
+            //   e.element.businessObject.name,that.data
+            // );
+            e.element.businessObject.nodeId = that.formData.nodeId
+            // e.element.businessObject.order = that.formData.order
+            // console.log(
+            //   "点击了element",
+            //   e,e.element.businessObject.name,
+            //   e.element.businessObject.nodeId
+            // );
+
+            if (e.element.businessObject.$type == "bpmn:SequenceFlow") {
+              const sourceRef = e.element.businessObject.sourceRef;
+
+              if (sourceRef.$type == "bpmn:ExclusiveGateway") {
+                var targetElement = elementRegistry.get(sourceRef.id);
+
+                modeling.updateProperties(targetElement, {
+                  default: e.element.businessObject
+                });
+              }
+            }
+          });
+        },
+    // 节点取消按钮
+    cancel() {
+        store.commit("STATUSCHANGE")
+        setTimeout(()=>{
+          this.serviceTask = false
+        })
+
+        // this.reset();
+    },
+    // 表单重置
+    // reset() {
+    //   this.resetForm("form");
+    // },
+    /** 节点提交按钮 */
+    submitForm() {
+      const that = this
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.msgSuccess("节点属性保存成功");
+          this.loading = false
+          //处理弹框无法关闭
+            setTimeout(()=>{
+              that.cancel()
+            },1)
+          this.formData.procedefKey = this.$store.state.bpmn.nodeInfo.businessObject.id
+          let arr = this.bpmnData
+          if(arr.length>0){
+             let num = 0
+            for(let i =0;i<arr.length;i++){
+              if(this.formData.procedefKey == arr[i].procedefKey){
+                arr[i] = JSON.parse(JSON.stringify(this.formData))
+                //return
+                num++
+                break
+              }
+            }
+            if(num = 0){
+              console.log("bpmnData长度",this.bpmnData.length,"不同procedefKey")
+              num +=1
+              this.bpmnData.push(JSON.parse(JSON.stringify(this.formData)))
+            }
+          }else{
+            if(!this.formData.param.value && this.nodeStorage.value != this.formData.param.value){
+              this.formData.xlStatus = true
+            }
+            this.bpmnData.push(JSON.parse(JSON.stringify(this.formData)))
+          }
+        }else{
+          this.nodeFail = false
+        }
+        console.log("节点提交",this.bpmnData)
+      });
+    },
+    /** 流程图节点提交按钮(弹框展示) */
+    submitBpmn(){
+      if(this.bpmnDataFH.name){
+        this.bpmnForm.procdefDescribe = this.bpmnDataFH.procdefDescribe
+        this.bpmnForm.name = this.bpmnDataFH.name
+        this.bpmnForm.runCron = this.bpmnDataFH.runCron
+        this.bpmnForm.runStatus = this.bpmnDataFH.runStatus
+      }
+      this.openBpmn = true
+    },
+    /** 流程图提交数据 */
+    submitBpnmForm(){
+      this.$refs["form2"].validate(valid => {
+        if (valid) {
+            if(this.bpmnData.length <  1 ){
+              this.msgError("流程图节点数据个数小于1");
+            }else{
+              let params = {}
+              params.runStatus = this.bpmnForm.runStatus
+              params.name = this.bpmnForm.name
+              params.procdefDescribe = this.bpmnForm.procdefDescribe
+              params.procedefKey = this.bpmnForm.procedefKey
+              params.resourceName =  this.xml.xml;
+              params.nodes = []
+              params.runCron =undefined
+              params.id = undefined
+              // if(!this.bpmnForm.runCron){
+              //   params.runStatus = false
+              // }else{
+              //   params.runStatus = true
+              //   params.runCron = this.bpmnForm.runCron
+              // }
+              params.runCron = this.bpmnForm.runCron
+              for(let i = 0; i<this.bpmnData.length;i++){
+                params.nodes[i] = {}
+                params.nodes[i].param = JSON.stringify(this.bpmnData[i].param)
+                params.nodes[i].procedefKey = this.bpmnData[i].procedefKey
+                params.nodes[i].nodeId = this.bpmnData[i].nodeId
+                params.nodes[i].name = this.bpmnData[i].name
+              }
+              if(this.bpmnDataFH.id){
+                params.id = this.bpmnDataFH.id
+                updataBpmnZkReProcdef(params).then(res=>{
+                  this.msgSuccess("流程图修改成功");
+                  this.loading = false
+                  this.openBpmn = false
+                  this.$router.push('/Middleware/bpmn')
+                })
+              }else{ //新增
+                for(let i=0;i<this.bpmnData.length;i++){
+                  params.nodes[i] = {}
+                  params.nodes[i].name = this.bpmnData[i].name
+                  params.nodes[i].nodeId = this.bpmnData[i].nodeId
+                  params.nodes[i].procedefKey = this.bpmnData[i].procedefKey
+                  var nodesWrap = {}
+                  nodesWrap.id = null
+                  nodesWrap.deptIds = null
+                  nodesWrap.createTime = null
+                  let data = this.bpmnData[i].param
+                  params.nodes[i].param = {}
+                  if(data.name){
+                    params.nodes[i].param[data.name] = data.value
+                  }
+                  params.nodes[i].param = JSON.stringify(params.nodes[i].param)
+                }
+                console.log(params)
+                addBpmnZkReProcdef(params).then(res=>{
+                  this.msgSuccess("流程图保存成功");
+                  this.loading = false
+                  this.openBpmn = false
+                  this.$router.push('/Middleware/bpmn')
+                })
+              }
+            }
+        }
+      });
+    },
+    /** 流程图取消按钮 */
+    cancelBpnm(){
+      this.openBpmn = false
+    },
+    /** 获取下拉数据 */
+    getNodeTree(){
+        getBpmnZkNodeTreeList().then(res =>{
+            if(res.data){
+              this.tree = res.data
+              this.dataOptions = this.getTreeData(res.data);
+            }
+        })
+    },
+    /** 遍历数据 */
+		getTreeData(data) {
+      // 循环遍历json数据
+      for (var i = 0; i < data.length; i++) {
+        data[i]["label"] = data[i].name
+        if(data[i].children){
+          if (data[i].children.length < 1) {
+            // children若为空数组,则不作操作
+          } else {
+            // children若不为空数组,则继续 递归调用 本方法
+            this.getTreeData(data[i].children);
+          }
+        }else{
+          data[i].children = []
+        }
+
+      }
+      return data;
+    },
+    //遍历给下拉输入框赋值
+    getInput(val,data,bpmnData,nodeKey){
+        console.log("节点id:",val,bpmnData)
+        for (var i = 0; i < data.length; i++) {
+          if(val == data[i].id){
+            this.nodeStorage = JSON.parse(data[i].params)[0]
+            if(bpmnData.length>0){
+              for(let a=0;a<bpmnData.length;a++){
+                if(nodeKey == bpmnData[a].procedefKey){
+                  console.log("修改节点入循环:")
+                  console.log(this.formData.param,bpmnData[a].param)
+                  this.formData.xlStatus = bpmnData[a].xlStatus
+                  if(this.formData.param != bpmnData[a].param){
+                    this.formData.param = JSON.parse(data[i].params)[0]
+                  }
+
+                  if(this.formData.xlStatus){
+                    this.status = true
+                  }else{
+                    this.status = false
+                  }
+                  return
+                }else{
+                  console.log("bpmnData大于1修新节点")
+                  this.formData.xlStatus = bpmnData[a].xlStatus
+                  this.formData.param = JSON.parse(data[i].params)[0]
+                  if(!this.formData.param.value){
+                    this.status = true
+                  }else{
+                    this.status = false
+                  }
+
+                }
+              }
+            }else{
+              console.log("修新节点:下拉展示")
+              this.formData.xlStatus = false
+              this.formData.param = JSON.parse(data[i].params)[0]
+              if(!this.formData.param.value){
+                this.status = true
+              }else{
+                this.status = false
+              }
+              console.log(this.formData)
+            }
+            return
+          }else{
+            if (this.tree[i].children) {
+              this.getInput(val,data[i].children,this.bpmnData,this.nodeKey);
+              // children若为空数组,则不作操作
+            }
+          }
+        }
+    },
+    //鼠标点击事件响应监听
+    currDeptChange(val) {
+      if(val){
+        this.formData.nodeId = val
+        this.getInput(val,this.tree,this.bpmnData,this.nodeKey)
+      }else{
+        this.status = false
+      }
+    }
+  },
+  // 计算属性
+  computed: {
+    task: {
+      get: function() {
+        const that = this;
+        const element = this.$store.state.bpmn.nodeInfo;
+        if (element.businessObject) {
+          if (element.businessObject.$type === "bpmn:ServiceTask") {
+              that.serviceTask = this.$store.state.bpmn.nodeVisible;
+              console.log("watch:",that.bpmnData)
+          }
+        }
+
+        return false;
+      },
+      set: function(val) {
+        this.$store.state.bpmn.nodeVisible = val;
+      }
+    }
+  },
+  watch: {
+    'formData.nodeId': 'currDeptChange',
+    task(val) {},
+    userTask(val) {
+      this.$store.state.bpmn.nodeVisible = val;
+      console.log(1)
+    },
+    serviceTask(val) {
+      this.$store.state.bpmn.nodeVisible = val;
+      const status = this.$store.state.bpmn.status
+      const that = this;
+      const element = this.$store.state.bpmn.nodeInfo;
+      that.nodeKey = element.id
+      console.log(element)
+      if(status == false){
+        console.log("弹框关闭")
+      }else{
+        console.log("弹框开启")
+        if (element.businessObject) {
+          let status = this.$store.state.bpmn.status
+          //console.log(element.businessObject)
+          if (element.businessObject.$type === "bpmn:ServiceTask") {
+          //新增修改数据赋值
+              let data = that.bpmnData
+              //console.log("computed监听编辑框id",element.businessObject.id,"computed监听编辑框id时bpmnData数据",data)
+              if(data.length>0){
+                for(let i = 0; i<data.length;i++){
+                  if(element.businessObject.id == data[i].procedefKey){
+                    if(data[i].nodeId){
+                      that.formData.nodeId = data[i].nodeId
+                    }
+                    that.formData.name = data[i].name
+                    that.formData.param = data[i].param
+                    that.formData.nodeId = data[i].nodeId
+                    that.formData.procedefKey = data[i].procedefKey
+                    console.log(that.formData.param)
+                    //修改存在记录
+                    if(data[i].xlStatus){
+                      that.status = true
+                    }
+                    return
+                  }else{
+                    that.formData.name = undefined
+                    that.formData.nodeId = undefined
+                    that.status = false
+                  }
+                }
+              }else{
+                that.formData.name = undefined
+                that.formData.nodeId = undefined
+                that.status = false
+              }
+            that.serviceTask = this.$store.state.bpmn.nodeVisible;
+          }
+        }
+
+      }
+    },
+    scriptTask(val) {
+      this.$store.state.bpmn.nodeVisible = val;
+      console.log(3)
+    },
+    sequenceFlow(val) {
+      const element = this.$store.state.bpmn.nodeInfo;
+      const modeling = this.bpmnModeler.get("modeling");
+      modeling.updateLabel(element, val);
+      console.log(4)
+    },
+    "formData.name": {
+      handler(val, old) {
+        const element = this.$store.state.bpmn.nodeInfo;
+        const modeling = this.bpmnModeler.get("modeling");
+        modeling.updateLabel(element, val);
+      },
+      deep: true
+    },
+  }
+};
+</script>
+
+<style scoped>
+.containers {
+  background: white;
+  overflow: auto;
+  background-image: linear-gradient(
+      90deg,
+      rgba(220, 220, 220, 0.5) 6%,
+      transparent 0
+    ),
+    linear-gradient(rgba(192, 192, 192, 0.5) 6%, transparent 0);
+  background-size: 12px 12px;
+  width: 100%;
+  height: 85vh;
+  -webkit-tap-highlight-color: rgba(255, 255, 255, 0);
+}
+.canvas {
+  width: 100%;
+  height: 100%;
+}
+.panel {
+  position: absolute;
+  right: 0;
+  top: 0;
+  width: 300px;
+}
+.buttons {
+  position: absolute;
+  left: 80px;
+  bottom: 20px;
+}
+.buttons li {
+  display: inline-block;
+  margin: 5px;
+}
+.buttons li a {
+  color: #999;
+  background: #eee;
+  cursor: not-allowed;
+  padding: 8px;
+  border: 1px solid #ccc;
+  text-decoration: none;
+}
+.buttons li a.active {
+  color: #333;
+  background: #fff;
+  cursor: pointer;
+}
+.demo-drawer-footer {
+  width: 100%;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  background: #fff;
+}
+
+</style>
+<style>
+.djs-palette{
+  display: none !important;
+}
+</style>

File diff suppressed because it is too large
+ 765 - 619
src/views/business/Middleware/bpmn/customModeler.vue


+ 13 - 26
src/views/business/Middleware/bpmn/executionLog.vue

@@ -11,10 +11,10 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item> -->
-        <el-form-item label="历史流程id:">
+        <el-form-item label="场景id:">
           <el-input
             v-model.trim="queryParams.hiExecutionId"
-            placeholder="请输入流程图id"
+            placeholder="请输入场景id"
             clearable
             size="small"
             style="width: 160px"
@@ -40,36 +40,23 @@
       </el-form>
       <!-- height="calc(100vh - 30vh)" -->
     <el-table v-loading="loading" :data="adminList" border style="margin-top:20px;">
-      <el-table-column label="历史流程id" align="center" prop="hiProcdefId"  show-overflow-tooltip />
-      <el-table-column label="任务名称" align="center" prop="taskName" show-overflow-tooltip />
-      <!-- <el-table-column label="参数" align="center" prop="taskParams" show-overflow-tooltip />
-      <el-table-column label="责任人" align="center" prop="assignee" show-overflow-tooltip />
-      <el-table-column label="been名称" align="center" prop="beenName" show-overflow-tooltip />
-      <el-table-column label="执行方法" align="center" prop=" beenMethod" show-overflow-tooltip /> -->
-      <el-table-column label="运行结果" align="center" prop="taskFlag" show-overflow-tooltip >
+      <el-table-column label="场景id" align="left" prop="hiProcdefId"  show-overflow-tooltip />
+      <el-table-column label="节点属性名称" align="left" prop="taskName" show-overflow-tooltip />
+      <el-table-column label="运行结果" align="left" prop="taskFlag" show-overflow-tooltip >
         <template slot-scope="scope">
           <span :style="scope.row.taskFlag == '0' ? 'color:#67C23A': 'color:#F56C6C' ">{{scope.row.taskFlag == "0" ? "成功" : "失败"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="执行节点顺序" align="center" prop="nodeId" show-overflow-tooltip />
-      <el-table-column label="节点名称" align="center" prop="nodeDescribe" show-overflow-tooltip />
-      <el-table-column label="执行结果" align="center" prop="executeResult" show-overflow-tooltip >
-        <template slot-scope="scope">
+      <el-table-column label="执行节点顺序" align="left" prop="nodeId" show-overflow-tooltip />
+      <el-table-column label="节点名称" align="left" prop="nodeDescribe" show-overflow-tooltip />
+      <el-table-column label="执行参数" align="left" prop="taskParams" show-overflow-tooltip />
+      <el-table-column label="结果报文" align="left" prop="executeResult" show-overflow-tooltip >
+        <!-- <template slot-scope="scope">
           <span :style="JSON.parse(scope.row.executeResult).status == 'SUCCESS' ? 'color:#67C23A': 'color:#F56C6C' ">{{JSON.parse(scope.row.executeResult).status == "SUCCESS" ? "成功" : JSON.parse(scope.row.executeResult).msg}}</span>
-        </template>
+        </template> -->
       </el-table-column>
-      <el-table-column label="开始时间:" align="center" prop="createTime"  show-overflow-tooltip />
-      <el-table-column label="结束时间:" align="center" prop="endTime"  show-overflow-tooltip />
-      <!-- <el-table-column label="执行日志" align="center">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="primary"
-            icon="el-icon-edit"
-            @click="getRecord(scope.row)"
-          >查看</el-button>
-        </template>
-      </el-table-column> -->
+      <el-table-column label="开始时间:" align="left" prop="createTime"  show-overflow-tooltip />
+      <el-table-column label="结束时间:" align="left" prop="endTime"  show-overflow-tooltip />
     </el-table>
     <pagination
       v-show="total>0"

+ 12 - 12
src/views/business/Middleware/bpmn/executionRecord.vue

@@ -1,20 +1,20 @@
 <template>
     <div class="app-container">
       <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
-        <el-form-item label="流程图名称:">
+        <el-form-item label="场景id:">
           <el-input
-            v-model.trim="queryParams.name"
-            placeholder="请输入流程图名称:"
+            v-model.trim="queryParams.procdefId"
+            placeholder="请输入场景id"
             clearable
             size="small"
             style="width: 160px"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="流程图id:">
+        <el-form-item label="场景名称:">
           <el-input
-            v-model.trim="queryParams.procdefId"
-            placeholder="请输入流程图id"
+            v-model.trim="queryParams.name"
+            placeholder="请输入场景名称:"
             clearable
             size="small"
             style="width: 160px"
@@ -40,12 +40,12 @@
       </el-form>
       <!-- height="calc(100vh - 30vh)" -->
     <el-table v-loading="loading" :data="adminList" border style="margin-top:20px;">
-      <el-table-column label="id" align="center" prop="id"  show-overflow-tooltip />
-      <el-table-column label="流程id" align="center" prop="procdefId"  show-overflow-tooltip />
-      <el-table-column label="流程名称" align="center" prop="procdefName" show-overflow-tooltip />
-      <el-table-column label="开始时间" align="center" prop="createTime"  show-overflow-tooltip />
-      <el-table-column label="结束时间" align="center" prop="endTime"  show-overflow-tooltip />
-      <el-table-column label="执行日志" align="center">
+      <el-table-column label="id" align="left" prop="id"  show-overflow-tooltip />
+      <el-table-column label="场景id" align="left" prop="procdefId"  show-overflow-tooltip />
+      <el-table-column label="场景名称" align="left" prop="procdefName" show-overflow-tooltip />
+      <el-table-column label="开始时间" align="left" prop="createTime"  show-overflow-tooltip />
+      <el-table-column label="结束时间" align="left" prop="endTime"  show-overflow-tooltip />
+      <el-table-column label="执行日志" align="left">
         <template slot-scope="scope">
           <el-button
             type="text"

+ 69 - 73
src/views/business/Middleware/bpmn/index.vue

@@ -1,10 +1,10 @@
 <template>
     <div class="app-container">
       <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
-        <el-form-item label="流程图名称:">
+        <el-form-item label="场景名称:">
           <el-input
             v-model.trim="queryParams.name"
-            placeholder="请输入流程图名称"
+            placeholder="请输入场景名称"
             clearable
             size="small"
             style="width: 160px"
@@ -22,78 +22,74 @@
             @click="handleAdd"
           >新增</el-button>
       </el-form>
-    <el-table v-loading="loading" :data="adminList" border style="margin-top:20px;">
-      <el-table-column label="流程id" align="center" prop="id" show-overflow-tooltip />
-      <el-table-column label="流程图名称" align="center" prop="name" show-overflow-tooltip />
-      <el-table-column label="描述" align="center" prop="procdefDescribe"  show-overflow-tooltip />
-      <el-table-column label="运行状态" align="center" >
-        <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.runStatus"
-             @change="handleStatusChange(scope.row)"
-          ></el-switch>
-        </template>
-      </el-table-column>
-      <el-table-column label="流程图" align="center" prop="resourceName"  show-overflow-tooltip >
+      <el-table v-loading="loading" :data="adminList" border style="margin-top:20px;">
+        <el-table-column label="场景id" align="left" prop="id" show-overflow-tooltip />
+        <el-table-column label="场景名称" align="left" prop="name" show-overflow-tooltip />
+        <el-table-column label="描述" align="left" prop="procdefDescribe"  show-overflow-tooltip />
+        <el-table-column label="运行状态" align="left" >
           <template slot-scope="scope">
-           <el-button
-            size="mini"
-            type="text"
-            class="lans"
-            @click="getBpmn(scope.row)"
-          >查看</el-button>
-          </template>
-      </el-table-column>
-      <el-table-column label="执行记录" align="center" prop="resourceName"  show-overflow-tooltip >
-         <template slot-scope="scope">
-           <el-button
-            size="mini"
-            type="text"
-            class="lans"
-             @click="getRecord(scope.row)"
-          >查看</el-button>
+            <el-switch
+              v-model="scope.row.runStatus"
+              @change="handleStatusChange(scope.row)"
+            ></el-switch>
           </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime"  show-overflow-tooltip />
-      <el-table-column label="操作" align="center" width="400">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            class="lans"
-            @click="zkReProcdefRun1(scope.row)"
-          >执行一次</el-button>
-
-          <el-button
-            size="mini"
-            type="text"
-            class="lans"
-            @click="handleUpdate(scope.row)"
-          >编辑</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            class="hongs"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 查看bpmn对话框 -->
-    <el-dialog  :title="title" :visible.sync="open" width="800px" append-to-body :before-close="cancel" :close-on-click-modal="false">
-      <div class="canvas" ref="canvas"></div>
-    </el-dialog>
-
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.current"
-      :limit.sync="queryParams.size"
-      @pagination="getList"
-    />
-
+        </el-table-column>
+        <el-table-column label="场景配置" align="left" prop="resourceName"  show-overflow-tooltip >
+            <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              class="lans"
+              @click="getBpmn(scope.row)"
+            >查看</el-button>
+            </template>
+        </el-table-column>
+        <el-table-column label="执行记录" align="left" prop="resourceName"  show-overflow-tooltip >
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              class="lans"
+              @click="getRecord(scope.row)"
+            >查看</el-button>
+            </template>
+        </el-table-column>
+        <el-table-column label="创建时间" align="left" prop="createTime"  show-overflow-tooltip />
+        <el-table-column label="操作" align="left">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              class="lans"
+              @click="zkReProcdefRun1(scope.row)"
+            >执行一次</el-button>
 
+            <el-button
+              size="mini"
+              type="text"
+              class="lans"
+              @click="handleUpdate(scope.row)"
+            >编辑</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              class="hongs"
+              @click="handleDelete(scope.row)"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 查看bpmn对话框 -->
+      <el-dialog  :title="title" :visible.sync="open" width="800px" append-to-body :before-close="cancel" :close-on-click-modal="false">
+        <div class="canvas" ref="canvas"></div>
+      </el-dialog>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.current"
+        :limit.sync="queryParams.size"
+        @pagination="getList"
+      />
     </div>
 </template>
 
@@ -124,7 +120,7 @@ export default {
       adminList: [],
 
       // 弹出层标题
-      title: "查看流程图",
+      title: "查看场景配置流程图",
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -250,7 +246,7 @@ export default {
 
     handleStatusChange(row){
       let text = row.runStatus === true ? "启用" : "停用";
-      this.$confirm('确认要'+ text + '"' + row.name + '"流程吗?', "警告", {
+      this.$confirm('确认要'+ text + '"' + row.name + '"场景配置流程吗?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 6 - 6
src/views/business/Middleware/functionalInterface/index.vue

@@ -49,10 +49,10 @@
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="adminList" @selection-change="handleSelectionChange" height="calc(100vh - 30vh)">
-      <!-- <el-table-column label="系统名称" align="center" prop="name"  show-overflow-tooltip /> -->
-      <el-table-column label="接口名称" align="center" prop="name" show-overflow-tooltip />
-      <el-table-column label="接口链接" align="center" prop="url"  show-overflow-tooltip />
-      <el-table-column label="状态" align="center" >
+      <!-- <el-table-column label="系统名称" align="left" prop="name"  show-overflow-tooltip /> -->
+      <el-table-column label="接口名称" align="left" prop="name" show-overflow-tooltip />
+      <el-table-column label="接口链接" align="left" prop="url"  show-overflow-tooltip />
+      <el-table-column label="状态" align="left" >
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.enableFlag"
@@ -62,8 +62,8 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime"  show-overflow-tooltip />
-      <el-table-column label="操作" align="center">
+      <el-table-column label="创建时间" align="left" prop="createTime"  show-overflow-tooltip />
+      <el-table-column label="操作" align="left">
         <template slot-scope="scope">
           <el-button
             size="mini"

+ 6 - 6
src/views/business/Middleware/hostEquipment/index.vue

@@ -49,10 +49,10 @@
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="adminList" @selection-change="handleSelectionChange" height="calc(100vh - 30vh)">
-      <!-- <el-table-column label="系统名称" align="center" prop="data1"  show-overflow-tooltip /> -->
-      <el-table-column label="主机名称" align="center" prop="name" show-overflow-tooltip />
-      <el-table-column label="主机参数" align="center" prop="params"  show-overflow-tooltip />
-      <el-table-column label="状态" align="center" >
+      <!-- <el-table-column label="系统名称" align="left" prop="data1"  show-overflow-tooltip /> -->
+      <el-table-column label="主机名称" align="left" prop="name" show-overflow-tooltip />
+      <el-table-column label="主机参数" align="left" prop="params"  show-overflow-tooltip />
+      <el-table-column label="状态" align="left" >
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.enableFlag"
@@ -62,8 +62,8 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime"  show-overflow-tooltip />
-      <el-table-column label="操作" align="center">
+      <el-table-column label="创建时间" align="left" prop="createTime"  show-overflow-tooltip />
+      <el-table-column label="操作" align="left">
         <template slot-scope="scope">
           <el-button
             size="mini"

+ 10 - 10
src/views/business/Middleware/subsystem/index.vue

@@ -34,11 +34,11 @@
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="adminList" @selection-change="handleSelectionChange" height="calc(100vh - 30vh)">
-      <el-table-column label="系统名称" align="center" prop="data1"  show-overflow-tooltip />
-      <el-table-column label="部署IP/域名" align="center" prop="data2" show-overflow-tooltip />
-      <el-table-column label="服务器基本路径" align="center" prop="data3"  show-overflow-tooltip />
-      <!-- <el-table-column label="创建时间" align="center" prop="data4"  show-overflow-tooltip /> -->
-      <el-table-column label="操作" align="center">
+      <el-table-column label="系统名称" align="left" prop="data1"  show-overflow-tooltip />
+      <el-table-column label="部署IP/域名" align="left" prop="data2" show-overflow-tooltip />
+      <el-table-column label="服务器基本路径" align="left" prop="data3"  show-overflow-tooltip />
+      <!-- <el-table-column label="创建时间" align="left" prop="data4"  show-overflow-tooltip /> -->
+      <el-table-column label="操作" align="left">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -221,7 +221,7 @@ export default {
   created() {
     // this.getList();
     // this.proportionListF()
-    
+
   },
   methods: {
     //强制el-input刷新
@@ -306,7 +306,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       Object.assign(this.form, row.id ? this.adminList.find(val=>val.id === row.id) : this.adminList.find(val=>val.id === this.ids[0]))
-      
+
       if(this.ids.length>1){
         this.open2 = true;
       }else{
@@ -362,8 +362,8 @@ export default {
           }
         });
       }
-      
-      
+
+
     },
     /** 删除按钮操作 */
     handleDelete(row) {
@@ -411,4 +411,4 @@ export default {
     height: 178px;
     display: block;
   }
-</style>
+</style>

+ 9 - 9
src/views/monitor/job/index.vue

@@ -88,13 +88,13 @@
     </el-row>
 
     <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="任务编号" align="center" prop="jobId" />
-      <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
-      <el-table-column label="任务组名" align="center" prop="jobGroup" :formatter="jobGroupFormat" />
-      <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
-      <el-table-column label="cron执行表达式" align="center" prop="cronExpression" :show-overflow-tooltip="true" />
-      <el-table-column label="状态" align="center">
+      <el-table-column type="selection" width="55" align="left" />
+      <el-table-column label="任务编号" align="left" prop="jobId" />
+      <el-table-column label="任务名称" align="left" prop="jobName" :show-overflow-tooltip="true" />
+      <el-table-column label="任务组名" align="left" prop="jobGroup" :formatter="jobGroupFormat" />
+      <el-table-column label="调用目标字符串" align="left" prop="invokeTarget" :show-overflow-tooltip="true" />
+      <el-table-column label="cron执行表达式" align="left" prop="cronExpression" :show-overflow-tooltip="true" />
+      <el-table-column label="状态" align="left">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.status"
@@ -104,7 +104,7 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -480,4 +480,4 @@ export default {
     }
   }
 };
-</script>
+</script>

+ 10 - 10
src/views/monitor/job/log.vue

@@ -94,19 +94,19 @@
     </el-row>
 
     <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="日志编号" width="80" align="center" prop="jobLogId" />
-      <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
-      <el-table-column label="任务组名" align="center" prop="jobGroup" :formatter="jobGroupFormat" :show-overflow-tooltip="true" />
-      <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
-      <el-table-column label="日志信息" align="center" prop="jobMessage" :show-overflow-tooltip="true" />
-      <el-table-column label="执行状态" align="center" prop="status" :formatter="statusFormat" />
-      <el-table-column label="执行时间" align="center" prop="createTime" width="180">
+      <el-table-column type="selection" width="55" align="left" />
+      <el-table-column label="日志编号" width="80" align="left" prop="jobLogId" />
+      <el-table-column label="任务名称" align="left" prop="jobName" :show-overflow-tooltip="true" />
+      <el-table-column label="任务组名" align="left" prop="jobGroup" :formatter="jobGroupFormat" :show-overflow-tooltip="true" />
+      <el-table-column label="调用目标字符串" align="left" prop="invokeTarget" :show-overflow-tooltip="true" />
+      <el-table-column label="日志信息" align="left" prop="jobMessage" :show-overflow-tooltip="true" />
+      <el-table-column label="执行状态" align="left" prop="status" :formatter="statusFormat" />
+      <el-table-column label="执行时间" align="left" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -293,4 +293,4 @@ export default {
     }
   }
 };
-</script>
+</script>

+ 10 - 10
src/views/monitor/logininfor/index.vue

@@ -88,16 +88,16 @@
     </el-row>
 
     <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="访问编号" align="center" prop="infoId" />
-      <el-table-column label="用户名称" align="center" prop="userName" />
-      <el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
-      <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
-      <el-table-column label="浏览器" align="center" prop="browser" />
-      <el-table-column label="操作系统" align="center" prop="os" />
-      <el-table-column label="登录状态" align="center" prop="status" :formatter="statusFormat" />
-      <el-table-column label="操作信息" align="center" prop="msg" />
-      <el-table-column label="登录日期" align="center" prop="loginTime" width="180">
+      <el-table-column type="selection" width="55" align="left" />
+      <el-table-column label="访问编号" align="left" prop="infoId" />
+      <el-table-column label="用户名称" align="left" prop="userName" />
+      <el-table-column label="登录地址" align="left" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
+      <el-table-column label="登录地点" align="left" prop="loginLocation" :show-overflow-tooltip="true" />
+      <el-table-column label="浏览器" align="left" prop="browser" />
+      <el-table-column label="操作系统" align="left" prop="os" />
+      <el-table-column label="登录状态" align="left" prop="status" :formatter="statusFormat" />
+      <el-table-column label="操作信息" align="left" prop="msg" />
+      <el-table-column label="登录日期" align="left" prop="loginTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.loginTime) }}</span>
         </template>

+ 10 - 10
src/views/monitor/online/index.vue

@@ -30,24 +30,24 @@
       :data="list.slice((pageNum-1)*pageSize,pageNum*pageSize)"
       style="width: 100%;"
     >
-      <el-table-column label="序号" type="index" align="center">
+      <el-table-column label="序号" type="index" align="left">
         <template slot-scope="scope">
           <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="会话编号" align="center" prop="tokenId" :show-overflow-tooltip="true" />
-      <el-table-column label="登录名称" align="center" prop="userName" :show-overflow-tooltip="true" />
-      <el-table-column label="部门名称" align="center" prop="deptName" />
-      <el-table-column label="主机" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
-      <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
-      <el-table-column label="浏览器" align="center" prop="browser" />
-      <el-table-column label="操作系统" align="center" prop="os" />
-      <el-table-column label="登录时间" align="center" prop="loginTime" width="180">
+      <el-table-column label="会话编号" align="left" prop="tokenId" :show-overflow-tooltip="true" />
+      <el-table-column label="登录名称" align="left" prop="userName" :show-overflow-tooltip="true" />
+      <el-table-column label="部门名称" align="left" prop="deptName" />
+      <el-table-column label="主机" align="left" prop="ipaddr" :show-overflow-tooltip="true" />
+      <el-table-column label="登录地点" align="left" prop="loginLocation" :show-overflow-tooltip="true" />
+      <el-table-column label="浏览器" align="left" prop="browser" />
+      <el-table-column label="操作系统" align="left" prop="os" />
+      <el-table-column label="登录时间" align="left" prop="loginTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.loginTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

+ 11 - 11
src/views/monitor/operlog/index.vue

@@ -104,21 +104,21 @@
     </el-row>
 
     <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="日志编号" align="center" prop="operId" />
-      <el-table-column label="系统模块" align="center" prop="title" />
-      <el-table-column label="操作类型" align="center" prop="businessType" :formatter="typeFormat" />
-      <el-table-column label="请求方式" align="center" prop="requestMethod" />
-      <el-table-column label="操作人员" align="center" prop="operName" />
-      <el-table-column label="主机" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />
-      <el-table-column label="操作地点" align="center" prop="operLocation" :show-overflow-tooltip="true" />
-      <el-table-column label="操作状态" align="center" prop="status" :formatter="statusFormat" />
-      <el-table-column label="操作日期" align="center" prop="operTime" width="180">
+      <el-table-column type="selection" width="55" align="left" />
+      <el-table-column label="日志编号" align="left" prop="operId" />
+      <el-table-column label="系统模块" align="left" prop="title" />
+      <el-table-column label="操作类型" align="left" prop="businessType" :formatter="typeFormat" />
+      <el-table-column label="请求方式" align="left" prop="requestMethod" />
+      <el-table-column label="操作人员" align="left" prop="operName" />
+      <el-table-column label="主机" align="left" prop="operIp" width="130" :show-overflow-tooltip="true" />
+      <el-table-column label="操作地点" align="left" prop="operLocation" :show-overflow-tooltip="true" />
+      <el-table-column label="操作状态" align="left" prop="status" :formatter="statusFormat" />
+      <el-table-column label="操作日期" align="left" prop="operTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.operTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

+ 10 - 10
src/views/system/config/index.vue

@@ -101,19 +101,19 @@
     </el-row>
 
     <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="参数主键" align="center" prop="configId" />
-      <el-table-column label="参数名称" align="center" prop="configName" :show-overflow-tooltip="true" />
-      <el-table-column label="参数键名" align="center" prop="configKey" :show-overflow-tooltip="true" />
-      <el-table-column label="参数键值" align="center" prop="configValue" />
-      <el-table-column label="系统内置" align="center" prop="configType" :formatter="typeFormat" />
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column type="selection" width="55" align="left" />
+      <el-table-column label="参数主键" align="left" prop="configId" />
+      <el-table-column label="参数名称" align="left" prop="configName" :show-overflow-tooltip="true" />
+      <el-table-column label="参数键名" align="left" prop="configKey" :show-overflow-tooltip="true" />
+      <el-table-column label="参数键值" align="left" prop="configValue" />
+      <el-table-column label="系统内置" align="left" prop="configType" :formatter="typeFormat" />
+      <el-table-column label="备注" align="left" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="创建时间" align="left" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -353,4 +353,4 @@ export default {
     }
   }
 };
-</script>
+</script>

+ 11 - 11
src/views/system/dept/index.vue

@@ -49,24 +49,24 @@
       <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
       <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
       <el-table-column prop="status" label="状态" :formatter="statusFormat" width="100"></el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
+      <el-table-column label="创建时间" align="left" prop="createTime" width="200">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button 
-            size="mini" 
-            type="text" 
-            icon="el-icon-edit" 
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:dept:edit']"
           >修改</el-button>
-          <el-button 
-            size="mini" 
-            type="text" 
-            icon="el-icon-plus" 
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
             @click="handleAdd(scope.row)"
             v-hasPermi="['system:dept:add']"
           >新增</el-button>
@@ -313,4 +313,4 @@ export default {
     }
   }
 };
-</script>
+</script>

+ 10 - 10
src/views/system/dict/data.vue

@@ -79,19 +79,19 @@
     </el-row>
 
     <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="字典编码" align="center" prop="dictCode" />
-      <el-table-column label="字典标签" align="center" prop="dictLabel" />
-      <el-table-column label="字典键值" align="center" prop="dictValue" />
-      <el-table-column label="字典排序" align="center" prop="dictSort" />
-      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column type="selection" width="55" align="left" />
+      <el-table-column label="字典编码" align="left" prop="dictCode" />
+      <el-table-column label="字典标签" align="left" prop="dictLabel" />
+      <el-table-column label="字典键值" align="left" prop="dictValue" />
+      <el-table-column label="字典排序" align="left" prop="dictSort" />
+      <el-table-column label="状态" align="left" prop="status" :formatter="statusFormat" />
+      <el-table-column label="备注" align="left" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="创建时间" align="left" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -347,4 +347,4 @@ export default {
     }
   }
 };
-</script>
+</script>

+ 9 - 9
src/views/system/dict/index.vue

@@ -107,24 +107,24 @@
     </el-row>
 
     <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="字典编号" align="center" prop="dictId" />
-      <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
+      <el-table-column type="selection" width="55" align="left" />
+      <el-table-column label="字典编号" align="left" prop="dictId" />
+      <el-table-column label="字典名称" align="left" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column label="字典类型" align="left" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <router-link :to="'/dict/type/data/' + scope.row.dictId" class="link-type">
             <span>{{ scope.row.dictType }}</span>
           </router-link>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column label="状态" align="left" prop="status" :formatter="statusFormat" />
+      <el-table-column label="备注" align="left" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="创建时间" align="left" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -357,4 +357,4 @@ export default {
     }
   }
 };
-</script>
+</script>

+ 11 - 11
src/views/system/menu/index.vue

@@ -46,7 +46,7 @@
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
       <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
-      <el-table-column prop="icon" label="图标" align="center" width="100">
+      <el-table-column prop="icon" label="图标" align="left" width="100">
         <template slot-scope="scope">
           <svg-icon :icon-class="scope.row.icon" />
         </template>
@@ -55,23 +55,23 @@
       <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="status" label="状态" :formatter="statusFormat" width="80"></el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime">
+      <el-table-column label="创建时间" align="left" prop="createTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" 
-            type="text" 
-            icon="el-icon-edit" 
+          <el-button size="mini"
+            type="text"
+            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:menu:edit']"
           >修改</el-button>
-          <el-button 
-            size="mini" 
-            type="text" 
-            icon="el-icon-plus" 
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
             @click="handleAdd(scope.row)"
             v-hasPermi="['system:menu:add']"
           >新增</el-button>
@@ -396,4 +396,4 @@ export default {
     }
   }
 };
-</script>
+</script>

+ 9 - 9
src/views/system/notice/index.vue

@@ -69,35 +69,35 @@
     </el-row>
 
     <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="noticeId" width="100" />
+      <el-table-column type="selection" width="55" align="left" />
+      <el-table-column label="序号" align="left" prop="noticeId" width="100" />
       <el-table-column
         label="公告标题"
-        align="center"
+        align="left"
         prop="noticeTitle"
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="公告类型"
-        align="center"
+        align="left"
         prop="noticeType"
         :formatter="typeFormat"
         width="100"
       />
       <el-table-column
         label="状态"
-        align="center"
+        align="left"
         prop="status"
         :formatter="statusFormat"
         width="100"
       />
-      <el-table-column label="创建者" align="center" prop="createBy" width="100" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="100">
+      <el-table-column label="创建者" align="left" prop="createBy" width="100" />
+      <el-table-column label="创建时间" align="left" prop="createTime" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -337,4 +337,4 @@ export default {
     }
   }
 };
-</script>
+</script>

+ 10 - 10
src/views/system/post/index.vue

@@ -78,18 +78,18 @@
     </el-row>
 
     <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="岗位编号" align="center" prop="postId" />
-      <el-table-column label="岗位编码" align="center" prop="postCode" />
-      <el-table-column label="岗位名称" align="center" prop="postName" />
-      <el-table-column label="岗位排序" align="center" prop="postSort" />
-      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column type="selection" width="55" align="left" />
+      <el-table-column label="岗位编号" align="left" prop="postId" />
+      <el-table-column label="岗位编码" align="left" prop="postCode" />
+      <el-table-column label="岗位名称" align="left" prop="postName" />
+      <el-table-column label="岗位排序" align="left" prop="postSort" />
+      <el-table-column label="状态" align="left" prop="status" :formatter="statusFormat" />
+      <el-table-column label="创建时间" align="left" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -108,7 +108,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -319,4 +319,4 @@ export default {
     }
   }
 };
-</script>
+</script>

+ 5 - 5
src/views/system/role/index.vue

@@ -98,12 +98,12 @@
     </el-row>
 
     <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="left" />
       <el-table-column label="角色编号" prop="roleId" width="120" />
       <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
       <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
       <el-table-column label="显示顺序" prop="roleSort" width="100" />
-      <el-table-column label="状态" align="center" width="100">
+      <el-table-column label="状态" align="left" width="100">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.status"
@@ -113,12 +113,12 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column label="创建时间" align="left" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -592,4 +592,4 @@ export default {
     }
   }
 };
-</script>
+</script>

+ 9 - 9
src/views/system/user/index.vue

@@ -134,13 +134,13 @@
         </el-row>
 
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="用户编号" align="center" prop="userId" />
-          <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" />
-          <el-table-column label="用户昵称" align="center" prop="nickName" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" prop="dept.deptName" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" prop="phonenumber" width="120" />
-          <el-table-column label="状态" align="center">
+          <el-table-column type="selection" width="50" align="left" />
+          <el-table-column label="用户编号" align="left" prop="userId" />
+          <el-table-column label="用户名称" align="left" prop="userName" :show-overflow-tooltip="true" />
+          <el-table-column label="用户昵称" align="left" prop="nickName" :show-overflow-tooltip="true" />
+          <el-table-column label="部门" align="left" prop="dept.deptName" :show-overflow-tooltip="true" />
+          <el-table-column label="手机号码" align="left" prop="phonenumber" width="120" />
+          <el-table-column label="状态" align="left">
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.status"
@@ -150,14 +150,14 @@
               ></el-switch>
             </template>
           </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createTime" width="160">
+          <el-table-column label="创建时间" align="left" prop="createTime" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
           <el-table-column
             label="操作"
-            align="center"
+            align="left"
             width="160"
             class-name="small-padding fixed-width"
           >

+ 8 - 8
src/views/tool/gen/index.vue

@@ -81,35 +81,35 @@
 
     <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column label="序号" type="index" width="50" align="center">
+      <el-table-column label="序号" type="index" width="50" align="left">
         <template slot-scope="scope">
           <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
         </template>
       </el-table-column>
       <el-table-column
         label="表名称"
-        align="center"
+        align="left"
         prop="tableName"
         :show-overflow-tooltip="true"
         width="130"
       />
       <el-table-column
         label="表描述"
-        align="center"
+        align="left"
         prop="tableComment"
         :show-overflow-tooltip="true"
         width="130"
       />
       <el-table-column
         label="实体"
-        align="center"
+        align="left"
         prop="className"
         :show-overflow-tooltip="true"
         width="130"
       />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="160" />
-      <el-table-column label="更新时间" align="center" prop="updateTime" width="160" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="创建时间" align="left" prop="createTime" width="160" />
+      <el-table-column label="更新时间" align="left" prop="updateTime" width="160" />
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -317,4 +317,4 @@ export default {
     }
   }
 };
-</script>
+</script>

+ 11 - 11
src/views/workflow/leave/index.vue

@@ -83,25 +83,25 @@
     </el-row>
 
     <el-table v-loading="loading" :data="leaveList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
-      <!--      <el-table-column label="主键ID" align="center" prop="id" />-->
-      <el-table-column label="请假类型" align="center" prop="type" :formatter="typeFormat"/>
-      <el-table-column label="标题" align="center" prop="title"/>
-      <el-table-column label="原因" align="center" prop="reason"/>
-      <el-table-column label="开始时间" align="center" prop="leaveStartTime" width="180">
+      <el-table-column type="selection" width="55" align="left"/>
+      <!--      <el-table-column label="主键ID" align="left" prop="id" />-->
+      <el-table-column label="请假类型" align="left" prop="type" :formatter="typeFormat"/>
+      <el-table-column label="标题" align="left" prop="title"/>
+      <el-table-column label="原因" align="left" prop="reason"/>
+      <el-table-column label="开始时间" align="left" prop="leaveStartTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.leaveStartTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="leaveEndTime" width="180">
+      <el-table-column label="结束时间" align="left" prop="leaveEndTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.leaveEndTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
 
 
-      <!--      <el-table-column label="状态" align="center" prop="state" :formatter="stateFormat">-->
-      <el-table-column label="状态" align="center">
+      <!--      <el-table-column label="状态" align="left" prop="state" :formatter="stateFormat">-->
+      <el-table-column label="状态" align="left">
         <template slot-scope="scope">
           <div v-if="scope.row.state!=0">
             {{stateFormat(scope.row)}}
@@ -111,8 +111,8 @@
           </div>
         </template>
       </el-table-column>
-      <!--      <el-table-column label="创建者" align="center" prop="createName" />-->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <!--      <el-table-column label="创建者" align="left" prop="createName" />-->
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button v-if="2==scope.row.state"
                      size="mini"

+ 10 - 10
src/views/workflow/leave/leaveAll.vue

@@ -73,24 +73,24 @@
     </el-row>
 
     <el-table v-loading="loading" :data="leaveList" >
-      <el-table-column type="selection" width="55" align="center"/>
-      <!--      <el-table-column label="主键ID" align="center" prop="id" />-->
-      <el-table-column label="请假类型" align="center" prop="type" :formatter="typeFormat"/>
-      <el-table-column label="标题" align="center" prop="title"/>
-      <el-table-column label="原因" align="center" prop="reason"/>
-      <el-table-column label="开始时间" align="center" prop="leaveStartTime" width="180">
+      <el-table-column type="selection" width="55" align="left"/>
+      <!--      <el-table-column label="主键ID" align="left" prop="id" />-->
+      <el-table-column label="请假类型" align="left" prop="type" :formatter="typeFormat"/>
+      <el-table-column label="标题" align="left" prop="title"/>
+      <el-table-column label="原因" align="left" prop="reason"/>
+      <el-table-column label="开始时间" align="left" prop="leaveStartTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.leaveStartTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="leaveEndTime" width="180">
+      <el-table-column label="结束时间" align="left" prop="leaveEndTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.leaveEndTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="创建人" align="center" prop="createName"/>
-      <el-table-column label="状态" align="center" prop="state" :formatter="stateFormat"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="创建人" align="left" prop="createName"/>
+      <el-table-column label="状态" align="left" prop="state" :formatter="stateFormat"/>
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

+ 3 - 3
vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
         proxy: {
             // detail: https://cli.vuejs.org/config/#devserver-proxy
             [process.env.VUE_APP_BASE_API]: {
-                target: `https://smartpark.caih.com/dmapi/`,
-                //target: `http://172.16.120.85:8084/`,
+                //target: `https://smartpark.caih.com/dmapi/`,
+                target: `http://172.16.120.85:8084/`,
                 changeOrigin: true,
                 pathRewrite: {
                     ['^' + process.env.VUE_APP_BASE_API]: ''
@@ -115,4 +115,4 @@ module.exports = {
                 }
             )
     }
-}
+}

Some files were not shown because too many files changed in this diff