修复周三测试提出的住数据bug

This commit is contained in:
hyt 2024-07-12 10:30:47 +08:00
parent 13a7898880
commit 325af2ffc4
19 changed files with 261 additions and 194 deletions

View File

@ -44,7 +44,7 @@ export default {
if (!this.showTagsView) {
top = "5px";
} else {
top = "50px";
top = "63px";
}
return top;
},
@ -67,6 +67,7 @@ export default {
margin-left: 136px;
}
.app-main {
border-radius: 8px;
/* 50= navbar 50 */
// padding-top: 104px;
// min-height: calc(100vh - 50px);
@ -75,16 +76,14 @@ export default {
// width: calc(100% - 20px);
// margin:0 10px;
position: relative;
border-radius: 4px;
top: 80px;
padding: 0 10px;
margin-left: 10px;
}
.h-10{
height: calc(100vh - 10px);
}
.h-65{
height: calc(100vh - 60px);
height: calc(100vh - 73px);
}
.fixed-header + .app-main {

View File

@ -502,6 +502,7 @@ export default {
.avatar-container {
margin-right: 15px;
background-color: #fff;
.avatar-wrapper {
// margin-top: 5px;

View File

@ -378,7 +378,7 @@ export default {
width: 90%;
padding-top: 10px;
border-top: 1px solid #eaeaea;
background: #f4f5f7;
background: #fff;
display: flex;
flex-direction: column;
align-items: center;
@ -410,4 +410,4 @@ export default {
}
}
}
</style>
</style>

View File

@ -2,7 +2,7 @@
<div
id="tags-view-container"
class="tags-view-container"
style="top:5px;margin:0 10px;"
style="top:10px;margin:0 10px;"
>
<scroll-pane
ref="scrollPane"
@ -288,7 +288,7 @@ export default {
this.left = left;
}
this.top = e.clientY;
this.visible = true;
this.selectedTag = tag;
@ -316,7 +316,7 @@ export default {
width: 100%;
// width: calc(100% - 180px);
margin-left: 10px;
background: #f7f7f7;
background: #fff;
border-radius: 4px;
padding: 0px 10px;
// border-bottom: 1px solid #d8dce5;

View File

@ -106,6 +106,7 @@ export default {
}
.newMenuWidth {
width: 114px;
background-color: #fff;
}
.newMenuAppMain {
width: calc(100% - 114px);

View File

@ -66,7 +66,7 @@
</div>
</div>
</div v->
<baseDialog title="数据设置" v-model="dialogShow" @confirm="dialogConfirm" :lookFlag="lookFlag">
<baseDialog title="数据设置" v-model="dialogShow" @confirm="dialogConfirm" :lookFlag="lookFlag" width="78%">
<h1 style="margin: 20px 10px; font-size: 18px; font-weight: 700">
基本信息
</h1>

View File

@ -86,15 +86,18 @@ export default {
tableColumn: [
{
title: '来源类型',
id: 'sourceType'
id: 'sourceType',
width:150,
},
{
title: '来源应用',
id: 'appName'
id: 'appName',
width:150,
},
{
title: '触发类型',
id: 'triggerType'
id: 'triggerType',
width:120,
},
{
title: '来源编码',
@ -115,9 +118,10 @@ export default {
},
{
title: '启用/停用',
id: 'enabledState'
id: 'enabledState',
width:120,
},
{ title: '操作', id: 'operation' }
{ title: '操作', id: 'operation',width:120, }
],
tableData: [],
pageModel: {
@ -185,7 +189,6 @@ export default {
}
//
if (item.sourceType == 1 && item.sourceCode) {
this.openLoading('detail')
const res = await authApi('sysApplicationPluginService', '', 'queryEntity', '', {
appId: item.sourceName
})
@ -301,7 +304,7 @@ export default {
.wrap {
background-color: #fbfbfb;
width: 100%;
width: 99.5%;
overflow: auto;
margin-left: 5px;

View File

@ -175,7 +175,6 @@ export default {
async initSelect() {
//
this.serviceOptions = []
this.openLoading('detail')
const service = await getApiModuleApi({
tl: 'mdmModuleService',
as: '',
@ -211,7 +210,6 @@ export default {
}
//appidapp
if ((row.id === 'sourceName' || row.id === 'sourceType') && this.ruleForm.sourceName) {
this.openLoading('detail')
const res = await authApi('sysApplicationApiService', '', 'queryEntity', '', {
appId: this.ruleForm.sourceName
})
@ -237,7 +235,6 @@ export default {
})
//
if (this.ruleForm.sourceType == 1) {
this.openLoading('detail')
const res = await authApi('sysApplicationPluginService', '', 'queryEntity', '', {
appId: this.ruleForm.sourceName
})
@ -272,7 +269,6 @@ export default {
},
//
async getAppList() {
this.openLoading('detail')
const res = await authApi('sysApplicationService', '', 'queryEntity', '', {})
this.formRow[1].elCol[0].options = []
res.attribute.forEach(item => {
@ -285,7 +281,6 @@ export default {
},
//
async getrowDetails(id) {
this.openLoading('detail')
const res = await authApi('mdmModuleService', '', 'getMdmSource', '', {
id
})

View File

@ -2,7 +2,6 @@
<div class="wrap">
<!--数据表-->
<div class="mainTable">
<div class="bigTitle">数据表</div>
<div class="rule">
<div class="name">单据规则</div>
<template v-if="!receiptsTableData.length">
@ -17,16 +16,17 @@
<img src="./images/设置.png" alt="">
</div>
</div>
<div class="bigTitle" style="margin: 10px 0">数据表</div>
<div class="table">
<BaseTable
ref="mainTable"
:tableData="mainTableData"
:tabLoading="mainTabLoading"
:tableColumn="mainTableColumn"
:border="false"
tableMaxHeight="600"
:highlightCurrent="true"
@radioChange="mainOnClick"
ref="mainTable"
:tableData="mainTableData"
:tabLoading="mainTabLoading"
:tableColumn="mainTableColumn"
:border="false"
tableMaxHeight="600"
:highlightCurrent="true"
@radioChange="mainOnClick"
>
<template #dbType="{row}">
{{ row.dbType === '1' ? '主表' : '子表' }}
@ -44,9 +44,9 @@
</BaseTable>
<div class="mainAddRow">
<el-link
type="primary"
@click="addMainAddRow"
:underline="false"
type="primary"
@click="addMainAddRow"
:underline="false"
>+ 数据表添加
</el-link
>
@ -58,15 +58,15 @@
<div class="bigTitle">表字段</div>
<div class="table">
<BaseTable
ref="activedTable"
:tableData="activedTableData"
:tabLoading="activedTabLoading"
:tableColumn="activedTableColumn"
:border="false"
tableMaxHeight="650"
:highlightCurrent="true"
@radioChange="activedOnClick"
@onFunc="activedOnFunc"
ref="activedTable"
:tableData="activedTableData"
:tabLoading="activedTabLoading"
:tableColumn="activedTableColumn"
:border="false"
tableMaxHeight="650"
:highlightCurrent="true"
@radioChange="activedOnClick"
@onFunc="activedOnFunc"
>
<template #filedType="{row}">
{{ dataTypeDist[row.filedType] }}
@ -84,10 +84,10 @@
</BaseTable>
<div class="mainAddRow" v-if="mainTempClick.id">
<el-link
v-if="mainTempClick.id"
type="primary"
@click="activedAddRow"
:underline="false"
v-if="mainTempClick.id"
type="primary"
@click="activedAddRow"
:underline="false"
>+ 表字段添加
</el-link
>
@ -96,14 +96,14 @@
</div>
<!-- 单据规则-->
<base-right-dialog
ref="baseRightDialog"
:footerShow="true"
:dialogVisible.sync="ruleAddDialogShow"
title="单据规则"
@handleClose="ruleAddDialogShow=false"
:submitShow="true"
:size="'50%'"
@handleConfirmClick="ruleAddSaveHanlde"
ref="baseRightDialog"
:footerShow="true"
:dialogVisible.sync="ruleAddDialogShow"
title="单据规则"
@handleClose="ruleAddDialogShow=false"
:submitShow="true"
:size="'50%'"
@handleConfirmClick="ruleAddSaveHanlde"
>
<div class="receiptsTable">
<ruleAddTable ref="ruleAddTable"></ruleAddTable>
@ -111,14 +111,14 @@
</base-right-dialog>
<!-- 数据表 -->
<base-right-dialog
ref="mainTableAddtDialog"
:footerShow="true"
:dialogVisible.sync="mainTableDialogShow"
title="数据表"
@handleClose="mainTableDialogShow=false"
:submitShow="true"
:size="'30%'"
@handleConfirmClick="mainTableSaveHandle"
ref="mainTableAddtDialog"
:footerShow="true"
:dialogVisible.sync="mainTableDialogShow"
title="数据表"
@handleClose="mainTableDialogShow=false"
:submitShow="true"
:size="'30%'"
@handleConfirmClick="mainTableSaveHandle"
>
<div class="mainTable">
<mainTable ref="mainTable"></mainTable>
@ -126,14 +126,14 @@
</base-right-dialog>
<!-- 表字段-->
<base-right-dialog
ref="sonTableAddtDialog"
:footerShow="true"
:dialogVisible.sync="sonTableDialogShow"
title="表字段"
@handleClose="sonTableDialogShow=false"
:submitShow="true"
:size="'40%'"
@handleConfirmClick="sonTableSaveHandle"
ref="sonTableAddtDialog"
:footerShow="true"
:dialogVisible.sync="sonTableDialogShow"
title="表字段"
@handleClose="sonTableDialogShow=false"
:submitShow="true"
:size="'40%'"
@handleConfirmClick="sonTableSaveHandle"
>
<div class="mainTable">
<sonTable ref="sonTable" :activedTableData="activedTableData" :mainTempClick="mainTempClick"
@ -252,21 +252,21 @@ export default {
console.log(row, 'row')
let msg = row.dbType == 1 ? '删除主表将会导致所有相关子表一并删除,是否确认继续删除操作?' : '是否确定删除?'
this.$confirm(msg)
.then(async(_) => {
this.openLoading('submit')
const res = await authApi('mdmModuleService', '', 'deleteMdmDb', '', {
mdmId: this.$route.query.id,
...row
.then(async(_) => {
this.openLoading('submit')
const res = await authApi('mdmModuleService', '', 'deleteMdmDb', '', {
mdmId: this.$route.query.id,
...row
})
this.$vmNews('删除成功!', 'success')
if (this.mainTempClick.id === row.id || row.dbType == 1) {
this.activedTableData = []
this.mainTempClick = {}
}
this.getMainTableHandle()
})
.catch((_) => {
})
this.$vmNews('删除成功!', 'success')
if (this.mainTempClick.id === row.id || row.dbType == 1) {
this.activedTableData = []
this.mainTempClick = {}
}
this.getMainTableHandle()
})
.catch((_) => {
})
},
//
addMainAddRow() {
@ -300,22 +300,22 @@ export default {
//
activedOnFunc(row) {
this.$confirm('是否确定删除?')
.then(async(_) => {
this.openLoading('submit')
const res = await authApi('mdmModuleService', '', 'deleteMdmDbField', '', {
id: row.id,
mdmId: this.$route.query.id,
dbId: this.mainTempClick.id,
dbName: this.mainTempClick.dbName,
enName: row.enName,
filedType: row.filedType
.then(async(_) => {
this.openLoading('submit')
const res = await authApi('mdmModuleService', '', 'deleteMdmDbField', '', {
id: row.id,
mdmId: this.$route.query.id,
dbId: this.mainTempClick.id,
dbName: this.mainTempClick.dbName,
enName: row.enName,
filedType: row.filedType
})
this.$vmNews('删除成功', 'success')
this.mainOnClick(this.mainTempClick)
this.activedTableData.splice(row.index, 1)
})
.catch((_) => {
})
this.$vmNews('删除成功', 'success')
this.mainOnClick(this.mainTempClick)
this.activedTableData.splice(row.index, 1)
})
.catch((_) => {
})
},
//
sonTableEditHandle(row) {
@ -469,7 +469,6 @@ export default {
},
//
async getMainTableHandle() {
this.openLoading('detail')
const res = await authApi('mdmModuleService', '', 'queryMdmDb', '', {
mdmId: this.$route.query.id
})
@ -560,7 +559,6 @@ export default {
border-right: 1px solid #EBEBEB;;
.rule {
margin-top: 20px;
display: flex;
align-items: center;
width: 100%;

View File

@ -1,13 +1,14 @@
<template>
<div class="mainTable">
<baseNewForm
ref="mainOptionForm"
:spanNumber="24"
:isFunBtn="false"
:formRow="mainOptionRow"
:ruleForm="mainOptionForm"
:labelPosition="'top'"
@onSubmit="mainOptionOnSubmit"
ref="mainOptionForm"
:spanNumber="24"
:isFunBtn="false"
:formRow="mainOptionRow"
:ruleForm="mainOptionForm"
:labelPosition="'top'"
:rules="rules"
@onSubmit="mainOptionOnSubmit"
>
</baseNewForm>
</div>
@ -53,7 +54,19 @@ export default {
]
}
],
mainOptionForm: {}
mainOptionForm: {},
rules: {
dbName: [{
required: true,
message: '请输入源数据',
trigger: 'blur'
}],
remark: [{
required: true,
message: '请输入源数据',
trigger: 'blur'
}],
}
}
},
methods: {

View File

@ -11,9 +11,11 @@
@onSelect="selectChangeHanlde"
@inputBlur="optionFormInputBlur"
@onSubmit="optionOnSubmit"
:rules="rules"
>
</baseNewForm>
<baseNewForm
:rules="rules"
ref="typeOptionForm"
:spanNumber="24"
:isFunBtn="false"
@ -25,6 +27,7 @@
>
</baseNewForm>
<baseNewForm
:rules="rules"
ref="propertyForm"
:spanNumber="24"
:isFunBtn="false"
@ -74,6 +77,58 @@ export default {
},
data() {
return {
rules:{
chName: [{
required: true,
message: '请输入源数据',
trigger: 'blur'
}],
enName: [{
required: true,
message: '请输入源数据',
trigger: 'blur'
}],
filedType: [{
required: true,
message: '请输入源数据',
trigger: 'blur'
}],
filedLength: [{
required: true,
message: '请输入源数据',
trigger: 'blur'
}],
title: [{
required: true,
message: '请输入源数据',
trigger: 'blur'
}],
row: [{
required: true,
message: '请输入源数据',
trigger: 'blur'
}],
type: [{
required: true,
message: '请输入源数据',
trigger: 'blur'
}],
service: [{
required: true,
message: '请输入源数据',
trigger: 'blur'
}],
label: [{
required: true,
message: '请输入源数据',
trigger: 'blur'
}],
upId: [{
required: true,
message: '请输入源数据',
trigger: 'blur'
}],
},
activedTableRow: {},//
optionFormRow: [
{

View File

@ -339,7 +339,6 @@ export default {
},
//
async getRuleForm() {
this.openLoading('detail')
this.ruleForm = {}
const res = await authApi('mdmModuleService', '', 'queryMdmView', '', {
mdmId: this.$route.query.id
@ -439,11 +438,10 @@ export default {
}
.displayInfo {
background-color: #fbfbfb;
background-color: #f5f5f5;
position: relative;
width: 99%;
margin: 10px 10px 0 5px;
margin-left: 5px;
width: 99.5%;
> .btn {
display: flex;
@ -463,9 +461,11 @@ export default {
width: 100%;
> .btn {
padding-top: 10px;
display: flex;
justify-content: space-between;
align-items: center;
.title {
font-weight: 600;
margin-left: 20px;
@ -518,7 +518,7 @@ export default {
.showItem {
flex: 1;
margin-left: 15px;
height: 58vh;
height: 55vh;
background: #FFFFFF;
border-radius: 8px;
border: 1px solid #EBEBEB;
@ -563,7 +563,6 @@ export default {
}
.value {
margin-top: 10px;
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 16px;

View File

@ -124,7 +124,6 @@ export default {
//
if (this.dist[key]) {
this.openLoading('detail')
const res = await authApi('mdmModuleService', '', 'queryMdmViewField', '', {
id: this.$route.query.id
})

View File

@ -211,7 +211,6 @@ export default {
activedOnFunc(row) {
this.$confirm('确定删除?')
.then(async(_) => {
this.openLoading('submit')
const res = await authApi('mdmModuleService', '', 'deleteMdmDistribute', '', {
id: row.id
})
@ -301,7 +300,7 @@ export default {
.wrap {
margin-left: 5px;
background-color: #fbfbfb;
width: 100%;
width: 99.5%;
overflow: auto;
> .btn {

View File

@ -410,7 +410,6 @@ export default {
})
})
//
this.openLoading('detail')
const res2 = await authApi('sysApplicationService', '', 'queryAppScript', '', {
appId: val
})
@ -562,7 +561,6 @@ export default {
},
//
async getrowDetails(id) {
this.openLoading('detail')
const res = await authApi('mdmModuleService', '', 'getMdmDistribute', '', {
id
})

View File

@ -299,7 +299,9 @@ export default {
.monitoring {
position: relative;
width: 100%;
background: #fff;
overflow: auto;
border-radius: 8px;
header {
display: flex;
@ -327,7 +329,7 @@ export default {
main {
margin-top: 5px;
padding: 5px 20px 5px;
height: calc(100% - 140px);
height: calc(100vh - 200px);
border-radius: 20px;
background-color: #fff;
overflow: auto;

View File

@ -233,7 +233,6 @@ export default {
this.ruleForm.accessMode = JSON.parse(res.attribute.accessMode)
},
async initEditFormData() {
this.openLoading('detail')
const res = await getApiModuleApi({
tl: 'mdmModuleService',
as: '',
@ -301,7 +300,7 @@ export default {
}
.wrap {
width: 100%;
width: 99.5%;
overflow: auto;
border-radius: 8px;
margin-left: 5px;
@ -318,7 +317,6 @@ export default {
}
> .main {
margin-top: 10px;
background-color: #fff;
border-radius: 16px;

View File

@ -130,12 +130,10 @@ export default {
width: 100%;
display: flex;
position: relative;
background: #fafafa !important;
overflow: auto;
background: #f5f5f5 !important;
.menu {
position: fixed;
width: 180px;
width: 162px;
height: calc(100% - 75px);
//margin-right: 1%;
background-color: #fff;
@ -237,9 +235,10 @@ export default {
.content {
margin-top: 10px;
margin-left: 185px;
margin-left: 170px;
margin-right: 10px;
flex: 1;
width: calc(100% - 195px);
width: calc(100% - 205px);
border-radius: 8px;
}
}

View File

@ -3,137 +3,143 @@
<h3 class="workbench-title">全部应用</h3>
<el-tabs>
<el-tab-pane
v-for="(item, index) in routeData"
:key="index"
:label="item.meta ? item.meta.title : ''"
v-if="item.meta"
v-for="(item, index) in routeData"
:key="index"
:label="item.meta ? item.meta.title : ''"
v-if="item.meta"
>
<div class="menuContainer">
<div
v-for="(list, listIndex) in item.children"
class="menuBox"
@click="goRoute(item, list)"
v-if="!list.meta.hidden"
v-for="(list, listIndex) in item.children"
class="menuBox"
@click="goRoute(item, list)"
v-if="!list.meta.hidden"
>
<img
class="menuIcon"
:src="list.meta.icon"
v-if="list.meta.icon"
class="menuIcon"
:src="list.meta.icon"
v-if="list.meta.icon"
/>
<img class="menuIcon" src="../logo1.png" v-else />
<img class="menuIcon" src="../logo1.png" v-else/>
<p class="menuContent">{{ list.meta.title }}</p>
</div>
</div></el-tab-pane
</div>
</el-tab-pane
>
</el-tabs>
</div>
</template>
<script>
import { TagsView } from "@/layout/components";
import request from "@/utils/request";
import { TagsView } from '@/layout/components'
import request from '@/utils/request'
export default {
name: "Workbench",
name: 'Workbench',
components: {
TagsView,
TagsView
},
created() {
this.$store.dispatch("settings/changeSetting", {
key: "showTagsView",
value: true,
});
this.$store.dispatch('settings/changeSetting', {
key: 'showTagsView',
value: true
})
},
data() {
return {
routeData: [], //
};
routeData: [] //
}
},
mounted() {
let routeList = localStorage.getItem("routeList")
? JSON.parse(localStorage.getItem("routeList"))
: [];
this.routeData = this.OrganizeMenus(routeList);
let routeList = localStorage.getItem('routeList')
? JSON.parse(localStorage.getItem('routeList'))
: []
this.routeData = this.OrganizeMenus(routeList)
},
methods: {
goRoute(val, item) {
let routeData = this.$router.resolve({
path: item.path,
name: item.name,
query: {mdmCode: item.meta.mdmCode, viewType: item.meta.viewType}
});
window.open(routeData.href, "_self");
query: { mdmCode: item.meta.mdmCode, viewType: item.meta.viewType }
})
window.open(routeData.href, '_self')
},
// icon
handlerIcon(item) {
let str = "";
if (item.includes("?")) {
str = item.split("?")[1];
let str = ''
if (item.includes('?')) {
str = item.split('?')[1]
} else {
str = item;
str = item
}
return str;
return str
},
handlerIconColor(item) {
let color = "";
if (item.includes("?")) {
color = item.split("?")[0];
let color = ''
if (item.includes('?')) {
color = item.split('?')[0]
} else {
color = "#1478F6";
color = '#1478F6'
}
return color;
return color
},
//
OrganizeMenus(data) {
let arrData = [];
let arrData = []
data.forEach((bItem) => {
if (bItem.children && bItem.children.length > 0) {
bItem.children.forEach((cItem) => {
if (cItem.meta.icon) {
this.getLogoUrl(cItem.meta.icon).then((res) => {
let imageUrl =
"data:image/png/jpg;base64," +
btoa(
new Uint8Array(res).reduce(
(data, byte) => data + String.fromCharCode(byte),
""
'data:image/png/jpg;base64,' +
btoa(
new Uint8Array(res).reduce(
(data, byte) => data + String.fromCharCode(byte),
''
)
)
);
this.$set(cItem.meta, 'icon', imageUrl)
});
})
}
});
})
}
arrData.push(bItem);
});
return arrData;
arrData.push(bItem)
})
return arrData
},
getLogoUrl(id) {
return request({
url:
"/kangarooDataCenterV3/entranceController/fileDownloadNew?id=" + id,
method: "get",
responseType: "arraybuffer",
'/kangarooDataCenterV3/entranceController/fileDownloadNew?id=' + id,
method: 'get',
responseType: 'arraybuffer'
}).then((res) => {
return res;
});
},
},
};
return res
})
}
}
}
</script>
<style lang="scss" scoped>
.workbench {
background: #fff;
// padding: 15px;
margin: 0 10px;
padding: 15px;
//margin: 0 10px;
}
.workbench-title {
margin: 15px 0;
}
.menuContainer {
display: flex;
flex-wrap: wrap;
background-color: #fff;
}
.menuBox {
display: flex;
align-items: center;
@ -144,6 +150,7 @@ export default {
margin: 10px;
cursor: pointer;
}
.menuIcon {
width: 36px;
height: 36px;
@ -151,6 +158,7 @@ export default {
border-radius: 12px;
margin-right: 10px;
}
.menuContent {
font-size: 14px;
color: #333333;