Merge remote-tracking branch 'origin/master'

fuliqi

2024-04-28 5208ae16a508a42be2e4b50ef299389fb556a67e

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

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

@@ -53,10 +53,14 @@
        </el-table-column>
        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
          <template slot-scope="scope">
            <el-button size="small" type="text" v-show="scope.row.publish != 1">确认发布</el-button>
            <el-button size="small" type="text" v-show="scope.row.publish == 1">取消发布</el-button>
            <el-button size="mini" type="text" icon="el-icon-view"
              @click="handleDetail(scope.row, scope.index)">详细</el-button>
            <el-button size="small" type="text"  v-show="scope.row.publish != 1">确认发布</el-button>
            <el-button size="small" type="text"  v-show="scope.row.publish == 1">取消发布</el-button>
            <el-button
              size="mini"
              type="text"
              icon="el-icon-view"
              @click="handleDetail(scope.row.id)"
            >详细</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -64,8 +68,8 @@

    <div style="text-align: right; margin-top: 10px">
      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
        :current-page="queryParams.pageNum" :page-sizes="[5, 10, 20]" :page-size="5"
        layout="total, sizes, prev, pager, next, jumper" :total="4">
        :current-page="queryParams.pageNum" :page-sizes="[10, 20, 50]" :page-size="queryParams.pageSize"
        layout="total, sizes, prev, pager, next, jumper" :total="tableData.length">
      </el-pagination>
    </div>

@@ -84,8 +88,7 @@
  dicts: ['platform_examine_use', 'platform_examine_category'],
  data() {
    return {
      activeIndex: '1',
      activeIndex2: '2',
      activeIndex: '0',
      areaList: [],
      date: '',
      dateRange: '',
@@ -93,6 +96,7 @@
        pageNum: 1,
        pageSize: 10,
        deptId: null,
        examinTag:0
      },
      tableData: [],
      loading: false,
@@ -130,8 +134,9 @@
    },
    /** 导航切换 */
    handleSelect(key) {
      this.activeIndex = key; // 更新当前激活的菜单项
      this.getList();
      this.activeIndex = key;
      this.queryParams.examinTag = key;
      this.getList(this.queryParams.deptId);
    },
    /** 查询考核模板列表 */
    getList(deptId) {
@@ -149,9 +154,13 @@
    handleCurrentChange(val) {
      console.log(`当前页: ${val}`);
    },
    handleDetail(index, row) {
      console.log(index, row);
      this.$router.push("/examine/detail/detail")
    handleDetail(id) {
      this.$router.push({
        path: '/examine/detail/detail',
        query: {
          id: id,
        }
      })
    },
    handleDelete(index, row) {
      console.log(index, row);