From f09e05514d9a9e2623cfa73c4de1ffa98bb30bf8 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期二, 23 一月 2024 10:09:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue | 100 +++++++++----------------------------------------
1 files changed, 19 insertions(+), 81 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue b/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
index a92827c..5be2861 100644
--- a/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
+++ b/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
@@ -19,85 +19,23 @@
:data="tableData"
:header-cell-style="{background:'#FAFAFA',color:'#505050'}"
border
- style="width: 100%;height: calc(100vh - 320px)"
+ style="width: 100%;height: calc(100vh - 315px)"
@cell-click="cellClickHandler">
- <el-table-column
- align="center"
- label="1"
- prop="1"
- >
- </el-table-column>
- <el-table-column
- align="center"
- label="2"
- prop="2"
- >
- </el-table-column>
- <el-table-column
- align="center"
- label="3"
- prop="3">
- </el-table-column>
- <el-table-column
- align="center"
- label="4"
- prop="4">
- </el-table-column>
- <el-table-column
- align="center"
- label="5"
- prop="5">
- </el-table-column>
- <el-table-column
- align="center"
- label="6"
- prop="6">
- </el-table-column>
- <el-table-column
- align="center"
- label="7"
- prop="7">
- </el-table-column>
- <el-table-column
- align="center"
- label="8"
- prop="8">
- </el-table-column>
- <el-table-column
- align="center"
- label="9"
- prop="9">
- </el-table-column>
- <el-table-column
- align="center"
- label="10"
- prop="10">
- </el-table-column>
- <el-table-column
- align="center"
- label="11"
- prop="11">
- </el-table-column>
- <el-table-column
- align="center"
- label="12"
- prop="12">
- </el-table-column>
- <el-table-column
- align="center"
- label="13"
- prop="13">
- </el-table-column>
- <el-table-column
- align="center"
- label="14"
- prop="14">
- </el-table-column>
- <el-table-column
- align="center"
- label="15"
- prop="15">
- </el-table-column>
+ <el-table-column align="center" label="1" prop="1"></el-table-column>
+ <el-table-column align="center" label="2" prop="2"></el-table-column>
+ <el-table-column align="center" label="3" prop="3"></el-table-column>
+ <el-table-column align="center" label="4" prop="4"></el-table-column>
+ <el-table-column align="center" label="5" prop="5"></el-table-column>
+ <el-table-column align="center" label="6" prop="6"></el-table-column>
+ <el-table-column align="center" label="7" prop="7"></el-table-column>
+ <el-table-column align="center" label="8" prop="8"></el-table-column>
+ <el-table-column align="center" label="9" prop="9"></el-table-column>
+ <el-table-column align="center" label="10" prop="10"></el-table-column>
+ <el-table-column align="center" label="11" prop="11"></el-table-column>
+ <el-table-column align="center" label="12" prop="12"></el-table-column>
+ <el-table-column align="center" label="13" prop="13"></el-table-column>
+ <el-table-column align="center" label="14" prop="14"></el-table-column>
+ <el-table-column align="center" label="15" prop="15"></el-table-column>
</el-table>
</el-main>
<el-footer>
@@ -132,7 +70,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",
@@ -198,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;
@@ -230,7 +168,7 @@
// const targetObject = this.characterReleasedList.find(obj => obj.oid === this.selectValue);
// const chartValue = targetObject.name;
getList({codeRuleId: this.select, chartType: "charset", chartValue: this.characterValue}).then(res => {
- console.log(res.data.data);
+ // console.log(res.data.data);
this.tableData = res.data.data;
this.loading = false;
});
--
Gitblit v1.9.3