From d8f51c40544ae278095e991ed00ec297842d4332 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期日, 29 九月 2024 11:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue b/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
index d832be8..d246424 100644
--- a/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
+++ b/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
@@ -1,14 +1,13 @@
<template>
<basic-container>
-
<el-header>
<div style="margin-bottom: 15px">
缂栫爜瑙勫垯锛�
- <el-select v-model="select" :filter-method="filterValue" filterable placeholder="璇烽�夋嫨" size="small"
+ <el-select v-model="select" :filter-method="filterValue" filterable placeholder="璇烽�夋嫨" size="small" v-loading="selectLoading"
@change="selectHandler">
<el-option v-for="(item,index) in queryReleasedList"
:key="item.oid"
- :label="item.name"
+ :label="item.name + ' (' + item.id + ')'"
:value="item.oid"></el-option>
</el-select>
</div>
@@ -70,7 +69,7 @@
<script>
import {getList, addSave, editSave, deleteSave} from "@/api/code/codeCharcter"
-import {gridCodeRule} from "@/api/code/codeCharcter"
+import {gridCodeRule} from "@/api/code/mdmrule"
export default {
name: "usableCharacter",
@@ -87,7 +86,8 @@
tableData: [],
select: "",
selectValue: "",
- editVisble: false
+ editVisble: false,
+ selectLoading:false,
}
},
watch: {
@@ -136,7 +136,7 @@
async getCodeRule() {
try {
// 缂栫爜瑙勫垯宸插彂甯冩暟鎹簮
- const res = await gridCodeRule({["conditionMap" + "[lcStatus_like]"]: "Released"});
+ const res = await gridCodeRule(1,-1);
this.characterReleasedList = res.data.data.records;
this.queryReleasedList = this.characterReleasedList;
this.select = this.characterReleasedList[0].oid;
@@ -144,6 +144,7 @@
const res2 = await getList({codeRuleId: this.select, chartType: "charset", chartValue: this.characterValue});
this.tableData = res2.data.data;
this.loading = false;
+ this.selectLoading = false;
} catch (error) {
this.$message.warning(error)
}
--
Gitblit v1.9.3