From dc3531814c2cfbf6d42065972abd5278e9afa086 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 04 十二月 2023 10:12:22 +0800
Subject: [PATCH] 规则基础配置模块优化修改+删除
---
Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue | 69 +++++++++++--
Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue | 67 +++++++++++--
Source/UBCS-WEB/src/views/statistic/statisticPage.vue | 14 +-
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 2
Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue | 65 +++++++++++--
Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue | 67 +++++++++++--
6 files changed, 234 insertions(+), 50 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 36ca0b3..35947ca 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -606,7 +606,7 @@
},
//鎵归噺缂栬緫
bulkEditHandler(type) {
- console.log(this.nodeClickList)
+ // console.log(this.nodeClickList)
if (this.nodeClickList.children.length >= 1) {
this.$message.warning('褰撳墠閫夋嫨鐨勫垎绫讳笉鏄彾瀛愯妭鐐癸紝涓嶅厑璁告壒閲忕紪杈戯紒')
return;
diff --git a/Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue b/Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue
index a78ad01..de2e56a 100644
--- a/Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue
+++ b/Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue
@@ -101,14 +101,30 @@
</el-table>
</el-main>
<el-footer>
- <div style="width: 260px; display: flex; align-items: center;margin-top: 5px">
+ <div style="width: 460px; display: flex; align-items: center;margin-top: 5px">
<p>鍊硷細</p>
- <el-input v-model="characterValue" size="small" style="flex: 1;"></el-input>
+ <el-input v-model="characterValue" size="small" style="flex: 1; display: flex;">
+ <template slot="prefix">
+ <div style="display: flex; align-items: center;height: 100%;text-align: center;margin-left: 5px">
+ <el-tag v-for="(item,index) in this.editValueList" :key="index" closable size="small"
+ @close="handleClose(item,index)">
+ {{ item }}
+ </el-tag>
+ </div>
+ </template>
+ </el-input>
</div>
</el-footer>
+ <el-dialog :visible.sync="editVisble" append-to-body title="淇敼鍙敤瀛楃" width="40%">
+ <el-input v-model="characterValue" size="small"></el-input>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="editVisble = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="editSaveHandler">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
<div style="margin-bottom: 10px;text-align: center">
<el-button icon="el-icon-plus" plain size="small" type="success" @click="addSaveHandler">娣诲姞</el-button>
- <el-button icon="el-icon-edit" plain size="small" type="primary" @click="editSaveHandler">淇敼</el-button>
+ <el-button icon="el-icon-edit" plain size="small" type="primary" @click="editDialog">淇敼</el-button>
<el-button icon="el-icon-delete" plain size="small" type="danger" @click="delSaveHandler">鍒犻櫎</el-button>
</div>
</basic-container>
@@ -119,10 +135,11 @@
import {gridCodeRule} from "@/api/code/codeCharcter"
export default {
- name: "delimiterConfig",
+ name: "usableCharacter",
data() {
return {
loading: false,
+ editValueList: [],
//涓嬫媺妗嗘暟缁�
queryReleasedList: [],
//涓嬫媺妗嗗垵濮嬫暟鎹暟缁�
@@ -131,7 +148,8 @@
characterEditOldValue: "",
tableData: [],
select: "",
- selectValue: ""
+ selectValue: "",
+ editVisble: false
}
},
watch: {
@@ -145,9 +163,32 @@
this.getCodeRule();
},
methods: {
+ editDialog(){
+ if(this.editValueList.length > 1){
+ this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹紒');
+ return;
+ }
+ if(this.editValueList.length === 0){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹紒');
+ return;
+ }
+ this.editVisble = true;
+ },
+ handleClose(tag, index) {
+ this.$delete(this.editValueList, index);
+ if (this.editValueList.length === 0) {
+ this.characterValue = "";
+ return;
+ }
+ },
cellClickHandler(row, column) {
this.characterValue = row[column.property];
- this.characterEditOldValue = row[column.property]
+ this.characterEditOldValue = row[column.property];
+ if (this.editValueList.includes(row[column.property])) {
+ this.$message.warning('璇锋鏌ュ瓧绗﹂泦鏄惁鏈夐噸澶嶏紒')
+ } else {
+ this.editValueList.push(row[column.property]);
+ }
},
async getCodeRule() {
try {
@@ -160,14 +201,12 @@
const res2 = await getList({codeRuleId: this.select, chartType: "separator", chartValue: this.characterValue});
this.tableData = res2.data.data;
this.loading = false;
- // console.log("this.tableData", this.tableData);
} catch (error) {
this.$message.warning(error)
}
},
//缂栫爜瑙勫垯涓嬫媺妗嗘悳绱�
filterValue(query) {
- console.log(query)
if (query !== "") {
this.queryReleasedList = this.characterReleasedList.filter(item => {
return item.name.includes(query.toString());
@@ -185,7 +224,7 @@
this.loading = true;
// const targetObject = this.characterReleasedList.find(obj => obj.oid === this.selectValue);
// const chartValue = targetObject.name;
- getList({codeRuleId: this.select, chartType: "separator", chartValue: this.characterValue}).then(res => {
+ getList({codeRuleId: this.select, chartType: "fillerChar", chartValue: this.characterValue}).then(res => {
console.log(res.data.data);
this.tableData = res.data.data;
this.loading = false;
@@ -196,12 +235,14 @@
this.$message.warning('璇峰～鍐欒娣诲姞鐨勫�硷紒');
return; // 鍒ゆ柇杈撳叆鍊�
}
-
+ if (this.editValueList.length != 0) {
+ this.$message.warning('璇峰厛鍙栨秷宸查�夋嫨鐨勫�硷紒');
+ return; // 鍒ゆ柇杈撳叆鍊�
+ }
const targetObject = this.characterReleasedList.find(obj => obj.oid === this.select);
if (!targetObject) {
return; // 鏌ユ壘瀵瑰簲typeText
}
-
const codeRuleCharacterVO = {
codeRuleId: this.select,
chartType: "separator",
@@ -246,6 +287,8 @@
.then(res => {
this.$message.success(res.data.msg);
this.characterValue = "";
+ this.editVisble = false;
+ this.editValueList = [];
this.getTableData();
}).catch(error => {
this.$message.error('淇敼澶辫触');
@@ -262,16 +305,18 @@
if (!targetObject) {
return; // 鏌ユ壘瀵瑰簲typeText
}
+ const value = this.editValueList.join("");
const codeRuleCharacterVO = {
codeRuleId: this.select,
chartType: "separator",
- chartValue: this.characterValue,
+ chartValue: value,
chartTypeText: targetObject.name
};
deleteSave(codeRuleCharacterVO)
.then(res => {
this.$message.success(res.data.msg);
+ this.editValueList = [];
this.characterValue = "";
this.getTableData();
}).catch(error => {
diff --git a/Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue b/Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue
index a1a9026..5285185 100644
--- a/Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue
+++ b/Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue
@@ -101,14 +101,30 @@
</el-table>
</el-main>
<el-footer>
- <div style="width: 260px; display: flex; align-items: center;margin-top: 5px">
+ <div style="width: 460px; display: flex; align-items: center;margin-top: 5px">
<p>鍊硷細</p>
- <el-input v-model="characterValue" size="small" style="flex: 1;"></el-input>
+ <el-input v-model="characterValue" size="small" style="flex: 1; display: flex;">
+ <template slot="prefix">
+ <div style="display: flex; align-items: center;height: 100%;text-align: center;margin-left: 5px">
+ <el-tag v-for="(item,index) in this.editValueList" :key="index" closable size="small"
+ @close="handleClose(item,index)">
+ {{ item }}
+ </el-tag>
+ </div>
+ </template>
+ </el-input>
</div>
</el-footer>
+ <el-dialog :visible.sync="editVisble" append-to-body title="淇敼鍙敤瀛楃" width="40%">
+ <el-input v-model="characterValue" size="small"></el-input>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="editVisble = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="editSaveHandler">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
<div style="margin-bottom: 10px;text-align: center">
<el-button icon="el-icon-plus" plain size="small" type="success" @click="addSaveHandler">娣诲姞</el-button>
- <el-button icon="el-icon-edit" plain size="small" type="primary" @click="editSaveHandler">淇敼</el-button>
+ <el-button icon="el-icon-edit" plain size="small" type="primary" @click="editDialog">淇敼</el-button>
<el-button icon="el-icon-delete" plain size="small" type="danger" @click="delSaveHandler">鍒犻櫎</el-button>
</div>
</basic-container>
@@ -119,10 +135,11 @@
import {gridCodeRule} from "@/api/code/codeCharcter"
export default {
- name: "paddingCharacter",
+ name: "usableCharacter",
data() {
return {
loading: false,
+ editValueList: [],
//涓嬫媺妗嗘暟缁�
queryReleasedList: [],
//涓嬫媺妗嗗垵濮嬫暟鎹暟缁�
@@ -131,7 +148,8 @@
characterEditOldValue: "",
tableData: [],
select: "",
- selectValue: ""
+ selectValue: "",
+ editVisble: false
}
},
watch: {
@@ -145,9 +163,32 @@
this.getCodeRule();
},
methods: {
+ editDialog(){
+ if(this.editValueList.length > 1){
+ this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹紒');
+ return;
+ }
+ if(this.editValueList.length === 0){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹紒');
+ return;
+ }
+ this.editVisble = true;
+ },
+ handleClose(tag, index) {
+ this.$delete(this.editValueList, index);
+ if (this.editValueList.length === 0) {
+ this.characterValue = "";
+ return;
+ }
+ },
cellClickHandler(row, column) {
this.characterValue = row[column.property];
- this.characterEditOldValue = row[column.property]
+ this.characterEditOldValue = row[column.property];
+ if (this.editValueList.includes(row[column.property])) {
+ this.$message.warning('璇锋鏌ュ瓧绗﹂泦鏄惁鏈夐噸澶嶏紒')
+ } else {
+ this.editValueList.push(row[column.property]);
+ }
},
async getCodeRule() {
try {
@@ -160,14 +201,12 @@
const res2 = await getList({codeRuleId: this.select, chartType: "fillerChar", chartValue: this.characterValue});
this.tableData = res2.data.data;
this.loading = false;
- // console.log("this.tableData", this.tableData);
} catch (error) {
this.$message.warning(error)
}
},
//缂栫爜瑙勫垯涓嬫媺妗嗘悳绱�
filterValue(query) {
- console.log(query)
if (query !== "") {
this.queryReleasedList = this.characterReleasedList.filter(item => {
return item.name.includes(query.toString());
@@ -196,12 +235,14 @@
this.$message.warning('璇峰～鍐欒娣诲姞鐨勫�硷紒');
return; // 鍒ゆ柇杈撳叆鍊�
}
-
+ if (this.editValueList.length != 0) {
+ this.$message.warning('璇峰厛鍙栨秷宸查�夋嫨鐨勫�硷紒');
+ return; // 鍒ゆ柇杈撳叆鍊�
+ }
const targetObject = this.characterReleasedList.find(obj => obj.oid === this.select);
if (!targetObject) {
return; // 鏌ユ壘瀵瑰簲typeText
}
-
const codeRuleCharacterVO = {
codeRuleId: this.select,
chartType: "fillerChar",
@@ -246,6 +287,8 @@
.then(res => {
this.$message.success(res.data.msg);
this.characterValue = "";
+ this.editVisble = false;
+ this.editValueList = [];
this.getTableData();
}).catch(error => {
this.$message.error('淇敼澶辫触');
@@ -262,16 +305,18 @@
if (!targetObject) {
return; // 鏌ユ壘瀵瑰簲typeText
}
+ const value = this.editValueList.join("");
const codeRuleCharacterVO = {
codeRuleId: this.select,
chartType: "fillerChar",
- chartValue: this.characterValue,
+ chartValue: value,
chartTypeText: targetObject.name
};
deleteSave(codeRuleCharacterVO)
.then(res => {
this.$message.success(res.data.msg);
+ this.editValueList = [];
this.characterValue = "";
this.getTableData();
}).catch(error => {
diff --git a/Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue b/Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue
index fe196c6..9b0b88e 100644
--- a/Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue
+++ b/Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue
@@ -101,14 +101,30 @@
</el-table>
</el-main>
<el-footer>
- <div style="width: 260px; display: flex; align-items: center;margin-top: 5px">
+ <div style="width: 460px; display: flex; align-items: center;margin-top: 5px">
<p>鍊硷細</p>
- <el-input v-model="characterValue" size="small" style="flex: 1;"></el-input>
+ <el-input v-model="characterValue" size="small" style="flex: 1; display: flex;">
+ <template slot="prefix">
+ <div style="display: flex; align-items: center;height: 100%;text-align: center;margin-left: 5px">
+ <el-tag v-for="(item,index) in this.editValueList" :key="index" closable size="small"
+ @close="handleClose(item,index)">
+ {{ item }}
+ </el-tag>
+ </div>
+ </template>
+ </el-input>
</div>
</el-footer>
+ <el-dialog :visible.sync="editVisble" append-to-body title="淇敼鍙敤瀛楃" width="40%">
+ <el-input v-model="characterValue" size="small"></el-input>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="editVisble = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="editSaveHandler">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
<div style="margin-bottom: 10px;text-align: center">
<el-button icon="el-icon-plus" plain size="small" type="success" @click="addSaveHandler">娣诲姞</el-button>
- <el-button icon="el-icon-edit" plain size="small" type="primary" @click="editSaveHandler">淇敼</el-button>
+ <el-button icon="el-icon-edit" plain size="small" type="primary" @click="editDialog">淇敼</el-button>
<el-button icon="el-icon-delete" plain size="small" type="danger" @click="delSaveHandler">鍒犻櫎</el-button>
</div>
</basic-container>
@@ -119,10 +135,11 @@
import {gridCodeRule} from "@/api/code/codeCharcter"
export default {
- name: "prefixConfig",
+ name: "usableCharacter",
data() {
return {
loading: false,
+ editValueList: [],
//涓嬫媺妗嗘暟缁�
queryReleasedList: [],
//涓嬫媺妗嗗垵濮嬫暟鎹暟缁�
@@ -131,7 +148,8 @@
characterEditOldValue: "",
tableData: [],
select: "",
- selectValue: ""
+ selectValue: "",
+ editVisble: false
}
},
watch: {
@@ -145,9 +163,32 @@
this.getCodeRule();
},
methods: {
+ editDialog(){
+ if(this.editValueList.length > 1){
+ this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹紒');
+ return;
+ }
+ if(this.editValueList.length === 0){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹紒');
+ return;
+ }
+ this.editVisble = true;
+ },
+ handleClose(tag, index) {
+ this.$delete(this.editValueList, index);
+ if (this.editValueList.length === 0) {
+ this.characterValue = "";
+ return;
+ }
+ },
cellClickHandler(row, column) {
this.characterValue = row[column.property];
- this.characterEditOldValue = row[column.property]
+ this.characterEditOldValue = row[column.property];
+ if (this.editValueList.includes(row[column.property])) {
+ this.$message.warning('璇锋鏌ュ瓧绗﹂泦鏄惁鏈夐噸澶嶏紒')
+ } else {
+ this.editValueList.push(row[column.property]);
+ }
},
async getCodeRule() {
try {
@@ -160,14 +201,12 @@
const res2 = await getList({codeRuleId: this.select, chartType: "prefix", chartValue: this.characterValue});
this.tableData = res2.data.data;
this.loading = false;
- // console.log("this.tableData", this.tableData);
} catch (error) {
this.$message.warning(error)
}
},
//缂栫爜瑙勫垯涓嬫媺妗嗘悳绱�
filterValue(query) {
- console.log(query)
if (query !== "") {
this.queryReleasedList = this.characterReleasedList.filter(item => {
return item.name.includes(query.toString());
@@ -196,12 +235,14 @@
this.$message.warning('璇峰～鍐欒娣诲姞鐨勫�硷紒');
return; // 鍒ゆ柇杈撳叆鍊�
}
-
+ if (this.editValueList.length != 0) {
+ this.$message.warning('璇峰厛鍙栨秷宸查�夋嫨鐨勫�硷紒');
+ return; // 鍒ゆ柇杈撳叆鍊�
+ }
const targetObject = this.characterReleasedList.find(obj => obj.oid === this.select);
if (!targetObject) {
return; // 鏌ユ壘瀵瑰簲typeText
}
-
const codeRuleCharacterVO = {
codeRuleId: this.select,
chartType: "prefix",
@@ -246,6 +287,8 @@
.then(res => {
this.$message.success(res.data.msg);
this.characterValue = "";
+ this.editVisble = false;
+ this.editValueList = [];
this.getTableData();
}).catch(error => {
this.$message.error('淇敼澶辫触');
@@ -262,16 +305,18 @@
if (!targetObject) {
return; // 鏌ユ壘瀵瑰簲typeText
}
+ const value = this.editValueList.join("");
const codeRuleCharacterVO = {
codeRuleId: this.select,
chartType: "prefix",
- chartValue: this.characterValue,
+ chartValue: value,
chartTypeText: targetObject.name
};
deleteSave(codeRuleCharacterVO)
.then(res => {
this.$message.success(res.data.msg);
+ this.editValueList = [];
this.characterValue = "";
this.getTableData();
}).catch(error => {
diff --git a/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue b/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
index fc533eb..44eb04b 100644
--- a/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
+++ b/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
@@ -101,14 +101,30 @@
</el-table>
</el-main>
<el-footer>
- <div style="width: 260px; display: flex; align-items: center;margin-top: 5px">
+ <div style="width: 460px; display: flex; align-items: center;margin-top: 5px">
<p>鍊硷細</p>
- <el-input v-model="characterValue" size="small" style="flex: 1;"></el-input>
+ <el-input v-model="characterValue" size="small" style="flex: 1; display: flex;">
+ <template slot="prefix">
+ <div style="display: flex; align-items: center;height: 100%;text-align: center;margin-left: 5px">
+ <el-tag v-for="(item,index) in this.editValueList" :key="index" closable size="small"
+ @close="handleClose(item,index)">
+ {{ item }}
+ </el-tag>
+ </div>
+ </template>
+ </el-input>
</div>
</el-footer>
+ <el-dialog :visible.sync="editVisble" append-to-body title="淇敼鍙敤瀛楃" width="40%">
+ <el-input v-model="characterValue" size="small"></el-input>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="editVisble = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="editSaveHandler">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
<div style="margin-bottom: 10px;text-align: center">
<el-button icon="el-icon-plus" plain size="small" type="success" @click="addSaveHandler">娣诲姞</el-button>
- <el-button icon="el-icon-edit" plain size="small" type="primary" @click="editSaveHandler">淇敼</el-button>
+ <el-button icon="el-icon-edit" plain size="small" type="primary" @click="editDialog">淇敼</el-button>
<el-button icon="el-icon-delete" plain size="small" type="danger" @click="delSaveHandler">鍒犻櫎</el-button>
</div>
</basic-container>
@@ -123,6 +139,7 @@
data() {
return {
loading: false,
+ editValueList: [],
//涓嬫媺妗嗘暟缁�
queryReleasedList: [],
//涓嬫媺妗嗗垵濮嬫暟鎹暟缁�
@@ -131,7 +148,8 @@
characterEditOldValue: "",
tableData: [],
select: "",
- selectValue: ""
+ selectValue: "",
+ editVisble: false
}
},
watch: {
@@ -145,9 +163,32 @@
this.getCodeRule();
},
methods: {
+ editDialog(){
+ if(this.editValueList.length > 1){
+ this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹紒');
+ return;
+ }
+ if(this.editValueList.length === 0){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹紒');
+ return;
+ }
+ this.editVisble = true;
+ },
+ handleClose(tag, index) {
+ this.$delete(this.editValueList, index);
+ if (this.editValueList.length === 0) {
+ this.characterValue = "";
+ return;
+ }
+ },
cellClickHandler(row, column) {
this.characterValue = row[column.property];
- this.characterEditOldValue = row[column.property]
+ this.characterEditOldValue = row[column.property];
+ if (this.editValueList.includes(row[column.property])) {
+ this.$message.warning('璇锋鏌ュ瓧绗﹂泦鏄惁鏈夐噸澶嶏紒')
+ } else {
+ this.editValueList.push(row[column.property]);
+ }
},
async getCodeRule() {
try {
@@ -160,14 +201,12 @@
const res2 = await getList({codeRuleId: this.select, chartType: "charset", chartValue: this.characterValue});
this.tableData = res2.data.data;
this.loading = false;
- // console.log("this.tableData", this.tableData);
} catch (error) {
this.$message.warning(error)
}
},
//缂栫爜瑙勫垯涓嬫媺妗嗘悳绱�
filterValue(query) {
- console.log(query)
if (query !== "") {
this.queryReleasedList = this.characterReleasedList.filter(item => {
return item.name.includes(query.toString());
@@ -196,12 +235,14 @@
this.$message.warning('璇峰～鍐欒娣诲姞鐨勫�硷紒');
return; // 鍒ゆ柇杈撳叆鍊�
}
-
+ if (this.editValueList.length != 0) {
+ this.$message.warning('璇峰厛鍙栨秷宸查�夋嫨鐨勫�硷紒');
+ return; // 鍒ゆ柇杈撳叆鍊�
+ }
const targetObject = this.characterReleasedList.find(obj => obj.oid === this.select);
if (!targetObject) {
return; // 鏌ユ壘瀵瑰簲typeText
}
-
const codeRuleCharacterVO = {
codeRuleId: this.select,
chartType: "charset",
@@ -246,6 +287,8 @@
.then(res => {
this.$message.success(res.data.msg);
this.characterValue = "";
+ this.editVisble = false;
+ this.editValueList = [];
this.getTableData();
}).catch(error => {
this.$message.error('淇敼澶辫触');
@@ -262,16 +305,18 @@
if (!targetObject) {
return; // 鏌ユ壘瀵瑰簲typeText
}
+ const value = this.editValueList.join("");
const codeRuleCharacterVO = {
codeRuleId: this.select,
chartType: "charset",
- chartValue: this.characterValue,
+ chartValue: value,
chartTypeText: targetObject.name
};
deleteSave(codeRuleCharacterVO)
.then(res => {
this.$message.success(res.data.msg);
+ this.editValueList = [];
this.characterValue = "";
this.getTableData();
}).catch(error => {
diff --git a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
index 2e9477a..35e2cb8 100644
--- a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
+++ b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
@@ -17,7 +17,7 @@
border
style="width: 100%"
@selection-change="selectChange"
- >
+ >
<el-table-column
type="selection"
width="55">
@@ -48,10 +48,14 @@
</el-dialog>
<!-- echarts缁勪欢-->
<div>
- <lineChart v-for="(item,index) in lineList" :key="index" :chartName="item.menuName" :lineData="item.menuData"></lineChart>
- <pieChart v-for="(item,index) in pieList" :key="index" :pieData="item.menuData" :chartName="item.menuName"></pieChart>
- <ColumnarChart v-for="(item,index) in columnarList" :key="index" :chartName="item.menuName" :columnarData="item.menuData"></ColumnarChart>
- <mixCart v-for="(item,index) in mixList" :key="index" :chartName="item.menuName" :mixData="item.menuData"></mixCart>
+ <lineChart v-for="(item,index) in lineList" :key="index" :chartName="item.menuName"
+ :lineData="item.menuData"></lineChart>
+ <pieChart v-for="(item,index) in pieList" :key="index" :chartName="item.menuName"
+ :pieData="item.menuData"></pieChart>
+ <ColumnarChart v-for="(item,index) in columnarList" :key="index" :chartName="item.menuName"
+ :columnarData="item.menuData"></ColumnarChart>
+ <mixCart v-for="(item,index) in mixList" :key="index" :chartName="item.menuName"
+ :mixData="item.menuData"></mixCart>
</div>
</div>
</template>
--
Gitblit v1.9.3