From 122a16e8561ae91183ee7e0d33816b05ec053445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com>
Date: Wed, 19 Jan 2022 13:41:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=99=E7=82=B9=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/examine/expert.js            |  7 ++++---
 src/components/SiteOptions/index.vue | 27 +++++++++++++++++++--------
 src/main.js                          |  3 ++-
 src/utils/parameter.js               | 10 ++++++++++
 4 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/src/api/examine/expert.js b/src/api/examine/expert.js
index 83e070e..a2c0a8d 100644
--- a/src/api/examine/expert.js
+++ b/src/api/examine/expert.js
@@ -1,9 +1,10 @@
 import request from '@/utils/request'
 
 // 专家审核列表
-export function getCache() {
+export function expertList(data) {
 	return request({
-		url: '/monitor/cache',
-		method: 'get',
+		url: '/admin/v1/manage/expert',
+		method: 'post',
+		data,
 	})
 }
diff --git a/src/components/SiteOptions/index.vue b/src/components/SiteOptions/index.vue
index 05c6c67..af6cbfb 100644
--- a/src/components/SiteOptions/index.vue
+++ b/src/components/SiteOptions/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-cascader
-    size="small"
-    style="width: 240px"
+    :size="size"
+    :style="{ width: limitWidth ? '240px' : '100%' }"
     v-model="tenant_id"
     clearable
     separator="-"
@@ -16,6 +16,14 @@ import { tenantSelect } from "@/api/subPlatform/tenant";
 export default {
   props: {
     value: String,
+    size: {
+      type: String,
+      default: "small",
+    },
+    limitWidth: {
+      type: Boolean,
+      default: true,
+    },
   },
   data() {
     return {
@@ -24,12 +32,15 @@ export default {
     };
   },
   watch: {
-    value(newVal, oldVal) {
-      if (newVal == "") {
-        this.tenant_id = undefined;
-      } else {
-        this.tenant_id = newVal;
-      }
+    value: {
+      handler(newVal, oldVal) {
+        if (newVal == "") {
+          this.tenant_id = undefined;
+        } else {
+          this.tenant_id = newVal;
+        }
+      },
+      immediate: true,
     },
     tenant_id(newVal, oldVal) {
       this.$emit("handleChange", newVal);
diff --git a/src/main.js b/src/main.js
index 9fe663a..58f4e63 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,7 +20,7 @@ import './permission' // permission control
 import { getDicts } from '@/api/system/dict/data'
 import { getConfigKey } from '@/api/system/config'
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from '@/utils/ruoyi'
-import { modeOptions } from '@/utils/parameter'
+import { modeOptions, educationOptions } from '@/utils/parameter'
 // 分页组件
 import Pagination from '@/components/Pagination'
 // 自定义表格工具组件
@@ -54,6 +54,7 @@ Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
 Vue.prototype.md5 = md5
 Vue.prototype.modeOptions = modeOptions
+Vue.prototype.educationOptions = educationOptions
 
 // 全局组件挂载
 Vue.component('DictTag', DictTag)
diff --git a/src/utils/parameter.js b/src/utils/parameter.js
index 116ef7c..3ae2d19 100644
--- a/src/utils/parameter.js
+++ b/src/utils/parameter.js
@@ -17,3 +17,13 @@ export const modeOptions = [
 		label: '科研院所服务',
 	},
 ]
+// 学历
+export const educationOptions = [
+	{ key: 1, text: '小学' },
+	{ key: 2, text: '初中' },
+	{ key: 3, text: '高中' },
+	{ key: 4, text: '大专' },
+	{ key: 5, text: '本科' },
+	{ key: 6, text: '研究生' },
+	{ key: 7, text: '博士' },
+]