Commit 4602ba9e authored by liwei's avatar liwei

修改了bug

parent 19bd2cbb
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
</template> </template>
</BasicTable> </BasicTable>
</PageWrapper> </PageWrapper>
<DetailSetModal @register="registerSetModal" @success="handleSuccess" /> <!-- <DetailSetModal @register="registerSetModal" @success="handleSuccess" />-->
</BasicModal> </BasicModal>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
import { ref, computed, unref, reactive, onMounted } from 'vue'; import { ref, computed, unref, reactive, onMounted } from 'vue';
import { BasicModal, useModal, useModalInner } from '@/components/Modal'; import { BasicModal, useModal, useModalInner } from '@/components/Modal';
import { BasicForm, useForm } from '@/components/Form'; import { BasicForm, useForm } from '@/components/Form';
import { detailColumns, modelFormSchema } from './model.data'; import { detailColumns } from './model.data';
import { useMessage } from '@/hooks/web/useMessage'; import { useMessage } from '@/hooks/web/useMessage';
import { TreeData } from '@/views/metaModel/physicsModel/modelData'; import { TreeData } from '@/views/metaModel/physicsModel/modelData';
import { router } from '@/router'; import { router } from '@/router';
...@@ -77,7 +77,6 @@ ...@@ -77,7 +77,6 @@
import AreaTable from './AreaTable.vue'; import AreaTable from './AreaTable.vue';
import Table from './Table.vue'; import Table from './Table.vue';
import BucketTable from './BucketTable.vue'; import BucketTable from './BucketTable.vue';
import DetailSetModal from './detailSetModal.vue';
import { useTable, BasicTable } from '@/components/Table'; import { useTable, BasicTable } from '@/components/Table';
import { import {
editAreaData, editAreaData,
......
...@@ -16,9 +16,7 @@ ...@@ -16,9 +16,7 @@
import { ModelFormSchematab2 } from './audiModal.data'; import { ModelFormSchematab2 } from './audiModal.data';
import { getDeptList } from '@/api/system/dept/dept'; import { getDeptList } from '@/api/system/dept/dept';
import { addUserApi, UserDetailApi, UserUpdataApi } from '@/api/system/user/user'; import { addUserApi, UserDetailApi, UserUpdataApi } from '@/api/system/user/user';
import { encryptTwo } from '../../../../src/utils/jsencrypt.js';
import { useMessage } from '@/hooks/web/useMessage'; import { useMessage } from '@/hooks/web/useMessage';
import { TableData } from './mock';
import { router } from '@/router'; import { router } from '@/router';
defineOptions({ name: 'ModelModal' }); defineOptions({ name: 'ModelModal' });
......
<template>
</template>
<script>
export default {
name: "beforeOutputModal"
}
</script>
<style scoped>
</style>
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
</Tabs> </Tabs>
</div> </div>
<img v-if="type === '1'" src="../../../../assets/images/setupImg.png" class="homePage_img" alt="Logo" /> <img v-if="type === '1'" src="../../../../../../../src/assets/images/setupImg.png" class="homePage_img" alt="Logo" />
<img v-else src="../../../../assets/images/SQLImg.png" class="homePage_img" alt="Logo" /> <img v-else src="../../../../../../../src/assets/images/SQLImg.png" class="homePage_img" alt="Logo" />
</Col> </Col>
</Row> </Row>
</div> </div>
......
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
</Tabs> </Tabs>
</div> </div>
<img v-if="type === '1'" src="../../../../assets/images/setupImg.png" class="homePage_img" alt="Logo" /> <img v-if="type === '1'" src="../../../../../../../src/assets/images/setupImg.png" class="homePage_img" alt="Logo" />
<img v-else src="../../../../assets/images/SQLImg.png" class="homePage_img" alt="Logo" /> <img v-else src="../../../../../../../src/assets/images/SQLImg.png" class="homePage_img" alt="Logo" />
</Col> </Col>
</Row> </Row>
</div> </div>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
import { Description } from '@/components/Description'; import { Description } from '@/components/Description';
import { PageWrapper } from '@/components/Page'; import { PageWrapper } from '@/components/Page';
import { Divider } from 'ant-design-vue'; import { Divider } from 'ant-design-vue';
import {documentTreeData, publicCodeTreeData, TreeData} from './indicatorStandardsData'; import {documentTreeData, TreeData} from './indicatorStandardsData';
import {router} from "@/router"; import {router} from "@/router";
import { BasicForm, useForm } from '@/components/Form'; import { BasicForm, useForm } from '@/components/Form';
import { import {
......
...@@ -2191,3 +2191,40 @@ export const relatedMeteDataSchema: any[] = [ ...@@ -2191,3 +2191,40 @@ export const relatedMeteDataSchema: any[] = [
}, },
] ]
/**导入数据标准 表单*/
export const importDataStandardsFormSchema: FormSchema[] = [
{
field: 'file',
component: 'Upload',
label: '导入文件选择',
componentProps: {
api: uploadApi,
},
labelWidth: 150,
colProps: { lg: 24, md: 24 },
},
{
field: 'agreement',
component: 'RadioGroup',
label: '标准重名',
colProps: { lg: 24, md: 24 },
labelWidth: 150,
componentProps: {
defaultValue:'1',
options: [
{
label: '全部放弃',
value: '1',
},
{
label: '全部替换',
value: '2',
},
{
label: '自动重命名',
value: '3',
},
],
},
},
];
...@@ -764,6 +764,8 @@ export const relatedRelationshipsData4 = [ ...@@ -764,6 +764,8 @@ export const relatedRelationshipsData4 = [
}, },
] ]
/**关联关系 关联质量 数据*/ /**关联关系 关联质量 数据*/
export const relatedQualityData = [ export const relatedQualityData = [
{ {
...@@ -1254,3 +1256,58 @@ export const basicStandardsTreeData: any[] = [ ...@@ -1254,3 +1256,58 @@ export const basicStandardsTreeData: any[] = [
"collaborativeDepartment": "人力资源部, 技术部" "collaborativeDepartment": "人力资源部, 技术部"
} }
]; ];
/**关联关系-文档-树 数据*/
export const documentTreeData: any[] = [
{
"businessId": 100,
"documentName": "文档模版",
"anotherName": "文档模版",
"parentId": 0,
"location": "/文档模版",
"icon": "ant-design:folder-open-outlined",
},
{
"businessId": 101,
"documentName": "CEA_POC_模版",
"anotherName": "CEA_POC_模版",
"parentId": 100,
"ancestors": "0,100",
"icon": "ant-design:folder-open-outlined",
},
{
"businessId": 102,
"documentName": "数据中台工作区01",
"anotherName": "数据中台工作区01",
"parentId": 100,
"ancestors": "0,100",
"location": "/文档模版/数据中台工作区01",
"icon": "ant-design:folder-open-outlined",
},
{
"businessId": 201,
"documentName": "值域检查(倍数)",
"anotherName": "值域检查(倍数)",
"parentId": 102,
"ancestors": "0,100,102",
"location": "/文档模版/数据中台工作区01/值域检查(倍数)",
"icon": "ant-design:partition-outlined",
},
{
"businessId": 202,
"documentName": "值域检查(数值大于零)",
"anotherName": "值域检查(数值大于零)",
"parentId": 102,
"ancestors": "0,100,102",
"location": "/文档模版/数据中台工作区01/值域检查(数值大于零)",
"icon": "ant-design:partition-outlined",
},
{
"businessId": 204,
"documentName": "准取检查-数值大于等于n",
"anotherName": "准取检查-数值大于等于n",
"parentId": 101,
"ancestors": "0,100,101",
"location": "/文档模版/CEA_POC_模版/准取检查-数值大于等于n",
"icon": "ant-design:partition-outlined",
}
];
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
import {ref, computed, unref, reactive} from 'vue'; import {ref, computed, unref, reactive} from 'vue';
import { BasicModal, useModalInner } from '@/components/Modal'; import { BasicModal, useModalInner } from '@/components/Modal';
import { BasicForm, useForm } from '@/components/Form'; import { BasicForm, useForm } from '@/components/Form';
import {relatedDocumentSchema, relatedIndicatorStandardsSchema} from './indicatorStandards.data'; import {relatedIndicatorStandardsSchema} from './indicatorStandards.data';
import { useMessage } from '@/hooks/web/useMessage'; import { useMessage } from '@/hooks/web/useMessage';
import { import {
documentTreeData, documentTreeData,
......
...@@ -292,7 +292,7 @@ function Button(record) { ...@@ -292,7 +292,7 @@ function Button(record) {
/**查看质量规则 按钮*/ /**查看质量规则 按钮*/
function lookQualityButton(record) { function lookQualityButton(record) {
router.push({ router.push({
path: '/dataQuality/rule', path: '/dataQuality/dataSheet/rule',
query: { query: {
}, },
...@@ -302,7 +302,7 @@ function lookQualityButton(record) { ...@@ -302,7 +302,7 @@ function lookQualityButton(record) {
/**创建质量规则 按钮*/ /**创建质量规则 按钮*/
function createQualityButton(record) { function createQualityButton(record) {
router.push({ router.push({
path: '/dataQuality/rule', path: '/dataQuality/dataSheet/rule',
query: { query: {
}, },
......
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
</Tabs> </Tabs>
</div> </div>
<img v-if="type === '1'" src="../../../../assets/images/setupImg.png" class="homePage_img" alt="Logo" /> <img v-if="type === '1'" src="../../../../../src/assets/images/setupImg.png" class="homePage_img" alt="Logo" />
<img v-else src="../../../../assets/images/SQLImg.png" class="homePage_img" alt="Logo" /> <img v-else src="../../../../../src/assets/images/SQLImg.png" class="homePage_img" alt="Logo" />
</Col> </Col>
</Row> </Row>
</div> </div>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
import {ref, computed, unref, reactive} from 'vue'; import {ref, computed, unref, reactive} from 'vue';
import { BasicModal, useModalInner } from '@/components/Modal'; import { BasicModal, useModalInner } from '@/components/Modal';
import { BasicForm, useForm } from '@/components/Form'; import { BasicForm, useForm } from '@/components/Form';
import { importDataStandardsFormSchema } from './indicatorStandards.data'; import { importDataStandardsFormSchema } from './api.data';
import { useMessage } from '@/hooks/web/useMessage'; import { useMessage } from '@/hooks/web/useMessage';
import { BasicUpload } from '@/components/Upload'; import { BasicUpload } from '@/components/Upload';
import { uploadApi } from '@/api/sys/upload'; import { uploadApi } from '@/api/sys/upload';
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
import {ref, computed, unref, reactive} from 'vue'; import {ref, computed, unref, reactive} from 'vue';
import { BasicModal, useModalInner } from '@/components/Modal'; import { BasicModal, useModalInner } from '@/components/Modal';
import { BasicForm, useForm } from '@/components/Form'; import { BasicForm, useForm } from '@/components/Form';
import { importRelativeFormSchema } from './indicatorStandards.data'; import { importRelativeFormSchema } from './api.data';
import { useMessage } from '@/hooks/web/useMessage'; import { useMessage } from '@/hooks/web/useMessage';
import { BasicUpload } from '@/components/Upload'; import { BasicUpload } from '@/components/Upload';
import { uploadApi } from '@/api/sys/upload'; import { uploadApi } from '@/api/sys/upload';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment