Merge remote-tracking branch 'origin/master'

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

@@ -61,19 +61,27 @@
}

// header参数
export const HeaderRequest =(params) => {
export const HeaderRequest =(page,limit,params) => {
  return request({
    url: '/api/ubcs-code/dockingManagement/gridHeader',
    method: 'get',
    ...params
    params: {
      ...params,
      page,
      limit
    }
  })
}

// 参数请求
export const ParmRequest =(params) => {
export const ParmRequest =(page,limit,params) => {
  return request({
    url: '/api/ubcs-code/dockingManagement/gridParam',
    method: 'get',
    ...params
    params:{
      ...params,
      page,
      limit
    }
  })
}

 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue

@@ -415,9 +415,8 @@
    },
    tableHeadDataFateher: {
      handler(newval, oldval) {
        // console.log(newval)
        if (newval.length > 0) {
          this.options = newval.tableDefineVO.seniorQueryColumns
        if (Object.keys(newval).length > 0) {
          this.options = newval.tableDefineVO.seniorQueryColumns;
        }
      }
    },
@@ -623,12 +622,16 @@
    async submitSync() {
      if (this.SyncValue) {
        this.syncLoading = true;
        const response = await syncSearch({enDate: this.SyncValue})
        const response = await syncSearch({endDate: this.SyncValue})
        if (response.status === 200) {
          this.$message.success('同步成功！')
          this.syncLoading = false;
          this.syncDialogBox = false;
          this.SyncValue = "";
        }else {
          this.syncLoading = false;
          this.syncDialogBox = false;
          this.SyncValue = "";
        }
      } else {
        this.$message.warning('请选择最后更新时间！')

 Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue

@@ -164,31 +164,19 @@
                         @click="TemRefresh">刷新</el-button>
              <el-button v-if="permissionList.CloneBtnStuatus" plain size="small" type="primary" @click="CloneBtn">从其它模板克隆</el-button>
              <!--              查询对话框-->
           <el-dialog :visible.sync="FindFormVisible" append-to-body title="高级查询">
              <div>
                <el-button size="small" type="primary" @click="AdvQueries">查询</el-button>
                <el-button size="small" type="primary">重置</el-button>
              </div>
             <div style="padding-left: 80px;margin-top: 15px;">
               <template v-for="(value, key) in FindSelect">
                <div style="display: flex; justify-content: space-around; width: 85%; margin-bottom: 15px">
                <el-select v-model="FindSelect[key]" placeholder="请选择" style="width: 28%"
                           @change="handleSelectChange(key)">
                  <el-option label="模板编号" value="0"></el-option>
                  <el-option label="模板名称" value="1"></el-option>
                  <el-option label="模板描述" value="2"></el-option>
                  <el-option label="版本号" value="3"></el-option>
                  <el-option label="状态" value="4"></el-option>
           <el-dialog :visible.sync="FindFormVisible" append-to-body title="高级查询" width="30%" @close="searchReset">
             <div style="text-align: center; margin-top: 5px;">
              <el-select v-model="searchSelect" style="width: 35%">
                <el-option v-for="item in crudFindTreeArray" :key="item.field" :label="item.title"
                           :value="item.queryField"></el-option>
                 </el-select>
                <el-select v-model="condition[0]" placeholder="请选择" style="width: 15%">
                  <el-option label="包含" value="0"></el-option>
                  <el-option label="等于" value="1"></el-option>
                </el-select>
              <el-input v-model="QueryArray[key]" style="width: 49%"></el-input>
          <span> <i class="el-icon-delete" style="font-size: 22px;margin-top:8px;margin-left: 10px"/></span>
                <el-input v-model="SearchValue"
                          placeholder="请输入关键字进行查询" style="width: 45%; margin-left: 5px;"></el-input>
             </div>
          </template>
        </div>
                  <span slot="footer" class="dialog-footer">
                <el-button type="primary" @click="advQueries">查询</el-button>
                <el-button type="danger" @click="searchReset">重置</el-button>
                  </span>
           </el-dialog>
              <!--            模板克隆  -->
                <el-dialog :before-close="cloneClose" :visible.sync="CloneVisible" append-to-body title="克隆模板">
@@ -378,6 +366,40 @@
  name: "classifyTrees.vue",
  data() {
    return {
      crudFindTreeArray: [
        {
          title: '模板编号',
          field: 'id',
          fieldType: 'text',
          queryField: 'id'
        },
        {
          title: '模板名称',
          field: 'name',
          fieldType: 'text',
          queryField: 'name'
        },
        {
          title: '模板描述',
          field: 'description',
          fieldType: 'text',
          queryField: 'description'
        },
        {
          title: '版本号',
          field: 'revisionSeq',
          fieldType: 'text',
          queryField: 'revisionSeq'
        },
        {
          title: '状态',
          field: 'lcStatusText',
          fieldType: 'text',
          queryField: 'lcStatusText'
        },
      ],
      searchSelect: 'id',
      SearchValue: '',
      allButtons: Boolean,
      btnAuthList: [],
      activeName: 'first',
@@ -669,11 +691,12 @@
      showEditBtn: false,
      //传递给分类授权子组件对话框的当前选中的分类节点信息
      classifyData: "",

    }
  },
  watch: {},
  mounted() {
    this.type = this.tabOption.column[0];
    this.type = this.tabOption.column[0] || {label: '基本信息', prop: 'tab1'};
    this.getAttr();
    const treeEle = this.$refs.tree.$el
    treeEle.addEventListener('click', (e) => {
@@ -768,7 +791,7 @@
          codeClassifyOid: ''
        }
      }
    }
    },
  },
  created() {
  },
@@ -1107,7 +1130,6 @@
        this.loading = false;
      }
    },

    async Deactivate() {
      if (Object.keys(this.nodeClickList).length < 1) {
        this.$message.warning('请先从树上选择一条数据');
@@ -1199,7 +1221,6 @@
        this.$message.error(error);
      }
    },

    // 递归查找顶层节点Id
    findTheTopLevelNode(data,TreeData){
      if(data.parentId === ""){
@@ -1276,34 +1297,28 @@
    handleChange(column) {
      this.type = column;
    },
    AdvQueries() {
      this.FindFormVisible = false
      //如果全部为空 allEmpty为true
      const allEmpty = Object.values(this.QueryArray).every(value => !value);
      //如果全部为空，点击查询出现所有数据
      if (allEmpty) {
        gridCodeClassifyTemplate().then(res => {
          this.Formlist = res.data.data
        })
    advQueries() {
      if (this.SearchValue === "") {
        this.$message.warning('请输入要查询的内容！');
      } else {
        //默认是等于
        gridCodeClassifyFindTemplate({'conditionMap[id]': this.QueryArray.id},
          {'conditionMap[name]': this.QueryArray.name},
          {'conditionMap[description]': this.QueryArray.description},
          {'conditionMap[revisionValue]': this.QueryArray.revisionValue},
          {'conditionMap[lcStatus]': this.QueryArray.lcStatus}
        ).then(res => {
          this.Formlist = res.data.data
        })
        const condition = {
          'conditionMap[codeclassifyoid]': this.nodeClickList.oid,
          [`conditionMap[${this.searchSelect}]`]: this.SearchValue
        };
        gridCodeClassifyFindTemplate(condition).then(res => {
          if (res.data.data.length > 0) {
            this.Formlist = res.data.data;
          } else {
            this.$message.error('暂未查询到相关模板！')
          }
          this.FindFormVisible = false;
        });
      }
    },
    //模板管理渲染
    CrudRend() {
      gridCodeClassifyTemplate({'conditionMap[codeclassifyoid]': this.nodeClickList.oid}).then(res => {
        this.Formlist = res.data.data
      })
    searchReset() {
      this.SearchValue = "";
      this.searchSelect = 'id'
    },

    //模板管理表格添加
    CrudRowSave(row, done) {
      if (this.nodeClickList.length <= 0) {
@@ -1548,6 +1563,7 @@
.headerCon > .el-button:nth-child(9) {
  margin-left: 0;
}

///deep/.el-scrollbar__bar.is-vertical{
//  width: 8px;
//}

 Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue

@@ -5,31 +5,31 @@
 -->
<template>
    <el-dialog
        title="高级查询"
        append-to-body
        width="46vw"
        style="height: 100vh;overflow: hidden"
        v-dialogDrag
        :visible.sync="isShowDialog"
        lock-scroll
    append-to-body
        class="avue-dialog avue-dialog--top"
        top="-3%"
        destroy-on-close
    lock-scroll
    style="height: 100vh;overflow: hidden"
    title="高级查询"
    top="-3%"
    width="46vw"
        @close="recoverPage">
        <div class="search-total">
            <!-- 头部按钮区域 -->
            <div slot="title" class="dialog-search-button">
                <el-button
                    type="primary"
                    size="small"
                    icon="el-icon-search"
          size="small"
          type="primary"
                    @click="searchSubmit">
                    查询
                </el-button>
                <el-button
                    type="warning"
                    size="small"
                    icon="el-icon-refresh"
          size="small"
          type="warning"
                    @click="resetInput">
                    重置
                </el-button>
@@ -42,7 +42,7 @@
                    :span="24">
                    <el-col :span="6">
                        <div class="grid-content">
                            <el-select disabled placeholder="请选择" v-model="searchFormArrays[index].queryField">
              <el-select v-model="searchFormArrays[index].queryField" disabled placeholder="请选择">
                                <el-option
                                    v-for="feildName in options"
                                    :key="feildName.queryField"
@@ -54,7 +54,7 @@
                    </el-col>
                    <el-col :span="4">
                        <div class="grid-content">
                            <el-select placeholder="请选择" v-model="searchFormArrays[index].condition">
              <el-select v-model="searchFormArrays[index].condition" placeholder="请选择">
                                <el-option
                                    v-for="condition in item.conditions"
                                    :key="condition.value"
@@ -66,8 +66,10 @@
                    </el-col>
                    <el-col :span="12">
                        <div class="grid-content">
                            <el-input v-if="item.fieldType==='text' || item.fieldType===''" v-model="searchFormArrays[index].fieldValue" type="text" placeholder="请输入"></el-input>
                            <el-select v-else-if="item.fieldType==='combox'" v-model="searchFormArrays[index].fieldValue" placeholder="请选择">
              <el-input v-if="item.fieldType==='text' || item.fieldType===''"
                        v-model="searchFormArrays[index].fieldValue" placeholder="请输入" type="text"></el-input>
              <el-select v-else-if="item.fieldType==='combox'" v-model="searchFormArrays[index].fieldValue"
                         placeholder="请选择">
                                <el-option
                                    v-for="option in item.data"
                                    :key="option.itemValue || option.value"
@@ -75,18 +77,19 @@
                                    :value="option.itemValue || option.value">
                                </el-option>
                            </el-select>
                            <el-switch v-else-if="item.fieldType==='truefalse'" v-model="searchFormArrays[index].fieldValue"></el-switch>
              <el-switch v-else-if="item.fieldType==='truefalse'"
                         v-model="searchFormArrays[index].fieldValue"></el-switch>
                            <el-date-picker v-else-if="item.fieldType==='datetime'"
                                v-model="searchFormArrays[index].fieldValue"
                                type="date"
                                placeholder="选择日期">
                              placeholder="选择日期"
                              type="date">
                            </el-date-picker>
                            <vci-web-refer
                                v-else-if="item.fieldType==='refer'"
                                :referConfig="item.referConfigData || {}"
                                :value="searchFormArrays[index].fieldValue"
                                :text="item.showField"
                                :display="!item.hidden"
                :referConfig="item.referConfigData || {}"
                :text="item.showField"
                :value="searchFormArrays[index].fieldValue"
                                @setReferValue="val=>setReferValue(val,index)">
                            </vci-web-refer>
                        </div>
@@ -106,6 +109,7 @@
import { getDictionary } from "@/api/omd/enum";
import moment from 'moment';
import vciWebRefer from '../refer/vciWebRefer.vue';

export default {
  components: { vciWebRefer },
    name: "advancedQuery",
@@ -197,6 +201,9 @@
        options(){
            this.initData();
        }
  },
  created() {
    this.resetInput()
    },
    methods: {

@@ -344,9 +351,11 @@
      border-radius: 4px;
      margin-top: -10px;
    }

    .dialog-search-button {
      margin-bottom: 15px;
    }

    // .search-total > .search-content > .el-row{
    //     margin-bottom: 5px;
    //     &:last-child {
@@ -355,36 +364,45 @@
    // }
    .search-total > .search-content {
    }

    .search-total > .search-content > .el-row > .el-col {
      border-radius: 4px;
    }

    .search-total > .search-content > .el-row > .el-col > .grid-content {
      border-radius: 4px;
      min-height: 36px;
    }

    .search-total > .search-content > .el-row > .el-col {
      margin-right: 6px;

      &:last-child {
        margin-right: 0;
      }
    }

    .grid-content > .el-icon-close {
      font-size: 30px;
      line-height: 40px;
      cursor: pointer;
      color: rgb(222, 130, 105);
    }

    .grid-content > .el-icon-close:hover {
      font-size: 30px;
      color: rgb(219, 52, 6);
    }

    .grid-content > .el-select {
      width: 100%;
    }

    .grid-content > .el-switch {
      line-height: 40px;
      height: 40px;
    }

    .grid-content > .el-date-editor.el-input, .el-date-editor.el-input__inner {
      width: 100%;
    }

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

@@ -59,7 +59,7 @@

<script>
import {
  getList, add, edit, del, push, updateStatus,HeaderRequest
  getList, add, edit, del, push, updateStatus, HeaderRequest, ParmRequest
} from "@/api/docking/info";
import {getDictionary} from "@/api/omd/enum";
import infoForm from "./infoForm.vue";
@@ -71,6 +71,8 @@

  data() {
    return {
      //下拉总类型
      DropDownTheTotalType: [],
      //接口类型下拉
      interfaceTypeList: [{
        label: 'webService', value: 'webService'
@@ -264,9 +266,6 @@
    };
  },
  created() {
    HeaderRequest().then(res => {
      console.log(res)
    })
  },
  computed: {
    ...mapGetters(["permission"]),
@@ -365,8 +364,14 @@
      this.editAttribute.type = 'edit';
      this.$refs.infoForm.formData = this.editAttribute;
      this.$refs.infoForm.showSubmitDialog = true;
      // console.log('row',this.editAttribute.pushType)
      // console.log('editAttribute',this.editAttribute.dataFlowTypeText)
      //header对象
      HeaderRequest(1, -1, {'conditionMap[infoOid]': row.oid}).then(res => {
        this.$refs.infoForm.formData.sysIntHeaderVOs = res.data.data.records;
      })
      //参数对象
      ParmRequest(1, -1, {'conditionMap[infoOid]': row.oid}).then(res => {
        this.$refs.infoForm.formData.sysIntParamVOs = res.data.data.records;
      })
    },
    deleteSave(row, index) {
      this.$confirm("删除数据将无法被恢复, 是否继续?", "提示", {

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

@@ -285,13 +285,13 @@
          {required: true, message: '请选择推送类型', trigger: 'blur'}
        ],
        classifyName: [
          {required: true, message: '请选择', trigger: 'sbumit'}
          {required: true, message: '请选择', trigger: 'submit'}
        ],
        sourceSystemName: [
          {required: true, message: '请选择', trigger: 'sbumit'}
          {required: true, message: '请选择', trigger: 'submit'}
        ],
        targetSystemName: [
          {required: true, message: '请选择', trigger: 'sbumit'}
          {required: true, message: '请选择', trigger: 'submit'}
        ],
        classPath: [
          {required: true, message: '请输入类路径', trigger: 'blur'}
@@ -478,6 +478,7 @@
    closeSubmitDialog() {
      // this.resetForm();
      this.showSubmitDialog = false;
      this.$refs.form.resetFields()
    },
    resetForm() {
      this.formData = {

 Source/UBCS-WEB/src/views/statistic/statisticPage.vue

@@ -2,7 +2,7 @@
  <!--  新增右侧按钮-->
  <div v-loading="loading">
    <div style=" display: flex; justify-content: flex-end;">
      <el-button plain type="primary" @click="addHandler">配置</el-button>
      <el-button plain type="primary" @click="addHandler" size="small">配置</el-button>
    </div>
    <!--新增对话框-->
    <el-dialog :visible.sync="addVisible" append-to-body class="avue-dialog avue-dialog--top" title="配置数据统计分析"
@@ -24,7 +24,7 @@
  </span>
    </el-dialog>
    <!--echarts组件-->
    <div style="margin-top: 15px;padding-bottom: 35px">
    <div style="margin-top: 10px;padding-bottom: 35px">
      <lineChart
        v-for="(item,index) in lineList"
        :key="index"