Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0

zhanghua

2023-02-21 fb1d57f4bce31fe4f8147a144f8ef4afbca0a4cd

 src/views/operate/disposal/casepool/learn/index.vue

@@ -1,29 +1,30 @@
<template>
  <div class="userList">
    <header>
      <div class="headerContent">
        <div class="search">
          <span>筛选条件:</span>
          <div class="option">
            <el-select
              v-model="resource"
              placeholder="违规"
              @change="setMystatus"
            >
              <el-option
                v-for="item in resourceList"
                :key="item.label"
                :label="item.label"
                :value="item.value"
              >
              </el-option>
            </el-select>
          </div>
          <div class="findBtn">
            <el-button type="primary" @click="getUserList">查询</el-button>
          </div>
        </div>
      </div>
      <MyHeader @getUserList ="getUserList"></MyHeader>
<!--      <div class="headerContent">-->
<!--        <div class="search">-->
<!--          <span>筛选条件:</span>-->
<!--          <div class="option">-->
<!--            <el-select-->
<!--              v-model="resource"-->
<!--              placeholder="违规"-->
<!--              @change="setMystatus"-->
<!--            >-->
<!--              <el-option-->
<!--                v-for="item in resourceList"-->
<!--                :key="item.label"-->
<!--                :label="item.label"-->
<!--                :value="item.value"-->
<!--              >-->
<!--              </el-option>-->
<!--            </el-select>-->
<!--          </div>-->
<!--          <div class="findBtn">-->
<!--            <el-button type="primary" @click="getUserList">查询</el-button>-->
<!--          </div>-->
<!--        </div>-->
<!--      </div>-->
    </header>
    <main>
      <div class="mainContent">
@@ -214,13 +215,14 @@
import helper from "@/utils/mydate";
import { RESOURCE_OPTIONS } from "@/utils/helper";
import basecase from "@/api/operate/basecase";

import MyHeader from "@/components/seachHeader";
export default {
  components: {
    uploadVio,
    uploadIll,
    MyDetail,
    MyIllDetail,
    MyHeader
  },
  data() {
    return {
@@ -355,21 +357,41 @@
        .catch((_) => {});
    },
    // 获取用户列表
    getUserList() {
      const params = {
        current: this.currentPage,
        state: this.statusArr[0] ?? null,
        size: this.pageSize,
        resource: this.resource,
        type: this.statusArr[1] ?? null,
      };
    getUserList(seachData) {
      // console.log(seachData.seachData.resource)
      let params
      if (seachData){
        params = {
          current: this.currentPage,
          state: this.statusArr[0] ?? null,
          size: this.pageSize,
          resource: seachData.seachData.resource ==undefined ?null:seachData.seachData.resource,
          region:seachData.seachData.region ==undefined?null:seachData.seachData.region,
          type: this.statusArr[1] ?? null,
          code:seachData.seachData.code ==undefined?null:seachData.seachData.code,
          categoryBig:seachData.seachData.categoryBig ==undefined?null:seachData.seachData.categoryBig,
          categorySmall:seachData.seachData.categorySmall ==undefined?null:seachData.seachData.categorySmall,
          site:seachData.seachData.site ==undefined?null:seachData.seachData.site,
          street:seachData.seachData.street ==undefined?null:seachData.seachData.street,
          alarmTime:seachData.seachData.alarmTime ==undefined?null:seachData.seachData.alarmTime,
        };
      }else {

        params = {
          current: this.currentPage,
          state: this.statusArr[0] ?? null,
          size: this.pageSize,
          type: this.statusArr[1] ?? null,
        };
      }

      basecase
        .baseCasePoolList(params)
        .then(({ records, total }) => {
          this.tableData = records;
          this.totalNum = total;
        })
        .catch((err) => this.$message.error(err));
          .baseCasePoolList(params)
          .then(({ records, total }) => {
            this.tableData = records;
            this.totalNum = total;
          })
          .catch((err) => this.$message.error(err));
    },
    // 更改违规/违建
    changeTypeChecked(idx) {