From 008cccd60e8bb552e4503dd7c59471be47f33941 Mon Sep 17 00:00:00 2001
From: jiangzhe <244140623@qq.com>
Date: Fri, 17 May 2024 14:42:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AF=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/scale/SysScale/index.vue        | 23 +++++++++++++++++++++--
 src/views/scale/SysScaleList/index.vue    | 17 ++++++++++++++---
 src/views/scale/SysScalePublish/index.vue |  4 ++--
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/views/scale/SysScale/index.vue b/src/views/scale/SysScale/index.vue
index 79fc2fd..3c99b45 100644
--- a/src/views/scale/SysScale/index.vue
+++ b/src/views/scale/SysScale/index.vue
@@ -236,6 +236,17 @@
           </el-col>
         </el-row>
 
+        <el-row v-if="selectDirectionVisible">
+          <el-col :span="12">
+            <el-form-item label="录取选项" prop="selectDirection">
+              <el-select multiple v-model="form.selectDirection" placeholder="请选择录取选项" class="w-100">
+                <el-option v-for="item in selectDirectionOptions" :key="item.value" :label="item.label"
+                  :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-row>
           <el-col :span="24">
             <el-form-item label="测评详情" prop="scaleDetails">
@@ -294,6 +305,12 @@ const dimensionTypeOptions = [
   { label: '多项多维型', value: 2 }
 ]
 
+const selectDirectionVisible = ref(false)
+const selectDirectionOptions = [
+  { label: '高分录取', value: 0 },
+  { label: '择低录取', value: 1 }
+]
+
 const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
@@ -364,9 +381,11 @@ const data = reactive<PageData<SysScaleForm, SysScaleQuery>>({
 
 const { queryParams, form, rules } = toRefs(data);
 
-const changeDimensionType = (val) => {
+const changeDimensionType = (val: any) => {
   if (val == 1) {
-    form.value.selectDirection = 1
+    selectDirectionVisible.value = true
+  } else {
+    selectDirectionVisible.value = false
   }
 }
 
diff --git a/src/views/scale/SysScaleList/index.vue b/src/views/scale/SysScaleList/index.vue
index 65d14ed..84a6225 100644
--- a/src/views/scale/SysScaleList/index.vue
+++ b/src/views/scale/SysScaleList/index.vue
@@ -151,7 +151,15 @@
     </el-dialog>
 
     <el-dialog title="查看量表试卷详情" v-model="detailVisible" width="800px" append-to-body>
-      <el-card v-for="item in factorList" style="margin-bottom: 10px;">
+      <el-tabs v-model="activeName" type="card">
+        <el-tab-pane v-for="item in factorList" :label="item.factorName" :name="item.factorName" :key="item.factorId">
+          <p v-for="q in item.questionList" :key="q.questionId">
+            {{ q.questionOrder + "、" + q.questionContent }}
+          </p>
+        </el-tab-pane>
+      </el-tabs>
+
+      <!-- <el-card v-for="item in factorList" style="margin-bottom: 10px;">
         <template #header>
           <div class="card-header">
             <span>{{ item.factorName }}</span>
@@ -161,7 +169,7 @@
         <p v-for="q in item.questionList" :key="q.questionId">
           {{ q.questionOrder + "、" + q.questionContent }}
         </p>
-      </el-card>
+      </el-card> -->
     </el-dialog>
 
   </div>
@@ -309,7 +317,7 @@ const getTreeSelect = async () => {
 
 const scaleOptions = ref<any[]>([]);
 const getScaleOptions = async () => {
-  const res = await findAll({ status: 1});
+  const res = await findAll({ status: 1 });
   scaleOptions.value = res.data;
 }
 
@@ -321,10 +329,13 @@ watch(() => dialog.visible, (visible) => {
 })
 
 const factorList = ref<any[]>([])
+const activeName = ref()
 async function handleDetail(row: any) {
   const res = await findByScaleId({ scaleId: row.scaleId })
   factorList.value = res.data
   detailVisible.value = true
+
+  activeName.value = factorList.value[0].factorName
 }
 
 function deptChange(val: any) {
diff --git a/src/views/scale/SysScalePublish/index.vue b/src/views/scale/SysScalePublish/index.vue
index b05d59a..6cc1dba 100644
--- a/src/views/scale/SysScalePublish/index.vue
+++ b/src/views/scale/SysScalePublish/index.vue
@@ -57,8 +57,8 @@
         </el-table-column>
         <el-table-column label="查看结果" align="center" prop="allowQueryResult">
           <template #default="scope">
-            <el-tag :type="scope.row.status === 0 ? 'danger' : 'success'" disable-transitions>
-              {{ scope.row.status === 0 ? '不允许' : '允许' }}
+            <el-tag :type="scope.row.allowQueryResult === 0 ? 'danger' : 'success'" disable-transitions>
+              {{ scope.row.allowQueryResult === 0 ? '不允许' : '允许' }}
             </el-tag>
           </template>
         </el-table-column>