From f0b55277b0b71cb7f9c7454efcf84f980f4db552 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Sat, 8 Jan 2022 17:27:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E7=AB=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ebts-ui/package.json                               |  2 +-
 ebts-ui/src/api/system/dict/data.js                | 12 +++++++++++-
 ebts-ui/src/main.js                                |  3 ++-
 .../src/views/sist/article/components/article.vue  | 14 +++++++-------
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/ebts-ui/package.json b/ebts-ui/package.json
index 209a3b3..32c0861 100644
--- a/ebts-ui/package.json
+++ b/ebts-ui/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "HCY",
+  "name": "EBTS",
   "version": "3.2.0",
   "description": "EBTS",
   "author": "Clay",
diff --git a/ebts-ui/src/api/system/dict/data.js b/ebts-ui/src/api/system/dict/data.js
index d7aca89..f2dfbf7 100644
--- a/ebts-ui/src/api/system/dict/data.js
+++ b/ebts-ui/src/api/system/dict/data.js
@@ -25,6 +25,16 @@ export function getDicts(dictType) {
   })
 }
 
+// 根据加密字典类型查询字典数据信息
+export function getEncodeDicts(dictType) {
+  return request({
+    url: '/system/dict/data/encode/' + dictType,
+    method: 'get'
+  })
+}
+
+
+
 // 新增字典数据
 export function addData(data) {
   return request({
@@ -58,4 +68,4 @@ export function exportData(query) {
     method: 'get',
     params: query
   })
-}
\ No newline at end of file
+}
diff --git a/ebts-ui/src/main.js b/ebts-ui/src/main.js
index b2774cd..220df5a 100644
--- a/ebts-ui/src/main.js
+++ b/ebts-ui/src/main.js
@@ -16,7 +16,7 @@ import permission from './directive/permission'
 
 import './assets/icons' // icon
 import './permission' // permission control
-import { getDicts } from "@/api/system/dict/data";
+import { getDicts,getEncodeDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
 import { parseTime, resetForm, addDateRange, addCreateDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/hcy";
 import Pagination from "@/components/Pagination";
@@ -25,6 +25,7 @@ import RightToolbar from "@/components/RightToolbar"
 
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
+Vue.prototype.getEncodeDicts = getEncodeDicts
 Vue.prototype.getConfigKey = getConfigKey
 Vue.prototype.parseTime = parseTime
 Vue.prototype.resetForm = resetForm
diff --git a/ebts-ui/src/views/sist/article/components/article.vue b/ebts-ui/src/views/sist/article/components/article.vue
index 137b685..7b7d399 100644
--- a/ebts-ui/src/views/sist/article/components/article.vue
+++ b/ebts-ui/src/views/sist/article/components/article.vue
@@ -75,9 +75,9 @@
             <el-select v-model="params.sistApprove" placeholder="请选择文章类型" clearable :style="{width: '100%'}">
               <el-option
                 v-for="dict in sistApproveOption"
-                :key="dict.user_id"
-                :label="dict.user_name"
-                :value="dict.user_id"
+                :key="dict.userId"
+                :label="dict.userName"
+                :value="dict.userId"
               />
             </el-select>
           </el-form-item>
@@ -102,9 +102,9 @@
             <el-select v-model="params.labApprove" placeholder="请选择文章类型" clearable :style="{width: '100%'}">
               <el-option
                 v-for="dict in labApproveOption"
-                :key="dict.user_id"
-                :label="dict.user_name"
-                :value="dict.user_id"
+                :key="dict.userId"
+                :label="dict.userName"
+                :value="dict.userId"
               />
             </el-select>
           </el-form-item>
@@ -231,7 +231,7 @@ export default {
     this.getDicts("article_site_type").then(response => {
       this.sitetypeOptions = response.data;
     });
-    this.getDicts("article_type").then(response => {
+    this.getEncodeDicts("article_type").then(response => {
       this.articleTypeOptions = response.data;
     });
     this.getDicts("is_top").then(response => {