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

@@ -37,7 +37,7 @@ VITE_BPMN_URL = https://workflow-swzl-test.csbr.cn
 VITE_APP_WORK_FLOW_URL = 'ms-daop-workflow-service'
 VITE_APP_WORK_FLOW_URL = 'ms-daop-workflow-service'
 
 
 # 数据标准、元数据、数据目录 接口地址
 # 数据标准、元数据、数据目录 接口地址
-VITE_APP_PLAN_BASEURL = ms-daop-zcgl-data-plan-service
+VITE_APP_PLAN_BASEURL = ms-daop-data-plan-service
 
 
 #数据质量接口地址
 #数据质量接口地址
 VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service
 VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service

@@ -71,7 +71,7 @@ VITE_BPMN_URL = https://workflow-swzl-test.csbr.cn
 VITE_APP_WORK_FLOW_URL = 'ms-daop-workflow-service'
 VITE_APP_WORK_FLOW_URL = 'ms-daop-workflow-service'
 
 
 # 数据标准、元数据、数据目录 接口地址
 # 数据标准、元数据、数据目录 接口地址
-VITE_APP_PLAN_BASEURL = ms-daop-zcgl-data-plan-service
+VITE_APP_PLAN_BASEURL = ms-daop-data-plan-service
 
 
 #数据质量接口地址
 #数据质量接口地址
 VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service
 VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service

@@ -654,7 +654,7 @@ const getSubjectTableTreeData = () => {
           d.children = d.children?.map(child => {
           d.children = d.children?.map(child => {
             child.label = child.name + `(${child.tableName})`;
             child.label = child.name + `(${child.tableName})`;
 						child.isLeaf = true;
 						child.isLeaf = true;
-						child.dataServerName = d.name;
+						child.dataServerName = child.databaseName;
 						child.dataSourceGuid = d.guid;
 						child.dataSourceGuid = d.guid;
             return  child;
             return  child;
           })
           })
@@ -1778,13 +1778,13 @@ const submitValueRange = () => {
 		let valueTableFields = valueRangeTableListData.value[table];
 		let valueTableFields = valueRangeTableListData.value[table];
 		let ruleFields: any = []
 		let ruleFields: any = []
 		for (const field of valueTableFields) {
 		for (const field of valueTableFields) {
-			if (field.startValue == null && field.endValue == null) {
-				if (dialogSelectSubjectTable.value.enName != table) {
-					valueCheckFormListRef.value.setSelectList(table, 'enName');
-				}
-				ElMessage.error(`表【${table}】的字段【${field.enName}】设置了值域，但范围未填写完整`);
-				return;
-			}
+			// if (field.startValue == null && field.endValue == null) {
+			// 	if (dialogSelectSubjectTable.value.enName != table) {
+			// 		valueCheckFormListRef.value.setSelectList(table, 'enName');
+			// 	}
+			// 	ElMessage.error(`表【${table}】的字段【${field.enName}】设置了值域，但范围未填写完整`);
+			// 	return;
+			// }
 			if (field.startValue != null || field.endValue != null) {
 			if (field.startValue != null || field.endValue != null) {
 				ruleFields.push(field);
 				ruleFields.push(field);
 			} else if (field.dataRange) {
 			} else if (field.dataRange) {

@@ -94,7 +94,7 @@ const getSubjectTableTreeData = () => {
           d.label = d.name;
           d.label = d.name;
           d.children = d.children?.map(child => {
           d.children = d.children?.map(child => {
             child.label = child.name + `(${child.tableName})`;
             child.label = child.name + `(${child.tableName})`;
-            child.dataServerName = d.name;
+            child.dataServerName = child.databaseName;
             child.dataSourceGuid = d.guid;
             child.dataSourceGuid = d.guid;
             return child;
             return child;
           })
           })