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

 Source/UBCS-WEB/src/const/omd/enum.js

@@ -1,6 +1,6 @@
export const optionParent = {
  height: 'auto',
  calcHeight: 30,
  calcHeight: 20,
  tip: false,
  searchShow: true,
  searchMenuSpan: 10,
@@ -94,7 +94,7 @@

export const optionChild = {
  height: 'auto',
  calcHeight: 95,
  calcHeight: 200,
  tip: false,
  searchShow: true,
  searchMenuSpan: 10,

 Source/UBCS-WEB/src/views/modeling/Business.vue

@@ -1,6 +1,6 @@
<template>
  <el-container>
    <el-header class="businessHeader" style="height: 40px;">
    <el-header class="businessHeader" style="height: 40px;padding:0 8px">
      <el-button-group>
        <el-button type="primary" @click="businessAdd" size="small"> <i class="el-icon-plus"></i>&nbsp; 新增</el-button>
        <el-button type="primary" @click="businessEdit" size="small"><i class="el-icon-edit"></i>&nbsp; 修改</el-button>
@@ -58,9 +58,10 @@
                  <i :class="icons.domain"></i>
                  所属领域
                </template>
                <el-tag size="small">
                <el-tag v-if="obj.domainText" size="small">
                  {{ obj.domainText }}
                </el-tag>
                <span v-else></span>
              </el-descriptions-item>
              <!-- <el-descriptions-item>
            <template slot="label">
@@ -98,9 +99,10 @@
                  <i :class="icons.view"></i>
                  视图
                </template>
                <el-tag size="small">
                <el-tag v-if="obj.viewText" size="small">
                  {{ obj.viewText }}
                </el-tag>
                <span v-else></span>
              </el-descriptions-item>
              <!-- <el-descriptions-item>
            <template slot="label">
@@ -189,7 +191,7 @@
      },
      loadOption: {
        border: true,
        height: 466,
        height: 478,
        editBtn: false,
        addBtn: false,
        menu: false,

 Source/UBCS-WEB/src/views/modeling/LinkType.vue

@@ -64,7 +64,7 @@
                                    <i :class="icons.domain"></i>
                                    所属领域
                                </template>
                                <el-tag size="small">
                                <el-tag v-if="obj.domainText" size="small">
                                    {{ obj.domainText }}
                                </el-tag>
                            </el-descriptions-item>
@@ -179,7 +179,7 @@
            },
            loadOption: {
                border: true,
                height: 360,
                height: 395,
                editBtn: false,
                addBtn: false,
                menu: false,
@@ -282,4 +282,3 @@
    display: none !important;
}
</style>
  

 Source/UBCS-WEB/src/views/modeling/LinkTypeAdd.vue

@@ -376,8 +376,8 @@
    display: none !important;
}

.linkTypeForm>.el-form-item>.el-form-item__content>.el-input>.el-input__inner {
    width: 200px;
.linkTypeForm>.el-form-item>.el-form-item__content>.el-input>.el-input__inner,.linkTypeForm>.el-form-item>.el-form-item__content>.el-select{
    width: 290px;
}

.descClass>.el-input__inner {
@@ -387,4 +387,7 @@
#descId {
    width: 57vw;
}
.el-tag + .el-tag{
  margin-top: 2px;
}
</style>

 Source/UBCS-WEB/src/views/modeling/cycle.vue

@@ -111,6 +111,8 @@
        layout: "total, sizes, prev, pager, next, jumper",
      },
      option: {
        height:'auto',
        calcHeight:20,
        selection: true,
        searchMenuSpan: 6,
        searchMenuPosition: "right",

 Source/UBCS-WEB/src/views/modeling/original.vue

@@ -161,7 +161,8 @@
      editAttribute: {},
      applyRangeData: [],
      option: {
        height: "550px",
        height: "auto",
        calcHeight:20,
        headerAlign: "center",
        border: true,
        index: true,

 Source/UBCS-WEB/src/views/modeling/status.vue

@@ -56,6 +56,8 @@
        ],
        form:{},
        option:{
          height:'auto',
          calcHeight:20,
          headerAlign:'center',
          align: 'center',
          border: true,

 Source/UBCS-WEB/src/views/omd/enum.vue

@@ -52,6 +52,8 @@
    <el-dialog :title="`[${name}]枚举项配置`"
               append-to-body
               :visible.sync="box"
               top="-6vh"
               class="avue-dialog avue-dialog--top"
               width="1000px">
      <avue-crud
        :option="optionChild"

 Source/UBCS-WEB/src/views/work/claim.vue

@@ -65,7 +65,7 @@
        workBox: false,
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 0,
          tip: false,
          simplePage: true,
          searchShow: true,

 Source/UBCS-WEB/src/views/work/done.vue

@@ -60,7 +60,7 @@
        workBox: false,
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 0,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 Source/UBCS-WEB/src/views/work/send.vue

@@ -64,7 +64,7 @@
        workBox: false,
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 20,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 Source/UBCS-WEB/src/views/work/start.vue

@@ -79,7 +79,7 @@
        workBox: false,
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 20,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

 Source/UBCS-WEB/src/views/work/todo.vue

@@ -65,7 +65,7 @@
        workBox: false,
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 0,
          tip: false,
          simplePage: true,
          searchShow: true,