Merge remote-tracking branch 'origin/master'

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

@@ -1398,7 +1398,7 @@
          },
          {
            label: "多行文本",
            prop: "textareaFlag",
            prop: "textAreaFlag",
            cell: false,
            edit: "switch"
          },
@@ -1619,7 +1619,7 @@
        value: 'sortAttrFlag',
        label: '列表排序'
      }, {
        value: 'textareaFlag',
        value: 'textAreaFlag',
        label: '多行文本'
      }, {
        value: 'imageFlag',

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

@@ -216,6 +216,7 @@
            width: 150,
            type: "textarea",
            slot: true,
            hide:true,
          },
          {
            label:'返回参数',

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

@@ -309,7 +309,6 @@
          // const groupReturnData = res.data && res.data.data ? res.data.data.map(item => item.groupAttrKey) : [];
          const groupReturnData = res.data.data;
          // 过滤匹配
          // console.log(groupReturnData)
          this.mappingData.forEach(mappingItem => {
            groupReturnData.forEach(groupItem => {
              if (mappingItem.sourceAttrKey === groupItem.groupAttrKey) {
@@ -329,7 +328,6 @@
          this.$message.success('自动填充成功，请确认属性后点击保存！');
        })
        .catch(error => {
          console.log(error)
          this.$message.error('填充失败，请稍后再试！');
        });
    },
@@ -440,7 +438,6 @@
      this.rangeData = []
      const response = await gridAttrRanges({meatId: oid})
      if (response.status === 200) {
        // console.log(response.data)
        this.rangeData = response.data.data
      }
    },
@@ -581,7 +578,6 @@
      }
    },
    handelTransferSave(event) {
      // console.log(event)
      let that = this
      const transferValue = event.value
      if (Object.keys(that.mappingForm).length == 0) {
@@ -693,7 +689,7 @@
          });
        }
      } catch (error) {
        console.error('处理映射更新时出错：', error);
        this.$message.error(error)
      } finally {
        done();
      }
@@ -710,7 +706,7 @@
      }
    },
    setCurrentRow(selection, row) {
      console.log(selection, row)

      this.mappingForm = row
      this.disabledPush = false
    },

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

@@ -129,7 +129,6 @@
  },
  methods: {
    searchHandler() {
      console.log(this.searchSelect)
      const params = {
        [`conditionMap[${this.searchSelect}_like]`]: this.searchValue,
        page: this.page.currentPage,
@@ -191,12 +190,9 @@

      // row.codeMetaAttrName因为下拉框value值原因绑定为codeMetaAttrOid
      let updataList = []
      // console.log(this.ChangeName)
      // console.log(row.codeMetaAttrName)
      // if (this.ChangeName && this.ChangeName === row.codeMetaAttrName) {
      //   updataList = this.codeMetaColumn.dicData.find(item => item.codeMetaAttrOid === row.codeMetaAttrOid)
      // } else {
      //   console.log('2')
      //     updataList = this.codeMetaColumn.dicData.find(item => item.codeMetaAttrOid === row.codeMetaAttrName)
      // }
      updataList = this.codeMetaColumn.dicData.find(item => item.codeMetaAttrOid === row.codeMetaAttrName)
@@ -266,7 +262,6 @@
          this.$message.success('保存成功！')
          await this.onLoad()
        }

      }
    },
    async syncHandler() {

 Source/UBCS-WEB/src/views/monitor/log/operateLog.vue

@@ -19,6 +19,21 @@
        <small slot="more">...</small>
      </avue-text-ellipsis>
    </template>
      <template slot="menuLeft">
        <span style="width: 200px;display: inline-block">
                <el-select slot="prepend" v-model="searchSelect" placeholder="请选择" size="small">
                <el-option v-for="item in searchData" :key="item.prop" :label="item.label" :value="item.prop"
                ></el-option>
              </el-select>
            </span>
        <span style="margin-left: 5px">
                 <el-input v-model="searchValue" class="attrSearch" clearable placeholder="请输入内容"
                           prefix-icon="el-icon-search"
                           size="small" type="text"></el-input>
              <el-button  icon="el-icon-search" plain size="small" type="primary"
                         @click="searchHandler">&nbsp;搜索</el-button>
              </span>
      </template>
    </avue-crud>
  </basic-container>
</template>
@@ -30,6 +45,23 @@
  export default {
    data() {
      return {
        searchSelect: "userName",
        searchValue: '',
        searchData: [
          {
            label: "用户名",
            prop: "userName",
            align: "left",
            display: false,
            width: 200,
            required: true
          }, {
            label: "姓名",
            prop: "realName",
            align: "left",
            display: false
          }
        ],
        form: {},
        selectionList: [],
        query: {},
@@ -48,7 +80,7 @@
          calcHeight: 20,
          columnBtn:false,
          tip: false,
          searchShow: true,
          searchShow: false,
          searchMenuSpan: 6,
          border: true,
          index: true,
@@ -74,22 +106,21 @@
            {
              label: "用户ip",
              prop: "ip",
              width:'130'
            },
            {
              label: "模块",
              prop: "model",
              width:'140'

            },
            {
              label: "时间",
              prop: "time",
              width:'160'

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

            },
            {
              label: "描述",
@@ -97,6 +128,7 @@
              span: 24,
              minRows: 20,
              type: "textarea",
              hide:true,
              slot: true,
            },
          ]
@@ -116,6 +148,13 @@
      this.getRouteParam()
    },
    methods: {
      searchHandler(){
        let params = {
          [this.searchSelect]:this.searchValue
        };
        this.page.currentPage = 1;
        this.onLoad(this.page, params);
      },
      //获取数据
      getRouteParam() {
        const logType = this.$route.query.log_type; // 获取log_type参数的值