Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

rk

4 天以前 8c4dfb07d551ceb372887ff8f22bd1f574d0347b

 admin/src/views/operation/danger/areaSet.vue

@@ -1,9 +1,12 @@
<template>
  <TableLayout :permissions="['business:member:query']">
  <TableLayout :permissions="['business:hiddendangerparam:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="120px" inline>
      <el-form-item label="隐患区域" prop="name">
        <el-input v-model="searchForm.name" clearable placeholder="请输入隐患区域" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="责任部门" prop="companyName">
        <el-input v-model="searchForm.companyName" clearable placeholder="请输入部门名称" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
@@ -17,20 +20,22 @@
        <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:hiddendangerparam:delete']">批量删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
          v-loading="isWorking.search"
          :data="tableData.list"
          stripe
          @selection-change="handleSelectionChange"
      >
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="name" label="隐患区域" min-width="200px"></el-table-column>
        <el-table-column prop="sortnum" label="排序码"  min-width="100px"></el-table-column>
        <el-table-column prop="memberNames" label="安全员" min-width="200px"></el-table-column>
        <el-table-column prop="editDate" label="操作时间" min-width="200px"></el-table-column>
        <el-table-column prop="name" show-overflow-tooltip label="隐患区域" min-width="120px"></el-table-column>
        <el-table-column prop="companyName" show-overflow-tooltip label="责任部门" min-width="120px"></el-table-column>
        <el-table-column prop="sortnum" label="排序码"  min-width="70px"></el-table-column>
        <el-table-column prop="memberNames" show-overflow-tooltip label="安全员" min-width="80px"></el-table-column>
        <el-table-column prop="editDate" label="操作时间" width="160px"></el-table-column>
        <el-table-column
            v-if="containPermissions(['business:hiddendangerparam:update', 'business:hiddendangerparam:delete' ])"
            label="操作"
            min-width="250"
            min-width="140"
            fixed="right"
        >
          <template slot-scope="{row}">