fix

xukangle
Showing 6 changed files with 105 additions and 33 deletions
src/assets/icons/waring.svg
src/layouts/components/Tools/index.vue
src/views/data_asset/registerCatalogManagement.vue
src/views/data_product/productListing.vue
src/views/indexNewBigScreen.vue
src/views/security_menu/index.vue
--- a/src/assets/icons/waring.svg 0 → 100644
View file @6ff7ed6
+++ b/src/assets/icons/waring.svg 0 → 100644
View file @6ff7ed6
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>0.全局样式/1.图标/4.基础面性图标/警告</title>
+    <g id="0.全局样式/1.图标/4.基础面性图标/警告" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M16,2 C23.7319865,2 30,8.2680135 30,16 C30,23.7319865 23.7319865,30 16,30 C8.2680135,30 2,23.7319865 2,16 C2,8.2680135 8.2680135,2 16,2 Z M16,22 C15.1715729,22 14.5,22.6715729 14.5,23.5 C14.5,24.3284271 15.1715729,25 16,25 C16.8284271,25 17.5,24.3284271 17.5,23.5 C17.5,22.6715729 16.8284271,22 16,22 Z M16,7 C15.4477153,7 15,7.44771525 15,8 L15,8 L15,19 C15,19.5522847 15.4477153,20 16,20 C16.5522847,20 17,19.5522847 17,19 L17,19 L17,8 C17,7.44771525 16.5522847,7 16,7 Z" id="形状结合" fill="#FF991C"></path>
+    </g>
+</svg>
--- a/src/layouts/components/Tools/index.vue
View file @6ff7ed6
+++ b/src/layouts/components/Tools/index.vue
View file @6ff7ed6
@@ -66,7 +66,6 @@ onMounted(() => {
            <svg-icon name="ep:caret-bottom" />
          </el-icon>
        </div>
      </div>
      <template #dropdown>
        <el-dropdown-menu class="user-dropdown">
--- a/src/views/data_asset/registerCatalogManagement.vue
View file @6ff7ed6
+++ b/src/views/data_asset/registerCatalogManagement.vue
View file @6ff7ed6
@@ -54,6 +54,9 @@ const searchItemList = ref([
    props: {
      value: 'value',
      label: 'label'
+    },
+    style: {
+      width: '230px'
    }
  },
  {
@@ -303,12 +306,19 @@ const handleCreate = () => {
 // 定义 ref 和响应式高度
 const tableToolsRef = ref<any>(null);
 const tableToolsHeight = ref<any>(0);
+const searchHeight = ref<any>(0);
 // 获取 TableTools 的高度
 const getTableToolsHeight = () => {
  const tableToolsElement: any = tableToolsRef.value;
  if (tableToolsElement) {
+    console.log('tableToolsElement', tableToolsElement.offsetHeight);
    tableToolsHeight.value = tableToolsElement.offsetHeight;
+    if (tableToolsHeight.value > 40 && tableToolsHeight.value < 80) {
+      searchHeight.value = tableToolsHeight.value - 30;
+    } else if (tableToolsHeight.value > 80) {
+      searchHeight.value = tableToolsHeight.value - 78;
+    }
  }
 };
 // 在组件挂载后获取初始高度
@@ -345,7 +355,7 @@ const handleWindowResize = () => {
      </div> -->
    </div>
    <div class="table_panel_wrap" :style="{ height: `calc(100% - ${tableToolsHeight + 60}px)` }">
-      <div class="data-content" v-loading="listDataLoading" :style="{ height: `calc(100% - ${tableToolsHeight}px)` }">
+      <div class="data-content" v-loading="listDataLoading" :style="{ height: `calc(100% - ${searchHeight}px)` }">
        <div class="v-add" @click.stop="handleCreate">
          <div class=" add-img"></div>
          <div class="add-titile">
@@ -458,7 +468,7 @@ const handleWindowResize = () => {
 :deep(.tools_search) {
  .el-form-item .el-select {
-    width: 240px;
+    width: 230px;
  }
 }
--- a/src/views/data_product/productListing.vue
View file @6ff7ed6
+++ b/src/views/data_product/productListing.vue
View file @6ff7ed6
@@ -851,10 +851,12 @@ const formInfo = ref<any>({
    <div class="list-content" v-if="demandListData.length > 0">
      <div class="card-content" v-for="item in demandListData" :key="item.guid">
        <div class="header">
+          <div class="header-top">
            <img class="left-img" :src="(item.picUrl && typeof item.picUrl == 'string') ? item.picUrl : defaultItemLogo"
              alt="" />
-          <div class="right-main">
            <div class="title">{{ item.exchangeName ?? '--' }}</div>
+          </div>
+          <div class="right-main">
            <div class="count-group">
              <div class="count-item">
                <div class="item-label">已上架产品数</div>
@@ -868,10 +870,17 @@ const formInfo = ref<any>({
          </div>
        </div>
        <div class="operator-btn" @click="btnClick(item)">
+          <!-- <div class="left-btn">更新模板</div> -->
-          <div class="left-btn">资产登记</div>
+          <div class="right-btn">产品上架</div>
+        </div>
      </div>
    </div>
+    <div class="v-tip">
+      <div class="tip-icon"></div>
+      <div class="tip-des">
+        在各数交所上架时，会同时在门户、专区和主平台门户进行展示；在门户上架则只会在门户上架，不会在数交所、专区及主平台门户上架。
+      </div>
    </div>
    <div class="table_panel_wrap" :style="{
      height: demandListData.length > 0 ? 'calc(100% - 230px)' : 'calc(100% - 54px)'
@@ -920,33 +929,42 @@ const formInfo = ref<any>({
    display: flex;
    justify-content: flex-start;
    flex-wrap: wrap;
-    margin-bottom: 8px;
    padding: 0 8px;
    .card-content {
      width: 300px;
-      padding: 16px;
      box-shadow: 0 0 0 1px #d9d9d9;
-      margin-right: 12px;
+      border-radius: 3px;
+      margin-right: 18px;
+      margin-bottom: 12px;
      .header {
        display: flex;
-        margin-bottom: 16px;
+        flex-direction: column;
+        padding: 16px;
+        .header-top {
+          display: flex;
+          align-items: center;
+          margin-bottom: 22px;
          img {
-          width: 80px;
+            width: 20px;
-          margin-right: 16px;
+            height: 20px;
+            margin-right: 8px;
          }
          .title {
            font-size: 16px;
            color: #212121;
            font-weight: 600;
-          margin-bottom: 8px;
          }
+        }
        .right-main {
-          width: calc(100% - 96px);
+          width: 100%;
+          padding: 0 16px;
          display: flex;
          flex-direction: column;
          justify-content: space-between;
@@ -956,10 +974,11 @@ const formInfo = ref<any>({
            justify-content: space-between;
            .item-num {
-              font-size: 20px;
+              font-size: 24px;
              font-weight: 600;
-              color: #212121;
+              color: #44ABB4;
              margin-top: 8px;
+              text-align: center;
            }
          }
        }
@@ -970,37 +989,63 @@ const formInfo = ref<any>({
        // justify-content: space-between;
        justify-content: center;
        align-items: center;
-        box-shadow: 0 0 0 1px #d9d9d9;
        position: relative;
        width: 100%;
-        height: 40px;
+        height: 44px;
        line-height: 40px;
-        background: #4fa1a4;
+        background: #FAFAFA;
        color: #fff;
        cursor: pointer;
+        border-bottom-left-radius: 3px;
+        border-bottom-right-radius: 3px;
+        border-top: 1px solid #d9d9d9;
        // &::after {
        //   content: '';
        //   width: 0;
-        //   height: 100%;
+        //   height: 26px;
        //   border-left: 1px solid #d9d9d9;
        //   position: absolute;
        //   left: 50%;
        //   transform: translateX(-50%);
        // }
-        // >.left-btn {
+        .left-btn,
-        //   width: 50%;
+        .right-btn {
-        //   height: 40px;
+          width: 50%;
-        //   line-height: 40px;
+          height: 40px;
-        //   text-align: center;
+          line-height: 40px;
-        //   cursor: pointer;
+          text-align: center;
+          cursor: pointer;
+          color: #666666;
+        }
+      }
+    }
+  }
-        // &:hover {
+  .v-tip {
-        //   color: #4fa1a4;
+    display: flex;
-        // }
+    height: 40px;
+    align-items: center;
+    background: #FFFBF2;
+    border: 1px solid rgba(255, 241, 212, 1);
+    border-radius: 4px;
+    margin: 5px 8px 17px 8px;
-        // }
+    .tip-icon {
+      width: 16px;
+      height: 16px;
+      background: url('@/assets/icons/waring.svg') no-repeat;
+      background-size: 100% 100%;
+      margin: 0 10px;
    }
+    .tip-des {
+      font-size: 14px;
+      color: #FF991C;
+      line-height: 20px;
+      font-weight: 400;
    }
  }
 }
--- a/src/views/indexNewBigScreen.vue
View file @6ff7ed6
+++ b/src/views/indexNewBigScreen.vue
View file @6ff7ed6
@@ -631,9 +631,9 @@ const autoRoll = (stop = false) => {
  }, 4000)
 }
 /** 快捷筛选项 */
-const filterDate = ref('today'); //默认选中今天
+const filterDate = ref(''); //默认选中今天
 /** 日期时间范围值 */
-const daterange = ref([Moment(new Date()).format("YYYY-MM-DD 00:00:00"), Moment(new Date()).format("YYYY-MM-DD HH:mm:ss")]);
+const daterange = ref(['', '']);
 /** 日期面板的默认显示时分秒 */
 const defaultTime1 = [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]; // '12:00:00'
 const filterDateClickTimestamp = ref(Date.now()); // 记录点击时间
@@ -674,6 +674,7 @@ const handleDatePickerChange = (val) => {
  // 更新开始时间和结束时间
  startTime.value = val[0];
  endTime.value = val[1];
+  daterange.value = [startTime.value, endTime.value];
  // 获取数据表格
  getAssetTableData();
--- a/src/views/security_menu/index.vue
View file @6ff7ed6
+++ b/src/views/security_menu/index.vue
View file @6ff7ed6
@@ -31,7 +31,7 @@ const page = ref({
 });
 const tableInfo = ref({
  id: "role-manage-table",
-  multiple: true,
+  // multiple: true,
  fixedSelection: true,
  fields: [
    { label: "序号", type: "index", width: 56, align: "center" },
@@ -56,6 +56,7 @@ const tableInfo = ref({
    },
    {
      label: "合规评估报告", field: "complianceEvaluateReport", width: 120, type: 'text_btn', value: 'complianceEvaluateReport', columClass: 'text_btn', getName: (scope) => {
+        console.log('scope合规评估报告', scope);
        return scope.row.complianceEvaluateReport?.length > 0 ? '预览' : '--';
      }
    },
@@ -141,6 +142,7 @@ const formItems = ref([
    block: true,
    visible: true,
    default: [],
+    limit: 1,
  },
  {
    label: '合规法律意见书',
@@ -153,6 +155,7 @@ const formItems = ref([
    block: true,
    visible: true,
    default: [],
+    limit: 1,
  },
  {
    label: '入表合规方案',
@@ -165,6 +168,7 @@ const formItems = ref([
    block: true,
    visible: true,
    default: [],
+    limit: 1,
  },
 ]);
@@ -366,6 +370,12 @@ const getTableData = () => {
        }
      }
+      :deep(.tools_search) {
+        .el-form-item .el-select {
+          width: 230px;
+        }
+      }
      .table_panel_wrap {
        margin-top: 12px;
        width: 100%;