Compare commits

...

1 Commits

Author SHA1 Message Date
herenshan112 3338414a71 BI报表问题 1 month ago
  1. 2
      src/components/DesignForm/app/index.vue
  2. 28
      src/components/DesignForm/public/form/newForm.vue
  3. 3
      src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/seeContChart.vue
  4. 2
      src/views/taskplatform/taskmanagement/runNewFlowStep.vue

2
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"
/>

28
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{

3
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"

2
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>

Loading…
Cancel
Save