From fbf4f0990b1f3b4f06a198f47d6513494f690d2c Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 04 十二月 2023 11:50:56 +0800
Subject: [PATCH] 整合代码
---
Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue | 2 ++
Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue | 2 ++
Source/UBCS-WEB/src/views/statistic/statisticPage.vue | 4 ++--
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 26 +++++++++++++++-----------
Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue | 18 +++++++++++++-----
Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue | 2 ++
6 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 35947ca..df6a0b6 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -36,16 +36,18 @@
</el-select></span>
</div>
<div class="custom-table">
- <el-table ref="dataTable" v-loading="isLoading" :data="tableData" :height="tableHeight"
- border class="cus-table"
- @select="handleSelection" @cell-click="handleCellClick" @row-click="handleRowClick"
- @select-all="handleSelectionAll" @selection-change="handleSelectionChange"
- @sort-change="sortChange" :header-cell-style="{background:'#FAFAFA',color:'#505050'}">
+ <el-table ref="dataTable" v-loading="isLoading" :data="tableData"
+ :header-cell-style="{background:'#FAFAFA',color:'#505050'}"
+ :height="tableHeight" border
+ class="cus-table" @select="handleSelection" @cell-click="handleCellClick"
+ @row-click="handleRowClick" @select-all="handleSelectionAll"
+ @selection-change="handleSelectionChange" @sort-change="sortChange">
<el-table-column v-if="tableData.length != 0" fixed type="selection" width="55"></el-table-column>
<el-table-column v-if="tableData.length != 0" fixed label="搴忓彿" type="index" width="55">
</el-table-column>
<!-- 鐢熷懡鍛ㄦ湡-->
- <el-table-column v-for="(item,index) in lcstatusArray" v-if=" lcstatusArray.length !== 0 && !item.hidden"
+ <el-table-column v-for="(item,index) in lcstatusArray"
+ v-if=" lcstatusArray.length !== 0 && !item.hidden"
key="index" :show-overflow-tooltip="true" :sortable="item.sortable"
:width="item.width" align="center" label="鐢熷懡鍛ㄦ湡鍊�"
prop="lcstatus">
@@ -75,7 +77,8 @@
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"
+ <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"
@@ -108,8 +111,9 @@
</FormTemplateDialog>
<!-- 淇敼-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
- :disabledProp="disabledProp" rowOid="rowOid" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
+ :disabledProp="disabledProp" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
:visible.sync="editvisible"
+ rowOid="rowOid"
type="edit" @submit="EditSumbit"></FormTemplateDialog>
<!-- 鎵归噺缂栬緫-->
<!-- <MasterEditBulk :visible.sync="bulkeditvisible" ></MasterEditBulk>-->
@@ -594,13 +598,13 @@
if (foundItem) {
this.amendvisible = true;
- this.rowOid = this.selectRow[0].oid ;
+ this.rowOid = this.selectRow[0].oid;
} else {
if (this.selectRow.length !== 1) {
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
- }else {
+ } else {
this.amendvisible = true;
- this.rowOid = this.selectRow[0].oid ;
+ this.rowOid = this.selectRow[0].oid;
}
}
},
diff --git a/Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue b/Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue
index de2e56a..8125016 100644
--- a/Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue
+++ b/Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue
@@ -186,6 +186,8 @@
this.characterEditOldValue = row[column.property];
if (this.editValueList.includes(row[column.property])) {
this.$message.warning('璇锋鏌ュ瓧绗﹂泦鏄惁鏈夐噸澶嶏紒')
+ } else if (row[column.property] === undefined || row[column.property] === null) {
+ this.$message.warning('璇锋鏌ュ瓧绗﹂泦鏄惁鏈夌┖鍊硷紒');
} else {
this.editValueList.push(row[column.property]);
}
diff --git a/Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue b/Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue
index 5285185..a4c9618 100644
--- a/Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue
+++ b/Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue
@@ -186,6 +186,8 @@
this.characterEditOldValue = row[column.property];
if (this.editValueList.includes(row[column.property])) {
this.$message.warning('璇锋鏌ュ瓧绗﹂泦鏄惁鏈夐噸澶嶏紒')
+ } else if (row[column.property] === undefined || row[column.property] === null) {
+ this.$message.warning('璇锋鏌ュ瓧绗﹂泦鏄惁鏈夌┖鍊硷紒');
} else {
this.editValueList.push(row[column.property]);
}
diff --git a/Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue b/Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue
index 9b0b88e..edecfe5 100644
--- a/Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue
+++ b/Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue
@@ -186,6 +186,8 @@
this.characterEditOldValue = row[column.property];
if (this.editValueList.includes(row[column.property])) {
this.$message.warning('璇锋鏌ュ瓧绗﹂泦鏄惁鏈夐噸澶嶏紒')
+ } else if (row[column.property] === undefined || row[column.property] === null) {
+ this.$message.warning('璇锋鏌ュ瓧绗﹂泦鏄惁鏈夌┖鍊硷紒');
} else {
this.editValueList.push(row[column.property]);
}
diff --git a/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue b/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
index 44eb04b..a92827c 100644
--- a/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
+++ b/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
@@ -116,8 +116,8 @@
</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-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>
@@ -163,12 +163,12 @@
this.getCodeRule();
},
methods: {
- editDialog(){
- if(this.editValueList.length > 1){
+ editDialog() {
+ if (this.editValueList.length > 1) {
this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹紒');
return;
}
- if(this.editValueList.length === 0){
+ if (this.editValueList.length === 0) {
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹紒');
return;
}
@@ -186,9 +186,14 @@
this.characterEditOldValue = row[column.property];
if (this.editValueList.includes(row[column.property])) {
this.$message.warning('璇锋鏌ュ瓧绗﹂泦鏄惁鏈夐噸澶嶏紒')
+ } else if (row[column.property] === undefined || row[column.property] === null) {
+ this.$message.warning('璇锋鏌ュ瓧绗﹂泦鏄惁鏈夌┖鍊硷紒');
} else {
this.editValueList.push(row[column.property]);
}
+ // else if (this.editValueList.some(value => value.trim() === '')) {
+ // this.$message.warning('璇锋鏌ュ瓧绗﹂泦鏄惁鏈夌┖鍊硷紒');
+ // }
},
async getCodeRule() {
try {
@@ -235,14 +240,17 @@
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",
diff --git a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
index 35e2cb8..316ba94 100644
--- a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
+++ b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
@@ -47,7 +47,7 @@
</span>
</el-dialog>
<!-- echarts缁勪欢-->
- <div>
+ <div style="margin-top: 15px">
<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"
@@ -225,6 +225,6 @@
}
</script>
-<style scoped>
+<style scoped lang="scss">
</style>
--
Gitblit v1.9.3