Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-06 9e8d1bd0b6fb495920921214775b84d490e032a3

 src/views/system/data-manage/data-detail/index.vue

@@ -1,8 +1,8 @@
<template>
  <div class="app-container">
    <div style="display: flex;flex-direction: row;min-width: 158px;max-width: 158px;margin-bottom: 5px;border-radius: 1px">
      <div @click="allData(0)" class="tab" :class="{tabActive: 0 === selected, tabInactive: 0 !== selected}">全部</div>
      <div @click="provinceData(1)" class="tab" :class="{tabActive: 1 === selected, tabInactive: 1 !== selected}">省厅考核</div>
    <div style="display: flex;flex-direction: row;min-width: 158px;max-width: 158px;margin-bottom: 5px;border-radius: 1px; user-select: none">
      <div @click="clickTab(0)" class="tab" :class="{tabActive: 0 === queryParams.dataType, tabInactive: 0 !== queryParams.dataType}">全部</div>
      <div @click="clickTab(1)" class="tab" :class="{tabActive: 1 === queryParams.dataType, tabInactive: 1 !== queryParams.dataType}">省厅考核</div>
    </div>
    <el-card class="box-card" v-show="index !== 'image_resource_security'">
      <el-row style="display: flex; flex-direction: row; align-items: center" justify="space-between">
@@ -30,24 +30,28 @@
      </el-row>
    </el-card>

    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <el-form-item label="关键词" prop="bayonetNumber">
        <el-input v-model="queryParams.keyword" placeholder="关键词搜索" clearable @input="handleQuery"/>
      </el-form-item>
      <el-form-item label="时间范围" prop="timeRange">
        <el-date-picker
          v-model="queryParams.timeRange"
          type="daterange"
          range-separator="至"
          start-placeholder="开始日期"
          end-placeholder="结束日期">
        </el-date-picker>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
    <div style="display: flex;position: relative">
      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
        <el-form-item label="关键词" prop="bayonetNumber">
          <el-input v-model="queryParams.keyword" placeholder="关键词搜索" clearable @input="handleQuery"/>
        </el-form-item>
        <el-form-item label="时间范围" prop="timeRange">
          <el-date-picker
            v-model="queryParams.timeRange"
            type="daterange"
            range-separator="至"
            start-placeholder="开始日期"
            end-placeholder="结束日期">
          </el-date-picker>
        </el-form-item>
        <el-form-item>
          <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
          <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
        </el-form-item>
      </el-form>
      <right-toolbar style="position: absolute;right: 0px" v-show="index !== 'image_resource_security'" :showSearch.sync="showSearch" @queryTable="handleQuery" :columns="showList"></right-toolbar>
    </div>


    <el-row :gutter="10" class="mb8" v-show="index === 'image_resource_security'">
      <el-container>
@@ -85,8 +89,6 @@
      </el-col>
      <right-toolbar  :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <right-toolbar v-show="index !== 'image_resource_security'" :showSearch.sync="showSearch" @queryTable="handleQuery" :columns="showList"></right-toolbar>

    <div>
      <el-table v-loading="loading" :data="tableData.list">
@@ -164,7 +166,6 @@
  },
  data() {
    return {
      selected: 0,
      // 导入参数
      upload: {
        // 是否显示弹出层
@@ -210,6 +211,7 @@
        pageSize: 10,
        keyword: '',
        timeRange: [],
        dataType: 0,
      },
      // 表单参数
      form: {},
@@ -282,11 +284,9 @@
    this.getList();
  },
  methods: {
    allData(active) {
      this.selected = active
    },
    provinceData(active) {
      this.selected = active
    clickTab(active) {
      this.queryParams.dataType = active
      this.getList()
    },
    showListPD(item) {
      if (!this.showList) {
@@ -434,7 +434,7 @@
  background-color: #F5F9FE;
  width: 100%;
  margin-bottom: 20px;
  height: 160px
  height: 120px
}

.icon-container {