数据目录清单完成

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

@@ -55,7 +55,27 @@ export function updateCatalog(data) {
       },
     });
   }
+// 目录发布
+export function publishCatalog(data) {
+  return request({
+    url: "/catalog/publish",
+    method: "post",
+    data: {
+      ...data,
+    },
+  });
+}
 
+// 目录失效
+export function InvalidCatalog(data) {
+  return request({
+    url: "/catalog/invalid",
+    method: "post",
+    data: {
+      ...data,
+    },
+  });
+}
   // 批量删除目录
 export function removeBatchCatalog(data) {
     return request({

src/assets/styles/index.scss

@@ -531,6 +531,6 @@ aside {
   }
 }
 
-input[aria-hidden="true"] {
-  display: none !important;
-}
+// input[aria-hidden="true"] {
+//   display: none !important;
+// }

src/components/HeaderSearch/index.vue

@@ -1,18 +1,10 @@
 <template>
-  <div :class="{'show':show}" class="header-search">
+  <div :class="{ 'show': show }" class="header-search">
     <svg-icon class-name="search-icon" icon-class="search" @click.stop="click" />
-    <el-select
-      ref="headerSearchSelect"
-      v-model="search"
-      :remote-method="querySearch"
-      filterable
-      default-first-option
-      remote
-      placeholder="Search"
-      class="header-search-select"
-      @change="change"
-    >
-      <el-option v-for="option in options" :key="option.item.path" :value="option.item" :label="option.item.title.join(' > ')" />
+    <el-select ref="headerSearchSelect" v-model="search" :remote-method="querySearch" filterable default-first-option
+      remote placeholder="Search" class="header-search-select" @change="change">
+      <el-option v-for="option in options" :key="option.item.path" :value="option.item"
+        :label="option.item.title.join(' > ')" />
     </el-select>
   </div>
 </template>
@@ -61,18 +53,22 @@ export default {
     click() {
       this.show = !this.show
       if (this.show) {
-        this.$refs.headerSearchSelect && this.$refs.headerSearchSelect.focus()
+        this.$nextTick(() => {
+          this.$refs.headerSearchSelect && this.$refs.headerSearchSelect.focus()
+        })
       }
     },
     close() {
-      this.$refs.headerSearchSelect && this.$refs.headerSearchSelect.blur()
+      this.$nextTick(() => {
+        this.$refs.headerSearchSelect && this.$refs.headerSearchSelect.blur()
+      })
       this.options = []
       this.show = false
     },
     change(val) {
       const path = val.path;
       const query = val.query;
-      if(this.ishttp(val.path)) {
+      if (this.ishttp(val.path)) {
         // http(s):// 路径新窗口打开
         const pindex = path.indexOf("http");
         window.open(path.substr(pindex, path.length), "_blank");

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

@@ -1,866 +0,0 @@
-<!-- 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/dialog/serviceDialog.vue

@@ -1021,10 +1021,11 @@ export default {
           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);
+        
+            // this.$emit("saveHandle");
+            this.$message.success("更新成功");
+            this.handleCancel()
+            // this.$bus.emit("libraryTable", params);
             sessionStorage.removeItem("kb-form");
           }
         });
@@ -1068,7 +1069,7 @@ export default {
     // 取消按钮处理方法
     handleCancel() {
       this.visible = false;
-      this.$emit("cancel"); // 可以在父组件监听 'cancel' 事件
+      this.$emit("confirm"); // 可以在父组件监听 'cancel' 事件
     },
 
     // 确定按钮处理方法

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

@@ -131,7 +131,8 @@
               <!-- <el-button link type="primary" @click="handleRow(row, 'edit')" v-if="row.catalogStatus === 1">编辑</el-button> -->
               <el-button type="text" @click="handleRow(row, 'edit')"
                 v-if="row.catalogStatus === 1 || row.catalogStatus === 2">编辑</el-button>
-              <el-button type="text" @click="handleRowAssetChange(row)" v-if="row.catalogStatus === 5">资产变更</el-button>
+              <!-- <el-button type="text" @click="handleRowAssetChange(row)" v-if="row.catalogStatus === 5">资产变更</el-button> -->
+
               <!-- <el-button  type="text" @click="handleRow(row, 'change')" v-if="row.catalogStatus === 5">变更</el-button> -->
               <el-button type="text" @click="handleRow(row, 'view')">查看</el-button>
               <el-button type="text" @click="handleView(row)" v-if="row.isGuiji === 1">查看归集</el-button>
@@ -141,7 +142,7 @@
               </el-popconfirm>
               <el-button type="text" @click="handleConfigId(row)">协同配置</el-button>
 
-              <el-popconfirm title="是否确定发布?" @confirm="handleIssue(row)">
+              <el-popconfirm title="是否确定发布?" @confirm="handleIssue(row)" class="popconfirm_btn">
                 <template #reference>
                   <el-button type="text" v-if="row.catalogStatus === 2">发布</el-button>
                 </template>
@@ -191,11 +192,36 @@
       </LibraryTable>
     </div>
 
-    <!--  -->
+    <!--  服务 -->
     <div v-if="addFwDialogVisible">
-      <ServiceDialog :current-op-obj="currentOpObj" v-model="addFwDialogVisible" :is-add-operation="isAddOperation" :operationType="operationType" @confirm="getList"></ServiceDialog>
+      <ServiceDialog :current-op-obj="currentOpObj" v-model="addFwDialogVisible" :is-add-operation="isAddOperation"
+        :operationType="operationType" @confirm="getList"></ServiceDialog>
+    </div>
+
+    <!-- 文件 -->
+    <div v-if="addWjDialogVisible">
+      <FireDirectoryDialog :current-op-obj="currentOpObj" :is-add-operation="isAddOperation"
+        v-model="addWjDialogVisible" :operationType="operationType" @confirm="getList"></FireDirectoryDialog>
     </div>
 
+    <!-- 实时 -->
+    <div v-if="addSjDialogVisible">
+      <DataDirectoryDialog :current-op-obj="currentOpObj" :is-add-operation="isAddOperation"
+        v-model="addSjDialogVisible" :operationType="operationType" @confirm="getList"></DataDirectoryDialog>
+    </div>
+
+    <el-dialog title="协同配置" :visible.sync="configOpen" width="50%" append-to-body>
+      <div style="font-size: 18px">
+        <span style="font-size: 20px; margin-right: 15px">协同id:</span>
+        {{ currentOpObj.catalogId }}
+      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="configOpen = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
     <!-- <div v-if="showDialog">
       <ConfigDialog
         v-model="showDialog"
@@ -208,7 +234,8 @@
   </el-container>
 </template>
 <script>
-import { getCatalogList, getCatalogDetail, saveCatalog, removeCatalog, removeBatchCatalog } from '@/api/unified-resources/data-directory/index.js'
+publishCatalog
+import { getCatalogList, getCatalogDetail, saveCatalog, removeCatalog, removeBatchCatalog,publishCatalog,InvalidCatalog } from '@/api/unified-resources/data-directory/index.js'
 import MyHeader from "@/components/MyHeader";
 import MyTable from "@/components/MyTable";
 import MyPagination from "@/components/MyPagination";
@@ -216,6 +243,9 @@ import MyTableHeader from "@/components/MyTableHeader";
 import FileUploadDialog from "./dialog/FileUploadDialog.vue";
 import LibraryTable from "./dialog/libraryTable.vue";
 import ServiceDialog from "./dialog/serviceDialog.vue";
+import FireDirectoryDialog from "./dialog/fileDirectory.vue";
+import DataDirectoryDialog from "./dialog/DataDirectoryDialog.vue";
+
 export default {
   name: "data-directory",
   dicts: ['catalog_type', 'catalog_status'],
@@ -226,12 +256,17 @@ export default {
     MyPagination,
     FileUploadDialog,
     LibraryTable,
-    ServiceDialog
+    ServiceDialog,
+    FireDirectoryDialog,
+    DataDirectoryDialog
   },
   data() {
     return {
-      addFwDialogVisible:false,
+      configOpen: false,
+      addFwDialogVisible: false,
       libraryTableVisible: false,
+      addWjDialogVisible: false,
+      addSjDialogVisible: false,
       isAddOperation: '',
       operationType: '',
       fileUploadShowDialog: false,
@@ -416,7 +451,7 @@ export default {
           this.currentOpObj = {};
           this.title = "新增";
           this.isAddOperation = 'add'
-          this.showDialog = true;
+          this.addWjDialogVisible = true;
           break;
         case "action4":
           // 新增实时目录
@@ -424,7 +459,7 @@ export default {
           this.currentOpObj = {};
           this.title = "新增";
           this.isAddOperation = 'add'
-          this.showDialog = true;
+          this.addSjDialogVisible = true;
           break;
         case "action5":
           // 导入
@@ -539,7 +574,7 @@ export default {
 
     // 复制
     handleCopy(row) {
-      getDetail(row)
+      this.getDetail(row)
     },
     getDetail(row) {
       getCatalogDetail({ catalogId: row.catalogId }).then(res => {
@@ -557,29 +592,29 @@ export default {
       })
     },
     handleRow(row, type) {
-  /////////////
-  let catalogId = row.catalogId
-  let catalogType = row.catalogType
-  this.isAddOperation = type
-  this.$store.dispatch(
+      /////////////
+      let catalogId = row.catalogId
+      let catalogType = row.catalogType
+      this.isAddOperation = type
+      this.$store.dispatch(
         "projectManage/setCatalogId",
         row.catalogId
       );
-  switch (catalogType) {
-    case 1:
-      this.libraryTableVisible = true
-      break
-    case 2:
-    this.addFwDialogVisible = true
-      break
-    case 3:
-    this.addWjDialogVisible = true
-      break
-    case 4:
-    this.addSjDialogVisible = true
-      break
-  }
-},
+      switch (catalogType) {
+        case 1:
+          this.libraryTableVisible = true
+          break
+        case 2:
+          this.addFwDialogVisible = true
+          break
+        case 3:
+          this.addWjDialogVisible = true
+          break
+        case 4:
+          this.addSjDialogVisible = true
+          break
+      }
+    },
     // 编辑
     handleView(row) {
       this.rowObj = row;
@@ -606,7 +641,31 @@ export default {
         }
       })
     },
-    changeOperation() { }
+    changeOperation() { },
+    handleConfigId(row) {
+      this.currentOpObj = row
+      this.configOpen = true
+    },
+    handleIssue(row) {
+  publishCatalog({ catalogId: row.catalogId }).then(res => {
+    if (+res.code === 200) {
+      this.$message.success(res.msg)
+      this.getList()
+    } else {
+      this.$message.error(res.msg)
+    }
+  })
+},
+handleInvalid(row) {
+  InvalidCatalog({ catalogId: row.catalogId }).then(res => {
+    if (+res.code === 200) {
+      this.$message.success(res.msg)
+      this.getList()
+    } else {
+      this.$message.error(res.msg)
+    }
+  })
+}
 
     // handleDelete(row) {
     //   this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {