diff --git a/src/views/modules/workSys/role/role-add-or-update.vue b/src/views/modules/workSys/role/role-add-or-update.vue
deleted file mode 100644
index c645b634..00000000
--- a/src/views/modules/workSys/role/role-add-or-update.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
-      <el-form-item prop="name" :label="$t('role.name')">
-        <el-input v-model="dataForm.name" :placeholder="$t('role.name')"></el-input>
-      </el-form-item>
-      <el-form-item prop="remark" :label="$t('role.remark')">
-        <el-input v-model="dataForm.remark" :placeholder="$t('role.remark')"></el-input>
-      </el-form-item>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item size="mini" :label="$t('role.menuList')">
-            <el-tree
-              :data="menuList"
-              :props="{ label: 'name', children: 'children' }"
-              node-key="id"
-              ref="menuListTree"
-              accordion
-              show-checkbox>
-            </el-tree>
-          </el-form-item>
-        </el-col>
-<!--        <el-col :span="12">-->
-<!--          <el-form-item size="mini" :label="$t('role.deptList')">-->
-<!--            <el-tree-->
-<!--              :data="deptList"-->
-<!--              :props="{ label: 'name', children: 'children' }"-->
-<!--              node-key="id"-->
-<!--              ref="deptListTree"-->
-<!--              accordion-->
-<!--              show-checkbox>-->
-<!--            </el-tree>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-      </el-row>
-    </el-form>
-    <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<script>
-import debounce from 'lodash/debounce'
-export default {
-  data () {
-    return {
-      visible: false,
-      menuList: [],
-      // deptList: [],
-      dataForm: {
-        id: '',
-        name: '',
-        menuIdList: [],
-        // deptIdList: [],
-        remark: ''
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        name: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    init () {
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        this.$refs.menuListTree.setCheckedKeys([])
-        // this.$refs.deptListTree.setCheckedKeys([])
-        Promise.all([
-          this.getMenuList()
-          // this.getDeptList()
-        ]).then(() => {
-          if (this.dataForm.id) {
-            this.getInfo()
-          }
-        })
-      })
-    },
-    // 获取菜单列表
-    getMenuList () {
-      return this.$http.get('/oper/access/menu/select').then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.menuList = res.data
-      }).catch(() => {})
-    },
-    // 获取部门列表
-    // getDeptList () {
-    //   return this.$http.get('/sys/dept/list').then(({ data: res }) => {
-    //     if (res.code !== 0) {
-    //       return this.$message.error(res.msg)
-    //     }
-    //     this.deptList = res.data
-    //   }).catch(() => {})
-    // },
-    // 获取信息
-    getInfo () {
-      this.$http.get(`/oper/access/operrole/${this.dataForm.id}`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.dataForm = {
-          ...this.dataForm,
-          ...res.data
-        }
-        this.dataForm.menuIdList.forEach(item => this.$refs.menuListTree.setChecked(item, true))
-        // this.$refs.deptListTree.setCheckedKeys(this.dataForm.deptIdList)
-      }).catch(() => {})
-    },
-    // 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (!valid) {
-          return false
-        }
-        this.dataForm.menuIdList = [
-          ...this.$refs.menuListTree.getCheckedKeys(),
-          ...this.$refs.menuListTree.getHalfCheckedKeys()
-        ]
-        // this.dataForm.deptIdList = this.$refs.deptListTree.getCheckedKeys()
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/oper/access/operrole', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.$emit('refreshDataList')
-            }
-          })
-        }).catch(() => {})
-      })
-    }, 1000, { 'leading': true, 'trailing': false })
-  }
-}
-</script>
diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue
index a3a87e38..c70125bc 100644
--- a/src/views/modules/workSys/role/role.vue
+++ b/src/views/modules/workSys/role/role.vue
@@ -1,102 +1,375 @@
 <template>
-  <el-card shadow="never"
-           class="aui-card--fill">
-    <div class="mod-sys__role">
+  <div class="div_main">
+    <div class="div_search">
       <el-form :inline="true"
-               :model="dataForm"
-               @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.name"
-                    :placeholder="$t('role.name')"
-                    clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary"
-                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'110px'">
+
+        <el-form-item label="角色名称"
+                      prop="name">
+          <el-input v-model="formData.name"
+                    size="small"
+                    class="list_item_width_1"
+                    clearable
+                    placeholder="请输入角色名称">
+          </el-input>
+
         </el-form-item>
-        <el-form-item>
-          <el-button type="danger"
-                     @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        <el-form-item label="创建时间"
+                      label-width="110px"
+                      prop="createdTime">
+          <el-date-picker v-model="formData.createdTime"
+                          size="small"
+                          type="datetime"
+                          @change="handleTimeChange"
+                          format="yyyy-MM-dd HH:mm"
+                          value-format="yyyy-MM-dd HH:mm"
+                          placeholder="创建时间">
+          </el-date-picker>
+
         </el-form-item>
+
+        <el-button style="margin-left:30px"
+                   size="small"
+                   class="diy-button--search"
+                   @click="handleSearch">查询</el-button>
+        <el-button style="margin-left:10px"
+                   size="small"
+                   class="diy-button--reset"
+                   @click="resetSearch">重置</el-button>
+
       </el-form>
-      <el-table v-loading="dataListLoading"
-                :data="dataList"
+    </div>
+    <div class="div_table">
+      <div class="div_btn">
+        <el-button class="diy-button--add"
+                   size="small"
+                   @click="handleAdd">新增</el-button>
+
+      </div>
+
+      <el-table class="table"
+                ref="ref_table"
+                :data="tableData"
                 border
-                @selection-change="dataListSelectionChangeHandle"
-                @sort-change="dataListSortChangeHandle"
-                style="width: 100%;">
-        <el-table-column type="selection"
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+        <el-table-column label="序号"
                          header-align="center"
                          align="center"
+                         type="index"
                          width="50"></el-table-column>
+
         <el-table-column prop="name"
-                         :label="$t('role.name')"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         label="角色名称"
+                         min-width="100">
+        </el-table-column>
         <el-table-column prop="remark"
-                         :label="$t('role.remark')"
                          header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="createDate"
-                         :label="$t('role.createDate')"
-                         sortable="custom"
+                         align="center"
+                         label="备注"
+                         min-width="110">
+        </el-table-column>
+        <el-table-column prop="createdTime"
                          header-align="center"
                          align="center"
-                         width="180"></el-table-column>
-        <el-table-column :label="$t('handle')"
+                         label="创建时间"
+                         min-width="170">
+        </el-table-column>
+
+        <el-table-column label="操作"
                          fixed="right"
+                         width="140"
                          header-align="center"
                          align="center"
-                         width="150">
+                         class="operate">
           <template slot-scope="scope">
-            <el-button type="text"
+
+            <el-button v-if="true"
+                       type="text"
+                       class="div-table-button--edit"
                        size="small"
-                       @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button type="text"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-button v-if="true"
+                       type="text"
+                       class="div-table-button--delete "
                        size="small"
-                       @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+                       @click="handleDelete(scope.row)">删除</el-button>
+
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination :current-page="page"
-                     :page-sizes="[10, 20, 50, 100]"
-                     :page-size="limit"
-                     :total="total"
-                     layout="total, sizes, prev, pager, next, jumper"
-                     @size-change="pageSizeChangeHandle"
-                     @current-change="pageCurrentChangeHandle">
-      </el-pagination>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible"
-                     ref="addOrUpdate"
-                     @refreshDataList="getDataList"></add-or-update>
+      <div>
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
+      </div>
     </div>
-  </el-card>
+
+    <!-- 修改弹出框 -->
+    <el-dialog :visible.sync="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <role-form ref="ref_form"
+                 @dialogCancle="diaClose"
+                 @dialogOk="addFormOk"></role-form>
+    </el-dialog>
+
+  </div>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './role-add-or-update'
+
+import roleForm from './roleForm'
+
+import { requestPost, requestGet } from '@/js/dai/request'
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading // 加载动画
 export default {
-  mixins: [mixinViewModule],
   data () {
     return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/oper/access/operrole/page',
-        getDataListIsPage: true,
-        deleteURL: '/oper/access/operrole',
-        deleteIsBatch: true
+      loading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 0,
+      tableLoading: false,
+      isResiUser: true,
+
+      agencyId: '',
+
+      timeRange: [],
+      formData: {
+        name: '',//名称
+        createdTime: '',//时间
+
+
       },
-      dataForm: {
-        name: ''
-      }
+
+
+      tableData: [],
+
+      //form相关
+      formShow: false,
+      formTitle: '新增',
+
     }
   },
   components: {
-    AddOrUpdate
+    roleForm
+  },
+  async created () {
+
+  },
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+
+    await this.loadTable()
+  },
+
+  activated () {
+    this.$refs['ref_table'].doLayout()
+  },
+
+  methods: {
+
+    async handleSearch () {
+      this.isResiUser = this.formData.orgType === 'current'
+
+      await this.loadTable()
+
+      this.$nextTick(() => {
+        this.$refs.ref_table.doLayout() // 解决表格错位
+      })
+
+    },
+
+    async loadTable () {
+      this.tableLoading = true
+
+      const url = "/gov/access/govrole/page"
+
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.formData
+      }
+
+      const { data, code, msg } = await requestGet(url, params)
+
+      if (code === 0) {
+        this.total = data.total
+        this.tableData = data.list
+
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+
+    handleTimeChange (time) {
+      if (time) {
+        this.formData.startTime = time[0]
+        this.formData.endTime = time[1]
+
+      } else {
+        this.formData.startTime = ''
+        this.formData.endTime = ''
+
+      }
+
+    },
+
+    diaClose () {
+      this.$refs.ref_form.resetData()
+      this.formShow = false
+
+    },
+
+
+    handleAdd () {
+      this.formTitle = '新增'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('add', null)
+      })
+    },
+
+    handleEdit (row) {
+      this.formTitle = '修改'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('edit', row.id)
+      })
+    },
+
+    addFormOk () {
+      this.formShow = false
+      this.loadTable()
+
+    },
+
+    async handleDelete (row) {
+      let message = '确认删除?'
+
+      this.$confirm(message, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.deleteRole(row)
+        })
+        .catch(err => {
+
+        });
+    },
+
+    async deleteRole (row) {
+
+      const url = "/gov/access/govrole/del/" + array
+
+
+      let params = {
+        ids: [row.id]
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //重置搜索条件
+    resetSearch () {
+      this.formData = {
+        orgType: 'current',//当前组织:current 根组织：all		
+        name: '',//姓名	
+        mobile: '',//手机号	
+        idCard: '',//身份证号码	
+        startTime: '',//检测开始时间yyyy-MM-dd HH:mm	
+        endTime: '',//检测结束时间yyyy-MM-dd HH:mm
+      }
+      this.timeRange = []
+
+      this.pageNo = 0
+      // this.loadTable()
+    },
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+
+      return this.$store.state.inIframe ? this.clientHeight - 360 + this.iframeHeight : this.clientHeight - 360
+
+
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+
   }
 }
 </script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>
+
+
diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue
new file mode 100644
index 00000000..289db50e
--- /dev/null
+++ b/src/views/modules/workSys/role/roleForm.vue
@@ -0,0 +1,369 @@
+<template>
+  <div class="epidemic-form">
+    <div class="dialog-h-content scroll-h">
+
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               :disabled="formType==='detail'"
+               class="form">
+
+        <el-form-item label="角色名称"
+                      prop="name"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    placeholder="请输入角色名称"
+                    clearable
+                    v-model="formData.name">
+          </el-input>
+
+        </el-form-item>
+
+        <el-form-item label="备注"
+                      prop="remark"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="textarea"
+                    maxlength="500"
+                    show-word-limit
+                    :autosize="{ minRows: 5, maxRows: 10 }"
+                    clearable
+                    placeholder="请输入备注"
+                    v-model="formData.remark"></el-input>
+        </el-form-item>
+
+        <el-form-item label="管理平台菜单"
+                      prop="content"
+                      label-width="150px"
+                      style="display: block">
+          <el-tree class="item_width_1"
+                   :data="menuList"
+                   :props="{ label: 'name', children: 'children' }"
+                   node-key="id"
+                   ref="menuListTree"
+                   accordion
+                   show-checkbox>
+          </el-tree>
+        </el-form-item>
+        <el-form-item label="可视化平台菜单"
+                      prop="content"
+                      label-width="150px"
+                      style="display: block">
+          <el-tree class="item_width_1 item_border"
+                   :data="menuListShuju"
+                   :props="{ label: 'name', children: 'children' }"
+                   node-key="id"
+                   ref="menuListShujuTree"
+                   accordion
+                   show-checkbox>
+          </el-tree>
+        </el-form-item>
+
+      </el-form>
+    </div>
+
+    <div class="form_div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button v-if="formType != 'detail'"
+                 size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost, requestGet } from '@/js/dai/request'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+
+
+
+      btnDisable: false,
+
+      roleId: '',
+      menuList: [],
+      menuListShuju: [],
+      formData: {
+        id: '',
+        name: '',
+        remark: '',//备注
+        menuIdList: [],
+        customerId: ''
+      },
+
+
+
+    }
+  },
+  components: {},
+  async mounted () {
+
+    //获取菜单
+    await this.getMenuList()
+    await this.getMenuShujuList()
+  },
+
+  methods: {
+
+    async initForm (type, roleId) {
+      this.startLoading()
+      this.customerId = localStorage.getItem("customerId");
+      this.formData.customerId = this.customerId
+
+      this.$refs['ref_form'].resetFields();
+      this.$refs.menuListTree.setCheckedKeys([])
+      this.$refs.menuListShujuTree.setCheckedKeys([])
+
+      this.formType = type
+
+      if (roleId) {
+        this.roleId = roleId
+        this.formData.id = roleId
+        this.loadFormData()
+      }
+
+      this.endLoading()
+
+
+    },
+
+
+    async getMenuList () {
+      const url = "/gov/access/menu/nav"
+
+      let params = {}
+
+      const { data, code, msg } = await requestGet(url, params)
+
+      if (code === 0) {
+        this.menuList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async getMenuShujuList () {
+      const url = "/gov/access/menu/nav"
+
+      let params = {
+        tableName: 'data_menu'
+      }
+
+
+      const { data, code, msg } = await requestGet(url, params)
+
+      if (code === 0) {
+        this.menuListShuju = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    async loadFormData () {
+
+      // const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/detail'
+      const url = '/gov/access/govrole/' + this.roleId
+      let params = {
+
+      }
+      const { data, code, msg } = await requestGet(url, params)
+      if (code === 0) {
+        this.formData = data
+
+        this.formData.menuIdList.forEach(item => {
+          this.$refs.menuListTree.setChecked(item, true)
+          this.$refs.menuListShujuTree.setChecked(item, true)
+        })
+        this.formData.customerId = this.customerId
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleComfirm () {
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+
+        } else {
+          this.addNat()
+        }
+
+      })
+    },
+
+    async addNat () {
+
+      // let menuList1 = [
+      //   ...this.$refs.menuListTree.getCheckedKeys(),
+      //   ...this.$refs.menuListTree.getHalfCheckedKeys(),
+      // ]
+      // let menuList2 = [
+      //   ...this.$refs.menuListShujuTree.getCheckedKeys(),
+      //   ...this.$refs.menuListShujuTree.getHalfCheckedKeys()
+      // ]
+
+      //   console.log('menuList1', menuList1)
+      //   console.log('menuList2', menuList2)
+      // let menuAll=menuList1.concat(menuList2)
+      // console.log('menuAll',menuAll)
+      this.formData.menuIdList = []
+      this.formData.menuIdList = [
+        ...this.$refs.menuListTree.getCheckedKeys(),
+        ...this.$refs.menuListTree.getHalfCheckedKeys(),
+        ...this.$refs.menuListShujuTree.getCheckedKeys(),
+        ...this.$refs.menuListShujuTree.getHalfCheckedKeys()
+      ]
+
+      console.log('menuAll', this.formData)
+
+      // return false
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 5000)
+
+      let url = ''
+      if (this.formType === 'add') {
+        url = '/gov/access/govrole/save'
+
+        this.formData.roleId = ''
+
+      } else {
+        url = '/gov/access/govrole/edit'
+
+      }
+
+
+      const { data, code, msg } = await requestPost(url, this.formData)
+
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.resetData()
+        this.$emit('dialogOk')
+        this.btnDisable = false
+
+      } else {
+        this.btnDisable = false
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleCancle () {
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+
+
+    resetData () {
+      this.roleId = ''
+      this.fileList = []
+      this.hideUploadEdit = false
+
+      this.formData = {
+        roleId: '',
+        agencyId: '',//当前网格所属组织Id	
+        userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值	
+        userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro	
+        name: '',
+        idCard: '',
+        mobile: '',
+        natTime: '',
+        natAddress: '',
+        natResult: '',
+        isSelChannel: false,
+        channel: [],
+        content: '',
+
+        fileName: '',//附件名	
+        attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））	
+        attachmentUrl: '',//附件地址	
+
+      }
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        name: [
+          { required: true, message: '姓名不能为空', trigger: 'blur' }
+        ],
+
+
+      }
+    },
+
+  },
+  props: {
+
+
+
+    // serviceList: {
+    //   type: Array,
+    //   default: []
+    // },
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+
+.item_border {
+  border: 1px;
+  border-radius: 50%;
+}
+</style>
+
+<style lang='scss'>
+// 隐藏上传按钮
+.hide .el-upload--picture-card {
+  display: none;
+}
+// 添加/删除文件时去掉动画过渡
+.el-upload-list__item {
+  transition: none !important;
+}
+</style>
+
+
+