Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

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

@@ -4,26 +4,29 @@
    3、用户输入的值会以conditionMap[field]的格式拼接好进行回传，然后就需要使用的地方自行进行查询的调用；
 -->
<template>
    <el-dialog 
    <el-dialog
        title="高级查询"
        append-to-body
        width="55vw"
        style="height: 115vh; margin-top: -10vh; overflow: hidden"
        width="46vw"
        style="height: 100vh;overflow: hidden"
        v-dialogDrag
        :visible.sync="isShowDialog"
        lock-scroll
        class="avue-dialog avue-dialog--top"
        top="-3%"
        :close-on-click-modal="false"
        @close="recoverPage">
        <div class="search-total">
            <!-- 头部按钮区域 -->
            <div slot="title" class="dialog-search-button"> 
                <el-button 
                    type="primary"  
            <div slot="title" class="dialog-search-button">
                <el-button
                    type="primary"
                    size="small"
                    icon="el-icon-search"
                    @click="searchSubmit">
                    查询
                </el-button>
                <el-button 
                <el-button
                    type="warning"
                    size="small"
                    icon="el-icon-refresh"
@@ -33,11 +36,11 @@
            </div>
            <!-- 页面主体内容区域 -->
            <div class="search-content">
                <el-row  
                <el-row
                    v-for="(item,index) in initOptions"
                    :key="item.queryField"
                    :span="24">
                    <el-col :span="5">
                    <el-col :span="6">
                        <div class="grid-content">
                            <el-select disabled placeholder="请选择" v-model="searchFormArrays[index].queryField">
                                <el-option
@@ -67,9 +70,9 @@
                            <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"
                                    :label="option.itemName"
                                    :value="option.itemValue">
                                    :key="option.itemValue || option.value"
                                    :label="option.itemName || option.label"
                                    :value="option.itemValue || option.value">
                                </el-option>
                            </el-select>
                            <el-switch v-else-if="item.fieldType==='truefalse'" v-model="searchFormArrays[index].fieldValue"></el-switch>
@@ -88,7 +91,7 @@
                            </vci-web-refer>
                        </div>
                    </el-col>
                    <el-col :span="2">
                    <el-col :span="1">
                        <div class="grid-content">
                            <i class="el-icon-close" @click="removeInput(index)"></i>
                        </div>
@@ -174,7 +177,7 @@
                    label: "不等于",
                },{
                    value: "_ge", //大于，默认为大于等于
                    label: "大于", 
                    label: "大于",
                },{
                    value: "_le", //小于，默认为小于等于
                    label: "小于",
@@ -205,7 +208,7 @@
                    let array = [];
                    this.initOptions.forEach((item,index) => {
                        if(item.fieldType==='combox') {
                            let enumCach = JSON.parse(localStorage.getItem(item.comboxKey));
                            let enumCach = item.data || JSON.parse(localStorage.getItem(item.comboxKey));
                            if(enumCach != null) {
                                item.data = enumCach;
                            }else {
@@ -223,22 +226,22 @@
                                options: Object.assign(item.referConfig,{width:"80%"}),
                            })
                            //console.log(item.referConfigData.options);
                            //console.log(item);   
                            //console.log(item);
                        }
                        // TODO: 这儿修改一下参照的查询条件
                        let conditions = [];
                        if(item.fieldType==='text'){
                            conditions = this.searchConditions;
                        }else if (item.fieldType==='combox'){
                            conditions = this.dateConditions;
                        }else if (item.fieldType==='combox'|| item.fieldType==='truefalse'){
                          conditions = this.switchSearchConditions;
                        }else if (item.fieldType==='datetime') {
                            conditions = this.switchSearchConditions;
                          conditions = this.dateConditions;
                        }else {
                            conditions = this.referSearchConditions;
                        }
                        // console.log(conditions);
                        this.$set(item,"conditions",conditions)
                        

                        let add = {
                            queryField: String(item.queryField),
                            condition: item.fieldType==='text' ? String("_like"):String("_equal"),
@@ -254,13 +257,10 @@

        /** 为参照类型时值选择之后的处理 */
        setReferValue(data,index){
            // console.log(index);
            if(data.field) {
                this.searchFormArrays[index][data.fieldValue] = data.value || '';
                this.initOptions[index][data.showField] = data.text || '';
            }
            // console.log(this.initOptions[index][data.showField]);
            // console.log(data);
        },

        // 属性切换时查询条件和查询值也需要对输入框进行切换
@@ -288,7 +288,7 @@
        // },

        // 移除搜索框
        

        removeInput(index){
            //console.log(this.initOptions);
            this.$delete(this.initOptions,index);
@@ -324,32 +324,18 @@
            console.log(condtionParam);
            this.$emit('echoContion',condtionParam)
            this.isShowDialog = false;
        },    
        },
    }
}
</script>

<style lang="scss" scoped>

    .search-total {
        border-radius: 4px;
        min-height: 70vh;
        // margin-left: 35px;
        margin-top: -8px;
        overflow-y: auto; 
        height: 70vh;
      border-radius: 4px;
      margin-top: -10px;
    }
    .dialog-search-button {
        border-top: 1px solid #E9E7E7;
        border-bottom: 1px solid #E9E7E7;
        padding: 10px 10px 10px;
        position: fixed;
        display: block;
        background-color: #fff;
        // top: 10%;
        margin-top: -30px;
        width: 50%;
        z-index: 1000;
      margin-bottom: 15px;
    }
    // .search-total > .search-content > .el-row{
    //     margin-bottom: 5px;
@@ -358,39 +344,39 @@
    //     }
    // }
    .search-total > .search-content {
        margin-top: 40px;
    }
    .search-total > .search-content > .el-row > .el-col {
        border-radius: 4px;
      border-radius: 4px;
    }
    .search-total > .search-content > .el-row > .el-col > .grid-content {
        border-radius: 4px;
        min-height: 36px;
      border-radius: 4px;
      min-height: 36px;
    }
    .search-total > .search-content > .el-row > .el-col {
        margin-right: 6px;
        &:last-child {
            margin-right: 0;
        }
      margin-right: 6px;
      &:last-child {
        margin-right: 0;
      }
    }
    .grid-content > .el-icon-close {
        font-size: 35px;
        cursor: pointer;
        color: rgb(222, 130, 105);
      font-size: 30px;
      line-height: 40px;
      cursor: pointer;
      color: rgb(222, 130, 105);
    }
    .grid-content > .el-icon-close:hover{
        font-size: 38px;
        color: rgb(219, 52, 6);
    .grid-content > .el-icon-close:hover {
      font-size: 30px;
      color: rgb(219, 52, 6);
    }
    .grid-content > .el-select {
        width: 100%;
      width: 100%;
    }
    .grid-content > .el-switch {
        line-height: 40px;
        height: 40px;
      line-height: 40px;
      height: 40px;
    }
    .grid-content > .el-date-editor.el-input, .el-date-editor.el-input__inner{
        width: 100%;
    .grid-content > .el-date-editor.el-input, .el-date-editor.el-input__inner {
      width: 100%;
    }

</style>
</style>

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

@@ -116,13 +116,13 @@
            return this.pushTypeList[d.pushType]
          }
        }, {
          label: '系统名称',
          prop: 'sysBaseName',
          label: '系统编号',
          prop: 'id',
          sortable: true,
          width: 150
        }, {
          label: '系统编号',
          prop: 'sysBaseId',
          label: '系统名称',
          prop: 'name',
          sortable: true,
          width: 150
        }, {
@@ -171,6 +171,10 @@
          formatter:function (d){
            return this.returnTypeList[d.returnType]
          }
        }, {
          label: '系统描述',
          prop: 'description',
          width: 150
        }]
      },
      // 高级查询对话框相关参数
@@ -266,18 +270,18 @@
    },
    ENABLE(row,index){
      //启用
      this.updateStatus("enable");
      this.updateStatus(row,"enable");
    },
    DISABLE(row,index){
      //停用
      this.updateStatus("disable");
      this.updateStatus(row,"disable");
    },
    updateStatus(able){
    updateStatus(selectRow,able){
      var that = this;
      var paramTemp = {
        update:able,
        oid:this.selectRow.oid,
        ts:this.selectRow.ts
        oid:selectRow.oid,
        ts:selectRow.ts
      };
      this.$confirm("是否要"+(able == "enbale" ? "启用" : (able == "disable" ? "停用": "发布")) +"这条数据？", {
        confirmButtonText: "确定",
@@ -293,12 +297,11 @@
            type: "success",
            message:(able == "enbale" ? "启用成功" : (able == "disable" ? "停用成功": "发布成功"))
          });
          this.$refs.crud.toggleSelection();
        });
    },
    PUSH(){
      if (this.selectionList.length != 1) {
        this.$message.error('请选择数据')
        this.$message.warning('请选择数据')
        return false;
      }
      this.$confirm("是否要"+ (this.selectionList[0].pushType == "1" ? "推送数据" : "推送分类"), {
@@ -322,10 +325,10 @@
      this.loading = true;
      getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
        const data = res.data.data;
        debugger;
        this.page.total = data.total;
        this.data = data.records;
        this.loading = false;
        this.data = res.data.data.records;
      });
    },
    rowClick(row) {
@@ -341,43 +344,57 @@
      }
    },
    openAdvancedQuery(){
        this.advancedQueryParam.options = [
          {
            data: [],
            title: '编号',
            fieldType: 'text',
            queryField: 'id',
          },{
            data: [],
            title: '名称',
            fieldType: 'text',
            queryField: 'name',
          },{
            data: [],
            title: '描述',
            fieldType: 'text',
            queryField: 'description',
          },{
            data: [
              // {
              //   key: '编辑中',
              //   value: 'Editing',
              // },
              // {
              //   key: '已发布',
              //   value: 'Released',
              // },
              // {
              //   key: '停用',
              //   value: 'Disabled',
              // },
            ],
            title: '状态',
            fieldType: 'combox',
            queryField: 'lcStatus',
            comboxKey: 'codeSearchLCStatus',
          },
        ]
        this.advancedQueryParam.options = [{
          data: this.pushTypeList,
          title: '推送类型',
          queryField: 'pushType',
          fieldType: 'combox',
          comboxKey: 'searchPushType'
        }, {
          title: '系统名称',
          queryField: 'sysBaseName',
          fieldType: 'text'
        }, {
          title: '系统编号',
          queryField: 'sysBaseId',
          fieldType: 'text'
        }, {
          title: '接口函数',
          queryField: 'interfaceFunction',
          fieldType: 'text'
        }, {
          title: '命名空间',
          queryField: 'nameSpace',
          fieldType: 'text'
        }, {
          title: 'soapAction',
          queryField: 'soapAction',
          fieldType: 'text'
        }, {
          title: '参数名称',
          queryField: 'targName',
          fieldType: 'text'
        }, {
          title: '调用方式',
          queryField: 'cxfaxis',
          fieldType: 'text'
        }, {
          title: '请求地址',
          queryField: 'requestUrl',
          fieldType: 'text'
        }, {
          title: '参数类型',
          queryField: 'paramType',
          fieldType: 'combox',
          comboxKey: 'searchparamType',
          data:this.paramTypeList
        }, {
          title: '返回值类型',
          queryField: 'returnType',
          fieldType: 'combox',
          comboxKey: 'searchreturnType',
          data:this.returnTypeList
        }]

      this.advancedQueryParam.currentOpen = 'info';
      this.advancedQueryParam.advancedQuerySettingBox = true;

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

@@ -105,7 +105,7 @@
        <el-form-item  v-if="formData.pushType=='7'" label="是否查询集团码" prop="isGroupCodeFlag">
          <el-switch v-model="formData.isGroupCodeFlag" ></el-switch>
        </el-form-item>
        <el-form-item label="系统描述"  style="width: 850px;">
        <el-form-item label="系统描述"  style="width: 850px;" prop="description">
          <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 5}" v-model="formData.description" style="width: 740px;"></el-input>
        </el-form-item>
        <el-form-item v-if="formData.interfaceType=='http'" label="请求方式" prop="requestMethod">