From 3338414a711142582aad3c759f2f6ba7a16e4769 Mon Sep 17 00:00:00 2001
From: herenshan112 <hreenshan112@163.com>
Date: Wed, 11 Feb 2026 14:41:20 +0800
Subject: [PATCH] =?UTF-8?q?BI=E6=8A=A5=E8=A1=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/app/index.vue       |  2 +-
 .../DesignForm/public/form/newForm.vue        | 28 +++++++++++++++++--
 .../appPageForm/echatesUnit/seeContChart.vue  |  3 ++
 .../taskmanagement/runNewFlowStep.vue         |  2 +-
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index 3e12ce1..dc29e8d 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -2671,7 +2671,7 @@ const getNonValue = () => {
         
 
         <SeeContChart
-          :echats-views="[echatsViewsdf]"
+          :echats-views="echatsViewsdf"
           :table-key="formBasicConfig.name"
           :types="1"
         />
diff --git a/src/components/DesignForm/public/form/newForm.vue b/src/components/DesignForm/public/form/newForm.vue
index d0d2edc..040b722 100644
--- a/src/components/DesignForm/public/form/newForm.vue
+++ b/src/components/DesignForm/public/form/newForm.vue
@@ -3167,7 +3167,15 @@ const webPage = computed({
     return newVal;
   },
 });
-//
+// 关闭表单
+const closeForm = () => {
+  // emits("closeForm");
+  // props.closeAppSubmit
+  let notReturn;
+  if (typeof props.closeAppSubmit === "function") {
+    notReturn = props.closeAppSubmit();
+  }
+};
 </script>
 <template>
     <div v-if="webPage" class="webBox">
@@ -3197,9 +3205,13 @@ const webPage = computed({
     <el-card v-else v-loading="loading" shadow="always">
         <template #header>
           <div class="card-header">
-            <div class="svgBox"><SvgIcon icon-class="edit" size="25" /></div>
-            {{ drawTitle }}
+            <div class="headerTitle">
+              <div class="svgBox"><SvgIcon icon-class="edit" size="25" /></div>
+              {{ drawTitle }}
+            </div>
+            <SvgIcon icon-class="close" size="25" class="headerSvgClose" @click="closeForm" />
           </div>
+          
         </template>
         <el-scrollbar class="scroBox">
             <el-form
@@ -3354,12 +3366,22 @@ const webPage = computed({
     justify-content: center;
     font-size: 1.2rem;
 }
+.headerTitle{
+  width: 50%;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+.headerSvgClose{
+  cursor: pointer;
+}
 .card-header{
   font-size: 1.4rem;
   font-weight: 700;
   color: #0020C2;
   display: flex;
   align-items: center;
+  justify-content: space-between;
   gap: 10px;
 }
 .scroBox{
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/seeContChart.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/seeContChart.vue
index 3234d99..07540d0 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/seeContChart.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/seeContChart.vue
@@ -43,6 +43,7 @@ const myChartId = ref("")
 const myLoading = ref(false)
 //改变选择
 const pickChartTable = (name: TabPaneName) => {
+    console.log("改变选择",name)
     if(name=="oneman"){
         haveMyBiChears()
     }
@@ -66,8 +67,10 @@ provide("haveMyBiCherBi",haveMyBiChears)
 <template>
     <div>
         <el-tabs v-model="pickChar" class="demo-tabs" @tab-change="pickChartTable">
+
             <el-tab-pane label="公共报表" name="all">
                 <div v-for="item in dataList">
+                    
                     <BarPage
                         v-if="item.type == 'bar'"
                         :data="item"
diff --git a/src/views/taskplatform/taskmanagement/runNewFlowStep.vue b/src/views/taskplatform/taskmanagement/runNewFlowStep.vue
index 7c1fa84..d211fb9 100644
--- a/src/views/taskplatform/taskmanagement/runNewFlowStep.vue
+++ b/src/views/taskplatform/taskmanagement/runNewFlowStep.vue
@@ -239,7 +239,7 @@ defineExpose({gainRunFlowTask,anewSubmit})
                                         <el-text v-if="logItem.cause" type="success" size="small">{{logItem.cause}}</el-text>
                                         <el-text v-else type="success" size="small" >已同意</el-text>
                                     </div>
-                                    <div v-if="logItem.state==3" class="step-info">
+                                    <div v-else-if="logItem.state==3" class="step-info">
                                         <el-text v-if="logItem.cause" type="danger" size="small">{{logItem.cause}}</el-text>
                                         <el-text v-else type="danger" size="small" >已驳回</el-text>
                                     </div>