hzya
/
middleground_code_v2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

应用中心 脚本管理、数据源管理修改与开发bug修改

This commit is contained in:
hyt 2024-06-25 13:41:35 +08:00
parent f227e0fc4b
commit b9ce505ced
25 changed files with 418 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/assets/icons/svg/appMenu07.svg Normal file
View File

@ -0,0 +1 @@
<svg t="1719277109538" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4273" width="200" height="200"><path d="M919.113143 325.485714H104.813714v-67.803428h814.299429v-133.12a36.571429 36.571429 0 0 0-36.571429-36.571429H141.385143a36.571429 36.571429 0 0 0-36.571429 36.571429L103.862857 865.645714a36.425143 36.425143 0 0 0 36.571429 36.571429h673.865143a33.938286 33.938286 0 1 1 0 67.876571h-705.097143-0.146286a73.142857 73.142857 0 0 1-73.069714-73.142857L36.937143 93.184a73.142857 73.142857 0 0 1 73.142857-73.142857h803.693714a73.142857 73.142857 0 0 1 73.142857 73.142857v703.268571a33.938286 33.938286 0 0 1-67.803428 0V325.485714zM206.628571 215.844571a33.938286 33.938286 0 1 1 0-67.803428 33.938286 33.938286 0 0 1 0 67.803428z m203.556572 0a33.938286 33.938286 0 1 1 0-67.803428 33.938286 33.938286 0 0 1 0 67.803428z m-101.814857 0a33.938286 33.938286 0 1 1 0-67.803428 33.938286 33.938286 0 0 1 0 67.803428z m34.889143 250.148572c7.168-7.094857 26.112-7.094857 33.28 0 7.168 7.094857 7.168 29.476571 0 37.156571L265.874286 610.742857 373.76 712.923429c7.168 7.094857 8.118857 27.355429 0 35.328-9.801143 9.728-29.842286 8.192-36.571429 1.609142l-126.025142-125.805714a18.432 18.432 0 0 1 0-25.965714l132.096-132.096z m343.478857 0l132.096 132.096a18.432 18.432 0 0 1 0 26.038857l-126.098286 125.732571c-6.656 6.582857-25.6 10.752-36.571429 0-10.313143-10.24-7.094857-31.305143 0-38.4l108.397715-100.717714-111.908572-108.690286c-7.168-7.68-9.508571-26.624 0-36.059428 9.289143-9.142857 26.916571-7.094857 34.084572 0z m-135.68-26.331429c3.657143-9.508571 21.430857-15.506286 32.768-11.264 10.825143 4.022857 17.188571 19.017143 14.189714 28.525715l-119.808 329.947428c-3.657143 9.508571-20.699429 13.238857-30.281143 9.728-10.166857-3.584-21.211429-17.554286-17.554286-27.062857l120.685715-329.874286z" p-id="4274"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

4
src/views/applicationList/apiList/apiAdd.vue
View File

@ -718,7 +718,7 @@ export default {
timeoutPeriod: 10000, timeoutPeriod: 10000,
currentLimiting: 100, currentLimiting: 100,
requestMethod: '1', requestMethod: '1',
extensionApi: '1' extensionApi: '2'
}, //步骤2表（数据） }, //步骤2表（数据）
stepThreeRadio: 1, //没用了（穿透配置） stepThreeRadio: 1, //没用了（穿透配置）
stepThreeRadioOptions: [ stepThreeRadioOptions: [
@ -2199,7 +2199,7 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
::v-deep .el-button { ::v-deep .el-button {
border-radius: 16px; border-radius: 4px;
} }
.wrap { .wrap {

2
src/views/applicationList/apiList/apiAdmin.vue
View File

@ -1026,7 +1026,7 @@ export default {
<style scoped lang='scss'> <style scoped lang='scss'>
::v-deep .el-button { ::v-deep .el-button {
border-radius: 16px; border-radius: 4px;
} }
.apiWrap { .apiWrap {

2
src/views/applicationList/applicationAdd.vue
View File

@ -292,7 +292,7 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
::v-deep .el-button { ::v-deep .el-button {
border-radius: 16px; border-radius: 4px;
} }
::v-deep .el-form-item { ::v-deep .el-form-item {

2
src/views/applicationList/authority/index.vue
View File

@ -387,7 +387,7 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
::v-deep .el-button { ::v-deep .el-button {
border-radius: 16px; border-radius: 4px;
} }
::v-deep .el-form-item { ::v-deep .el-form-item {

2
src/views/applicationList/configData.js
View File

@ -207,7 +207,7 @@ const settingMenu = [
}, },
{ {
title: "脚本管理", title: "脚本管理",
icon: "appMenu06", icon: "appMenu07",
path: 'scriptAdmin' path: 'scriptAdmin'
}, },
] ]

7
src/views/applicationList/exploit/configData.js
View File

@ -226,6 +226,10 @@ const dataSettingFormRow = [
{ {
id: '3', id: '3',
label: 'mysql' label: 'mysql'
},
{
id: '4',
label: 'dm'
} }
] ]
}] }]
@ -242,7 +246,8 @@ const dataSettingFormRow = [
}, { }, {
title: '密码', title: '密码',
id: 'password', id: 'password',
type: 'input', type: 'password',
tag:"elInput",
changeRemind: true, changeRemind: true,
row: 12, row: 12,
required: true, required: true,

2
src/views/applicationList/exploit/index.vue
View File

@ -388,7 +388,7 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
::v-deep .el-button { ::v-deep .el-button {
border-radius: 16px; border-radius: 4px;
} }
::v-deep .el-form-item { ::v-deep .el-form-item {

1
src/views/applicationList/inserterAdmin/index.vue
View File

@ -147,6 +147,7 @@ export default {
}, },
// 添加应用 // 添加应用
inserterAdd() { inserterAdd() {
this.ruleForm = {}
this.plugInDialog = true; this.plugInDialog = true;
// this.$router.push({ path: "/inserterAdmin/inserterAdd" }); // this.$router.push({ path: "/inserterAdmin/inserterAdd" });
}, },

2
src/views/applicationList/inserterAdmin/inserterAdd.vue
View File

@ -139,7 +139,7 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
::v-deep .el-button { ::v-deep .el-button {
border-radius: 16px; border-radius: 4px;
} }
::v-deep .el-form-item { ::v-deep .el-form-item {
display: block !important; display: block !important;

2
src/views/applicationList/scriptAdmin/configData.js
View File

@ -59,7 +59,7 @@ const formRow = [
id: 'scriptData', id: 'scriptData',
row: 24, row: 24,
disabled: false, disabled: false,
required: false, required: true,
fontSize: 16 fontSize: 16
} }
] ]

117
src/views/applicationList/scriptAdmin/index.vue
View File

@ -3,17 +3,17 @@
<header> <header>
<div class="left"> <div class="left">
<el-input <el-input
placeholder="脚本" placeholder="脚本"
v-model="searchForm.scriptName" v-model="searchForm.scriptName"
@change="searchBtnHandle" @change="searchBtnHandle"
> >
<i slot="suffix" class="el-input__icon el-icon-search" @click="searchBtnHandle"></i> <i slot="suffix" class="el-input__icon el-icon-search" @click="searchBtnHandle"></i>
</el-input> </el-input>
</div> </div>
<div class="right"> <div class="right">
<el-button <el-button
icon="el-icon-back" icon="el-icon-back"
@click=" @click="
$router.replace({ path: '/applicationList/applicationListAdmin' }) $router.replace({ path: '/applicationList/applicationListAdmin' })
" "
>返回 >返回
@ -27,16 +27,16 @@
</header> </header>
<main> <main>
<BaseTable <BaseTable
ref="mainTable" ref="mainTable"
:tableData="tableData" :tableData="tableData"
:tableColumn="tableColumn" :tableColumn="tableColumn"
:funData="funData" :funData="funData"
:funWidth="funWidth" :funWidth="funWidth"
:showIndex="true" :showIndex="true"
:tabLoading="mainTabLoading" :tabLoading="mainTabLoading"
@onFunc="tableButtonHandle" @onFunc="tableButtonHandle"
:tableHeight="'70vh'" :tableHeight="'70vh'"
:border="false" :border="false"
> >
<template #scriptStatus="{row}"> <template #scriptStatus="{row}">
{{ row.scriptStatus == 1 ? '启用' : '停用' }} {{ row.scriptStatus == 1 ? '启用' : '停用' }}
@ -44,38 +44,38 @@
<!-- 启用/停用--> <!-- 启用/停用-->
<template #scriptStatus="{row}"> <template #scriptStatus="{row}">
<el-switch <el-switch
v-model="row.scriptStatus" v-model="row.scriptStatus"
active-value="1" active-value="1"
inactive-value="0" inactive-value="0"
@change="(val)=>{swithChangeHandle(val,row)}" @change="(val)=>{swithChangeHandle(val,row)}"
> >
</el-switch> </el-switch>
</template> </template>
</BaseTable> </BaseTable>
<div class="page"> <div class="page">
<basePage <basePage
:pageModel="pageModel" :pageModel="pageModel"
@update:pageModel="currentChangeHandle" @update:pageModel="currentChangeHandle"
></basePage> ></basePage>
</div> </div>
</main> </main>
<footer></footer> <footer></footer>
<baseDialog <baseDialog
:title="'插件配置'" :title="'脚本配置'"
v-model="plugInDialog" v-model="plugInDialog"
@confirm="plugInConfirm" @confirm="plugInConfirm"
:width="'50%'" :width="'50%'"
> >
<div v-if="plugInDialog"> <div v-if="plugInDialog">
<baseNewForm <baseNewForm
ref="dataSettingForm" ref="dataSettingForm"
:spanNumber="24" :spanNumber="24"
:isFunBtn="false" :isFunBtn="false"
:lookFlag="lookFlag" :lookFlag="lookFlag"
:formRule="!lookFlag" :formRule="!lookFlag"
:formRow="formRow" :formRow="formRow"
:ruleForm="ruleForm" :ruleForm="ruleForm"
@onSubmit="onSubmit" @onSubmit="onSubmit"
></baseNewForm> ></baseNewForm>
</div> </div>
</baseDialog> </baseDialog>
@ -205,6 +205,7 @@ export default {
// 添加应用 // 添加应用
inserterAdd() { inserterAdd() {
this.plugInDialog = true this.plugInDialog = true
this.ruleForm = {}
// this.$router.push({ path: "/inserterAdmin/inserterAdd" }); // this.$router.push({ path: "/inserterAdmin/inserterAdd" });
}, },
// 时间处理 // 时间处理
@ -220,17 +221,17 @@ export default {
this.refreshLoading = true this.refreshLoading = true
this.openLoading('detail') this.openLoading('detail')
const res = await getApiModuleApi( const res = await getApiModuleApi(
{ {
tl: 'sysApplicationService', tl: 'sysApplicationService',
as: '', as: '',
dj: 'queryAppScriptPage' dj: 'queryAppScriptPage'
}, },
{ {
pageNum: this.pageModel.pageIndex, pageNum: this.pageModel.pageIndex,
pageSize: this.pageModel.limit, pageSize: this.pageModel.limit,
...obj, ...obj,
appId: this.$route.query.id appId: this.$route.query.id
} }
) )
this.refreshLoading = false this.refreshLoading = false
if (res.status == 200) { if (res.status == 200) {
@ -249,20 +250,20 @@ export default {
this.plugInDialog = true this.plugInDialog = true
} else if (item.type === 'dele') { } else if (item.type === 'dele') {
this.$confirm('确认删除？') this.$confirm('确认删除？')
.then(async() => { .then(async() => {
this.openLoading('submit') this.openLoading('submit')
const res = await getApiModuleApi({ const res = await getApiModuleApi({
tl: 'sysApplicationService', tl: 'sysApplicationService',
as: '', as: '',
dj: 'deleteAppScript' dj: 'deleteAppScript'
}, { id: val.id }) }, { id: val.id })
if (res.status === '200') { if (res.status === '200') {
this.$vmNews('删除脚本成功', 'success') this.$vmNews('删除脚本成功', 'success')
this.initMainTableData(this.searchForm) this.initMainTableData(this.searchForm)
} }
}) })
.catch(() => { .catch(() => {
}) })
} }
}, },
// 页码 // 页码

2
src/views/applicationList/scriptAdmin/inserterAdd.vue
View File

@ -139,7 +139,7 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
::v-deep .el-button { ::v-deep .el-button {
border-radius: 16px; border-radius: 4px;
} }
::v-deep .el-form-item { ::v-deep .el-form-item {
display: block !important; display: block !important;

2
src/views/inserterAdmin/inserterAdd.vue
View File

@ -134,7 +134,7 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
::v-deep .el-button { ::v-deep .el-button {
border-radius: 16px; border-radius: 4px;
} }
::v-deep .el-form-item { ::v-deep .el-form-item {
display: block !important; display: block !important;

3
src/views/masterDataOptions/authority/index.vue
View File

@ -286,7 +286,7 @@ export default {
} }
::v-deep .el-button { ::v-deep .el-button {
border-radius: 16px; border-radius: 4px;
} }
::v-deep .el-form-item { ::v-deep .el-form-item {
@ -302,6 +302,7 @@ export default {
background-color: #fbfbfb; background-color: #fbfbfb;
width: 100%; width: 100%;
overflow: auto; overflow: auto;
margin-left: 5px;
> .btn { > .btn {
display: flex; display: flex;

16
src/views/masterDataOptions/dataOrigin/index.vue
View File

@ -24,7 +24,7 @@
:tabLoading="mainTabLoading" :tabLoading="mainTabLoading"
:tableColumn="mainTableColumn" :tableColumn="mainTableColumn"
:border="false" :border="false"
tableHeight="68vh" tableMaxHeight="600"
:highlightCurrent="true" :highlightCurrent="true"
@radioChange="mainOnClick" @radioChange="mainOnClick"
> >
@ -36,7 +36,7 @@
<div class="settingBtn" @click="mainTableEditHandle(row)"> <div class="settingBtn" @click="mainTableEditHandle(row)">
<img src="./images/设置.png" alt=""> <img src="./images/设置.png" alt="">
</div> </div>
<div class="deleBtn" @click="mainDeleOnFunc"> <div class="deleBtn" @click="mainDeleOnFunc(row)">
<img src="./images/删除.png" alt=""> <img src="./images/删除.png" alt="">
</div> </div>
</div> </div>
@ -63,7 +63,7 @@
:tabLoading="activedTabLoading" :tabLoading="activedTabLoading"
:tableColumn="activedTableColumn" :tableColumn="activedTableColumn"
:border="false" :border="false"
tableHeight="73vh" tableMaxHeight="650"
:highlightCurrent="true" :highlightCurrent="true"
@radioChange="activedOnClick" @radioChange="activedOnClick"
@onFunc="activedOnFunc" @onFunc="activedOnFunc"
@ -82,7 +82,7 @@
</div> </div>
</template> </template>
</BaseTable> </BaseTable>
<div class="mainAddRow"> <div class="mainAddRow" v-if="mainTempClick.id">
<el-link <el-link
v-if="mainTempClick.id" v-if="mainTempClick.id"
type="primary" type="primary"
@ -407,7 +407,7 @@ export default {
this.$refs.mainTable.$refs.mainOptionForm.$refs['ruleForm'].validate(async(valid) => { this.$refs.mainTable.$refs.mainOptionForm.$refs['ruleForm'].validate(async(valid) => {
if (valid) { if (valid) {
//主数据英文名黑名单 //主数据英文名黑名单
let blacklist = ['id', 'document_rule', 'document_rule_num', 'data_status', 'add_status', 'update_status', 'delete_status', 'sorts', 'create_user_id', 'create_time', 'modify_user_id', 'modify_time', 'sts', 'org_id', 'company_id'] let blacklist = ['id', 'document_rule', 'document_rule_num', 'data_status', 'add_status', 'update_status', 'delete_status', 'sorts', 'create_user_id', 'create_time', 'modify_user_id', 'modify_time', 'sts', 'org_id', 'company_id','data_id']
let form = this.$refs.mainTable.mainOptionForm let form = this.$refs.mainTable.mainOptionForm
//判断黑名单 //判断黑名单
if (blacklist.includes(form.dbName)) { if (blacklist.includes(form.dbName)) {
@ -516,7 +516,7 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
::v-deep .el-button { ::v-deep .el-button {
border-radius: 16px; border-radius: 4px;
} }
::v-deep .el-form-item { ::v-deep .el-form-item {
@ -526,9 +526,9 @@ export default {
.wrap { .wrap {
display: flex; display: flex;
background-color: #fff; background-color: #fff;
margin-left: 15px; margin-left: 5px;
border-radius: 8px; border-radius: 8px;
height: calc(100%);
.mainAddRow { .mainAddRow {
margin-top: 30px; margin-top: 30px;
border: 1px dotted #ccc; border: 1px dotted #ccc;

2
src/views/masterDataOptions/dataOrigin/indexOld.vue
View File

@ -1075,7 +1075,7 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
::v-deep .el-button { ::v-deep .el-button {
border-radius: 16px; border-radius: 4px;
} }
::v-deep .el-form-item { ::v-deep .el-form-item {

2
src/views/masterDataOptions/dataOrigin/sonTable.vue
View File

@ -604,7 +604,7 @@ export default {
width: true width: true
} }
let tempArr = [] let tempArr = []
let disabledWords = ['id', 'formmain_id', 'data_status', 'sorts', 'create_user_id', 'create_time', 'modify_user_id', 'modify_time', 'sts', 'org_id', 'company_id'] let disabledWords = ['id', 'formmain_id', 'data_status', 'sorts', 'create_user_id', 'create_time', 'modify_user_id', 'modify_time', 'sts', 'org_id', 'company_id','data_id']
if (disabledWords.includes(this.optionRuleForm.enName)) { if (disabledWords.includes(this.optionRuleForm.enName)) {
this.$vmNews(`暂存失败，英文名${this.optionRuleForm.enName}不合法。`) this.$vmNews(`暂存失败，英文名${this.optionRuleForm.enName}不合法。`)
return return

181
src/views/masterDataOptions/displayInfo/index.vue
View File

@ -1,47 +1,81 @@
<template> <template>
<div class="displayInfo"> <div class="displayInfo">
<div class="btn">
<div class="chunk">
<el-button
icon="el-icon-back"
@click="
$router.replace({ path: '/integrationOption/masterDataOptions' })
"
>返回
</el-button
>
</div>
<div class="chunk">
<el-button
icon="el-icon-first-aid-kit"
type="primary"
@click="saveHandle"
:loading="saveLoading"
>保存
</el-button
>
</div>
</div>
<div class="main" v-loading="mainLoading"> <div class="main" v-loading="mainLoading">
<div class="title">显示类型</div>
<div class="radio"> <div class="typeSetting">
<el-radio-group v-model="displayType"> <div class="btn">
<el-radio label="1">树形</el-radio> <div class="chunk">
<el-radio label="2">列表</el-radio> <el-button
</el-radio-group> v-if="!editFlag"
</div> icon="el-icon-edit"
<div class="form" v-if="displayType == 1"> type="primary"
<baseNewForm @click="editFlag=true"
ref="optionForm" >编辑
:spanNumber="24" </el-button>
:isFunBtn="false" <el-button
:formRow="formRow" v-if="editFlag"
:ruleForm="ruleForm" icon="el-icon-close"
:labelPosition="'right'" @click="getRuleForm"
labelWidth="100px" :loading="saveLoading"
@onSubmit="onSubmit" >取消
> </el-button>
</baseNewForm> <el-button
v-if="editFlag"
icon="el-icon-first-aid-kit"
type="primary"
@click="saveHandle"
:loading="saveLoading"
>保存
</el-button>
</div>
</div>
<template v-if="!editFlag">
<div class="title">显示类型</div>
<div class="radio">
<el-radio-group v-model="displayType" :disabled="true">
<el-radio label="1">树形</el-radio>
<el-radio label="2">列表</el-radio>
</el-radio-group>
</div>
<div class="form" v-if="displayType == 1">
<baseNewForm
ref="optionForm"
:spanNumber="24"
:isFunBtn="false"
:formRow="formRow"
:ruleForm="ruleForm"
:labelPosition="'right'"
labelWidth="100px"
@onSubmit="onSubmit"
:lookFlag="true"
>
</baseNewForm>
</div>
</template>
<template v-else>
<div class="title">显示类型</div>
<div class="radio">
<el-radio-group v-model="displayType">
<el-radio label="1">树形</el-radio>
<el-radio label="2">列表</el-radio>
</el-radio-group>
</div>
<div class="form" v-if="displayType == 1">
<baseNewForm
ref="optionForm"
:spanNumber="24"
:isFunBtn="false"
:formRow="formRow"
:ruleForm="ruleForm"
:labelPosition="'right'"
labelWidth="100px"
@onSubmit="onSubmit"
>
</baseNewForm>
</div>
</template>
</div> </div>
<div class="main"> <div class="main">
<div class="content"> <div class="content">
@ -249,7 +283,8 @@ export default {
'新增': ['addFiled', 'dbAddFiled', 3], '新增': ['addFiled', 'dbAddFiled', 3],
'修改': ['editFiled', 'dbEditFiled', 4], '修改': ['editFiled', 'dbEditFiled', 4],
'查看': ['showFiled', 'dbShowFiled', 5] '查看': ['showFiled', 'dbShowFiled', 5]
}//字典 },//字典
editFlag: false
} }
}, },
methods: { methods: {
@ -291,6 +326,7 @@ export default {
viewName: this.displayType viewName: this.displayType
}) })
this.$vmNews('保存成功', 'success') this.$vmNews('保存成功', 'success')
this.editFlag = false
this.getRuleForm() this.getRuleForm()
} else { } else {
this.openLoading('submit') this.openLoading('submit')
@ -301,6 +337,7 @@ export default {
}) })
this.$vmNews('保存成功', 'success') this.$vmNews('保存成功', 'success')
this.editFlag = false
this.getRuleForm() this.getRuleForm()
} }
@ -315,6 +352,7 @@ export default {
console.log(res.attribute, 'res.attribute', res) console.log(res.attribute, 'res.attribute', res)
this.ruleForm = res.attribute ? res.attribute : {} this.ruleForm = res.attribute ? res.attribute : {}
this.displayType = this.ruleForm.viewName ? this.ruleForm.viewName : '1' this.displayType = this.ruleForm.viewName ? this.ruleForm.viewName : '1'
this.editFlag = false
}, },
//保存 //保存
saveHandle() { saveHandle() {
@ -326,6 +364,10 @@ export default {
}, },
//点击设置 //点击设置
settingHandle(key) { settingHandle(key) {
if (!this.ruleForm.id) {
this.$vmNews('请先添加显示类型后再配置按钮')
return
}
this.activeTitle = key this.activeTitle = key
this.mainTableDialogShow = true this.mainTableDialogShow = true
this.$nextTick(() => { this.$nextTick(() => {
@ -390,7 +432,7 @@ export default {
} }
::v-deep .el-button { ::v-deep .el-button {
border-radius: 16px; border-radius: 4px;
} }
::v-deep .el-transfer-panel__list { ::v-deep .el-transfer-panel__list {
@ -405,6 +447,7 @@ export default {
background-color: #fbfbfb; background-color: #fbfbfb;
width: 100%; width: 100%;
position: relative; position: relative;
margin-left: 5px;
> .btn { > .btn {
display: flex; display: flex;
@ -416,28 +459,46 @@ export default {
} }
> .main { > .main {
background-color: #fff;
border-right: 8px;
height: 85vh;
overflow: auto;
margin-top: 10px; margin-top: 10px;
padding: 0px 15px; .typeSetting {
background-color: #fff;
padding: 15px 10px;
margin-bottom: 10px;
border-radius: 16px;
> .title { > .btn {
font-weight: 600; display: flex;
margin: 15px 0; justify-content: flex-end;
}
> .title {
font-weight: 600;
margin-left: 20px;
margin-bottom: 25px;
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 18px;
color: #333333;
line-height: 25px;
text-align: left;
font-style: normal;
}
> .radio {
margin: 20px 20px;
}
> .tabIndex {
margin-top: 10px;
}
} }
> .radio {
margin: 15px 20px;
}
> .tabIndex {
margin-top: 10px;
}
.main { .main {
border-radius: 16px;
background-color: #fff;
overflow: auto; overflow: auto;
padding: 15px 10px;
> .content { > .content {
margin-top: 1vh; margin-top: 1vh;
@ -447,7 +508,7 @@ export default {
display: inline-block; display: inline-block;
width: 340px; width: 340px;
margin-left: 8px; margin-left: 8px;
height: 68vh; height: 58vh;
background: #FFFFFF; background: #FFFFFF;
border-radius: 8px; border-radius: 8px;
border: 1px solid #EBEBEB; border: 1px solid #EBEBEB;
@ -511,7 +572,7 @@ export default {
} }
.showCheckBoxList { .showCheckBoxList {
height: 45vh; height: 40vh;
overflow: auto; overflow: auto;
} }

2
src/views/masterDataOptions/displayInfo/indexOldCopy.vue
View File

@ -378,7 +378,7 @@ export default {
} }
::v-deep .el-button { ::v-deep .el-button {
border-radius: 16px; border-radius: 4px;
} }
::v-deep .el-transfer-panel__list { ::v-deep .el-transfer-panel__list {

4
src/views/masterDataOptions/distribute/index.vue
View File

@ -282,10 +282,11 @@ export default {
text-align: center; text-align: center;
height: 50px; height: 50px;
line-height: 50px; line-height: 50px;
} }
::v-deep .el-button { ::v-deep .el-button {
border-radius: 16px; border-radius: 4px;
} }
::v-deep .el-form-item { ::v-deep .el-form-item {
@ -298,6 +299,7 @@ export default {
} }
.wrap { .wrap {
margin-left: 5px;
background-color: #fbfbfb; background-color: #fbfbfb;
width: 100%; width: 100%;
overflow: auto; overflow: auto;

2
src/views/masterDataOptions/index.vue
View File

@ -329,7 +329,7 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
::v-deep .el-button { ::v-deep .el-button {
border-radius: 16px; border-radius: 4px;
} }
.monitoring { .monitoring {

124
src/views/masterDataOptions/logsDeatil/index.vue
View File

@ -4,17 +4,17 @@
<div class="chunk" :class="{acivted:activeName==='1'}" @click="tabsHandleClick('1')">下发日志</div> <div class="chunk" :class="{acivted:activeName==='1'}" @click="tabsHandleClick('1')">下发日志</div>
<div class="chunk" :class="{acivted:activeName==='2'}" @click="tabsHandleClick('2')">写入日志</div> <div class="chunk" :class="{acivted:activeName==='2'}" @click="tabsHandleClick('2')">写入日志</div>
</div> </div>
<div class="table"> <div class="table" v-loading="tableLoading">
<baseTable :tableData="tableData" :tabLoading="tabLoading" <baseTable :tableData="tableData" :tabLoading="tabLoading"
:tableColumn="tableColumn" :border="false" tableHeight="70vh" :tableColumn="tableColumn" :border="false" tableHeight="73vh"
> >
<!-- 状态--> <!-- 状态-->
<template #dataType="{row}"> <template #dataType="{row}">
{{ row.dataType == 1 ? '成功' : '失败'}} {{ row.dataType == 1 ? '成功' : '失败' }}
</template> </template>
<!-- 操作类型--> <!-- 操作类型-->
<template #optionType="{row}"> <template #optionType="{row}">
{{row.optionType}} {{ row.optionType }}
</template> </template>
</baseTable> </baseTable>
</div> </div>
@ -35,72 +35,98 @@ export default {
return { return {
activeName: '1', activeName: '1',
tableData: [], tableData: [],
tableColumn: [], tableColumn: [
{
title: '目标应用',
id: 'targetApp'
},
{
title: '目标api',
id: 'targetApi'
},
{
title: '源数据',
id: 'sourceData',
tooltip: true
},
{
title: '状态',
id: 'dataType'
},
{
title: '返回信息',
id: 'remark',
tooltip: true
},
{
title: '操作类型',
id: 'optionType'
}
],
tabLoading: false, tabLoading: false,
tableColumnTypeOne: [ tableColumnTypeOne: [
{ {
title: "目标应用", title: '目标应用',
id: "targetApp", id: 'targetApp'
}, },
{ {
title: "目标api", title: '目标api',
id: "targetApi", id: 'targetApi'
}, },
{ {
title: "源数据", title: '源数据',
id: "sourceData", id: 'sourceData',
tooltip: true, tooltip: true
}, },
{ {
title: "状态", title: '状态',
id: "dataType", id: 'dataType'
}, },
{ {
title: "返回信息", title: '返回信息',
id: "remark", id: 'remark',
tooltip: true, tooltip: true
}, },
{ {
title: "操作类型", title: '操作类型',
id: "optionType", id: 'optionType'
}, }
],//下发日志用 ],//下发日志用
tableColumnTypeTwo: [ tableColumnTypeTwo: [
{ {
title: "来源名称", title: '来源名称',
id: "sourceName", id: 'sourceName'
}, },
{ {
title: "编码", title: '编码',
id: "code", id: 'code'
}, },
{ {
title: "源数据", title: '源数据',
id: "sourceData", id: 'sourceData',
tooltip: true, tooltip: true
}, },
{ {
title: "状态", title: '状态',
id: "dataType", id: 'dataType'
}, },
{ {
title: "返回信息", title: '返回信息',
id: "remark", id: 'remark',
tooltip: true, tooltip: true
}, },
{ {
title: "创建时间", title: '创建时间',
id: "create_time", id: 'create_time'
}, },
{ {
title: "操作类型", title: '操作类型',
id: "optionType", id: 'optionType'
}, },
{ {
title: "操作人", title: '操作人',
id: "optionName", id: 'optionName'
}, }
],//写入日志用 ],//写入日志用
pageModel: { pageModel: {
@ -108,11 +134,12 @@ export default {
total: 10, total: 10,
limit: 10 limit: 10
}, },
optionTypeDist:{ optionTypeDist: {
'1':"新增", '1': '新增',
'2':"修改", '2': '修改',
'3':"删除", '3': '删除'
} },
tableLoading: false
} }
}, },
methods: { methods: {
@ -162,8 +189,9 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
.logsDeatil { .logsDeatil {
margin-left: 10px; margin-left: 5px;
background-color: #fff; background-color: #fff;
padding: 10px;
.tabs { .tabs {
display: flex; display: flex;

163
src/views/masterDataOptions/masterDataAdd.vue
View File

@ -1,28 +1,29 @@
<script src="configData.js"></script> <script src="configData.js"></script>
<template> <template>
<div class="wrap"> <div class="wrap">
<div class="btn">
<div class="title">主数据信息</div> <div class="main">
<div class="chunkList"> <div class="btn">
<div class="chunk"> <div class="chunkList">
<el-button icon="el-icon-back" @click=" <div class="chunk">
$router.replace({ path: '/integrationOption/masterDataOptions' }) </div>
" <div class="chunk">
>返回 <el-button
</el-button> v-if="showForm"
</div> icon="el-icon-close"
<div class="chunk"> @click="showForm=false"
<el-button v-if="showForm" icon="el-icon-first-aid-kit" type="primary" @click="saveHandle" >取消
:loading="saveLoading" </el-button>
>保存 <el-button v-if="showForm" icon="el-icon-first-aid-kit" type="primary" @click="saveHandle"
</el-button> :loading="saveLoading"
<el-button v-else icon="el-icon-first-aid-kit" type="primary" @click="showForm=true">编辑 >保存
</el-button> </el-button>
<el-button v-if="!showForm" icon="el-icon-first-aid-kit" type="primary" @click="showForm=true">编辑
</el-button>
</div>
</div> </div>
</div> </div>
<div class="title">主数据信息</div>
</div>
<div class="main">
<!-- 展示页--> <!-- 展示页-->
<template v-if="!showForm"> <template v-if="!showForm">
<div class="planInfo"> <div class="planInfo">
@ -36,6 +37,7 @@
</div> </div>
</div> </div>
</template> </template>
<template v-if="showForm"> <template v-if="showForm">
<!-- 编辑页--> <!-- 编辑页-->
<div class="upload"> <div class="upload">
@ -72,7 +74,20 @@
></baseNewForm> ></baseNewForm>
</div> </div>
</template> </template>
</div>
<div class="rule">
<div class="title">数据源</div>
<div class="line">
<div class="name">单据规则</div>
<template v-if="!receiptsTableData.length">
<div class="value">尚未设置</div>
</template>
<template v-else>
<div class="value">
<div class="receiptsItem" v-for="(item,index) in receiptsTableData">{{ item.dbValue }}</div>
</div>
</template>
</div>
</div> </div>
</div> </div>
</template> </template>
@ -100,7 +115,8 @@ export default {
imgLoading: false, imgLoading: false,
saveLoading: false, saveLoading: false,
showForm: false, showForm: false,
billid: '' billid: '',
receiptsTableData: []
} }
}, },
methods: { methods: {
@ -138,8 +154,8 @@ export default {
}, },
async beforeUpload(file) { async beforeUpload(file) {
if ( if (
file.type.split('/')[1] != 'jpeg' && file.type.split('/')[1] != 'jpeg' &&
file.type.split('/')[1] != 'png' file.type.split('/')[1] != 'png'
) { ) {
this.$message({ this.$message({
type: 'warning', type: 'warning',
@ -246,8 +262,16 @@ export default {
return return
} }
this.imgUrl = this.imgUrl =
'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), ''))
}) })
},
//单据规则获取
async getRuleHandle() {
this.openLoading('submit')
const res = await authApi('mdmModuleService', '', 'getMdmTableCodeRule', '', {
mdmId: this.billid
})
this.receiptsTableData = res.attribute
} }
}, },
@ -261,6 +285,7 @@ export default {
if (this.$route.query.id) { if (this.$route.query.id) {
this.billid = this.$route.query.id this.billid = this.$route.query.id
this.initEditFormData() this.initEditFormData()
this.getRuleHandle()
} }
} }
} }
@ -268,7 +293,7 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
::v-deep .el-button { ::v-deep .el-button {
border-radius: 16px; border-radius: 4px;
} }
::v-deep .el-form-item { ::v-deep .el-form-item {
@ -276,40 +301,43 @@ export default {
} }
.wrap { .wrap {
background-color: #fff;
width: 100%; width: 100%;
overflow: auto; overflow: auto;
border-radius: 8px; border-radius: 8px;
margin-left: 10px; margin-left: 5px;
> .btn {
display: flex;
justify-content: space-between;
align-items: center;
.title {
margin-left: 32px;
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 18px;
color: #333333;
line-height: 25px;
text-align: left;
font-style: normal;
}
.chunkList {
display: flex;
> .chunk {
margin-left: 10px;
}
}
.title {
margin-bottom: 32px;
margin-left: 32px;
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 18px;
color: #333333;
line-height: 25px;
text-align: left;
font-style: normal;
} }
> .main { > .main {
margin-top: 10px; margin-top: 10px;
background-color: #fff;
border-radius: 16px;
> .btn {
display: flex;
justify-content: flex-end;
align-items: center;
padding: 15px 10px;
.chunkList {
display: flex;
> .chunk {
margin-left: 10px;
}
}
}
> .planInfo { > .planInfo {
margin-top: 17px; margin-top: 17px;
@ -409,5 +437,36 @@ export default {
padding: 10px 20px; padding: 10px 20px;
} }
} }
> .rule {
padding: 30px 0;
margin-top: 10px;
background-color: #fff;
border-radius: 16px;
.line{
margin-left: 32px;
display: flex;
.name{
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 18px;
color: #999999;
line-height: 25px;
text-align: left;
font-style: normal;
}
.value{
display: flex;
margin-left: 15px;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 18px;
color: #333333;
line-height: 25px;
text-align: left;
font-style: normal;
}
}
}
} }
</style> </style>

17
src/views/masterDataOptions/settingMenu.vue
View File

@ -11,6 +11,7 @@
</template> </template>
</div> </div>
<div class="appName">{{ name }}</div> <div class="appName">{{ name }}</div>
<div class="version" v-if="code">编码：{{ code }}</div>
</div> </div>
<div class="menuList"> <div class="menuList">
<div class="item" v-for="(item, index) in settingMunu" :key="index" @click="menuClick(index, item)"> <div class="item" v-for="(item, index) in settingMunu" :key="index" @click="menuClick(index, item)">
@ -44,6 +45,7 @@ export default {
settingMunu: configData.settingMenu, settingMunu: configData.settingMenu,
query: this.$route.query, query: this.$route.query,
name: '', name: '',
code: '',
imgUrl: '', imgUrl: '',
versionNumber: '', versionNumber: '',
imgLoading: false, imgLoading: false,
@ -71,6 +73,7 @@ export default {
}, { id: this.billid }) }, { id: this.billid })
if (res.status === '200') { if (res.status === '200') {
this.name = res.attribute.mdmName this.name = res.attribute.mdmName
this.code = res.attribute.mdmCode
//下载logo //下载logo
this.imgLoading = true this.imgLoading = true
return request({ return request({
@ -84,7 +87,7 @@ export default {
return return
} }
this.imgUrl = this.imgUrl =
'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), ''))
}) })
} }
}, },
@ -158,12 +161,18 @@ export default {
font-size: 18px; font-size: 18px;
} }
> .version { .version {
margin-top: 1px; margin-top: 10px;
font-size: 12px; font-size: 12px;
padding: 1px 2px; padding: 1px 2px;
border: 1px solid #ff8b0f;
color: #ff8b0f; color: #ff8b0f;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 14px;
color: #333333;
line-height: 20px;
text-align: left;
font-style: normal;
} }
} }