数据目录清单-库表目录-70%==服务目录-50%

.env.development

@@ -12,7 +12,7 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 
 # VUE_APP_BASE_API  = 'http://10.1.161.127:8080'
 # VUE_APP_BASE_API  = 'http://10.1.161.183:6661'
-VUE_APP_BASE_API  = 'http://192.168.136.137:6661'
+VUE_APP_BASE_API  = 'http://192.168.136.169:6661'
 # VUE_APP_BASE_API2  = 'http://192.168.136.23:'
 
 # VUE_APP_BASE_API  = 'http://10.1.162.158:6661'

package.json

@@ -65,6 +65,7 @@
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0",
+    "xe-utils": "^3.5.7",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
@@ -84,7 +85,8 @@
     "sass-loader": "10.1.1",
     "script-ext-html-webpack-plugin": "2.1.5",
     "svg-sprite-loader": "5.1.1",
-    "vue-template-compiler": "2.6.12"
+    "vue-template-compiler": "2.6.12",
+    "vxe-table": "^3.4.7"
   },
   "engines": {
     "node": ">=8.9",

src/api/unified-resources/data-directory/index.js

@@ -1,4 +1,5 @@
 import request from "@/utils/request2";
+import { myRequestInstance } from "@/utils/request2";
 
 // 目录列表查询
 export function getCatalogList(data) {
@@ -53,4 +54,50 @@ export function removeBatchCatalog(data) {
         ...data,
       },
     });
-  }
+  }
+
+  // 查询项目规则
+export function queryGovernanceRuleByName(data) {
+  return myRequestInstance({
+    url: '/rule/queryGovernanceRuleByName',
+    method: "post",
+    // headers:{
+    //     'Content-Type': 'application/x-www-form-urlencoded'
+    // },
+    data: {
+      ...data,
+    },
+  })
+}
+
+export function queryDatabase(data) {
+  return request({
+    url: '/database/queryDatabase',
+    method: "post",
+    data: {
+      ...data
+    }
+  })
+}
+
+//查询表
+export function getEtlTableList(data) {
+  return request({
+    url: "/database/getEtlTableList",
+    method: "post",
+    data: {
+      ...data,
+    },
+  });
+}
+
+export function getEtlTableFields(data) {
+  return request({
+    url: "/database/getEtlTableFields",
+    method: "post",
+    data: {
+      ...data,
+    },
+  });
+}
+

src/api/unified-resources/job-directory/index.js

@@ -39,4 +39,5 @@ export function getResponsibilityMsg(data) {
       method: "post",
       data
     })
-  }
+  }
+

src/main.js

@@ -19,6 +19,15 @@ import './permission' // permission control
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
+
+import VXETable from 'vxe-table';
+import 'vxe-table/lib/style.css';
+// 设置全局配置
+VXETable.setup({
+  size: 'medium',
+  zIndex: 10000  // 这通常是错误的用法，因为 zIndex 需要针对具体组件设置
+})
+
 // 分页组件
 import Pagination from "@/components/Pagination";
 // 自定义表格工具组件
@@ -61,6 +70,7 @@ Vue.component('ImagePreview', ImagePreview)
 Vue.use(directive)
 Vue.use(plugins)
 Vue.use(VueMeta)
+Vue.use(VXETable)
 DictData.install()
 
 /**

src/store/modules/projectManage.js

@@ -1,40 +1,45 @@
 const state = {
   projectRow: {},
-  catalogId: '',
-  serviceId: '',
-  selectDutyId: '',
-  selectTagList: []
-}
+  catalogId: "",
+  serviceId: "",
+  selectDutyId: "",
+  selectTagList: [],
+};
 
 const mutations = {
+  setCatalogId(state, catalogId) {
+    state.catalogId = catalogId;
+  },
   setProjectRow(state, tags) {
-    state.projectRow = tags
+    state.projectRow = tags;
   },
   setSelectTagList(state, tags) {
-    state.selectTagList = tags
+    state.selectTagList = tags;
   },
   setsSelectDutyId(state, val) {
-    state.selectDutyId = val
+    state.selectDutyId = val;
   },
-}
+};
 
 const actions = {
-  setRow({ commit },row) {
+  setRow({ commit }, row) {
     // state.projectRow = row
-    commit('setProjectRow', row)
+    commit("setProjectRow", row);
   },
   setSelectTagList({ commit }, tags) {
-    commit('setSelectTagList', tags)
+    commit("setSelectTagList", tags);
   },
   setsSelectDutyId({ commit }, val) {
-    commit('setsSelectDutyId', val)
+    commit("setsSelectDutyId", val);
+  },
+  setCatalogId({ commit }, catalogId) {
+    commit("setCatalogId", catalogId);
   },
-   
-}
+};
 
 export default {
   namespaced: true,
   state,
   mutations,
-  actions
-}
+  actions,
+};

src/utils/request2.js

@@ -16,7 +16,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   // baseURL: process.env.VUE_APP_BASE_API2+'5001' ,
-  baseURL: 'http://192.168.136.137:5001' ,
+  baseURL: 'http://192.168.136.169:5001' ,
   
   // 超时
   timeout: 10000
@@ -151,6 +151,130 @@ export function download(url, params, filename, config) {
   })
 }
 
+export const myRequestInstance = axios.create({
+  baseURL: 'http://192.168.136.169:5001',
+  method: 'post',
+  headers: {
+    Authorization: getCatalogToken(),
+    'Content-Type': 'application/x-www-form-urlencoded'
+  },
+  transformRequest: [
+    data => {
+      if (data) {
+        let params = new FormData()
+        let keys = Object.keys(data)
+        keys.forEach(key => {
+          params.append(key, data[key])
+        })
+        return params
+      }
+      return data
+    }
+  ]
+})
+
+// request拦截器
+myRequestInstance.interceptors.request.use(config => {
+  // 是否需要设置 token
+  const isToken = (config.headers || {}).isToken === false
+  // 是否需要防止数据重复提交
+  const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
+  if (getToken() && getCatalogToken() && !isToken) {
+    config.headers['Authorization'] = 'Bearer ' + getCatalogToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+  }
+  // get请求映射params参数
+  if (config.method === 'get' && config.params) {
+    let url = config.url + '?' + tansParams(config.params);
+    url = url.slice(0, -1);
+    config.params = {};
+    config.url = url;
+  }
+  if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
+    const requestObj = {
+      url: config.url,
+      data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
+      time: new Date().getTime()
+    }
+    const requestSize = Object.keys(JSON.stringify(requestObj)).length; // 请求数据大小
+    const limitSize = 5 * 1024 * 1024; // 限制存放数据5M
+    if (requestSize >= limitSize) {
+      console.warn(`[${config.url}]: ` + '请求数据大小超出允许的5M限制，无法进行防重复提交验证。')
+      return config;
+    }
+    const sessionObj = cache.session.getJSON('sessionObj')
+    if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
+      cache.session.setJSON('sessionObj', requestObj)
+    } else {
+      const s_url = sessionObj.url;                  // 请求地址
+      const s_data = sessionObj.data;                // 请求数据
+      const s_time = sessionObj.time;                // 请求时间
+      const interval = 1000;                         // 间隔时间(ms)，小于此时间视为重复提交
+      if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
+        const message = '数据正在处理，请勿重复提交';
+        console.warn(`[${s_url}]: ` + message)
+        return Promise.reject(new Error(message))
+      } else {
+        cache.session.setJSON('sessionObj', requestObj)
+      }
+    }
+  }
+  return config
+}, error => {
+    console.log(error)
+    Promise.reject(error)
+})
+
+// 响应拦截器
+myRequestInstance.interceptors.response.use(res => {
+  // 未设置状态码则默认成功状态
+  const code = +res.data.code || 200;
+  // 获取错误信息
+  const msg = errorCode[code] || res.data.msg || errorCode['default']
+  // 二进制数据则直接返回
+  if (res.request.responseType ===  'blob' || res.request.responseType ===  'arraybuffer') {
+    return res.data
+  }
+  if (code === 401) {
+    if (!isRelogin.show) {
+      isRelogin.show = true;
+      MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
+        isRelogin.show = false;
+        store.dispatch('LogOut').then(() => {
+          location.href = '/index';
+        })
+    }).catch(() => {
+      isRelogin.show = false;
+    });
+  }
+    return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
+  } else if (code === 500) {
+    Message({ message: msg, type: 'error' })
+    return Promise.reject(new Error(msg))
+  } else if (code === 601) {
+    Message({ message: msg, type: 'warning' })
+    return Promise.reject('error')
+  } else if (code !== 200) {
+    Notification.error({ title: msg })
+    return Promise.reject('error')
+  } else {
+    return res.data
+  }
+},
+error => {
+  console.log('err' + error)
+  let { message } = error;
+  if (message == "Network Error") {
+    message = "后端接口连接异常";
+  } else if (message.includes("timeout")) {
+    message = "系统接口请求超时";
+  } else if (message.includes("Request failed with status code")) {
+    message = "系统接口" + message.substr(message.length - 3) + "异常";
+  }
+  Message({ message: message, type: 'error', duration: 5 * 1000 })
+  return Promise.reject(error)
+}
+)
+
 
 
 export default service

src/views/unified-resources/data-directory/comp/SelectDutyDialog.vue

@@ -1,6 +1,6 @@
 <template>
     <el-dialog :modal="true" :close-on-click-modal="false" :close-on-press-escape="false" title="选择数据目录"
-        :append-to-body="true" :visible.sync="dialogVisible" width="50%" :before-close="handleClose">
+        :append-to-body="true" :visible.sync="visible" width="50%" :before-close="handleClose">
         <el-form :inline="true" label-width="auto" :model="searchForm" class="form-detail-inline-two">
             <el-form-item label="数据目录名称">
                 <el-input placeholder="请输入数据目录名称" v-model="searchForm.searchName" />
@@ -16,7 +16,7 @@
             <el-table-column prop="belongDepartmentName" label="内设机构名称" align="center" />
             <el-table-column prop="agenciesPrsponsibility" label="内设机构职责" align="center" />
         </el-table>
-        <div class="op-btn">
+        <div slot="footer" class="dialog-footer">
             <el-button type="primary" @click="saveHandle">确定</el-button>
             <el-button @click="handleClose">取消</el-button>
         </div>
@@ -29,9 +29,9 @@ import { getResponsibilityList, } from '@/api/unified-resources/job-directory/in
 
 export default {
     props: {
-        dialogVisible: {
+        value: {
             type: Boolean,
-            default: false
+            default: false,
         },
         operationType: {
             type: String,
@@ -44,6 +44,7 @@ export default {
     },
     data() {
         return {
+            visible: this.value,
             searchForm: { searchName: '' },
             selectArr: [],
             tableData: [],
@@ -57,6 +58,12 @@ export default {
         ...mapState('projectManage', ['selectDutyId']),  // 映射 Vuex 状态
     },
     watch: {
+        value(newVal) {
+            this.visible = newVal;
+        },
+        visible(newVal) {
+            this.$emit("input", newVal);
+        },
         selectDutyId(newVal) {
             if (newVal) {
                 this.tableData.forEach(element => {
@@ -73,7 +80,7 @@ export default {
         this.getList();  // 获取数据
     },
     methods: {
-        ...mapActions('projectManage', ['setSelectDutyId']),  // 映射 Vuex actions
+        // ...mapActions('projectManage', ['setsSelectDutyId']),  // 映射 Vuex actions
 
         getList() {
             getResponsibilityList({
@@ -121,18 +128,21 @@ export default {
                 }
             }
 
-            this.selectArr = this.$refs.tableRef.getSelectionRows();
+            this.selectArr = this.$refs.tableRef.selection;
             this.selectObj = row;
         },
 
         saveHandle() {
-            this.setSelectDutyId(this.selectObj.id);  // 更新 Vuex 状态
+            debugger
+            this.$store.dispatch('projectManage/setsSelectDutyId', this.selectObj.id)
+            // this.setsSelectDutyId(this.selectObj.id);  // 更新 Vuex 状态
             this.$emit('saveHandle', this.selectObj);  // 向父组件发送选择的对象
             this.handleClose();
         },
 
         handleClose() {
-            this.$emit('update:dialogVisible', false);  // 关闭对话框
+            this.visible = false;
+            this.$emit("cancel");
         }
     }
 };

src/views/unified-resources/data-directory/comp/SelectTagDialog.vue

@@ -53,7 +53,6 @@
 <script>
 import { mapState, mapActions } from 'vuex';
 import { queryMisList, getDirectoryAllLevel } from '@/api/unified-resources/information-system/index.js'
-import { ElMessage } from 'element-ui';
 
 export default {
     props: {
@@ -93,7 +92,10 @@ export default {
 
         selectTagList: {
             handler(newTags) {
-                this.dynamicTags = newTags;
+                if (newTags && Array.isArray(newTags)) {
+                    this.dynamicTags = newTags;
+                }
+
             },
             deep: true, // 深入监听
             immediate: true,
@@ -155,9 +157,6 @@ export default {
 
         tagSelectionChange(newSelection, row) {
             // 确保 dynamicTags 是一个数组
-            // if (!Array.isArray(this.dynamicTags)) {
-            //     this.dynamicTags = [];
-            // }
             const selectIds = newSelection.map(item => item.id);
             if (!selectIds.includes(row.id)) {
                 this.dynamicTags = this.dynamicTags.filter(item => item.id !== row.id);

src/views/unified-resources/data-directory/dialog/libraryTable.vue

@@ -66,12 +66,14 @@
         <div class="t-b">共享管理</div>
         <el-form-item label="共享方式" prop="shareMethod">
           <el-select v-model="libraryData.shareMethod" placeholder="请选择共享方式">
-            <el-option v-for="item in dict.type.share_method" :key="item.value" :label="item.label" :value="item.value" />
+            <el-option v-for="item in dict.type.share_method" :key="item.value" :label="item.label"
+              :value="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="共享范围" prop="shareRange">
           <el-select v-model="libraryData.shareRange" placeholder="请选择共享范围">
-            <el-option v-for="item in dict.type.shared_scope" :key="item.value" :label="item.label" :value="item.value" />
+            <el-option v-for="item in dict.type.shared_scope" :key="item.value" :label="item.label"
+              :value="item.value" />
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="共享类型" prop="shareType">
@@ -122,7 +124,8 @@
         </el-form-item>
         <el-form-item label="存储层" prop="dataLayer">
           <el-select v-model="libraryData.dataLayer" placeholder="请选择存储层">
-            <el-option v-for="item in dict.type.datalayer_type" :key="item.value" :label="item.label" :value="item.value" />
+            <el-option v-for="item in dict.type.datalayer_type" :key="item.value" :label="item.label"
+              :value="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="是否创建ODS表" prop="isCreateTable" v-if="libraryData.dataLayer === '1'">
@@ -155,7 +158,8 @@
         </el-form-item>
         <el-form-item label="数据更新方式" prop="updateType">
           <el-select v-model="libraryData.updateType" placeholder="请选择数据更新方式">
-            <el-option v-for="item in dict.type.data_update_type" :key="item.value" :label="item.label" :value="+item.value" />
+            <el-option v-for="item in dict.type.data_update_type" :key="item.value" :label="item.label"
+              :value="+item.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="接入归集周期" prop="inputationCron">
@@ -236,16 +240,18 @@
             </el-table>
           </el-col>
           <el-col :span="2" style="display: flex; flex-direction: column; justify-content: center">
-            <el-button :disabled="nowSelectData.length ? false : true" size="mini" type="primary" @click="handelSelect">
-              <el-icon>
+            <el-button :disabled="nowSelectData.length ? false : true" size="mini" type="primary" @click="handelSelect" icon="el-icon-arrow-right">
+              <!-- <i class="el-icon-arrow-right"></i> -->
+              <!-- <el-icon>
                 <ArrowRight />
-              </el-icon>
+              </el-icon> -->
             </el-button>
             <el-button :disabled="nowSelectRightData.length ? false : true" size="mini" type="primary"
-              @click="handleRemoveSelect" style="margin-top: 10px; margin-left: 0px">
-              <el-icon>
+              @click="handleRemoveSelect" style="margin-top: 10px; margin-left: 0px" icon="el-icon-arrow-left">
+              <!-- <i class="el-icon-arrow-left"></i> -->
+              <!-- <el-icon>
                 <ArrowLeft />
-              </el-icon>
+              </el-icon> -->
             </el-button>
           </el-col>
           <el-col :span="10" style="min-height: 460px" class="border-color">
@@ -281,7 +287,6 @@
       </el-form>
       <vxe-table border show-overflow :data="tableData" min-height="360" :column-config="{ resizable: true }"
         :edit-config="{ trigger: 'click', mode: 'cell' }">
-        <!-- <vxe-column type="seq" width="60"></vxe-column> -->
         <vxe-column field="fieldName" title="数据项名称" :edit-render="{ autofocus: '.vxe-input--inner' }" width="100">
           <template #edit="{ row }">
             <vxe-input v-model="row.fieldName" :disabled="isEdit" type="text"></vxe-input>
@@ -311,9 +316,7 @@
           <template #edit="{ row }">
             <vxe-input v-model="row.fieldDes" :disabled="isEdit" type="text" placeholder="请输入昵称"></vxe-input>
           </template>
-          <!-- <template #edit="{ row }">
-            <vxe-input v-model="row.list" type="text"></vxe-input>
-          </template> -->
+    
         </vxe-column>
         <vxe-column field="ruleId" title="数据标准" :edit-render="{}" min-width="100">
           <template #edit="{ row }">
@@ -452,35 +455,7 @@
             <el-table-column prop="name" label="字段名"></el-table-column>
           </el-table>
         </div>
-        <!-- <div>
-          <table style="width: 100%" cellspacing="1">
-            <thead></thead>
-            <tbody class="arrowList">
-              <tr>
-                <td>
-                  <el-icon>
-                    <ArrowRight />
-                  </el-icon>
-                </td>
-              </tr>
-              <tr>
-                <td>
-                  <el-icon>
-                    <ArrowRight />
-                  </el-icon>
-                </td>
-              </tr>
-              <tr>
-                <td>
-                  <el-icon>
-                    <ArrowRight />
-                  </el-icon>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div> -->
-        <div class="table1">
+      <div class="table1">
           <el-table style="width: 100%" border="1" cellspacing="1" :data="dataList">
             <el-table-column prop="name" label="字段名"></el-table-column>
           </el-table>
@@ -500,26 +475,27 @@
 </template>
 
 <script>
-import { queryMisList, getDirectoryAllLevel, queryDirectoryList } from '@/api/unified-resources/information-system/index.js'
-import { getResponsibilityList, } from '@/api/unified-resources/job-directory/index.js'
+import { mapState, mapActions } from 'vuex';
+import { queryMisList, getDirectoryAllLevel, queryDirectoryList, queryDatabase, getEtlTableFields,getEtlTableList  } from '@/api/unified-resources/information-system/index.js'
+import { queryGovernanceRuleByName} from '@/api/unified-resources/data-directory/index.js'
+import { getResponsibilityList } from '@/api/unified-resources/job-directory/index.js'
 import MainClassDialog from "../comp/MainClassDialog.vue";
 import SelectTagDialog from "../comp/SelectTagDialog.vue";
 import SelectDutyDialog from "../comp/SelectDutyDialog.vue";
 
-// import { queryMisList, getDirectoryAllLevel } from '@/api/unified-resources/information-system/index.js'
-// import { getResponsibilityMsg, addResponsibility, updateResponsibility } from '@/api/unified-resources/job-directory/index.js'
-// import MyForm from "@/components/MyForm";
 export default {
   name: "libraryTable",
-  dicts: ['share_method',
-  'shared_scope',
-  'shared_type',
-  'access_collection_method',
-  'data_collection_frequency',
-  'base_type',
-  'data_update_type',
-  'access_collection_caliber',
-  'datalayer_type'],
+  dicts: [
+    'share_method',
+    'shared_scope',
+    'shared_type',
+    'access_collection_method',
+    'data_collection_frequency',
+    'base_type',
+    'data_update_type',
+    'access_collection_caliber',
+    'datalayer_type'
+  ],
   components: {
     MainClassDialog,
     SelectTagDialog,
@@ -557,7 +533,9 @@ export default {
         env: '',
         isSpace: 2,
         isOpen: 2,
-        catalogType: '数据库'
+        catalogType: '数据库',
+        departmentClassId: null,
+        informationSystem:'',
       },
       provideUnitArr: [],
       informationSystemArr: [],
@@ -579,7 +557,15 @@ export default {
       selectDutyId: '',
       isAdding: false,
       optionName: '',
-      isEdit:false,
+      isEdit: false,
+      dataList: [],
+      datasourceList: [],
+      data1: [],
+      parentArr: [],
+      childArr: [],
+      selectArr: [],
+      nowSelectData: [],
+      nowSelectRightData:[],
       firstFormRules: {
         catalogCode: [{ required: true, message: '请输入数据目录代码', trigger: 'blur' }],
         catalogName: [{ required: true, message: '请输入目录名称', trigger: 'blur' }],
@@ -608,7 +594,11 @@ export default {
         inputationCalibre: [{ required: true, message: '请选择接入归集口径', trigger: 'change' }],
         identificationField: [{ required: true, message: '请输入归集增量标识字段', trigger: 'blur' }],
         dutyId: [{ required: true, message: '请选择关联本机构职责目录', trigger: 'change' }]
-      }
+      },
+      secondFormRules: {
+        datasourceId: [{ required: true, message: '请选择数据来源', trigger: 'change' }],
+        schemeName: [{ required: true, message: '请选择模式名', trigger: 'change' }]
+      },
 
     };
   },
@@ -637,7 +627,36 @@ export default {
 
   mounted() {
 
+    if (this.isAddOperation === 'add' && JSON.parse(sessionStorage.getItem('kb-form'))) {
+      this.libraryData = JSON.parse(sessionStorage.getItem('kb-form'))
+    }
+    this.libraryData.inputationMethod = '库表'
+    this.getTrees()
+    this.getList()
+    this.getSystemListData()
+    // getSafetyLevelList()
+    this.getGovernanceRuleByName()
+    console.log(queryGovernanceRuleByName, 'queryGovernanceRuleByName');
+
     this.getOrganizationalList()
+    if (this.isAddOperation !== 'add') {
+      if (this.historyId) {
+        // this.getDirectoryList()
+        // this.getVerHistory()
+      } else {
+        this.getDirectoryList()
+        this.getDetail()
+      }
+
+      if (this.isAddOperation === 'view') {
+        this.isEdit = true
+      } else {
+        this.isEdit = false
+      }
+    }
+  },
+  computed: {
+    ...mapState('projectManage', ['catalogId']),  // 映射 Vuex 状态
   },
   methods: {
     getOrganizationalList() {
@@ -687,7 +706,7 @@ export default {
       })
     },
     handelMainClassId() {
-      this.mainClassId = this.libraryData.mainClassIdvue
+      this.mainClassId = this.libraryData.mainClassId
       this.isMainClassDialog = true
     },
     handelSelectTag() {
@@ -695,7 +714,12 @@ export default {
       this.$store.dispatch('projectManage/setSelectTagList', this.libraryData.column1)
       this.isSelectTagDialog = true
     },
-
+    handelSelect() {
+      this.queryEtlTableFields(this.nowSelectData)
+      this.selectArr = this.handleConcatArr(this.selectArr, this.nowSelectData)
+      // console.log(selectArr.value)
+      this.nowSelectData = []
+    },
     valiNumber() {
       if (this.libraryData.dataSize) {
         const reg = /^-?\d+(\.\d+)?$/
@@ -706,6 +730,15 @@ export default {
         }
       }
     },
+    getTrees() {
+      getDirectoryAllLevel({
+        type: '目录'
+      }).then(res => {
+        if (+res.code === 200) {
+          this.mainClassIdOptions = res.data
+        }
+      })
+    },
     getList() {
       getResponsibilityList({
         pageNumber: 1,
@@ -716,13 +749,130 @@ export default {
         }
       })
     },
+    getGovernanceRuleByName() {
+      queryGovernanceRuleByName({
+        pageNumber: 1,
+        pageSize: 9999
+      }).then(res => {
+        if (+res.code === 200) {
+          this.dataNormList = res.data
+        }
 
+      })
+    },
     handelSelectDuty() {
-      this.isSelectDutyDialog = true
-      // this.selectDutyId=libraryData.value.dutyId
       this.$store.dispatch('projectManage/setsSelectDutyId', this.libraryData.dutyId)
-      // useProjectStore.selectDutyId = libraryData.value.dutyId
+      this.isSelectDutyDialog = true
+
+    },
+    getDetail() {
+      getCatalogDetail({ catalogId: this.catalogId }).then(res => {
+        let catalog = res.data.catalog
+        let catalogDuty = res.data.catalogDuty
+        let catalogExtend = res.data.catalogExtend
+        let catalogDatabase = res.data.catalogDatabase
+        let schemeName = catalogDatabase.schemeName
+        let datasourceId = catalogDatabase.datasourceId
+        let tableName = catalogDatabase.tableName
+        let newObj = {
+          ...catalog,
+          ...catalogDuty,
+          ...catalogExtend,
+          ...catalogDatabase
+        }
+        dbId = catalogDatabase.datasourceId
+        console.log(catalogDatabase.datasourceId, 'catalogDatabase.datasourceId')
+        this.libraryData = newObj
+        catalogId = catalog.catalogId
+        this.libraryData.date = [catalogExtend.startTime, catalogExtend.endTime]
+        this.libraryData.catalogType = '数据库'
+        this.libraryData.safetyLevel = +this.libraryData.safetyLevel //安全等级
+        this.libraryData.provideUnit = this.libraryData.provideUnit.split(',')
+
+        if (this.libraryData.column1) {
+          this.libraryData.column1 = JSON.parse(this.libraryData.column1)
+        }
+        if (catalog?.catalogChange?.changeReason) {
+          this.libraryData.changeReason = catalog.catalogChange.changeReason
+        }
+
+        this.tableData = res.data.dataFields
+        res.data.dataFields.forEach(ak => {
+          let newObj = {
+            name: ak.fieldName,
+            comments: ak.fieldDes,
+            originalColumnTypeName: ak.fieldType
+          }
+          // selectArr.value.push(newObj)
+          this.dataList.push(newObj)
+          // queryEtlTableFields()
+        })
+        this.getDatabaseList()
+
+        if (dbId && tableName) {
+          getEtlTableFields({
+            dbId: dbId,
+            tableName: tableName
+          }).then(res => {
+            if (+res.code === 200 && +res.data.code === 200) {
+              selectArr.value = res.data.data
+            }
+          })
+
+          queryDatabase({
+            pageNumber: 1,
+            pageSize: 999
+          }).then(res => {
+            if (+res.code === 200) {
+              libraryData.value.datasourceId = datasourceId
+              getEtlTableList({ dbId: datasourceId, tableName: tableName }).then(res => {
+                let nameArr = []
+                if (res.data.data.tableList.length !== 0) {
+                  res.data.data.tableList.forEach(item => {
+                    let info = item.split('.')
+                    nameArr.push(info[0])
+                  })
+                  nameArr = [...new Set(nameArr)]
+                  nameArr.forEach(it => {
+                    let nameObj = {
+                      label: it,
+                      value: it,
+                      child: []
+                    }
+                    res.data.data.tableList.forEach(i => {
+                      let cf = i.split('.')
+                      if (cf[0] === it) {
+                        nameObj.child.push({
+                          label: cf[1],
+                          value: cf[1],
+                          parentLabel: cf[0]
+                        })
+                      }
+                    })
+                    parentArr.value.push(nameObj)
+                  })
+
+                  parentArr.value.find(info => {
+                    if (info.value === schemeName) {
+                      data1.value = info.child
+                    }
+                  })
+                }
+              })
+            }
+          })
+        }
+      })
     },
+    getDatabaseList() {
+      queryDatabase({
+        pageNumber: 1,
+        pageSize: 999
+      }).then(res => {
+        this.datasourceList = res.data
+      })
+    },
+
     inputationLabelSelected(obj) {
       this.libraryData.inputationLabel = obj.dynamicTags?.map(i => i.directoryName).join(',')
       this.libraryData.column1 = obj.dynamicTags
@@ -731,51 +881,169 @@ export default {
       this.libraryData.dutyId = obj.id
     },
     MainClassSaveHandle(value) {
-  this.clear()
-  this.libraryData.mainClassId = value.levelDirectory
-  this.libraryData.mainClassName = value.levelDirectoryName
-  this.libraryData.departmentClassId = ''
-  this.getDirectoryList(value.levelDirectory)
-},
-clear() {
-  this.optionName = ''
-  this.isAdding = false
-},
+      this.clear()
+      this.libraryData.mainClassId = value.levelDirectory
+      this.libraryData.mainClassName = value.levelDirectoryName
+      this.libraryData.departmentClassId = ''
+      this.getDirectoryList(value.levelDirectory)
+    },
+    clear() {
+      this.optionName = ''
+      this.isAdding = false
+    },
 
-async changeActiveVal(type) {
-  if (type == 'up') {
-    this.activeValue -= 1
-  } else {
-    if (this.activeValue === 1) {
-      this.libraryData.catalogCode = createRandomId()
-      let res1
-      await this.$refs.firstRef.validate((valid, fields) => {
-        if (valid) {
-          res1 = valid
-          this.activeValue += 1
+    async changeActiveVal(type) {
+      if (type == 'up') {
+        this.activeValue -= 1
+      } else {
+        if (this.activeValue === 1) {
+          this.libraryData.catalogCode = this.createRandomId()
+          let res1
+          await this.$refs.firstRef.validate((valid, fields) => {
+            if (valid) {
+              res1 = valid
+              this.activeValue += 1
 
-          queryDatabase({ pageNumber: 1, pageSize: 999 }).then(res => {})
-        } else {
-          ElMessage.error('请完整输入表单项')
-          return
+              queryDatabase({ pageNumber: 1, pageSize: 999 }).then(res => { })
+            } else {
+              this.$message.error('请完整输入表单项')
+              return
+            }
+            return res1
+          })
+        } else if (this.activeValue === 2) {
+          await this.$refs.secondRef.validate((valid, fields) => {
+            if (valid) {
+              res1 = valid
+              this.activeValue += 1
+            } else {
+              this.$message.error('请完整输入表单项')
+              return
+            }
+            return res1
+          })
+        } else if (this.activeValue === 3) {
+          this.activeValue += 1
+        }
+      }
+    },
+    searchEtlTableList(value) {
+      this.libraryData.schemeName = ''
+      this.libraryData.tableName = ''
+      this.data1.value = []
+      this.parentArr.value = []
+      this.childArr.value = []
+      this.selectArr.value = []
+      getEtlTableList({ dbId: this.libraryData.datasourceId, tableName: '' }).then(res => {
+        let nameArr = []
+        if (res.data.data.tableList.length !== 0) {
+          res.data.data.tableList.forEach(item => {
+            let info = item.split('.')
+            nameArr.push(info[0])
+          })
+          nameArr = [...new Set(nameArr)]
+          nameArr.forEach(it => {
+            let nameObj = {
+              label: it,
+              value: it,
+              child: []
+            }
+            res.data.data.tableList.forEach(i => {
+              let cf = i.split('.')
+              if (cf[0] === it) {
+                nameObj.child.push({
+                  label: cf[1],
+                  value: cf[1],
+                  parentLabel: cf[0]
+                })
+              }
+            })
+            this.parentArr.push(nameObj)
+          })
         }
-        return res1
       })
-    } else if (this.activeValue === 2) {
-      await this.$refs.secondRef.validate((valid, fields) => {
-        if (valid) {
-          res1.value = valid
-          this.activeValue += 1
-        } else {
-          ElMessage.error('请完整输入表单项')
-          return
+      this.libraryData.datasourceId = value
+      console.log(this.libraryData.datasourceId, 'libraryData.value.datasourceId====change')
+    },
+    selectChild() {
+      this.data1 = []
+      this.selectArr = []
+      let schemeName = this.libraryData.schemeName
+      console.log(schemeName)
+      this.parentArr.find(item => {
+        if (item.label === schemeName) {
+          this.data1 = item.child
         }
-        return res1
       })
-    } else if (this.activeValue === 3) {
-      this.activeValue += 1
+    },
+    checkAll(val) {
+      if (this.isEdit) return
+      console.log(val)
+      this.data1 = []
+      this.selectArr = []
+      this.selectChild()
+      this.nowSelectData = [val]
+      this.libraryData.tableName = val.parentLabel + '.' + val.value
+
+    },
+    checkRightAll(val) {
+  ;(this.libraryData.databaseName = ''), //数据库名称
+    // this.libraryData.schemeName = '', //模式名
+    // this.libraryData.tableName = '', //表名
+    (this.libraryData.tableDes = '') //表描述
+  this.tableData = []
+  this.dataList = val
+  val.forEach(item => {
+    console.log(item)
+    let tableRow = {
+      fieldName: item.name, //字段名称
+      fieldNameEn: '', //字段英文名称
+      fieldDes: item.comments, //字段描述
+      fieldType: item.originalColumnTypeName, //数据类型
+      length: item.length, //数据长度
+      precision: item.precision, //标度
+      spaceInfo: '', //空间信息项 1x 2y 3z 4非空间
+      isKey: '', //是否主键 1是 2否
+      isNull: '', //是否允许为空 1是 2否
+      isTimestamp: '', //是否业务时间戳 1是 2否
+      isDelete: '', //是否删除标志 1是 2否
+      isWarehouse: '', //是否入库时间 1是 2否
+      safetyLevel: '', //安全等级
+      isOpen: '', //是否开放 1是 2否
+      shareType: '', //共享类型
+      isSensitive: '' //是否为敏感数据 1是 2否
     }
+
+    this.tableData.push(tableRow)
+  })
+  this.nowSelectRightData = val
+},
+    handleRemoveSelect() {
+  this.data1 = this.handleConcatArr(this.data1, this.nowSelectRightData)
+  handleRemoveTabList(this.nowSelectRightData, this.selectArr)
+  this.nowSelectRightData = []
+},
+queryEtlTableFields(val) {
+  let params = {
+    dbId: this.libraryData.datasourceId,
+    tableName: val[0].parentLabel + '.' + val[0].value
   }
+  params.dbId = this.libraryData.datasourceId
+  console.log('我执行了', params)
+  // if (props.isAddOperation !== 'add') {
+  //   params.dbId = dbId
+  // }
+  getEtlTableFields({ ...params }).then(res => {
+    if (+res.code === 200 && +res.data.code === 200) {
+      this.selectArr = res.data.data
+    }
+  })
+},
+handleConcatArr(selectArr, nowSelectData) {
+  let arr = []
+  arr = arr.concat(selectArr, nowSelectData)
+
+  return arr
 },
 
     handleUpdateVisible(val) {

src/views/unified-resources/data-directory/dialog/serviceDialog copy.vue

@@ -0,0 +1,866 @@
+<!-- Dialog.vue -->
+<template>
+    <el-dialog :modal="true" :close-on-click-modal="false" :close-on-press-escape="false" :title="dialogTitle"
+        :append-to-body="true" v-model="visible" width="80%" :before-close="handleClose">
+        <div>
+            <el-steps :active="activeValue" align-center>
+                <el-step title="填写编目信息"></el-step>
+                <el-step title="选择服务"></el-step>
+                <el-step title="完善归集项"></el-step>
+            </el-steps>
+        </div>
+        <div v-if="activeValue === 1" class="container">
+            <div class="t-b">目录信息</div>
+            <el-form inline :model="libraryData" label-width="auto" ref="firstRef" :disabled="isEdit"
+                class="form-detail-inline" :rules="firstFormRules">
+                <el-form-item label="数据目录代码" prop="catalogCode">
+                    <el-input v-model="libraryData.catalogCode" placeholder="提交后自动生成" disabled />
+                </el-form-item>
+                <el-form-item label="目录名称" prop="catalogName">
+                    <el-input v-model="libraryData.catalogName" placeholder="请输入目录名称" />
+                </el-form-item>
+                <el-form-item label="目录英文名称" prop="catalogNameEn">
+                    <el-input v-model="libraryData.catalogNameEn" placeholder="请输入目录英文名称" />
+                </el-form-item>
+                <!-- 添加其他表单项... -->
+                <div class="t-b">共享管理</div>
+                <el-form-item label="共享方式" prop="shareMethod">
+                    <el-select v-model="libraryData.shareMethod" placeholder="请选择共享方式">
+                        <el-option v-for="item in dict.type.share_method" :key="item.value" :label="item.label"
+                            :value="item.value" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="共享范围" prop="shareRange">
+                    <el-select v-model="libraryData.shareRange" placeholder="请选择共享范围">
+                        <el-option v-for="item in dict.type.shared_scope" :key="item.value" :label="item.label"
+                            :value="item.value" />
+                    </el-select>
+                </el-form-item>
+                <!-- 更多表单项 -->
+            </el-form>
+        </div>
+        <div v-if="activeValue === 2" class="container">
+            <div class="t-b">封装API选择</div>
+            <div class="box">
+                <el-form inline :model="libraryData" label-position="left" :disabled="isEdit">
+                    <el-form-item label="选择服务来源">
+                        <el-radio-group v-model="libraryData.apiSourceType" class="ml-4">
+                            <el-radio :label="item.value" :value="item.value" v-for="item in resourceArr"
+                                :key="item.label">{{ item.label }}</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                </el-form>
+            </div>
+            <div class="t-b">接口信息</div>
+            <div class="box">
+                <el-form class="other-form" inline :model="libraryData" label-position="left" :disabled="isEdit">
+                    <el-form-item label="接口地址">
+                        <el-input placeholder="请输入" v-model="libraryData.apiAddress"></el-input>
+                    </el-form-item>
+                    <el-form-item label="接口名称">
+                        <el-input placeholder="请输入" v-model="libraryData.apiName"></el-input>
+                    </el-form-item>
+                    <el-form-item label="请求方式">
+                        <el-select v-model="libraryData.method">
+                            <el-option :label="item.label" :value="item.value" v-for="item in method_type"
+                                :key="item.value"></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-form>
+            </div>
+            <!-- 请求参数表格 -->
+            <div class="t-b">请求参数</div>
+            <div class="box">
+                <el-button type="primary" @click="addData1" :disabled="isEdit">新增</el-button>
+                <el-table :data="data1" border style="width: 100%">
+                    <el-table-column type="selection" width="50" align="center" />
+                    <el-table-column prop="fieldName" label="参数信息" />
+                    <el-table-column prop="parameterDes" label="参数描述" />
+                    <el-table-column prop="fieldType" label="参数类型" />
+                    <el-table-column prop="isNeed" label="是否必填">
+                        <template slot-scope="{ row }">
+                            <el-switch v-model="row.isNeed" :disabled="isDisabled" active-text="是" inactive-text="否" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="explain" label="说明" />
+                </el-table>
+            </div>
+        </div>
+        <div v-if="activeValue === 3" class="container">
+            <div class="t-b">目录信息</div>
+            <p>编辑数据信息项</p>
+            <el-form inline :model="libraryData" label-position="left" :disabled="isEdit">
+                <el-form-item label="接入归集方式">
+                    <el-input v-model="libraryData.inputationMethod" placeholder="请输入数据目录代码" />
+                </el-form-item>
+                <el-form-item label="数据归集频率">
+                    <el-input v-model="libraryData.inputationSequence" placeholder="请输入数据目录代码" />
+                </el-form-item>
+            </el-form>
+        </div>
+        <div class="op-btn">
+            <el-button type="primary" v-if="!isEdit" @click="handleSave('save')">暂存</el-button>
+            <el-button type="primary" v-if="activeValue === 3 && !isEdit" @click="fangdouSaveClick">保存</el-button>
+            <el-button v-if="activeValue !== 1" @click="changeActiveVal('up')">上一步</el-button>
+            <el-button v-if="activeValue !== 3" @click="changeActiveVal('next')">下一步</el-button>
+            <el-button @click="handleClose">取消</el-button>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+import { mapState, mapActions } from 'vuex';
+import { queryMisList, getDirectoryAllLevel, queryDirectoryList, queryDatabase, getEtlTableFields, getEtlTableList } from '@/api/unified-resources/information-system/index.js'
+import { queryGovernanceRuleByName } from '@/api/unified-resources/data-directory/index.js'
+import { getResponsibilityList } from '@/api/unified-resources/job-directory/index.js'
+import MainClassDialog from "../comp/MainClassDialog.vue";
+import SelectTagDialog from "../comp/SelectTagDialog.vue";
+import SelectDutyDialog from "../comp/SelectDutyDialog.vue";
+
+export default {
+    name: "libraryTable",
+    dicts: [
+    'share_method',
+    'shared_scope',
+    'shared_type',
+    'access_collection_method',
+    'data_collection_frequency',
+    'base_type',
+    'data_update_type',
+    'access_collection_caliber',
+    'datalayer_type'
+  ],
+    components: {
+        MainClassDialog,
+        SelectTagDialog,
+        SelectDutyDialog,
+    },
+    props: {
+        value: {
+            type: Boolean,
+            default: false,
+        },
+        title: {
+            type: String,
+            default: "弹窗标题",
+        },
+        currentOpObj: {
+            type: Object,
+            default: {},
+        },
+        width: {
+            type: String,
+            default: "85%",
+        },
+        isAddOperation: {
+
+         }
+    },
+    data() {
+        return {
+            visible: this.value,
+            dialogTitle: '',
+            itemView: {},
+
+            libraryData: {
+                apiSourceType: 1,
+                isSpace: 2,
+                isOpen: 2,
+                catalogType: '服务'
+            },
+            data1: {},
+            isEdit: false,
+            // catalogId: null,
+            isAdding: false,
+            optionName: '',
+            isMainClassDialog: false,
+            mainClassId: '',
+            safetyLevelArr: [{ id: 1, levelName: '安全等级一级' }, { id: 2, levelName: '安全等级二级' }, { id: 3, levelName: '安全等级三级' }],
+            allInformationSystemArr: [],
+            informationSystemArr: [],
+            provideUnitArr: [],
+            departmentClassIdTypeArr: [],
+            selectDutyId: '',
+            tagSelectList: {},
+            dutyIdTypeArr: [],
+            mainClassIdOptions: [],
+            isSelectTagDialog: false,
+            isSelectDutyDialog: false,
+            libraryData: {
+                apiSourceType: 1,
+                isSpace: 2,
+                isOpen: 2,
+                catalogType: '服务'
+            },
+            environmentOtherFormData: {
+                env: ''
+            },
+            selectArr: [],
+            options: [],
+            data1: [
+            ],
+            nowSelectData: [],
+            nowSelectRightData: [],
+            activeValue: 1,
+            tableData: [
+                {
+                    id: 10001,
+                    name: '系统1',
+                    nickname: 'comId',
+                    role: 'VARCHAR2(2',
+                    sex: '主健',
+                    sex2: '是',
+                    num1: '是',
+                    age: '是',
+                    address: '是',
+                    date12: '是',
+                    date13: '是'
+                }
+            ],
+            resourceArr: [
+                { label: '转发API', value: 1 },
+                { label: '查询API', value: 2 }
+            ],
+            isRadio: [
+                { label: '是', value: 1 },
+                { label: '否', value: 2 }
+            ],
+            isOpen: [
+                { label: '开放', value: 1 },
+                { label: '非开放', value: 2 }
+            ],
+            
+            res1: '',
+            firstFormRules:{
+  catalogCode: [{ required: true, message: '请输入数据目录代码', trigger: 'blur' }],
+  catalogName: [{ required: true, message: '请输入目录名称', trigger: 'blur' }],
+  catalogNameEn: [{ required: true, message: '请输入目录英文名称', trigger: 'blur' }],
+  provideUnit: [{ required: true, message: '请选择提供单位', trigger: 'change' }],
+  informationSystem: [{ required: true, message: '请选择所属信息系统', trigger: 'change' }],
+  catalogType: [{ required: true, message: '请输入目录类型', trigger: 'blur' }],
+  updateSeq: [{ required: true, message: '请输入更新频率及增量描述', trigger: 'blur' }],
+  isSpace: [{ required: true, message: '请选择是否为空间资源', trigger: 'change' }],
+  coordinate: [{ required: true, message: '请输入源坐标系', trigger: 'blur' }],
+  safetyLevel: [{ required: true, message: '请选择安全等级', trigger: 'change' }],
+  shareMethod: [{ required: true, message: '请选择共享方式', trigger: 'change' }],
+  shareRange: [{ required: true, message: '请选择共享范围', trigger: 'change' }],
+  // shareType: [{ required: true, message: '请选择共享类型', trigger: 'change' }],
+  // shareCondition: [{ required: true, message: '请输入共享条件', trigger: 'blur' }],
+  // isOpen: [{ required: true, message: '请选择开放属性', trigger: 'change' }],
+  openCondition: [{ required: true, message: '请输入开放条件', trigger: 'blur' }],
+  isOpen: [{ required: true, message: '请选择是否硬件网络', trigger: 'change' }],
+  mainClassId: [{ required: true, message: '请选择是否硬件网络', trigger: 'change' }],
+  departmentClassId: [{ required: true, message: '请选择是否硬件网络', trigger: 'change' }],
+  inputationMethod: [{ required: true, message: '请选择接入归集方式', trigger: 'change' }],
+  baseType: [{ required: true, message: '请选择底座类型', trigger: 'change' }],
+  updateType: [{ required: true, message: '请选择数据更新方式', trigger: 'change' }],
+  inputationCron: [{ required: true, message: '请输入接入归集周期', trigger: 'blur' }],
+  inputationCalibre: [{ required: true, message: '请选择接入归集口径', trigger: 'change' }],
+  identificationField: [{ required: true, message: '请输入归集增量标识字段', trigger: 'blur' }],
+  dutyId: [{ required: true, message: '请选择关联本机构职责目录', trigger: 'change' }]
+},
+        };
+    },
+    watch: {
+        value(newVal) {
+            this.visible = newVal;
+        },
+        visible(newVal) {
+            this.$emit("input", newVal);
+        },
+        title: {
+            handler(newVal) {
+                this.dialogTitle = newVal;
+            },
+            deep: true, // 深入监听
+            immediate: true,
+        },
+        currentOpObj: {
+            handler(newVal) {
+                this.itemView = newVal;
+            },
+            deep: true, // 深入监听
+            immediate: true,
+        },
+    },
+
+    mounted() {
+
+        if (this.isAddOperation === 'add' && sessionStorage.getItem('fw-form')) {
+            this.libraryData = JSON.parse(sessionStorage.getItem('fw-form'));
+        }
+        this.libraryData.inputationMethod = '接口';
+        this.getOrganizationalList();
+        this.getTrees();
+        this.getList();
+        this.getSystemListData();
+
+        if (this.isAddOperation !== 'add') {
+            if (this.historyId) {
+                this.getDirectoryList();
+                this.getVerHistory();
+            } else {
+                this.getDirectoryList();
+                this.getDetail();
+            }
+
+            if (this.isAddOperation === 'view') {
+                this.isEdit = true;
+            } else {
+                this.isEdit = false;
+            }
+
+        }
+    },
+    computed: {
+        ...mapState('projectManage', ['catalogId']),  // 映射 Vuex 状态
+        // isAddOperation() {
+        //     return this.$props.isAddOperation
+        // }
+    },
+    methods: {
+        // ...mapMutations(['updateCatalog']),
+
+        onAddOption() {
+            this.isAdding = true;
+        },
+
+        onConfirm() {
+            if (this.optionName) {
+                let pForm = {};
+                pForm.directoryCode = this.createRandomId();
+                pForm.directoryName = this.optionName;
+                pForm.levelDirectory = this.libraryData.mainClassId;
+                pForm.levelDirectoryName = this.libraryData.mainClassName;
+                this.addDireccory(pForm).then(res => {
+                    if (+res.code === 200) {
+                        this.getDirectoryList(this.libraryData.mainClassId);
+                    }
+                });
+                this.clear();
+            }
+        },
+
+        clear() {
+            this.optionName = '';
+            this.isAdding = false;
+        },
+
+        handelMainClassId() {
+            this.mainClassId = this.libraryData.mainClassId;
+            this.isMainClassDialog = true;
+        },
+
+        MainClassSaveHandle(value) {
+            this.clear();
+            this.libraryData.mainClassId = value.levelDirectory;
+            this.libraryData.mainClassName = value.levelDirectoryName;
+            this.libraryData.departmentClassId = '';
+            this.getDirectoryList(value.levelDirectory);
+        },
+
+        getOrganizationalList() {
+            getDirectoryAllLevel({ type: '组织机构' }).then(res => {
+                if (+res.code === 200) {
+                    this.provideUnitArr = res.data === null ? [] : res.data[0].list;
+                }
+            });
+        },
+
+        getSystemListData() {
+            queryMisList({ pageNumber: 1, pageSize: 999 }).then(res => {
+                if (+res.code === 200) {
+                    this.informationSystemArr = res.data;
+                }
+            });
+        },
+
+        changeProvidedUnit(value) {
+            this.libraryData.informationSystem = '';
+        },
+
+        addData1() {
+            this.data1.push({});
+        },
+
+        handleMainClassIdChange(value) {
+            this.libraryData.mainClassId = value[value.length - 1];
+            this.libraryData.departmentClassId = '';
+            this.getDirectoryList(this.libraryData.mainClassId);
+        },
+
+        getDirectoryList(val) {
+            this.queryDirectoryList({ pageNumber: 1, pageSize: 99999, directoryTwoId: val }).then(res => {
+                if (+res.code === 200) {
+                    this.departmentClassIdTypeArr = res.data;
+                }
+            });
+        },
+
+        inputationLabelSelected(obj) {
+            this.libraryData.inputationLabel = obj.dynamicTags?.map(i => i.directoryName).join(',');
+            this.libraryData.column1 = obj.dynamicTags;
+        },
+
+        dutyIdSelected(obj) {
+            this.libraryData.dutyId = obj.id;
+        },
+
+        getList() {
+            getResponsibilityList({
+                pageNumber: 1,
+                pageSize: 9999
+            }).then(res => {
+                if (+res.code === 200) {
+                    this.dutyIdTypeArr = res.data;
+                }
+            });
+        },
+
+        getTrees() {
+            getDirectoryAllLevel({ type: '目录' }).then(res => {
+                if (+res.code === 200) {
+                    this.mainClassIdOptions = res.data;
+                }
+            });
+        },
+
+        handelSelectTag() {
+            this.isSelectTagDialog = true;
+            this.$store.commit('setSelectTagList', this.libraryData.column1);
+        },
+
+        handelSelectDuty() {
+            this.isSelectDutyDialog = true;
+            this.$store.commit('setSelectDutyId', this.libraryData.dutyId);
+        },
+
+        handleClose() {
+            if (this.props.isAddOperation === 'add') {
+                if (Object.keys(this.libraryData).length > 5) {
+                    this.$confirm('表单尚未提交，是否暂存已修改的内容？', '提示', {
+                        confirmButtonText: '暂存',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                    }).then(() => {
+                        sessionStorage.setItem('fw-form', JSON.stringify(this.libraryData));
+                        this.$message({
+                            type: 'success',
+                            message: '暂存成功'
+                        });
+                        this.$emit('update:dialogVisible', false);
+                    }).catch(() => {
+                        this.$message({
+                            type: 'info',
+                            message: '取消成功'
+                        });
+                        this.libraryData = {};
+                        sessionStorage.removeItem('fw-form');
+                        this.$emit('update:dialogVisible', false);
+                    });
+                } else {
+                    this.$emit('update:dialogVisible', false);
+                }
+            } else {
+                this.$emit('update:dialogVisible', false);
+            }
+        },
+
+        changeActiveVal(type) {
+            if (type === 'up') {
+                this.activeValue -= 1;
+            } else {
+                if (this.activeValue === 1) {
+                    this.libraryData.catalogCode = this.createRandomId();
+
+                    this.firstRef.validate((valid, fields) => {
+                        if (valid) {
+                            this.res1 = valid;
+                            this.activeValue += 1;
+                            this.queryDatabase({ pageNumber: 1, pageSize: 999 }).then(res => { });
+                        } else {
+                            this.$message.error('请完整输入表单项');
+                            return;
+                        }
+                    });
+                } else if (this.activeValue === 2) {
+                    this.activeValue += 1;
+                } else if (this.activeValue === 3) {
+                    this.activeValue += 1;
+                }
+            }
+        },
+        checkAll(val) {
+            this.nowSelectData = val;
+        },
+
+        checkRightAll(val) {
+            this.nowSelectRightData = val;
+        },
+
+        handleConcatArr(selectArr, nowSelectData) {
+            let arr = [];
+            arr = arr.concat(selectArr, nowSelectData);
+            return arr;
+        },
+
+        handleRemoveTabList(isNeedArr, originalArr) {
+            if (isNeedArr.length && originalArr.length) {
+                for (let i = 0; i < isNeedArr.length; i++) {
+                    for (let k = 0; k < originalArr.length; k++) {
+                        if (isNeedArr[i]['name'] === originalArr[k]['name']) {
+                            originalArr.splice(k, 1);
+                        }
+                    }
+                }
+            }
+        },
+
+        getDetail() {
+            getCatalogDetail({ catalogId: this.catalogId }).then(res => {
+                let catalog = res.data.catalog;
+                let catalogDuty = res.data.catalogDuty;
+                let catalogExtend = res.data.catalogExtend;
+                let catalogApi = res.data.catalogApi;
+                let newObj = {
+                    ...catalog,
+                    ...catalogDuty,
+                    ...catalogExtend,
+                    ...catalogApi
+                };
+                this.libraryData = newObj;
+                this.catalogId = catalog.catalogId;
+                this.libraryData.date = [catalogExtend.startTime, catalogExtend.endTime];
+                this.libraryData.apiSourceType = Number(catalogApi.apiSourceType);
+                this.libraryData.catalogType = '服务';
+                this.libraryData.safetyLevel = +this.libraryData.safetyLevel;
+                this.libraryData.provideUnit = this.libraryData.provideUnit.split(',');
+                if (catalogApi.params) {
+                    this.data1 = JSON.parse(catalogApi.params);
+                }
+
+                if (this.libraryData.column1) {
+                    this.libraryData.column1 = JSON.parse(this.libraryData.column1);
+                }
+
+                if (newObj.params) {
+                    this.libraryData.params = JSON.parse(newObj.params);
+                }
+                if (newObj.body) {
+                    this.libraryData.body = JSON.parse(newObj.body);
+                }
+                if (newObj.apiExample) {
+                    this.libraryData.apiExample = JSON.parse(newObj.apiExample);
+                }
+
+                if (catalog?.catalogChange?.changeReason) {
+                    this.libraryData.changeReason = catalog.catalogChange.changeReason;
+                }
+            });
+        },
+
+        handleSave(type) {
+            this.libraryData.column1 = JSON.stringify(this.libraryData.column1, null, '')
+
+            let params = {
+                catalog: {
+                    catalogCode: this.libraryData.catalogCode,
+                    catalogName: this.libraryData.catalogName,
+                    catalogNameEn: this.libraryData.catalogNameEn,
+                    provideUnit: this.libraryData.provideUnit.join(','),
+                    informationSystem: this.libraryData.informationSystem,
+                    catalogType: 2,
+                    updateSeq: this.libraryData.updateSeq,
+                    isSpace: this.libraryData.isSpace,
+                    coordinate: this.libraryData.coordinate,
+                    shareMethod: this.libraryData.shareMethod,
+                    shareRange: this.libraryData.shareRange,
+                    openCondition: this.libraryData.openCondition,
+                    mainClassId: this.libraryData.mainClassId,
+                    mainClassName: this.libraryData.mainClassName,
+                    departmentClassId: this.libraryData.departmentClassId,
+                    catalogStatus: this.libraryData.catalogStatus,
+                    safetyLevel: this.libraryData.safetyLevel,
+                    catalogDes: this.libraryData.catalogDes
+                },
+                catalogExtend: {
+                    inputationMethod: this.libraryData.inputationMethod,
+                    inputationSequence: this.libraryData.inputationSequence,
+                    catalogAbstract: this.libraryData.catalogAbstract,
+                    inputationLabel: this.libraryData.inputationLabel,
+                    column1: this.libraryData.column1,
+                    baseType: this.libraryData.baseType,
+                    updateType: this.libraryData.updateType,
+                    inputationCron: this.libraryData.inputationCron,
+                    inputationCalibre: this.libraryData.inputationCalibre,
+                    identificationField: this.libraryData.identificationField,
+                    dataSize: this.libraryData.dataSize,
+                    startTime: this.libraryData.date?.[0],
+                    endTime: this.libraryData.date?.[1]
+                },
+                catalogDuty: {
+                    dutyId: this.libraryData.dutyId
+                },
+                catalogApi: {
+                    apiAddress: this.libraryData.apiAddress,
+                    apiName: this.libraryData.apiName,
+                    method: this.libraryData.method,
+                    requestHeader: this.libraryData.requestHeader,
+                    responseHeader: this.libraryData.responseHeader,
+                    params: JSON.stringify(this.data1),
+                    body: JSON.stringify(this.libraryData.body),
+                    apiExample: JSON.stringify(this.libraryData.apiExample),
+                    apiSourceType: this.libraryData.apiSourceType
+                },
+                catalogChange: {
+                    changeReason: this.libraryData.changeReason
+                }
+            }
+
+            if (type === 'save') {
+                params.catalog.catalogStatus = 1
+            } else {
+                params.catalog.catalogStatus = 2
+            }
+
+            if (this.isAddOperation === 'change') {
+                params.catalog.catalogId = this.catalogId
+                params.catalogExtend.catalogId = this.catalogId
+                params.catalogDuty.catalogId = this.catalogId
+                params.catalogApi.catalogId = this.catalogId
+                changeFeedbackList({ catalogDTO: params, queryType: 1, registerFlag: true, assertId: this.catalogId }).then(res => {
+                    if (+res.code === 200) {
+                        this.$emit('update:dialogVisible', false)
+                        this.$emit('saveHandle')
+                        this.$modal.msgSuccess('更新成功')
+                        this.$bus.emit('libraryTable', params)
+                        sessionStorage.removeItem('kb-form')
+                    }
+                })
+            } else {
+                if (this.catalogId) {
+                    params.catalog.catalogId = this.catalogId
+                    params.catalogExtend.catalogId = this.catalogId
+                    params.catalogDuty.catalogId = this.catalogId
+                    params.catalogApi.catalogId = this.catalogId
+                    updateCatalog(params).then(res => {
+                        if (+res.code === 200) {
+                            this.$emit('update:dialogVisible', false)
+                            this.$modal.msgSuccess('更新成功')
+                            this.$bus.emit('libraryTable', params)
+                            sessionStorage.removeItem('fw-form')
+                        }
+                    })
+                } else {
+                    saveCatalog(params).then(res => {
+                        if (+res.code === 200) {
+                            this.$emit('update:dialogVisible', false)
+                            this.$modal.msgSuccess('新增成功')
+                            this.$bus.emit('libraryTable', params)
+                            sessionStorage.removeItem('fw-form')
+                        }
+                    })
+                }
+            }
+        },
+
+        fangdouSaveClick() {
+            this.$debounce(this.handleSave, 1000, {
+                leading: true,
+                trailing: false
+            })()
+        },
+
+        handleSubmitSave() {
+            this.handleSave('submit')
+        },
+
+        handleUpdateVisible(val) {
+            this.visible = val;
+        },
+        beforeClose(done) {
+            this.visible = false;
+            this.$emit("before-close", done);
+        },
+        // 取消按钮处理方法
+        handleCancel() {
+            this.visible = false;
+            this.$emit("cancel"); // 可以在父组件监听 'cancel' 事件
+        },
+
+
+
+        // 确定按钮处理方法
+        async handleConfirm() {
+            if (this.title === "新增") {
+                this.formData.code = this.createRandomId()
+            }
+            // this.$refs.myFormComponent.validateForm();
+            await this.$refs.ruleFormRef.validate((valid, fields) => {
+                if (valid) {
+                    // 校验通过，进行后续操作
+                    console.log("表单校验通过，进行后续操作");
+                    this.handleSave();
+                } else {
+                    this.$message.error("请完整填写表单");
+                    console.log("表单校验失败");
+                }
+            })
+
+        },
+
+        handleSave() {
+
+            let pForm = {}
+            pForm = { ...this.formData }
+            pForm.agenciesName = pForm.agenciesName ? pForm.agenciesName?.join(',') : ''
+            if (this.title === "新增") {
+                addResponsibility({ ...pForm }).then(res => {
+                    if (+res.code === 200) {
+                        this.$message.success(res.msg)
+                        this.$emit("confirm");
+                        this.handleCancel()
+                    }
+                })
+            } else {
+                updateResponsibility({ id: this.itemView.id, ...pForm }).then(res => {
+                    if (+res.code === 200) {
+                        this.$message.success(res.msg)
+                        this.$emit("confirm");
+                        this.handleCancel()
+                    }
+                })
+            }
+        },
+        createRandomId() {
+            let min = Math.pow(10, 14);
+            let max = Math.pow(10, 15) - 1;
+            return Math.floor(Math.random() * (max - min + 1)) + min;
+        }
+    },
+};
+</script>
+
+<style scoped lang="scss">
+.op-btn {
+    text-align: center;
+    margin-top: 15px;
+}
+
+.other-form {
+    .el-form-item {
+        width: 27%;
+    }
+}
+
+.two-form {
+    .el-form-item {
+        width: 43%;
+    }
+}
+
+.container {
+    min-height: 60vh;
+}
+
+.rowForm {
+    // justify-content: center;
+}
+
+.w100 {
+    width: 100% !important;
+}
+
+.t-b {
+    font-size: 18px;
+    margin-bottom: 20px;
+}
+
+.box {
+    margin-left: 50px;
+}
+
+.list {
+    display: flex;
+    justify-content: center;
+    margin-top: 20px;
+
+    .table1 {
+        width: 30%;
+        margin: 20px;
+    }
+
+    table {
+        width: 100%;
+        border-collapse: collapse;
+        font-size: 12px;
+        color: #606266;
+
+        td,
+        thead {
+            padding: 0 10px;
+            width: 177px;
+            height: 34px;
+            line-height: 34px;
+            border: 1px solid #e4e4e4;
+            box-sizing: border-box;
+        }
+
+        thead {
+            text-align: center;
+        }
+
+        .one-td {
+            border-top: none;
+        }
+    }
+
+    .arrowList {
+        td {
+            border: 0 !important;
+            text-align: center;
+        }
+
+        tbody {
+            border: 0 !important;
+        }
+    }
+}
+
+.flex-box {
+    display: flex;
+    width: 100%;
+
+    .el-input {
+        width: 100%;
+    }
+}
+
+.flex-box-btn {
+    background-color: #3f8ffe !important;
+    color: #fff !important;
+    height: 38px !important;
+}
+
+.header-title {
+    display: block;
+    font-size: 16px;
+    text-align: center;
+    padding: 10px;
+    border-bottom: 1px solid #ebeef5;
+    margin-bottom: 10px;
+}
+
+.border-color {
+    border: 1px solid #ebeef5;
+}
+
+.option-input {
+    width: 100%;
+    margin-bottom: 8px;
+}
+
+.select-txt {
+    font-size: 30px !important;
+}
+</style>

src/views/unified-resources/data-directory/index.vue

@@ -191,6 +191,11 @@
       </LibraryTable>
     </div>
 
+    <!--  -->
+    <div v-if="addFwDialogVisible">
+      <ServiceDialog :current-op-obj="currentOpObj" v-model="addFwDialogVisible" :is-add-operation="isAddOperation" :operationType="operationType"></ServiceDialog>
+    </div>
+
     <!-- <div v-if="showDialog">
       <ConfigDialog
         v-model="showDialog"
@@ -210,6 +215,7 @@ import MyPagination from "@/components/MyPagination";
 import MyTableHeader from "@/components/MyTableHeader";
 import FileUploadDialog from "./dialog/FileUploadDialog.vue";
 import LibraryTable from "./dialog/libraryTable.vue";
+import ServiceDialog from "./dialog/serviceDialog.vue";
 export default {
   name: "data-directory",
   dicts: ['catalog_type', 'catalog_status'],
@@ -220,9 +226,11 @@ export default {
     MyPagination,
     FileUploadDialog,
     LibraryTable,
+    ServiceDialog
   },
   data() {
     return {
+      addFwDialogVisible:false,
       libraryTableVisible: false,
       isAddOperation: '',
       operationType: '',
@@ -400,7 +408,7 @@ export default {
           this.currentOpObj = {};
           this.title = "新增";
           this.isAddOperation = 'add'
-          this.showDialog = true;
+          this.addFwDialogVisible = true;
           break;
         case "action3":
           // 新增文件目录