Conflicts:
	vue.config.js
This commit is contained in:
lvleigang 2024-07-31 16:05:12 +08:00
commit bfa0b1ca6b
5 changed files with 476 additions and 432 deletions

View File

@ -1,46 +1,46 @@
<template>
<div>
<base-right-dialog
ref="baseRightDialog"
:footerShow="true"
:dialogVisible.sync="dialogVisible"
:title="dialogTitle + ' 消息管理日志'"
@handleClose="handleDialogClose"
:type="dialogType"
:submitShow="submitShow"
:size="'65%'"
@handleConfirmClick="handleConfirmClick"
ref="baseRightDialog"
:footerShow="true"
:dialogVisible.sync="dialogVisible"
:title="dialogTitle + ' 消息管理日志'"
@handleClose="handleDialogClose"
:type="dialogType"
:submitShow="submitShow"
:size="'65%'"
@handleConfirmClick="handleConfirmClick"
>
<base-form
ref="basicsForm"
:formRow="formRow"
:isFunBtn="false"
:rules="basicsRules"
class="dialog_form"
:spanWidth="`120px`"
:loading="vLoading"
style="padding-bottom:20px;"
ref="basicsForm"
:formRow="formRow"
:isFunBtn="false"
:rules="basicsRules"
class="dialog_form"
:spanWidth="`120px`"
:loading="vLoading"
style="padding-bottom:20px;"
>
<div slot="sourceData" class="code-json-editor">
<vue-json-editor
class="editor"
v-model="sourceData"
:showBtns="false"
:mode="'code'"
@json-change="onSourceDataJsonChange"
@json-save="onSourceDataSave"
@has-error="onSourceDataError"
class="editor"
v-model="sourceData"
:showBtns="false"
:mode="'code'"
@json-change="onSourceDataJsonChange"
@json-save="onSourceDataSave"
@has-error="onSourceDataError"
/>
</div>
<div slot="targetData" class="code-json-editor">
<vue-json-editor
class="editor"
v-model="targetData"
:showBtns="false"
:mode="'code'"
@json-change="onTargetDataChange"
@json-save="onTargetDataSave"
@has-error="onTargetDataError"
class="editor"
v-model="targetData"
:showBtns="false"
:mode="'code'"
@json-change="onTargetDataChange"
@json-save="onTargetDataSave"
@has-error="onTargetDataError"
/>
</div>
</base-form>
@ -49,25 +49,26 @@
</template>
<script>
import vueJsonEditor from "vue-json-editor";
import baseRightDialog from "@/components/base/baseRightDialog";
import baseForm from "@/components/base/baseNewForm";
import baseTable from "@/components/base/baseTable";
import configData from "./configData";
import { authApi } from "@/api/apis/auth";
import {getApiModuleApi} from "@/api/apiChunks/index.js";
import vueJsonEditor from 'vue-json-editor'
import baseRightDialog from '@/components/base/baseRightDialog'
import baseForm from '@/components/base/baseNewForm'
import baseTable from '@/components/base/baseTable'
import configData from './configData'
import { authApi } from '@/api/apis/auth'
import { getApiModuleApi } from '@/api/apiChunks/index.js'
export default {
components: {
baseRightDialog,
baseForm,
baseTable,
vueJsonEditor,
vueJsonEditor
},
data() {
return {
dialogVisible: false,
dialogTitle: "",
dialogType: "",
dialogTitle: '',
dialogType: '',
formRow: configData.formRow,
basicsRules: configData.basicsRules,
vLoading: false,
@ -75,136 +76,137 @@ export default {
sourceData: {},
sourceDataFlag: true,
targetData: {},
targetDataFlag: true,
};
targetDataFlag: true
}
},
methods: {
openDialog(type, row) {
this.querysysAppService();
this.querysysAppService()
// this.querysysAppApiService();
this.formRow = configData.formRow;
this.submitShow = true;
this.formRow = configData.formRow
this.submitShow = true
//
if (type == "edit") {
this.dialogTitle = "编辑";
this.dialogType = "edit";
this.messageLogGetById(row.id);
if (type == 'edit') {
this.dialogTitle = '编辑'
this.dialogType = 'edit'
this.messageLogGetById(row.id)
}
//
if (type == "show") {
this.submitShow = false;
this.formRow = configData.formRowShow;
this.dialogTitle = "查看";
this.dialogType = "show";
this.messageLogGetById(row.id);
if (type == 'show') {
this.submitShow = false
this.formRow = configData.formRowShow
this.dialogTitle = '查看'
this.dialogType = 'show'
this.messageLogGetById(row.id, row)
}
this.dialogVisible = true;
this.dialogVisible = true
},
//
async messageLogGetById(id) {
async messageLogGetById(id, row) {
let params = {
id: id,
};
status: row.status
}
let res = await authApi(
"sysMessageManageLogService",
"messageManage",
"thirdInterfacequeryEntity",
"",
params
);
if (res.status == "200") {
'sysMessageManageLogService',
'messageManage',
'thirdInterfacequeryEntity',
'',
params
)
if (res.status == '200') {
this.$nextTick(() => {
this.$refs.basicsForm.incomingParameters(res.attribute);
});
this.$refs.basicsForm.incomingParameters(res.attribute)
})
}
},
//
onSourceDataJsonChange(value) {
this.onSourceDataSave(value);
this.onSourceDataSave(value)
},
onSourceDataSave(value) {
this.sourceData = value;
this.sourceDataFlag = true;
this.sourceData = value
this.sourceDataFlag = true
},
onSourceDataError(value) {
this.sourceDataFlag = false;
this.sourceDataFlag = false
},
checkSourceDataJson() {
if (this.sourceDataFlag === false) {
return false;
return false
} else {
return true;
return true
}
},
//
onTargetDataChange(value) {
this.onTargetDataSave(value);
this.onTargetDataSave(value)
},
onTargetDataSave(value) {
this.targetData = value;
this.targetDataFlag = true;
this.targetData = value
this.targetDataFlag = true
},
onTargetDataError(value) {
this.targetDataFlag = false;
this.targetDataFlag = false
},
checkTargetDataJson() {
if (this.targetDataFlag === false) {
return false;
return false
} else {
return true;
return true
}
},
//
handleDialogClose() {
this.$refs.basicsForm.resetFields();
this.dialogVisible = false;
this.$refs.basicsForm.resetFields()
this.dialogVisible = false
},
//
handleConfirmClick() {
let checkSource = this.checkSourceDataJson();
let checkSource = this.checkSourceDataJson()
if (!checkSource) {
this.$vmNews("源数据格式应为JSON格式", "warning");
return;
this.$vmNews('源数据格式应为JSON格式', 'warning')
return
}
let checkTarget = this.checkTargetDataJson();
let checkTarget = this.checkTargetDataJson()
if (!checkTarget) {
this.$vmNews("目标数据格式应为JSON格式", "warning");
return;
this.$vmNews('目标数据格式应为JSON格式', 'warning')
return
}
let params = {
...this.$refs.basicsForm.ruleForm,
sourceData: this.sourceData,
targetData: this.targetData,
};
if (this.dialogType == "edit") {
this.openLoading("submit");
this.messageLogUpdateDto(params);
targetData: this.targetData
}
if (this.dialogType == 'edit') {
this.openLoading('submit')
this.messageLogUpdateDto(params)
}
},
//
async messageLogUpdateDto(params) {
let res = await authApi(
"sysMessageManageLogService",
"messageManage",
"updateEntity",
"",
params
);
if (res.status == "200") {
this.handleDialogClose();
this.$vmNews("更新成功", "success");
this.$emit("resetTable");
'sysMessageManageLogService',
'messageManage',
'updateEntity',
'',
params
)
if (res.status == '200') {
this.handleDialogClose()
this.$vmNews('更新成功', 'success')
this.$emit('resetTable')
}
},
//
async querysysAppService() {
const res = await getApiModuleApi({
tl: "sysApplicationService",
as: "application",
dj: "thirdInterfacequeryApp"
tl: 'sysApplicationService',
as: 'application',
dj: 'thirdInterfacequeryApp'
}, {
"pageNum": 1,
"pageSize": 999
'pageNum': 1,
'pageSize': 999
})
this.formRow[0].elCol[0].options = res.attribute.list
// if (res.status == "200") {
@ -216,29 +218,31 @@ export default {
async querysysAppApiService() {
let params = {
pageSize: 9999,
pageNum: 1,
};
pageNum: 1
}
let res = await authApi(
"appApiService",
"appApi",
"queryPage",
"",
params
);
if (res.status == "200") {
'appApiService',
'appApi',
'queryPage',
'',
params
)
if (res.status == '200') {
// this.formRow[1].elCol[1].options = res.attribute.list;
// this.formRow[2].elCol[1].options = res.attribute.list;
}
},
},
};
}
}
}
</script>
<style lang="less" scoped>
.code-json-editor {
/* jsoneditor右上角默认有一个链接,加css去掉 */
/deep/ .jsoneditor-poweredBy {
display: none !important;
}
/deep/ .ace-jsoneditor {
height: 150px !important;
}
@ -249,6 +253,7 @@ export default {
::v-deep textarea.el-textarea__inner {
min-height: 150px !important;
}
.dialogList {
padding: 16px 0;
border-top: 1px solid #dcdfe6;

View File

@ -1,46 +1,46 @@
<template>
<div>
<base-right-dialog
ref="baseRightDialog"
:footerShow="true"
:dialogVisible.sync="dialogVisible"
:title="dialogTitle + ' 消息管理日志'"
@handleClose="handleDialogClose"
:type="dialogType"
:submitShow="submitShow"
:size="'65%'"
@handleConfirmClick="handleConfirmClick"
ref="baseRightDialog"
:footerShow="true"
:dialogVisible.sync="dialogVisible"
:title="dialogTitle + ' 消息管理日志'"
@handleClose="handleDialogClose"
:type="dialogType"
:submitShow="submitShow"
:size="'65%'"
@handleConfirmClick="handleConfirmClick"
>
<base-form
ref="basicsForm"
:formRow="formRow"
:isFunBtn="false"
:rules="basicsRules"
class="dialog_form"
:spanWidth="`120px`"
:loading="vLoading"
style="padding-bottom:20px;"
ref="basicsForm"
:formRow="formRow"
:isFunBtn="false"
:rules="basicsRules"
class="dialog_form"
:spanWidth="`120px`"
:loading="vLoading"
style="padding-bottom:20px;"
>
<div slot="sourceData" class="code-json-editor">
<vue-json-editor
class="editor"
v-model="sourceData"
:showBtns="false"
:mode="'code'"
@json-change="onSourceDataJsonChange"
@json-save="onSourceDataSave"
@has-error="onSourceDataError"
class="editor"
v-model="sourceData"
:showBtns="false"
:mode="'code'"
@json-change="onSourceDataJsonChange"
@json-save="onSourceDataSave"
@has-error="onSourceDataError"
/>
</div>
<div slot="targetData" class="code-json-editor">
<vue-json-editor
class="editor"
v-model="targetData"
:showBtns="false"
:mode="'code'"
@json-change="onTargetDataChange"
@json-save="onTargetDataSave"
@has-error="onTargetDataError"
class="editor"
v-model="targetData"
:showBtns="false"
:mode="'code'"
@json-change="onTargetDataChange"
@json-save="onTargetDataSave"
@has-error="onTargetDataError"
/>
</div>
</base-form>
@ -49,25 +49,26 @@
</template>
<script>
import vueJsonEditor from "vue-json-editor";
import baseRightDialog from "@/components/base/baseRightDialog";
import baseForm from "@/components/base/baseNewForm";
import baseTable from "@/components/base/baseTable";
import configData from "./configData";
import { authApi } from "@/api/apis/auth";
import {getApiModuleApi} from "@/api/apiChunks/index.js";
import vueJsonEditor from 'vue-json-editor'
import baseRightDialog from '@/components/base/baseRightDialog'
import baseForm from '@/components/base/baseNewForm'
import baseTable from '@/components/base/baseTable'
import configData from './configData'
import { authApi } from '@/api/apis/auth'
import { getApiModuleApi } from '@/api/apiChunks/index.js'
export default {
components: {
baseRightDialog,
baseForm,
baseTable,
vueJsonEditor,
vueJsonEditor
},
data() {
return {
dialogVisible: false,
dialogTitle: "",
dialogType: "",
dialogTitle: '',
dialogType: '',
formRow: configData.formRow,
basicsRules: configData.basicsRules,
vLoading: false,
@ -75,136 +76,137 @@ export default {
sourceData: {},
sourceDataFlag: true,
targetData: {},
targetDataFlag: true,
};
targetDataFlag: true
}
},
methods: {
openDialog(type, row) {
this.querysysAppService();
this.querysysAppService()
// this.querysysAppApiService();
this.formRow = configData.formRow;
this.submitShow = true;
this.formRow = configData.formRow
this.submitShow = true
//
if (type == "edit") {
this.dialogTitle = "编辑";
this.dialogType = "edit";
this.messageLogGetById(row.id);
if (type == 'edit') {
this.dialogTitle = '编辑'
this.dialogType = 'edit'
this.messageLogGetById(row.id, row)
}
//
if (type == "show") {
this.submitShow = false;
this.formRow = configData.formRowShow;
this.dialogTitle = "查看";
this.dialogType = "show";
this.messageLogGetById(row.id);
if (type == 'show') {
this.submitShow = false
this.formRow = configData.formRowShow
this.dialogTitle = '查看'
this.dialogType = 'show'
this.messageLogGetById(row.id, row)
}
this.dialogVisible = true;
this.dialogVisible = true
},
//
async messageLogGetById(id) {
async messageLogGetById(id, row) {
let params = {
id: id,
};
status: row.status
}
let res = await authApi(
"sysMessageManageLogService",
"messageManage",
"thirdInterfacequeryEntity",
"",
params
);
if (res.status == "200") {
'sysMessageManageLogService',
'messageManage',
'thirdInterfacequeryEntity',
'',
params
)
if (res.status == '200') {
this.$nextTick(() => {
this.$refs.basicsForm.incomingParameters(res.attribute);
});
this.$refs.basicsForm.incomingParameters(res.attribute)
})
}
},
//
onSourceDataJsonChange(value) {
this.onSourceDataSave(value);
this.onSourceDataSave(value)
},
onSourceDataSave(value) {
this.sourceData = value;
this.sourceDataFlag = true;
this.sourceData = value
this.sourceDataFlag = true
},
onSourceDataError(value) {
this.sourceDataFlag = false;
this.sourceDataFlag = false
},
checkSourceDataJson() {
if (this.sourceDataFlag === false) {
return false;
return false
} else {
return true;
return true
}
},
//
onTargetDataChange(value) {
this.onTargetDataSave(value);
this.onTargetDataSave(value)
},
onTargetDataSave(value) {
this.targetData = value;
this.targetDataFlag = true;
this.targetData = value
this.targetDataFlag = true
},
onTargetDataError(value) {
this.targetDataFlag = false;
this.targetDataFlag = false
},
checkTargetDataJson() {
if (this.targetDataFlag === false) {
return false;
return false
} else {
return true;
return true
}
},
//
handleDialogClose() {
this.$refs.basicsForm.resetFields();
this.dialogVisible = false;
this.$refs.basicsForm.resetFields()
this.dialogVisible = false
},
//
handleConfirmClick() {
let checkSource = this.checkSourceDataJson();
let checkSource = this.checkSourceDataJson()
if (!checkSource) {
this.$vmNews("源数据格式应为JSON格式", "warning");
return;
this.$vmNews('源数据格式应为JSON格式', 'warning')
return
}
let checkTarget = this.checkTargetDataJson();
let checkTarget = this.checkTargetDataJson()
if (!checkTarget) {
this.$vmNews("目标数据格式应为JSON格式", "warning");
return;
this.$vmNews('目标数据格式应为JSON格式', 'warning')
return
}
let params = {
...this.$refs.basicsForm.ruleForm,
sourceData: this.sourceData,
targetData: this.targetData,
};
if (this.dialogType == "edit") {
this.openLoading("submit");
this.messageLogUpdateDto(params);
targetData: this.targetData
}
if (this.dialogType == 'edit') {
this.openLoading('submit')
this.messageLogUpdateDto(params)
}
},
//
async messageLogUpdateDto(params) {
let res = await authApi(
"sysMessageManageLogService",
"messageManage",
"updateEntity",
"",
params
);
if (res.status == "200") {
this.handleDialogClose();
this.$vmNews("更新成功", "success");
this.$emit("resetTable");
'sysMessageManageLogService',
'messageManage',
'updateEntity',
'',
params
)
if (res.status == '200') {
this.handleDialogClose()
this.$vmNews('更新成功', 'success')
this.$emit('resetTable')
}
},
//
async querysysAppService() {
const res = await getApiModuleApi({
tl: "sysApplicationService",
as: "application",
dj: "thirdInterfacequeryApp"
tl: 'sysApplicationService',
as: 'application',
dj: 'thirdInterfacequeryApp'
}, {
"pageNum": 1,
"pageSize": 999
'pageNum': 1,
'pageSize': 999
})
this.formRow[0].elCol[0].options = res.attribute.list
// if (res.status == "200") {
@ -216,29 +218,31 @@ export default {
async querysysAppApiService() {
let params = {
pageSize: 9999,
pageNum: 1,
};
pageNum: 1
}
let res = await authApi(
"appApiService",
"appApi",
"queryPage",
"",
params
);
if (res.status == "200") {
'appApiService',
'appApi',
'queryPage',
'',
params
)
if (res.status == '200') {
// this.formRow[1].elCol[1].options = res.attribute.list;
// this.formRow[2].elCol[1].options = res.attribute.list;
}
},
},
};
}
}
}
</script>
<style lang="less" scoped>
.code-json-editor {
/* jsoneditor右上角默认有一个链接,加css去掉 */
/deep/ .jsoneditor-poweredBy {
display: none !important;
}
/deep/ .ace-jsoneditor {
height: 150px !important;
}
@ -249,6 +253,7 @@ export default {
::v-deep textarea.el-textarea__inner {
min-height: 150px !important;
}
.dialogList {
padding: 16px 0;
border-top: 1px solid #dcdfe6;

View File

@ -49,24 +49,25 @@
</template>
<script>
import vueJsonEditor from "vue-json-editor";
import baseRightDialog from "@/components/base/baseRightDialog";
import baseForm from "@/components/base/baseNewForm";
import baseTable from "@/components/base/baseTable";
import configData from "./configData";
import { authApi } from "@/api/apis/auth";
import vueJsonEditor from 'vue-json-editor'
import baseRightDialog from '@/components/base/baseRightDialog'
import baseForm from '@/components/base/baseNewForm'
import baseTable from '@/components/base/baseTable'
import configData from './configData'
import { authApi } from '@/api/apis/auth'
export default {
components: {
baseRightDialog,
baseForm,
baseTable,
vueJsonEditor,
vueJsonEditor
},
data() {
return {
dialogVisible: false,
dialogTitle: "",
dialogType: "",
dialogTitle: '',
dialogType: '',
formRow: configData.formRow,
basicsRules: configData.basicsRules,
vLoading: false,
@ -74,180 +75,183 @@ export default {
sourceData: {},
sourceDataFlag: true,
targetData: {},
targetDataFlag: true,
};
targetDataFlag: true
}
},
methods: {
openDialog(type, row) {
this.querysysAppService();
this.querysysAppApiService();
this.formRow = configData.formRow;
this.submitShow = true;
this.querysysAppService()
this.querysysAppApiService()
this.formRow = configData.formRow
this.submitShow = true
//
if (type == "edit") {
this.dialogTitle = "编辑";
this.dialogType = "edit";
this.messageLogGetById(row.id);
if (type == 'edit') {
this.dialogTitle = '编辑'
this.dialogType = 'edit'
this.messageLogGetById(row.id, row)
}
//
if (type == "show") {
this.submitShow = false;
this.formRow = configData.formRowShow;
this.dialogTitle = "查看";
this.dialogType = "show";
this.messageLogGetById(row.id);
if (type == 'show') {
this.submitShow = false
this.formRow = configData.formRowShow
this.dialogTitle = '查看'
this.dialogType = 'show'
this.messageLogGetById(row.id, row)
}
this.dialogVisible = true;
this.dialogVisible = true
},
//
async messageLogGetById(id) {
async messageLogGetById(id, row) {
let params = {
id: id,
};
status: row.status
}
let res = await authApi(
"sysMessageManageLogService",
"messageManage",
"queryEntity",
"",
'sysMessageManageLogService',
'messageManage',
'queryEntity',
'',
params
);
if (res.status == "200") {
)
if (res.status == '200') {
this.$nextTick(() => {
this.$refs.basicsForm.incomingParameters(res.attribute);
this.$refs.basicsForm.incomingParameters(res.attribute)
this.sourceData = res.attribute.sourceData
? JSON.parse(res.attribute.sourceData)
: {};
: {}
this.targetData = res.attribute.targetData
? JSON.parse(res.attribute.targetData)
: {};
});
: {}
})
}
},
//
onSourceDataJsonChange(value) {
this.onSourceDataSave(value);
this.onSourceDataSave(value)
},
onSourceDataSave(value) {
this.sourceData = value;
this.sourceDataFlag = true;
this.sourceData = value
this.sourceDataFlag = true
},
onSourceDataError(value) {
this.sourceDataFlag = false;
this.sourceDataFlag = false
},
checkSourceDataJson() {
if (this.sourceDataFlag === false) {
return false;
return false
} else {
return true;
return true
}
},
//
onTargetDataChange(value) {
this.onTargetDataSave(value);
this.onTargetDataSave(value)
},
onTargetDataSave(value) {
this.targetData = value;
this.targetDataFlag = true;
this.targetData = value
this.targetDataFlag = true
},
onTargetDataError(value) {
this.targetDataFlag = false;
this.targetDataFlag = false
},
checkTargetDataJson() {
if (this.targetDataFlag === false) {
return false;
return false
} else {
return true;
return true
}
},
//
handleDialogClose() {
this.sourceData = {};
this.targetData = {};
this.$refs.basicsForm.resetFields();
this.dialogVisible = false;
this.sourceData = {}
this.targetData = {}
this.$refs.basicsForm.resetFields()
this.dialogVisible = false
},
//
handleConfirmClick() {
let checkSource = this.checkSourceDataJson();
let checkSource = this.checkSourceDataJson()
if (!checkSource) {
this.$vmNews("源数据格式应为JSON格式", "warning");
return;
this.$vmNews('源数据格式应为JSON格式', 'warning')
return
}
let checkTarget = this.checkTargetDataJson();
let checkTarget = this.checkTargetDataJson()
if (!checkTarget) {
this.$vmNews("目标数据格式应为JSON格式", "warning");
return;
this.$vmNews('目标数据格式应为JSON格式', 'warning')
return
}
let params = {
...this.$refs.basicsForm.ruleForm,
sourceData: this.sourceData,
targetData: this.targetData,
};
if (this.dialogType == "edit") {
this.openLoading("submit");
this.messageLogUpdateDto(params);
targetData: this.targetData
}
if (this.dialogType == 'edit') {
this.openLoading('submit')
this.messageLogUpdateDto(params)
}
},
//
async messageLogUpdateDto(params) {
let res = await authApi(
"sysMessageManageLogService",
"messageManage",
"updateEntity",
"",
'sysMessageManageLogService',
'messageManage',
'updateEntity',
'',
params
);
if (res.status == "200") {
this.handleDialogClose();
this.$vmNews("更新成功", "success");
this.$emit("resetTable");
)
if (res.status == '200') {
this.handleDialogClose()
this.$vmNews('更新成功', 'success')
this.$emit('resetTable')
}
},
//
async querysysAppService() {
let params = {
pageSize: 9999,
pageNum: 1,
};
pageNum: 1
}
let res = await authApi(
"sysAppService",
"app",
"queryPageApp",
"",
'sysAppService',
'app',
'queryPageApp',
'',
params
);
if (res.status == "200") {
this.formRow[1].elCol[0].options = res.attribute.list;
this.formRow[2].elCol[0].options = res.attribute.list;
)
if (res.status == '200') {
this.formRow[1].elCol[0].options = res.attribute.list
this.formRow[2].elCol[0].options = res.attribute.list
}
},
//
async querysysAppApiService() {
let params = {
pageSize: 9999,
pageNum: 1,
};
let res = await authApi(
"appApiService",
"appApi",
"queryPage",
"",
params
);
if (res.status == "200") {
this.formRow[1].elCol[1].options = res.attribute.list;
this.formRow[2].elCol[1].options = res.attribute.list;
pageNum: 1
}
},
},
};
let res = await authApi(
'appApiService',
'appApi',
'queryPage',
'',
params
)
if (res.status == '200') {
this.formRow[1].elCol[1].options = res.attribute.list
this.formRow[2].elCol[1].options = res.attribute.list
}
}
}
}
</script>
<style lang="less" scoped>
.code-json-editor {
/* jsoneditor右上角默认有一个链接,加css去掉 */
/deep/ .jsoneditor-poweredBy {
display: none !important;
}
/deep/ .ace-jsoneditor {
height: 150px !important;
}
@ -257,6 +261,7 @@ export default {
::v-deep textarea.el-textarea__inner {
min-height: 150px !important;
}
.dialogList {
padding: 16px 0;
border-top: 1px solid #dcdfe6;
@ -287,4 +292,4 @@ export default {
::v-deep .app-container {
height: auto !important;
}
</style>
</style>

View File

@ -2,38 +2,38 @@
<div class="wrap">
<div class="tree" v-if="$route.query.viewType === '1'" style="flex:0.18">
<BaseMenuTree
:menuData="treeData"
:filterShow="false"
:Allshow="false"
:treeButton="false"
:filterButtonShow="false"
style="height: 100%"
:treeProps="treeProps"
@handleNodeClick="homeHandleNodeClick"
ref="menuTree"
:menuData="treeData"
:filterShow="false"
:Allshow="false"
:treeButton="false"
:filterButtonShow="false"
style="height: 100%"
:treeProps="treeProps"
@handleNodeClick="homeHandleNodeClick"
ref="menuTree"
></BaseMenuTree>
</div>
<div class="main" :style="{flex:$route.query.viewType === '1'?0.82:1}" v-loading="mainLoading">
<div class="top">
<div class="search">
<BaseNewForm
v-loading="searchLoading"
refName="searchForm"
:formRow="searchFormRow"
:formRule="false"
:ruleForm="searchForm"
:newFlag="true"
:treeSelectInfo="treeSelectInfo"
:isFunBtn="false"
v-loading="searchLoading"
refName="searchForm"
:formRow="searchFormRow"
:formRule="false"
:ruleForm="searchForm"
:newFlag="true"
:treeSelectInfo="treeSelectInfo"
:isFunBtn="false"
></BaseNewForm>
</div>
<div class="btnList">
<div class="btnItem" v-for="item in searchButton" :key="item.buttonType">
<el-button
type="primary"
size="mini"
@click="buttonHandle(item)"
v-btnPermission="{ btnID: item.buttonType, routeId: $route.meta.id }"
type="primary"
size="mini"
@click="buttonHandle(item)"
v-btnPermission="{ btnID: item.buttonType, routeId: $route.meta.id }"
>{{ item.buttonName }}
</el-button>
</div>
@ -41,18 +41,18 @@
</div>
<div class="table">
<BaseTable
ref="mainTable"
:treeSelectInfo="treeSelectInfo"
:tableData="tableData"
:tableColumn="tableColumn"
:funData="mainFunData"
:funWidth="funWidth"
:showIndex="true"
:tabLoading="mainTabLoading"
@onFunc="tableButtonHandle"
@selectValueGeT="selectValueGeTHandle"
:tableHeight="'67vh'"
:border="false"
ref="mainTable"
:treeSelectInfo="treeSelectInfo"
:tableData="tableData"
:tableColumn="tableColumn"
:funData="mainFunData"
:funWidth="funWidth"
:showIndex="true"
:tabLoading="mainTabLoading"
@onFunc="tableButtonHandle"
@selectValueGeT="selectValueGeTHandle"
:tableHeight="'67vh'"
:border="false"
>
<template #data_status="{row}">
{{ data_status_dist[row.data_status] }}
@ -60,8 +60,8 @@
</BaseTable>
<div class="nextPage">
<BasePage
:pageModel="pageModel"
@update:pageModel="currentChangeHandle"
:pageModel="pageModel"
@update:pageModel="currentChangeHandle"
></BasePage>
</div>
</div>
@ -72,15 +72,15 @@
</h1>
<div class="dialogForm" v-if="dialogShow" style="padding: 0 20px">
<BaseNewForm
:treeSelectInfo="treeSelectInfo"
:loading="dialogCommitLoading"
:formRow="formRow"
:ruleForm="ruleForm"
:lookFlag="lookFlag"
:newFlag="newFlag"
@onSubmit="onSubmitHandele"
:isFunBtn="false"
ref="dialogForm"
:treeSelectInfo="treeSelectInfo"
:loading="dialogCommitLoading"
:formRow="formRow"
:ruleForm="ruleForm"
:lookFlag="lookFlag"
:newFlag="newFlag"
@onSubmit="onSubmitHandele"
:isFunBtn="false"
ref="dialogForm"
></BaseNewForm>
</div>
<template v-for="(item, index) in dialogTabaleInfo">
@ -89,17 +89,17 @@
{{ item.title }}
</h1>
<BaseTableForm
:lookflag="lookFlag"
:showIndex="true"
:treeSelectInfo="treeSelectInfo"
:indexOperate="true"
:tableInfo="item"
@newRow="dialogTableAddHandle"
@onFunc="dialogTableDeleHandle"
:funData="dialogfunData"
:border="false"
:formIndex="index"
table-height="30vh"
:lookflag="lookFlag"
:showIndex="true"
:treeSelectInfo="treeSelectInfo"
:indexOperate="true"
:tableInfo="item"
@newRow="dialogTableAddHandle"
@onFunc="dialogTableDeleHandle"
:funData="dialogfunData"
:border="false"
:formIndex="index"
table-height="30vh"
></BaseTableForm>
</div>
@ -112,14 +112,14 @@
<div class="title">分发</div>
<div class="value" style="margin-left: 20px">
<el-select
v-model="sendCheckboxList"
placeholder="请选择"
v-model="sendCheckboxList"
placeholder="请选择"
>
<el-option
v-for="item in sendTableData"
:key="item.id"
:label="item.name"
:value="item.id"
v-for="item in sendTableData"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
@ -129,14 +129,14 @@
<div class="title">类型</div>
<div class="value" style="margin-left: 20px">
<el-select
v-model="sendCheckboxType"
placeholder="请选择"
v-model="sendCheckboxType"
placeholder="请选择"
>
<el-option
v-for="item in sendTableTypeOptions"
:key="item.id"
:label="item.name"
:value="item.id"
v-for="item in sendTableTypeOptions"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
@ -173,6 +173,8 @@ import BasePage from './compoments/basePage.vue'
import baseDialog from '@/views/integrationOption/compoments/baseDialog'
import BaseTableForm from './compoments/baseTableForm_v2.vue'
import BaseMenuTree from '@/views/intergrationTask/compoments/baseMenuTree.vue'
import { getInfo } from '@/utils/auth'
import { authApi } from '@/api/apis/auth'
export default {
data() {
@ -302,6 +304,31 @@ export default {
}
},
methods: {
//
async getBtn() {
let userId = JSON.parse(getInfo()).id
const res = await authApi('sysButtonConfigService', '', 'getUserButton', '', {
menuId: this.$route.meta.id,
userId: userId
})
let dist_arr = ['new', 'resize', 'search']
console.log(res, 'res')
this.searchButton = []
this.mainFunData = []
res.attribute.forEach(item => {
if (dist_arr.includes(item.nameEn)) {
this.searchButton.push({
buttonType: item.nameEn,
buttonName: item.nameCh
})
} else {
this.mainFunData.push({
text: item.nameCh,
type: item.nameEn
})
}
})
},
async init() {
this.mainLoading = true
const res = await getUserModuleApi({
@ -451,12 +478,12 @@ export default {
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
this.deleRowHanlde(row.id)
.then(() => {
this.deleRowHanlde(row.id)
})
.catch((error) => {
})
})
.catch((error) => {
})
} else if (item.type === 'send') {
this.sendHandle(row.id)
}
@ -525,15 +552,15 @@ export default {
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
this.dialogTabaleInfo[index].tableData.splice(row.index, 1)
this.$message({
type: 'success',
message: '删除成功!'
.then(() => {
this.dialogTabaleInfo[index].tableData.splice(row.index, 1)
this.$message({
type: 'success',
message: '删除成功!'
})
})
.catch((error) => {
})
})
.catch((error) => {
})
}
},
//dialog
@ -667,20 +694,20 @@ export default {
showType: '4'
})
res.attribute.mainMdmModuleDb.sublistMdmModuleDbFileds.forEach(item => {
item.mdmModuleDbFiledsRules.forEach(ele => {
if (ele.ruleCode === 'required' || ele.ruleCode === 'disabled') {
if (!ele.ruleValue) {
item[ele.ruleCode] = false
item.mdmModuleDbFiledsRules.forEach(ele => {
if (ele.ruleCode === 'required' || ele.ruleCode === 'disabled') {
if (!ele.ruleValue) {
item[ele.ruleCode] = false
} else {
item[ele.ruleCode] = JSON.parse(ele.ruleValue)
}
} else {
item[ele.ruleCode] = JSON.parse(ele.ruleValue)
item[ele.ruleCode] = ele.ruleValue
}
} else {
item[ele.ruleCode] = ele.ruleValue
}
item['id'] = item.enName
})
}
item['id'] = item.enName
})
}
)
this.dialogFormName = res.attribute.mainMdmModuleDb.dbName
this.formRow = []
@ -717,7 +744,7 @@ export default {
if (data.status === '200') {
this.ruleForm = data.attribute[this.mainTableName]
console.log(this.ruleForm,
'123'
'123'
)
console.log(this.ruleForm, this.mainTableName, data.attribute, '123')
this.dialogTabaleInfo.forEach(table => {
@ -903,6 +930,7 @@ export default {
},
created() {
this.init()
this.getBtn()
}
,
components: {

View File

@ -45,6 +45,7 @@ module.exports = {
// target: `http://192.168.2.78:9999`,
target: `http://192.168.2.85:9999`,
// target: `http://192.168.2.78:8080`,
target: `http://192.168.2.78:9999`,
// target: `http://192.168.2.83:9999`,
changeOrigin: true,
pathRewrite: {