Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/api/docking/loge.js

@@ -13,3 +13,12 @@
    }
  })
}
export const gridLogeDetail = (params) => {
  return request({
    url: '/api/ubcs-code/dockingManagement/gridLogeDetail',
    method: 'get',
    params: {
      ...params,
    }
  })
}

 Source/UBCS-WEB/src/api/logs.js

@@ -95,3 +95,13 @@
    }
  })
}

export const detailByOid = (params) => {
  return request({
    url: '/api/ubcs-log/operateLog/detailByOid',
    method: 'get',
    params: {
      ...params,
    }
  })
}

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

@@ -27,12 +27,15 @@
          <small slot="more">...</small>
        </avue-text-ellipsis>
      </template>
      <template slot="menu" slot-scope="scope">
        <el-button type="text" icon="el-icon-view" size="mini" @click="rowView(scope.row)">查看</el-button>
      </template>
    </avue-crud>
  </basic-container>
</template>

<script>
import {getLogoList} from "@/api/docking/loge";
import {getLogoList,gridLogeDetail} from "@/api/docking/loge";
import {validatenull} from "@/util/validate";
import {mapGetters} from "vuex";

@@ -137,7 +140,7 @@
        dialogClickModal: false,
        menuFixed:'right',
        dialogType: 'drawer',
        viewBtn: true,
        viewBtn: false,
        stripe: true,
        addBtn:false,
        editBtn:false,
@@ -273,6 +276,16 @@
    }
  },
  methods: {
    rowView(row){
      this.loading = true;
      gridLogeDetail({oid:row.oid}).then(res =>{
        console.log(res)
        if(res.data.data){
          this.loading = false
          this.$refs.crud.rowView(res.data.data)
        }
      })
    },
    dockingGetList(val){
      this.data=val.records;
      this.page.pageSize=val.size;

 Source/UBCS-WEB/src/views/monitor/log/operateLog.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"
               :page.sync="page"
               :before-open="beforeOpen"
               :data="data"
               :option="option"
               :page.sync="page"
               :permission="permissionList"
               :table-loading="loading"
               @search-change="searchChange"
               @search-reset="searchReset"
               @current-change="currentChange"
@@ -15,7 +15,7 @@
               @refresh-change="refreshChange"
               @on-load="onLoad">
    <template slot="description" slot-scope="scope">
      <avue-text-ellipsis :text="scope.row.description" :height="50">
        <avue-text-ellipsis :height="50" :text="scope.row.description">
        <small slot="more">...</small>
      </avue-text-ellipsis>
    </template>
@@ -34,12 +34,15 @@
                         @click="searchHandler">&nbsp;搜索</el-button>
              </span>
      </template>
      <template slot="menu" slot-scope="scope">
        <el-button type="text" icon="el-icon-view" size="mini" @click="rowView(scope.row)">查看</el-button>
      </template>
    </avue-crud>
  </basic-container>
</template>

<script>
  import { listLogOperate } from "@/api/logs";
import {listLogOperate,detailByOid} from "@/api/logs";
  import {mapGetters} from "vuex";

  export default {
@@ -60,7 +63,32 @@
            prop: "realName",
            align: "left",
            display: false
          }
        },
        {
          label: "用户ip",
          prop: "ip",
        },
        {
          label: "模块",
          prop: "model",

        },
        {
          label: "时间",
          prop: "time",

        },
        {
          label: "操作结果",
          prop: "operateResult",

        },
        {
          label: "描述",
          prop: "description",
          span: 24,
          minRows: 20,
        },
        ],
        form: {},
        selectionList: [],
@@ -84,7 +112,7 @@
          searchMenuSpan: 6,
          border: true,
          index: true,
          viewBtn: true,
        viewBtn: false,
          editBtn: false,
          addBtn: false,
          delBtn: false,
@@ -148,7 +176,17 @@
      this.getRouteParam()
    },
    methods: {
    rowView(row){
      this.loading = true;
      detailByOid({oid:row.oid}).then(res =>{
        if(res.data.data){
          this.loading = false
          this.$refs.crud.rowView(res.data.data)
        }
      })
    },
      searchHandler(){

        let params = {
          [this.searchSelect]:this.searchValue
        };