From abf8822cfc6fe397d1f7216620f8ba5d3b4d0aab Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 12 十二月 2023 10:49:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/loge.vue | 34 +
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 2
Source/UBCS-WEB/src/views/statistic/statisticPage.vue | 5
Source/UBCS-WEB/src/components/StatisticsComponent/ColumnarChart.vue | 1
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue | 8
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 3
Source/UBCS-WEB/src/views/monitor/log/operateLog.vue | 2
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 9
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 7
Source/UBCS-WEB/src/views/integration/integrationIndex.vue | 828 ++++++++++++++++++++++++++++--------------------------
10 files changed, 476 insertions(+), 423 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 10186c8..73d8a17 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -1,5 +1,3 @@
-<!-- eslint-disable vue/valid-v-for -->
-<!-- eslint-disable vue/require-v-for-key -->
<template>
<div>
<avue-form
@@ -246,7 +244,7 @@
}
//鏇存敼鏂瑰紡
if (formItem.field === "codeStandardEditType") {
- if (this.status === "amend" ) {
+ if (this.status === "amend") {
formItem.readOnly = true;
}
}
@@ -436,7 +434,8 @@
field: formItem.field,
type: this.columnType[formItem.type],
dicData: this.getDataList(formItem.type, formItem.data),
- disabled: this.type === "detail" ? true : formItem.readOnly || (formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ? true : false) ,
+ disabled: this.type === "detail" ? true : formItem.readOnly || (formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ? true : false) ||
+ (this.status ? (formItem.field === "reviseSeries" ? (formItem.value == 'false' ? true : false) : false) : false),
prepend: this.preOrSufFixShow("text", formItem.prefix),
append: this.preOrSufFixShow("text", formItem.suffix),
prefixIcon: this.preOrSufFixShow("icon", formItem.prefix),
@@ -556,7 +555,7 @@
type: this.columnType[formItem.type],
dicData: this.getDataList(formItem.type, formItem.data),
disabled: this.type === "detail" ? true : formItem.readOnly || (formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ? true : false) ||
- ((formItem.name === "绯诲垪鍙�" && this.status && (formItem.field === "reviseSeries" && formItem.value == 'false') ? true : false)),
+ (this.status ? (formItem.field === "reviseSeries" ? (formItem.value == 'false' ? true : false) : false) : false),
prepend: this.preOrSufFixShow("text", formItem.prefix),
append: this.preOrSufFixShow("text", formItem.suffix),
prefixIcon: this.preOrSufFixShow("icon", formItem.prefix),
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index a2a076d..1cb14bf 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -3,10 +3,10 @@
<avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false"
:option="Treeoption" style="width: fit-content;" @node-click="nodeClick">
<template slot-scope="{ node }">
- <span v-html="node.label"></span>
+ <span id="labelSize" v-html="node.label" ></span>
</template>
</avue-tree>
- <div style="position: absolute; right: 0px; top: -1px;">
+ <div style="position: absolute; right: 3px; top: -1px;">
<el-link class="refresh-icon" icon="el-icon-refresh" @click="getTreeLists"></el-link>
</div>
</div>
@@ -253,4 +253,7 @@
margin-left: 6px;
font-size: 18px;
}
+#labelSize{
+ font-size: 14px !important;
+}
</style>
diff --git a/Source/UBCS-WEB/src/components/StatisticsComponent/ColumnarChart.vue b/Source/UBCS-WEB/src/components/StatisticsComponent/ColumnarChart.vue
index 050e580..741b537 100644
--- a/Source/UBCS-WEB/src/components/StatisticsComponent/ColumnarChart.vue
+++ b/Source/UBCS-WEB/src/components/StatisticsComponent/ColumnarChart.vue
@@ -82,7 +82,6 @@
chartName:{
handler(newval,oldval){
if(newval){
- console.log(newval)
this.chartOptions.title.text = newval + "鏁版嵁缁熻"
}
},
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index e874bdf..e576ea9 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -1109,6 +1109,8 @@
index: true,
indexFixed:false,
selectionFixed:false,
+ columnBtn: false,
+ refreshBtn:false,
border: true,
addBtn: false,
menu: false,
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue
index d609062..5882a33 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue
@@ -172,7 +172,8 @@
],
SelectValue:'id',
btmOption:{
- columnBtn:false,
+ columnBtn: false,
+ refreshBtn:false,
addBtn:false,
index:true,
border:true,
@@ -196,7 +197,8 @@
},
attrOption:{
addBtn:false,
- columnBtn:false,
+ columnBtn: false,
+ refreshBtn:false,
index:true,
border:true,
menu:false,
@@ -223,6 +225,8 @@
]
},
masterOption:{
+ columnBtn: false,
+ refreshBtn:false,
addBtn:false,
index:true,
border:true,
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 91b2025..549d206 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -476,6 +476,8 @@
masterOption: {
addBtn: false,
index: true,
+ refreshBtn:false,
+ columnBtn: false,
border: true,
menu: false,
height: 380,
@@ -504,6 +506,7 @@
addBtn: false,
index: true,
columnBtn: false,
+ refreshBtn:false,
border: true,
menu: false,
height: 380,
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index 023a104..43436b1 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -5,7 +5,6 @@
:table-loading="loading"
:data="data || getList"
:page.sync="page"
- :permission="permissionList"
ref="crud"
@cell-dblclick="cellDbClick"
@search-change="searchChange"
@@ -17,6 +16,16 @@
@on-load="onLoad">
<template slot-scope="scope" slot="menuLeft">
<vci-docking-search :SearchObject="SearchObject" :page="page" :formInline="formInline" :status="status" @getList="dockingGetList"></vci-docking-search>
+ </template>
+ <template slot="paramString" slot-scope="scope">
+ <avue-text-ellipsis :text="scope.row.paramString" :height="50">
+ <small slot="more">...</small>
+ </avue-text-ellipsis>
+ </template>
+ <template slot="returnString" slot-scope="scope">
+ <avue-text-ellipsis :text="scope.row.returnString" :height="50">
+ <small slot="more">...</small>
+ </avue-text-ellipsis>
</template>
</avue-crud>
</basic-container>
@@ -118,15 +127,18 @@
option: {
height:'auto',
calcHeight: 0,
- columnBtn:false,
tip: false,
searchShow: false,
border: true,
index: true,
- viewBtn: true,
selection: false,
dialogClickModal: false,
- menu:false,
+ menuFixed:false,
+ dialogType: 'drawer',
+ viewBtn: true,
+ addBtn:false,
+ editBtn:false,
+ delBtn:false,
column: [
{
label: "鏁版嵁缂栫爜",
@@ -176,6 +188,7 @@
{
label: '闆嗘垚绯荤粺缂栧彿',
prop: 'systemCode',
+ labelWidth:150,
sortable:true,
width: 130
},
@@ -183,6 +196,7 @@
label: '闆嗘垚绯荤粺鍚嶇О',
prop: 'systemName',
sortable:true,
+ labelWidth:150,
width: 150
},
{
@@ -194,16 +208,20 @@
{
label:'鎺ュ彛鍙傛暟',
prop:'paramString',
- overHidden:true,
sortable:true,
- width: 150
+ minRows: 20,
+ width: 150,
+ type: "textarea",
+ slot: true,
},
{
label:'杩斿洖鍙傛暟',
prop:'returnString',
- overHidden:true,
sortable:true,
- width: 150
+ minRows: 20,
+ width: 150,
+ type: "textarea",
+ slot: true,
},
{
label: '杩斿洖msg',
diff --git a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
index 4ff3f1a..2896931 100644
--- a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
+++ b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
@@ -1,428 +1,452 @@
<template>
- <div>
- <el-container style="height: 100%; border: 1px solid #fff">
- <el-card :style="{ marginRight: '10px' }">
- <el-aside width="300px" style="background-color: #fff">
- <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
- </el-input>
- <el-menu :default-openeds="['1', '3']">
- <el-tree class="filter-tree" :data="treeData" accordion :props="defaultProps"
- :filter-node-method="filterNode" empty-text="鏆傛棤鏁版嵁" ref="tree" @node-click="handelTreeCell">
- </el-tree>
- </el-menu>
- </el-aside>
- </el-card>
- <el-main>
- <el-card>
- <el-form :model="form">
- <el-form-item label="闆嗗洟鍒嗙被" label-width="70px" size="small">
- <el-select clearable ref="selectTree" v-model="groupVal" placeholder="璇烽�夋嫨"
- popper-class="popperTreeSelect">
- <el-option :value="groupVal" :label="groupVal">
- <el-tree ref="groupTree" :data="groupTreeData" empty-text="鏆傛棤鏁版嵁" :props="defaultProps"
- @node-click="handleNodeClick">
- </el-tree>
- </el-option>
- </el-select>
+ <div>
+ <el-container style="height: 100%; border: 1px solid #fff">
+ <el-card :style="{ marginRight: '10px' }">
+ <el-aside style="background-color: #fff" width="220px">
+ <el-input v-model="filterText" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�">
+ </el-input>
+ <el-menu :default-openeds="['1', '3']" >
+ <el-tree ref="tree" :data="treeData" :filter-node-method="filterNode" :props="defaultProps"
+ accordion class="filter-tree" empty-text="鏆傛棤鏁版嵁" @node-click="handelTreeCell">
+ </el-tree>
+ </el-menu>
+ </el-aside>
+ </el-card>
+ <el-main>
+ <el-card>
+ <el-form :model="form">
+ <el-form-item label="闆嗗洟鍒嗙被" label-width="70px" size="small">
+ <el-select ref="selectTree" v-model="groupVal" clearable placeholder="璇烽�夋嫨"
+ popper-class="popperTreeSelect">
+ <el-option :label="groupVal" :value="groupVal">
+ <el-tree ref="groupTree" :data="groupTreeData" :props="defaultProps" empty-text="鏆傛棤鏁版嵁"
+ @node-click="handleNodeClick">
+ </el-tree>
+ </el-option>
+ </el-select>
- </el-form-item>
- </el-form>
- <el-card>
- <avue-crud :table-loading="loading" :data="mappingData" :option="optionMapping" ref="crudMapping"
- @row-update="handleMapingUpdate" @row-click="handleMapingClick"
- @row-dblclick="handleMapingRowClick" @selection-change="selectionChange" @select="setCurrentRow"
- @select-all="handleSelectAll">
- <template slot="menuLeft">
- <el-button icon="el-icon-plus" size="small" type="primary" :disabled="disabledPush"
- @click="dialogPush = true">鏂� 澧�
- </el-button>
- <el-button icon="el-icon-check" size="small" type="primary" @click="handleSave">淇� 瀛�
- </el-button>
- <el-button icon="el-icon-connection" size="small" type="primary"
- @click="handleSync('all')">鍚屾涓绘ā鍨�
- </el-button>
- <el-button icon="el-icon-connection" size="small" type="primary"
- @click="handleSync('one')">鍚屾璇︾粏妯″瀷
- </el-button>
- </template>
- </avue-crud>
- </el-card>
- <el-card :style="{ marginTop: '20px'}">
- <avue-crud :style="{ marginTop: '-20px'}" :data="rangeData" :option="optinoRange" ref="crudRange" @row-update="handleUpdate"
- @row-dblclick="handleRowClick">
- </avue-crud>
- </el-card>
- </el-card>
- </el-main>
- </el-container>
- <integration-transfer :visible.sync="dialogPush" :data="transferData" :disabledData="filtermapping"
- :props="transferProps" @save="handelTransferSave"></integration-transfer>
- </div>
+ </el-form-item>
+ </el-form>
+ <el-card>
+ <avue-crud ref="crudMapping" :data="mappingData" :option="optionMapping" :table-loading="loading"
+ @select="setCurrentRow" @row-update="handleMapingUpdate"
+ @row-click="handleMapingClick" @row-dblclick="handleMapingRowClick" @selection-change="selectionChange"
+ @select-all="handleSelectAll">
+ <template slot="menuLeft">
+ <el-button :disabled="disabledPush" icon="el-icon-plus" size="small" type="primary"
+ @click="dialogPush = true">鏂� 澧�
+ </el-button>
+ <el-button icon="el-icon-check" size="small" type="primary" @click="handleSave">淇� 瀛�
+ </el-button>
+ <el-button icon="el-icon-connection" size="small" type="primary"
+ @click="handleSync('all')">鍚屾涓绘ā鍨�
+ </el-button>
+ <el-button icon="el-icon-connection" size="small" type="primary"
+ @click="handleSync('one')">鍚屾璇︾粏妯″瀷
+ </el-button>
+ </template>
+ </avue-crud>
+ </el-card>
+ <el-card :style="{ marginTop: '20px'}">
+ <avue-crud ref="crudRange" :data="rangeData" :option="optinoRange" :style="{ marginTop: '-20px'}"
+ @row-update="handleUpdate"
+ @row-dblclick="handleRowClick">
+ </avue-crud>
+ </el-card>
+ </el-card>
+ </el-main>
+ </el-container>
+ <integration-transfer :data="transferData" :disabledData="filtermapping" :props="transferProps"
+ :visible.sync="dialogPush" @save="handelTransferSave"></integration-transfer>
+ </div>
</template>
<script>
import integrationTransfer from './integrationTransfer.vue'
import pinyin from 'js-pinyin'
-import { referCodeClassifyTree, referTree, gridAttrMapping, gridAttrRanges, batchAddSave, listCodeAttributeByClassId, syncClassifyModel } from '@/api/integration/integration.js'
+import {
+ referCodeClassifyTree,
+ referTree,
+ gridAttrMapping,
+ gridAttrRanges,
+ batchAddSave,
+ listCodeAttributeByClassId,
+ syncClassifyModel
+} from '@/api/integration/integration.js'
+
export default {
- components: {
- integrationTransfer
- },
- name: 'Integration',
- data() {
- const options = {
- menu: false,
- delBtn: false,
- addBtn: false,
- index: true,
- columnBtn: false,
- searchShow: true,
- emptyBtn: false,
- searchBtn: false,
- searchShowBtn: false,
- cellBtn: true,
- border: true,
- searchMenuSpan: 8,
- highlightCurrentRow: true,
- }
- return {
- // 琛ㄥ崟鍊�
- form: {
- // 闆嗗洟鏍戞樉绀哄��
- groupValue: ''
- },
- // 妫�娴嬫柊澧炴寜閽姸鎬�
- disabledPush: true,
- // 琛ㄦ牸鍔犺浇涓�
- loading: false,
- // 绌挎妗嗘暟鎹�
- transferData: [],
- // dialog寮圭獥寮�鍏�
- dialogPush: false,
- // 灞炴�ф槧灏勮〃鏁版嵁
- mappingData: [],
- // 灞炴�ф槧灏勫彇鍊艰〃鏁版嵁
- rangeData: [],
- // 涓绘暟鎹爲鎼滅储杩囨护
- filterText: '',
- // 灞炴�ф槧灏勫彇鍊艰〃閰嶇疆
- optinoRange: {
- title: '灞炴�ф槧灏勫彇鍊艰寖鍥�',
- maxHeight: '300px',
- header: false,
- rowKey: 'oid',
- column: [
- { label: '灞炴�ч泦鍥㈡灇涓惧��', prop: 'numTextValue', minWidth: 80 },
- { label: '闆嗗洟灞炴�ф灇涓炬樉绀哄悕绉�', prop: 'numText', minWidth: 80 },
- { label: 'MDM鏋氫妇鍊�', prop: 'targetNumTextValue', minWidth: 80, cell: true, blur: (value) => window.handleBlur(value, 'range') },
- { label: 'MDM鏋氫妇鏄剧ず鍚嶇О', prop: 'targetNumText', minWidth: 80, cell: true, blur: (value) => window.handleBlur(value, 'range') },
- ],
- ...options
- },
- // 灞炴�ф槧灏勮〃閰嶇疆
- optionMapping: {
- maxHeight: '500px',
- header: true,
- rowKey: 'oid',
- selection: false,
- column: [
- { label: '闆嗗洟鍒嗙被', prop: 'sourceClassifyName', minWidth: 80 },
- { label: '鎵�灞炶鍥�', prop: 'viewName', minWidth: 80 },
- { label: '闆嗗洟灞炴��', prop: 'sourceAttrName', minWidth: 80 },
- { label: '鍒嗙被鍚嶇О', prop: 'targetClassifyName', minWidth: 80 },
- {
- label: '灞炴�у悕绉�',
- prop: 'targetAttrName',
- minWidth: 80,
- },
- {
- label: '榛樿鍊�',
- prop: 'defaultValue',
- minWidth: 140,
- cell: true,
- blur: (value) => window.handleBlur(value, 'mapping')
- },
- ],
- ...options
- },
- // 涓绘暟鎹垎绫绘爲
- treeData: [],
- // 闆嗗洟鍒嗙被鏍�
- groupTreeData: [],
- // 鏍憄opos鏇挎崲鍊�
- defaultProps: {
- children: 'children',
- label: 'name',
- id: 'oid',
- isLeaf: ''
- },
- transferProps: {
- key: 'oid',
- label: 'name'
-
- },
- // 闆嗗洟鍒嗙被鏍戝��
- groupVal: '',
- // 宸︿晶鏍戦�夋嫨鐨刬d鍊�
- treeParam: {},
- // 琛ㄦ牸閫夋嫨鐨勮
- rangeForm: {},
- mappingForm: {},
- // 瀹氭椂鍣�
- times: null,
-
- }
- },
- watch: {
- filterText(val) {
- this.$refs.tree.filter(val);
- }
- },
- created() {
- this.getReferCodeClassifyTree()
- pinyin.setOptions({ checkPolyphone: false, charCase: 1 });
- },
- mounted() {
- let that = this
- window.handleBlur = that.handleBlur
-
- },
- computed: {
- filtermapping() {
- const data = this.mappingData.filter(item => {
- return !(Object.prototype.hasOwnProperty.call(item, 'targetAttrName') && (item.targetAttrName === null || item.targetAttrName === undefined || item.targetAttrName === ""))
- })
- const transfer = data.map(obj => {
- return obj.targetAttrName
- })
- return transfer
- }
- },
- methods: {
- // 鎺ュ彛宸︿晶鏍�
- async getReferCodeClassifyTree() {
- this.treeData = []
- const param = {
- parentBtmName: "jclass",
- valueField: "oid",
- textField: "name",
- parentFieldName: "id"
- }
- const response = await referCodeClassifyTree(param)
- if (response.status === 200) {
- let data = response.data;
- this.treeData = data.map(item => item.children ? { ...item, ...{ isLeaf: false } } : { ...item, ...{ isLeaf: true } })
- }
- },
- // 鎺ュ彛鑾峰彇灞炴�ф槧灏�
- async getGridAttrMapping(oid) {
- this.mappingData = []
- this.loading = true
- const response = await gridAttrMapping({ sourceClassifyId: oid, ...this.treeParam })
- if (response.status === 200) {
- this.loading = false
- this.mappingData = response.data.data
- // console.log(this.filtermapping)
- }
- },
- // 鎺ュ彛鑾峰彇灞炴�ф槧灏勫彇鍊艰寖鍥�
- async getGridAttrRanges(oid) {
- this.rangeData = []
- const response = await gridAttrRanges({ meatId: oid })
- if (response.status === 200) {
- // console.log(response.data)
- this.rangeData = response.data.data
- }
- },
- // 鎺ュ彛鑾峰彇涓绘暟鎹垎绫诲睘鎬т俊鎭�
- async getListCodeByClassId(oid) {
- this.transferData = []
- pinyin.setOptions({ checkPolyphone: false, charCase: 1 });
- const response = await listCodeAttributeByClassId({ codeClassifyId: oid })
- if (response.status === 200) {
- const data = response.data.data
- this.transferData = data
- }
- },
- // 鎺ュ彛鑾峰彇闆嗗洟鍒嗙被鏍�
- async referTree(oid, checked) {
- this.groupTreeData = []
- const response = await referTree({ 'conditionMap[codeclsfid]': oid, parentOid: null })
- if (response.status === 200) {
- if (checked) {
- let items = response.data.map(item => {
- let obj = {}
- if (item.checked) obj = { ...item }
- else obj = null
- return obj
- })
- var r = items.filter(s => { return s && s.trim() });
- this.groupTreeData = r
- } else {
- this.groupTreeData = response.data
- }
- }
- },
- // 宸︿晶鏍戣繃婊ゆ悳绱�
- filterNode(value, data) {
- if (!value) return true;
- return data.name.indexOf(value) !== -1;
- },
- // 淇濆瓨鎸夐挳
- async handleSave() {
- const response = await batchAddSave({ dockingPreAttrMappingVOList: this.mappingData })
- if (response.status === 200) {
- this.$message({
- type: "success",
- message: "淇濆瓨鎴愬姛!"
- });
- }
- },
- // 鍚屾鏁版嵁
- async handleSync(type = 'all') {
- let param = { operationType: type }
- if (type === 'one') {
- param.classifyId = this.form.groupValue
- }
- if (this.form.groupValue === '' && type === 'one') {
- this.$message({
- type: "error",
- message: "璇烽�夋嫨涓�鏉￠泦鍥㈠垎绫�"
- });
- } else {
- const response = await syncClassifyModel(param)
- if (response.status === 200) {
- console.log(response)
- }
- }
- },
- handelTransferSave(event) {
- let that = this
- const transferValue = event.value
- if (Object.keys(that.mappingForm).length == 0) {
- this.$message({
- type: "error",
- message: "璇烽�夋嫨涓�鏉℃暟鎹�!"
- });
- } else {
- const findRow = that.mappingData.findIndex(item => item.metaListId === that.mappingForm.metaListId)
- that.mappingData[findRow].targetAttrName = transferValue[0].name
- that.mappingData[findRow].targetAttrId = transferValue[0].oid
- this.dialogPush = false
- }
-
- },
- // 宸︿晶鏍戠偣鍑�
- handelTreeCell(event) {
- if (event.leaf) {
- this.treeParam.codeClassifyId = event.oid
- this.form.groupValue = ''
- this.groupVal = ''
- this.tableData = []
- this.referTree(event.oid, event.checked)
- this.getListCodeByClassId(event.oid)
- }
- },
- // 闆嗗洟鍒嗙被鏍戠偣鍑�
- handleNodeClick(data) {
- this.form.groupValue = data.oid
- this.groupVal = data.name
- this.$refs.selectTree.blur()
- this.getGridAttrMapping(data.oid)
- },
- // 闆嗗洟鍒嗙被澶卞幓鐒︾偣
- inputBlur() {
- this.tableColumnIndex = ''
- this.tableRowIndex = null
- },
- // 澶卞幓鐒︾偣
- handleBlur(value, event) {
- if (event === 'range') this.$refs.crudRange.rowCell(this.rangeForm, this.rangeForm.$index)
- if (event === 'mapping') this.$refs.crudMapping.rowCell(this.mappingForm, this.mappingForm.$index)
- },
- // 闆嗗洟鏄犲皠灞炴�ц閫夋嫨鍗曞厓鏍肩紪杈戯紙鍙屽嚮锛�
- handleMapingRowClick(row, column) {
- clearTimeout(this.times)
- this.mappingForm = row
- if (column.label === '榛樿鍊�' || column.label === '灞炴�у悕绉�') this.$refs.crudMapping.rowCell(row, row.$index)
- },
- // 闆嗗洟鏄犲皠灞炴�ц閫夋嫨锛堝崟鍑伙級
- handleMapingClick(row) {
- clearTimeout(this.times)
- this.mappingForm = row
- this.times = setTimeout(() => {
- this.$refs.crudMapping.toggleSelection([row]);
- }, 300)
- },
- // 灞炴�у彇鍊艰寖鍥村崟鍏冩牸缂栬緫锛堝弻鍑伙級
- handleRowClick(row) {
- this.rangeForm = row
- this.$refs.crudRange.rowCell(row, row.$index)
- },
- // 灞炴�у彇鍊艰寖鍥村崟鍏冩牸缂栬緫鍚�
- handleUpdate(row, index, done) {
- const findRow = this.mappingData.findIndex(item => item.metaListId === row.metaListId)
- this.rangeData[index] = row
- this.mappingData[findRow].dockingPreAttrRangeVoList = (this.rangeData)
- this.$message({
- showClose: true,
- message: "淇敼鎴愬姛",
- type: "success",
- });
- done();
- },
- // 灞炴�у彇鍊艰寖鍥村崟鍏冩牸缂栬緫鍚�
- handleMapingUpdate(row, index, done) {
- this.$message({
- showClose: true,
- message: "淇敼鎴愬姛",
- type: "success",
- });
- done();
- },
- // 闆嗗洟鏄犲皠灞炴�ч�夋嫨锛堝崟閫夛級
- selectionChange(selection) {
- if (selection.length > 1) {
- const nowVal = selection.shift();
- this.$refs.crudMapping.toggleRowSelection(nowVal, false);
- } else if (selection.length === 1) {
- // 瀵瑰崟閫夋暟鎹殑鎿嶄綔鍐欏湪杩欓噷
- this.disabledPush = false
- this.getGridAttrRanges(this.mappingForm.metaListId)
- }
- },
- setCurrentRow(selection, row) {
- this.mappingForm = row
- this.disabledPush = false
- },
- handleSelectAll(selection) {
- this.$refs.crudMapping.toggleSelection()
- }
+ components: {
+ integrationTransfer
+ },
+ name: 'Integration',
+ data() {
+ const options = {
+ menu: false,
+ delBtn: false,
+ addBtn: false,
+ index: true,
+ columnBtn: false,
+ searchShow: true,
+ emptyBtn: false,
+ searchBtn: false,
+ searchShowBtn: false,
+ cellBtn: true,
+ border: true,
+ searchMenuSpan: 8,
+ highlightCurrentRow: true,
}
+ return {
+ // 琛ㄥ崟鍊�
+ form: {
+ // 闆嗗洟鏍戞樉绀哄��
+ groupValue: ''
+ },
+ // 妫�娴嬫柊澧炴寜閽姸鎬�
+ disabledPush: true,
+ // 琛ㄦ牸鍔犺浇涓�
+ loading: false,
+ // 绌挎妗嗘暟鎹�
+ transferData: [],
+ // dialog寮圭獥寮�鍏�
+ dialogPush: false,
+ // 灞炴�ф槧灏勮〃鏁版嵁
+ mappingData: [],
+ // 灞炴�ф槧灏勫彇鍊艰〃鏁版嵁
+ rangeData: [],
+ // 涓绘暟鎹爲鎼滅储杩囨护
+ filterText: '',
+ // 灞炴�ф槧灏勫彇鍊艰〃閰嶇疆
+ optinoRange: {
+ title: '灞炴�ф槧灏勫彇鍊艰寖鍥�',
+ maxHeight: '300px',
+ header: false,
+ rowKey: 'oid',
+ column: [
+ {label: '灞炴�ч泦鍥㈡灇涓惧��', prop: 'numTextValue', minWidth: 80},
+ {label: '闆嗗洟灞炴�ф灇涓炬樉绀哄悕绉�', prop: 'numText', minWidth: 80},
+ {
+ label: 'MDM鏋氫妇鍊�',
+ prop: 'targetNumTextValue',
+ minWidth: 80,
+ cell: true,
+ blur: (value) => window.handleBlur(value, 'range')
+ },
+ {
+ label: 'MDM鏋氫妇鏄剧ず鍚嶇О',
+ prop: 'targetNumText',
+ minWidth: 80,
+ cell: true,
+ blur: (value) => window.handleBlur(value, 'range')
+ },
+ ],
+ ...options
+ },
+ // 灞炴�ф槧灏勮〃閰嶇疆
+ optionMapping: {
+ maxHeight: '500px',
+ header: true,
+ rowKey: 'oid',
+ selection: false,
+ column: [
+ {label: '闆嗗洟鍒嗙被', prop: 'sourceClassifyName', minWidth: 80},
+ {label: '鎵�灞炶鍥�', prop: 'viewName', minWidth: 80},
+ {label: '闆嗗洟灞炴��', prop: 'sourceAttrName', minWidth: 80},
+ {label: '鍒嗙被鍚嶇О', prop: 'targetClassifyName', minWidth: 80},
+ {
+ label: '灞炴�у悕绉�',
+ prop: 'targetAttrName',
+ minWidth: 80,
+ },
+ {
+ label: '榛樿鍊�',
+ prop: 'defaultValue',
+ minWidth: 140,
+ cell: true,
+ blur: (value) => window.handleBlur(value, 'mapping')
+ },
+ ],
+ ...options
+ },
+ // 涓绘暟鎹垎绫绘爲
+ treeData: [],
+ // 闆嗗洟鍒嗙被鏍�
+ groupTreeData: [],
+ // 鏍憄opos鏇挎崲鍊�
+ defaultProps: {
+ children: 'children',
+ label: 'name',
+ id: 'oid',
+ isLeaf: ''
+ },
+ transferProps: {
+ key: 'oid',
+ label: 'name'
+
+ },
+ // 闆嗗洟鍒嗙被鏍戝��
+ groupVal: '',
+ // 宸︿晶鏍戦�夋嫨鐨刬d鍊�
+ treeParam: {},
+ // 琛ㄦ牸閫夋嫨鐨勮
+ rangeForm: {},
+ mappingForm: {},
+ // 瀹氭椂鍣�
+ times: null,
+
+ }
+ },
+ watch: {
+ filterText(val) {
+ this.$refs.tree.filter(val);
+ }
+ },
+ created() {
+ this.getReferCodeClassifyTree()
+ pinyin.setOptions({checkPolyphone: false, charCase: 1});
+ },
+ mounted() {
+ let that = this
+ window.handleBlur = that.handleBlur
+
+ },
+ computed: {
+ filtermapping() {
+ const data = this.mappingData.filter(item => {
+ return !(Object.prototype.hasOwnProperty.call(item, 'targetAttrName') && (item.targetAttrName === null || item.targetAttrName === undefined || item.targetAttrName === ""))
+ })
+ const transfer = data.map(obj => {
+ return obj.targetAttrName
+ })
+ return transfer
+ }
+ },
+ methods: {
+ // 鎺ュ彛宸︿晶鏍�
+ async getReferCodeClassifyTree() {
+ this.treeData = []
+ const param = {
+ parentBtmName: "jclass",
+ valueField: "oid",
+ textField: "name",
+ parentFieldName: "id"
+ }
+ const response = await referCodeClassifyTree(param)
+ if (response.status === 200) {
+ let data = response.data;
+ this.treeData = data.map(item => item.children ? {...item, ...{isLeaf: false}} : {...item, ...{isLeaf: true}})
+ }
+ },
+ // 鎺ュ彛鑾峰彇灞炴�ф槧灏�
+ async getGridAttrMapping(oid) {
+ this.mappingData = []
+ this.loading = true
+ const response = await gridAttrMapping({sourceClassifyId: oid, ...this.treeParam})
+ if (response.status === 200) {
+ this.loading = false
+ this.mappingData = response.data.data
+ // console.log(this.filtermapping)
+ }
+ },
+ // 鎺ュ彛鑾峰彇灞炴�ф槧灏勫彇鍊艰寖鍥�
+ async getGridAttrRanges(oid) {
+ this.rangeData = []
+ const response = await gridAttrRanges({meatId: oid})
+ if (response.status === 200) {
+ // console.log(response.data)
+ this.rangeData = response.data.data
+ }
+ },
+ // 鎺ュ彛鑾峰彇涓绘暟鎹垎绫诲睘鎬т俊鎭�
+ async getListCodeByClassId(oid) {
+ this.transferData = []
+ pinyin.setOptions({checkPolyphone: false, charCase: 1});
+ const response = await listCodeAttributeByClassId({codeClassifyId: oid})
+ if (response.status === 200) {
+ const data = response.data.data
+ this.transferData = data
+ }
+ },
+ // 鎺ュ彛鑾峰彇闆嗗洟鍒嗙被鏍�
+ async referTree(oid, checked) {
+ this.groupTreeData = []
+ const response = await referTree({'conditionMap[codeclsfid]': oid, parentOid: null})
+ if (response.status === 200) {
+ if (checked) {
+ let items = response.data.map(item => {
+ let obj = {}
+ if (item.checked) obj = {...item}
+ else obj = null
+ return obj
+ })
+ var r = items.filter(s => {
+ return s && s.trim()
+ });
+ this.groupTreeData = r
+ } else {
+ this.groupTreeData = response.data
+ }
+ }
+ },
+ // 宸︿晶鏍戣繃婊ゆ悳绱�
+ filterNode(value, data) {
+ if (!value) return true;
+ return data.name.indexOf(value) !== -1;
+ },
+ // 淇濆瓨鎸夐挳
+ async handleSave() {
+ const response = await batchAddSave({dockingPreAttrMappingVOList: this.mappingData})
+ if (response.status === 200) {
+ this.$message({
+ type: "success",
+ message: "淇濆瓨鎴愬姛!"
+ });
+ }
+ },
+ // 鍚屾鏁版嵁
+ async handleSync(type = 'all') {
+ let param = {operationType: type}
+ if (type === 'one') {
+ param.classifyId = this.form.groupValue
+ }
+ if (this.form.groupValue === '' && type === 'one') {
+ this.$message({
+ type: "error",
+ message: "璇烽�夋嫨涓�鏉￠泦鍥㈠垎绫�"
+ });
+ } else {
+ const response = await syncClassifyModel(param)
+ if (response.status === 200) {
+ console.log(response)
+ }
+ }
+ },
+ handelTransferSave(event) {
+ let that = this
+ const transferValue = event.value
+ if (Object.keys(that.mappingForm).length == 0) {
+ this.$message({
+ type: "error",
+ message: "璇烽�夋嫨涓�鏉℃暟鎹�!"
+ });
+ } else {
+ const findRow = that.mappingData.findIndex(item => item.metaListId === that.mappingForm.metaListId)
+ that.mappingData[findRow].targetAttrName = transferValue[0].name
+ that.mappingData[findRow].targetAttrId = transferValue[0].oid
+ this.dialogPush = false
+ }
+
+ },
+ // 宸︿晶鏍戠偣鍑�
+ handelTreeCell(event) {
+ if (event.leaf) {
+ this.treeParam.codeClassifyId = event.oid
+ this.form.groupValue = ''
+ this.groupVal = ''
+ this.tableData = []
+ this.referTree(event.oid, event.checked)
+ this.getListCodeByClassId(event.oid)
+ }
+ },
+ // 闆嗗洟鍒嗙被鏍戠偣鍑�
+ handleNodeClick(data) {
+ this.form.groupValue = data.oid
+ this.groupVal = data.name
+ this.$refs.selectTree.blur()
+ this.getGridAttrMapping(data.oid)
+ },
+ // 闆嗗洟鍒嗙被澶卞幓鐒︾偣
+ inputBlur() {
+ this.tableColumnIndex = ''
+ this.tableRowIndex = null
+ },
+ // 澶卞幓鐒︾偣
+ handleBlur(value, event) {
+ if (event === 'range') this.$refs.crudRange.rowCell(this.rangeForm, this.rangeForm.$index)
+ if (event === 'mapping') this.$refs.crudMapping.rowCell(this.mappingForm, this.mappingForm.$index)
+ },
+ // 闆嗗洟鏄犲皠灞炴�ц閫夋嫨鍗曞厓鏍肩紪杈戯紙鍙屽嚮锛�
+ handleMapingRowClick(row, column) {
+ clearTimeout(this.times)
+ this.mappingForm = row
+ if (column.label === '榛樿鍊�' || column.label === '灞炴�у悕绉�') this.$refs.crudMapping.rowCell(row, row.$index)
+ },
+ // 闆嗗洟鏄犲皠灞炴�ц閫夋嫨锛堝崟鍑伙級
+ handleMapingClick(row) {
+ clearTimeout(this.times)
+ this.mappingForm = row
+ this.times = setTimeout(() => {
+ this.$refs.crudMapping.toggleSelection([row]);
+ }, 300)
+ },
+ // 灞炴�у彇鍊艰寖鍥村崟鍏冩牸缂栬緫锛堝弻鍑伙級
+ handleRowClick(row) {
+ this.rangeForm = row
+ this.$refs.crudRange.rowCell(row, row.$index)
+ },
+ // 灞炴�у彇鍊艰寖鍥村崟鍏冩牸缂栬緫鍚�
+ handleUpdate(row, index, done) {
+ const findRow = this.mappingData.findIndex(item => item.metaListId === row.metaListId)
+ this.rangeData[index] = row
+ this.mappingData[findRow].dockingPreAttrRangeVoList = (this.rangeData)
+ this.$message({
+ showClose: true,
+ message: "淇敼鎴愬姛",
+ type: "success",
+ });
+ done();
+ },
+ // 灞炴�у彇鍊艰寖鍥村崟鍏冩牸缂栬緫鍚�
+ handleMapingUpdate(row, index, done) {
+ this.$message({
+ showClose: true,
+ message: "淇敼鎴愬姛",
+ type: "success",
+ });
+ done();
+ },
+ // 闆嗗洟鏄犲皠灞炴�ч�夋嫨锛堝崟閫夛級
+ selectionChange(selection) {
+ if (selection.length > 1) {
+ const nowVal = selection.shift();
+ this.$refs.crudMapping.toggleRowSelection(nowVal, false);
+ } else if (selection.length === 1) {
+ // 瀵瑰崟閫夋暟鎹殑鎿嶄綔鍐欏湪杩欓噷
+ this.disabledPush = false
+ this.getGridAttrRanges(this.mappingForm.metaListId)
+ }
+ },
+ setCurrentRow(selection, row) {
+ this.mappingForm = row
+ this.disabledPush = false
+ },
+ handleSelectAll(selection) {
+ this.$refs.crudMapping.toggleSelection()
+ }
+ }
}
</script>
<style lang="scss" scoped>
.setstyle {
- min-height: 200px;
- padding: 0 !important;
- margin: 0;
- overflow: auto;
- cursor: default !important;
+ min-height: 200px;
+ padding: 0 !important;
+ margin: 0;
+ overflow: auto;
+ cursor: default !important;
}
::v-deep(.el-transfer-panel__list) {
- width: 100%;
- height: 370px;
+ width: 100%;
+ height: 370px;
}
::v-deep(.el-transfer-panel__body) {
- height: 370px;
+ height: 370px;
}
::v-deep(.el-input) {
- width: auto;
+ width: auto;
}
::v-deep(.el-transfer-panel) {
- width: 270px;
+ width: 270px;
}
</style>
diff --git a/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue b/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue
index f8aee43..a36e69b 100644
--- a/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue
+++ b/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue
@@ -159,7 +159,7 @@
}
this.loading = true;
listLogOperate(
- page.currentPage,
+ page.currentPage,
page.pageSize,
conditionMaps
).then(res => {
diff --git a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
index 0a62428..da3bcf1 100644
--- a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
+++ b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
@@ -2,14 +2,14 @@
<!-- 鏂板鍙充晶鎸夐挳-->
<div>
<div style=" display: flex; justify-content: flex-end;">
- <el-button plain type="primary" @click="addHandler">鏂板</el-button>
+ <el-button plain type="primary" @click="addHandler">閰嶇疆</el-button>
</div>
<!-- 鏂板瀵硅瘽妗�-->
<el-dialog
:visible.sync="addVisible"
append-to-body
class="avue-dialog avue-dialog--top"
- title="鏂板鏁版嵁缁熻鍒嗘瀽"
+ title="閰嶇疆鏁版嵁缁熻鍒嗘瀽"
top="-50px"
>
<el-table
@@ -149,6 +149,7 @@
if (dataKey) {
this[dataKey].push(item);
this[dataKey].forEach(res=>{
+ console.log('this[dataKey]',this[dataKey])
console.log('res',res)
})
hasValidData = true;
--
Gitblit v1.9.3