连接器去掉IP地址和域名信息；供应商信息和等保信息改成非必填

lihua
Showing 3 changed files with 52 additions and 50 deletions
Jenkinsfile
src/views/data_facilitator/settleDetail.vue
src/views/data_facilitator/settleStart.vue
--- a/Jenkinsfile
View file @0917927
+++ b/Jenkinsfile
View file @0917927
@@ -6,7 +6,7 @@ pipeline {
        SVN_FOLD = "fe-data-trusted-space-connector"
        SSH_PATH = "js-match"
        SVN_TYPE = "temp"
-        image_tag = "1.0.1-arm"
+        image_tag = "1.0.2-arm"
        ip = "121.237.182.192:30002"
        port = "59900"
        vport = "80"
--- a/src/views/data_facilitator/settleDetail.vue
View file @0917927
+++ b/src/views/data_facilitator/settleDetail.vue
View file @0917927
@@ -372,14 +372,14 @@ const fileKeyNames = ref({
            <span class="item_label">可信凭证证书:</span>
            <span class="item_value link" @click="viewVoucherFile">查看</span>
          </div> -->
-          <div class="list_item is_block">
+          <!-- <div class="list_item is_block">
            <span class="item_label">IP地址列表:</span>
            <span class="item_value">{{ flowDetail.ipAddressList?.join(',') || '--' }}</span>
          </div>
          <div class="list_item is_block">
            <span class="item_label">域名信息:</span>
            <span class="item_value">{{ flowDetail.domainList?.join(',') || '--' }}</span>
-          </div>
+          </div> -->
        </div>
      </ContentWrap>
      <ContentWrap title="连接器附属信息" expandSwicth style="margin-top: 15px" :isExpand="expand2"
@@ -428,7 +428,7 @@ const fileKeyNames = ref({
          </div>
        </div>
      </ContentWrap>
-      <ContentWrap title="连接器可验信息" expandSwicth style="margin-top: 15px" :isExpand="expand3"
+      <ContentWrap title="连接器可验信息" v-if="Object.keys(fileKeyNames || {}).some(field => flowDetail.tdsConnectorVerifiable?.[field]?.length)" expandSwicth style="margin-top: 15px" :isExpand="expand3"
        @expand="(v) => expand3 = v">
        <div class="list_panel">
          <template v-for="(field, index) in Object.keys(fileKeyNames || {})">
--- a/src/views/data_facilitator/settleStart.vue
View file @0917927
+++ b/src/views/data_facilitator/settleStart.vue
View file @0917927
@@ -120,33 +120,33 @@ const baseInfoFormItems = ref([
  //   visible: false,
  //   required: false,
  // },
-  {
+  // {
-    type: "input",
+  //   type: "input",
-    label: "IP地址列表",
+  //   label: "IP地址列表",
-    field: "ipAddressList",
+  //   field: "ipAddressList",
-    default: "",
+  //   default: "",
-    placeholder: "支持以逗号，分隔的多地址配置，格式IPv4/IPv6",
+  //   placeholder: "支持以逗号，分隔的多地址配置，格式IPv4/IPv6",
-    clearable: true,
+  //   clearable: true,
-    required: false,
+  //   required: false,
-    block: true,
+  //   block: true,
-  },
+  // },
-  {
+  // {
-    type: "input",
+  //   type: "input",
-    label: "域名信息",
+  //   label: "域名信息",
-    field: "domainList",
+  //   field: "domainList",
-    default: "",
+  //   default: "",
-    placeholder: "支持以逗号，分隔的多个域名配置",
+  //   placeholder: "支持以逗号，分隔的多个域名配置",
-    clearable: true,
+  //   clearable: true,
-    required: false,
+  //   required: false,
-    block: true,
+  //   block: true,
-  },
+  // },
 ]);
 const baseInfoFormRules = ref({
  connectorName: [required("请填写连接器名称")],
  accessMethod: [required("请选择接入方式")],
-  ipAddressList: [/*required("请填写IP地址列表"),*/validateIPList()], //TODO,校验IP地址和域名
+  // ipAddressList: [/*required("请填写IP地址列表"),*/validateIPList()], //TODO,校验IP地址和域名
-  domainList: [/*required("请填写域名信息"),*/ validateDomainList()],
+  // domainList: [/*required("请填写域名信息"),*/ validateDomainList()],
 });
 /** 连接器附属信息表单配置 */
@@ -160,7 +160,7 @@ const addInfoFormItems = ref([
    placeholder: "请输入",
    maxlength: 50,
    clearable: true,
-    required: true,
+    required: false,
  },
  {
    type: "input",
@@ -170,7 +170,7 @@ const addInfoFormItems = ref([
    placeholder: "请输入",
    maxlength: 50,
    clearable: true,
-    required: true,
+    required: false,
  },
  {
    label: "连接器类型",
@@ -188,7 +188,7 @@ const addInfoFormItems = ref([
        value: 1,
      },
    ],
-    required: true,
+    required: false,
  },
  {
    type: "input",
@@ -208,7 +208,7 @@ const addInfoFormItems = ref([
    placeholder: "请输入出厂唯一SN号",
    maxlength: 20,
    clearable: true,
-    required: true,
+    required: false,
  },
  {
    type: "input",
@@ -218,7 +218,7 @@ const addInfoFormItems = ref([
    placeholder: "请输入产品版本号，用于补丁管理和漏洞响应",
    maxlength: 20,
    clearable: true,
-    required: true,
+    required: false,
  },
  {
    type: "input",
@@ -228,16 +228,16 @@ const addInfoFormItems = ref([
    placeholder: "物理设备唯一标识符(若有多台，只登记管理服务器mac地址)",
    maxlength: 50,
    clearable: true,
-    required: true,
+    required: false,
  },
 ]);
 const addInfoFormRules = ref({
-  supplierName: [required("请填写供应商名称")],
+  // supplierName: [required("请填写供应商名称")],
-  supplierCode: [required('请填写供应商统一社会信用代码'), isUSCCCode()],
+  // supplierCode: [required('请填写供应商统一社会信用代码'), isUSCCCode()],
-  productSn: [required("请填写出厂唯一SN号")],
+  // productSn: [required("请填写出厂唯一SN号")],
-  productVersion: [required("请填写产品版本号")],
+  // productVersion: [required("请填写产品版本号")],
-  deviceMacAddress: [required("请填写设备MAC地址")], //校验
+  // deviceMacAddress: [required("请填写设备MAC地址")], //校验
 });
 /** 连接器身份可验证信息 */
@@ -260,7 +260,7 @@ const validInfoFormItems = ref([
    tip: "支持扩展名：pdf、png、jpg，单个文件不得大于10M",
    type: "upload-file",
    accept: ".pdf, .png, .jpg",
-    required: true,
+    required: false,
    limitSize: 10,
    default: [],
    tooltip: true,
@@ -294,7 +294,7 @@ const validInfoFormItems = ref([
      // 禁用 dateStart < todayStart 的日期（即今天之前）
      return dateStart.getTime() < todayStart.getTime();
    },
-    required: true,
+    required: false,
  },
  {
    label: "网络安全产品备案证明",
@@ -390,8 +390,8 @@ const validInfoFormItems = ref([
 const validInfoFormRules = ref({
  //networkAccessQualification: [requiredFiles()],
-  levelProtectionEvaluationResults: [requiredFiles()],
+  // levelProtectionEvaluationResults: [requiredFiles()],
-  levelProtectionEvaluationExpirationTime: [required("请选择有效期")],
+  // levelProtectionEvaluationExpirationTime: [required("请选择有效期")],
  //networkSecurityFilingCertificate: [requiredFiles()],
  // encryptionModuleAuthentication: [requiredFiles()],
  // softwareScmStatemen: [requiredFiles()],
@@ -440,7 +440,7 @@ const transferValueInfo = () => {
  let tdsConnectorVerifiable = {};
  for (const key in validInfo) {
    if (key == "levelProtectionEvaluationExpirationTime") {
-      tdsConnectorVerifiable[key] = validInfo[key];
+      tdsConnectorVerifiable[key] = validInfo[key] || '';
    } else {
      tdsConnectorVerifiable[key] =
        validInfo[key]?.map((v) => {
@@ -499,11 +499,11 @@ const saveDraft = () => {
 const submit = () => {
  baseInfoFormRef.value.ruleFormRef.validate((valid1, errorItem1) => {
-    let baseForminline = baseInfoFormRef.value.formInline;
+    // let baseForminline = baseInfoFormRef.value.formInline;
-    if (!baseForminline.ipAddressList && !baseForminline.domainList) {
+    // if (!baseForminline.ipAddressList && !baseForminline.domainList) {
-      proxy.$ElMessage.error('IP地址和域名信息请至少填写一个');
+    //   proxy.$ElMessage.error('IP地址和域名信息请至少填写一个');
-      return;
+    //   return;
-    }
+    // }
    if (valid1) {
      addInfoFormRef.value.ruleFormRef.validate((valid2, errorItem2) => {
        if (valid2) {
@@ -671,9 +671,11 @@ onBeforeMount(() => {
            item.default = connectorDetail[item.field] || logonUserDetail["socialCreditCode"] || "";
          } else if (item.field == 'credentialTime' || item.field == 'trustedIdentityCredential') {
            item.default = connectorDetail[item.field] || logonUserDetail[item.field] || "";
-          } else if (item.field == 'ipAddressList' || item.field == 'domainList') {
+          }
-            item.default = connectorDetail[item.field]?.join(',') || '';
+          //  else if (item.field == 'ipAddressList' || item.field == 'domainList') {
-          } else {
+          //   item.default = connectorDetail[item.field]?.join(',') || '';
+          // }
+           else {
            item.default = connectorDetail[item.field] || '';
          }
        });