Merge branch 'develop' of http://117.78.60.236:8000/csbr-daop/fe-data-asset-management into develop

@@ -110,6 +110,9 @@ VITE_API_ASSET_BASEURL = ms-swzl-data-dam-service
 #数据同步接口地址
 #数据同步接口地址
 VITE_API_DATA_SYNC = ms-swzl-data-sync-service
 VITE_API_DATA_SYNC = ms-swzl-data-sync-service
 
 
+#元数据标准
+VITE_APP_STANDARD_URL = 'ms-daop-meta-standard-service'
+
 #消息接口
 #消息接口
 VITE_API_MESSAGE = ms-daop-message-service
 VITE_API_MESSAGE = ms-daop-message-service
 
 

@@ -97,6 +97,12 @@ const setChartsOption = () => {
         bottom: 20,
         bottom: 20,
         draggable: false,
         draggable: false,
         left: 50,
         left: 50,
+        emphasis: {
+          focus: 'trajectory'
+        },
+        labelLayout: {
+          hideOverlap: true,
+        },
         right: 100,
         right: 100,
         label: {
         label: {
           fontSize: 10,
           fontSize: 10,

@@ -904,30 +904,41 @@ const checkForm = (type) => {
         // 字典
         // 字典
         let dictList: any = [], hasModelScore = false;
         let dictList: any = [], hasModelScore = false;
         const dictStr = exportData.value.map(e => {
         const dictStr = exportData.value.map(e => {
-          const targetList: any = [];
-          e.pricingTargetRSVOS.map(t => {
-            if (t.targetType == '2' && t.functionName == '1') {
-              hasModelScore = true;
-            } else {
-              targetList.push({
-                targetName: t.targetName,
-                tNum: t.tNum,
-              })
-            }
-          })
-          const targetStr = targetList.length ? targetList.map(t => `${t.targetName}为${changeNum(t.tNum, 2)}`).join('、') : '';
-          targetStr && dictList.push(`${e.dimensionalityName}为${changeNum(e.sNum, 2)}，其中${targetStr}`);
+          // 检查是否有质量模型评分
+          hasModelScore = hasModelScore || e.pricingTargetRSVOS.some(
+            t => t.targetType === '2' && t.functionName === '1'
+          );
+
+          // 只有当维度指标数大于1时才处理明细
+          if (e.pricingTargetRSVOS.length > 1) {
+            const targetStr = e.pricingTargetRSVOS
+              .map(t => `${t.targetName}为${changeNum(t.tNum, 2)}`)
+              .join('、');
+
+            dictList.push(`${e.dimensionalityName}为${changeNum(e.sNum, 2)}，其中${targetStr}`);
+          }
+
           return `${e.dimensionalityName}为${changeNum(e.sNum, 2)}`;
           return `${e.dimensionalityName}为${changeNum(e.sNum, 2)}`;
         })
         })
         let dictListStr = `${dictStr.join('，')}。\n${dictList.join('；\n')}`
         let dictListStr = `${dictStr.join('，')}。\n${dictList.join('；\n')}`
         // 质量模型
         // 质量模型
         if (hasModelScore) {
         if (hasModelScore) {
-          const largeCategoryScoreList = qualityScoreData.value.largeCategoryScoreList || [];
-          const largeCategoryScore = largeCategoryScoreList.map(q => `${q.largeCategoryName}方面得分为${changeNum(q.largeCategoryScore || 0, 2)}`);
-          dictListStr += largeCategoryScore.length ? `；\n数据的总体质量得分为${changeNum(qualityScoreData.value.qualityScore || 0, 2)}。其中${largeCategoryScore.join('，')}` : `；\n数据的总体质量得分为${changeNum(qualityScoreData.value.qualityScore || 0, 2)}。`
+          const { largeCategoryScoreList = [], qualityScore = 0 } = qualityScoreData.value;
+          const qualityParts = [
+            `数据的总体质量得分为${changeNum(qualityScore, 2)}`
+          ];
+
+          if (largeCategoryScoreList.length) {
+            const categoryScores = largeCategoryScoreList.map(
+              q => `${q.largeCategoryName}方面得分为${changeNum(q.largeCategoryScore || 0, 2)}`
+            );
+            qualityParts.push(`其中${categoryScores.join('，')}`);
+          }
+
+          dictListStr += `；\n${qualityParts.join('。')}`;
         }
         }
-        exportOut.three = `${baseConfigFormInfo.belongingEntityGuid}持有的\"${damName}\"的数据(患者人次)单价为${changeNum(dataTransactionPrice.value, 2)}元`;
-        exportOut.three = dictListStr ? `${exportOut.three}；其中${dictListStr}` : `${exportOut.three}。`
+        exportOut.three = `${baseConfigFormInfo.belongingEntityGuid}持有的"${damName}"的数据(患者人次)单价为${changeNum(dataTransactionPrice.value, 2)}元${dictListStr ? `；其中${dictListStr}` : '。'}`;
+
         exportModelScore(exportOut).then((res: any) => {
         exportModelScore(exportOut).then((res: any) => {
           loading.value = false;
           loading.value = false;
           if (res && !res.msg) {
           if (res && !res.msg) {