Merge branch 'develop' into release-test

lxs
Showing 1 changed file with 51 additions and 23 deletions
src/views/data_asset/registerDetail.vue
--- a/src/views/data_asset/registerDetail.vue
View file @3833801
+++ b/src/views/data_asset/registerDetail.vue
View file @3833801
@@ -37,6 +37,7 @@ const route = useRoute();
 const fullPath = route.fullPath;
 const assetGuid = route.query.guid;
 const tenantGuid = route.query.tenantGuid;
+const tenantGuid = route.query.tenantGuid;
 const { proxy } = getCurrentInstance() as any;
@@ -356,7 +357,7 @@ const tentData = ref<any>({});
 const getTenantInformation = () => {
  const ps: any = [];
-  ps.push(getTenantDetailInfo(tenantGuid).then((res: any) => {
+  ps.push(getTenantDetailInfo(tenantGuid || userData.tenantGuid).then((res: any) => {
    if (res.code === proxy.$passCode) {
      const data = res.data ?? {};
      tentData.value = { ...tentData.value, ...data };
@@ -1419,7 +1420,7 @@ const passCommonDialogBtnClick = (btn, info) => {
          :isExpand="assetContentExpand" expandSwicth @expand="(v) => assetContentExpand = v">
          <div class="list_panel mt4">
            <!-- <span class="small-title">资产内容</span> -->
-            <div class="list_item isFile" :style="{ width: '40%', 'margin-right': '28px' }"
+            <div class="list_item isFile"
              v-if="assetDetailInfo.registerAttachment?.registerLetter?.length">
              <div class="item_label"
                :style="{ width: 'auto', display: 'flex', 'justify-content': 'space-between', 'margin-right': '8px' }">
@@ -1453,7 +1454,8 @@ const passCommonDialogBtnClick = (btn, info) => {
                    v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'">
                    <img class="file-img" src="../../assets/images/jpg.png" />
                  </template>
-                  <div class="file-name">{{ item.name }}</div>
+                  <div class="file-name"><ellipsis-tooltip :content="item.name ?? ''" class-name="w100f"
+                    refName="tooltipOver"></ellipsis-tooltip></div>
                  <div :style="{ right: '36px' }"
                    v-if="item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'pdf' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'png' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'"
                    class="file-preview" @click="onUploadFilePreview(item)">查看</div>
@@ -1461,7 +1463,7 @@ const passCommonDialogBtnClick = (btn, info) => {
                </div>
              </span>
            </div>
-            <div class="list_item is_block isFile" :style="{ width: '40%', 'margin-right': '28px' }"
+            <div class="list_item is_block isFile"
              v-if="((detailType != 'asset' || assetDetailInfo.isEvaluationAssessment == 'Y') && assetDetailInfo.registerAttachment?.qualityEvaluationFile?.length) || (evaDetailInfo?.qualityEvaluationFile?.length > 0)">
              <span class="item_label" :style="{ width: 'auto', 'text-align': 'left' }">数据质量评价收集</span>
              <span
@@ -1492,7 +1494,8 @@ const passCommonDialogBtnClick = (btn, info) => {
                    v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'">
                    <img class="file-img" src="../../assets/images/jpg.png" />
                  </template>
-                  <div class="file-name">{{ item.name }}</div>
+                  <div class="file-name"><ellipsis-tooltip :content="item.name ?? ''" class-name="w100f"
+                    refName="tooltipOver"></ellipsis-tooltip></div>
                  <div :style="{ right: '36px' }"
                    v-if="item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'pdf' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'png' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'"
                    class="file-preview" @click="onUploadFilePreview(item)">查看</div>
@@ -1500,7 +1503,7 @@ const passCommonDialogBtnClick = (btn, info) => {
                </div>
              </span>
            </div>
-            <div class="list_item is_block isFile" :style="{ width: '40%', 'margin-right': '28px' }"
+            <div class="list_item is_block isFile"
              v-if="detailType == 'certificate' && assetDetailInfo.registerAttachment?.assessmentFile?.length">
              <span class="item_label" :style="{ width: 'auto', 'text-align': 'left' }">数据价值评估</span>
              <span v-for="(item) in (assetDetailInfo.registerAttachment?.assessmentFile || [])" class="item_value"
@@ -1530,7 +1533,8 @@ const passCommonDialogBtnClick = (btn, info) => {
                    v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'">
                    <img class="file-img" src="../../assets/images/jpg.png" />
                  </template>
-                  <div class="file-name">{{ item.name }}</div>
+                  <div class="file-name"><ellipsis-tooltip :content="item.name ?? ''" class-name="w100f"
+                    refName="tooltipOver"></ellipsis-tooltip></div>
                  <div :style="{ right: '36px' }"
                    v-if="item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'pdf' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'png' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'"
                    class="file-preview" @click="onUploadFilePreview(item)">查看</div>
@@ -1538,7 +1542,7 @@ const passCommonDialogBtnClick = (btn, info) => {
                </div>
              </span>
            </div>
-            <div class="list_item is_block isFile" :style="{ width: '40%', 'margin-right': '28px' }"
+            <div class="list_item is_block isFile"
              v-if="detailType == 'asset' && assetDetailInfo.registerAttachment?.commitmentLetter?.length">
              <span class="item_label" :style="{ width: 'auto', 'text-align': 'left' }">承诺函附件</span>
              <span v-for="(item) in (assetDetailInfo.registerAttachment?.commitmentLetter || [])" class="item_value"
@@ -1568,7 +1572,8 @@ const passCommonDialogBtnClick = (btn, info) => {
                    v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'">
                    <img class="file-img" src="../../assets/images/jpg.png" />
                  </template>
-                  <div class="file-name">{{ item.name }}</div>
+                  <div class="file-name"><ellipsis-tooltip :content="item.name ?? ''" class-name="w100f"
+                    refName="tooltipOver"></ellipsis-tooltip></div>
                  <div :style="{ right: '36px' }"
                    v-if="item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'pdf' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'png' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'"
                    class="file-preview" @click="onUploadFilePreview(item)">查看</div>
@@ -1576,7 +1581,7 @@ const passCommonDialogBtnClick = (btn, info) => {
                </div>
              </span>
            </div>
-            <div class="list_item is_block isFile" :style="{ width: '40%', 'margin-right': '28px' }"
+            <div class="list_item is_block isFile"
              v-if="(detailType == 'asset' && assetDetailInfo.isQualityAssessment == 'Y') && assetDetailInfo.registerAttachment?.evaluationFile?.length">
              <span class="item_label" :style="{ width: 'auto', 'text-align': 'left' }">质量评估报告</span>
              <span v-for="(item) in (assetDetailInfo.registerAttachment?.evaluationFile || [])" class="item_value"
@@ -1606,7 +1611,8 @@ const passCommonDialogBtnClick = (btn, info) => {
                    v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'">
                    <img class="file-img" src="../../assets/images/jpg.png" />
                  </template>
-                  <div class="file-name">{{ item.name }}</div>
+                  <div class="file-name"><ellipsis-tooltip :content="item.name ?? ''" class-name="w100f"
+                    refName="tooltipOver"></ellipsis-tooltip></div>
                  <div :style="{ right: '36px' }"
                    v-if="item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'pdf' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'png' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'"
                    class="file-preview" @click="onUploadFilePreview(item)">查看</div>
@@ -1614,7 +1620,7 @@ const passCommonDialogBtnClick = (btn, info) => {
                </div>
              </span>
            </div>
-            <div class="list_item is_block isFile" :style="{ width: '40%', 'margin-right': '28px' }"
+            <div class="list_item is_block isFile"
              v-if="(detailType == 'asset' && assetDetailInfo.isCostAssessment == 'Y') && assetDetailInfo.registerAttachment?.assessmentFile?.length">
              <span class="item_label" :style="{ width: 'auto', 'text-align': 'left' }">价值评估报告</span>
              <span v-for="(item) in (assetDetailInfo.registerAttachment?.assessmentFile || [])" class="item_value"
@@ -1644,7 +1650,8 @@ const passCommonDialogBtnClick = (btn, info) => {
                    v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'">
                    <img class="file-img" src="../../assets/images/jpg.png" />
                  </template>
-                  <div class="file-name">{{ item.name }}</div>
+                  <div class="file-name"><ellipsis-tooltip :content="item.name ?? ''" class-name="w100f"
+                    refName="tooltipOver"></ellipsis-tooltip></div>
                  <div :style="{ right: '36px' }"
                    v-if="item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'pdf' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'png' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'"
                    class="file-preview" @click="onUploadFilePreview(item)">查看</div>
@@ -1652,7 +1659,7 @@ const passCommonDialogBtnClick = (btn, info) => {
                </div>
              </span>
            </div>
-            <div class="list_item is_block isFile" :style="{ width: '40%', 'margin-right': '28px' }"
+            <div class="list_item is_block isFile"
              v-if="(detailType == 'costAssess' && costAssessDetailInfo.costAssessmentFile?.length)">
              <span class="item_label" :style="{ width: 'auto', 'text-align': 'left' }">价值评估收集附件</span>
              <span v-for="(item) in (costAssessDetailInfo.costAssessmentFile || [])" class="item_value"
@@ -1682,7 +1689,8 @@ const passCommonDialogBtnClick = (btn, info) => {
                    v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'">
                    <img class="file-img" src="../../assets/images/jpg.png" />
                  </template>
-                  <div class="file-name">{{ item.name }}</div>
+                  <div class="file-name"><ellipsis-tooltip :content="item.name ?? ''" class-name="w100f"
+                    refName="tooltipOver"></ellipsis-tooltip></div>
                  <div :style="{ right: '36px' }"
                    v-if="item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'pdf' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'png' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'"
                    class="file-preview" @click="onUploadFilePreview(item)">查看</div>
@@ -1693,7 +1701,7 @@ const passCommonDialogBtnClick = (btn, info) => {
            <!-- <span
              v-if="tenantDetail.businessLicense?.length || assetDetailInfo.registerAttachment?.commitmentLetter?.length"
              class="small-title" :style="{ marginTop: '10px' }">公司信息</span> -->
-            <div class="list_item is_block isFile" :style="{ width: '40%', 'margin-right': '28px' }"
+            <div class="list_item is_block isFile"
              v-if="tenantDetail.businessLicense?.length">
              <span class="item_label" :style="{ width: 'auto', 'text-align': 'left' }">营业执照</span>
              <span v-for="(item) in (tenantDetail?.businessLicense || [])" class="item_value"
@@ -1723,7 +1731,8 @@ const passCommonDialogBtnClick = (btn, info) => {
                    v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'">
                    <img class="file-img" src="../../assets/images/jpg.png" />
                  </template>
-                  <div class="file-name">{{ item.name }}</div>
+                  <div class="file-name"><ellipsis-tooltip :content="item.name ?? ''" class-name="w100f"
+                    refName="tooltipOver"></ellipsis-tooltip></div>
                  <div :style="{ right: '36px' }" class="file-preview"
                    v-if="item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'pdf' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'png' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'"
                    @click="onUploadFilePreview(item)">查看</div>
@@ -1731,7 +1740,7 @@ const passCommonDialogBtnClick = (btn, info) => {
                </div>
              </span>
            </div>
-            <div class="list_item is_block isFile" :style="{ width: '40%', 'margin-right': '28px' }"
+            <div class="list_item is_block isFile"
              v-if="detailType !='asset' && assetDetailInfo.registerAttachment?.commitmentLetter?.length">
              <span class="item_label" :style="{ width: 'auto', 'text-align': 'left' }">承诺函附件</span>
              <span v-for="(item) in (assetDetailInfo.registerAttachment?.commitmentLetter || [])" class="item_value"
@@ -1761,7 +1770,8 @@ const passCommonDialogBtnClick = (btn, info) => {
                    v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'">
                    <img class="file-img" src="../../assets/images/jpg.png" />
                  </template>
-                  <div class="file-name">{{ item.name }}</div>
+                  <div class="file-name"><ellipsis-tooltip :content="item.name ?? ''" class-name="w100f"
+                    refName="tooltipOver"></ellipsis-tooltip></div>
                  <div :style="{ right: '36px' }"
                    v-if="item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'pdf' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'png' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'"
                    class="file-preview" @click="onUploadFilePreview(item)">查看</div>
@@ -1869,7 +1879,8 @@ const passCommonDialogBtnClick = (btn, info) => {
              <span class="item_value">
                <div class="file-operate">
                  <img class="file-img" src="../../assets/images/PDF.png" />
-                  <div class="file-name">{{ evaDetailInfo.evaluationFile?.[0]?.name }}</div>
+                  <div class="file-name"><ellipsis-tooltip :content="evaDetailInfo.evaluationFile[0].name ?? ''"
+                    class-name="w100f" refName="tooltipOver"></ellipsis-tooltip></div>
                  <div :style="{ right: '36px' }" class="file-preview"
                    @click="onUploadFilePreview(evaDetailInfo.evaluationFile?.[0])">查看</div>
                  <div :style="{ right: '0px' }" class="file-preview"
@@ -1900,7 +1911,8 @@ const passCommonDialogBtnClick = (btn, info) => {
              <span class="item_value">
                <div class="file-operate">
                  <img class="file-img" src="../../assets/images/PDF.png" />
-                  <div class="file-name">{{ costAssessDetailInfo.assessmentFile?.[0]?.name }}</div>
+                  <div class="file-name"><ellipsis-tooltip :content="costAssessDetailInfo.assessmentFile[0].name ?? ''"
+                    class-name="w100f" refName="tooltipOver"></ellipsis-tooltip></div>
                  <div :style="{ right: '36px' }" class="file-preview"
                    @click="onUploadFilePreview(costAssessDetailInfo.assessmentFile?.[0])">查看</div>
                  <div :style="{ right: '0px' }" class="file-preview"
@@ -1973,7 +1985,8 @@ const passCommonDialogBtnClick = (btn, info) => {
                    v-else-if="detailInfo.documentFile?.[0]?.name.substring(detailInfo.documentFile?.[0]?.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || detailInfo.documentFile?.[0]?.name.substring(detailInfo.documentFile?.[0]?.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'">
                    <img class="file-img" src="../../assets/images/jpg.png" />
                  </template>
-                  <div class="file-name">{{ detailInfo.documentFile?.[0]?.name }}</div>
+                  <div class="file-name"><ellipsis-tooltip :content="detailInfo.documentFile[0].name ?? ''"
+                    class-name="w100f" refName="tooltipOver"></ellipsis-tooltip></div>
                  <div :style="{ right: '36px' }" class="file-preview"
                    v-if="detailInfo.documentFile?.[0]?.name.substring(detailInfo.documentFile?.[0]?.name.lastIndexOf('.') + 1).toLowerCase() == 'pdf' || detailInfo.documentFile?.[0]?.name.substring(detailInfo.documentFile?.[0]?.name.lastIndexOf('.') + 1).toLowerCase() == 'png' || detailInfo.documentFile?.[0]?.name.substring(detailInfo.documentFile?.[0]?.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || detailInfo.documentFile?.[0]?.name.substring(detailInfo.documentFile?.[0]?.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'"
                    @click="onUploadFilePreview(detailInfo.documentFile?.[0])">查看</div>
@@ -2228,8 +2241,23 @@ const passCommonDialogBtnClick = (btn, info) => {
    }
  }
-  .isFile {
+  &.isFile {
+    width: 50%;
+    display: flex;
    flex-direction: column;
+    justify-content: space-between;
+    .item_label {
+      width: 100px;
+      text-align: right;
+      flex-shrink: 0;
+    }
+    .item_value {
+      flex: 1 1 0%;
+      min-width: 100px;
+      white-space: pre-wrap;
+    }
  }
 }