From 848f49f6fa9217bb847003a8f247a5325d69186c Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 7 Mar 2022 17:39:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/layouts/TabLayout.vue |  3 +-
 .../views/processCenter/ProcessMapping.vue    |  2 +-
 .../views/processCenter/procedure/index.vue   | 40 ++++++++++++-------
 .../tabComponents/alreadySend/index.vue       | 16 ++++++--
 .../tabComponents/monitorProcess/index.vue    | 16 ++++++--
 .../tabComponents/processCenter/index.vue     | 11 ++++-
 .../tabComponents/taskDraft/index.vue         | 11 ++++-
 7 files changed, 73 insertions(+), 26 deletions(-)

diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue
index c86127a46..b638bd6f3 100644
--- a/jero-web/src/components/layouts/TabLayout.vue
+++ b/jero-web/src/components/layouts/TabLayout.vue
@@ -87,7 +87,8 @@
       },
       isTrue() {
         if (this.$route.path == '/docManage/library/detail' ||
-          this.$route.path == '/system/MessageDetails') {
+          this.$route.path == '/system/MessageDetails' ||
+          this.$route.path == '/ProcessMapping') {
           return false
         } else {
           return true
diff --git a/jero-web/src/views/processCenter/ProcessMapping.vue b/jero-web/src/views/processCenter/ProcessMapping.vue
index ae5b79d22..15cdff2b2 100644
--- a/jero-web/src/views/processCenter/ProcessMapping.vue
+++ b/jero-web/src/views/processCenter/ProcessMapping.vue
@@ -16,7 +16,7 @@
         data() {
             return {
                 name: '',
-                actUrl: 'http://10.0.1.13:17210/modeler.html?modelId='//本地
+                actUrl: 'http://10.0.1.13:17210/bat-wkflow/modeler.html?modelId='//本地
                 // actUrl: 'http://10.255.35.25:8082/modeler.html?modelId='  //正式
                 // actUrl: 'http://10.255.128.148:8888/modeler.html?modelId='  //测试
             }
diff --git a/jero-web/src/views/processCenter/procedure/index.vue b/jero-web/src/views/processCenter/procedure/index.vue
index a4fb2b4a3..e656f4020 100644
--- a/jero-web/src/views/processCenter/procedure/index.vue
+++ b/jero-web/src/views/processCenter/procedure/index.vue
@@ -10,6 +10,7 @@
         </div>
         <a-table
           class="table"
+          key="id"
           :pagination="false"
           :scroll="{x: true}"
           :data-source="dataSource"
@@ -18,10 +19,10 @@
           @change="tableOnChange"
         >
           <span slot="operation" slot-scope="record">
-             <a @click="edit(record)">{{$t('edit')}}</a>
-             <a @click="deploy(record.id)">部署</a>
-             <a @click="copyModel(record.id)">复制</a>
-             <a @click="deleteRow(record)">{{$t('delete')}}</a>
+             <a style="margin-right: 8px" @click="edit(record)">{{$t('edit')}}</a>
+             <a style="margin-right: 8px" @click="deploy(record.id)">部署</a>
+<!--             <a style="margin-right: 8px" @click="copyModel(record.id)">复制</a>-->
+             <a style="margin-right: 8px" @click="deleteRow(record)">{{$t('delete')}}</a>
           </span>
         </a-table>
       </div>
@@ -100,6 +101,7 @@
 <script>
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
   import eventBUs from '../../../common/event'
+  import moment from 'moment'
 
   export default {
     name: 'ProcessClassification',
@@ -116,29 +118,38 @@
             title: this.$t('serialNumber'),
             dataIndex: 'index',
             align: 'center',
-            ellipsis: true
+            width: 20,
+            customRender: function(t, r, index) {
+              return parseInt(index) + 1
+            }
           },
           {
             title: this.$t('ProcessName'),
             dataIndex: 'name',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            width: 180
           },
           {
             title: this.$t('ProcessType'),
             dataIndex: 'categoryName',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            width: 180
           },
           {
             title: this.$t('createTime'),
             dataIndex: 'createTime',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            width: 180,
+            customRender: function(t, r, index) {
+              return moment(t).format('YYYY-MM-DD HH:mm:ss')
+            }
           },
           {
             title: this.$t('operation'),
-            width: 140,
+            width: 200,
             align: 'center',
             fixed: 'right',
             scopedSlots: { customRender: 'operation' }
@@ -201,6 +212,7 @@
       },
       // 查询、加载表格
       queryTablePage() {
+        this.loading = true
         const formData = {
           current: this.pageNo,
           size: this.pageSize
@@ -209,8 +221,10 @@
           if (res.success) {
             this.dataSource = res.result.records || []
             this.total = res.result.total
+            this.loading = false
           } else {
             this.dataSource = []
+            this.loading = false
           }
         })
       },
@@ -231,7 +245,7 @@
             getAction('/model/deploy', { modelId: modelId }).then((res) => {
               if (res.success) {
                 _this.$message.success(_this.$t('OperationSuccessful'))
-                this.queryTablePage()
+                _this.queryTablePage()
               } else {
                 _this.$message.warning(_this.$t('operationFailed'))
               }
@@ -246,12 +260,10 @@
           onOk() {
             getAction('model/copyModel', { modelId: modelId }).then((res) => {
               if (res.success) {
-                this.$router.push({
+                _this.$router.push({
                   path: '/ProcessMapping',
                   query: { id: res.result }
                 })
-                _this.$message.success(_this.$t('OperationSuccessful'))
-                this.queryTablePage()
               } else {
                 _this.$message.warning(_this.$t('operationFailed'))
               }
@@ -268,7 +280,7 @@
             getAction('model/deleteModel', { modelId: row.id }).then((res) => {
               if (res.success) {
                 _this.$message.success(_this.$t('OperationSuccessful'))
-                this.queryTablePage()
+                _this.queryTablePage()
               } else {
                 _this.$message.warning(_this.$t('operationFailed'))
               }
diff --git a/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue
index 2e1f5d980..11c89bcd2 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue
@@ -29,6 +29,7 @@
 <script>
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
   import { mapGetters } from 'vuex'
+  import moment from 'moment'
 
   export default {
     name: 'AlreadySend',
@@ -68,13 +69,19 @@
             title: this.$t('createTime'),
             dataIndex: 'createTime',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            customRender: function(t, r, index) {
+              return moment(t).format('YYYY-MM-DD HH:mm:ss')
+            }
           },
           {
             title: this.$t('CompletionTime'),
             dataIndex: 'createTime',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            customRender: function(t, r, index) {
+              return moment(t).format('YYYY-MM-DD HH:mm:ss')
+            }
           },
           {
             title: this.$t('ProcessStatus'),
@@ -86,7 +93,10 @@
             title: this.$t('cutoffTime'),
             dataIndex: 'endTime',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            customRender: function(t, r, index) {
+              return moment(t).format('YYYY-MM-DD HH:mm:ss')
+            }
           },
           {
             title: this.$t('operation'),
diff --git a/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue
index 9552626ae..9a8560517 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue
@@ -29,6 +29,7 @@
 <script>
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
   import { mapGetters } from 'vuex'
+  import moment from 'moment'
 
   export default {
     name: 'MonitorProcess',
@@ -68,13 +69,19 @@
             title: this.$t('createTime'),
             dataIndex: 'createTime',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            customRender: function(t, r, index) {
+              return moment(t).format('YYYY-MM-DD HH:mm:ss')
+            }
           },
           {
             title: this.$t('CompletionTime'),
             dataIndex: 'createTime',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            customRender: function(t, r, index) {
+              return moment(t).format('YYYY-MM-DD HH:mm:ss')
+            }
           },
           {
             title: this.$t('ProcessStatus'),
@@ -86,7 +93,10 @@
             title: this.$t('cutoffTime'),
             dataIndex: 'endTime',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            customRender: function(t, r, index) {
+              return moment(t).format('YYYY-MM-DD HH:mm:ss')
+            }
           },
           {
             title: this.$t('operation'),
diff --git a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
index 5699c26d9..794f6b36a 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
@@ -29,6 +29,7 @@
 <script>
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
   import { mapGetters } from 'vuex'
+  import moment from 'moment'
   export default {
     name: 'ProcessCenter',
     data() {
@@ -73,13 +74,19 @@
             title: this.$t('createTime'),
             dataIndex: 'createTime',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            customRender: function(t, r, index) {
+              return moment(t).format('YYYY-MM-DD HH:mm:ss')
+            }
           },
           {
             title: this.$t('cutoffTime'),
             dataIndex: 'endTime',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            customRender: function(t, r, index) {
+              return moment(t).format('YYYY-MM-DD HH:mm:ss')
+            }
           },
           {
             title: this.$t('operation'),
diff --git a/jero-web/src/views/processCenter/processList/tabComponents/taskDraft/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/taskDraft/index.vue
index c2ec44643..b812c7442 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/taskDraft/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/taskDraft/index.vue
@@ -29,6 +29,7 @@
 <script>
   import { mapMutations, mapActions, mapGetters } from 'vuex'
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+  import moment from 'moment'
 
   export default {
     name: 'ProcessCenter',
@@ -80,7 +81,10 @@
             title: this.$t('createTime'),
             dataIndex: 'createTime',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            customRender: function(t, r, index) {
+              return moment(t).format('YYYY-MM-DD HH:mm:ss')
+            }
           },
           {
             title: this.$t('ProcessStatus'),
@@ -92,7 +96,10 @@
             title: this.$t('cutoffTime'),
             dataIndex: 'endTime',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            customRender: function(t, r, index) {
+              return moment(t).format('YYYY-MM-DD HH:mm:ss')
+            }
           },
           {
             title: this.$t('operation'),