From 51eafed4293ceed5fd52c7c60188007244d7c5a5 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Mon, 31 Mar 2025 17:09:07 +0800
Subject: [PATCH 1/4] =?UTF-8?q?[=E5=85=B3=E8=81=94]=20#[1356418362343424]?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5-=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96=E4=BD=9C=E4=B8=9A=E8=8A=82=E7=82=B9=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1356418362343424?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/assets/languages/page/en.json   |  3 +-
 src/resources/assets/languages/page/zh.json   |  3 +-
 .../workorder/activity/item/index.js          |  2 +
 .../workorder/createjob/job-detail.vue        | 69 +++++++++++++++----
 4 files changed, 63 insertions(+), 14 deletions(-)

diff --git a/src/resources/assets/languages/page/en.json b/src/resources/assets/languages/page/en.json
index cc4ed489c..e287051ae 100644
--- a/src/resources/assets/languages/page/en.json
+++ b/src/resources/assets/languages/page/en.json
@@ -1061,5 +1061,6 @@
   "movetothebottom": "Move to the bottom layer",
   "pastehere": "Paste here",
   "dragthecanvas": "Drag and drop canvas",
-  "rubberband": "Frame Select"
+  "rubberband": "Frame Select",
+  "actualpath": "actual path"
 }
\ No newline at end of file
diff --git a/src/resources/assets/languages/page/zh.json b/src/resources/assets/languages/page/zh.json
index ebbed6abb..4c2fa46c6 100644
--- a/src/resources/assets/languages/page/zh.json
+++ b/src/resources/assets/languages/page/zh.json
@@ -1063,5 +1063,6 @@
   "movetothebottom": "移至底层",
   "pastehere": "在此粘贴",
   "dragthecanvas": "拖拽画布",
-  "rubberband": "框选"
+  "rubberband": "框选",
+  "actualpath": "实际路径"
 }
\ No newline at end of file
diff --git a/src/views/pages/process/task/processdetail/workorder/activity/item/index.js b/src/views/pages/process/task/processdetail/workorder/activity/item/index.js
index 6f2f5c2a6..c8190789e 100644
--- a/src/views/pages/process/task/processdetail/workorder/activity/item/index.js
+++ b/src/views/pages/process/task/processdetail/workorder/activity/item/index.js
@@ -20,6 +20,7 @@ import eventinfoHandler from './list-handler';
 import focususerHandler from './focususer-handler';
 import automaticinfoHandler from './automaticinfo-handler';
 import cmdbsyncmessageHandler from './cmdbsyncmessage-handler';
+import autoexecmessageHandler from './autoexecmessage-handler';
 import ComponentManager from '@/resources/import/component-manager.js';
 
 export default {
@@ -44,5 +45,6 @@ export default {
   focususerHandler, //修改工单关注人
   automaticinfoHandler,
   cmdbsyncmessageHandler,
+  autoexecmessageHandler,
   ...(ComponentManager.getTimeLineComponent() || {})
 };
diff --git a/src/views/pages/process/task/processdetail/workorder/createjob/job-detail.vue b/src/views/pages/process/task/processdetail/workorder/createjob/job-detail.vue
index f49a8438a..18a408c75 100644
--- a/src/views/pages/process/task/processdetail/workorder/createjob/job-detail.vue
+++ b/src/views/pages/process/task/processdetail/workorder/createjob/job-detail.vue
@@ -1,13 +1,24 @@
 <template>
   <div v-if="handlerStepInfo">
-    <Alert v-if="!$utils.isEmpty(handlerStepInfo.errorList)" type="error">
-      <template slot="desc">
-        <div v-for="(e,eindex) in handlerStepInfo.errorList" :key="eindex" class="text-word-break">
-          {{ $t('term.autoexec.targetjoberror',{target: e.jobName}) }}：{{ e.error.length > 500 && !e.isMore? e.error.slice(0,500) : e.error }}
-          <span v-if="e.error.length > 500" class="text-href pl-sm" @click="viewDetail(e)">{{ !e.isMore?$t('page.viewmore'):$t('page.packup') }}</span>
-        </div>
-      </template>
-    </Alert>
+    <div v-if="!$utils.isEmpty(handlerStepInfo.errorList)" type="error">
+      <!-- <div v-for="(e,eindex) in handlerStepInfo.errorList" :key="eindex"> -->
+      <TsTable
+        :theadList="columnList"
+        :tbodyList="handlerStepInfo.errorList"
+      >
+        <template slot="status" slot-scope="{ row }">
+          <div class="text-error">{{ row.status || $t('page.fail') }}</div>
+        </template>
+        <template slot="action" slot-scope="{ row }">
+          <div class="tstable-action">
+            <ul class="tstable-action-ul">
+              <li class="tsfont-eye" @click="viewError(row)">{{ $t('page.viewtarget',{'target':$t('page.exception')}) }}</li>
+            </ul>
+          </div>
+        </template>
+      </TsTable>
+      <!-- </div> -->
+    </div>
     <TsTable
       v-if="handlerStepInfo.jobList && handlerStepInfo.jobList.length > 0"
       :theadList="theadList"
@@ -73,7 +84,26 @@ export default {
           title: this.$t('term.autoexec.executionsituation'),
           key: 'completionRate'
         }
-      ]
+      ],
+      columnList: [
+        {
+          key: 'jobName',
+          title: this.$t('page.jobname')
+        },
+        {
+          title: this.$t('page.status'),
+          key: 'status'
+        },
+        {
+          key: 'message',
+          title: this.$t('term.framework.errorinfo'),
+          maxLength: 50
+        },
+        {
+          key: 'action'
+        }
+      ],
+      isMore: false
     };
   },
   beforeCreate() {},
@@ -90,8 +120,14 @@ export default {
     gotoJopDetail(job) { //查看作业
       window.open(HOME + '/autoexec.html#/job-detail?id=' + job.id, '_blank');
     },
-    viewDetail(e) {
-      this.$set(e, 'isMore', !e.isMore);
+    viewError(row) {
+      this.$createDialog({
+        title: this.$t('term.framework.errorinfo'),
+        content: row.message,
+        width: 'medium',
+        hasFooter: false,
+        maskClose: true
+      });
     }
   },
   filter: {},
@@ -108,5 +144,14 @@ export default {
   watch: {}
 };
 </script>
-<style lang="less">
+<style lang="less" scoped>
+.more-btn {
+  position: absolute;
+  right: 8px;
+  top: 0px;
+}
+.td-div {
+  word-break:break-all;
+  white-space:break-spaces
+}
 </style>
-- 
Gitee


From cd3bf02721d8ee60e27e30114cf434c4183a0a0f Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Mon, 31 Mar 2025 17:12:39 +0800
Subject: [PATCH 2/4] =?UTF-8?q?[=E5=85=B3=E8=81=94]=20#[1356418362343424]?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5-=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96=E4=BD=9C=E4=B8=9A=E8=8A=82=E7=82=B9=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1356418362343424?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/processdetail/workorder/createjob/job-detail.vue       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/views/pages/process/task/processdetail/workorder/createjob/job-detail.vue b/src/views/pages/process/task/processdetail/workorder/createjob/job-detail.vue
index 18a408c75..737bb5dda 100644
--- a/src/views/pages/process/task/processdetail/workorder/createjob/job-detail.vue
+++ b/src/views/pages/process/task/processdetail/workorder/createjob/job-detail.vue
@@ -1,7 +1,6 @@
 <template>
   <div v-if="handlerStepInfo">
     <div v-if="!$utils.isEmpty(handlerStepInfo.errorList)" type="error">
-      <!-- <div v-for="(e,eindex) in handlerStepInfo.errorList" :key="eindex"> -->
       <TsTable
         :theadList="columnList"
         :tbodyList="handlerStepInfo.errorList"
@@ -17,7 +16,6 @@
           </div>
         </template>
       </TsTable>
-      <!-- </div> -->
     </div>
     <TsTable
       v-if="handlerStepInfo.jobList && handlerStepInfo.jobList.length > 0"
-- 
Gitee


From 19315d96fe7ea48c8fccc556eec1af90bddcb685 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Mon, 31 Mar 2025 17:13:34 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processdetail/workorder/createjob/job-detail.vue     | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/views/pages/process/task/processdetail/workorder/createjob/job-detail.vue b/src/views/pages/process/task/processdetail/workorder/createjob/job-detail.vue
index 737bb5dda..bd90e81c5 100644
--- a/src/views/pages/process/task/processdetail/workorder/createjob/job-detail.vue
+++ b/src/views/pages/process/task/processdetail/workorder/createjob/job-detail.vue
@@ -143,13 +143,4 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-.more-btn {
-  position: absolute;
-  right: 8px;
-  top: 0px;
-}
-.td-div {
-  word-break:break-all;
-  white-space:break-spaces
-}
 </style>
-- 
Gitee


From 0e6f1ac1bf160e74d14813c116163ae15e0b1d75 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Mon, 31 Mar 2025 17:17:46 +0800
Subject: [PATCH 4/4] =?UTF-8?q?[=E5=85=B3=E8=81=94]#[1356418362343424]?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5-=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96=E4=BD=9C=E4=B8=9A=E8=8A=82=E7=82=B9=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1356418362343424?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/item/autoexecmessage-handler.vue | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 src/views/pages/process/task/processdetail/workorder/activity/item/autoexecmessage-handler.vue

diff --git a/src/views/pages/process/task/processdetail/workorder/activity/item/autoexecmessage-handler.vue b/src/views/pages/process/task/processdetail/workorder/activity/item/autoexecmessage-handler.vue
new file mode 100644
index 000000000..29c93dbcf
--- /dev/null
+++ b/src/views/pages/process/task/processdetail/workorder/activity/item/autoexecmessage-handler.vue
@@ -0,0 +1,45 @@
+<template>
+  <div v-if="!$utils.isEmpty(config)">
+    <JobDetail :handlerStepInfo="errorConfig"></JobDetail>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    JobDetail: () => import('@/views/pages/process/task/processdetail/workorder/createjob/job-detail.vue')
+  },
+  props: {
+    config: Object
+  },
+  data() {
+    return {
+      errorConfig: {}
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {
+    this.init();
+  },
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    init() {
+      if (this.config && this.config.newContent) {
+        this.errorConfig = JSON.parse(this.config.newContent);
+      }
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less">
+</style>
-- 
Gitee