Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/package.json

@@ -29,6 +29,7 @@
    "script-loader": "^0.7.2",
    "vue": "^2.6.10",
    "vue-axios": "^2.1.2",
    "vue-clipboard2": "^0.3.3",
    "vue-flowchart-editor": "^1.0.2",
    "vue-i18n": "^8.7.0",
    "vue-router": "^3.0.1",

 Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,75 @@
<template>
  <div style="display: flex" >
    <el-form :inline="true" :model="formInline" class="demo-form-inline">
      <el-form-item label="类型:" size="small">
        <el-select v-model="formInline.type" placeholder="请输入类型" @change="SelectChange">
          <el-option :label="item.label" :value="item.value" v-for="item in SearchObject.searchData" ></el-option>
        </el-select>
      </el-form-item>
      <el-form-item v-if="typeFlag" size="small">
        <el-select v-model="formInline.check" placeholder="请选择分类">
          <el-option label="1" value="0"></el-option>
          <el-option label="2" value="1"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item size="small" v-if="dateFlag">
        <el-date-picker
          v-model="formInline.Date"
          type="date"
          placeholder="选择日期时间">
        </el-date-picker>
      </el-form-item>
      <el-form-item size="small" >
        <el-input v-model="formInline.text" placeholder="请输入内容" @keyup.enter.native="SaveHandler"></el-input>
      </el-form-item>
    </el-form>
  </div>
</template>

<script>
import {getList} from "@/api/docking/loge";
export default {
  name: "VciDockingSearch",
  props:['SearchObject','page'],
  data() {
    return {
      typeFlag:false,
      dateFlag:false,
      formInline:{
        type:'',
        check:'',
        text:'',
        Date:''
      },
    }
  },
  methods:{
    SelectChange(val){
      this.typeFlag = (this.SearchObject.type === 'loge' && val === 5);
      this.dateFlag = (this.SearchObject.type === 'loge' && val === 6);
      // if(this.SearchObject.type === 'loge'){
      //   if(val === 5){
      //     this.typeFlag=true;
      //   }else {
      //     this.typeFlag=false;
      //   }
      //   if(val === 6){
      //     this.dateFlag=true;
      //   }else {
      //     this.dateFlag=false;
      //   }
      // }
    },
    SaveHandler(){
      let name = this.SearchObject.searchData[this.formInline.type].prop;
      getList(this.page.currentPage, this.page.pageSize, {[name]: this.formInline.text}).then(res => {
        console.log(res);
      });
    }
  }
}
</script>

<style scoped>

</style>

 Source/UBCS-WEB/src/main.js

@@ -56,6 +56,7 @@
import MasterTransfer from "@/components/Master/MasterTransfer";
import ThemeImport from "@/components/Theme/ThemeImport";
import maxSerialnumDialog from '@/components/code-dialog-page/maxSerialnumDialog'
import VciDockingSearch from '@/components/dockingSearch/VciDockingSearch'
// å°†å·¥å…·å‡½æ•°æ·»åŠ åˆ°å…¨å±€
import utilFunc from './util/func'
Vue.prototype.$utilFunc = utilFunc
@@ -74,6 +75,9 @@
  calcHeight: 65,
  i18n: (key, value) => i18n.t(key, value)
});
//复制插件
import VueClipboard from 'vue-clipboard2'
Vue.use( VueClipboard )
// æ³¨å†Œå…¨å±€å®¹å™¨
Vue.component('basicContainer', basicContainer);
Vue.component('basicBlock', basicBlock);
@@ -112,6 +116,7 @@
Vue.component('MasterTransfer', MasterTransfer)
Vue.component('ThemeImport', ThemeImport)
Vue.component('maxSerialnumDialog', maxSerialnumDialog)
Vue.component('VciDockingSearch', VciDockingSearch)

// åŠ è½½ç›¸å…³url地址
Object.keys(urls).forEach(key => {

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

@@ -7,6 +7,7 @@
               :page.sync="page"
               :permission="permissionList"
               ref="crud"
               @cell-dblclick="cellDbClick"
               @search-change="searchChange"
               @search-reset="searchReset"
               @selection-change="selectionChange"
@@ -14,6 +15,9 @@
               @size-change="sizeChange"
               @refresh-change="refreshChange"
               @on-load="onLoad">
      <template slot-scope="scope" slot="menuLeft">
        <vci-docking-search :SearchObject="SearchObject" :page="page"></vci-docking-search>
      </template>
    </avue-crud>
  </basic-container>
</template>
@@ -27,6 +31,52 @@
  name: "loge",
  data(){
    return {
      value:'',
      SearchObject:{
        type:'loge',
        searchData:[
          {
            label:'数据编码',
            prop: "id",
            value:0
          },
          {
            label:'分类代号',
            prop: 'classifyId',
            value:1
          },
          {
            label:'分类名称',
            prop: 'classifyName',
            value:2
          },
          {
            label:'集成系统编号',
            prop: 'systemCode',
            value:3
          },
          {
            label:'集成系统名称',
            prop: 'systemName',
            value:4
          },
          {
            label:'类型',
            prop: 'typeText',
            value:5
          },
          {
            label:'记录时间',
            value:6,
            prop: 'createTime',
          },
          {
            label:'是否成功',
            prop: 'interfaceStatus',
            value:7
          },
        ],
      },
      loading: false,
      query: {},
      selectionList: [],
@@ -41,7 +91,7 @@
        calcHeight: 0,
        tip: false,
        searchShow: false,
        searchMenuSpan: 6,
        // searchMenuSpan: 12,
        border: true,
        index: true,
        viewBtn: true,
@@ -52,14 +102,12 @@
          {
            label: "数据编码",
            prop: "id",
            search: true,
            sortable:true,
            width:130
          },
          {
            label: "图号",
            prop: "uniqueCode",
            search: true,
            hide:true,
            sortable:true,
            width:150
@@ -67,7 +115,6 @@
          {
            label: '分类代号',
            prop: 'classifyId',
            search: true,
            sortable:true,
            overHidden:true,
            width: 150
@@ -75,7 +122,6 @@
          {
            label: '分类名称',
            prop: 'classifyName',
            search: true,
            sortable:true,
            overHidden: true,
            width: 140
@@ -83,21 +129,18 @@
          {
            label: '集成系统编号',
            prop: 'systemCode',
            search: true,
            sortable:true,
            width: 130
          },
          {
            label: '集成系统名称',
            prop: 'systemName',
            search: true,
            sortable:true,
            width: 150
          },
          {
            label: '类型',
            prop: 'typeText',
            search: true,
            sortable:true,
            width: 150
          },
@@ -105,7 +148,6 @@
            label:'接口参数',
            prop:'paramString',
            overHidden:true,
            search: true,
            sortable:true,
            width: 150
          },
@@ -113,7 +155,6 @@
            label:'返回参数',
            prop:'returnString',
            overHidden:true,
            search: true,
            sortable:true,
            width: 150
          },
@@ -131,7 +172,6 @@
          {
            label: '是否成功',
            prop: 'interfaceStatus',
            search: true,
            sortable:true,
            width: 120,
            html:true,
@@ -163,6 +203,19 @@
    }
  },
  methods: {
    async cellDbClick(row, column, cell, event) {
      for (const key in row) {
        if (key === column.property) {
          this.value = row[key];
        }
      }
      try {
        await this.$copyText(this.value);
        this.$message.success('复制成功');
      } catch (error) {
        this.$message.warning('复制失败');
      }
    },
    searchReset() {
      this.query = {};
      this.onLoad(this.page);