From e0778297ad4a5fd6677294cff81d972acccb728d Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Tue, 11 Nov 2025 18:41:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[15522447621816?=
 =?UTF-8?q?32]=E6=8A=A5=E8=A1=A8=EF=BC=9A=E6=B5=81=E7=A8=8B=E5=9B=BE?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=80=9A=E7=94=A8=E9=85=8D=E7=BD=AE=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=20http://192.168.0.96:8090/demo/rdm.html#/story-detai?=
 =?UTF-8?q?l/939050947543040/939050947543042/1552244762181632?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/statement/statement-data-edit.vue  |  13 +-
 .../others/autoexec-widget-config.vue         | 162 +++++++++++++++++-
 .../statement/widgets/define/autoexec.js      |  16 +-
 .../widgets/others/autoexec-widget.vue        | 110 +++++-------
 4 files changed, 229 insertions(+), 72 deletions(-)

diff --git a/src/views/pages/report/statement/statement-data-edit.vue b/src/views/pages/report/statement/statement-data-edit.vue
index 7968af94..515bc5be 100644
--- a/src/views/pages/report/statement/statement-data-edit.vue
+++ b/src/views/pages/report/statement/statement-data-edit.vue
@@ -102,9 +102,13 @@
                 </div>
               </div>
               <Divider plain orientation="right" style="font-size:12px;margin:0px">{{ $t('term.report.datatype.binddynamicdata') }}</Divider>
-              <div v-for="(field, index) in currentWidgetComponent.fields" :key="index" class="ivu-form-item tsform-item ivu-form-label-top">
-                <label class="ivu-form-item-label overflow">{{ field.label }}</label>
-                <div class="ivu-form-item-content">
+              <div v-for="(field, index) in currentWidgetComponent.fields" :key="index" class="mb-sm"> 
+                <TsFormItem
+                  :label="field.label"
+                  labelPosition="top"
+                  :tooltip="field.description"
+                  :required="field.isRequired"
+                >
                   <TsFormSelect
                     :value="getCurrentWidgetField(field.name) && getCurrentWidgetField(field.name)['datasourceField']"
                     :transfer="true"
@@ -117,7 +121,7 @@
                       }
                     "
                   ></TsFormSelect>
-                </div>
+                </TsFormItem>
               </div>
               <div v-if="datasourceConditionList && datasourceConditionList.length > 0">
                 <Divider plain orientation="right" style="font-size:12px;margin:0px">{{ $t('page.filtercondition') }}</Divider>
@@ -149,6 +153,7 @@ export default {
   name: '',
   components: {
     TsForm: () => import('@/resources/plugins/TsForm/TsForm'),
+    TsFormItem: () => import('@/resources/plugins/TsForm/TsFormItem'),
     TsFormRadio: () => import('@/resources/plugins/TsForm/TsFormRadio'),
     TsFormInput: () => import('@/resources/plugins/TsForm/TsFormInput'),
     TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'),
diff --git a/src/views/pages/report/statement/widgetconfigs/others/autoexec-widget-config.vue b/src/views/pages/report/statement/widgetconfigs/others/autoexec-widget-config.vue
index 8b07cf8f..153a87e0 100644
--- a/src/views/pages/report/statement/widgetconfigs/others/autoexec-widget-config.vue
+++ b/src/views/pages/report/statement/widgetconfigs/others/autoexec-widget-config.vue
@@ -30,25 +30,172 @@
         />
       </div>
     </TsFormItem>
+    <TsFormItem label="箭头颜色" labelPosition="top">
+      <ColorPicker
+        :value="config.arrowcolor"
+        :transfer="true"
+        recommend
+        format="hex"
+        class="colorPicker"
+        transfer-class-name="color-picker-transfer-class"
+        alpha
+        @on-change="val => {
+          setConfigValue('arrowcolor', val);
+        }"
+      />
+    </TsFormItem>
+    <TsFormItem label="阶段状态颜色设置" labelPosition="top">
+      <TsRow v-if="!$utils.isEmpty(statusColorList)" :gutter="8">
+        <Col :span="8">状态</Col>
+        <Col :span="7">字体颜色</Col>
+        <Col :span="7">背景颜色</Col>
+      </TsRow>
+      <TsRow
+        v-for="(item, index) in statusColorList"
+        :key="index"
+        :gutter="8"
+        class="mb-sm"
+      >
+        <Col :span="8">
+          <TsFormInput
+            v-model="item.name"
+            border="border"
+            @on-blur="val => {
+              setConfigValue('statusColorList', statusColorList);
+            }"
+          ></TsFormInput>
+        </Col>
+        <Col :span="7">
+          <ColorPicker
+            :value="item.color"
+            :transfer="true"
+            recommend
+            format="hex"
+            class="colorPicker"
+            transfer-class-name="color-picker-transfer-class"
+            @on-change="val => {
+              $set(item, 'color', val);
+              setConfigValue('statusColorList', statusColorList);
+            }"
+          />
+        </Col>
+        <Col :span="7">
+          <ColorPicker
+            :value="item.bgColor"
+            :transfer="true"
+            recommend
+            class="colorPicker"
+            alpha 
+            transfer-class-name="color-picker-transfer-class"
+            @on-change="val => {
+              $set(item, 'bgColor', val);
+              setConfigValue('statusColorList', statusColorList);
+            }"
+          />
+        </Col>
+        <Col :span="2">
+          <span class="text-href tsfont-trash-o" @click="removeStatusColor(index)"></span>
+        </Col>
+      </TsRow>
+      <Button @click="addStatusColor"><span class="tsfont-plus">状态</span></Button>
+    </TsFormItem>
   </div>
 </template>
 <script>
 export default {
   name: '',
   components: {
-    TsFormItem: () => import('@/resources/plugins/TsForm/TsFormItem')
+    TsFormItem: () => import('@/resources/plugins/TsForm/TsFormItem'),
+    TsFormInput: () => import('@/resources/plugins/TsForm/TsFormInput')
   },
   props: {
     config: { type: Object }
   },
   data() {
     return {
+      statusColorList: [
+        // {
+        //   name: 'saved',
+        //   label: '待提交',
+        //   color: '#f2f4f5'
+        // },
+        // {
+        //   name: 'pending',
+        //   label: '待处理',
+        //   color: '#8c8c8c'
+        // },
+        // {
+        //   name: 'waiting',
+        //   label: '排队中',
+        //   color: '#ffba5a'
+        // },
+        // {
+        //   name: 'running',
+        //   label: '运行中',
+        //   color: '#1690ff'
+        // },
+        // {
+        //   name: 'pausing',
+        //   label: '暂停中',
+        //   color: '#ffba5a'
+        // },
+        // {
+        //   name: 'paused',
+        //   label: '已暂停',
+        //   color: '#ffba5a'
+        // },
+        // {
+        //   name: 'aborting',
+        //   label: '中止中',
+        //   color: '#ffba5a'
+        // },
+        // {
+        //   name: 'aborted',
+        //   label: '已中止',
+        //   color: '#ffba5a'
+        // },
+        // {
+        //   name: 'completed',
+        //   label: '已完成',
+        //   color: '#25b864'
+        // },
+        // {
+        //   name: 'failed',
+        //   label: '已失败',
+        //   color: '#f33b3b'
+        // },
+        // {
+        //   name: 'ready',
+        //   label: '已就绪',
+        //   color: '#8c8c8c'
+        // },
+        // {
+        //   name: 'waitting',
+        //   label: '待输入',
+        //   color: '#8c8c8c'
+        // },
+        // {
+        //   name: 'checked',
+        //   label: '已验证',
+        //   color: '#25b864'
+        // },
+        // {
+        //   name: 'revoked',
+        //   label: '已撤销',
+        //   color: '#ffba5a'
+        // }
+
+      ]
     };
   },
   beforeCreate() {},
   created() {},
   beforeMount() {},
-  mounted() {},
+  mounted() {
+    if (this.config.statusColorList && this.config.statusColorList.length) {
+      this.statusColorList = this.config.statusColorList;
+    } 
+  },
   beforeUpdate() {},
   updated() {},
   activated() {},
@@ -60,6 +207,17 @@ export default {
       if (attrName) {
         this.$emit('setConfig', attrName, attrValue);
       }
+    },
+    addStatusColor() {
+      this.statusColorList.push({
+        name: '',
+        color: null,
+        bgColor: null
+      });
+    },
+    removeStatusColor(index) {
+      this.statusColorList.splice(index, 1);
+      this.setConfigValue('statusColorList', this.statusColorList);
     }
   },
   filter: {},
diff --git a/src/views/pages/report/statement/widgets/define/autoexec.js b/src/views/pages/report/statement/widgets/define/autoexec.js
index 39d2594d..a94997d2 100644
--- a/src/views/pages/report/statement/widgets/define/autoexec.js
+++ b/src/views/pages/report/statement/widgets/define/autoexec.js
@@ -11,6 +11,18 @@ export default {
   height: 300,
   padding: 5,
   needData: true,
-  dataTypes: [{ value: 'dynamic', text: $t('term.report.datatype.dynamicdata') }], 
-  config: { backgroundColor: '', backgroundImage: '', fontsize: 13, color: '' }
+  dataTypes: [{ value: 'dynamic', text: $t('term.report.datatype.dynamicdata') }],
+  fields: [
+    { name: 'jobPhaseName', label: '阶段名称', type: 'text', isRequired: true },
+    { name: 'jobPhaseStatus', label: '阶段状态', type: 'text', isRequired: true },
+    { name: 'progress', label: '阶段进度', type: ['text', 'number'], isRequired: true, description: '进度说明：1代表已完成，0代表未完成' },
+    { name: 'jobGroupSort', label: '阶段组', type: ['text', 'number'], isRequired: true }
+  ],
+  config: { 
+    backgroundColor: '', 
+    backgroundImage: '', 
+    fontsize: 13, 
+    color: '',
+    arrowcolor: ''
+  }
 };
diff --git a/src/views/pages/report/statement/widgets/others/autoexec-widget.vue b/src/views/pages/report/statement/widgets/others/autoexec-widget.vue
index da85b333..fa01e344 100644
--- a/src/views/pages/report/statement/widgets/others/autoexec-widget.vue
+++ b/src/views/pages/report/statement/widgets/others/autoexec-widget.vue
@@ -18,7 +18,7 @@
             <span>开始</span>
           </div>
         </div>
-        <span class="step_a tsfont-arrow-down text-success"></span>
+        <span class="step_a tsfont-arrow-down" :style="{'color': widget?.config.arrowcolor || '#25b864'}"></span>
       </div>
       <div
         v-for="(item,index) in dataList"
@@ -31,41 +31,25 @@
           :key="lindex"
           class="step-content"
         >
-          <div class="step-node border-base radius-sm" :class="getStatusClassName(litem.jobPhaseStatus)" :title="litem.jobPhaseName">
+          <div class="step-node border radius-sm" :style="getStatusStyle(litem.jobPhaseStatus)" :title="litem.jobPhaseName">
             <span>{{ litem.jobPhaseName }}</span>
           </div>
         </div>
-        <span class="step_a tsfont-arrow-down text-success"></span>
+        <span class="step_a tsfont-arrow-down" :style="{'color': widget?.config.arrowcolor || '#25b864'}"></span>
       </div>
       <div class="item-list border-color">
         <div class="step-content">
-          <div class="step-node border-base radius-sm" :class="percentData == 100? 'success border-color-success text-success':'pending border-color'">
+          <div class="step-node border-base radius-sm border-color-error text-error failed">
             <span>结束</span>
           </div>
         </div>
       </div>
     </div>
     <div v-else><no-data></no-data></div>
-    <div class="action-group no-line">
-      <span class="block-item">
-        <span class="color-tip bg-pending"></span>
-        <span class="fz10">未开始</span>
-      </span>
-      <span class="block-item">
-        <span class="color-tip bg-info"></span>
-        <span class="fz10"> 进行中</span>
-      </span>
-      <span class="block-item">
-        <span class="color-tip bg-warning"></span>
-        <span class="fz10">已终止</span>
-      </span>
-      <span class="block-item">
-        <span class="color-tip bg-error"></span>
-        <span class="fz10">失败</span>
-      </span>
-      <span class="block-item">
-        <span class="color-tip bg-success"></span>
-        <span class="fz10">成功</span>
+    <div v-if="!$utils.isEmpty(statusColorList)" class="action-group no-line">
+      <span v-for="item in statusColorList" :key="item.name" class="block-item">
+        <span class="color-tip" :style="{'background-color': item.color}"></span>
+        <span class="fz10">{{ item.name }}</span>
       </span>
     </div>
   </div>
@@ -83,31 +67,27 @@ export default {
     return {
       isFirst: true,
       isReady: true,
-      statusMapClass: {
-        pending: 'pending',
-        completed: 'success border-color-success text-success', //成功
-        running: 'running border-color-info text-info', //运行中
-        failed: 'failed border-color-error text-error', //失败
-        aborted: 'aborted border-color-warning text-warning' //中止
-      },
       dataList: [],
       stepList: [
-        {jobPhaseName: '步骤一', jobGroupSort: 0, jobPhaseStatus: 'completed'},
-        {jobPhaseName: '步骤二', jobGroupSort: 0, jobPhaseStatus: 'completed'},
-        {jobPhaseName: '步骤三', jobGroupSort: 0, jobPhaseStatus: 'completed'},
-        {jobPhaseName: '步骤四', jobGroupSort: 0, jobPhaseStatus: 'completed'},     
-        {jobPhaseName: '步骤一', jobGroupSort: 0, jobPhaseStatus: 'completed'},
-        {jobPhaseName: '步骤二', jobGroupSort: 1, jobPhaseStatus: 'failed'},
-        {jobPhaseName: '步骤三', jobGroupSort: 1, jobPhaseStatus: 'running'}
+        {jobPhaseName: '阶段1', jobGroupSort: '11111', jobPhaseStatus: 'completed', progress: 1},
+        {jobPhaseName: '阶段2', jobGroupSort: '11111', jobPhaseStatus: 'completed', progress: 1},
+        {jobPhaseName: '阶段3', jobGroupSort: '22222', jobPhaseStatus: 'completed', progress: 1},
+        {jobPhaseName: '阶段4', jobGroupSort: '22222', jobPhaseStatus: 'completed', progress: 1},     
+        {jobPhaseName: '阶段5', jobGroupSort: '22222', jobPhaseStatus: 'running', progress: 0},
+        {jobPhaseName: '阶段6', jobGroupSort: '33333', jobPhaseStatus: 'failed', progress: 0},
+        {jobPhaseName: '阶段7', jobGroupSort: '44444', jobPhaseStatus: 'running', progress: 0}
       ],
-      percentData: 0
+      percentData: 0,
+      statusColorList: []
     };
   },
   beforeCreate() {},
   created() {},
   beforeMount() {},
   mounted() {
-  
+    if (this.widget?.config.statusColorList && this.widget?.config.statusColorList.length) {
+      this.statusColorList = this.widget?.config.statusColorList;
+    }
   },
   beforeUpdate() {},
   updated() {},
@@ -141,22 +121,17 @@ export default {
     },
     getStepList(stepList) {
       let list = [];
+      let listMap = {};
       if (stepList.length) {
-        let groupSortList = stepList.filter(l => !this.$utils.isEmpty(l.jobGroupSort));
-        if (groupSortList && groupSortList.length) {
-          for (let sort = 0, index = 0; index < groupSortList.length;) {
-            let arr = [];
-            groupSortList.filter(l => {
-              if (l.jobGroupSort == sort) {
-                arr.push(l);
-                index++;
-                return true;
-              }
-            });
-            sort++;
-            arr.length && list.push(arr);
+        stepList.forEach(item => {
+          if (!listMap[item.jobGroupSort]) {
+            listMap[item.jobGroupSort] = [];
           }
-        }
+          listMap[item.jobGroupSort].push(item);
+        });
+        Object.keys(listMap).forEach(key => {
+          list.push(listMap[key]);
+        });
       }
       return list;
     },
@@ -177,7 +152,7 @@ export default {
       if (list && list.length) {
         let i = 0;
         list.forEach(item => {
-          if (['checked', 'success', 'completed'].includes(item.jobPhaseStatus)) {
+          if (item.progress == 1) {
             i += 1;
           }
         });
@@ -185,7 +160,7 @@ export default {
           this.percentData = 100;
         } else {
           let num = i / list.length;
-          this.percentData = num.toFixed(2) * 100;
+          this.percentData = Number((num.toFixed(2) * 100).toFixed(2));
         }
       }
     }
@@ -201,17 +176,21 @@ export default {
     strokeWidth() {
       return this.widget && this.widget.config && this.widget.config.fontsize ? this.widget.config.fontsize - 3 : 10; 
     },
-    getStatusClassName() {
+    getStatusStyle() {
       return (jobPhaseStatus) => {
-        let className = this.statusMapClass[jobPhaseStatus] || '';
-        if (jobPhaseStatus && !className) {
-          if (['pausing', 'paused', 'aborting', 'waitInput'].includes(jobPhaseStatus)) {
-            className = this.statusMapClass['aborted'];
-          } else if (['checked', 'success'].includes(jobPhaseStatus)) {
-            className = this.statusMapClass['completed']; 
+        let status = this.statusColorList.find(l => l.name === jobPhaseStatus);
+        let style = {};
+        if (status) {
+          style['color'] = status.color || '';
+          if (status.color) {
+            style['color'] = status.color || '';
+            style['border-color'] = status.borderColor || '';
+          }
+          if (status.bgColor) {
+            style['background-color'] = status.bgColor || '';
           }
         }
-        return className;
+        return style;
       };
     }
   },
@@ -228,6 +207,9 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+.border{
+  border:  1px solid;
+}
 .autoexec-widget{
   position: relative;
   padding-bottom: 10px;
-- 
Gitee


From 290d4b94188ecad568bfcf3b6e62f25b7917353c Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Tue, 11 Nov 2025 18:55:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=9A=E6=B5=81=E7=A8=8B=E5=9B=BE=E7=BB=84=E4=BB=B6=E9=80=9A?=
 =?UTF-8?q?=E7=94=A8=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4=20=20=20=20-=20[?=
 =?UTF-8?q?=E5=85=B3=E8=81=94]#[1552244762181632]=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=9A=E6=B5=81=E7=A8=8B=E5=9B=BE=E7=BB=84=E4=BB=B6=E9=80=9A?=
 =?UTF-8?q?=E7=94=A8=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4=20http://192.168.?=
 =?UTF-8?q?0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947?=
 =?UTF-8?q?543042/1552244762181632?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../others/autoexec-widget-config.vue         | 171 +++++++++++-------
 .../widgets/others/autoexec-widget.vue        |  19 +-
 2 files changed, 123 insertions(+), 67 deletions(-)

diff --git a/src/views/pages/report/statement/widgetconfigs/others/autoexec-widget-config.vue b/src/views/pages/report/statement/widgetconfigs/others/autoexec-widget-config.vue
index 153a87e0..929abe9d 100644
--- a/src/views/pages/report/statement/widgetconfigs/others/autoexec-widget-config.vue
+++ b/src/views/pages/report/statement/widgetconfigs/others/autoexec-widget-config.vue
@@ -15,19 +15,33 @@
         ></Slider>
       </div>
     </TsFormItem>
-    <TsFormItem :label="$t('page.fontcolor')" labelPosition="top">
-      <div>
-        <ColorPicker
-          :value="config.fontcolor"
-          :transfer="true"
-          recommend
-          format="hex"
-          class="colorPicker"
-          transfer-class-name="color-picker-transfer-class"
-          @on-change="val => {
-            setConfigValue('fontcolor', val);
-          }"
-        />
+    <TsFormItem label="进度条的颜色" labelPosition="top">
+      <div class="bg-op radius-sm padding-sm">
+        <Row
+          v-for="(item, index) in progressStatusList"
+          :key="index"
+          :gutter="16"
+          type="flex"
+          :class="index != progressStatusList.length - 1 ? 'mb-sm' : ''"
+        >
+          <Col span="6">
+            {{ item.progressName }}
+          </Col>
+          <Col span="10">
+            <ColorPicker
+              :value="item.progressColor"
+              :transfer="true"
+              recommend
+              format="hex"
+              class="colorPicker"
+              transfer-class-name="color-picker-transfer-class"
+              @on-change="val => {
+                item.progressColor = val;
+                setConfigValue('progressStatusList', progressStatusList);
+              }"
+            />
+          </Col>
+        </Row>
       </div>
     </TsFormItem>
     <TsFormItem label="箭头颜色" labelPosition="top">
@@ -45,59 +59,61 @@
       />
     </TsFormItem>
     <TsFormItem label="阶段状态颜色设置" labelPosition="top">
-      <TsRow v-if="!$utils.isEmpty(statusColorList)" :gutter="8">
-        <Col :span="8">状态</Col>
-        <Col :span="7">字体颜色</Col>
-        <Col :span="7">背景颜色</Col>
-      </TsRow>
-      <TsRow
-        v-for="(item, index) in statusColorList"
-        :key="index"
-        :gutter="8"
-        class="mb-sm"
-      >
-        <Col :span="8">
-          <TsFormInput
-            v-model="item.name"
-            border="border"
-            @on-blur="val => {
-              setConfigValue('statusColorList', statusColorList);
-            }"
-          ></TsFormInput>
-        </Col>
-        <Col :span="7">
-          <ColorPicker
-            :value="item.color"
-            :transfer="true"
-            recommend
-            format="hex"
-            class="colorPicker"
-            transfer-class-name="color-picker-transfer-class"
-            @on-change="val => {
-              $set(item, 'color', val);
-              setConfigValue('statusColorList', statusColorList);
-            }"
-          />
-        </Col>
-        <Col :span="7">
-          <ColorPicker
-            :value="item.bgColor"
-            :transfer="true"
-            recommend
-            class="colorPicker"
-            alpha 
-            transfer-class-name="color-picker-transfer-class"
-            @on-change="val => {
-              $set(item, 'bgColor', val);
-              setConfigValue('statusColorList', statusColorList);
-            }"
-          />
-        </Col>
-        <Col :span="2">
-          <span class="text-href tsfont-trash-o" @click="removeStatusColor(index)"></span>
-        </Col>
-      </TsRow>
-      <Button @click="addStatusColor"><span class="tsfont-plus">状态</span></Button>
+      <div class="bg-op radius-sm padding-sm">
+        <TsRow v-if="!$utils.isEmpty(statusColorList)" :gutter="8">
+          <Col :span="8">状态</Col>
+          <Col :span="7">字体颜色</Col>
+          <Col :span="7">背景颜色</Col>
+        </TsRow>
+        <TsRow
+          v-for="(item, index) in statusColorList"
+          :key="index"
+          :gutter="8"
+          class="mb-sm"
+        >
+          <Col :span="8">
+            <TsFormInput
+              v-model="item.name"
+              border="border"
+              @on-blur="val => {
+                setConfigValue('statusColorList', statusColorList);
+              }"
+            ></TsFormInput>
+          </Col>
+          <Col :span="7">
+            <ColorPicker
+              :value="item.color"
+              :transfer="true"
+              recommend
+              format="hex"
+              class="colorPicker"
+              transfer-class-name="color-picker-transfer-class"
+              @on-change="val => {
+                $set(item, 'color', val);
+                setConfigValue('statusColorList', statusColorList);
+              }"
+            />
+          </Col>
+          <Col :span="7">
+            <ColorPicker
+              :value="item.bgColor"
+              :transfer="true"
+              recommend
+              class="colorPicker"
+              alpha 
+              transfer-class-name="color-picker-transfer-class"
+              @on-change="val => {
+                $set(item, 'bgColor', val);
+                setConfigValue('statusColorList', statusColorList);
+              }"
+            />
+          </Col>
+          <Col :span="2">
+            <span class="text-href tsfont-trash-o" @click="removeStatusColor(index)"></span>
+          </Col>
+        </TsRow>
+        <Button @click="addStatusColor"><span class="tsfont-plus">状态</span></Button>
+      </div>
     </TsFormItem>
   </div>
 </template>
@@ -113,6 +129,20 @@ export default {
   },
   data() {
     return {
+      progressStatusList: [{
+        progressName: '未开始',
+        progressValue: 'pending',
+        progressColor: '#fff'
+      }, {
+        progressName: '进行中',
+        progressValue: 'running',
+        progressColor: '#2d8cf0'
+      },
+      {
+        progressName: '已完成',
+        progressValue: 'completed',
+        progressColor: '#19be6b'
+      }],
       statusColorList: [
         // {
         //   name: 'saved',
@@ -195,6 +225,7 @@ export default {
     if (this.config.statusColorList && this.config.statusColorList.length) {
       this.statusColorList = this.config.statusColorList;
     } 
+    this.handleProgressStatusList();
   },
   beforeUpdate() {},
   updated() {},
@@ -203,6 +234,14 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
+    handleProgressStatusList() {
+      const { progressStatusList = [] } = this.config || {};
+      if (this.$utils.isEmpty(progressStatusList)) {
+        this.setConfigValue('progressStatusList', this.progressList);
+      } else {
+        this.progressStatusList = progressStatusList;
+      }
+    },
     setConfigValue(attrName, attrValue) {
       if (attrName) {
         this.$emit('setConfig', attrName, attrValue);
diff --git a/src/views/pages/report/statement/widgets/others/autoexec-widget.vue b/src/views/pages/report/statement/widgets/others/autoexec-widget.vue
index fa01e344..3ef4d1c6 100644
--- a/src/views/pages/report/statement/widgets/others/autoexec-widget.vue
+++ b/src/views/pages/report/statement/widgets/others/autoexec-widget.vue
@@ -7,6 +7,7 @@
           v-if="isReady"
           :percent="percentData"
           :stroke-width="strokeWidth"
+          :stroke-color="getStrokeColor(percentData)"
           status="active"
           text-inside
         /></div>
@@ -174,7 +175,8 @@ export default {
       };
     },
     strokeWidth() {
-      return this.widget && this.widget.config && this.widget.config.fontsize ? this.widget.config.fontsize - 3 : 10; 
+      const { fontsize } = this?.widget?.config || {};
+      return fontsize < 18 ? 18 : fontsize; 
     },
     getStatusStyle() {
       return (jobPhaseStatus) => {
@@ -192,6 +194,21 @@ export default {
         }
         return style;
       };
+    },
+    getStrokeColor() {
+      return (percentData) => {
+        const { progressStatusList = [] } = this?.widget?.config || {};
+        let status = '';
+        if (percentData === 100) {
+          status = 'completed';
+        } else if (percentData > 0) {
+          status = 'running';
+        } else {
+          status = 'pending';
+        }
+        const findProgressItem = progressStatusList.find(v => v.progressValue === status);
+        return findProgressItem && findProgressItem.progressColor;
+      };
     }
   },
   watch: {
-- 
Gitee