diff --git a/src/components/dataAsync/AsyncMain.data.ts b/src/components/dataAsync/AsyncMain.data.ts
index 23acf67..e6c732d 100644
--- a/src/components/dataAsync/AsyncMain.data.ts
+++ b/src/components/dataAsync/AsyncMain.data.ts
@@ -5,30 +5,52 @@ import { render } from '/@/utils/common/renderUtils';
import { getWeekMonthQuarterYear } from '/@/utils';
//主列表数据
export const asyncMaincolumns: BasicColumn[] = [
- // {
- // title: '类型',
- // align: "center",
- // dataIndex: 'type'
- // },
{
- title: '同步备注信息',
+ title: '同步时间',
align: 'center',
- dataIndex: 'descr',
+ dataIndex: 'createTime',
+ width: '150px'
},
{
title: '同步人',
align: 'center',
dataIndex: 'createBy_dictText',
+ width: '120px'
},
{
- title: '开始同步时间',
+ title: '源平台',
align: 'center',
- dataIndex: 'createTime',
+ dataIndex: 'orgName',
+ width: '150px'
},
{
- title: '同步状态',
+ title: '目标平台',
align: 'center',
- dataIndex: 'asyncStatusList',
+ dataIndex: 'targetOrgName',
+ width: '150px',
+ customRender: ({ record }) => {
+ return record.asyncStatusList?.[0]?.zorgName || '-';
+ }
+ },
+ {
+ title: '业务字段',
+ align: 'center',
+ dataIndex: 'dataStatus',
+ width: '120px',
+ customRender: ({ record }) => {
+ const dataItem = record.asyncStatusList?.find(item => item.code === 'data');
+ return dataItem ? (dataItem.status === '200' ? '成功' : '失败') : '-';
+ }
+ },
+ {
+ title: '指令资源',
+ align: 'center',
+ dataIndex: 'fileStatus',
+ width: '120px',
+ customRender: ({ record }) => {
+ const fileItem = record.asyncStatusList?.find(item => item.code === 'file');
+ return fileItem ? (fileItem.status === '200' ? '成功' : '失败') : '-';
+ }
},
];
//子列表数据
diff --git a/src/components/dataAsync/AsyncMainList0731.vue b/src/components/dataAsync/AsyncMainList0731.vue
new file mode 100644
index 0000000..38e7887
--- /dev/null
+++ b/src/components/dataAsync/AsyncMainList0731.vue
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+ 新增
+ 导出
+ 导入
+
+
+
+
+
+ 删除
+
+
+
+ 批量操作
+
+
+
+
+
+
+ {{ record.asyncStatusList?.[0]?.zorgName || '-' }}
+
+
+
+
+
+
+ 成功
+
+
+ 失败
+
+ -
+
+
+
+
+
+ 成功
+
+
+ 失败
+
+ -
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/synchronization/directive/serviceDirective/DirectiveChooseCom.vue b/src/views/synchronization/directive/serviceDirective/DirectiveChooseCom.vue
index 7d7900d..7a550d3 100644
--- a/src/views/synchronization/directive/serviceDirective/DirectiveChooseCom.vue
+++ b/src/views/synchronization/directive/serviceDirective/DirectiveChooseCom.vue
@@ -154,22 +154,22 @@
目标机构 :{{ targetOrg?.departName }}
新增服务指令: {{ getNewCount() }} 条
更新服务指令: {{ getUpdateCount() }} 条
- 请选择"新增指令"需要同步的内容:
+
同步服务指令: {{ rightNeedAddList.length }} 条
-
请选择"服务指令"需要同步的内容:
+
diff --git a/src/views/synchronization/directive/syncList.vue b/src/views/synchronization/directive/syncList.vue
index af60d2f..6514168 100644
--- a/src/views/synchronization/directive/syncList.vue
+++ b/src/views/synchronization/directive/syncList.vue
@@ -19,9 +19,11 @@
镜像
+ 日志
查看可新增指令
+ @click="handleLookNewDirectives">新增指令
@@ -33,6 +35,14 @@
+
+
+ 关闭
+
+
+
@@ -49,6 +59,7 @@ import { getOrgInfo } from '/@/views/admin/orgapplyinfo/OrgApplyInfo.api';
//机构列表
import OrgListCom from '/@/views/synchronization/directive/orgCom/OrgListCom.vue'
import { useMessage } from '/@/hooks/web/useMessage';
+import AsyncListComponent from '@/components/dataAsync/AsyncMainList0731.vue'
const { createMessage } = useMessage();
const formRef = ref();
@@ -58,6 +69,7 @@ const orgTableList = ref([]);
const queryParam = reactive({});
const pageParams = ref({ pageNo: 1, pageSize: 8 })
const orgListComRef = ref()
+const logsVisible = ref(false)
const labelCol = reactive({
xs: 24,
@@ -109,9 +121,22 @@ function searchReset() {
orgListComRef.value?.searchReset()
}
-function handleLookNewDirectives(){
+/**
+ * 日志
+ */
+function handleViewLogs() {
+ logsVisible.value = true
+}
+
+function handleLookNewDirectives() {
createMessage.warning('功能开发中')
}
+
+//关闭日志模态框
+function handleCancelLogs() {
+ logsVisible.value = false
+}
+
// 自动请求并暴露内部方法
onMounted(() => {
reload();
diff --git a/src/views/system/depart/components/DepartFormModal.vue b/src/views/system/depart/components/DepartFormModal.vue
index f1de9b1..72c22b2 100644
--- a/src/views/system/depart/components/DepartFormModal.vue
+++ b/src/views/system/depart/components/DepartFormModal.vue
@@ -78,6 +78,10 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
field: 'url',
show: !isChild,
},
+ {
+ field: 'contextPath',
+ show: !isChild,
+ },
{
field: 'orgCategory',
componentProps: { options: categoryOptions },
diff --git a/src/views/system/depart/depart.data.ts b/src/views/system/depart/depart.data.ts
index 991c4db..c6de5f8 100644
--- a/src/views/system/depart/depart.data.ts
+++ b/src/views/system/depart/depart.data.ts
@@ -50,6 +50,17 @@ export function useBasicFormSchema() {
placeholder: '请输入协议域名',
},
},
+ {
+ field: 'contextPath',
+ label: '项目访问路径',
+ component: 'Input',
+ ifShow: (v_) => {
+ return !v_.values.parentId;
+ },
+ componentProps: {
+ placeholder: '请输入项目访问路径',
+ },
+ },
// {
// field: 'province',
// label: '省份',