企业认证，连接器代码迁移

@@ -98,7 +98,7 @@ VITE_APP_DATA_DELIVERY = http://192.168.6.20:38052/
 #数据服务接口地址
 #数据服务接口地址
 VITE_APP_SERVICE_BASEURL = ms-daop-trust-api-service
 VITE_APP_SERVICE_BASEURL = ms-daop-trust-api-service
 
 
-#数字合约接口
+#数字合约接口,身份认证有关的服务
 VITE_APP_DIGITAL_CONTRACT_URL = ms-daop-trust-data-space-service
 VITE_APP_DIGITAL_CONTRACT_URL = ms-daop-trust-data-space-service
 
 
 # 本地访问地址
 # 本地访问地址

@@ -37,6 +37,7 @@
     "html2canvas": "^1.4.1",
     "html2canvas": "^1.4.1",
     "html2pdf.js": "^0.12.1",
     "html2pdf.js": "^0.12.1",
     "insert-css": "^2.0.0",
     "insert-css": "^2.0.0",
+    "ip-regex": "^5.0.0",
     "jquery": "^3.7.1",
     "jquery": "^3.7.1",
     "jsencrypt": "^3.3.2",
     "jsencrypt": "^3.3.2",
     "lodash-es": "^4.17.21",
     "lodash-es": "^4.17.21",

@@ -71,6 +71,9 @@ dependencies:
   insert-css:
   insert-css:
     specifier: ^2.0.0
     specifier: ^2.0.0
     version: 2.0.0
     version: 2.0.0
+  ip-regex:
+    specifier: ^5.0.0
+    version: 5.0.0
   jquery:
   jquery:
     specifier: ^3.7.1
     specifier: ^3.7.1
     version: 3.7.1
     version: 3.7.1
@@ -6056,6 +6059,11 @@ packages:
     resolution: {integrity: sha512-pZ2xT+LOHckCatGQ3DcG/a+QuEqvoxqkiL7tvE8nn3uuu+f6i1TtpB5/FtWFbxUuVr5PZCx8KskuGatbJDXOWA==}
     resolution: {integrity: sha512-pZ2xT+LOHckCatGQ3DcG/a+QuEqvoxqkiL7tvE8nn3uuu+f6i1TtpB5/FtWFbxUuVr5PZCx8KskuGatbJDXOWA==}
     dev: true
     dev: true
 
 
+  /ip-regex@5.0.0:
+    resolution: {integrity: sha512-fOCG6lhoKKakwv+C6KdsOnGvgXnmgfmp0myi3bcNwj3qfwPAxRKWEuFhvEFF7ceYIz6+1jRZ+yguLFAmUNPEfw==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dev: false
+
   /is-absolute@1.0.0:
   /is-absolute@1.0.0:
     resolution: {integrity: sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==}
     resolution: {integrity: sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==}
     engines: {node: '>=0.10.0'}
     engines: {node: '>=0.10.0'}

@@ -587,4 +587,30 @@ export const getDictionaryTree = (params) => request({
   url: `${import.meta.env.VITE_APP_PLAN_BASEURL}/data-dictionary-general/tree-list`,
   url: `${import.meta.env.VITE_APP_PLAN_BASEURL}/data-dictionary-general/tree-list`,
   method: 'post',
   method: 'post',
   params
   params
+})
+
+/** -------------------- 数据产品目录分类----------- */
+
+export const addDictClass = (params) => request({
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/dict/save-class`,
+  method: 'post',
+  data: params
+})
+
+export const getDictClass = (params) => request({
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/dict/get-type-page-list`,
+  method: 'post',
+  data: params
+})
+
+export const removeDict = (guids) => request({
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/dict/del`,
+  method: 'delete',
+  data: guids
+});
+
+export const getDictData = (params) => request({
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/dict/get-tree`,
+  method: 'post',
+  data: params
 })
 })
\ No newline at end of file

+import request from "@/utils/request";
+
+// 最后一级节点审批通过
+export const contractApprove = (params, serviceTenantGuid:any = null) => request({
+  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/data-contract/submit-flow${serviceTenantGuid?`?serviceTenantGuid=${serviceTenantGuid}`:''}`,
+  method: 'post',
+  data: params
+})
+
+/** 企业认证 **/
+// 企业认证分页
+export const getEnterpriseList = (params) => request({
+  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/page-list`,
+  method: 'post',
+  data: params
+})
+
+// 企业认证详情
+export const getEnterpriseDetail = (params) => request({
+  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/detail`,
+  method: 'get',
+  params
+})
+
+// 企业认证新增
+export const enterpriseSave = (params) => request({
+  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/save`,
+  method: 'post',
+  data: params
+})
+
+// 企业认证修改
+export const enterpriseUpdate = (params) => request({
+  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/update`,
+  method: 'put',
+  data: params
+})
+
+// 企业认证删除
+export const enterpriseDelete = (params) => request({
+  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/delete`,
+  method: 'delete',
+  data: params
+})
+
+// 企业认证变更删除
+export const enterpriseChangeDelete = (params) => request({
+  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/change/delete`,
+  method: 'delete',
+  data: params
+})
+
+// 企业认证最后一级审批
+export const enterpriseApprove = (params) => request({
+  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/last-approve`,
+  method: 'post',
+  data: params
+})
+
+// 企业认证进度列表
+export const getTaskGressList = (params) => request({
+  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/pending-task/page-list`,
+  method: 'post',
+  data: params
+})
+
+// 企业认证重新发起
+export const getTaskRestart = (params) => request({
+  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/pending-task/restart`,
+  method: 'get',
+  params
+})
+
+// 企业认证执行日志
+export const getTaskExecutionLog = (params) => request({
+  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/pending-task/task-info`,
+  method: 'get',
+  params
+})
+
+// 获取企业认证流程列表
+export const getFlowEnterpriseList = (params) => request({
+  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/flow/page-list`,
+  method: 'post',
+  data: params
+})
+
+// 获取企业信息
+export const getUserTenant = () => request({
+  // url: `http://localhost:9000/master/ms-daop-personel-service/tenant/get-current-user-tenant-from-cache`,
+  url: `http://192.168.6.20:18052/master/ms-daop-personel-service/tenant/get-current-user-tenant-from-cache`,
+  method: 'get'
+})
+
+// 获取企业信息
+export const getEnterpriseData = (params) => request({
+  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/detail-by-logonUser`,
+  method: 'get',
+  params
+})
+
+/** -------------------- 连接器管理 --------------------------  */
+
+// 连接器分页
+export const getConnectorList = (params) => request({
+  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/tds-connector-identity/page-list`,
+  method: 'post',
+  data: params
+})
+
+/** 保存 */
+export const saveConnector = (params) => request({
+  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/tds-connector-identity/save`,
+  method: 'post',
+  data: params
+})
+
+/** 更新 */
+export const updateConnector = (params) => request({
+  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/tds-connector-identity/update`,
+  method: 'put',
+  data: params
+})
+
+/** 变更的重新提交 */
+export const changeSaveConnector = (params) => request({
+  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/tds-connector-identity/change-save`,
+  method: 'post',
+  data: params
+})
+
+/** 删除 */
+export const deleteConnector = (params) => request({
+  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/tds-connector-identity/delete`,
+  method: 'delete',
+  data: params
+})
+
+export const getConnectorDetail = (guid) => request({
+  url: `${import.meta.env.VITE_APP_CIRCULATION_PORTAL_URL}/tds-connector-identity/detail?guid=${guid}`,
+  method: 'get'
+})
+
+/** 判断当前用户企业是否已申请连接器 */
+export const checkConnector = () => request({
+  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/tds-connector-identity/check-connector `,
+  method: 'get'
+})
+
+/** 接入方式下拉列表 */
+export const assessMethodList = [
+      {
+        label: "专线",
+        value: 1,
+      },
+      {
+        label: "互联网(固定公网IP)",
+        value: 2,
+      },
+      {
+        label: "互联网(无固定公网IP)",
+        value: 3,
+      },
+      {
+        label: "高速数据网",
+        value: 4,
+      },
+      {
+        label: "其他",
+        value: 5,
+      },
+]
\ No newline at end of file

@@ -345,3 +345,9 @@ export const checkSql  = (params) => request({
     method: 'post',
     method: 'post',
     data:params
     data:params
 })
 })
+
+export const getUserSomeInfo = (params) => request({
+  url: `/ms-daop-user-service/user/data/get-some-info`,
+  method: 'post',
+  data: params
+})

@@ -83,3 +83,21 @@ export const isNeedApprove = (params) => request({
   url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/func-flow-config/is-need-approve?funcCode=${params.funcCode}`,
   url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/func-flow-config/is-need-approve?funcCode=${params.funcCode}`,
   method: 'get',
   method: 'get',
 })
 })
+
+export const changeApproveSave = (params)=>request({
+  url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/changeApprove/save`,
+  method: 'post',
+  data: params
+})
+
+export const myLastNode = (params) => request({
+  url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/is-my-last-node`,
+  method: 'post',
+  data: params
+})
+
+// 获取最新变更信息
+export const getLastChange = (params) => request({
+  url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/changeApprove/get-by-guid/${params}`,
+  method: 'get'
+})
\ No newline at end of file

 /** form表单检验规则钩子函数 */
 /** form表单检验规则钩子函数 */
 import { FormItemRule } from 'element-plus'
 import { FormItemRule } from 'element-plus'
+import { cnIdCode, StringUtils } from '@/utils/validation'
+import ipRegex from 'ip-regex';
 
 
 export const useValidator = () => {
 export const useValidator = () => {
   const required = (message?: string): FormItemRule => {
   const required = (message?: string): FormItemRule => {
@@ -187,6 +189,33 @@ export const useValidator = () => {
       trigger: "blur",
       trigger: "blur",
     };
     };
   }
   }
+
+  const isUSCCCode = (message?: string): FormItemRule => {
+    return {
+      validator: (_, val, callback) => {
+        if (val && !StringUtils.checkUnifiedCreditCode(val).success) {
+          callback(new Error(message || StringUtils.checkUnifiedCreditCode(val).errorMessage || '统一社会信用代码格式不正确！'))
+        } else {
+          callback()
+        }
+      },
+      trigger: 'blur'
+    }
+  }
+
+  const idCode = (message?: string): FormItemRule => {
+    return {
+      validator: (_, val, callback) => {
+        if (val && !cnIdCode(val)) {
+          callback(new Error(message || '身份证格式不正确！'))
+        } else {
+          callback()
+        }
+      },
+      trigger: 'blur',
+    }
+  }
+
     /** 验证输入的多个IP地址 */
     /** 验证输入的多个IP地址 */
   const validateIPList = (): FormItemRule => {
   const validateIPList = (): FormItemRule => {
     return {
     return {
@@ -303,6 +332,8 @@ export const useValidator = () => {
     scrollToError,
     scrollToError,
     checkExistName,
     checkExistName,
     requiredFiles,
     requiredFiles,
+    isUSCCCode,
+    idCode,
     validateIPList,
     validateIPList,
     validateDomainList
     validateDomainList
   }
   }

+import type { RouteRecordRaw } from 'vue-router'
+function Layout() {
+  return import('@/layouts/index.vue')
+}
+const routes: RouteRecordRaw[] = [
+  {
+    path: '/data-facilitator/authentication-management',
+    component: Layout,
+    meta: {
+      title: '认证管理',
+      icon: 'sidebar-videos',
+    },
+    children: [{
+      path: '',
+      name: 'authenticationManagement',
+      component: () => import('@/views/data_facilitator/authenticationManagement.vue'),
+      meta: {
+        title: '认证管理',
+        sidebar: false,
+        breadcrumb: false,
+        cache: true,
+        editPage: true
+      },
+    }]
+  },
+  {
+    path: '/data-facilitator/certification-audit',
+    component: Layout,
+    meta: {
+      title: '认证审核管理',
+      icon: 'sidebar-videos',
+    },
+    children: [
+      {
+        path: '',
+        name: 'certificationAudit',
+        component: () => import('@/views/data_facilitator/certificationAudit.vue'),
+        meta: {
+          title: '认证审核管理',
+          sidebar: false,
+          breadcrumb: false,
+          cache: true
+        },
+      },
+      {
+        path: 'certification-audit-detail',
+        name: 'certificationAuditDetail',
+        component: () => import('@/views/data_facilitator/certificationAuditDetail.vue'),
+        meta: {
+          title: '详情-',
+          sidebar: false,
+          breadcrumb: false,
+          cache: true,
+        },
+        beforeEnter: (to, from) => {
+          to.meta.title = `详情-${to.query.name}`;
+        }
+      }
+    ]
+  },
+    {
+    path: '/data-connector/settle-management',
+    component: Layout,
+    meta: {
+      title: '连接器管理',
+      icon: 'sidebar-videos',
+    },
+    children: [{
+      path: '',
+      name: 'settleManagement',
+      component: () => import('@/views/data_facilitator/settleManagement.vue'),
+      meta: {
+        title: '',
+        sidebar: false,
+        breadcrumb: false,
+        cache: true,
+        editPage: true
+      },
+    }, {
+        path: 'settle-start',
+        name: 'settleStart',
+        component: () => import('@/views/data_facilitator/settleStart.vue'),
+        meta: {
+          title: '连接器入驻',
+          sidebar: false,
+          breadcrumb: false,
+          cache: true,
+          editPage: true,
+          reuse: true
+        },
+        beforeEnter: (to, from) => {
+          to.meta.title = !to.query.guid ? '连接器入驻' : (to.query.isChange == 'Y' ? `变更-${to.query.name}` :  `编辑-${to.query.name}`);
+          to.meta.editPage = true;
+        }
+      }, {
+        path: 'settle-detail',
+        name: 'settleDetail',
+        component: () => import('@/views/data_facilitator/settleDetail.vue'),
+        meta: {
+          title: '详情-',
+          sidebar: false,
+          breadcrumb: false,
+          cache: true,
+          reuse: true
+        },
+        beforeEnter: (to, from) => {
+          to.meta.title = `详情-${to.query.name}`;
+        }
+      },]
+  },
+]
+export default routes

@@ -4,6 +4,7 @@ import type { RouteRecordRaw } from 'vue-router'
 import DataAssess from './modules/dataAsset';
 import DataAssess from './modules/dataAsset';
 import DataService from './modules/dataService';
 import DataService from './modules/dataService';
 import DataSmartContract from './modules/dataSmartContract';
 import DataSmartContract from './modules/dataSmartContract';
+import DataFacilitator from './modules/dataFacilitator';
 
 
 import useSettingsStore from '@/store/modules/settings'
 import useSettingsStore from '@/store/modules/settings'
 
 
@@ -93,6 +94,7 @@ const asyncRoutes: RouteRecordRaw[] = [
   ...DataAssess,
   ...DataAssess,
   ...DataService,
   ...DataService,
   ...DataSmartContract,
   ...DataSmartContract,
+  ...DataFacilitator,
  // ...DataAssetRegistry,
  // ...DataAssetRegistry,
 ]
 ]
 
 

+const useDataConnectorStore = defineStore(
+    'isRefresh',
+    () => {
+      const isRefresh = ref<boolean>(false)
+    
+      function set(v: boolean) {
+        isRefresh.value = v;
+      }
+
+      return {
+        isRefresh,
+        set,
+      }
+    },
+  )
+  
+export default useDataConnectorStore
\ No newline at end of file

@@ -33,7 +33,7 @@ const useUserStore = defineStore(
     function getToken(data, state) {
     function getToken(data, state) {
           data.platformGuid = "7f16f697aec111ef8656fa163e60becd";
           data.platformGuid = "7f16f697aec111ef8656fa163e60becd";
           data.userType = 2;
           data.userType = 2;
-          data.appKey = '691689d8e4b0f359c04d204a';
+         // data.appKey = '691689d8e4b0f359c04d204a';
           data.validateUri = location.origin == 'http://localhost:9000' ? 'http://localhost:9000/' : location.origin + '/';
           data.validateUri = location.origin == 'http://localhost:9000' ? 'http://localhost:9000/' : location.origin + '/';
           return getTokenPromise.value = getTokenByCode(data).then((res: any) => {
           return getTokenPromise.value = getTokenByCode(data).then((res: any) => {
             getTokenPromise.value = null;
             getTokenPromise.value = null;

@@ -430,8 +430,7 @@ const handleUploadClose = (itemGuid) => {
               <div class="mid-content">
               <div class="mid-content">
                 <div class="left">产品来源</div>
                 <div class="left">产品来源</div>
                 <!-- TODO，要改成连接器名称 -->
                 <!-- TODO，要改成连接器名称 -->
-                <div class="right">{{ item.foundMode ? (item.foundMode === 1 ? '自建' : (item.foundMode == 2 ? '加工交付' : (item.foundMode == 4 ? '江苏专区' : (item.foundMode == 5 ? '数据港' : '专区')))) : '--'
-                  }}</div>
+                <div class="right">{{ item.foundModeName ? item.foundModeName : '自建' }}</div>
               </div>
               </div>
               <div class="mid-content">
               <div class="mid-content">
                 <div class="left">登记机构</div>
                 <div class="left">登记机构</div>