diff --git a/webview/src/apps/chatroom/create.html b/webview/src/apps/chatroom/create.html index f4a99cb6..2bad68e5 100644 --- a/webview/src/apps/chatroom/create.html +++ b/webview/src/apps/chatroom/create.html @@ -14,7 +14,7 @@
diff --git a/webview/src/apps/keyword/create.html b/webview/src/apps/keyword/create.html index 5c90278c..4b31b802 100644 --- a/webview/src/apps/keyword/create.html +++ b/webview/src/apps/keyword/create.html @@ -21,8 +21,8 @@
@@ -31,9 +31,13 @@
- +
- 用于违规积分计算,0 为不生效,当前值:{{formdata.level}} + 用于违规积分累计,当前选项计 {{formdata.level}} 分
diff --git a/webview/src/apps/keyword/create.ts b/webview/src/apps/keyword/create.ts index cc7eb831..322fa305 100644 --- a/webview/src/apps/keyword/create.ts +++ b/webview/src/apps/keyword/create.ts @@ -1,6 +1,7 @@ import { Component } from '@angular/core'; import { Router } from '@angular/router'; +import { KeywordLevels } from 'src/openapi/const'; import { RobotApi, KeywordCreateParam } from '../../openapi/wrobot'; import { WrestApi, WcfrestContactPayload } from '../../openapi/wcfrest'; @@ -12,23 +13,28 @@ import { WrestApi, WcfrestContactPayload } from '../../openapi/wcfrest'; }) export class KeywordCreateComponent { - public chatrooms: Array = []; + public keywordLevels = KeywordLevels; + + public wcfChatrooms: Array = []; public formdata: KeywordCreateParam = { roomid: '-', level: 1 }; constructor(private router: Router) { - this.getChatrooms(); + this.getWcfChatrooms(); } public createKeyword() { + if (this.formdata.level) { + this.formdata.level = +this.formdata.level; + } RobotApi.keywordCreate(this.formdata).then(() => { this.router.navigate(['keyword/list']); }); } - public getChatrooms() { + public getWcfChatrooms() { WrestApi.chatrooms().then((data) => { - this.chatrooms = data || []; + this.wcfChatrooms = data || []; }); } diff --git a/webview/src/apps/keyword/list.html b/webview/src/apps/keyword/list.html index 670e01f4..23bb543d 100644 --- a/webview/src/apps/keyword/list.html +++ b/webview/src/apps/keyword/list.html @@ -28,13 +28,13 @@ {{item.rd}} {{item.phrase}} - @if (chatrooms[item.roomid]) { - {{chatrooms[item.roomid].name}} + @if (wcfChatrooms[item.roomid]) { + {{wcfChatrooms[item.roomid].name}} } @else { {{item.roomid != '-' ? item.roomid : '全局'}} } - {{item.level}} + {{ keywordLevels[item.level] && keywordLevels[item.level].name || item.level}} diff --git a/webview/src/apps/keyword/list.ts b/webview/src/apps/keyword/list.ts index 583aee0c..b98e45f5 100644 --- a/webview/src/apps/keyword/list.ts +++ b/webview/src/apps/keyword/list.ts @@ -1,5 +1,6 @@ import { Component } from '@angular/core'; +import { KeywordLevels } from 'src/openapi/const'; import { RobotApi, TablesKeyword } from '../../openapi/wrobot'; import { WrestApi, WcfrestContactPayload } from '../../openapi/wcfrest'; @@ -11,13 +12,15 @@ import { WrestApi, WcfrestContactPayload } from '../../openapi/wcfrest'; }) export class KeywordListComponent { - public chatrooms: Record = {}; + public keywordLevels = KeywordLevels; + + public wcfChatrooms: Record = {}; public keywords: Array = []; constructor() { this.getKeywords(); - this.getChatrooms(); + this.getWcfChatrooms(); } public getKeywords() { @@ -33,9 +36,9 @@ export class KeywordListComponent { }); } - public getChatrooms() { + public getWcfChatrooms() { WrestApi.chatrooms().then((data) => { - data.forEach((item) => this.chatrooms[item.wxid] = item); + data.forEach((item) => this.wcfChatrooms[item.wxid] = item); }); } diff --git a/webview/src/openapi/const.ts b/webview/src/openapi/const.ts index c5bb0607..b91b6a53 100644 --- a/webview/src/openapi/const.ts +++ b/webview/src/openapi/const.ts @@ -14,4 +14,10 @@ export const UserLevels: Record = { 2: { name: '已注册' }, 7: { name: '管理员' }, 9: { name: '创始人' } +}; + +export const KeywordLevels: Record = { + 1: { name: '一般违规' }, + 2: { name: '较为严重' }, + 3: { name: '非常严重' }, }; \ No newline at end of file