Merge branch 'master' of ssh://192.168.20.39:29418/LFWEB

王旭

2022-10-13 17b2681fbd5029ddf65e7c1fe30a49a9ff8479ac

 src/views/userManage/roleManage.vue

@@ -47,10 +47,24 @@
            }}</el-button
          >
        </el-form-item>
        <el-form-item>
          <el-button @click="handleDelete()"
            ><i class="el-icon-delete"></i>&nbsp;{{
              $t('common.delete')
            }}</el-button
          >
        </el-form-item>
      </el-form>
    </div>
    <div class="table_box">
      <el-table :data="tableData" stripe style="width: 100%" height="99%">
      <el-table
        :data="tableData"
        stripe
        style="width: 100%"
        @selection-change="handleSelectionChange"
        height="99%"
      >
        <el-table-column type="selection" width="55" />
        <el-table-column
          align="center"
          type="index"
@@ -75,7 +89,7 @@
          :label="$t('userManage.RM.describe')"
        />

        <el-table-column
        <!-- <el-table-column
          align="center"
          prop="createUser"
          :label="$t('userManage.RM.creationuser')"
@@ -101,7 +115,7 @@
          align="center"
          prop="bak"
          :label="$t('userManage.RM.remarks')"
        />
        /> -->
        <el-table-column
          fixed="right"
          :label="$t('common.operate')"
@@ -114,12 +128,9 @@
              size="small"
              >{{ $t('common.update') }}</el-button
            >
            <el-button
              type="danger"
              @click="handleDelete(scope.$index, scope.row)"
              size="small"
              >{{ $t('common.delete') }}</el-button
            >
            <el-button  @click="showDetail(scope.$index, scope.row)" type="primary" size="small">{{
              $t('common.see')
            }}</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -136,6 +147,7 @@
        </el-pagination>
      </div>
    </div>

    <el-dialog
      :title="$t('userManage.RM.insertRole')"
      top="15vh"
@@ -247,6 +259,62 @@
        >
      </div>
    </div>

     <div class="infoBox" v-show="showinfoBox">
      <el-card>
        <div slot="header" class="clearfix">
          <span>{{ $t('dataManage.styleObj.deInformation') }}</span>
          <div style="float: right; cursor: pointer" @click="closeDetial"   >
            <i class="el-icon-close"></i>
          </div>
        </div>
               <div class="contentBox">
          <p>
            <label> {{ $t('userManage.RM.roleName') }}:</label>
            <label class="boxlabel">{{ itemdetail.name }}</label>
          </p>
          <el-divider></el-divider>
          <p>
           <p>
            <label> {{ $t('userManage.RM.ownedSystem') }}:</label>
            <label class="boxlabel">{{ itemdetail.depName }}</label>
          </p>
          </p>
          <el-divider></el-divider>
          <p>
            <label> {{ $t('userManage.RM.describe') }}:</label>
            <label class="boxlabel">{{ itemdetail.descr }}</label>
          </p>
          <el-divider></el-divider>
           <p>
            <label> {{ $t('userManage.RM.creationuser') }}:</label>
            <label class="boxlabel">{{ itemdetail.createUser }}</label>
          </p>
          <el-divider></el-divider>
          <p>
            <label> {{ $t('userManage.RM.creationtime') }}:</label>
            <label class="boxlabel">{{ itemdetail.createTime }}</label>
          </p>
          <el-divider></el-divider>
          <p>
            <label> {{ $t('userManage.RM.updateonuser') }}:</label>
            <label class="boxlabel">{{ itemdetail.UpdateUser }}</label>
          </p>
          <el-divider></el-divider>

             <p>
            <label> {{ $t('userManage.RM.updateontime') }}:</label>
            <label class="boxlabel">{{ itemdetail.updateTime }}</label>
          </p>
           <el-divider></el-divider>
             <p>
            <label> {{ $t('userManage.RM.remarks') }}:</label>
            <label class="boxlabel">{{ itemdetail.bak }}</label>
          </p>
           <el-divider></el-divider>
        </div>
      </el-card>
    </div>
  </div>
</template>

@@ -258,7 +326,7 @@
  select_Role_ByPageAndCount,
  selectdepTab,
  insertRole,
  deleteRole,
  deleteRoles,
  selectDep,
  updateRole,
} from '../../api/api';
@@ -270,6 +338,7 @@
  },
  data() {
    return {
      showinfoBox: false,
      showCata: false,
      formLabelWidth: '120px',
      InsertFormdialog: false,
@@ -284,6 +353,9 @@
      updateform: {},
      count: 0,
      selData: [],
      itemdetail: {},
      multipleSelection: [],

      listData: {
        name: null,
        depName: null,
@@ -293,13 +365,28 @@
    };
  },
  methods: {
        closeDetial() {
      this.showinfoBox = false;
      this.itemdetail = {};
    },
      showDetail(index, row) {
      this.showinfoBox = true;
      this.itemdetail = row;
      this.itemdetail.createTime = this.formomentTime(this.itemdetail.createTime);
      this.itemdetail.updateTime = this.formomentTime(this.itemdetail.updateTime);

    },
    handleSelectionChange(val) {
      this.multipleSelection = val;
    },
    formatTime(row, column) {
      let date = row[column.property];

      return this.formomentTime(date);
    },
    formomentTime(date) {
      if (date === undefined || date === null) {
        return '';
        return;
      }

      return moment(parseInt(date)).format('YYYY-MM-DD HH:mm:ss');
    },
    showDepTree(res) {
@@ -418,8 +505,13 @@
        });
      }
    },
    async handleDelete(index, row) {
      const data = await deleteRole({ id: row.id.toString() });
    async handleDelete() {
      var std = [];
      for (var i in this.multipleSelection) {
        std.push(this.multipleSelection[i].id);
      }
      const data = await deleteRoles({ ids: std.toString() });

      if (data.code == 200) {
        this.InsertFormdialog = false;
        this.$message({
@@ -519,5 +611,58 @@
  .text-center {
    text-align: center;
  }
  .infoBox {
    width: 500px;
    border: 1px solid #eee;
    position: absolute;
    z-index: 100;
    top: 25%;
    right: 12%;
    background-color: #fff;
    .el-card {
      background-color: transparent;
      span {
        font-size: 16px;
        font-weight: 600;
      }
    }
    .contentBox {
      margin: 0 aotu 10px;
      height: 485px;
      overflow: auto;
      p {
        // background-color: #bfa;
        // margin-bottom: 10px;
        font-size: 14px;
      }
      .boxlabel {
        margin-left: 10px;
      }
    }
    /* 整体样式 */
    .contentBox::-webkit-scrollbar {
      width: 6px;
      height: 6px;
    }

    /* 滚动条 */
    .contentBox::-webkit-scrollbar-thumb {
      background-color: #b3d8ff;
      border-radius: 6px;
    }

    /* 滚动条鼠标经过样式 */
    .contentBox::-webkit-scrollbar-thumb:hover {
      background-color: #b3d8ff;
      border-radius: 6px;
    }

    /* 滚动条轨道 */
    .contentBox::-webkit-scrollbar-track-piece {
      -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
      border-radius: 10px;
      background: #ededed;
    }
  }
}
</style>