From 16913ea709f434cfebe71fd0c66b0a6931398f3e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 13 十二月 2023 08:56:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 11 ++
Source/UBCS-WEB/src/views/flow/manager.vue | 22 +++--
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 22 +++++
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 34 +++-----
Source/UBCS-WEB/src/components/StatisticsComponent/lineChart.vue | 19 ++--
Source/UBCS-WEB/src/components/file/main.vue | 2
Source/UBCS-WEB/src/views/MasterData/items.vue | 2
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 4
Source/UBCS-WEB/src/components/StatisticsComponent/pieChart.vue | 100 +++++++++++-------------
9 files changed, 114 insertions(+), 102 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 1cb14bf..9f9a378 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -3,7 +3,9 @@
<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 id="labelSize" v-html="node.label" ></span>
+ <el-tooltip class="item" effect="dark" open-delay="350" :content="$createElement('div', { domProps: { innerHTML: node.label } })" placement="right-start">
+ <span id="labelSize" v-html="node.label" ></span>
+ </el-tooltip>
</template>
</avue-tree>
<div style="position: absolute; right: 3px; top: -1px;">
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 01e02df..76fc6c0 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -77,17 +77,6 @@
:width="item.width"
align="center">
</el-table-column>
- <!-- 鍙傜収鏁版嵁-->
-<!-- <el-table-column v-for="(item,index) in referArray"-->
-<!-- v-if="item.referConfig && Object.keys(item.referConfig).length > 0 && !item.hidden"-->
-<!-- :key="index"-->
-<!-- :label="item.title" :show-overflow-tooltip="true"-->
-<!-- :sortable="item.sortable" :width="item.width" align="center"-->
-<!-- :prop="item.prop">-->
-<!-- <template slot-scope="scope">-->
-<!-- <span>{{ scope.row[item.showField] }}</span>-->
-<!-- </template>-->
-<!-- </el-table-column>-->
</el-table>
</div>
</el-row>
@@ -356,15 +345,7 @@
},
// 涓绘暟鎹寜閽�
masterVrBtnList: [],
- fileOptions: {
- ownbizOid: "0",
- ownbizBtm: "0",
- fileDocClassify: '!=processAuditSuggest',
- fileDocClassifyName: '',
- hasDownload: true,
- hasUpload: true,
- height: 110
- },
+ fileOptions:{},
result: '',
elapsedTime: '',
};
@@ -416,6 +397,15 @@
this.tableData = newval;
this.searchResults = newval
this.doLayout();
+ this.fileOptions= {
+ ownbizOid: "0",
+ ownbizBtm: "0",
+ fileDocClassify: '!=processAuditSuggest',
+ fileDocClassifyName: '',
+ hasDownload: true,
+ hasUpload: true,
+ height: 'auto'
+ }
},
},
tableHeadFindData: {
@@ -1101,7 +1091,7 @@
<style lang="scss" scoped>
//鍥哄畾鍒楅珮搴�
/deep/ .el-table__fixed {
- height: calc(100vh - 370px) !important;
+ height: calc(100vh - 365px) !important;
}
// 婊氬姩鏉℃牱寮忎慨鏀�
@@ -1139,7 +1129,7 @@
.top {
overflow-y: scroll;
- min-height: 55%;
+ min-height: 40%;
}
.bottom {
diff --git a/Source/UBCS-WEB/src/components/StatisticsComponent/lineChart.vue b/Source/UBCS-WEB/src/components/StatisticsComponent/lineChart.vue
index 7c180bc..f37802e 100644
--- a/Source/UBCS-WEB/src/components/StatisticsComponent/lineChart.vue
+++ b/Source/UBCS-WEB/src/components/StatisticsComponent/lineChart.vue
@@ -31,15 +31,14 @@
handler(newval, oldval) {
if (newval) {
const series = newval.map((data, index) => ({
- name: index === 0 ? "鎬婚噺" : "鏂板",
- type: "line",
+ name: index === 0 ? '鎬婚噺' : '鏂板',
+ type: 'line',
smooth: true,
- stack: "Total",
+ stack: index === 0 ? 'Total' : 'total2', // 鏍规嵁 index 鍖哄垎鎬婚噺鍜屾柊澧炵殑鍫嗗彔鎯呭喌
label: {
show: true,
- position: "top",
textStyle: {
- fontSize: 14 // 璋冩暣瀛椾綋澶у皬
+ fontSize: 14
}
},
data: data.map(value => ({value}))
@@ -49,14 +48,14 @@
}
}
},
- chartName:{
- handler(newval,oldval){
- if(newval){
+ chartName: {
+ handler(newval, oldval) {
+ if (newval) {
this.chartOptions.title.text = newval + "鏁版嵁缁熻"
}
},
- immediate:true,
- deep:true
+ immediate: true,
+ deep: true
}
},
data() {
diff --git a/Source/UBCS-WEB/src/components/StatisticsComponent/pieChart.vue b/Source/UBCS-WEB/src/components/StatisticsComponent/pieChart.vue
index 9efd832..d81c227 100644
--- a/Source/UBCS-WEB/src/components/StatisticsComponent/pieChart.vue
+++ b/Source/UBCS-WEB/src/components/StatisticsComponent/pieChart.vue
@@ -6,11 +6,11 @@
<script>
import 'echarts'
-import 'echarts/lib/chart/pie'
+import 'echarts/lib/chart/bar' // 瀵煎叆鏌辩姸鍥剧粍浠�
import 'echarts/lib/component/tooltip'
import 'echarts/lib/component/legend'
export default {
- name: "pieChart",
+ name: "polarBarChart",
props:{
pieData:{
type:Array,
@@ -19,97 +19,89 @@
chartName:{
type:String,
default: ""
+ },
+ monthData:{
+ type:Array,
+ default: () => ['涓�鏈�', '浜屾湀', '涓夋湀', '鍥涙湀', '浜旀湀', '鍏湀', '涓冩湀', '鍏湀', '涔濇湀', '鍗佹湀', '鍗佷竴鏈�', '鍗佷簩鏈�']
}
},
watch:{
pieData:{
immediate:true,
- handler(newval,oldval){
+ handler(newval, oldval){
if (newval) {
- // console.log(newval)
- const series=[
+ const series = [
{
- name: '',
- type: 'pie',
- radius: ['40%', '70%'],
- avoidLabelOverlap:false,
- label: {
- formatter: '{b}\n{d}%',
- fontSize:14
+ type: 'bar',
+ name: '鏂板',
+ data: newval[1],
+ coordinateSystem: 'polar',
+ stack: 'a',
+ emphasis: {
+ focus: 'series'
},
itemStyle: {
- color: function(params) {
- // 鏍规嵁鍏蜂綋闇�姹傝缃鑹�
- const colorList = ['#5470C6', '#91CC75', '#fac858', '#EE6666', '#3BA272', '#FC8452', '#9A60B4', '#e34d4d', '#b3e9b9', '#eaaaed', '#1bc6e4', '#c6b3e9'];
- return colorList[params.dataIndex % colorList.length];
- }
+ color: '#91cc75' // 鏂板鐨勯鑹�
+ }
+ },
+ {
+ type: 'bar',
+ name: '鎬婚噺',
+ data: newval[0],
+ coordinateSystem: 'polar',
+ stack: 'a',
+ emphasis: {
+ focus: 'series'
},
- data:newval[0].map((value, index) => {
- return {
- value: value,
- name: this.getMonthName(index),
- newValue: newval[1][index]
- };
- }),
+ itemStyle: {
+ color: '#5470c6' // 鎬婚噺鐨勯鑹�
+ }
}
- ]
+ ];
this.chartOptions.series = series;
}
}
},
chartName:{
- handler(newval,oldval){
+ handler(newval, oldval){
if(newval){
this.chartOptions.title.text = newval + "鏁版嵁缁熻"
}
},
- immediate:true,
- deep:true
+ immediate:true
}
},
data() {
return {
chartOptions: {
title: {
- text: '渚涘簲鍟嗕富鏁版嵁缁熻',
- left: 'center'
- },
- tooltip: {
- trigger: 'item',
- formatter: function (params) {
- let result = '';
- if (params.componentType === 'series') {
- result += params.name + '<br/>';
- result += '鏂板锛�' + params.data.newValue + '<br/>';
- result += '鎬婚噺锛�' + params.data.value + '<br/>';
- result += '鐧惧垎姣旓細' + params.percent + '%';
- }
- return result;
- }
+ text: '',
},
legend: {
- orient: 'vertical',
- right: 10,
- top: 'middle',
+ data: ['鎬婚噺', '鏂板'],
+ },
+ polar: {},
+ angleAxis: {
+ type: 'category',
data: ['涓�鏈�', '浜屾湀', '涓夋湀', '鍥涙湀', '浜旀湀', '鍏湀', '涓冩湀', '鍏湀', '涔濇湀', '鍗佹湀', '鍗佷竴鏈�', '鍗佷簩鏈�']
},
+ radiusAxis: {},
+ tooltip: {
+ trigger: 'axis'
+ },
series: []
- },
+ }
}
},
- methods:{
- getMonthName(index){
- const monthNames = ['涓�鏈�', '浜屾湀', '涓夋湀', '鍥涙湀', '浜旀湀', '鍏湀', '涓冩湀', '鍏湀', '涔濇湀', '鍗佹湀', '鍗佷竴鏈�', '鍗佷簩鏈�'];
- return monthNames[index];
- }
+ created(){
+ this.chartOptions.color = ['#5470c6', '#91cc75', '#fac858', '#ca8622', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4'];
}
}
</script>
<style scoped lang="scss">
#chart {
- width: 90%;
+ width: 97%;
height: 530px;
}
-
</style>
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index e576ea9..eb130ce 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -2069,16 +2069,23 @@
const regex = new RegExp(this.rulesData.ruleRowBds);
if (regex.test(this.RulesForm.TestContent)) {
this.$message.success('鏍￠獙鎴愬姛')
+ }else {
+ this.$message.error('鏍￠獙澶辫触')
}
},
//鐐瑰嚮鍒嗙被娉ㄥ叆鎸夐挳
injectBtn() {
if (this.attrSelectList.length > 1) {
this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉挎暟鎹�')
- } else if (this.attrSelectList.length < 1) {
+ return;
+ }
+ if (this.attrSelectList.length < 1) {
this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉挎暟鎹�')
- } else if (this.attrSelectList.length === 1) {
+ return;;
+ }
+ if (this.attrSelectList.length === 1) {
this.injectVisible = true;
+ return;
}
},
//鍒嗙被娉ㄥ叆淇濆瓨
diff --git a/Source/UBCS-WEB/src/components/file/main.vue b/Source/UBCS-WEB/src/components/file/main.vue
index 8444c92..fd673bf 100644
--- a/Source/UBCS-WEB/src/components/file/main.vue
+++ b/Source/UBCS-WEB/src/components/file/main.vue
@@ -88,7 +88,7 @@
hasDel:validatenull(this.options.hasDel) ? true :this.options.hasDel,
hasDownload:validatenull(this.options.hasDownload) ? true :this.options.hasDownload,
option: {
- height:(this.options.tableHeight?this.options.tableHeight:'400'),
+ height:(this.options.tableHeight?this.options.tableHeight:'300'),
calcHeight: 30,
tip: false,
searchShow: false,
diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue
index f095049..2ee09cf 100644
--- a/Source/UBCS-WEB/src/views/MasterData/items.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -55,7 +55,7 @@
page: {
total: 0,
currentPage: 1,
- pageSize: 100,
+ pageSize: 10,
pageSizes: [10, 30, 50, 100, 200],
},
pageSize: "100",
diff --git a/Source/UBCS-WEB/src/views/flow/manager.vue b/Source/UBCS-WEB/src/views/flow/manager.vue
index de3a9e9..a8c6a30 100644
--- a/Source/UBCS-WEB/src/views/flow/manager.vue
+++ b/Source/UBCS-WEB/src/views/flow/manager.vue
@@ -25,8 +25,10 @@
<el-button type="text"
size="small"
icon="el-icon-refresh"
+ :style="{color: scope.row.suspensionState === 1 ? '#67C23A' : '#F56C6C'}"
v-if="permissionList.state"
- @click.stop="handleState(scope.row,scope.index)">鍙樻洿鐘舵��
+ @click.stop="handleDoState(scope.row, scope.index)">
+ {{ scope.row.suspensionState === 1 ? '婵�娲�' : '鎸傝捣' }}
</el-button>
<el-button type="text"
size="small"
@@ -292,15 +294,15 @@
this.stateBox = true;
this.selectionId = row.id;
},
- handleDoState() {
- if (!this.flowState) {
- this.$message({
- type: "warn",
- message: "璇峰厛閫夋嫨娴佺▼鐘舵��!"
- });
- return;
- }
- changeState({processId: this.selectionId, state: this.flowState}).then(res => {
+ handleDoState(row) {
+ // if (!this.flowState) {
+ // this.$message({
+ // type: "warn",
+ // message: "璇峰厛閫夋嫨娴佺▼鐘舵��!"
+ // });
+ // return;
+ // }
+ changeState({processId: row.id, state: (row.suspensionState === 1 ? 'suspend' : 'active')}).then(res => {
const data = res.data;
if (data.success) {
this.$message({
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index e187c23..3bb6a3e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -2959,7 +2959,17 @@
}
conditionMap.put("t.lastr", "1");
conditionMap.put("t.lastv", "1");
- return queryGrid(btmTypeId, templateVO, conditionMap, pageHelper);
+ DataGrid<Map<String, String>> mapDataGrid = queryGrid(btmTypeId, templateVO, conditionMap, pageHelper);
+ //澶勭悊杩斿洖鏁版嵁涓庢ā鏉挎暟鎹厤缃殑瀛楁涓嶄竴鏍烽棶棰�
+ templateVO.getAttributes().stream().forEach(e->{
+ for (Map<String, String> datum : mapDataGrid.getData()) {
+ if(datum.containsKey(e.getId().toLowerCase()) && !datum.containsKey(e.getId())){
+ datum.put(e.getId(),datum.get(e.getId().toLowerCase()));
+ datum.remove(e.getId().toLowerCase());
+ }
+ }
+ });
+ return mapDataGrid;
// List<String> selectFieldList = templateVO.getAttributes().stream().map(CodeClassifyTemplateAttrVO::getId).collect(Collectors.toList());
// //鍙傜収璁╁钩鍙扮洿鎺ユ煡璇㈠氨琛�
// List<String> finalSelectFieldList = selectFieldList;
@@ -3402,6 +3412,16 @@
dataList.add(cbo);
wrapperData(dataList, templateVO, sqlBO.getSelectFieldList(), true);
R<List<Map<String, String>>> result = R.data(Collections.singletonList(cbo));
+ //澶勭悊杩斿洖鏁版嵁涓庢ā鏉挎暟鎹厤缃殑瀛楁涓嶄竴鏍烽棶棰�
+ templateVO.getAttributes().stream().forEach(e->{
+ for (Map<String, String> datum : result.getData()) {
+ if(datum.containsKey(e.getId().toLowerCase()) && !datum.containsKey(e.getId())){
+ datum.put(e.getId(),datum.get(e.getId().toLowerCase()));
+ datum.remove(e.getId().toLowerCase());
+ }
+ }
+ });
+
//鎴戜滑瑕佺湅鏄惁涓嶆槸鍗囩増鐨勶紝鍗囩増鐨勮瘽锛岄渶瑕佸姣斾笉鐩哥瓑鐨勫睘鎬�
/* String copy = cbo.get("copyfromversion");
// if (StringUtils.isBlank(copy)) {
--
Gitblit v1.9.3