修复周三测试提出的住数据bug

2024-06-28 08:38:48 +08:00 · 2024-06-28 08:38:48 +08:00 · aee09418c5
parent a1d3e34009
commit aee09418c5
12 changed files with 308 additions and 361 deletions
--- a/src/App.vue
+++ b/src/App.vue
@ -79,9 +79,9 @@ export default {
 }
 // 全局滚动条样式调整
 ::-webkit-scrollbar {
-  width: 10px;
+  width: 5px;
  /*滚动条宽度*/
-  height: 10px;
+  height: 5px;
  /*滚动条高度*/
 }

@ -106,26 +106,13 @@ export default {
 </style>
 <style lang="scss">
 .el-table__header-wrapper {
-  border-radius: 10px !important;
  background: #f7f7f7 !important;
 }
-.el-table__body-wrapper {
-  //   border-radius: 15px !important;
-  //   margin-top: 5px;
-}
-.el-table__body {
-  padding-top: 5px;
-}
 .el-table {
  width: 100%;
-  margin-bottom: 20px;
  &::before {
    display: none;
  }
-  .el-table__body {
-    //-webkit-border-horizontal-spacing: 13px;  // 水平间距
-    -webkit-border-vertical-spacing: 7px; // 垂直间距 设置的是行间距
-  }
  //以下代码是实现边框效果
  thead th {
    font-size: 14px;
@ -141,21 +128,20 @@ export default {
    font-family: PingFangSC-Regular, PingFang SC;
    font-weight: 400;
    padding: 10px 0;
-    border-top: 1px solid rgba(0, 0, 0, 0.1) !important;
+    border-top: 0px solid rgba(0, 0, 0, 0.1) !important;
    border-bottom: 1px solid rgba(0, 0, 0, 0.1) !important;
+ background: #fff;
    &:first-child {
-      border-left: 1px solid rgba(0, 0, 0, 0.1) !important;
+      border-left: 0px solid rgba(0, 0, 0, 0.1) !important;
      // border-radius: 5px 0 0 5px;
-      border-radius: 10px 0 0 10px;
    }
  }
  .el-table__row > td {
    font-size: 12px;
    color: #333333;
    &:last-child {
-      border-right: 1px solid rgba(0, 0, 0, 0.1) !important;
+      border-right: 0px solid rgba(0, 0, 0, 0.1) !important;
      // border-radius: 0 5px 5px 0;
-      border-radius: 0 10px 10px 0;
      right: 1px;
    }
  }
--- a/src/components/base/baseRightDialog/index.vue
+++ b/src/components/base/baseRightDialog/index.vue
@ -17,12 +17,12 @@
        <div flex="cross:center main:justify" class="rightConcat">
          <span style="font-size: 16px">{{ title }}</span>
          <span v-if="footerShow" flex="main:right">
-            <el-button @click="handleClose" v-if="closeShow">取 消</el-button>
+            <el-button @click="handleClose" v-if="closeShow">关 闭</el-button>
            <el-button
              type="primary"
              @click="handleConfirmClick"
              v-if="submitShow"
-              >确 定</el-button
+              >保 存</el-button
            >
          </span>
          <slot name="buttonPlus"></slot>
@ -110,7 +110,7 @@ export default {
  /* padding-bottom:16px; */
  padding: 16px 0;
  overflow-y: auto;
-  border-bottom: 1px solid #ddd;
+  border-bottom: 1px solid #eee;
  margin-bottom: 20px;
 }
 </style>
--- a/src/views/integrationOptionV2/index.vue
+++ b/src/views/integrationOptionV2/index.vue
@ -351,6 +351,7 @@ export default {
      // })
      //主表处理
      console.log(res, 'res')
+      //将所有tableColumn预处理
      res.attribute.listList.forEach(item => {
        this.mainTableName = item.dbName
        item.ruleList.forEach(ele => {
--- a/src/views/masterDataOptions/compoments/baseNewForm.vue
+++ b/src/views/masterDataOptions/compoments/baseNewForm.vue
@ -25,7 +25,7 @@
      >
        <el-form-item
          :prop="row.id"
-          :style="`display: flex;margin-bottom: ${marginBottom}px;padding:0 20px`"
+          :style="`display: flex;margin-bottom: ${marginBottom}px;padding:0 10px`"
          v-if="row.show != false"
          :class="rules[row.id] ? 'ruleFormClass ' : ''"
          :rules="
@ -812,7 +812,7 @@ export default {
 }

 .el-form-item--medium .el-form-item__content {
-  /* line-height: 36px; */
+  line-height: 20px !important;
  flex: 1;
 }

@ -823,13 +823,13 @@ export default {
 </style>
 <style scoped lang="scss">
 ::v-deep .el-form-item__label {
-  padding: 0 0 5px !important;
+  padding: 0 0 0px !important;
 }

 .label {
  /* @include fontBase(16px, #333333) ; */
  color: #999;
-  font-size: 13px;
+  font-size: 14px !important;
  display: block;
  width: 180px;
  // text-align: left;
--- a/src/views/masterDataOptions/dataOrigin/index.vue
+++ b/src/views/masterDataOptions/dataOrigin/index.vue
@ -549,7 +549,7 @@ export default {
    font-weight: 600;
    font-size: 18px;
    color: #333333;
-    line-height: 25px;
+    line-height: 20px;
    text-align: left;
    font-style: normal;
  }
@ -560,7 +560,7 @@ export default {
    border-right: 1px solid #EBEBEB;;

    .rule {
-      margin-top: 30px;
+      margin-top: 20px;
      display: flex;
      align-items: center;
      width: 100%;
@ -584,8 +584,8 @@ export default {
      .btn {
        margin-left: 15px;
        cursor: pointer;
-        width: 24px;
-        height: 24px;
+        width: 25px;
+        height: 25px;
        background: #EBEBED;
        border-radius: 6px;
        display: flex;
@ -593,8 +593,8 @@ export default {
        align-items: center;

        > img {
-          width: 10px;
-          height: 10px;
+          width: 15px;
+          height: 15px;
        }
      }
    }
--- a/src/views/masterDataOptions/dataOrigin/mainTable.vue
+++ b/src/views/masterDataOptions/dataOrigin/mainTable.vue
@ -6,7 +6,7 @@
        :isFunBtn="false"
        :formRow="mainOptionRow"
        :ruleForm="mainOptionForm"
-        :labelPosition="'left'"
+        :labelPosition="'top'"
        @onSubmit="mainOptionOnSubmit"
    >
    </baseNewForm>
--- a/src/views/masterDataOptions/dataOrigin/sonTable.vue
+++ b/src/views/masterDataOptions/dataOrigin/sonTable.vue
@ -7,7 +7,7 @@
        :isFunBtn="false"
        :formRow="optionFormRow"
        :ruleForm="optionRuleForm"
-        :labelPosition="'left'"
+        :labelPosition="'top'"
        @onSelect="selectChangeHanlde"
        @inputBlur="optionFormInputBlur"
        @onSubmit="optionOnSubmit"
@ -19,7 +19,7 @@
        :isFunBtn="false"
        :formRow="typeOptionFormRow"
        :ruleForm="typeOptionRuleForm"
-        :labelPosition="'left'"
+        :labelPosition="'top'"
        @onSelect="typeSelectChangeHanlde"
        @onSubmit="typeOptionOnSubmit"
      >
@ -30,7 +30,7 @@
        :isFunBtn="false"
        :formRow="propertyFormRow"
        :ruleForm="propertyRuleForm"
-        :labelPosition="'left'"
+        :labelPosition="'top'"
        @onSubmit="propertyOnSubmit"

      >
@ -715,8 +715,8 @@ export default {

 <style scoped lang="scss">
 .smtitle {
-  color: #000;
-  font-weight: 600;
+  color: #333;
+  font-weight: 400;
  padding: 20px 0;
  border-top: 1px solid #EBEBEB;
 }
--- a/src/views/masterDataOptions/displayInfo/index.vue
+++ b/src/views/masterDataOptions/displayInfo/index.vue
@ -1,45 +1,42 @@
 <template>
-  <div class="displayInfo">
-
-    <div class="main" v-loading="mainLoading">
-
-      <div class="typeSetting">
-        <div class="btn">
-          <div class="chunk">
-            <el-button
+  <div class="displayInfo" v-loading="mainLoading">
+    <div class="typeSetting">
+      <div class="btn">
+        <div class="chunk">
+          <el-button
              v-if="!editFlag"
              icon="el-icon-edit"
              type="primary"
              @click="editFlag=true"
-            >编辑
-            </el-button>
-            <el-button
-                v-if="editFlag"
-                icon="el-icon-close"
-                @click="getRuleForm"
-                :loading="saveLoading"
-            >取消
-            </el-button>
-            <el-button
+          >编辑
+          </el-button>
+          <el-button
+              v-if="editFlag"
+              icon="el-icon-close"
+              @click="getRuleForm"
+              :loading="saveLoading"
+          >取消
+          </el-button>
+          <el-button
              v-if="editFlag"
              icon="el-icon-first-aid-kit"
              type="primary"
              @click="saveHandle"
              :loading="saveLoading"
-            >保存
-            </el-button>
-          </div>
+          >保存
+          </el-button>
        </div>
-        <template v-if="!editFlag">
-          <div class="title">显示类型</div>
-          <div class="radio">
-            <el-radio-group v-model="displayType" :disabled="true">
-              <el-radio label="1">树形</el-radio>
-              <el-radio label="2">列表</el-radio>
-            </el-radio-group>
-          </div>
-          <div class="form" v-if="displayType == 1">
-            <baseNewForm
+      </div>
+      <template v-if="!editFlag">
+        <div class="title">显示类型</div>
+        <div class="radio">
+          <el-radio-group v-model="displayType" :disabled="true">
+            <el-radio label="1">树形</el-radio>
+            <el-radio label="2">列表</el-radio>
+          </el-radio-group>
+        </div>
+        <div class="form" v-if="displayType == 1">
+          <baseNewForm
              ref="optionForm"
              :spanNumber="24"
              :isFunBtn="false"
@ -49,20 +46,20 @@
              labelWidth="100px"
              @onSubmit="onSubmit"
              :lookFlag="true"
-            >
-            </baseNewForm>
-          </div>
-        </template>
-        <template v-else>
-          <div class="title">显示类型</div>
-          <div class="radio">
-            <el-radio-group v-model="displayType">
-              <el-radio label="1">树形</el-radio>
-              <el-radio label="2">列表</el-radio>
-            </el-radio-group>
-          </div>
-          <div class="form" v-if="displayType == 1">
-            <baseNewForm
+          >
+          </baseNewForm>
+        </div>
+      </template>
+      <template v-else>
+        <div class="title">显示类型</div>
+        <div class="radio">
+          <el-radio-group v-model="displayType">
+            <el-radio label="1">树形</el-radio>
+            <el-radio label="2">列表</el-radio>
+          </el-radio-group>
+        </div>
+        <div class="form" v-if="displayType == 1">
+          <baseNewForm
              ref="optionForm"
              :spanNumber="24"
              :isFunBtn="false"
@ -71,124 +68,123 @@
              :labelPosition="'right'"
              labelWidth="100px"
              @onSubmit="onSubmit"
-            >
-            </baseNewForm>
-          </div>
-        </template>
+          >
+          </baseNewForm>
+        </div>
+      </template>

-      </div>
-      <div class="main">
-        <div class="content">
-          <div class="showItem">
-            <div class="itemTitle">查询</div>
-            <div class="setting">
-              <div class="settingBox" @click="settingHandle('查询')">
-                <div class="img">
-                  <img src="./images/设置.png" alt="">
-                </div>
-                <div class="value">设置</div>
-              </div>
-            </div>
-            <div class="showCheckBoxList">
-              <div class="showCheckBoxItem" v-for="(item,index) in dbQueryFiled" :key="index">
-                <div class="name">{{ item.viewName }}</div>
+    </div>
+    <div class="main">
+      <div class="content">
+        <div class="showItem">
+          <div class="itemTitle">查询</div>
+          <div class="setting">
+            <div class="settingBox" @click="settingHandle('查询')">
+              <div class="img">
+                <img src="./images/设置.png" alt="">
              </div>
+              <div class="value">设置</div>
            </div>
          </div>
-          <div class="showItem">
-            <div class="itemTitle">列表</div>
-            <div class="setting">
-              <div class="settingBox" @click="settingHandle('列表')">
-                <div class="img">
-                  <img src="./images/设置.png" alt="">
-                </div>
-                <div class="value">设置</div>
-              </div>
-            </div>
-            <div class="showCheckBoxList">
-              <div class="showCheckBoxItem" v-for="(item,index) in dbListFiled" :key="index">
-                <div class="name">{{ item.viewName }}</div>
-              </div>
+          <div class="showCheckBoxList">
+            <div class="showCheckBoxItem" v-for="(item,index) in dbQueryFiled" :key="index">
+              <div class="name">{{ item.viewName }}</div>
            </div>
          </div>
-          <div class="showItem">
-            <div class="itemTitle">新增</div>
-            <div class="setting">
-              <div class="settingBox" @click="settingHandle('新增')">
-                <div class="img">
-                  <img src="./images/设置.png" alt="">
-                </div>
-                <div class="value">设置</div>
-              </div>
-            </div>
-            <div class="showCheckBoxList">
-              <div class="showCheckBoxItem" v-for="(item,index) in dbAddFiled" :key="index">
-                <div class="name">{{ item.viewName }}</div>
+        </div>
+        <div class="showItem">
+          <div class="itemTitle">列表</div>
+          <div class="setting">
+            <div class="settingBox" @click="settingHandle('列表')">
+              <div class="img">
+                <img src="./images/设置.png" alt="">
              </div>
+              <div class="value">设置</div>
            </div>
          </div>
-          <div class="showItem">
-            <div class="itemTitle">修改</div>
-            <div class="setting">
-              <div class="settingBox" @click="settingHandle('修改')">
-                <div class="img">
-                  <img src="./images/设置.png" alt="">
-                </div>
-                <div class="value">设置</div>
-              </div>
-            </div>
-            <div class="showCheckBoxList">
-              <div class="showCheckBoxItem" v-for="(item,index) in dbEditFiled" :key="index">
-                <div class="name">{{ item.viewName }}</div>
-              </div>
+          <div class="showCheckBoxList">
+            <div class="showCheckBoxItem" v-for="(item,index) in dbListFiled" :key="index">
+              <div class="name">{{ item.viewName }}</div>
            </div>
          </div>
-          <div class="showItem">
-            <div class="itemTitle">查看</div>
-            <div class="setting">
-              <div class="settingBox" @click="settingHandle('查看')">
-                <div class="img">
-                  <img src="./images/设置.png" alt="">
-                </div>
-                <div class="value">设置</div>
-              </div>
-            </div>
-            <div class="showCheckBoxList">
-              <div class="showCheckBoxItem" v-for="(item,index) in dbShowFiled" :key="index">
-                <div class="name">{{ item.viewName }}</div>
+        </div>
+        <div class="showItem">
+          <div class="itemTitle">新增</div>
+          <div class="setting">
+            <div class="settingBox" @click="settingHandle('新增')">
+              <div class="img">
+                <img src="./images/设置.png" alt="">
              </div>
+              <div class="value">设置</div>
            </div>
          </div>
-          <div class="showItem">
-            <div class="itemTitle">按钮</div>
-            <div class="setting">
-              <div class="settingBox" @click="settingHandle('按钮')">
-                <div class="img">
-                  <img src="./images/设置.png" alt="">
-                </div>
-                <div class="value">设置</div>
-              </div>
+          <div class="showCheckBoxList">
+            <div class="showCheckBoxItem" v-for="(item,index) in dbAddFiled" :key="index">
+              <div class="name">{{ item.viewName }}</div>
            </div>
-            <div class="showCheckBoxList">
-              <div class="showCheckBoxItem" v-for="(item,index) in btnShowList" :key="index">
-                <div class="name">{{ item.name }}</div>
+          </div>
+        </div>
+        <div class="showItem">
+          <div class="itemTitle">修改</div>
+          <div class="setting">
+            <div class="settingBox" @click="settingHandle('修改')">
+              <div class="img">
+                <img src="./images/设置.png" alt="">
              </div>
+              <div class="value">设置</div>
+            </div>
+          </div>
+          <div class="showCheckBoxList">
+            <div class="showCheckBoxItem" v-for="(item,index) in dbEditFiled" :key="index">
+              <div class="name">{{ item.viewName }}</div>
+            </div>
+          </div>
+        </div>
+        <div class="showItem">
+          <div class="itemTitle">查看</div>
+          <div class="setting">
+            <div class="settingBox" @click="settingHandle('查看')">
+              <div class="img">
+                <img src="./images/设置.png" alt="">
+              </div>
+              <div class="value">设置</div>
+            </div>
+          </div>
+          <div class="showCheckBoxList">
+            <div class="showCheckBoxItem" v-for="(item,index) in dbShowFiled" :key="index">
+              <div class="name">{{ item.viewName }}</div>
+            </div>
+          </div>
+        </div>
+        <div class="showItem">
+          <div class="itemTitle">按钮</div>
+          <div class="setting">
+            <div class="settingBox" @click="settingHandle('按钮')">
+              <div class="img">
+                <img src="./images/设置.png" alt="">
+              </div>
+              <div class="value">设置</div>
+            </div>
+          </div>
+          <div class="showCheckBoxList">
+            <div class="showCheckBoxItem" v-for="(item,index) in btnShowList" :key="index">
+              <div class="name">{{ item.name }}</div>
            </div>
          </div>
        </div>
      </div>
-
    </div>
+
    <!--     -->
    <base-right-dialog
-      ref="mainTableAddtDialog"
-      :footerShow="true"
-      :dialogVisible.sync="mainTableDialogShow"
-      :title="activeTitle + '设置'"
-      :submitShow="true"
-      :size="'50%'"
-      @handleConfirmClick="mainTableSaveHandle"
-      @handleClose="mainTableDialogShow=false"
+        ref="mainTableAddtDialog"
+        :footerShow="true"
+        :dialogVisible.sync="mainTableDialogShow"
+        :title="activeTitle + '设置'"
+        :submitShow="true"
+        :size="'50%'"
+        @handleConfirmClick="mainTableSaveHandle"
+        @handleClose="mainTableDialogShow=false"
    >
      <div class="mainTable">
        <settingChunk ref="settingChunk" @saveSuccessEmit="saveSuccessEmit"></settingChunk>
@ -445,9 +441,9 @@ export default {

 .displayInfo {
  background-color: #fbfbfb;
-  width: 100%;
  position: relative;
  margin-left: 5px;
+  width: 99%;

  > .btn {
    display: flex;
@ -458,143 +454,142 @@ export default {
    }
  }

-  > .main {
-    margin-top: 10px;
-    .typeSetting {
-      background-color: #fff;
-      padding: 15px 10px;
-      margin-bottom: 10px;
-      border-radius: 16px;
+  .typeSetting {
+    background-color: #fff;
+    padding: 15px 10px;
+    margin-bottom: 10px;
+    border-radius: 16px;
+    width: 100%;

-      > .btn {
-        display: flex;
-        justify-content: flex-end;
-      }
-
-      > .title {
-        font-weight: 600;
-        margin-left: 20px;
-        margin-bottom: 25px;
-        font-family: PingFangSC, PingFang SC;
-        font-weight: 600;
-        font-size: 18px;
-        color: #333333;
-        line-height: 25px;
-        text-align: left;
-        font-style: normal;
-      }
-
-      > .radio {
-        margin: 20px 20px;
-      }
-
-      > .tabIndex {
-        margin-top: 10px;
-      }
+    > .btn {
+      display: flex;
+      justify-content: flex-end;
    }

+    > .title {
+      font-weight: 600;
+      margin-left: 20px;
+      margin-bottom: 25px;
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 600;
+      font-size: 18px;
+      color: #333333;
+      line-height: 25px;
+      text-align: left;
+      font-style: normal;
+    }

-    .main {
-      border-radius: 16px;
-      background-color: #fff;
-      overflow: auto;
-      padding: 15px 10px;
+    > .radio {
+      margin: 20px 20px;
+    }

-      > .content {
-        margin-top: 1vh;
-        width: 2100px;
+    > .tabIndex {
+      margin-top: 10px;
+    }
+  }

-        .showItem {
-          display: inline-block;
-          width: 340px;
-          margin-left: 8px;
-          height: 58vh;
-          background: #FFFFFF;
+  .main {
+    border-radius: 16px;
+    background-color: #fff;
+    padding: 15px 10px;
+    width: 100%;
+    overflow: auto;
+
+    .content {
+      margin-top: 1vh;
+      display: flex;
+      align-items: center;
+      width: 2000px;
+
+      .showItem {
+        flex: 1;
+        margin-left: 15px;
+        height: 58vh;
+        background: #FFFFFF;
+        border-radius: 8px;
+        border: 1px solid #EBEBEB;
+        padding: 14px 20px;
+        position: relative;
+
+        .itemTitle {
+          font-family: PingFangSC, PingFang SC;
+          font-weight: 500;
+          font-size: 16px;
+          color: #333333;
+          line-height: 22px;
+          font-style: normal;
+          text-align: center;
+          padding-bottom: 20px;
+          border-bottom: 1px #ebebeb solid;
+        }
+
+        .setting {
+          width: 100%;
+          height: 140px;
+          position: absolute;
+          bottom: 0;
+          left: 0;
          border-radius: 8px;
-          border: 1px solid #EBEBEB;
-          padding: 14px 20px;
-          position: relative;
+          display: none;
+          justify-content: center;
+          align-items: center;
+          background-color: rgba(0, 0, 0, .6);

-          .itemTitle {
-            font-family: PingFangSC, PingFang SC;
-            font-weight: 500;
-            font-size: 16px;
-            color: #333333;
-            line-height: 22px;
-            font-style: normal;
-            text-align: center;
-            padding-bottom: 20px;
-            border-bottom: 1px #ebebeb solid;
+          .settingBox {
+            cursor: pointer;
+
+            .img {
+              width: 44px;
+              height: 44px;
+
+              img {
+                width: 100%;
+                height: 100%;
+              }
+            }
+
+            .value {
+              margin-top: 10px;
+              font-family: PingFangSC, PingFang SC;
+              font-weight: 600;
+              font-size: 16px;
+              color: #FFFFFF;
+              line-height: 22px;
+              text-align: center;
+              font-style: normal;
+            }
          }
+        }

+        &:hover {
          .setting {
-            width: 100%;
-            height: 140px;
-            position: absolute;
-            bottom: 0;
-            left: 0;
-            border-radius: 8px;
-            display: none;
-            justify-content: center;
-            align-items: center;
-            background-color: rgba(0, 0, 0, .6);
-
-            .settingBox {
-              cursor: pointer;
-
-              .img {
-                width: 44px;
-                height: 44px;
-
-                img {
-                  width: 100%;
-                  height: 100%;
-                }
-              }
-
-              .value {
-                margin-top: 10px;
-                font-family: PingFangSC, PingFang SC;
-                font-weight: 600;
-                font-size: 16px;
-                color: #FFFFFF;
-                line-height: 22px;
-                text-align: center;
-                font-style: normal;
-              }
-            }
+            display: flex !important;
          }
+        }

-          &:hover {
-            .setting {
-              display: flex !important;
-            }
-          }
+        .showCheckBoxList {
+          height: 40vh;
+          overflow: auto;
+        }

-          .showCheckBoxList {
-            height: 40vh;
-            overflow: auto;
-          }
-
-          .showCheckBoxItem {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            margin: 16px 0 16px;
-            border-radius: 4px;
-            font-size: 14px;
+        .showCheckBoxItem {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin: 16px 0 16px;
+          border-radius: 4px;
+          font-size: 14px;


-            .btn {
-              color: grey;
-              cursor: pointer;
-            }
+          .btn {
+            color: grey;
+            cursor: pointer;
          }
        }
      }
    }
-
  }

+
 }
 </style>
--- a/src/views/masterDataOptions/index.vue
+++ b/src/views/masterDataOptions/index.vue
@ -18,7 +18,8 @@
          </div>
        </div>
      </div>
-      <div class="right">
+      <div class="right" style="display: flex;align-items: center">
+        <div style="margin-right: 5px;color: #333;font-size: 12px">共 <span>{{tableData.length}}个主数据</span></div>
        <!--        <el-button type="primary" icon="el-icon-plus" @click="addApp">新增</el-button>-->
        <el-button type="primary" icon="el-icon-plus" @click="tableButtonHandle({},{type:'new'})">新增</el-button>
      </div>
@ -68,43 +69,6 @@
          </div>
        </div>
      </div>
-      <!--      <BaseTable ref="mainTable" :tableData="tableData" :tableColumn="tableColumn" :funData="funData"-->
-      <!--                 :funWidth="funWidth" :showIndex="true" :tabLoading="mainTabLoading" @onFunc="tableButtonHandle"-->
-      <!--                 :tableHeight="'70vh'" :border="false">-->
-      <!--        <template v-slot:mdmName="{ row }">-->
-      <!--          <div class="nameCard">-->
-      <!--            <div class="image" v-loading="row.imgLoading">-->
-      <!--              <template v-if="row.imgUrl">-->
-      <!--                <img :src="row.imgUrl" alt=""/>-->
-      <!--              </template>-->
-      <!--              <template v-else>-->
-      <!--                <img src="./images/icon.png">-->
-      <!--              </template>-->
-      <!--            </div>-->
-      <!--            <div class="nameInfo">-->
-      <!--              <div class="name">{{ row.mdmName }}</div>-->
-      <!--            </div>-->
-      <!--          </div>-->
-      <!--        </template>-->
-      <!--        <template v-slot:accessMode="{ row }">-->
-      <!--          <div class="taskClasses">-->
-      <!--            <span :class="`state${item}`" v-for="(item,index) in JSON.parse(row.accessMode)"-->
-      <!--                  :key="index">{{ methods_dist[item] }}</span>-->
-      <!--          </div>-->
-      <!--        </template>-->
-      <!--        <template v-slot:interfaceStatus="{ row }">-->
-      <!--          <el-switch active-value="1" inactive-value="2" active-color="#60c958" v-model="row.interfaceStatus"-->
-      <!--                     disabled></el-switch>-->
-      <!--        </template>-->
-      <!--        <template v-slot:dbStatus="{ row }">-->
-      <!--          <el-switch active-value="1" inactive-value="2" active-color="#60c958" v-model="row.dbStatus"-->
-      <!--                     disabled></el-switch>-->
-      <!--        </template>-->
-      <!--        <template v-slot:appStatus="{ row }">-->
-      <!--          <el-switch active-value="1" inactive-value="2" active-color="#60c958" v-model="row.appStatus"-->
-      <!--                     @change="(val)=>appStatusChange(val,row)"></el-switch>-->
-      <!--        </template>-->
-      <!--      </BaseTable>-->
    </main>
    <footer>
      <!--      <basePage :pageModel="pageModel" @update:pageModel="currentChangeHandle"></basePage>-->
@ -376,26 +340,28 @@ export default {

      .tableChunk {
        width: 30%;
-        margin-bottom: 30px;
+        margin-bottom: 15px;
        margin-left: 2.5%;
        border-radius: 24px;
-        border: 2px solid #E5E5E5;
-        padding-bottom: 20px;
+        border: 1px solid #E5E5E5;
+        padding-bottom: 10px;
        position: relative;
        overflow: hidden;

        .topInfo {
          display: flex;
-          margin: 20px 0 0 26px;
+          margin: 15px 0 0 15px;

          .left {
            .icon {
-              width: 88px;
-              height: 88px;
+              width: 70px;
+              height: 70px;
              border-radius: 16px;
              border: 1px solid #F0F0F2;
              padding: 14px;
-
+              display: flex;
+              justify-content: center;
+              align-items: center;
              > img {
                width: 60px;
                height: 60px;
@ -422,7 +388,7 @@ export default {
              > .name {
                font-family: PingFangSC, PingFang SC;
                font-weight: 400;
-                font-size: 24px;
+                font-size: 18px;
                color: #333333;
                line-height: 33px;
                text-align: left;
@ -431,7 +397,6 @@ export default {
            }

            .tableType {
-              margin-top: 11px;
              width: 38px;
              height: 24px;
              background: #1478F6;
@ -448,7 +413,7 @@ export default {
            .tableContent {
              margin-top: 5px;
              width: 95%;
-              height: 60px;
+              height: 40px;
              font-family: PingFangSC, PingFang SC;
              font-weight: 400;
              font-size: 14px;
@ -458,7 +423,7 @@ export default {
              font-style: normal;
              display: -webkit-box; /*作为弹性伸缩盒子模型显示。*/
              -webkit-box-orient: vertical; /*作为弹性伸缩盒子模型显示。*/
-              -webkit-line-clamp: 3; //*显示的行*/
+              -webkit-line-clamp: 2; //*显示的行*/
              overflow: hidden; /*溢出隐藏*/
              /* 对于连字情况或者纯字母，可以解决 */
              word-break: break-all;
--- a/src/views/masterDataOptions/masterDataAdd.vue
+++ b/src/views/masterDataOptions/masterDataAdd.vue
@ -307,13 +307,12 @@ export default {
  margin-left: 5px;

  .title {
-    margin-bottom: 20px;
+    margin-bottom: 10px;
    margin-left: 32px;
    font-family: PingFangSC, PingFang SC;
    font-weight: 600;
    font-size: 18px;
    color: #333333;
-    line-height: 25px;
    text-align: left;
    font-style: normal;
  }
@ -327,7 +326,7 @@ export default {
      display: flex;
      justify-content: flex-end;
      align-items: center;
-      padding: 15px 10px;
+      padding: 15px 10px 3px;

      .chunkList {
        display: flex;
@ -386,7 +385,7 @@ export default {
    > .upload {
      background-color: #fff;
      border-radius: 16px;
-      padding: 24px 30px;
+      padding: 12px 30px 0px;

      > .title {
        font-size: 18px;
--- a/src/views/masterDataOptions/settingMenu.vue
+++ b/src/views/masterDataOptions/settingMenu.vue
@ -135,7 +135,7 @@ export default {

  .menu {
    position: fixed;
-    width: 11%;
+    width: 180px;
    height: 90vh;
    //margin-right: 1%;
    background-color: #fff;
@ -143,7 +143,7 @@ export default {
    overflow: auto;

    .appInfo {
-      padding: 16px 0;
+      padding: 10px 0;
      border-bottom: 1px solid #f3f3f3;
      display: flex;
      flex-direction: column;
@ -184,7 +184,7 @@ export default {
      align-items: center;

      .item {
-        margin-bottom: 24px;
+        margin-bottom: 20px;

        display: flex;
        flex-direction: column;
@ -192,8 +192,8 @@ export default {
        align-items: center;

        > .icon {
-          width: 64px;
-          height: 64px;
+          width: 50px;
+          height: 50px;
          text-align: center;
          border-radius: 12px;
          display: flex;
@ -202,7 +202,7 @@ export default {

          > .iconfont {
            font-weight: 300;
-            font-size: 37px;
+            font-size: 35px;
            color: #000;
          }

@ -216,9 +216,9 @@ export default {
        }

        > .title {
-          margin-top: 11px;
+          margin-top: 10px;
          color: #333333;
-          font-size: 18px;
+          font-size: 16px;
          font-weight: 600;
          user-select: none;
        }
@ -235,8 +235,9 @@ export default {
  }

  .content {
-    margin-left: 11.5%;
-    width: 88%;
+    margin-left: 180px;
+    flex: 1;
+    width: calc(100% - 190px);
    border-radius: 16px;
  }
 }
--- a/vue.config.js
+++ b/vue.config.js
@ -39,9 +39,9 @@ module.exports = {
    proxy: {
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
-        // target: `http://hzya.ufyct.com:9067/`,
+        target: `http://hzya.ufyct.com:9067/`,
        // target: `http://127.0.0.1:9081/`,
-        target: `http://192.168.2.78:9999`,
+        // target: `http://192.168.2.78:9999`,
        changeOrigin: true,
        pathRewrite: {
          ["^" + process.env.VUE_APP_BASE_API]: "",