Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Source/UBCS-WEB/src/store/modules/user.js

 Source/UBCS-WEB/src/store/modules/user.js

@@ -145,7 +145,7 @@
    },
    //刷新token
    refreshToken({state, commit}, userInfo) {
      window.console.log('handle refresh token');
      // window.console.log('handle refresh token');
      return new Promise((resolve, reject) => {
        refreshToken(state.refreshToken, state.tenantId,
          !validatenull(userInfo) ? userInfo.deptId : state.userInfo.dept_id,
@@ -273,7 +273,7 @@
    },
    SET_USER_INFO: (state, userInfo) => {
      state.upadatastatus=userInfo
      console.log(state.upadatastatus)
      // console.log(state.upadatastatus)
      if (validatenull(userInfo.avatar)) {
        userInfo.avatar = "/img/bg/img-logo.png";
      }
@@ -295,8 +295,8 @@
        }
        Vue.set(permission_new, item.code, children);
      });
      //console.log(permission_new)
      state.permission = permission_new;
      // console.log(state.permission)
      setStore({name: "permission", content: permission_new});
    },


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

@@ -2,28 +2,43 @@
  <el-container>
    <el-main>
      <basic-container>
        <avue-crud ref="crud" v-model="form" :data="data" :option="option" :page.sync="page" @on-load="onLoad"
        <avue-crud ref="crud" v-model="form" :cell-style="cellStyle" :data="data" :option="option" :page.sync="page"
                   @on-load="onLoad"
                   @search-change="searchChange"
                   @search-reset="searchReset"
                   @selection-change="selectionChange"
                   @current-change="currentChange"
                   @size-change="sizeChange"
                   @refresh-change="refreshChange" @row-click="rowClick" :cell-style="cellStyle">
                   @size-change="sizeChange" @refresh-change="refreshChange" @row-click="rowClick">
          <template slot="menu" slot-scope="{row,index}">
            <el-button icon="el-icon-edit" size="small" type="text" @click="updateSave(row,index)" :disabled="row.usedFlag === 'true' ? false :true">编辑</el-button>
            <el-button icon="el-icon-delete" size="small" type="text" @click="deleteSave(row,index)">删除</el-button>
            <el-button v-if="row.usedFlag=='false' || row.usedFlag==''" icon="el-icon-position" size="small" type="text"
                       @click="ENABLE(row,index)">启用
            <el-button v-if="permission.info.info_edit" :disabled="row.usedFlag === 'true' ? false :true"
                       icon="el-icon-edit" size="small"
                       type="text"
                       @click="updateSave(row,index)">编辑
            </el-button>
            <el-button v-else icon="el-icon-finished" size="small" type="text" @click="DISABLE(row,index)">停用
            <el-button v-if="permission.info.info_delete" icon="el-icon-delete" size="small" type="text"
                       @click="deleteSave(row,index)">删除
            </el-button>
            <span v-if="permission.info.info_enable">

                       <el-button v-if="row.usedFlag=='false' || row.usedFlag==''" icon="el-icon-position" size="small"
                                  type="text" @click="ENABLE(row,index)">启用
                       </el-button>
            </span>
            <span v-if="permission.info.info_stop">
                      <el-button v-if="row.usedFlag !== 'false' && row.usedFlag !== ''" icon="el-icon-finished"
                                 size="small"
                                 type="text" @click="DISABLE(row, index)">停用
                      </el-button>
            </span>
          </template>
          <template slot="menuLeft">
            <el-button icon="el-icon-plus" size="small" type="primary" @click="addSave">新&nbsp;&nbsp;增
            <el-button v-if="permission.info.info_add" icon="el-icon-plus" size="small" type="primary" @click="addSave">
              新&nbsp;&nbsp;增
            </el-button>
            <el-button icon="el-icon-share" size="small" @click="PUSH">同 步
            <el-button v-if="permission.info.info_sync" icon="el-icon-share" size="small" @click="PUSH">同 步
            </el-button>
            <el-button icon="el-icon-search" size="small" @click="openAdvancedQuery">查 询
            <el-button v-if="permission.info.info_query" icon="el-icon-search" size="small" @click="openAdvancedQuery">查
              询
            </el-button>
          </template>
        </avue-crud>
@@ -46,6 +61,7 @@
} from "@/api/docking/info";
import {getDictionary} from "@/api/omd/enum";
import infoForm from "./infoForm.vue";
import {mapGetters} from "vuex";

export default {
  name: "info",
@@ -245,6 +261,8 @@
  created() {
  },
  computed: {
    ...mapGetters(["permission"]),

    oids() {
      let oids = [];
      this.selectionList.forEach(ele => {
@@ -515,6 +533,7 @@
  width: 10px;

}

// 滚动条的滑块
/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
  background-color: #ececec;

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

@@ -20,6 +20,7 @@
                     size="small"
                     plain
                     icon="el-icon-refresh-right"
                       v-if="permission.task.task_sendPush"
                     @click="handleSend">手动推送
          </el-button>
        <div style="float: right;margin-left: 10px">

 Source/UBCS-WEB/src/views/integration/systemInfo.vue

@@ -7,7 +7,7 @@
      <template slot="menuLeft">
        <!-- <el-button icon="el-icon-search" size="small" type="primary" @click="handleStatus">查 询
        </el-button> -->
        <el-button icon="el-icon-delete" size="small" type="danger" @click="handleDeleteByIds">删 除
        <el-button icon="el-icon-delete" size="small" type="danger" @click="handleDeleteByIds" v-if="this.permission.systemInfo.systemInfo_remove">删 除
        </el-button>
      </template>
      <template slot="search" slot-scope="{row,size}">
@@ -19,10 +19,11 @@
                  :size="size" clearable style="width:300px;margin-left: 10px;"
                  @clear="handleClear" @keyup.enter.native="handleEnter"></el-input>
      </template>
      <template #menu="{row,index,size}">
      <template #menu="{row,index,size}" v-if="this.permission.systemInfo.systemInfo_empower">
        <el-button icon="el-icon-menu" size="small" type="text" @click="classifyHandler(row)">分类授权</el-button>

      </template>


    </avue-crud>
    <el-dialog :visible.sync="dialogVisible" append-to-body class="avue-dialog avue-dialog--top" title="分类授权"
               top="-50px">
@@ -54,7 +55,7 @@
  sysInfoTree,
  batchAddSave
} from '@/api/integration/sysInfo.js'

import {mapGetters} from "vuex";
export default {
  data() {
    return {
@@ -90,7 +91,15 @@
      search: {},
      delIds: [],
      data: [],
      option: {

    }
  },
  created() {
  },
  computed: {
    ...mapGetters(["permission"]),
    option(){
      return{
        height: "auto",
        tip: false,
        border: true,
@@ -98,6 +107,9 @@
        menuAlign: 'center',
        index: true,
        searchMenuSpan: 8,
          addBtn:this.permission.systemInfo.systemInfo_add,
          editBtn:this.permission.systemInfo.systemInfo_edit,
          delBtn:this.permission.systemInfo.systemInfo_remove,
        searchBtn: false,
        emptyBtn: false,
        columnBtn: false,
@@ -134,10 +146,8 @@
            type: 'textarea'
          }
        ]
      },
    }
  },
  created() {
    }
  },
  methods: {
    //重置

 Source/UBCS-WEB/src/views/system/menu.vue

@@ -1,13 +1,13 @@
<template>
  <basic-container>
    <avue-crud :option="option"
               :table-loading="loading"
               :data="data"
               ref="crud"
    <avue-crud ref="crud"
               v-model="form"
               :permission="permissionList"
               :before-open="beforeOpen"
               :before-close="beforeClose"
               :before-open="beforeOpen"
               :data="data"
               :option="option"
               :permission="permissionList"
               :table-loading="loading"
               @row-del="rowDel"
               @row-update="rowUpdate"
               @row-save="rowSave"
@@ -21,48 +21,49 @@
               @on-load="onLoad"
               @tree-load="treeLoad">
      <template slot="menuLeft">
        <el-button type="danger"
          size="small"
        <el-button v-if="this.permission.menu.menu_delete"
          icon="el-icon-delete"
          v-if="permission.menu_delete"
          plain
                   size="small"
                   type="danger"
          @click="handleDelete">删 除
        </el-button>
        <el-button type="success"
          size="small"
        <el-button v-if="this.permission.menu.menu_clone"
          icon="el-icon-connection"
          plain
                   size="small"
                   type="success"
          @click="cloneMenuButton">从其他菜单克隆按钮
        </el-button>
      </template>
      <template slot-scope="scope" slot="menu">
      <template slot="menu" slot-scope="scope">
        <el-button
          type="text"
          v-if="userInfo.role_name.includes('admin') && scope.row.category === 1"
          icon="el-icon-circle-plus-outline"
          size="small"
          type="text"
          @click.stop="handleAdd(scope.row,scope.index)"
          v-if="userInfo.role_name.includes('admin') && scope.row.category === 1"
        >新增子项
        </el-button>
      </template>
      <template slot-scope="{row}"
                slot="source">
      <template slot="source"
                slot-scope="{row}">
        <div style="text-align:center">
          <i :class="row.source"/>
        </div>
      </template>
    </avue-crud>
    <!-- 从其他菜单克隆按钮 -->
    <el-dialog title="从其他菜单克隆按钮"
    <el-dialog :visible.sync="cloneOtherMenuButtons.cloneButtonSettingBox"
        append-to-body
        :visible.sync="cloneOtherMenuButtons.cloneButtonSettingBox"
               style="height: 110vh; margin-top: -10vh;"
               title="从其他菜单克隆按钮"
        width="1100px"
        @close="cleanCloneSelections"
        style="height: 110vh; margin-top: -10vh;">
        <avue-crud :option="cloneOtherMenuButtons.cloneOption"
          :table-loading="cloneOtherMenuButtons.cloneLoading"
               @close="cleanCloneSelections">
      <avue-crud ref="cloneCrud"
          :data="cloneOtherMenuButtons.cloneData"
          ref="cloneCrud"
                 :option="cloneOtherMenuButtons.cloneOption"
                 :table-loading="cloneOtherMenuButtons.cloneLoading"
          @search-change="searchCloneChange"
          @search-reset="searchCloneReset"
          @selection-change="selectionCloneChange"
@@ -70,7 +71,7 @@
          @refresh-change="refreshCloneChange"
          @on-load="cloneOnLoad"
          @tree-load="treeLoad">
          <template slot-scope="{row}" slot="source">
        <template slot="source" slot-scope="{row}">
            <div style="text-align:center">
              <i :class="row.source"/>
            </div>
@@ -437,10 +438,10 @@
      ...mapGetters(["userInfo", "permission"]),
      permissionList() {
        return {
          addBtn: this.vaildData(this.permission.menu_add, false),
          viewBtn: this.vaildData(this.permission.menu_view, false),
          delBtn: this.vaildData(this.permission.menu_delete, false),
          editBtn: this.vaildData(this.permission.menu_edit, false)
        addBtn: this.vaildData(this.permission.menu.menu_add, false),
        viewBtn: this.vaildData(this.permission.menu.menu_view, false),
        delBtn: this.vaildData(this.permission.menu.menu_delete, false),
        editBtn: this.vaildData(this.permission.menu.menu_edit, false)
        };

      },