Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/views/docking/info.vue

@@ -40,8 +40,7 @@
            <el-button v-if="permissionList.sync" icon="el-icon-share" size="small" @click="PUSH">同 步
            </el-button>
            <el-button v-if="permissionList.query" icon="el-icon-search" size="small"
                       @click="openAdvancedQuery">查
              询
                       @click="openAdvancedQuery">查 询
            </el-button>
          </template>
        </avue-crud>

 Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue

@@ -1,21 +1,22 @@
<template>
  <basic-container >
    <avue-crud v-model="form" :option="option" :data="data" ref="crud"  @on-load="onLoad" @row-save="rowSave" @row-update="rowUpdate" @row-del="rowDel" :page.sync="page">
    <avue-crud ref="crud" v-model="form" :data="data" :option="option" :page.sync="page" @on-load="onLoad"
               @row-save="rowSave" @row-update="rowUpdate" @row-del="rowDel">
      <template slot="menu" slot-scope="{ row, index }">
        <el-button
          type="text"
          size="small"
          icon="el-icon-edit"
          v-if="permissionList.editBtn"
          icon="el-icon-edit"
          size="small"
          type="text"
          @click="handleEdit(row, index)"
        >
          编辑
        </el-button>
        <el-button
          type="text"
          size="small"
          icon="el-icon-delete"
          v-if="permissionList.delBtn"
          icon="el-icon-delete"
          size="small"
          type="text"
          @click="handleDel(row, index)"
        >
          删除
@@ -39,6 +40,7 @@
  combination
} from "@/api/system/passwords";
import {mapGetters} from "vuex";

export default {
  name: "passwords.vue",
  data() {

 Source/UBCS-WEB/src/views/wel/index.vue

@@ -15,15 +15,16 @@
    <el-row>
      <el-col :span="24">
        <basic-container title="待办流程任务">
          <avue-crud ref="crud" :table-loading="loading" :data="todoData" :option="todoOption"
          <avue-crud ref="crud" :data="todoData" :option="todoOption" :page.sync="page"
                     :table-loading="loading"
                     @on-load="onLoad"
                     @cell-click="cellHandle"
                     :page.sync="page">
                     @cell-click="cellHandle">
            <template #menu="{size,row,index}">
              <el-button @click="gotodo(row,index)"
              <el-button :size="size"
                         icon="el-icon-check"
                         type="text"
                         :size="size">执行</el-button>
                         @click="gotodo(row,index)">执行
              </el-button>
            </template>
          </avue-crud>
        </basic-container>
@@ -41,15 +42,17 @@

<!--      </el-col>-->
    </el-row>
    <el-dialog title="修改密码" :visible.sync="dialogFormVisible" append-to-body  :close-on-press-escape="false" :before-close="Xdelhandle">
      <el-form :model="form"  :rules="rules" ref="form">
        <el-form-item label="原密码" :label-width="formLabelWidth" prop="oldPassword">
    <el-dialog :before-close="Xdelhandle" :close-on-press-escape="false" :visible.sync="dialogFormVisible"
               append-to-body
               title="修改密码">
      <el-form ref="form" :model="form" :rules="rules">
        <el-form-item :label-width="formLabelWidth" label="原密码" prop="oldPassword">
          <el-input v-model="form.oldPassword" autocomplete="off"></el-input>
        </el-form-item>
        <el-form-item label="新密码" :label-width="formLabelWidth" prop="newPassword">
        <el-form-item :label-width="formLabelWidth" label="新密码" prop="newPassword">
          <el-input v-model="form.newPassword" autocomplete="off"></el-input>
        </el-form-item>
        <el-form-item label="确认密码" :label-width="formLabelWidth" prop="newPassword1">
        <el-form-item :label-width="formLabelWidth" label="确认密码" prop="newPassword1">
          <el-input v-model="form.newPassword1" autocomplete="off"></el-input>
        </el-form-item>
      </el-form>

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/TestIntegrateFrame.java

@@ -24,12 +24,11 @@
        list.add(4);
        List<Integer> classifyVOS =list.stream().sorted(((o1, o2) -> o2.compareTo(o1))).collect(Collectors.toList());
        int level=1;

        int tt=1;
        if (classifyVOS.size() >= level && level > 0) {
            tt = classifyVOS.get(level - 1);
        }


        final JFrame j = new JFrame();
        j.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
        JPanel p = new JPanel();