去掉资源名称；编辑维度时传guid

@@ -92,7 +92,7 @@ const productConfigFormItems = ref([{
   label: '数据产品名称',
   label: '数据产品名称',
   type: 'input',
   type: 'input',
   placeholder: '请输入',
   placeholder: '请输入',
-  field: 'damName',
+  field: 'dataResourceGuid',
   default: '',
   default: '',
   required: true,
   required: true,
   maxlength: 50,
   maxlength: 50,
@@ -113,7 +113,7 @@ const productConfigFormRules = ref({
   companyName: [required('请填写企业名称')],
   companyName: [required('请填写企业名称')],
   contactPerson: [required('请填写联系人')],
   contactPerson: [required('请填写联系人')],
   contactInformation: [required('请填写联系方式')],
   contactInformation: [required('请填写联系方式')],
-  damName: [required('请填写产品名称')],
+  dataResourceGuid: [required('请填写数据产品名称')],
   productDesc: [required('请填写产品简介')],
   productDesc: [required('请填写产品简介')],
 });
 });
 
 
@@ -135,16 +135,16 @@ const baseConfigFormItems: any = ref([
     filterable: true,
     filterable: true,
     required: true
     required: true
   },
   },
-  {
-    label: '数据资源名称',
-    type: 'input',
-    placeholder: '请输入',
-    field: 'dataResourceGuid',
-    maxlength: 50,
-    default: '',
-    clearable: true,
-    required: true
-  },
+  // {
+  //   label: '数据资源名称',
+  //   type: 'input',
+  //   placeholder: '请输入',
+  //   field: 'dataResourceGuid',
+  //   maxlength: 50,
+  //   default: '',
+  //   clearable: true,
+  //   required: true
+  // },
   // {
   // {
   //   label: '数据资源',
   //   label: '数据资源',
   //   type: 'select',
   //   type: 'select',
@@ -751,7 +751,7 @@ const selectChange = async (val, row, info) => {
     val && getModelInfo(val);
     val && getModelInfo(val);
     currModelGuid.value = val || '';
     currModelGuid.value = val || '';
     qualityScoreData.value = {};
     qualityScoreData.value = {};
-    baseConfigFormItems.value[1].default = '';
+ //   baseConfigFormItems.value[1].default = '';
     //    changeDatasource();
     //    changeDatasource();
   }
   }
   // else if (row.field == 'dataResourceGuid') {
   // else if (row.field == 'dataResourceGuid') {
@@ -856,8 +856,8 @@ const getCalculateParams = (baseConfigFormObj, baseConfigFormInfo) => {
     dataTransactionPrice: dataTransactionPrice.value,
     dataTransactionPrice: dataTransactionPrice.value,
     modelGuid: baseConfigFormInfo.modelGuid,
     modelGuid: baseConfigFormInfo.modelGuid,
     modelName,
     modelName,
-    dataResourceGuid: baseConfigFormInfo.dataResourceGuid,
-    dataResourceName: baseConfigFormInfo.dataResourceGuid,
+    dataResourceGuid: companyInfo.dataResourceGuid,
+    dataResourceName: companyInfo.dataResourceGuid,
     belongingEntityGuid: companyInfo.companyName,
     belongingEntityGuid: companyInfo.companyName,
     belongingTheme: baseConfigFormInfo.belongingTheme,
     belongingTheme: baseConfigFormInfo.belongingTheme,
     diseaseGuid,
     diseaseGuid,

@@ -1105,6 +1105,7 @@ const drawerBtnClick = async (btn, info) => {
         pricingTargetRSVOS: []
         pricingTargetRSVOS: []
       })
       })
     } else if (drawerInfo.value.type == 'edit-signatory') {// 编辑维度
     } else if (drawerInfo.value.type == 'edit-signatory') {// 编辑维度
+      params.guid = currTableData.value.guid;
       setSignatoryTableInfo(params, true);
       setSignatoryTableInfo(params, true);
     } else if (drawerInfo.value.type == 'add-target') {// 新增指标
     } else if (drawerInfo.value.type == 'add-target') {// 新增指标
       let factorFull = true;
       let factorFull = true;
@@ -1140,6 +1141,7 @@ const drawerBtnClick = async (btn, info) => {
         !sData && signatoryParams.pricingTargetRSVOS.push({ ...params, dictionaryJson: dictionaryData, dictionaryName })
         !sData && signatoryParams.pricingTargetRSVOS.push({ ...params, dictionaryJson: dictionaryData, dictionaryName })
       }
       }
     } else if (drawerInfo.value.type == 'edit-target') {// 编辑指标
     } else if (drawerInfo.value.type == 'edit-target') {// 编辑指标
+      params.guid = currTableData.value.guid;
       let factorFull = true;
       let factorFull = true;
       const dictionaryData = tableData.value.map((d: any) => {
       const dictionaryData = tableData.value.map((d: any) => {
         if (dictionaryType.value && !d.factor) {
         if (dictionaryType.value && !d.factor) {