modified: src/views/laboratory/measure/Add.vue modified: src/views/la...

Fixiaobai

2023-08-28 add7a64f33833638304abeb87350965bc62d0fee

	modified:   src/views/laboratory/measure/Add.vue
	modified:   src/views/laboratory/role/index.vue

 src/views/laboratory/measure/Add.vue

@@ -140,7 +140,6 @@
        res.data.instrumentList.forEach(item => {
            this.insList.push({ label: item.equipmentName, value: item.id })
        })
        console.log(this.insList);
    },
    methods: {
        addcodePointsTable() {

 src/views/laboratory/role/index.vue

@@ -2,14 +2,16 @@
  <div>
    <div class="content-main">
      <div class="top-bar">
        <el-form ref="form" :inline="true" :model="searchData">
        <el-form style="display: flex;align-items: center;" ref="form" :inline="true" :model="searchData">
          <el-form-item label="角色名称：" class="sermargin">
            <el-input v-model="searchData.roleName" class="input-form" placeholder="请输入角色名称" style="width:250px">
            </el-input>
          </el-form-item>
          <el-form-item class="rightBtn">
            <el-col>
            <el-button type="primary" @click="searchRole">查询</el-button>
            <el-button type="primary" plain>重置</el-button>
            </el-col>
          </el-form-item>
        </el-form>
        <el-form>
@@ -358,13 +360,11 @@

    },
    async upRole(scope) {
      console.log(scope);
      this.updateRole.roleId = scope.row.roleId
      this.updateRole.roleName = scope.row.roleName
      this.updateRole.lastName = scope.row.roleName
      let menuSelect = scope.row.roleMenuList
      this.updateRole.lastMenuSelect = scope.row.roleMenuList
      console.log(menuSelect);
      let res = await getMenusTree();
      this.menuUpdateInfo = res.data
      this.menuUpdateInfo.forEach(item => {
@@ -386,7 +386,6 @@
          })
        }
      })
      console.log(this.menuUpdateInfo);
      menuSelect.forEach(ms => {
        this.menuUpdateInfo.forEach(item => {
          if (ms.menuName === item.name) {
@@ -784,6 +783,7 @@
#selectRolecheck .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after {
  border-color: #fff !important;
}

#selectRoleCheck .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
  background-color: #409EFF;
  border-color: #409EFF;