Merge branch 'develop' into release-test

xukangle
Showing 8 changed files with 71 additions and 33 deletions
src/assets/icons/waring.svg
src/layouts/components/Tools/index.vue
src/views/data_asset/registerCatalogManagement.vue
src/views/data_asset/registerStart.vue
src/views/data_product/productListing.vue
src/views/data_product/productListingDetail.vue
src/views/indexNewBigScreen.vue
src/views/security_menu/index.vue
--- a/src/assets/icons/waring.svg 0 → 100644
View file @72248ee
+++ b/src/assets/icons/waring.svg 0 → 100644
View file @72248ee
+<?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 @72248ee
+++ b/src/layouts/components/Tools/index.vue
View file @72248ee
@@ -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 @72248ee
+++ b/src/views/data_asset/registerCatalogManagement.vue
View file @72248ee
@@ -54,6 +54,9 @@ const searchItemList = ref([
    props: {
      value: 'value',
      label: 'label'
+    },
+    style: {
+      width: '230px'
    }
  },
  {
@@ -83,7 +86,7 @@ const searchItemList = ref([
    label: "",
    field: "dataSources",
    default: "",
-    placeholder: "数据来源",
+    placeholder: "产品来源",
    clearable: true,
    filterable: true,
    options: dataSources.value,
@@ -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">
@@ -413,7 +423,7 @@ const handleWindowResize = () => {
                <div class="right">{{ item.damTypeName || '--' }}</div>
              </div>
              <div class="mid-content">
-                <div class="left">数据来源</div>
+                <div class="left">产品来源</div>
                <div class="right">{{ item.foundMode ? (item.foundMode === 1 ? '自建' : '加工交付') : '--'
                  }}</div>
              </div>
@@ -458,7 +468,7 @@ const handleWindowResize = () => {
 :deep(.tools_search) {
  .el-form-item .el-select {
-    width: 240px;
+    width: 230px;
  }
 }
--- a/src/views/data_asset/registerStart.vue
View file @72248ee
+++ b/src/views/data_asset/registerStart.vue
View file @72248ee
@@ -171,7 +171,7 @@ const getTenantDetail = () => {
  ps.push(getTenantDetailInfo(userData.tenantGuid).then((res: any) => {
    if (res.code == proxy.$passCode) {
      const data = res.data ?? {};
-        tentData = {...tentData, ...data};
+      tentData = { ...tentData, ...data };
    } else {
      ElMessage.error(res.msg);
    }
@@ -179,7 +179,7 @@ const getTenantDetail = () => {
  ps.push(getTenantInfo({ tenantName: userData.tenantName }).then((res: any) => {
    if (res.code == proxy.$passCode) {
      const data = res.data ?? {};
-        tentData = {...tentData, ...data};
+      tentData = { ...tentData, ...data };
    } else {
      ElMessage.error(res.msg);
    }
@@ -310,28 +310,28 @@ const setUploadFormItemsValue = (info) => {
  uploadFormItems.value.forEach(item => {
    if (item.field == 'registerLetter') {
      let registerLetter = attach.registerLetter ? attach.registerLetter : [];
-      if(registerLetter.length){
+      if (registerLetter.length) {
        registerLetter[0].name = registerLetter[0].name
      }
      item.default = registerLetter;
      item.templateUrl = attachDataInfo.value.register_letter;
    } else if (item.field == 'evaluationFile') {
      let evaluationFile = attach.evaluationFile ? attach.evaluationFile : [];
-      if(evaluationFile.length){
+      if (evaluationFile.length) {
        evaluationFile[0].name = evaluationFile[0].name
      }
      item.default = evaluationFile;
      item.templateUrl = attachDataInfo.value.quality_evaluation_file;
    } else if (item.field == 'assessmentFile') {
      let assessmentFile = attach.assessmentFile ? attach.assessmentFile : [];
-      if(assessmentFile.length){
+      if (assessmentFile.length) {
        assessmentFile[0].name = assessmentFile[0].name
      }
      item.default = assessmentFile;
      item.templateUrl = attachDataInfo.value.cost_assessment_file;
    } else if (item.field === 'commitmentLetter') {
      let commitmentLetter = attach.commitmentLetter ? attach.commitmentLetter : [];
-      if(commitmentLetter.length){
+      if (commitmentLetter.length) {
        commitmentLetter[0].name = commitmentLetter[0].name
      }
      item.default = commitmentLetter;
@@ -423,7 +423,7 @@ onActivated(() => {
 })
 onBeforeMount(() => {
-  restart.value = localStorage.getItem('isRestart')?true:false;
+  restart.value = localStorage.getItem('isRestart') ? true : false;
  if (guid) {
    fullscreenLoading.value = true;
    getRegiaterDetail({ guid: guid }).then((res: any) => {
--- a/src/views/data_product/productListing.vue
View file @72248ee
+++ b/src/views/data_product/productListing.vue
View file @72248ee
--- a/src/views/data_product/productListingDetail.vue
View file @72248ee
+++ b/src/views/data_product/productListingDetail.vue
View file @72248ee
@@ -72,6 +72,7 @@ const getArea = (node, resolve) => {
    return;
  }
  if (!getAreaDataPromise.value[node.value]) {
+    console.log('getAreaDataPromise', getAreaDataPromise.value);
    getAreaDataPromise.value[node.value] = getAreaData(params).then((res: any) => {
      getAreaDataPromise.value[node.value] = null;
      node.loaded = true;
@@ -264,13 +265,14 @@ const formInfo = ref<any>({
          clearable: true,
          required: true,
          col: 'checkbox-right',
-          visible: true
+          visible: false
        }
      ],
      clearable: false,
      required: true,
      col: 'checkbox-cascader'
-    }, {
+    },
+    {
      label: "交付方式",
      type: "select",
      placeholder: "请选择",
@@ -1191,6 +1193,7 @@ const setFormItems = (row: any = null, isDetail = false) => {
 const selectChange = async (val, row, info) => {
  if (row.field == 'damName') {
+    console.log(val, row, info, '--------1123123---------');
    const data = row.options.filter(o => o.damName == val);
    let coverageArea = (data.length && data[0].coverageArea) ? data[0].coverageArea : [];
    await setFormItems({ ...info, coverageArea: coverageArea });
@@ -1483,9 +1486,17 @@ onBeforeMount(async () => {
  if (route.query.exchangeGuid) {
    getTemplateInfo();
  }
+  setTimeout(() => {
+    formInfo.value.items.forEach(item => {
+      if (item.field == 'coverageAreas') {
+        item.children[0].visible = true
+      }
+    })
+  }, 0);
 })
 const pageLIstInfo = ref<any>();
 const getTableData = async () => {
  const res: any = await getListingList({
@@ -1508,13 +1519,13 @@ const getTemplateInfo = () => {
    if (res.code == proxy.$passCode) {
      formInfo.value.items.forEach(item => {
        if (item.field == 'commitmentLetterInfo') {
-          item.templateUrl = res.data.commitment_letter || '';
+          item.templateUrl = res.data?.commitment_letter || '';
        }
        if (item.field == 'accreditFileInfo') {
-          item.templateUrl = res.data.authorization_file || '';
+          item.templateUrl = res.data?.authorization_file || '';
        }
        if (item.field == 'productDetailInfo') {
-          item.templateUrl = res.data.detail_file || '';
+          item.templateUrl = res.data?.detail_file || '';
        }
      })
    } else {
--- a/src/views/indexNewBigScreen.vue
View file @72248ee
+++ b/src/views/indexNewBigScreen.vue
View file @72248ee
@@ -91,18 +91,18 @@ const cardList = ref([
    label: "最近入表时间",
    unit: "",
  },
-  {
+  // {
-    name: "dataCategoryNum",
+  //   name: "dataCategoryNum",
-    value: 0,
+  //   value: 0,
-    label: "数据分类",
+  //   label: "数据分类",
-    unit: "",
+  //   unit: "",
-  },
+  // },
-  {
+  // {
-    name: "dataGradeNum",
+  //   name: "dataGradeNum",
-    value: 0,
+  //   value: 0,
-    label: "数据分级",
+  //   label: "数据分级",
-    unit: "",
+  //   unit: "",
-  },
+  // },
 ]);
 const checkImage = () => {
@@ -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();
@@ -868,7 +869,7 @@ const handleChangeTime = (val) => {
        <div class="row-per">
          <div class="header">
            <div class="left-pd"></div>
-            <div class="header-title">资产授信情况</div>
+            <div class="header-title">数据产品调用情况</div>
          </div>
          <div style="height: calc(100% - 40px);">
            <Table class="drak-table" v-if="!financingTableInfo.loading1" :tableInfo="financingTableInfo"
--- a/src/views/security_menu/index.vue
View file @72248ee
+++ b/src/views/security_menu/index.vue
View file @72248ee
@@ -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) => {
+        const value = scope.row.complianceEvaluateReport?.length > 0;
        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%;