Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

zhanghua

2022-12-08 1ec00a645693dbc08b7ea70855451bbd72c43a6a

 src/views/operate/viewEvent/index.vue

@@ -15,19 +15,16 @@
        <div class="contentItem">
          <div style="width: 80px">按类型:</div>
          <div class="search">
            <el-input
              placeholder=" 请输入类型"
              v-model="searchData.categories"
            ></el-input>
            <el-select clearable v-model="searchData.categories" placeholder=" 请选择类型">
              <el-option v-for="option in categoryOptions" :key="option.id" :label="option.label" :value="option.value"></el-option>
            </el-select>
          </div>
        </div>
        <div class="contentItem">
          <div style="width: 80px">按社区:</div>
          <div class="search">
            <el-input
              placeholder=" 请输入社区"
              v-model="searchData.communityId"
            ></el-input>
            <el-cascader clearable v-model="searchData.community" :props="communityProps" :options="communityOptions" placeholder="请选择社区">
            </el-cascader>
          </div>
        </div>
        <div class="contentItem">
@@ -186,6 +183,7 @@
import helper from "@/utils/mydate";
import casequery from "@/api/operate/basecase";
import { CATEGOTY } from "@/utils/helper";
import department from "@/api/system/department";

export default {
  components: {
@@ -207,24 +205,18 @@
      totalNum: null,
      pageSize: 10,
      currentPage: 1,
      typeList: [
        {
          name: "违规",
          value: 1,
          checked: true,
        },
        {
          name: "违建",
          value: 2,
          checked: false,
        },
      ],
      categoryOptions: CATEGOTY,
      communityOptions: [],
      communityProps: {
        label: 'regionName',
        value: 'id'
      },
      myproblem: 1,
      number: "",
      searchData: {
        categories: null,
        number: null,
        communityId: null,
        community: null,
        endTime: null,
        site: null,
        startTime: null,
@@ -233,15 +225,21 @@
  },
  created() {
    this.getList();
    this.getCommunityOptions();
  },
  methods: {
    // 获取列表
    getList() {
      const searchData = Object.assign({}, this.searchData);
      if (this.searchData.community) {
        searchData.communityId = searchData.community[1];
      }
      delete searchData.community;
      casequery
        .baseCaseQuery({
          current: this.currentPage,
          pageSize: this.pageSize,
          ...this.searchData,
          ...searchData,
        })
        .then((res) => {
          this.tableData = res.records;
@@ -251,6 +249,16 @@
          this.tableData = [];
        });
    },

    // 获取社区和街道
    getCommunityOptions() {
      department.getDepartmentList()
          .then(res => {
            this.communityOptions = res;
          })
          .catch(err => this.$message.error(err))
    },

    // 设置表格斑马纹
    tableRowClassName({ row, rowIndex }) {
      if ((rowIndex + 1) % 2 === 0) {