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

odc.xiaohui

2023-02-21 426d3d33f23bd04e7cafda728cdcc82f11d5baa3

 src/components/seachHeader/index.vue

@@ -25,7 +25,11 @@
      <el-input v-model="seachData.site" placeholder="报警点位"></el-input>
    </el-form-item>
    <el-form-item label="所属区域">
      <el-input v-model="seachData.street" placeholder="所属区域"></el-input>
      <el-cascader
          v-model="seachData.street"
          :options="communityOptions"
          :props="options"
          @change="handleChange"></el-cascader>
    </el-form-item>
    <el-form-item label="报警时间">
      <el-date-picker
@@ -64,10 +68,16 @@

<script>
import {RESOURCE_OPTIONS} from "@/utils/helper";
import department from "@/api/system/department";

export default {
  data(){
    return{
      options:{
        label:'regionName',
        value:'id',
      },
      communityOptions:[],
      eventSourceOptions: RESOURCE_OPTIONS,
      seachData:{

@@ -106,8 +116,20 @@
  },
  mounted() {
    this.getPool()
    this.getCommunityOptions()
  },
  methods:{
    handleChange(value) {
      console.log(value);
    },
    // 获取社区和街道
    getCommunityOptions() {
      department.getDepartmentList()
          .then(res => {
            this.communityOptions = res;
          })
          .catch(err => this.$message.error(err))
    },
    getPool(){
      console.log(this.$route.name);
      let name = this.$route.name
@@ -117,7 +139,11 @@

    },
    getUserList(){
      this.$emit('getUserList', {seachData:this.seachData})
      console.log(this.seachData)
      // this.seachData.alarmTimeOne =this.seachData.alarmTime[0];
      // this.seachData.alarmTimeTwo = this.seachData.alarmTime[1];
      this.seachData.street=this.seachData.street?this.seachData.street[this.seachData.street.length-1]:null;
      this.$emit('getUserList', {seachData:this.seachData});
    },
    dialogCreate(){
      this.$emit('dialogCreatepro')