Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-03 c30d5534c86d48cdd94d06b6760aeb57df56963f

Merge remote-tracking branch 'origin/master'

 src/views/system/check/result/detail/detail.vue

@@ -1,5 +1,12 @@
<template>
  <div class="app-container">
  <div style="padding: 0px 10px">
      <div >
        <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
               >
          <el-menu-item index="0">省厅考核</el-menu-item>
          <el-menu-item index="1">区县考核</el-menu-item>
        </el-menu>
      </div>
    <el-container>
      <el-main>
        <h2>考核规则</h2>
@@ -91,18 +98,18 @@
            :inline="true"
            v-show="showSearch"
          >
            <el-form-item label="考核月度" prop="name">
              <el-date-picker
                v-model="queryParams.date"
                format="yyyy-MM"
                value-format="yyyy-MM"
                type="month"
                placeholder="选择日期"
                @change="dateChange"
              >
              </el-date-picker>
            </el-form-item>
            <el-form-item label="考核季度">
<!--            <el-form-item label="考核月度" prop="name">-->
<!--              <el-date-picker-->
<!--                v-model="queryParams.date"-->
<!--                format="yyyy-MM"-->
<!--                value-format="yyyy-MM"-->
<!--                type="month"-->
<!--                placeholder="选择日期"-->
<!--                @change="dateChange"-->
<!--              >-->
<!--              </el-date-picker>-->
<!--            </el-form-item>-->
            <el-form-item label="考核时间">
              <el-date-picker
                :clearable="false"
                v-model="queryParams.quarter"
@@ -154,6 +161,17 @@
          >
            <template slot-scope="scope">
              <span>{{ translateDeptId(scope.row.dept_id) }}</span>
            </template>
          </el-table-column>
          <el-table-column
            label="考核标签"
            align="center"
            prop="dept_id"
            width="120px"
            fixed
          >
            <template slot-scope="scope">
              {{ scope.row.examine_tag === 0 ? '省厅考核' : '区县考核' }}
            </template>
          </el-table-column>
          <template v-for="item in tableData">
@@ -325,7 +343,8 @@
      queryParams: {
        id: null,
        date: null,
        quarter: null
        quarter: null,
        examineTag: null
      },
      // 表单校验
      rules: {},
@@ -344,6 +363,9 @@
    if (this.$route.query.id) {
      this.queryParams.id = this.$route.query.id;
    }
    let examineTag = this.$route.query.examineTag;
    this.activeIndex = examineTag;
    this.queryParams.examineTag = examineTag;
    // 考核积分列表
    this.getList();
    this.areaSelect();
@@ -441,6 +463,15 @@
      this.indexOpen = true;
      this.title = "修改考核指标";
    },
    /** 导航切换 */
    handleSelect(key) {
      this.activeIndex = key;
      this.queryParams.examineTag = key;
      // 考核积分列表
      this.getList();


    },
    /** 修改按钮操作 */
    handleRuleUpdate(row) {
      this.reset("ruleForm");
@@ -471,9 +502,6 @@
        },
        `考核指标_${new Date().getTime()}.xlsx`
      );
    },
    handleSelect(key, keyPath) {
      console.log(key, keyPath);
    },
  },
};

 src/views/system/check/result/detail/index.vue

@@ -4,7 +4,7 @@
      <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
        style="margin-bottom: 10px">
        <el-menu-item index="0">省厅考核</el-menu-item>
        <el-menu-item index="1">区域考核</el-menu-item>
        <el-menu-item index="1">区县考核</el-menu-item>
      </el-menu>
    </div>

@@ -37,7 +37,7 @@
        </el-table-column>
        <el-table-column label="标签" prop="examineTag" align="center">
          <template slot-scope="scope">
            {{ scope.row.examineTag == 0 ? '省厅考核' : '市局考核' }}
            {{ scope.row.examineTag == 0 ? '省厅考核' : '区县考核' }}
          </template>
        </el-table-column>
        <el-table-column label="考核类型" prop="examineCategory" align="center">

 src/views/system/check/result/index.vue

@@ -5,8 +5,8 @@
        style="margin-bottom: 10px">
        <el-menu-item index="0">省厅月度</el-menu-item>
        <el-menu-item index="2">省厅季度</el-menu-item>
        <el-menu-item index="1">市局月度</el-menu-item>
        <el-menu-item index="3">市局季度</el-menu-item>
        <el-menu-item index="1">区县月度</el-menu-item>
        <el-menu-item index="3">区县季度</el-menu-item>
      </el-menu>
    </div>