diff --git a/src/views/dashboard/index.txt b/src/views/dashboard/index.txt
new file mode 100644
index 0000000..67a3d72
--- /dev/null
+++ b/src/views/dashboard/index.txt
@@ -0,0 +1,1100 @@
+<template>
+  <div class="app-container">
+    <div
+      style="display: flex; justify-content: space-between; align-items: center"
+    >
+      <span>当前登录人：{{ user.name }} </span>
+
+    </div>
+
+    <el-row :gutter="20">
+      <el-col :span="allowAuth ? 16 : 24">
+        <el-card v-if="allowAuth" class="box-card" style="margin: 20px 0">
+          <div slot="header" class="clearfix">
+            <span>预算总体执行情况</span>
+            <DatePicker
+              :value="select.year"
+              placeholder="选择所属年份"
+              placement="bottom"
+              style="width: 130px; float: right"
+              type="year"
+              @on-change="changeYear"
+            ></DatePicker>
+          </div>
+          <router-link :to="`/statisticalReport/budgetProgress`">
+            <div class="progress-card">
+              <div class="progress-card-item">
+                <div class="progress-card-item__num">
+                  {{
+                    moneyFormat(
+                      statistic.progress ? statistic.progress.money_total_1 : 0
+                    )
+                  }}
+                </div>
+                <div class="progress-card-item__label">年初预算合计金额</div>
+              </div>
+              <div class="progress-card-item">
+                <div class="progress-card-item__num">
+                  {{
+                    moneyFormat(
+                      statistic.progress ? statistic.progress.money_total_2 : 0
+                    )
+                  }}
+                </div>
+                <div class="progress-card-item__label">调整后预算合计金额</div>
+              </div>
+              <div class="progress-card-item">
+                <div class="progress-card-item__num">
+                  {{
+                    moneyFormat(
+                      statistic.progress
+                        ? statistic.progress.use_money_total
+                        : 0
+                    )
+                  }}
+                </div>
+                <div class="progress-card-item__label">已支付金额</div>
+              </div>
+              <div class="progress-card-item">
+                <div class="progress-card-item__num">
+                  {{
+                    toper(
+                      statistic.progress ? statistic.progress.money_total_1 : 0,
+                      statistic.progress ? statistic.progress.money_total_2 : 0,
+                      statistic.progress
+                        ? statistic.progress.use_money_total
+                        : 0
+                    )
+                  }}%
+                </div>
+                <div class="progress-card-item__label">执行率</div>
+              </div>
+            </div>
+          </router-link>
+        </el-card>
+
+        <div ref="lxHeader">
+          <LxHeader
+            icon="iconfont/icon--kucunguanli"
+            text="待办事项"
+            :custom="true"
+            style="margin-bottom: 10px; border: 0px; margin-top: 15px"
+          >
+            <div slot="content" />
+            <slot>
+              <div></div>
+            </slot>
+          </LxHeader>
+        </div>
+        <div class="table-tree">
+          <el-table
+            :data="list"
+            border
+            class="v-table"
+            style="width: 100%; margin-bottom: 20px"
+          >
+            <el-table-column type="index" label="序号" align="center" />
+            <el-table-column
+              prop="type"
+              width="100"
+              label="类型"
+              align="center"
+              :formatter="typeFormatter"
+            />
+            <el-table-column prop="content" label="内容" align="left" />
+            <el-table-column
+              prop="created_at"
+              width="200"
+              label="下发时间"
+              align="center"
+              :formatter="timeFormatter"
+            />
+            <el-table-column
+              width="100"
+              label="状态"
+              align="center"
+              prop="read_count"
+            >
+              <template slot-scope="{ row, $index }">
+                <el-link v-if="row.read_count" type="success" :underline="false"
+                  >已读</el-link
+                >
+                <Button
+                  v-else
+                  type="error"
+                  size="small"
+                  style="margin-left: 10px"
+                  ghost
+                  @click="readIt(row, $index)"
+                  >未读</Button
+                >
+              </template>
+            </el-table-column>
+            <el-table-column
+              width="90"
+              header-align="center"
+              label="操作"
+              align="center"
+            >
+              <template slot-scope="{ row, $index }">
+                <Button
+                  type="primary"
+                  size="small"
+                  style="margin-left: 10px"
+                  ghost
+                  @click="toContract(row)"
+                  >查看</Button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <div style="display: flex; justify-content: flex-end">
+            <Page :total="total" show-elevator @on-change="pageChange" />
+          </div>
+        </div>
+      </el-col>
+      <el-col v-if="allowAuth" :span="($store.state.user.department && $store.state.user.department.name === '中心领导') ? 7 : 8">
+        <el-card class="box-card" style="margin: 20px 0">
+          <div class="text item">
+            <pie-chart :chartData="rptChartData"></pie-chart>
+          </div>
+        </el-card>
+      </el-col>
+
+      <el-col :span="1" v-if="$store.state.user.department && $store.state.user.department.name === '中心领导'">
+        <div style="display: flex;flex-direction: column;height: 310px;padding-top: 20px;">
+          <div class="show-static-btn" @click="$refs['budgetStatic'].show()">
+            统计查看
+            <i class="el-icon-d-arrow-left"></i>
+          </div>
+          <div class="show-static-btn"
+               @click="$confirm('选择统计的数据类型','提示',{
+                 confirmButtonText: '预算类型',
+                 cancelButtonText: '部门科室',
+                 showClose: false,
+                 callback:(action, instance) => {
+                   if (action === 'cancel') {
+                     $refs['carryStatic'].setType(1)
+                     $refs['carryStatic'].show()
+                   }
+                   if (action === 'confirm') {
+                     $refs['carryStatic'].setType(2)
+                     $refs['carryStatic'].show()
+                   }
+                 }
+               })">
+            执行统计
+            <i class="el-icon-d-arrow-left"></i>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+
+    <div class="demo-split" v-if="allowAuth">
+      <Split v-model="split" style="height: 440px">
+        <template #left>
+          <div class="demo-split-pane" style="padding-right: 5px">
+            <div ref="lxHeader" v-if="statistic.departmentList">
+              <LxHeader
+                icon="iconfont/icon--kucunguanli"
+                text="科室执行情况"
+                :custom="true"
+                style="margin-bottom: 10px; border: 0px; margin-top: 15px"
+              >
+                <div slot="content" />
+                <slot>
+                  <div style="width: 100%">
+                    <xy-table
+                      :height="380"
+                      :list="statistic.departmentList"
+                      :table-item="departmentTable"
+                    >
+                      <template v-slot:btns>
+                        <el-table-column
+                          v-if="false"
+                          :width="80"
+                          fixed="right"
+                          label="操作"
+                          header-align="center"
+                          align="center"
+                        >
+                          <template slot-scope="scope">
+                            <router-link
+                              :to="`/contract/statisticalReport/budgetProgress?departmentId=${scope.row.plan_department_id}`"
+                              >查看
+                            </router-link>
+                          </template>
+                        </el-table-column>
+                      </template>
+                    </xy-table>
+                  </div>
+                </slot>
+              </LxHeader>
+            </div>
+          </div>
+        </template>
+        <template #right>
+          <div class="demo-split-pane" style="padding-left: 10px">
+            <div ref="lxHeader" v-if="statistic.typeList">
+              <LxHeader
+                icon="iconfont/icon--kucunguanli"
+                text="预算类型执行情况"
+                :custom="true"
+                style="margin-bottom: 10px; border: 0px; margin-top: 15px"
+              >
+                <div slot="content" />
+                <slot>
+                  <div style="width: 100%">
+                    <xy-table
+                      :height="380"
+                      :list="statistic.typeList"
+                      :table-item="typeTable"
+                    >
+                      <template v-slot:btns>
+                        <el-table-column
+                          v-if="false"
+                          :width="80"
+                          fixed="right"
+                          label="操作"
+                          header-align="center"
+                          align="center"
+                        >
+                          <template slot-scope="scope">
+                            <router-link
+                              :to="`/contract/statisticalReport/budgetProgress?typeId=${scope.row.type}`"
+                              >查看
+                            </router-link>
+                          </template>
+                        </el-table-column>
+                      </template>
+                    </xy-table>
+                  </div>
+                </slot>
+              </LxHeader>
+            </div>
+          </div>
+        </template>
+      </Split>
+    </div>
+
+    <Card v-if="allowAuth">
+      <template #title>
+        <div style="display: flex;justify-content: space-between;align-items: center;">
+          <p>各科室预算计划完成对比图</p>
+          <el-date-picker v-model="carrySelect.month"
+                          format="yyyy-MM"
+                          :clearable="false"
+                          style="width: 140px;"
+                          placeholder="月份"
+                          type="month"
+                          size="small"
+                          @change="e => {
+                            carrySelect.month = $moment(e).format('YYYY-MM');
+                            getCarry();
+                          }"></el-date-picker>
+        </div>
+      </template>
+      <lineChart height="500px" :chart-data="lineChartData"></lineChart>
+    </Card>
+
+    <detailContract ref="detailContract"></detailContract>
+
+    <budgetStatic ref="budgetStatic"></budgetStatic>
+
+    <carryStatic ref="carryStatic" :departments="statistic.departmentList" :year="select.year"></carryStatic>
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'
+import detailContract from "@/views/contract/components/detailContract";
+import LxHeader from "@/components/LxHeader/index.vue";
+import Pagination from "@/components/Pagination";
+import PieChart from "./components/PieChart.vue";
+import { adminDepartmentList } from '@/api/system/department';
+import { adminUserList, getInfo } from '@/api/user';
+import { getNotice, readNotice, carry } from "@/api/dashboard/notice";
+import { statistic } from '@/api/system/temporaryPlan'
+import { parseTime, moneyFormatter, deepCopy } from '@/utils';
+import { Message } from "element-ui";
+import budgetStatic from '@/views/dashboard/components/budgetStatic.vue'
+import lineChart from '@/views/dashboard/components/LineChart.vue'
+import carryStatic from '@/views/dashboard/components/carryStatic.vue'
+export default {
+  name: "Manage",
+  components: {
+    LxHeader,
+    Pagination,
+    detailContract,
+    PieChart,
+    budgetStatic,
+    lineChart,
+    carryStatic
+  },
+  data() {
+    return {
+      value2: 12,
+      split: 0.5,
+      rptChartData: [],
+      select: {
+        year: "",
+      },
+      carrySelect: {
+        month: this.$moment().format('YYYY-MM')
+      },
+      lineChartData: {},
+      statistic: {
+        departmentList: []
+      },
+      department_id: [],
+      userIds: [],
+      list: [],
+      total: 0,
+      pageIndex: 1,
+      // listQuery: {
+      //   page: 1,
+      //   page_size: 10,
+      //   show_self: 1,
+      // },
+      form: {
+        id: undefined,
+      },
+      dialogFormVisible: false,
+      departmentTree: [],
+      userList: [],
+      formLabelWidth: "200px",
+      user: {},
+
+      departmentProgress: [],
+      departmentTable: [
+        {
+          label: "科室",
+          minWidth: 180,
+          prop: "department.name",
+          sortable: false,
+          align: "left",
+          fixed: "left",
+        },
+        {
+          label: "执行情况",
+          sortable: false,
+          minWidth: 220,
+          align: "left",
+          fixed: "right",
+          customFn: (row) => {
+            let m2 = row?.money_total_2 ? Number(row?.money_total_2) : 0;
+            let m1 = row?.money_total_1 ? Number(row?.money_total_1) : 0;
+            let m3 = row?.use_money_total ? Number(row?.use_money_total) : 0;
+            let per = 0;
+
+            if (m2 != 0) {
+              per = ((m3 / m2) * 100).toFixed(2);
+            } else if (m1 != 0) {
+              per = ((m3 / m1) * 100).toFixed(2);
+            }
+            return (
+              <div>
+                <el-progress percentage={Number(per)}> </el-progress>{" "}
+              </div>
+            );
+          },
+        },
+        {
+          label: "年初预算合计金额(元)",
+          width: 260,
+          align: "right",
+          sortable: false,
+          prop: "money_total_1",
+          formatter: (cell, data, value) => {
+            return moneyFormatter(value ? Number(value) : 0);
+          },
+        },
+        {
+          label: "调整后预算合计金额(元)",
+          width: 260,
+          align: "right",
+          sortable: false,
+          prop: "money_total_2",
+          formatter: (cell, data, value) => {
+            return moneyFormatter(value ? Number(value) : 0);
+          },
+        },
+        {
+          label: "已使用(元)",
+          width: 120,
+          align: "right",
+          sortable: false,
+          prop: "use_money_total",
+          formatter: (cell, data, value) => {
+            return moneyFormatter(value ? Number(value) : 0);
+          },
+        },
+      ],
+      typeTable: [
+        {
+          label: "预算类别",
+          width: 100,
+          prop: "type_detail.value",
+          sortable: false,
+          fixed: "left",
+        },
+        {
+          label: "执行情况",
+          sortable: false,
+          minWidth: 220,
+          align: "left",
+          fixed: "right",
+          customFn: (row) => {
+            let m2 = row.money_total_2 ? Number(row.money_total_2) : 0;
+            let m1 = row.money_total_1 ? Number(row.money_total_1) : 0;
+            let m3 = row.use_money_total ? Number(row.use_money_total) : 0;
+            let per = 0;
+
+            if (m2 != 0) {
+              per = ((m3 / m2) * 100).toFixed(2);
+            } else if (m1 != 0) {
+              per = ((m3 / m1) * 100).toFixed(2);
+            }
+            return (
+              <div>
+                <el-progress percentage={Number(per)}> </el-progress>{" "}
+              </div>
+            );
+          },
+        },
+        {
+          label: "年初预算合计金额(元)",
+          width: 260,
+          align: "right",
+          sortable: false,
+          prop: "money_total_1",
+          formatter: (cell, data, value) => {
+            return moneyFormatter(value ? Number(value) : 0);
+          },
+        },
+        {
+          label: "调整后预算合计金额(元)",
+          width: 260,
+          align: "right",
+          sortable: false,
+          prop: "money_total_2",
+          formatter: (cell, data, value) => {
+            return moneyFormatter(value ? Number(value) : 0);
+          },
+        },
+        {
+          label: "已使用(元)",
+          width: 140,
+          align: "right",
+          sortable: false,
+          prop: "use_money_total",
+          formatter: (cell, data, value) => {
+            return moneyFormatter(value ? Number(value) : 0);
+          },
+        },
+      ],
+    };
+  },
+  created() {
+    this.select.year = this.$moment().format("YYYY");
+    this.getNotices();
+
+    this.getStatistic();
+    this.getCarry();
+
+    getInfo()
+      .then((response) => {
+        console.log(response);
+        this.user = response;
+      })
+      .catch((error) => {});
+  },
+  methods: {
+    async getCarry () {
+      const res = await carry(this.carrySelect);
+
+      //组织数据
+      let setData = function(data, constData, showData) {
+        data.filter(function(item) {
+          if (item) {
+            constData.push(1);
+            showData.push(item);
+          } else {
+            constData.push(0);
+            showData.push({
+              value: 1,
+              itemStyle: {
+                normal: {
+                  borderColor: "rgba(0,0,0,0)",
+                  borderWidth: 2,
+                  color: "rgba(0,0,0,0)",
+                },
+              },
+            });
+          }
+        });
+      }
+      //组织颜色
+      let setColor = function(colorArr) {
+        let color = {
+          type: "linear",
+          x: 0,
+          x2: 1,
+          y: 0,
+          y2: 0,
+          /* 此处决定阴暗面 若为横向柱状图则x,y轴调换
+            x: 0,
+            x2: 0,
+            y: 0,
+            y2: 1, */
+          colorStops: [{
+            offset: 0,
+            color: colorArr[0],
+          },
+            {
+              offset: 0.5,
+              color: colorArr[0],
+            },
+            {
+              offset: 0.5,
+              color: colorArr[1],
+            },
+            {
+              offset: 1,
+              color: colorArr[1],
+            },
+          ],
+        };
+        return color
+      }
+
+      let curPlan = res?.map(i => {
+        const { use_money_total,paid_plan_total,money_total_2 } = i
+        return paid_plan_total ? (Math.round((Number(paid_plan_total||0) / Number(money_total_2 ||0)) * 10000) / 100) : 0;
+      });
+      let curAct = res?.map(i => {
+        const { use_money_total,money_total_2 } = i
+        return money_total_2 ? (Math.round((Number(use_money_total||0) / Number(money_total_2||0)) * 10000) / 100) : 0;
+      });
+      let nextPlan = res?.map(i => {
+        const { use_money_total_next,paid_plan_total_next,money_total_2 } = i
+        return paid_plan_total_next ? (Math.round((Number(paid_plan_total_next||0) / Number(money_total_2||0)) * 10000) / 100) : 0;
+      });
+      let barWidth = 23;
+      let constData1 = [];
+      let showData1 = [];
+      let constData2 = [];
+      let showData2 = [];
+      let constData3 = [];
+      let showData3 = [];
+
+      setData(curPlan, constData1, showData1)
+      setData(curAct, constData2, showData2)
+      setData(nextPlan, constData3, showData3)
+
+      let colorArr1 = ["#345A8B", "#387ABD", "#398ac4"];
+      let colorArr2 = ["#51C0DB", "#42D9D6", "#45F5F1"];
+      let colorArr3 = ['#559372','#7ab798','#9edebc']
+
+      let color1 = setColor(colorArr1)
+      let color2 = setColor(colorArr2)
+      let color3 = setColor(colorArr3)
+
+      this.lineChartData = {
+        rotate: 54,
+        xArr: res?.map(i => i.plan_department?.name),
+        series: [
+          {
+            z: 1,
+            type: 'bar',
+            barWidth: barWidth,
+            name: `${this.carrySelect.month}计划`,
+            barGap: "90%", //相邻柱子间距
+            itemStyle: {
+              borderRadius: [0, 0, 0, 0],//柱子四周圆角
+              color: color1//柱子左右颜色（深，浅）
+            },
+            data: curPlan, //Y轴上的高度
+            label: {
+              show: true,
+              position: 'top',
+              textStyle: {//数值样式
+                fontSize: 12,
+                color: '#4d8bdc',
+              },
+              formatter: params => `${params.value}%`
+            }
+          },
+          {
+            z: 2,
+            name: `${this.carrySelect.month}计划`,
+            type: "pictorialBar",
+            data: constData1,//此数据对应底部组件
+            symbol: "diamond",//底部组件形状，不写默认为椭圆
+            symbolOffset: ["-190%", "50%"],//与柱子的偏移角度
+            symbolSize: [barWidth, 10],//底面[宽，高]
+            itemStyle: {
+              normal: {
+                color: color1//底面左右颜色（深，浅）
+              },
+            },
+            tooltip: {
+              show: false,
+            },
+          },
+          {
+            z: 3,
+            name: `${this.carrySelect.month}计划`,
+            type: "pictorialBar",
+            symbolPosition: "end",
+            data: showData1,//此数据对应顶部组件
+            symbol: "diamond",
+            symbolOffset: ["-230%", "-50%"],
+            symbolSize: [barWidth - 4, (10 * (barWidth - 4)) / barWidth],
+            itemStyle: {
+              normal: {
+                borderColor: colorArr1[2],
+                borderWidth: 2,
+                color: colorArr1[2],
+              },
+            },
+            tooltip: {
+              show: false,
+            },
+          },
+          {
+            z: 4,
+            type: 'bar',
+            barWidth: barWidth,
+            name: `${this.carrySelect.month}实际`,
+            itemStyle: {
+              borderRadius: [0, 0, 0, 0],
+              color: color2
+            },
+            data: curAct,
+            label: {
+              show: true,
+              position: 'top',
+              textStyle: {//数值样式
+                fontSize: 12,
+                color: '#4d8bdc',
+              },
+              formatter: params => `${params.value}%`
+            }
+          },
+          {
+            z: 5,
+            name: `${this.carrySelect.month}实际`,
+            type: "pictorialBar",
+            data: constData2,
+            symbol: "diamond",
+            symbolOffset: ["0%", "50%"],
+            symbolSize: [barWidth, 10], //=========================
+            itemStyle: {
+              normal: {
+                color: color2
+              },
+            },
+            tooltip: {
+              show: false,
+            },
+          },
+          {
+            z: 6,
+            name: `${this.carrySelect.month}实际`,
+            type: "pictorialBar",
+            symbolPosition: "end",
+            data: showData2,
+            symbol: "diamond",
+            symbolOffset: ["0%", "-50%"],
+            symbolSize: [barWidth - 4, (10 * (barWidth - 4)) / barWidth],
+            itemStyle: {
+              normal: {
+                borderColor: colorArr2[2],
+                borderWidth: 2,
+                color: colorArr2[2]
+              },
+            },
+            tooltip: {
+              show: false,
+            },
+          },
+          {
+            z: 7,
+            type: 'bar',
+            barWidth: barWidth,
+            name: `${this.$moment(this.carrySelect.month).add(1,'months').format('YYYY-MM')}计划`,
+            itemStyle: {
+              borderRadius: [0, 0, 0, 0],
+              color: color3
+            },
+            data: nextPlan,
+            label: {
+              show: true,
+              position: 'top',
+              textStyle: {//数值样式
+                fontSize: 12,
+                color: '#4d8bdc',
+              },
+              formatter: params => `${params.value}%`
+            }
+          },
+          {
+            z: 8,
+            name: `${this.$moment(this.carrySelect.month).add(1,'months').format('YYYY-MM')}计划`,
+            type: "pictorialBar",
+            data: constData3,
+            symbol: "diamond",
+            symbolOffset: ["192%", "50%"],
+            symbolSize: [barWidth, 10],
+            itemStyle: {
+              normal: {
+                color: color3
+              },
+            },
+            tooltip: {
+              show: false,
+            },
+          },
+          {
+            z: 9,
+            name: `${this.$moment(this.carrySelect.month).add(1,'months').format('YYYY-MM')}计划`,
+            type: "pictorialBar",
+            symbolPosition: "end",
+            data: showData3,
+            symbol: "diamond",
+            symbolOffset: ["233%", "-50%"],
+            symbolSize: [barWidth - 4, (10 * (barWidth - 4)) / barWidth],
+            itemStyle: {
+              normal: {
+                borderColor: colorArr3[2],
+                borderWidth: 2,
+                color: colorArr3[2]
+              },
+            },
+            tooltip: {
+              show: false,
+            },
+          }
+        ]
+      };
+    },
+
+    changeYear(e) {
+      this.select.year = e;
+      this.getStatistic();
+    },
+    async getStatistic() {
+      const res = await statistic(this.select);
+      console.log(res);
+      function handleDataStructure(data) {
+        let cData = deepCopy(data)
+        cData.progress.money_total_1 = isNaN(Number(cData.progress.plan_money)) ? 0 : Number(cData.progress.plan_money)
+        cData.progress.money_total_2 = isNaN(Number(cData.progress.plan_money)) ? 0 : Number(cData.progress.plan_money)
+        cData.progress.use_money_total = isNaN(Number(cData.progress.use_money)) ? 0 : Number(cData.progress.use_money)
+
+        cData.departmentList = cData.departmentList.map(i => ({
+          ...i,
+          money_total_1: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
+          money_total_2: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
+          use_money_total: isNaN(Number(i.use_money)) ? 0 : Number(i.use_money)
+        }))
+        cData.typeList = cData.typeList.map(i => ({
+          ...i,
+          money_total_1: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
+          money_total_2: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
+          use_money_total: isNaN(Number(i.use_money)) ? 0 : Number(i.use_money)
+        }))
+        return cData
+      }
+      this.statistic = handleDataStructure(res);
+      let m2 = this.statistic.progress.money_total_2;
+      let m1 = this.statistic.progress.money_total_1;
+      var user_m = this.statistic.progress.use_money_total;
+      var m3 = m1-user_m
+      if (m2 != 0) {
+        m3=m2-user_m;
+      } else if (m1 != 0) {
+        m3=m1-user_m;
+      }
+      this.rptChartData = {
+        xArr: ["预算未执行金额", "预算已执行金额"],
+        radiusArr: "50%",
+        yArr: [
+          {
+            value: m3,
+            name: "预算未执行金额",
+            label: {
+              show: false, //这个数据高亮时不显示label，就不会显示替遮住第一个数据的label值了
+            },
+            emphasis: {
+              label: {
+                show: false, //这个数据高亮时不显示label，就不会显示替遮住第一个数据的label值了
+              },
+            },
+          },
+          { value: user_m, name: "预算已执行金额" },
+        ],
+      };
+    },
+
+    toContract(row) {
+      this.$refs["detailContract"].getDetail(row.contract_id);
+      this.$refs["detailContract"].isShowDetail = true;
+    },
+
+    pageChange(e) {
+      this.pageIndex = e;
+      this.getNotices();
+    },
+
+    timeFormatter(cell, data, value) {
+      return parseTime(new Date(value));
+    },
+    typeFormatter(cell, data, value) {
+      return value === 1 ? "合同流程" : "付款计划";
+    },
+    toper(m1, m2, m3) {
+      if (m2 != 0) {
+        return ((m3 / m2) * 100).toFixed(2);
+      } else if (m1 != 0) {
+        return ((m3 / m1) * 100).toFixed(2);
+      } else return 0;
+    },
+    async getNotices() {
+      const res = await getNotice({
+        page_size: 10,
+        page: this.pageIndex,
+      });
+      this.list = res.data;
+      this.total = res.total;
+    },
+
+    filterChildren(data) {
+      data.forEach((i) => {
+        if (i.children && i.children.length > 0) {
+          this.filterChildren(i.children);
+        } else {
+          delete i.children;
+        }
+      });
+    },
+    getList() {
+      index(this.listQuery)
+        .then((response) => {
+          this.list = response.data;
+          this.total = response.total;
+        })
+        .catch((error) => {});
+    },
+    handleFilter() {
+      this.listQuery.page = 1;
+      this.getList();
+    },
+    readIt(row) {
+      readNotice({
+        id: row.id,
+      }).then((res) => {
+        Message({
+          type: "success",
+          message: "已读",
+        });
+        this.getNotices();
+      });
+      // show({id: row.id}).then(r => { this.form = r }).catch(error => {})
+      // this.list[index].is_read = 1
+    },
+    save() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (valid) {
+          const tempData = Object.assign({}, this.form);
+          tempData.admin_id_list = tempData.ids.map((i) => {
+            return {
+              admin_id: i,
+            };
+          });
+          if (tempData.id) {
+            save(tempData)
+              .then((r) => {
+                this.saved();
+              })
+              .catch((error) => {});
+          } else {
+            store(tempData)
+              .then((r) => {
+                this.saved();
+              })
+              .catch((error) => {});
+          }
+        }
+      });
+    },
+    saved() {
+      this.handleFilter();
+      this.dialogFormVisible = false;
+      this.$message.success("保存成功");
+    },
+    handleDelete(row, index) {
+      this.$confirm("确定要删除吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          destroy({
+            id: row.id,
+          })
+            .then((response) => {
+              this.$message.success("删除成功");
+              this.getList();
+            })
+            .catch((error) => {});
+        })
+        .catch(() => {});
+    },
+  },
+  computed: {
+    moneyFormat () {
+      return function (price) {
+        return moneyFormatter(price);
+      };
+    },
+    allowAuth () {
+      return this.$store.state.user.min_allow_level !== 2
+    }
+  },
+};
+</script>
+<style scoped lang="scss">
+::v-deep .el-progress--line {
+  display: flex;
+  align-items: center;
+}
+::v-deep .el-progress__text {
+  word-break: keep-all;
+}
+.show-static-btn {
+  cursor: pointer;
+  font-size: 15px;
+  font-weight: 600;
+  text-align: center;
+  color: #fff;
+  background: #4d8bdc;
+  border-radius: 4px;
+  border: 1px solid #EBEEF5;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  transition: all .2s;
+  flex: 1;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  padding: 0 20px;
+  box-sizing: border-box;
+
+  & + & {
+    background: darkorange;
+    margin-top: 20px;
+  }
+  &:hover {
+    transform: scale(1.05,1.05);
+  }
+}
+::v-deep .el-dialog__body {
+  padding: 8px 20px;
+}
+
+::v-deep .el-col-5 {
+  width: 20%;
+}
+
+::v-deep .el-card__body {
+  padding: 4px 10px !important;
+}
+
+.progress-card {
+  display: flex;
+
+  &-item {
+    text-align: center;
+    flex: 1;
+
+    &__label {
+      font-size: 14px;
+    }
+
+    &__num {
+      font-size: 20px;
+      font-weight: 600;
+
+      padding: 6px 0;
+    }
+  }
+}
+</style>
+<style lang="scss" scoped>
+.ivu-btn {
+  margin-right: 10px;
+}
+
+.table-tree {
+  margin-top: 10px;
+}
+
+.v-text {
+  padding: 8px 0;
+  border-bottom: 1px solid #eee;
+  margin-bottom: 20px;
+
+  .title {
+    color: #338de3;
+  }
+}
+
+.dataGroup {
+  padding: 10px 0;
+}
+
+.grid-content {
+  border-radius: 5px;
+  text-align: center;
+  background: #ffffff;
+  padding: 15px 0;
+
+  p {
+    line-height: 1.8;
+  }
+
+  p:first-child {
+    font-weight: 700;
+    font-size: 16px;
+  }
+}
+
+.bg-org {
+  border: 2px solid #ef6c24;
+  color: #ef6c24;
+}
+
+.bg-blue {
+  border: 2px solid #0800ff;
+  color: #0800ff;
+}
+
+.bg-green {
+  border: 2px solid #0f9700;
+  color: #0f9700;
+}
+
+.bg-black {
+  border: 2px solid #333;
+  color: #333;
+}
+
+.bg-pink {
+  border: 2px solid #ff0000;
+  color: #ff0000;
+}
+</style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 67a3d72..7c44975 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -212,7 +212,6 @@
                     >
                       <template v-slot:btns>
                         <el-table-column
-                          v-if="false"
                           :width="80"
                           fixed="right"
                           label="操作"
@@ -253,7 +252,6 @@
                     >
                       <template v-slot:btns>
                         <el-table-column
-                          v-if="false"
                           :width="80"
                           fixed="right"
                           label="操作"
@@ -314,9 +312,8 @@ import Pagination from "@/components/Pagination";
 import PieChart from "./components/PieChart.vue";
 import { adminDepartmentList } from '@/api/system/department';
 import { adminUserList, getInfo } from '@/api/user';
-import { getNotice, readNotice, carry } from "@/api/dashboard/notice";
-import { statistic } from '@/api/system/temporaryPlan'
-import { parseTime, moneyFormatter, deepCopy } from '@/utils';
+import { getNotice, readNotice, statistic, carry } from "@/api/dashboard/notice";
+import { parseTime, moneyFormatter } from '@/utils';
 import { Message } from "element-ui";
 import budgetStatic from '@/views/dashboard/components/budgetStatic.vue'
 import lineChart from '@/views/dashboard/components/LineChart.vue'
@@ -371,7 +368,7 @@ export default {
         {
           label: "科室",
           minWidth: 180,
-          prop: "department.name",
+          prop: "plan_department.name",
           sortable: false,
           align: "left",
           fixed: "left",
@@ -383,9 +380,9 @@ export default {
           align: "left",
           fixed: "right",
           customFn: (row) => {
-            let m2 = row?.money_total_2 ? Number(row?.money_total_2) : 0;
-            let m1 = row?.money_total_1 ? Number(row?.money_total_1) : 0;
-            let m3 = row?.use_money_total ? Number(row?.use_money_total) : 0;
+            let m2 = row?.money_total_2;
+            let m1 = row?.money_total_1;
+            let m3 = row?.use_money_total;
             let per = 0;
 
             if (m2 != 0) {
@@ -407,7 +404,7 @@ export default {
           sortable: false,
           prop: "money_total_1",
           formatter: (cell, data, value) => {
-            return moneyFormatter(value ? Number(value) : 0);
+            return moneyFormatter(value);
           },
         },
         {
@@ -417,7 +414,7 @@ export default {
           sortable: false,
           prop: "money_total_2",
           formatter: (cell, data, value) => {
-            return moneyFormatter(value ? Number(value) : 0);
+            return moneyFormatter(value);
           },
         },
         {
@@ -427,7 +424,7 @@ export default {
           sortable: false,
           prop: "use_money_total",
           formatter: (cell, data, value) => {
-            return moneyFormatter(value ? Number(value) : 0);
+            return moneyFormatter(value);
           },
         },
       ],
@@ -435,7 +432,7 @@ export default {
         {
           label: "预算类别",
           width: 100,
-          prop: "type_detail.value",
+          prop: "type_text",
           sortable: false,
           fixed: "left",
         },
@@ -446,9 +443,9 @@ export default {
           align: "left",
           fixed: "right",
           customFn: (row) => {
-            let m2 = row.money_total_2 ? Number(row.money_total_2) : 0;
-            let m1 = row.money_total_1 ? Number(row.money_total_1) : 0;
-            let m3 = row.use_money_total ? Number(row.use_money_total) : 0;
+            let m2 = row.money_total_2;
+            let m1 = row.money_total_1;
+            let m3 = row.use_money_total;
             let per = 0;
 
             if (m2 != 0) {
@@ -470,7 +467,7 @@ export default {
           sortable: false,
           prop: "money_total_1",
           formatter: (cell, data, value) => {
-            return moneyFormatter(value ? Number(value) : 0);
+            return moneyFormatter(value);
           },
         },
         {
@@ -480,7 +477,7 @@ export default {
           sortable: false,
           prop: "money_total_2",
           formatter: (cell, data, value) => {
-            return moneyFormatter(value ? Number(value) : 0);
+            return moneyFormatter(value);
           },
         },
         {
@@ -490,7 +487,7 @@ export default {
           sortable: false,
           prop: "use_money_total",
           formatter: (cell, data, value) => {
-            return moneyFormatter(value ? Number(value) : 0);
+            return moneyFormatter(value);
           },
         },
       ],
@@ -786,38 +783,18 @@ export default {
       this.getStatistic();
     },
     async getStatistic() {
-      const res = await statistic(this.select);
-      console.log(res);
-      function handleDataStructure(data) {
-        let cData = deepCopy(data)
-        cData.progress.money_total_1 = isNaN(Number(cData.progress.plan_money)) ? 0 : Number(cData.progress.plan_money)
-        cData.progress.money_total_2 = isNaN(Number(cData.progress.plan_money)) ? 0 : Number(cData.progress.plan_money)
-        cData.progress.use_money_total = isNaN(Number(cData.progress.use_money)) ? 0 : Number(cData.progress.use_money)
-
-        cData.departmentList = cData.departmentList.map(i => ({
-          ...i,
-          money_total_1: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
-          money_total_2: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
-          use_money_total: isNaN(Number(i.use_money)) ? 0 : Number(i.use_money)
-        }))
-        cData.typeList = cData.typeList.map(i => ({
-          ...i,
-          money_total_1: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
-          money_total_2: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
-          use_money_total: isNaN(Number(i.use_money)) ? 0 : Number(i.use_money)
-        }))
-        return cData
-      }
-      this.statistic = handleDataStructure(res);
-      let m2 = this.statistic.progress.money_total_2;
-      let m1 = this.statistic.progress.money_total_1;
-      var user_m = this.statistic.progress.use_money_total;
-      var m3 = m1-user_m
-      if (m2 != 0) {
-        m3=m2-user_m;
-      } else if (m1 != 0) {
-        m3=m1-user_m;
-      }
+            const res = await statistic(this.select);
+            console.log(res);
+            this.statistic = res;
+            let m2 = res.progress.money_total_2;
+            let m1 = res.progress.money_total_1;
+            var user_m = res.progress.use_money_total;
+            var m3=m1-user_m
+            if (m2 != 0) {
+              m3=m2-user_m;
+            } else if (m1 != 0) {
+              m3=m1-user_m;
+            }
       this.rptChartData = {
         xArr: ["预算未执行金额", "预算已执行金额"],
         radiusArr: "50%",
diff --git a/src/views/dashboard/index1.txt b/src/views/dashboard/index1.txt
new file mode 100644
index 0000000..7c44975
--- /dev/null
+++ b/src/views/dashboard/index1.txt
@@ -0,0 +1,1077 @@
+<template>
+  <div class="app-container">
+    <div
+      style="display: flex; justify-content: space-between; align-items: center"
+    >
+      <span>当前登录人：{{ user.name }} </span>
+
+    </div>
+
+    <el-row :gutter="20">
+      <el-col :span="allowAuth ? 16 : 24">
+        <el-card v-if="allowAuth" class="box-card" style="margin: 20px 0">
+          <div slot="header" class="clearfix">
+            <span>预算总体执行情况</span>
+            <DatePicker
+              :value="select.year"
+              placeholder="选择所属年份"
+              placement="bottom"
+              style="width: 130px; float: right"
+              type="year"
+              @on-change="changeYear"
+            ></DatePicker>
+          </div>
+          <router-link :to="`/statisticalReport/budgetProgress`">
+            <div class="progress-card">
+              <div class="progress-card-item">
+                <div class="progress-card-item__num">
+                  {{
+                    moneyFormat(
+                      statistic.progress ? statistic.progress.money_total_1 : 0
+                    )
+                  }}
+                </div>
+                <div class="progress-card-item__label">年初预算合计金额</div>
+              </div>
+              <div class="progress-card-item">
+                <div class="progress-card-item__num">
+                  {{
+                    moneyFormat(
+                      statistic.progress ? statistic.progress.money_total_2 : 0
+                    )
+                  }}
+                </div>
+                <div class="progress-card-item__label">调整后预算合计金额</div>
+              </div>
+              <div class="progress-card-item">
+                <div class="progress-card-item__num">
+                  {{
+                    moneyFormat(
+                      statistic.progress
+                        ? statistic.progress.use_money_total
+                        : 0
+                    )
+                  }}
+                </div>
+                <div class="progress-card-item__label">已支付金额</div>
+              </div>
+              <div class="progress-card-item">
+                <div class="progress-card-item__num">
+                  {{
+                    toper(
+                      statistic.progress ? statistic.progress.money_total_1 : 0,
+                      statistic.progress ? statistic.progress.money_total_2 : 0,
+                      statistic.progress
+                        ? statistic.progress.use_money_total
+                        : 0
+                    )
+                  }}%
+                </div>
+                <div class="progress-card-item__label">执行率</div>
+              </div>
+            </div>
+          </router-link>
+        </el-card>
+
+        <div ref="lxHeader">
+          <LxHeader
+            icon="iconfont/icon--kucunguanli"
+            text="待办事项"
+            :custom="true"
+            style="margin-bottom: 10px; border: 0px; margin-top: 15px"
+          >
+            <div slot="content" />
+            <slot>
+              <div></div>
+            </slot>
+          </LxHeader>
+        </div>
+        <div class="table-tree">
+          <el-table
+            :data="list"
+            border
+            class="v-table"
+            style="width: 100%; margin-bottom: 20px"
+          >
+            <el-table-column type="index" label="序号" align="center" />
+            <el-table-column
+              prop="type"
+              width="100"
+              label="类型"
+              align="center"
+              :formatter="typeFormatter"
+            />
+            <el-table-column prop="content" label="内容" align="left" />
+            <el-table-column
+              prop="created_at"
+              width="200"
+              label="下发时间"
+              align="center"
+              :formatter="timeFormatter"
+            />
+            <el-table-column
+              width="100"
+              label="状态"
+              align="center"
+              prop="read_count"
+            >
+              <template slot-scope="{ row, $index }">
+                <el-link v-if="row.read_count" type="success" :underline="false"
+                  >已读</el-link
+                >
+                <Button
+                  v-else
+                  type="error"
+                  size="small"
+                  style="margin-left: 10px"
+                  ghost
+                  @click="readIt(row, $index)"
+                  >未读</Button
+                >
+              </template>
+            </el-table-column>
+            <el-table-column
+              width="90"
+              header-align="center"
+              label="操作"
+              align="center"
+            >
+              <template slot-scope="{ row, $index }">
+                <Button
+                  type="primary"
+                  size="small"
+                  style="margin-left: 10px"
+                  ghost
+                  @click="toContract(row)"
+                  >查看</Button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <div style="display: flex; justify-content: flex-end">
+            <Page :total="total" show-elevator @on-change="pageChange" />
+          </div>
+        </div>
+      </el-col>
+      <el-col v-if="allowAuth" :span="($store.state.user.department && $store.state.user.department.name === '中心领导') ? 7 : 8">
+        <el-card class="box-card" style="margin: 20px 0">
+          <div class="text item">
+            <pie-chart :chartData="rptChartData"></pie-chart>
+          </div>
+        </el-card>
+      </el-col>
+
+      <el-col :span="1" v-if="$store.state.user.department && $store.state.user.department.name === '中心领导'">
+        <div style="display: flex;flex-direction: column;height: 310px;padding-top: 20px;">
+          <div class="show-static-btn" @click="$refs['budgetStatic'].show()">
+            统计查看
+            <i class="el-icon-d-arrow-left"></i>
+          </div>
+          <div class="show-static-btn"
+               @click="$confirm('选择统计的数据类型','提示',{
+                 confirmButtonText: '预算类型',
+                 cancelButtonText: '部门科室',
+                 showClose: false,
+                 callback:(action, instance) => {
+                   if (action === 'cancel') {
+                     $refs['carryStatic'].setType(1)
+                     $refs['carryStatic'].show()
+                   }
+                   if (action === 'confirm') {
+                     $refs['carryStatic'].setType(2)
+                     $refs['carryStatic'].show()
+                   }
+                 }
+               })">
+            执行统计
+            <i class="el-icon-d-arrow-left"></i>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+
+    <div class="demo-split" v-if="allowAuth">
+      <Split v-model="split" style="height: 440px">
+        <template #left>
+          <div class="demo-split-pane" style="padding-right: 5px">
+            <div ref="lxHeader" v-if="statistic.departmentList">
+              <LxHeader
+                icon="iconfont/icon--kucunguanli"
+                text="科室执行情况"
+                :custom="true"
+                style="margin-bottom: 10px; border: 0px; margin-top: 15px"
+              >
+                <div slot="content" />
+                <slot>
+                  <div style="width: 100%">
+                    <xy-table
+                      :height="380"
+                      :list="statistic.departmentList"
+                      :table-item="departmentTable"
+                    >
+                      <template v-slot:btns>
+                        <el-table-column
+                          :width="80"
+                          fixed="right"
+                          label="操作"
+                          header-align="center"
+                          align="center"
+                        >
+                          <template slot-scope="scope">
+                            <router-link
+                              :to="`/contract/statisticalReport/budgetProgress?departmentId=${scope.row.plan_department_id}`"
+                              >查看
+                            </router-link>
+                          </template>
+                        </el-table-column>
+                      </template>
+                    </xy-table>
+                  </div>
+                </slot>
+              </LxHeader>
+            </div>
+          </div>
+        </template>
+        <template #right>
+          <div class="demo-split-pane" style="padding-left: 10px">
+            <div ref="lxHeader" v-if="statistic.typeList">
+              <LxHeader
+                icon="iconfont/icon--kucunguanli"
+                text="预算类型执行情况"
+                :custom="true"
+                style="margin-bottom: 10px; border: 0px; margin-top: 15px"
+              >
+                <div slot="content" />
+                <slot>
+                  <div style="width: 100%">
+                    <xy-table
+                      :height="380"
+                      :list="statistic.typeList"
+                      :table-item="typeTable"
+                    >
+                      <template v-slot:btns>
+                        <el-table-column
+                          :width="80"
+                          fixed="right"
+                          label="操作"
+                          header-align="center"
+                          align="center"
+                        >
+                          <template slot-scope="scope">
+                            <router-link
+                              :to="`/contract/statisticalReport/budgetProgress?typeId=${scope.row.type}`"
+                              >查看
+                            </router-link>
+                          </template>
+                        </el-table-column>
+                      </template>
+                    </xy-table>
+                  </div>
+                </slot>
+              </LxHeader>
+            </div>
+          </div>
+        </template>
+      </Split>
+    </div>
+
+    <Card v-if="allowAuth">
+      <template #title>
+        <div style="display: flex;justify-content: space-between;align-items: center;">
+          <p>各科室预算计划完成对比图</p>
+          <el-date-picker v-model="carrySelect.month"
+                          format="yyyy-MM"
+                          :clearable="false"
+                          style="width: 140px;"
+                          placeholder="月份"
+                          type="month"
+                          size="small"
+                          @change="e => {
+                            carrySelect.month = $moment(e).format('YYYY-MM');
+                            getCarry();
+                          }"></el-date-picker>
+        </div>
+      </template>
+      <lineChart height="500px" :chart-data="lineChartData"></lineChart>
+    </Card>
+
+    <detailContract ref="detailContract"></detailContract>
+
+    <budgetStatic ref="budgetStatic"></budgetStatic>
+
+    <carryStatic ref="carryStatic" :departments="statistic.departmentList" :year="select.year"></carryStatic>
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'
+import detailContract from "@/views/contract/components/detailContract";
+import LxHeader from "@/components/LxHeader/index.vue";
+import Pagination from "@/components/Pagination";
+import PieChart from "./components/PieChart.vue";
+import { adminDepartmentList } from '@/api/system/department';
+import { adminUserList, getInfo } from '@/api/user';
+import { getNotice, readNotice, statistic, carry } from "@/api/dashboard/notice";
+import { parseTime, moneyFormatter } from '@/utils';
+import { Message } from "element-ui";
+import budgetStatic from '@/views/dashboard/components/budgetStatic.vue'
+import lineChart from '@/views/dashboard/components/LineChart.vue'
+import carryStatic from '@/views/dashboard/components/carryStatic.vue'
+export default {
+  name: "Manage",
+  components: {
+    LxHeader,
+    Pagination,
+    detailContract,
+    PieChart,
+    budgetStatic,
+    lineChart,
+    carryStatic
+  },
+  data() {
+    return {
+      value2: 12,
+      split: 0.5,
+      rptChartData: [],
+      select: {
+        year: "",
+      },
+      carrySelect: {
+        month: this.$moment().format('YYYY-MM')
+      },
+      lineChartData: {},
+      statistic: {
+        departmentList: []
+      },
+      department_id: [],
+      userIds: [],
+      list: [],
+      total: 0,
+      pageIndex: 1,
+      // listQuery: {
+      //   page: 1,
+      //   page_size: 10,
+      //   show_self: 1,
+      // },
+      form: {
+        id: undefined,
+      },
+      dialogFormVisible: false,
+      departmentTree: [],
+      userList: [],
+      formLabelWidth: "200px",
+      user: {},
+
+      departmentProgress: [],
+      departmentTable: [
+        {
+          label: "科室",
+          minWidth: 180,
+          prop: "plan_department.name",
+          sortable: false,
+          align: "left",
+          fixed: "left",
+        },
+        {
+          label: "执行情况",
+          sortable: false,
+          minWidth: 220,
+          align: "left",
+          fixed: "right",
+          customFn: (row) => {
+            let m2 = row?.money_total_2;
+            let m1 = row?.money_total_1;
+            let m3 = row?.use_money_total;
+            let per = 0;
+
+            if (m2 != 0) {
+              per = ((m3 / m2) * 100).toFixed(2);
+            } else if (m1 != 0) {
+              per = ((m3 / m1) * 100).toFixed(2);
+            }
+            return (
+              <div>
+                <el-progress percentage={Number(per)}> </el-progress>{" "}
+              </div>
+            );
+          },
+        },
+        {
+          label: "年初预算合计金额(元)",
+          width: 260,
+          align: "right",
+          sortable: false,
+          prop: "money_total_1",
+          formatter: (cell, data, value) => {
+            return moneyFormatter(value);
+          },
+        },
+        {
+          label: "调整后预算合计金额(元)",
+          width: 260,
+          align: "right",
+          sortable: false,
+          prop: "money_total_2",
+          formatter: (cell, data, value) => {
+            return moneyFormatter(value);
+          },
+        },
+        {
+          label: "已使用(元)",
+          width: 120,
+          align: "right",
+          sortable: false,
+          prop: "use_money_total",
+          formatter: (cell, data, value) => {
+            return moneyFormatter(value);
+          },
+        },
+      ],
+      typeTable: [
+        {
+          label: "预算类别",
+          width: 100,
+          prop: "type_text",
+          sortable: false,
+          fixed: "left",
+        },
+        {
+          label: "执行情况",
+          sortable: false,
+          minWidth: 220,
+          align: "left",
+          fixed: "right",
+          customFn: (row) => {
+            let m2 = row.money_total_2;
+            let m1 = row.money_total_1;
+            let m3 = row.use_money_total;
+            let per = 0;
+
+            if (m2 != 0) {
+              per = ((m3 / m2) * 100).toFixed(2);
+            } else if (m1 != 0) {
+              per = ((m3 / m1) * 100).toFixed(2);
+            }
+            return (
+              <div>
+                <el-progress percentage={Number(per)}> </el-progress>{" "}
+              </div>
+            );
+          },
+        },
+        {
+          label: "年初预算合计金额(元)",
+          width: 260,
+          align: "right",
+          sortable: false,
+          prop: "money_total_1",
+          formatter: (cell, data, value) => {
+            return moneyFormatter(value);
+          },
+        },
+        {
+          label: "调整后预算合计金额(元)",
+          width: 260,
+          align: "right",
+          sortable: false,
+          prop: "money_total_2",
+          formatter: (cell, data, value) => {
+            return moneyFormatter(value);
+          },
+        },
+        {
+          label: "已使用(元)",
+          width: 140,
+          align: "right",
+          sortable: false,
+          prop: "use_money_total",
+          formatter: (cell, data, value) => {
+            return moneyFormatter(value);
+          },
+        },
+      ],
+    };
+  },
+  created() {
+    this.select.year = this.$moment().format("YYYY");
+    this.getNotices();
+
+    this.getStatistic();
+    this.getCarry();
+
+    getInfo()
+      .then((response) => {
+        console.log(response);
+        this.user = response;
+      })
+      .catch((error) => {});
+  },
+  methods: {
+    async getCarry () {
+      const res = await carry(this.carrySelect);
+
+      //组织数据
+      let setData = function(data, constData, showData) {
+        data.filter(function(item) {
+          if (item) {
+            constData.push(1);
+            showData.push(item);
+          } else {
+            constData.push(0);
+            showData.push({
+              value: 1,
+              itemStyle: {
+                normal: {
+                  borderColor: "rgba(0,0,0,0)",
+                  borderWidth: 2,
+                  color: "rgba(0,0,0,0)",
+                },
+              },
+            });
+          }
+        });
+      }
+      //组织颜色
+      let setColor = function(colorArr) {
+        let color = {
+          type: "linear",
+          x: 0,
+          x2: 1,
+          y: 0,
+          y2: 0,
+          /* 此处决定阴暗面 若为横向柱状图则x,y轴调换
+            x: 0,
+            x2: 0,
+            y: 0,
+            y2: 1, */
+          colorStops: [{
+            offset: 0,
+            color: colorArr[0],
+          },
+            {
+              offset: 0.5,
+              color: colorArr[0],
+            },
+            {
+              offset: 0.5,
+              color: colorArr[1],
+            },
+            {
+              offset: 1,
+              color: colorArr[1],
+            },
+          ],
+        };
+        return color
+      }
+
+      let curPlan = res?.map(i => {
+        const { use_money_total,paid_plan_total,money_total_2 } = i
+        return paid_plan_total ? (Math.round((Number(paid_plan_total||0) / Number(money_total_2 ||0)) * 10000) / 100) : 0;
+      });
+      let curAct = res?.map(i => {
+        const { use_money_total,money_total_2 } = i
+        return money_total_2 ? (Math.round((Number(use_money_total||0) / Number(money_total_2||0)) * 10000) / 100) : 0;
+      });
+      let nextPlan = res?.map(i => {
+        const { use_money_total_next,paid_plan_total_next,money_total_2 } = i
+        return paid_plan_total_next ? (Math.round((Number(paid_plan_total_next||0) / Number(money_total_2||0)) * 10000) / 100) : 0;
+      });
+      let barWidth = 23;
+      let constData1 = [];
+      let showData1 = [];
+      let constData2 = [];
+      let showData2 = [];
+      let constData3 = [];
+      let showData3 = [];
+
+      setData(curPlan, constData1, showData1)
+      setData(curAct, constData2, showData2)
+      setData(nextPlan, constData3, showData3)
+
+      let colorArr1 = ["#345A8B", "#387ABD", "#398ac4"];
+      let colorArr2 = ["#51C0DB", "#42D9D6", "#45F5F1"];
+      let colorArr3 = ['#559372','#7ab798','#9edebc']
+
+      let color1 = setColor(colorArr1)
+      let color2 = setColor(colorArr2)
+      let color3 = setColor(colorArr3)
+
+      this.lineChartData = {
+        rotate: 54,
+        xArr: res?.map(i => i.plan_department?.name),
+        series: [
+          {
+            z: 1,
+            type: 'bar',
+            barWidth: barWidth,
+            name: `${this.carrySelect.month}计划`,
+            barGap: "90%", //相邻柱子间距
+            itemStyle: {
+              borderRadius: [0, 0, 0, 0],//柱子四周圆角
+              color: color1//柱子左右颜色（深，浅）
+            },
+            data: curPlan, //Y轴上的高度
+            label: {
+              show: true,
+              position: 'top',
+              textStyle: {//数值样式
+                fontSize: 12,
+                color: '#4d8bdc',
+              },
+              formatter: params => `${params.value}%`
+            }
+          },
+          {
+            z: 2,
+            name: `${this.carrySelect.month}计划`,
+            type: "pictorialBar",
+            data: constData1,//此数据对应底部组件
+            symbol: "diamond",//底部组件形状，不写默认为椭圆
+            symbolOffset: ["-190%", "50%"],//与柱子的偏移角度
+            symbolSize: [barWidth, 10],//底面[宽，高]
+            itemStyle: {
+              normal: {
+                color: color1//底面左右颜色（深，浅）
+              },
+            },
+            tooltip: {
+              show: false,
+            },
+          },
+          {
+            z: 3,
+            name: `${this.carrySelect.month}计划`,
+            type: "pictorialBar",
+            symbolPosition: "end",
+            data: showData1,//此数据对应顶部组件
+            symbol: "diamond",
+            symbolOffset: ["-230%", "-50%"],
+            symbolSize: [barWidth - 4, (10 * (barWidth - 4)) / barWidth],
+            itemStyle: {
+              normal: {
+                borderColor: colorArr1[2],
+                borderWidth: 2,
+                color: colorArr1[2],
+              },
+            },
+            tooltip: {
+              show: false,
+            },
+          },
+          {
+            z: 4,
+            type: 'bar',
+            barWidth: barWidth,
+            name: `${this.carrySelect.month}实际`,
+            itemStyle: {
+              borderRadius: [0, 0, 0, 0],
+              color: color2
+            },
+            data: curAct,
+            label: {
+              show: true,
+              position: 'top',
+              textStyle: {//数值样式
+                fontSize: 12,
+                color: '#4d8bdc',
+              },
+              formatter: params => `${params.value}%`
+            }
+          },
+          {
+            z: 5,
+            name: `${this.carrySelect.month}实际`,
+            type: "pictorialBar",
+            data: constData2,
+            symbol: "diamond",
+            symbolOffset: ["0%", "50%"],
+            symbolSize: [barWidth, 10], //=========================
+            itemStyle: {
+              normal: {
+                color: color2
+              },
+            },
+            tooltip: {
+              show: false,
+            },
+          },
+          {
+            z: 6,
+            name: `${this.carrySelect.month}实际`,
+            type: "pictorialBar",
+            symbolPosition: "end",
+            data: showData2,
+            symbol: "diamond",
+            symbolOffset: ["0%", "-50%"],
+            symbolSize: [barWidth - 4, (10 * (barWidth - 4)) / barWidth],
+            itemStyle: {
+              normal: {
+                borderColor: colorArr2[2],
+                borderWidth: 2,
+                color: colorArr2[2]
+              },
+            },
+            tooltip: {
+              show: false,
+            },
+          },
+          {
+            z: 7,
+            type: 'bar',
+            barWidth: barWidth,
+            name: `${this.$moment(this.carrySelect.month).add(1,'months').format('YYYY-MM')}计划`,
+            itemStyle: {
+              borderRadius: [0, 0, 0, 0],
+              color: color3
+            },
+            data: nextPlan,
+            label: {
+              show: true,
+              position: 'top',
+              textStyle: {//数值样式
+                fontSize: 12,
+                color: '#4d8bdc',
+              },
+              formatter: params => `${params.value}%`
+            }
+          },
+          {
+            z: 8,
+            name: `${this.$moment(this.carrySelect.month).add(1,'months').format('YYYY-MM')}计划`,
+            type: "pictorialBar",
+            data: constData3,
+            symbol: "diamond",
+            symbolOffset: ["192%", "50%"],
+            symbolSize: [barWidth, 10],
+            itemStyle: {
+              normal: {
+                color: color3
+              },
+            },
+            tooltip: {
+              show: false,
+            },
+          },
+          {
+            z: 9,
+            name: `${this.$moment(this.carrySelect.month).add(1,'months').format('YYYY-MM')}计划`,
+            type: "pictorialBar",
+            symbolPosition: "end",
+            data: showData3,
+            symbol: "diamond",
+            symbolOffset: ["233%", "-50%"],
+            symbolSize: [barWidth - 4, (10 * (barWidth - 4)) / barWidth],
+            itemStyle: {
+              normal: {
+                borderColor: colorArr3[2],
+                borderWidth: 2,
+                color: colorArr3[2]
+              },
+            },
+            tooltip: {
+              show: false,
+            },
+          }
+        ]
+      };
+    },
+
+    changeYear(e) {
+      this.select.year = e;
+      this.getStatistic();
+    },
+    async getStatistic() {
+            const res = await statistic(this.select);
+            console.log(res);
+            this.statistic = res;
+            let m2 = res.progress.money_total_2;
+            let m1 = res.progress.money_total_1;
+            var user_m = res.progress.use_money_total;
+            var m3=m1-user_m
+            if (m2 != 0) {
+              m3=m2-user_m;
+            } else if (m1 != 0) {
+              m3=m1-user_m;
+            }
+      this.rptChartData = {
+        xArr: ["预算未执行金额", "预算已执行金额"],
+        radiusArr: "50%",
+        yArr: [
+          {
+            value: m3,
+            name: "预算未执行金额",
+            label: {
+              show: false, //这个数据高亮时不显示label，就不会显示替遮住第一个数据的label值了
+            },
+            emphasis: {
+              label: {
+                show: false, //这个数据高亮时不显示label，就不会显示替遮住第一个数据的label值了
+              },
+            },
+          },
+          { value: user_m, name: "预算已执行金额" },
+        ],
+      };
+    },
+
+    toContract(row) {
+      this.$refs["detailContract"].getDetail(row.contract_id);
+      this.$refs["detailContract"].isShowDetail = true;
+    },
+
+    pageChange(e) {
+      this.pageIndex = e;
+      this.getNotices();
+    },
+
+    timeFormatter(cell, data, value) {
+      return parseTime(new Date(value));
+    },
+    typeFormatter(cell, data, value) {
+      return value === 1 ? "合同流程" : "付款计划";
+    },
+    toper(m1, m2, m3) {
+      if (m2 != 0) {
+        return ((m3 / m2) * 100).toFixed(2);
+      } else if (m1 != 0) {
+        return ((m3 / m1) * 100).toFixed(2);
+      } else return 0;
+    },
+    async getNotices() {
+      const res = await getNotice({
+        page_size: 10,
+        page: this.pageIndex,
+      });
+      this.list = res.data;
+      this.total = res.total;
+    },
+
+    filterChildren(data) {
+      data.forEach((i) => {
+        if (i.children && i.children.length > 0) {
+          this.filterChildren(i.children);
+        } else {
+          delete i.children;
+        }
+      });
+    },
+    getList() {
+      index(this.listQuery)
+        .then((response) => {
+          this.list = response.data;
+          this.total = response.total;
+        })
+        .catch((error) => {});
+    },
+    handleFilter() {
+      this.listQuery.page = 1;
+      this.getList();
+    },
+    readIt(row) {
+      readNotice({
+        id: row.id,
+      }).then((res) => {
+        Message({
+          type: "success",
+          message: "已读",
+        });
+        this.getNotices();
+      });
+      // show({id: row.id}).then(r => { this.form = r }).catch(error => {})
+      // this.list[index].is_read = 1
+    },
+    save() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (valid) {
+          const tempData = Object.assign({}, this.form);
+          tempData.admin_id_list = tempData.ids.map((i) => {
+            return {
+              admin_id: i,
+            };
+          });
+          if (tempData.id) {
+            save(tempData)
+              .then((r) => {
+                this.saved();
+              })
+              .catch((error) => {});
+          } else {
+            store(tempData)
+              .then((r) => {
+                this.saved();
+              })
+              .catch((error) => {});
+          }
+        }
+      });
+    },
+    saved() {
+      this.handleFilter();
+      this.dialogFormVisible = false;
+      this.$message.success("保存成功");
+    },
+    handleDelete(row, index) {
+      this.$confirm("确定要删除吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          destroy({
+            id: row.id,
+          })
+            .then((response) => {
+              this.$message.success("删除成功");
+              this.getList();
+            })
+            .catch((error) => {});
+        })
+        .catch(() => {});
+    },
+  },
+  computed: {
+    moneyFormat () {
+      return function (price) {
+        return moneyFormatter(price);
+      };
+    },
+    allowAuth () {
+      return this.$store.state.user.min_allow_level !== 2
+    }
+  },
+};
+</script>
+<style scoped lang="scss">
+::v-deep .el-progress--line {
+  display: flex;
+  align-items: center;
+}
+::v-deep .el-progress__text {
+  word-break: keep-all;
+}
+.show-static-btn {
+  cursor: pointer;
+  font-size: 15px;
+  font-weight: 600;
+  text-align: center;
+  color: #fff;
+  background: #4d8bdc;
+  border-radius: 4px;
+  border: 1px solid #EBEEF5;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  transition: all .2s;
+  flex: 1;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  padding: 0 20px;
+  box-sizing: border-box;
+
+  & + & {
+    background: darkorange;
+    margin-top: 20px;
+  }
+  &:hover {
+    transform: scale(1.05,1.05);
+  }
+}
+::v-deep .el-dialog__body {
+  padding: 8px 20px;
+}
+
+::v-deep .el-col-5 {
+  width: 20%;
+}
+
+::v-deep .el-card__body {
+  padding: 4px 10px !important;
+}
+
+.progress-card {
+  display: flex;
+
+  &-item {
+    text-align: center;
+    flex: 1;
+
+    &__label {
+      font-size: 14px;
+    }
+
+    &__num {
+      font-size: 20px;
+      font-weight: 600;
+
+      padding: 6px 0;
+    }
+  }
+}
+</style>
+<style lang="scss" scoped>
+.ivu-btn {
+  margin-right: 10px;
+}
+
+.table-tree {
+  margin-top: 10px;
+}
+
+.v-text {
+  padding: 8px 0;
+  border-bottom: 1px solid #eee;
+  margin-bottom: 20px;
+
+  .title {
+    color: #338de3;
+  }
+}
+
+.dataGroup {
+  padding: 10px 0;
+}
+
+.grid-content {
+  border-radius: 5px;
+  text-align: center;
+  background: #ffffff;
+  padding: 15px 0;
+
+  p {
+    line-height: 1.8;
+  }
+
+  p:first-child {
+    font-weight: 700;
+    font-size: 16px;
+  }
+}
+
+.bg-org {
+  border: 2px solid #ef6c24;
+  color: #ef6c24;
+}
+
+.bg-blue {
+  border: 2px solid #0800ff;
+  color: #0800ff;
+}
+
+.bg-green {
+  border: 2px solid #0f9700;
+  color: #0f9700;
+}
+
+.bg-black {
+  border: 2px solid #333;
+  color: #333;
+}
+
+.bg-pink {
+  border: 2px solid #ff0000;
+  color: #ff0000;
+}
+</style>
diff --git a/src/views/system/workerComponents/department.txt b/src/views/system/workerComponents/department.txt
new file mode 100644
index 0000000..5a24844
--- /dev/null
+++ b/src/views/system/workerComponents/department.txt
@@ -0,0 +1,274 @@
+<template>
+  <el-card class="box-card" shadow="hover" id="department-card">
+    <div slot="header" class="clearfix">
+      <SvgIcon style="color: #3171f4;width: 22px;height: 22px;" icon-class="form"></SvgIcon>
+      <span style=" padding-left: 15px"
+        >科室执行情况</span
+      >
+      <i class="el-icon-more" style="margin-left: auto; font-size: 20px"></i>
+    </div>
+
+    <div style="position: relative;height: 100%;width: 100%;">
+      <div id="department-chart"></div>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import { moneyFormatter } from "@/utils";
+import ElementResize from 'element-resize-detector'
+import SvgIcon from "@/components/SvgIcon/index.vue";
+
+export default {
+  components: {
+    SvgIcon
+  },
+  name: "card3",
+  layout: {
+    x: 0,
+    y: 5,
+    w: 6,
+    h: 4,
+    i: "3",
+    name: "科室执行情况",
+  },
+  inject: {
+    getStatistic: {
+      default: () => {
+        return () => {
+          return {
+            statistic: {
+              departmentList: [
+                {
+                  money_total_1: "1900000.00",
+                  money_total_2: "0.00",
+                  ids: "11",
+                  plan_department_id: 2,
+                  use_money_total: 0,
+                  money_total: "0.00",
+                  end_money: 0,
+                  plan_department: {
+                    id: 2,
+                    pid: 0,
+                    name: "办公室（党建作风办）",
+                    manager_id: 7,
+                    leader_id: 4,
+                    sortnumber: 1,
+                    created_at: "2021-06-22 07:01:41",
+                    updated_at: "2023-03-22 14:56:51",
+                    deleted_at: null,
+                  },
+                },
+              ],
+            },
+          };
+        }
+      },
+    },
+  },
+  data() {
+    return {
+      chart: "",
+      tableHeight: 200,
+      table: [
+        {
+          title: "科室",
+          width: 100,
+          key: "plan_department.name",
+          fixed: "left",
+          render:(h,{row}) => {
+            return h('span',{},row.plan_department?.name)
+          }
+        },
+        {
+          title: "执行情况",
+          minWidth: 160,
+          fixed: "right",
+          render: (h, { row }) => {
+            let m2 = row?.money_total_2 ? Number(row?.money_total_2) : 0;
+            let m1 = row?.money_total_1 ? Number(row?.money_total_1) : 0;
+            let m3 = row?.use_money_total ? Number(row?.use_money_total) : 0;
+            let per = 0;
+
+            if (m2 != 0) {
+              per = ((m3 / m2) * 100).toFixed(2);
+            } else if (m1 != 0) {
+              per = ((m3 / m1) * 100).toFixed(2);
+            }
+            return h("el-progress", {
+              props: {
+                percentage: Number(per),
+              },
+            });
+          },
+        },
+        {
+          title: "年初预算合计金额(元)",
+          width: 170,
+          align: "right",
+          key: "money_total_1",
+          render: (h, { row }) => {
+            return h("span", {}, moneyFormatter(row.money_total_1));
+          },
+        },
+        {
+          title: "调整后预算合计金额(元)",
+          width: 170,
+          align: "right",
+          key: "money_total_2",
+          render: (h, { row }) => {
+            return h("span", {}, moneyFormatter(row.money_total_2));
+          },
+        },
+        {
+          title: "已使用(元)",
+          width: 120,
+          align: "right",
+          key: "use_money_total",
+          render: (h, { row }) => {
+            return h("span", {}, moneyFormatter(row.use_money_total));
+          },
+        },
+      ],
+    };
+  },
+  methods: {
+    setOptions() {
+      this.chart.setOption({
+        grid: {
+          left: "15%"
+        },
+        tooltip: {
+          show: true
+        },
+        legend: {
+          show: true
+        },
+        xAxis: {
+          data: this.departmentList.map((item) => item.department.name),
+        },
+        yAxis: {
+          axisLabel: {
+            color: '#999'
+          }
+        },
+        series: [
+          {
+            barWidth: 30,
+            type: 'bar',
+            stack: "a",
+            name: "合计金额（元）",
+            itemStyle: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 1, color: '#83bff6' },
+                { offset: 0.5, color: '#188df0' },
+                { offset: 0, color: '#188df0' }
+              ]),
+            },
+            emphasis: {
+              itemStyle: {
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  { offset: 1, color: '#4f86f5' },
+                  { offset: 0.3, color: '#3f79f1' },
+                  { offset: 0, color: '#3171f4' }
+                ])
+              }
+            },
+            data: this.departmentList.map(item => (parseFloat(item.money_total_2) ? parseFloat(item.money_total_2) : parseFloat(item.money_total_1) - parseFloat(item.use_money_total))),
+          },
+          {
+            barWidth: 30,
+            type: "bar",
+            stack: "a",
+            name: "已使用金额（元）",
+            label: {
+              show: true,
+              color: "#188df0",
+              position: "top",
+              formatter: (params) => {
+                console.log(params)
+                let m2 = this.departmentList[params.dataIndex]?.money_total_2 ? Number(this.departmentList[params.dataIndex]?.money_total_2) : 0;
+                let m1 = this.departmentList[params.dataIndex]?.money_total_1 ? Number(this.departmentList[params.dataIndex]?.money_total_1) : 0;
+                let m3 = this.departmentList[params.dataIndex]?.use_money_total ? Number(this.departmentList[params.dataIndex]?.use_money_total) : 0;
+                let per = 0;
+
+                if (m2 != 0) {
+                  per = ((m3 / m2) * 100).toFixed(2);
+                } else if (m1 != 0) {
+                  per = ((m3 / m1) * 100).toFixed(2);
+                }
+                return Number(per) + "%";
+              },
+            },
+            itemStyle: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: '#b4cef3' },
+                { offset: 0.5, color: '#aecbf5' },
+                { offset: 1, color: '#9fc4f9' }
+              ]),
+              borderRadius: [20, 20, 0, 0]
+            },
+            data: this.departmentList.map(item => parseFloat(item.use_money_total))
+          }
+        ]
+      })
+    },
+    init() {
+      this.chart = echarts.init(document.getElementById("department-chart"));
+      this.setOptions();
+      let cardDom = document.getElementById('department-card');
+      let cardTitleH = 58;
+      const elementResize = ElementResize({
+        strategy:'scroll'
+      })
+      elementResize.listenTo(cardDom,ele => {
+        //this.setOptions()
+        this.chart.resize();
+       // this.tableHeight = cardDom.getBoundingClientRect().height - 40 - cardTitleH
+      })
+    }
+  },
+  computed: {
+    departmentList() {
+      if (this.getStatistic)
+        return this.getStatistic()?.statistic?.departmentList || [];
+    },
+  },
+  watch: {
+    departmentList: {
+      handler: function (newVal) {
+        this.setOptions()
+      },
+      immediate: false
+    }
+  },
+  created() {},
+  mounted() {
+    this.init();
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.clearfix {
+  display: flex;
+  align-items: center;
+}
+::v-deep .el-progress--line {
+  display: flex;
+  align-items: center;
+}
+::v-deep .el-progress__text {
+  word-break: keep-all;
+}
+::v-deep .el-card__body {
+  width: 100%;
+  height: calc(100% - 58px);
+}
+#department-chart {
+  width: 100%;
+  height: 100%;
+  min-height: 200px;
+}
+</style>
diff --git a/src/views/system/workerComponents/department.vue b/src/views/system/workerComponents/department.vue
index 5a24844..7900c74 100644
--- a/src/views/system/workerComponents/department.vue
+++ b/src/views/system/workerComponents/department.vue
@@ -86,9 +86,9 @@ export default {
           minWidth: 160,
           fixed: "right",
           render: (h, { row }) => {
-            let m2 = row?.money_total_2 ? Number(row?.money_total_2) : 0;
-            let m1 = row?.money_total_1 ? Number(row?.money_total_1) : 0;
-            let m3 = row?.use_money_total ? Number(row?.use_money_total) : 0;
+            let m2 = row?.money_total_2 || 0;
+            let m1 = row?.money_total_1 || 0;
+            let m3 = row?.use_money_total || 0;
             let per = 0;
 
             if (m2 != 0) {
@@ -146,7 +146,7 @@ export default {
           show: true
         },
         xAxis: {
-          data: this.departmentList.map((item) => item.department.name),
+          data: this.departmentList.map((item) => item.plan_department.name),
         },
         yAxis: {
           axisLabel: {
@@ -188,9 +188,9 @@ export default {
               position: "top",
               formatter: (params) => {
                 console.log(params)
-                let m2 = this.departmentList[params.dataIndex]?.money_total_2 ? Number(this.departmentList[params.dataIndex]?.money_total_2) : 0;
-                let m1 = this.departmentList[params.dataIndex]?.money_total_1 ? Number(this.departmentList[params.dataIndex]?.money_total_1) : 0;
-                let m3 = this.departmentList[params.dataIndex]?.use_money_total ? Number(this.departmentList[params.dataIndex]?.use_money_total) : 0;
+                let m2 = this.departmentList[params.dataIndex]?.money_total_2 || 0;
+                let m1 = this.departmentList[params.dataIndex]?.money_total_1 || 0;
+                let m3 = this.departmentList[params.dataIndex]?.use_money_total || 0;
                 let per = 0;
 
                 if (m2 != 0) {
diff --git a/src/views/system/workerComponents/department1.txt b/src/views/system/workerComponents/department1.txt
new file mode 100644
index 0000000..7900c74
--- /dev/null
+++ b/src/views/system/workerComponents/department1.txt
@@ -0,0 +1,274 @@
+<template>
+  <el-card class="box-card" shadow="hover" id="department-card">
+    <div slot="header" class="clearfix">
+      <SvgIcon style="color: #3171f4;width: 22px;height: 22px;" icon-class="form"></SvgIcon>
+      <span style=" padding-left: 15px"
+        >科室执行情况</span
+      >
+      <i class="el-icon-more" style="margin-left: auto; font-size: 20px"></i>
+    </div>
+
+    <div style="position: relative;height: 100%;width: 100%;">
+      <div id="department-chart"></div>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import { moneyFormatter } from "@/utils";
+import ElementResize from 'element-resize-detector'
+import SvgIcon from "@/components/SvgIcon/index.vue";
+
+export default {
+  components: {
+    SvgIcon
+  },
+  name: "card3",
+  layout: {
+    x: 0,
+    y: 5,
+    w: 6,
+    h: 4,
+    i: "3",
+    name: "科室执行情况",
+  },
+  inject: {
+    getStatistic: {
+      default: () => {
+        return () => {
+          return {
+            statistic: {
+              departmentList: [
+                {
+                  money_total_1: "1900000.00",
+                  money_total_2: "0.00",
+                  ids: "11",
+                  plan_department_id: 2,
+                  use_money_total: 0,
+                  money_total: "0.00",
+                  end_money: 0,
+                  plan_department: {
+                    id: 2,
+                    pid: 0,
+                    name: "办公室（党建作风办）",
+                    manager_id: 7,
+                    leader_id: 4,
+                    sortnumber: 1,
+                    created_at: "2021-06-22 07:01:41",
+                    updated_at: "2023-03-22 14:56:51",
+                    deleted_at: null,
+                  },
+                },
+              ],
+            },
+          };
+        }
+      },
+    },
+  },
+  data() {
+    return {
+      chart: "",
+      tableHeight: 200,
+      table: [
+        {
+          title: "科室",
+          width: 100,
+          key: "plan_department.name",
+          fixed: "left",
+          render:(h,{row}) => {
+            return h('span',{},row.plan_department?.name)
+          }
+        },
+        {
+          title: "执行情况",
+          minWidth: 160,
+          fixed: "right",
+          render: (h, { row }) => {
+            let m2 = row?.money_total_2 || 0;
+            let m1 = row?.money_total_1 || 0;
+            let m3 = row?.use_money_total || 0;
+            let per = 0;
+
+            if (m2 != 0) {
+              per = ((m3 / m2) * 100).toFixed(2);
+            } else if (m1 != 0) {
+              per = ((m3 / m1) * 100).toFixed(2);
+            }
+            return h("el-progress", {
+              props: {
+                percentage: Number(per),
+              },
+            });
+          },
+        },
+        {
+          title: "年初预算合计金额(元)",
+          width: 170,
+          align: "right",
+          key: "money_total_1",
+          render: (h, { row }) => {
+            return h("span", {}, moneyFormatter(row.money_total_1));
+          },
+        },
+        {
+          title: "调整后预算合计金额(元)",
+          width: 170,
+          align: "right",
+          key: "money_total_2",
+          render: (h, { row }) => {
+            return h("span", {}, moneyFormatter(row.money_total_2));
+          },
+        },
+        {
+          title: "已使用(元)",
+          width: 120,
+          align: "right",
+          key: "use_money_total",
+          render: (h, { row }) => {
+            return h("span", {}, moneyFormatter(row.use_money_total));
+          },
+        },
+      ],
+    };
+  },
+  methods: {
+    setOptions() {
+      this.chart.setOption({
+        grid: {
+          left: "15%"
+        },
+        tooltip: {
+          show: true
+        },
+        legend: {
+          show: true
+        },
+        xAxis: {
+          data: this.departmentList.map((item) => item.plan_department.name),
+        },
+        yAxis: {
+          axisLabel: {
+            color: '#999'
+          }
+        },
+        series: [
+          {
+            barWidth: 30,
+            type: 'bar',
+            stack: "a",
+            name: "合计金额（元）",
+            itemStyle: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 1, color: '#83bff6' },
+                { offset: 0.5, color: '#188df0' },
+                { offset: 0, color: '#188df0' }
+              ]),
+            },
+            emphasis: {
+              itemStyle: {
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  { offset: 1, color: '#4f86f5' },
+                  { offset: 0.3, color: '#3f79f1' },
+                  { offset: 0, color: '#3171f4' }
+                ])
+              }
+            },
+            data: this.departmentList.map(item => (parseFloat(item.money_total_2) ? parseFloat(item.money_total_2) : parseFloat(item.money_total_1) - parseFloat(item.use_money_total))),
+          },
+          {
+            barWidth: 30,
+            type: "bar",
+            stack: "a",
+            name: "已使用金额（元）",
+            label: {
+              show: true,
+              color: "#188df0",
+              position: "top",
+              formatter: (params) => {
+                console.log(params)
+                let m2 = this.departmentList[params.dataIndex]?.money_total_2 || 0;
+                let m1 = this.departmentList[params.dataIndex]?.money_total_1 || 0;
+                let m3 = this.departmentList[params.dataIndex]?.use_money_total || 0;
+                let per = 0;
+
+                if (m2 != 0) {
+                  per = ((m3 / m2) * 100).toFixed(2);
+                } else if (m1 != 0) {
+                  per = ((m3 / m1) * 100).toFixed(2);
+                }
+                return Number(per) + "%";
+              },
+            },
+            itemStyle: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: '#b4cef3' },
+                { offset: 0.5, color: '#aecbf5' },
+                { offset: 1, color: '#9fc4f9' }
+              ]),
+              borderRadius: [20, 20, 0, 0]
+            },
+            data: this.departmentList.map(item => parseFloat(item.use_money_total))
+          }
+        ]
+      })
+    },
+    init() {
+      this.chart = echarts.init(document.getElementById("department-chart"));
+      this.setOptions();
+      let cardDom = document.getElementById('department-card');
+      let cardTitleH = 58;
+      const elementResize = ElementResize({
+        strategy:'scroll'
+      })
+      elementResize.listenTo(cardDom,ele => {
+        //this.setOptions()
+        this.chart.resize();
+       // this.tableHeight = cardDom.getBoundingClientRect().height - 40 - cardTitleH
+      })
+    }
+  },
+  computed: {
+    departmentList() {
+      if (this.getStatistic)
+        return this.getStatistic()?.statistic?.departmentList || [];
+    },
+  },
+  watch: {
+    departmentList: {
+      handler: function (newVal) {
+        this.setOptions()
+      },
+      immediate: false
+    }
+  },
+  created() {},
+  mounted() {
+    this.init();
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.clearfix {
+  display: flex;
+  align-items: center;
+}
+::v-deep .el-progress--line {
+  display: flex;
+  align-items: center;
+}
+::v-deep .el-progress__text {
+  word-break: keep-all;
+}
+::v-deep .el-card__body {
+  width: 100%;
+  height: calc(100% - 58px);
+}
+#department-chart {
+  width: 100%;
+  height: 100%;
+  min-height: 200px;
+}
+</style>
diff --git a/src/views/system/workerComponents/signStatic.txt b/src/views/system/workerComponents/signStatic.txt
new file mode 100644
index 0000000..cfae794
--- /dev/null
+++ b/src/views/system/workerComponents/signStatic.txt
@@ -0,0 +1,329 @@
+<template>
+  <el-card class="box-card" shadow="hover">
+    <div slot="header" class="clearfix">
+      <SvgIcon style="color: #3171f4;width: 22px;height: 22px;" icon-class="wengao"></SvgIcon>
+      <span style="padding-left: 15px"
+      >项目支出</span
+      >
+      <i class="el-icon-more" style="margin-left: auto; font-size: 20px"></i>
+    </div>
+
+    <div class="progress-card">
+      <div class="progress-card-item">
+        <div class="worker-progress__icon icon-yuan">
+          <SvgIcon icon-class="yuan"></SvgIcon>
+        </div>
+        <div class="progress-card-item__num">{{ moneyFormatter(statistic.progress.money_total_1 || 0) }}</div>
+        <div class="progress-card-item__label">年初预算合计金额</div>
+      </div>
+      <div class="progress-card-item">
+        <div class="worker-progress__icon icon-zhangdan">
+          <SvgIcon icon-class="zhangdan"></SvgIcon>
+        </div>
+        <div class="progress-card-item__num">{{ moneyFormatter(statistic.progress.money_total_2 || 0) }}</div>
+        <div class="progress-card-item__label">调整后预算合计金额</div>
+      </div>
+      <div class="progress-card-item">
+        <div class="worker-progress__icon icon-zhifu">
+          <SvgIcon icon-class="zhifu"></SvgIcon>
+        </div>
+        <div class="progress-card-item__num">{{moneyFormatter(statistic.progress.use_money_total || 0)}}</div>
+        <div class="progress-card-item__label">已支付金额</div>
+      </div>
+      <div class="progress-card-item">
+        <MyProgress width="145px" height="145px" title="执行率" :chart-data="[{value:statistic.progress.money_total_2 ? statistic.progress.money_total_2 : statistic.progress.money_total_1,name:'合计金额'},{value:statistic.progress.use_money_total,name:'已用金额'}]" ></MyProgress>
+      </div>
+    </div>
+
+    <Table style="margin-top: 20px;" :data="departments" size="small" :columns="table" :max-height="280"></Table>
+  </el-card>
+</template>
+
+<script>
+import ElementResize from "element-resize-detector";
+import {deepCopy, moneyFormatter} from "@/utils";
+import echarts from 'echarts'
+import SvgIcon from "@/components/SvgIcon/index.vue";
+import MyProgress from "@/components/Progress/index.vue";
+import {statistic} from "@/api/system/temporaryPlan";
+
+export default {
+  components: {
+    MyProgress,
+    SvgIcon
+  },
+  name: "card8",
+  layout: {
+    x: 0,
+    y: 5,
+    w: 6,
+    h: 4,
+    i: "9",
+    name: "项目支出",
+  },
+  inject: {
+    getStatistic: {
+      default: () => {
+        return () => {
+          return {
+            statistic: {
+              departmentList: [
+                {
+                  money_total_1: "1900000.00",
+                  money_total_2: "0.00",
+                  ids: "11",
+                  plan_department_id: 2,
+                  use_money_total: 0,
+                  money_total: "0.00",
+                  end_money: 0,
+                  plan_department: {
+                    id: 2,
+                    pid: 0,
+                    name: "办公室（党建作风办）",
+                    manager_id: 7,
+                    leader_id: 4,
+                    sortnumber: 1,
+                    created_at: "2021-06-22 07:01:41",
+                    updated_at: "2023-03-22 14:56:51",
+                    deleted_at: null,
+                  },
+                },
+              ],
+            },
+          };
+        }
+      },
+    },
+  },
+  data() {
+    return {
+      tableHeight: 200,
+      statistic: {
+        progress: {
+          money_total_1: 0,
+          money_total_2: 0,
+          use_money_total: 0
+        }
+      },
+      list: [],
+      table: [
+        {
+          title: "序号",
+          type: "index",
+          width: 60,
+          fixed: "left",
+          align: "center",
+        },
+        {
+          title: "部门",
+          key: "plan_department.name",
+          minWidth: 180,
+          align: "center",
+          fixed: "left",
+          render: (h, params) => {
+            return h("p",{ style: { "text-align": "left" } }, params.row.plan_department.name);
+          }
+        },
+        {
+          title: "年初预算数（元）",
+          key: "money_total_1",
+          align: "center",
+          width: 160,
+          render: (h, params) => {
+            return h("p",{ style: { "text-align": "right" } }, moneyFormatter(params.row.money_total_1));
+          }
+        },
+        {
+          title: "调整后预算数（元）",
+          key: "money_total_2",
+          align: "center",
+          width: 160,
+          render: (h, params) => {
+            return h("p",{ style: { "text-align": "right" } }, moneyFormatter(params.row.money_total_2));
+          }
+        },
+        {
+          title: "已使用（元）",
+          key: "money_total",
+          align: "center",
+          width: 140,
+          render: (h, params) => {
+            return h("p",{ style: { "text-align": "right" } }, moneyFormatter(params.row.money_total));
+          }
+        },
+        {
+          title: "进展情况",
+          key: "rate",
+          align: "center",
+          width: 160,
+          render: (h, row) => {
+            let m2 = row?.money_total_2 || 0;
+            let m1 = row?.money_total_1 || 0;
+            let m3 = row?.use_money_total || 0;
+            let per = 0;
+
+            if (m2 != 0) {
+              per = ((m3 / m2) * 100).toFixed(2);
+            } else if (m1 != 0) {
+              per = ((m3 / m1) * 100).toFixed(2);
+            }
+            return h("el-progress", {
+              props: {
+                percentage: Number(per),
+              },
+            });
+          }
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          minWidth: 100,
+          render: (h, params) => {
+            return h("Button", {
+              props: {
+                size: "small"
+              }
+            } , "查看")
+          }
+        }
+      ]
+    };
+  },
+  methods: {
+    moneyFormatter,
+    init() {
+      let cardDom = this.$el;
+      let cardTitleH = 58;
+      const elementResize = ElementResize({
+        strategy:'scroll'
+      })
+      elementResize.listenTo(cardDom,ele => {
+        this.tableHeight = cardDom.getBoundingClientRect().height - 40 - cardTitleH
+      })
+    },
+    async getStatistics() {
+      if(/^\/system/.test(this.$route.path)) return
+
+      const res = await statistic(this.select,true)
+      function handleDataStructure(data) {
+        let cData = deepCopy(data)
+        cData.progress.money_total_1 = isNaN(Number(cData.progress.plan_money)) ? 0 : Number(cData.progress.plan_money)
+        cData.progress.money_total_2 = isNaN(Number(cData.progress.plan_money)) ? 0 : Number(cData.progress.plan_money)
+        cData.progress.use_money_total = isNaN(Number(cData.progress.use_money)) ? 0 : Number(cData.progress.use_money)
+
+        cData.departmentList = cData.statistic.departmentList.map(i => ({
+          ...i,
+          money_total_1: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
+          money_total_2: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
+          use_money_total: isNaN(Number(i.use_money)) ? 0 : Number(i.use_money)
+        }))
+        cData.typeList = cData.statistic.typeList.map(i => ({
+          ...i,
+          money_total_1: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
+          money_total_2: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
+          use_money_total: isNaN(Number(i.use_money)) ? 0 : Number(i.use_money)
+        }))
+        return cData
+      }
+      this.statistic = handleDataStructure(res)
+      this.$emit('send-data',res)
+    },
+  },
+  computed: {
+    departments () {
+      return this.getStatistics()?.statistic?.departmentList
+    }
+  },
+  created() {
+    this.getStatistic();
+  },
+  mounted() {
+    this.init();
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.clearfix {
+  display: flex;
+  align-items: center;
+}
+::v-deep .el-card__body {
+  width: 100%;
+  height: calc(100% - 58px);
+}
+::v-deep .ivu-table th,::v-deep .ivu-table td {
+  border-bottom-style: dashed;
+}
+.progress-card {
+  display: grid;
+  grid-template-columns: repeat(4, 1fr);
+  grid-gap: 20px;
+
+  &-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    text-align: center;
+
+    &__label {
+      font-size: 15px;
+      color: #000000;
+      padding-top: 20px;
+    }
+
+    &__num {
+      font-size: 20px;
+      line-height: 7px;
+      color: #000000;
+      font-weight: bold;
+      padding-top: 18px;
+    }
+
+    .worker-progress__icon {
+      border-radius: 20px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 72px;
+      height: 72px;
+
+      svg {
+        border-radius: 100%;
+        width: 40px;
+        height: 40px;
+
+      }
+    }
+    .icon-yuan {
+      background: #56b7f9;
+      color: #fff;
+      filter: drop-shadow(0px 6px 6px rgba(43,188,255,0.5));
+      svg {
+        color: #56b7f9;
+        background: #fff;
+      }
+    }
+    .icon-zhangdan {
+      background: #446df6;
+      filter: drop-shadow(0px 6px 6px rgba(54,117,255,0.5));
+      svg {
+        color: #fff;
+        width: 36px;
+      }
+    }
+    .icon-zhifu {
+      background: #f2a93f;
+      filter: drop-shadow(0px 6px 6px rgba(255,164,45,0.5));
+      svg {
+        color: #fff;
+        width: 36px;
+      }
+    }
+  }
+}
+::v-deep .el-progress--circle .el-progress__text {
+  white-space: break-spaces;
+}
+</style>
diff --git a/src/views/system/workerComponents/signStatic.vue b/src/views/system/workerComponents/signStatic.vue
index cfae794..5690ee1 100644
--- a/src/views/system/workerComponents/signStatic.vue
+++ b/src/views/system/workerComponents/signStatic.vue
@@ -41,11 +41,11 @@
 
 <script>
 import ElementResize from "element-resize-detector";
-import {deepCopy, moneyFormatter} from "@/utils";
+import { moneyFormatter } from "@/utils";
 import echarts from 'echarts'
 import SvgIcon from "@/components/SvgIcon/index.vue";
 import MyProgress from "@/components/Progress/index.vue";
-import {statistic} from "@/api/system/temporaryPlan";
+import {statistic} from "@/api/dashboard/notice";
 
 export default {
   components: {
@@ -206,27 +206,7 @@ export default {
       if(/^\/system/.test(this.$route.path)) return
 
       const res = await statistic(this.select,true)
-      function handleDataStructure(data) {
-        let cData = deepCopy(data)
-        cData.progress.money_total_1 = isNaN(Number(cData.progress.plan_money)) ? 0 : Number(cData.progress.plan_money)
-        cData.progress.money_total_2 = isNaN(Number(cData.progress.plan_money)) ? 0 : Number(cData.progress.plan_money)
-        cData.progress.use_money_total = isNaN(Number(cData.progress.use_money)) ? 0 : Number(cData.progress.use_money)
-
-        cData.departmentList = cData.statistic.departmentList.map(i => ({
-          ...i,
-          money_total_1: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
-          money_total_2: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
-          use_money_total: isNaN(Number(i.use_money)) ? 0 : Number(i.use_money)
-        }))
-        cData.typeList = cData.statistic.typeList.map(i => ({
-          ...i,
-          money_total_1: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
-          money_total_2: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
-          use_money_total: isNaN(Number(i.use_money)) ? 0 : Number(i.use_money)
-        }))
-        return cData
-      }
-      this.statistic = handleDataStructure(res)
+      this.statistic = res
       this.$emit('send-data',res)
     },
   },
diff --git a/src/views/system/workerComponents/signStatic1.txt b/src/views/system/workerComponents/signStatic1.txt
new file mode 100644
index 0000000..b446959
--- /dev/null
+++ b/src/views/system/workerComponents/signStatic1.txt
@@ -0,0 +1,618 @@
+<template>
+  <el-card class="box-card" shadow="hover">
+    <div slot="header" class="clearfix">
+      <SvgIcon style="color: #3171f4;width: 22px;height: 22px;" icon-class="wengao"></SvgIcon>
+      <span style="padding-left: 15px"
+      >项目支出</span
+      >
+      <i class="el-icon-more" style="margin-left: auto; font-size: 20px"></i>
+    </div>
+
+    <div class="progress-card">
+      <div class="progress-card-item">
+        <div class="worker-progress__icon icon-yuan">
+          <SvgIcon icon-class="yuan"></SvgIcon>
+        </div>
+        <div class="progress-card-item__num">{{ moneyFormatter(statistic.progress.money_total_1 || 0) }}</div>
+        <div class="progress-card-item__label">年初预算合计金额</div>
+      </div>
+      <div class="pro<template>
+  <el-card class="box-card" shadow="hover">
+      <div slot="header" class="clearfix">
+        <SvgIcon style="color: #3171f4;width: 22px;height: 22px;" icon-class="wengao"></SvgIcon>
+        <span style="padding-left: 15px"
+        >项目支出</span
+        >
+        <i class="el-icon-more" style="margin-left: auto; font-size: 20px"></i>
+      </div>
+
+      <div class="progress-card">
+        <div class="progress-card-item">
+          <div class="worker-progress__icon icon-yuan">
+            <SvgIcon icon-class="yuan"></SvgIcon>
+          </div>
+          <div class="progress-card-item__num">{{ moneyFormatter(statistic.progress.money_total_1 || 0) }}</div>
+          <div class="progress-card-item__label">年初预算合计金额</div>
+        </div>
+        <div class="progress-card-item">
+          <div class="worker-progress__icon icon-zhangdan">
+            <SvgIcon icon-class="zhangdan"></SvgIcon>
+          </div>
+          <div class="progress-card-item__num">{{ moneyFormatter(statistic.progress.money_total_2 || 0) }}</div>
+          <div class="progress-card-item__label">调整后预算合计金额</div>
+        </div>
+        <div class="progress-card-item">
+          <div class="worker-progress__icon icon-zhifu">
+            <SvgIcon icon-class="zhifu"></SvgIcon>
+          </div>
+          <div class="progress-card-item__num">{{moneyFormatter(statistic.progress.use_money_total || 0)}}</div>
+          <div class="progress-card-item__label">已支付金额</div>
+        </div>
+        <div class="progress-card-item">
+          <MyProgress width="145px" height="145px" title="执行率" :chart-data="[{value:statistic.progress.money_total_2 ? statistic.progress.money_total_2 : statistic.progress.money_total_1,name:'合计金额'},{value:statistic.progress.use_money_total,name:'已用金额'}]" ></MyProgress>
+        </div>
+      </div>
+
+      <Table style="margin-top: 20px;" :data="departments" size="small" :columns="table" :max-height="280"></Table>
+  </el-card>
+</template>
+
+<script>
+import ElementResize from "element-resize-detector";
+import { moneyFormatter } from "@/utils";
+import echarts from 'echarts'
+import SvgIcon from "@/components/SvgIcon/index.vue";
+import MyProgress from "@/components/Progress/index.vue";
+import {statistic} from "@/api/dashboard/notice";
+
+export default {
+  components: {
+    MyProgress,
+    SvgIcon
+  },
+  name: "card8",
+  layout: {
+    x: 0,
+    y: 5,
+    w: 6,
+    h: 4,
+    i: "9",
+    name: "项目支出",
+  },
+  inject: {
+    getStatistic: {
+      default: () => {
+        return () => {
+          return {
+            statistic: {
+              departmentList: [
+                {
+                  money_total_1: "1900000.00",
+                  money_total_2: "0.00",
+                  ids: "11",
+                  plan_department_id: 2,
+                  use_money_total: 0,
+                  money_total: "0.00",
+                  end_money: 0,
+                  plan_department: {
+                    id: 2,
+                    pid: 0,
+                    name: "办公室（党建作风办）",
+                    manager_id: 7,
+                    leader_id: 4,
+                    sortnumber: 1,
+                    created_at: "2021-06-22 07:01:41",
+                    updated_at: "2023-03-22 14:56:51",
+                    deleted_at: null,
+                  },
+                },
+              ],
+            },
+          };
+        }
+      },
+    },
+  },
+  data() {
+    return {
+      tableHeight: 200,
+      statistic: {
+        progress: {
+          money_total_1: 0,
+          money_total_2: 0,
+          use_money_total: 0
+        }
+      },
+      list: [],
+      table: [
+        {
+          title: "序号",
+          type: "index",
+          width: 60,
+          fixed: "left",
+          align: "center",
+        },
+        {
+          title: "部门",
+          key: "plan_department.name",
+          minWidth: 180,
+          align: "center",
+          fixed: "left",
+          render: (h, params) => {
+            return h("p",{ style: { "text-align": "left" } }, params.row.plan_department.name);
+          }
+        },
+        {
+          title: "年初预算数（元）",
+          key: "money_total_1",
+          align: "center",
+          width: 160,
+          render: (h, params) => {
+            return h("p",{ style: { "text-align": "right" } }, moneyFormatter(params.row.money_total_1));
+          }
+        },
+        {
+          title: "调整后预算数（元）",
+          key: "money_total_2",
+          align: "center",
+          width: 160,
+          render: (h, params) => {
+            return h("p",{ style: { "text-align": "right" } }, moneyFormatter(params.row.money_total_2));
+          }
+        },
+        {
+          title: "已使用（元）",
+          key: "money_total",
+          align: "center",
+          width: 140,
+          render: (h, params) => {
+            return h("p",{ style: { "text-align": "right" } }, moneyFormatter(params.row.money_total));
+          }
+        },
+        {
+          title: "进展情况",
+          key: "rate",
+          align: "center",
+          width: 160,
+          render: (h, row) => {
+            let m2 = row?.money_total_2 || 0;
+            let m1 = row?.money_total_1 || 0;
+            let m3 = row?.use_money_total || 0;
+            let per = 0;
+
+            if (m2 != 0) {
+              per = ((m3 / m2) * 100).toFixed(2);
+            } else if (m1 != 0) {
+              per = ((m3 / m1) * 100).toFixed(2);
+            }
+            return h("el-progress", {
+              props: {
+                percentage: Number(per),
+              },
+            });
+          }
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          minWidth: 100,
+          render: (h, params) => {
+            return h("Button", {
+              props: {
+                size: "small"
+              }
+            } , "查看")
+          }
+        }
+      ]
+    };
+  },
+  methods: {
+    moneyFormatter,
+    init() {
+      let cardDom = this.$el;
+      let cardTitleH = 58;
+      const elementResize = ElementResize({
+        strategy:'scroll'
+      })
+      elementResize.listenTo(cardDom,ele => {
+        this.tableHeight = cardDom.getBoundingClientRect().height - 40 - cardTitleH
+      })
+    },
+    async getStatistics() {
+      if(/^\/system/.test(this.$route.path)) return
+
+      const res = await statistic(this.select,true)
+      this.statistic = res
+      this.$emit('send-data',res)
+    },
+  },
+  computed: {
+    departments () {
+      return this.getStatistics()?.statistic?.departmentList
+    }
+  },
+  created() {
+    this.getStatistic();
+  },
+  mounted() {
+    this.init();
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.clearfix {
+  display: flex;
+  align-items: center;
+}
+::v-deep .el-card__body {
+  width: 100%;
+  height: calc(100% - 58px);
+}
+::v-deep .ivu-table th,::v-deep .ivu-table td {
+  border-bottom-style: dashed;
+}
+.progress-card {
+  display: grid;
+  grid-template-columns: repeat(4, 1fr);
+  grid-gap: 20px;
+
+  &-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    text-align: center;
+
+    &__label {
+      font-size: 15px;
+      color: #000000;
+      padding-top: 20px;
+    }
+
+    &__num {
+      font-size: 20px;
+      line-height: 7px;
+      color: #000000;
+      font-weight: bold;
+      padding-top: 18px;
+    }
+
+    .worker-progress__icon {
+      border-radius: 20px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 72px;
+      height: 72px;
+
+      svg {
+        border-radius: 100%;
+        width: 40px;
+        height: 40px;
+
+      }
+    }
+    .icon-yuan {
+      background: #56b7f9;
+      color: #fff;
+      filter: drop-shadow(0px 6px 6px rgba(43,188,255,0.5));
+      svg {
+        color: #56b7f9;
+        background: #fff;
+      }
+    }
+    .icon-zhangdan {
+      background: #446df6;
+      filter: drop-shadow(0px 6px 6px rgba(54,117,255,0.5));
+      svg {
+        color: #fff;
+        width: 36px;
+      }
+    }
+    .icon-zhifu {
+      background: #f2a93f;
+      filter: drop-shadow(0px 6px 6px rgba(255,164,45,0.5));
+      svg {
+        color: #fff;
+        width: 36px;
+      }
+    }
+  }
+}
+::v-deep .el-progress--circle .el-progress__text {
+  white-space: break-spaces;
+}
+</style>
+gress-card-item">
+        <div class="worker-progress__icon icon-zhangdan">
+          <SvgIcon icon-class="zhangdan"></SvgIcon>
+        </div>
+        <div class="progress-card-item__num">{{ moneyFormatter(statistic.progress.money_total_2 || 0) }}</div>
+        <div class="progress-card-item__label">调整后预算合计金额</div>
+      </div>
+      <div class="progress-card-item">
+        <div class="worker-progress__icon icon-zhifu">
+          <SvgIcon icon-class="zhifu"></SvgIcon>
+        </div>
+        <div class="progress-card-item__num">{{moneyFormatter(statistic.progress.use_money_total || 0)}}</div>
+        <div class="progress-card-item__label">已支付金额</div>
+      </div>
+      <div class="progress-card-item">
+        <MyProgress width="145px" height="145px" title="执行率" :chart-data="[{value:statistic.progress.money_total_2 ? statistic.progress.money_total_2 : statistic.progress.money_total_1,name:'合计金额'},{value:statistic.progress.use_money_total,name:'已用金额'}]" ></MyProgress>
+      </div>
+    </div>
+
+    <Table style="margin-top: 20px;" :data="departments" size="small" :columns="table" :max-height="280"></Table>
+  </el-card>
+</template>
+
+<script>
+import ElementResize from "element-resize-detector";
+import { moneyFormatter } from "@/utils";
+import echarts from 'echarts'
+import SvgIcon from "@/components/SvgIcon/index.vue";
+import MyProgress from "@/components/Progress/index.vue";
+import {statistic} from "@/api/dashboard/notice";
+
+export default {
+  components: {
+    MyProgress,
+    SvgIcon
+  },
+  name: "card8",
+  layout: {
+    x: 0,
+    y: 5,
+    w: 6,
+    h: 4,
+    i: "9",
+    name: "项目支出",
+  },
+  inject: {
+    getStatistic: {
+      default: () => {
+        return () => {
+          return {
+            statistic: {
+              departmentList: [
+                {
+                  money_total_1: "1900000.00",
+                  money_total_2: "0.00",
+                  ids: "11",
+                  plan_department_id: 2,
+                  use_money_total: 0,
+                  money_total: "0.00",
+                  end_money: 0,
+                  plan_department: {
+                    id: 2,
+                    pid: 0,
+                    name: "办公室（党建作风办）",
+                    manager_id: 7,
+                    leader_id: 4,
+                    sortnumber: 1,
+                    created_at: "2021-06-22 07:01:41",
+                    updated_at: "2023-03-22 14:56:51",
+                    deleted_at: null,
+                  },
+                },
+              ],
+            },
+          };
+        }
+      },
+    },
+  },
+  data() {
+    return {
+      tableHeight: 200,
+      statistic: {
+        progress: {
+          money_total_1: 0,
+          money_total_2: 0,
+          use_money_total: 0
+        }
+      },
+      list: [],
+      table: [
+        {
+          title: "序号",
+          type: "index",
+          width: 60,
+          fixed: "left",
+          align: "center",
+        },
+        {
+          title: "部门",
+          key: "plan_department.name",
+          minWidth: 180,
+          align: "center",
+          fixed: "left",
+          render: (h, params) => {
+            return h("p",{ style: { "text-align": "left" } }, params.row.plan_department.name);
+          }
+        },
+        {
+          title: "年初预算数（元）",
+          key: "money_total_1",
+          align: "center",
+          width: 160,
+          render: (h, params) => {
+            return h("p",{ style: { "text-align": "right" } }, moneyFormatter(params.row.money_total_1));
+          }
+        },
+        {
+          title: "调整后预算数（元）",
+          key: "money_total_2",
+          align: "center",
+          width: 160,
+          render: (h, params) => {
+            return h("p",{ style: { "text-align": "right" } }, moneyFormatter(params.row.money_total_2));
+          }
+        },
+        {
+          title: "已使用（元）",
+          key: "money_total",
+          align: "center",
+          width: 140,
+          render: (h, params) => {
+            return h("p",{ style: { "text-align": "right" } }, moneyFormatter(params.row.money_total));
+          }
+        },
+        {
+          title: "进展情况",
+          key: "rate",
+          align: "center",
+          width: 160,
+          render: (h, row) => {
+            let m2 = row?.money_total_2 || 0;
+            let m1 = row?.money_total_1 || 0;
+            let m3 = row?.use_money_total || 0;
+            let per = 0;
+
+            if (m2 != 0) {
+              per = ((m3 / m2) * 100).toFixed(2);
+            } else if (m1 != 0) {
+              per = ((m3 / m1) * 100).toFixed(2);
+            }
+            return h("el-progress", {
+              props: {
+                percentage: Number(per),
+              },
+            });
+          }
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          minWidth: 100,
+          render: (h, params) => {
+            return h("Button", {
+              props: {
+                size: "small"
+              }
+            } , "查看")
+          }
+        }
+      ]
+    };
+  },
+  methods: {
+    moneyFormatter,
+    init() {
+      let cardDom = this.$el;
+      let cardTitleH = 58;
+      const elementResize = ElementResize({
+        strategy:'scroll'
+      })
+      elementResize.listenTo(cardDom,ele => {
+        this.tableHeight = cardDom.getBoundingClientRect().height - 40 - cardTitleH
+      })
+    },
+    async getStatistics() {
+      if(/^\/system/.test(this.$route.path)) return
+
+      const res = await statistic(this.select,true)
+      this.statistic = res
+      this.$emit('send-data',res)
+    },
+  },
+  computed: {
+    departments () {
+      return this.getStatistics()?.statistic?.departmentList
+    }
+  },
+  created() {
+    this.getStatistic();
+  },
+  mounted() {
+    this.init();
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.clearfix {
+  display: flex;
+  align-items: center;
+}
+::v-deep .el-card__body {
+  width: 100%;
+  height: calc(100% - 58px);
+}
+::v-deep .ivu-table th,::v-deep .ivu-table td {
+  border-bottom-style: dashed;
+}
+.progress-card {
+  display: grid;
+  grid-template-columns: repeat(4, 1fr);
+  grid-gap: 20px;
+
+  &-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    text-align: center;
+
+    &__label {
+      font-size: 15px;
+      color: #000000;
+      padding-top: 20px;
+    }
+
+    &__num {
+      font-size: 20px;
+      line-height: 7px;
+      color: #000000;
+      font-weight: bold;
+      padding-top: 18px;
+    }
+
+    .worker-progress__icon {
+      border-radius: 20px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 72px;
+      height: 72px;
+
+      svg {
+        border-radius: 100%;
+        width: 40px;
+        height: 40px;
+
+      }
+    }
+    .icon-yuan {
+      background: #56b7f9;
+      color: #fff;
+      filter: drop-shadow(0px 6px 6px rgba(43,188,255,0.5));
+      svg {
+        color: #56b7f9;
+        background: #fff;
+      }
+    }
+    .icon-zhangdan {
+      background: #446df6;
+      filter: drop-shadow(0px 6px 6px rgba(54,117,255,0.5));
+      svg {
+        color: #fff;
+        width: 36px;
+      }
+    }
+    .icon-zhifu {
+      background: #f2a93f;
+      filter: drop-shadow(0px 6px 6px rgba(255,164,45,0.5));
+      svg {
+        color: #fff;
+        width: 36px;
+      }
+    }
+  }
+}
+::v-deep .el-progress--circle .el-progress__text {
+  white-space: break-spaces;
+}
+</style>
diff --git a/src/views/system/workerComponents/total.txt b/src/views/system/workerComponents/total.txt
new file mode 100644
index 0000000..f92c0f5
--- /dev/null
+++ b/src/views/system/workerComponents/total.txt
@@ -0,0 +1,206 @@
+<template>
+  <el-card class="box-card" shadow="hover">
+    <div slot="header" class="clearfix">
+      <SvgIcon style="color: #3171f4;width: 22px;height: 22px;" icon-class="calendar-check"></SvgIcon>
+      <span style="padding-left: 15px;">预算总体执行情况</span>
+      <DatePicker transfer :value="select.year" placeholder="选择所属年份" placement="bottom" style="width: 130px;margin-left: auto;"
+                  type="year" @on-change="changeYear"></DatePicker>
+    </div>
+    <div class="progress-card">
+      <div class="progress-card-item">
+        <div class="worker-progress__icon icon-yuan">
+          <SvgIcon icon-class="yuan"></SvgIcon>
+        </div>
+        <div class="progress-card-item__num">{{moneyFormatter(statistic.progress.money_total_1 || 0)}}</div>
+        <div class="progress-card-item__label">年初预算合计金额</div>
+      </div>
+      <div class="progress-card-item">
+        <div class="worker-progress__icon icon-zhangdan">
+          <SvgIcon icon-class="zhangdan"></SvgIcon>
+        </div>
+        <div class="progress-card-item__num">{{moneyFormatter(statistic.progress.money_total_2 || 0)}}</div>
+        <div class="progress-card-item__label">调整后预算合计金额</div>
+      </div>
+      <div class="progress-card-item">
+        <div class="worker-progress__icon icon-zhifu">
+          <SvgIcon icon-class="zhifu"></SvgIcon>
+        </div>
+        <div class="progress-card-item__num">{{moneyFormatter(statistic.progress.use_money_total || 0)}}</div>
+        <div class="progress-card-item__label">已支付金额</div>
+      </div>
+      <div class="progress-card-item">
+        <MyProgress width="145px" height="145px" title="执行率" :chart-data="[{value:statistic.progress.money_total_2 ? (statistic.progress.money_total_2 - statistic.progress.use_money_total) : (statistic.progress.money_total_1 - statistic.progress.use_money_total),name:'预算未执行金额'},{value:statistic.progress.use_money_total,name:'预算已执行金额'}]" ></MyProgress>
+<!--        <el-progress :width="145" type="circle" stroke-width="20" :format="per => `${per}%\n执行率`" :percentage="40"></el-progress>-->
+<!--        <div class="progress-card-item__num">-->
+<!--          {{toper(statistic.progress.money_total_1 || 0,statistic.progress.money_total_2 || 0,statistic.progress.use_money_total || 0)}}%-->
+<!--        </div>-->
+<!--        <div class="progress-card-item__label">执行率</div>-->
+      </div>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import MyProgress from "@/components/Progress";
+import SvgIcon from "@/components/SvgIcon";
+import {deepCopy, moneyFormatter} from "@/utils"
+import { statistic } from '@/api/system/temporaryPlan'
+export default {
+  components: {
+    SvgIcon,
+    MyProgress
+  },
+  name:"card1",
+  layout:{
+    x:0,
+    y:0,
+    w:4,
+    h:5,
+    i:"1",
+    name:"预算统计",
+  },
+  data() {
+    return {
+      select: {
+        year: new Date().getFullYear().toString()
+      },
+      statistic: {
+        progress: {
+          money_total_1: 0,
+          money_total_2: 0,
+          use_money_total: 0
+        }
+      }
+    }
+  },
+  methods: {
+    moneyFormatter,
+    toper(m1, m2, m3) {
+      if (m2 != 0) {
+        return ((m3 / m2) * 100).toFixed(2);
+      } else if (m1 != 0) {
+        return ((m3 / m1) * 100).toFixed(2);
+      } else
+        return 0
+    },
+    changeYear(e) {
+      this.select.year = e;
+      this.getStatistic()
+    },
+    async getStatistic() {
+      if(/^\/system/.test(this.$route.path)) return
+
+      const res = await statistic(this.select,true)
+      function handleDataStructure(data) {
+        let cData = deepCopy(data)
+        cData.progress.money_total_1 = isNaN(Number(cData.progress.plan_money)) ? 0 : Number(cData.progress.plan_money)
+        cData.progress.money_total_2 = isNaN(Number(cData.progress.plan_money)) ? 0 : Number(cData.progress.plan_money)
+        cData.progress.use_money_total = isNaN(Number(cData.progress.use_money)) ? 0 : Number(cData.progress.use_money)
+
+        cData.departmentList = cData.departmentList.map(i => ({
+          ...i,
+          money_total_1: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
+          money_total_2: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
+          use_money_total: isNaN(Number(i.use_money)) ? 0 : Number(i.use_money)
+        }))
+        cData.typeList = cData.typeList.map(i => ({
+          ...i,
+          money_total_1: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
+          money_total_2: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
+          use_money_total: isNaN(Number(i.use_money)) ? 0 : Number(i.use_money)
+        }))
+        return cData
+      }
+      this.statistic = handleDataStructure(res)
+      this.$emit('send-data', this.statistic)
+    },
+  },
+  computed: {},
+  created() {
+    this.getStatistic();
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.clearfix {
+  display: flex;
+  align-items: center;
+}
+.progress-card {
+  display: grid;
+  grid-template-columns: repeat(4, 1fr);
+  grid-gap: 20px;
+
+  &-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    text-align: center;
+
+    &__label {
+      font-size: 15px;
+      color: #000000;
+      padding-top: 20px;
+    }
+
+    &__num {
+      font-size: 20px;
+      line-height: 7px;
+      color: #000000;
+      font-weight: bold;
+      padding-top: 18px;
+    }
+
+    .worker-progress__icon {
+      border-radius: 20px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 72px;
+      height: 72px;
+
+      svg {
+        border-radius: 100%;
+        width: 40px;
+        height: 40px;
+
+      }
+    }
+    .icon-yuan {
+      background: #56b7f9;
+      color: #fff;
+      filter: drop-shadow(0px 6px 6px rgba(43,188,255,0.5));
+      svg {
+        color: #56b7f9;
+        background: #fff;
+      }
+    }
+    .icon-zhangdan {
+      background: #446df6;
+      filter: drop-shadow(0px 6px 6px rgba(54,117,255,0.5));
+      svg {
+        color: #fff;
+        width: 36px;
+      }
+    }
+    .icon-zhifu {
+      background: #f2a93f;
+      filter: drop-shadow(0px 6px 6px rgba(255,164,45,0.5));
+      svg {
+        color: #fff;
+        width: 36px;
+      }
+    }
+  }
+}
+::v-deep .el-progress--circle .el-progress__text {
+  white-space: break-spaces;
+}
+</style>
+<style>
+.progress-card-item > .icon-yuan > svg > use {
+  transform: scale(0.55);
+  transform-origin: center;
+}
+</style>
diff --git a/src/views/system/workerComponents/total.vue b/src/views/system/workerComponents/total.vue
index f92c0f5..d2c6d20 100644
--- a/src/views/system/workerComponents/total.vue
+++ b/src/views/system/workerComponents/total.vue
@@ -29,7 +29,7 @@
         <div class="progress-card-item__label">已支付金额</div>
       </div>
       <div class="progress-card-item">
-        <MyProgress width="145px" height="145px" title="执行率" :chart-data="[{value:statistic.progress.money_total_2 ? (statistic.progress.money_total_2 - statistic.progress.use_money_total) : (statistic.progress.money_total_1 - statistic.progress.use_money_total),name:'预算未执行金额'},{value:statistic.progress.use_money_total,name:'预算已执行金额'}]" ></MyProgress>
+        <MyProgress width="145px" height="145px" title="执行率" :chart-data="[{value:statistic.progress.money_total_2 ? statistic.progress.money_total_2 : statistic.progress.money_total_1,name:'合计金额'},{value:statistic.progress.use_money_total,name:'已用金额'}]" ></MyProgress>
 <!--        <el-progress :width="145" type="circle" stroke-width="20" :format="per => `${per}%\n执行率`" :percentage="40"></el-progress>-->
 <!--        <div class="progress-card-item__num">-->
 <!--          {{toper(statistic.progress.money_total_1 || 0,statistic.progress.money_total_2 || 0,statistic.progress.use_money_total || 0)}}%-->
@@ -43,8 +43,8 @@
 <script>
 import MyProgress from "@/components/Progress";
 import SvgIcon from "@/components/SvgIcon";
-import {deepCopy, moneyFormatter} from "@/utils"
-import { statistic } from '@/api/system/temporaryPlan'
+import { moneyFormatter } from "@/utils"
+import { statistic } from '@/api/dashboard/notice'
 export default {
   components: {
     SvgIcon,
@@ -91,28 +91,8 @@ export default {
       if(/^\/system/.test(this.$route.path)) return
 
       const res = await statistic(this.select,true)
-      function handleDataStructure(data) {
-        let cData = deepCopy(data)
-        cData.progress.money_total_1 = isNaN(Number(cData.progress.plan_money)) ? 0 : Number(cData.progress.plan_money)
-        cData.progress.money_total_2 = isNaN(Number(cData.progress.plan_money)) ? 0 : Number(cData.progress.plan_money)
-        cData.progress.use_money_total = isNaN(Number(cData.progress.use_money)) ? 0 : Number(cData.progress.use_money)
-
-        cData.departmentList = cData.departmentList.map(i => ({
-          ...i,
-          money_total_1: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
-          money_total_2: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
-          use_money_total: isNaN(Number(i.use_money)) ? 0 : Number(i.use_money)
-        }))
-        cData.typeList = cData.typeList.map(i => ({
-          ...i,
-          money_total_1: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
-          money_total_2: isNaN(Number(i.plan_money)) ? 0 : Number(i.plan_money),
-          use_money_total: isNaN(Number(i.use_money)) ? 0 : Number(i.use_money)
-        }))
-        return cData
-      }
-      this.statistic = handleDataStructure(res)
-      this.$emit('send-data', this.statistic)
+      this.statistic = res
+      this.$emit('send-data',res)
     },
   },
   computed: {},
diff --git a/src/views/system/workerComponents/total1.txt b/src/views/system/workerComponents/total1.txt
new file mode 100644
index 0000000..d2c6d20
--- /dev/null
+++ b/src/views/system/workerComponents/total1.txt
@@ -0,0 +1,186 @@
+<template>
+  <el-card class="box-card" shadow="hover">
+    <div slot="header" class="clearfix">
+      <SvgIcon style="color: #3171f4;width: 22px;height: 22px;" icon-class="calendar-check"></SvgIcon>
+      <span style="padding-left: 15px;">预算总体执行情况</span>
+      <DatePicker transfer :value="select.year" placeholder="选择所属年份" placement="bottom" style="width: 130px;margin-left: auto;"
+                  type="year" @on-change="changeYear"></DatePicker>
+    </div>
+    <div class="progress-card">
+      <div class="progress-card-item">
+        <div class="worker-progress__icon icon-yuan">
+          <SvgIcon icon-class="yuan"></SvgIcon>
+        </div>
+        <div class="progress-card-item__num">{{moneyFormatter(statistic.progress.money_total_1 || 0)}}</div>
+        <div class="progress-card-item__label">年初预算合计金额</div>
+      </div>
+      <div class="progress-card-item">
+        <div class="worker-progress__icon icon-zhangdan">
+          <SvgIcon icon-class="zhangdan"></SvgIcon>
+        </div>
+        <div class="progress-card-item__num">{{moneyFormatter(statistic.progress.money_total_2 || 0)}}</div>
+        <div class="progress-card-item__label">调整后预算合计金额</div>
+      </div>
+      <div class="progress-card-item">
+        <div class="worker-progress__icon icon-zhifu">
+          <SvgIcon icon-class="zhifu"></SvgIcon>
+        </div>
+        <div class="progress-card-item__num">{{moneyFormatter(statistic.progress.use_money_total || 0)}}</div>
+        <div class="progress-card-item__label">已支付金额</div>
+      </div>
+      <div class="progress-card-item">
+        <MyProgress width="145px" height="145px" title="执行率" :chart-data="[{value:statistic.progress.money_total_2 ? statistic.progress.money_total_2 : statistic.progress.money_total_1,name:'合计金额'},{value:statistic.progress.use_money_total,name:'已用金额'}]" ></MyProgress>
+<!--        <el-progress :width="145" type="circle" stroke-width="20" :format="per => `${per}%\n执行率`" :percentage="40"></el-progress>-->
+<!--        <div class="progress-card-item__num">-->
+<!--          {{toper(statistic.progress.money_total_1 || 0,statistic.progress.money_total_2 || 0,statistic.progress.use_money_total || 0)}}%-->
+<!--        </div>-->
+<!--        <div class="progress-card-item__label">执行率</div>-->
+      </div>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import MyProgress from "@/components/Progress";
+import SvgIcon from "@/components/SvgIcon";
+import { moneyFormatter } from "@/utils"
+import { statistic } from '@/api/dashboard/notice'
+export default {
+  components: {
+    SvgIcon,
+    MyProgress
+  },
+  name:"card1",
+  layout:{
+    x:0,
+    y:0,
+    w:4,
+    h:5,
+    i:"1",
+    name:"预算统计",
+  },
+  data() {
+    return {
+      select: {
+        year: new Date().getFullYear().toString()
+      },
+      statistic: {
+        progress: {
+          money_total_1: 0,
+          money_total_2: 0,
+          use_money_total: 0
+        }
+      }
+    }
+  },
+  methods: {
+    moneyFormatter,
+    toper(m1, m2, m3) {
+      if (m2 != 0) {
+        return ((m3 / m2) * 100).toFixed(2);
+      } else if (m1 != 0) {
+        return ((m3 / m1) * 100).toFixed(2);
+      } else
+        return 0
+    },
+    changeYear(e) {
+      this.select.year = e;
+      this.getStatistic()
+    },
+    async getStatistic() {
+      if(/^\/system/.test(this.$route.path)) return
+
+      const res = await statistic(this.select,true)
+      this.statistic = res
+      this.$emit('send-data',res)
+    },
+  },
+  computed: {},
+  created() {
+    this.getStatistic();
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.clearfix {
+  display: flex;
+  align-items: center;
+}
+.progress-card {
+  display: grid;
+  grid-template-columns: repeat(4, 1fr);
+  grid-gap: 20px;
+
+  &-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    text-align: center;
+
+    &__label {
+      font-size: 15px;
+      color: #000000;
+      padding-top: 20px;
+    }
+
+    &__num {
+      font-size: 20px;
+      line-height: 7px;
+      color: #000000;
+      font-weight: bold;
+      padding-top: 18px;
+    }
+
+    .worker-progress__icon {
+      border-radius: 20px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 72px;
+      height: 72px;
+
+      svg {
+        border-radius: 100%;
+        width: 40px;
+        height: 40px;
+
+      }
+    }
+    .icon-yuan {
+      background: #56b7f9;
+      color: #fff;
+      filter: drop-shadow(0px 6px 6px rgba(43,188,255,0.5));
+      svg {
+        color: #56b7f9;
+        background: #fff;
+      }
+    }
+    .icon-zhangdan {
+      background: #446df6;
+      filter: drop-shadow(0px 6px 6px rgba(54,117,255,0.5));
+      svg {
+        color: #fff;
+        width: 36px;
+      }
+    }
+    .icon-zhifu {
+      background: #f2a93f;
+      filter: drop-shadow(0px 6px 6px rgba(255,164,45,0.5));
+      svg {
+        color: #fff;
+        width: 36px;
+      }
+    }
+  }
+}
+::v-deep .el-progress--circle .el-progress__text {
+  white-space: break-spaces;
+}
+</style>
+<style>
+.progress-card-item > .icon-yuan > svg > use {
+  transform: scale(0.55);
+  transform-origin: center;
+}
+</style>
diff --git a/src/views/system/workerComponents/type.txt b/src/views/system/workerComponents/type.txt
new file mode 100644
index 0000000..9381693
--- /dev/null
+++ b/src/views/system/workerComponents/type.txt
@@ -0,0 +1,306 @@
+<template>
+  <el-card class="box-card" shadow="hover" id="type-card">
+    <div slot="header" class="clearfix">
+      <SvgIcon style="color: #3171f4;width: 22px;height: 22px;" icon-class="wengao"></SvgIcon>
+      <span style="padding-left: 15px"
+        >预算类型执行情况</span
+      >
+      <i class="el-icon-more" style="margin-left: auto; font-size: 20px"></i>
+    </div>
+
+    <div id="type-card-body" style="position: relative;height: 100%;width: 100%;">
+      <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
+        <Table style="width: 100%;" :height="tableHeight" size="small" :data="departmentList" :columns="table"></Table>
+      </div>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import ElementResize from "element-resize-detector";
+import { moneyFormatter } from "@/utils";
+import echarts from 'echarts'
+import SvgIcon from "@/components/SvgIcon/index.vue";
+
+export default {
+  components: {
+    SvgIcon
+  },
+  name: "card3",
+  layout: {
+    x: 0,
+    y: 5,
+    w: 6,
+    h: 4,
+    i: "5",
+    name: "预算类型执行情况",
+  },
+  inject: {
+    getStatistic: {
+      default: () => {
+        return () => {
+          return {
+            statistic: {
+              typeList: [
+                {
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "1150000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },
+              ],
+            },
+          };
+        };
+      },
+    },
+  },
+  data() {
+    return {
+      tableHeight: 200,
+      table: [
+        {
+          title: "预算类别",
+          width: 100,
+          key: "type_detail.value",
+          render: (h, { row }) => h('span', row.type_detail?.value),
+          ellipsis: true,
+          tooltip: true,
+          fixed: "left",
+        },
+        {
+          title: "执行情况",
+          minWidth: 120,
+          fixed: "right",
+          render: (h, { row }) => {
+            let m2 = row?.money_total_2 ? Number(row?.money_total_2) : 0;
+            let m1 = row?.money_total_1 ? Number(row?.money_total_1) : 0;
+            let m3 = row?.use_money_total ? Number(row?.use_money_total) : 0;
+            let per = 0;
+
+            if (m2 != 0) {
+              per = ((m3 / m2) * 100).toFixed(2);
+            } else if (m1 != 0) {
+              per = ((m3 / m1) * 100).toFixed(2);
+            }
+            return h("el-progress", {
+              props: {
+                "stroke-width": 13,
+                percentage: Number(per),
+              },
+            });
+          },
+        },
+        {
+          title: "年初预算合计金额(元)",
+          width: 170,
+          align: "right",
+          key: "money_total_1",
+          render: (h, { row }) => {
+            return h("span", {}, moneyFormatter(row.money_total_1));
+          },
+        },
+        {
+          title: "调整后预算合计金额(元)",
+          width: 170,
+          align: "right",
+          key: "money_total_2",
+          render: (h, { row }) => {
+            return h("span", {}, moneyFormatter(row.money_total_2));
+          },
+        },
+        {
+          title: "已使用(元)",
+          width: 120,
+          align: "right",
+          key: "use_money_total",
+          render: (h, { row }) => {
+            return h("span", {}, moneyFormatter(row.use_money_total));
+          },
+        },
+      ],
+    };
+  },
+  methods: {
+    init() {
+      let cardDom = document.getElementById('type-card');
+      let cardTitleH = 58;
+      const elementResize = ElementResize({
+        strategy:'scroll'
+      })
+      elementResize.listenTo(cardDom,ele => {
+        this.tableHeight = cardDom.getBoundingClientRect().height - 40 - cardTitleH
+      })
+    }
+  },
+  computed: {
+    departmentList() {
+      if (this.getStatistic)
+        return this.getStatistic()?.statistic?.typeList || [];
+    },
+  },
+  created() {},
+  mounted() {
+    this.init();
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.clearfix {
+  display: flex;
+  align-items: center;
+}
+::v-deep .el-card__body {
+  width: 100%;
+  height: calc(100% - 58px);
+}
+::v-deep .ivu-table th,::v-deep .ivu-table td {
+  border-bottom-style: dashed;
+}
+::v-deep .el-progress {
+  white-space: nowrap;
+}
+::v-deep .el-progress__text {
+  color: rgb(77, 139, 220);
+}
+</style>
diff --git a/src/views/system/workerComponents/type.vue b/src/views/system/workerComponents/type.vue
index 9381693..e2f946f 100644
--- a/src/views/system/workerComponents/type.vue
+++ b/src/views/system/workerComponents/type.vue
@@ -201,8 +201,7 @@ export default {
         {
           title: "预算类别",
           width: 100,
-          key: "type_detail.value",
-          render: (h, { row }) => h('span', row.type_detail?.value),
+          key: "type_text",
           ellipsis: true,
           tooltip: true,
           fixed: "left",
@@ -212,9 +211,9 @@ export default {
           minWidth: 120,
           fixed: "right",
           render: (h, { row }) => {
-            let m2 = row?.money_total_2 ? Number(row?.money_total_2) : 0;
-            let m1 = row?.money_total_1 ? Number(row?.money_total_1) : 0;
-            let m3 = row?.use_money_total ? Number(row?.use_money_total) : 0;
+            let m2 = row?.money_total_2 || 0;
+            let m1 = row?.money_total_1 || 0;
+            let m3 = row?.use_money_total || 0;
             let per = 0;
 
             if (m2 != 0) {
diff --git a/src/views/system/workerComponents/type1.txt b/src/views/system/workerComponents/type1.txt
new file mode 100644
index 0000000..e2f946f
--- /dev/null
+++ b/src/views/system/workerComponents/type1.txt
@@ -0,0 +1,305 @@
+<template>
+  <el-card class="box-card" shadow="hover" id="type-card">
+    <div slot="header" class="clearfix">
+      <SvgIcon style="color: #3171f4;width: 22px;height: 22px;" icon-class="wengao"></SvgIcon>
+      <span style="padding-left: 15px"
+        >预算类型执行情况</span
+      >
+      <i class="el-icon-more" style="margin-left: auto; font-size: 20px"></i>
+    </div>
+
+    <div id="type-card-body" style="position: relative;height: 100%;width: 100%;">
+      <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
+        <Table style="width: 100%;" :height="tableHeight" size="small" :data="departmentList" :columns="table"></Table>
+      </div>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import ElementResize from "element-resize-detector";
+import { moneyFormatter } from "@/utils";
+import echarts from 'echarts'
+import SvgIcon from "@/components/SvgIcon/index.vue";
+
+export default {
+  components: {
+    SvgIcon
+  },
+  name: "card3",
+  layout: {
+    x: 0,
+    y: 5,
+    w: 6,
+    h: 4,
+    i: "5",
+    name: "预算类型执行情况",
+  },
+  inject: {
+    getStatistic: {
+      default: () => {
+        return () => {
+          return {
+            statistic: {
+              typeList: [
+                {
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "1150000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },{
+                  money_total_1: "17549700.00",
+                  money_total_2: "0.00",
+                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
+                  type: 7,
+                  use_money_total: "50000.00",
+                  type_text: "项目经费",
+                  money_total: "0.00",
+                  end_money: 0,
+                },
+              ],
+            },
+          };
+        };
+      },
+    },
+  },
+  data() {
+    return {
+      tableHeight: 200,
+      table: [
+        {
+          title: "预算类别",
+          width: 100,
+          key: "type_text",
+          ellipsis: true,
+          tooltip: true,
+          fixed: "left",
+        },
+        {
+          title: "执行情况",
+          minWidth: 120,
+          fixed: "right",
+          render: (h, { row }) => {
+            let m2 = row?.money_total_2 || 0;
+            let m1 = row?.money_total_1 || 0;
+            let m3 = row?.use_money_total || 0;
+            let per = 0;
+
+            if (m2 != 0) {
+              per = ((m3 / m2) * 100).toFixed(2);
+            } else if (m1 != 0) {
+              per = ((m3 / m1) * 100).toFixed(2);
+            }
+            return h("el-progress", {
+              props: {
+                "stroke-width": 13,
+                percentage: Number(per),
+              },
+            });
+          },
+        },
+        {
+          title: "年初预算合计金额(元)",
+          width: 170,
+          align: "right",
+          key: "money_total_1",
+          render: (h, { row }) => {
+            return h("span", {}, moneyFormatter(row.money_total_1));
+          },
+        },
+        {
+          title: "调整后预算合计金额(元)",
+          width: 170,
+          align: "right",
+          key: "money_total_2",
+          render: (h, { row }) => {
+            return h("span", {}, moneyFormatter(row.money_total_2));
+          },
+        },
+        {
+          title: "已使用(元)",
+          width: 120,
+          align: "right",
+          key: "use_money_total",
+          render: (h, { row }) => {
+            return h("span", {}, moneyFormatter(row.use_money_total));
+          },
+        },
+      ],
+    };
+  },
+  methods: {
+    init() {
+      let cardDom = document.getElementById('type-card');
+      let cardTitleH = 58;
+      const elementResize = ElementResize({
+        strategy:'scroll'
+      })
+      elementResize.listenTo(cardDom,ele => {
+        this.tableHeight = cardDom.getBoundingClientRect().height - 40 - cardTitleH
+      })
+    }
+  },
+  computed: {
+    departmentList() {
+      if (this.getStatistic)
+        return this.getStatistic()?.statistic?.typeList || [];
+    },
+  },
+  created() {},
+  mounted() {
+    this.init();
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.clearfix {
+  display: flex;
+  align-items: center;
+}
+::v-deep .el-card__body {
+  width: 100%;
+  height: calc(100% - 58px);
+}
+::v-deep .ivu-table th,::v-deep .ivu-table td {
+  border-bottom-style: dashed;
+}
+::v-deep .el-progress {
+  white-space: nowrap;
+}
+::v-deep .el-progress__text {
+  color: rgb(77, 139, 220);
+}
+</style>