From 3f75d75de14adb9c53b4df84b1d48d49e2563876 Mon Sep 17 00:00:00 2001
From: jiangzhe <244140623@qq.com>
Date: Wed, 3 Apr 2024 11:26:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8F=E8=A1=A8=E4=BB=A3=E7=A0=81=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/scale/SysScale/index.vue         | 28 ++++++++++++++++++----
 src/views/scale/SysScaleQuestion/index.vue |  5 ++--
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/views/scale/SysScale/index.vue b/src/views/scale/SysScale/index.vue
index cbf8352..f599e68 100644
--- a/src/views/scale/SysScale/index.vue
+++ b/src/views/scale/SysScale/index.vue
@@ -62,8 +62,8 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="计分公式" align="center" prop="formulaId" />
-        <el-table-column label="量表类型" align="center" prop="scaleType" />
+        <el-table-column label="计分公式" align="center" prop="formulaName" />
+        <el-table-column label="量表类型" align="center" prop="scaleTypeName" />
         <el-table-column label="预警分数" align="center" prop="earlyWarningScore" />
         <el-table-column label="测评开始时间" align="center" prop="startTime" width="180">
           <template #default="scope">
@@ -130,19 +130,20 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="总分计分公式" prop="formulaId">
-          <el-input v-model="form.formulaId" placeholder="请输入量表的总分计分公式" />
+          <el-select v-model="form.formulaId" placeholder="请输入量表的总分计分公式" style="width: 100%">
+            <el-option v-for="item in scaleFormulaList" :key="item.formulaId" :label="item.formulaName"
+              :value="item.formulaId" />
+          </el-select>
         </el-form-item>
         <el-form-item label="预警分数" prop="earlyWarningScore">
           <el-input v-model="form.earlyWarningScore" placeholder="请输入预警分数" />
         </el-form-item>
-
         <el-form-item label="量表类型" prop="scaleType">
           <el-select v-model="form.scaleType" placeholder="请选择量表类型" class="w-100">
             <el-option v-for="item in scaleTypeList" :key="item.dictCode" :label="item.dictLabel"
               :value="item.dictValue" />
           </el-select>
         </el-form-item>
-
         <el-form-item label="测评开始时间" prop="startTime">
           <el-date-picker clearable v-model="form.startTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="请选择测评开始时间" class="w-100">
@@ -170,9 +171,13 @@
 <script setup name="SysScale" lang="ts">
 import { listSysScale, getSysScale, delSysScale, addSysScale, updateSysScale } from '@/api/scale/SysScale';
 import { SysScaleVO, SysScaleQuery, SysScaleForm } from '@/api/scale/SysScale/types';
+
 import { getDicts } from '@/api/system/dict/data';
 import { DictDataVO } from '@/api/system/dict/data/types';
 
+import { listSysScaleFormula } from '@/api/scale/SysScaleFormula'
+import { SysScaleFormulaVO } from '@/api/scale/SysScaleFormula/types';
+
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const SysScaleList = ref<SysScaleVO[]>([]);
@@ -358,6 +363,19 @@ async function getScaleTypeList() {
   scaleTypeList.value = res.data
 }
 
+
+const scaleFormulaList = ref<SysScaleFormulaVO[]>([]);
+async function getScaleFormulaList() {
+  const res = await listSysScaleFormula()
+  scaleFormulaList.value = res.rows
+}
+
+watch(() => dialog.visible, (visible) => {
+  if (visible) {
+    getScaleFormulaList()
+  }
+})
+
 onMounted(() => {
   getList();
 
diff --git a/src/views/scale/SysScaleQuestion/index.vue b/src/views/scale/SysScaleQuestion/index.vue
index fb143df..65e17c7 100644
--- a/src/views/scale/SysScaleQuestion/index.vue
+++ b/src/views/scale/SysScaleQuestion/index.vue
@@ -51,10 +51,10 @@
 
       <el-table v-loading="loading" :data="SysScaleQuestionList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="测评量表标题" align="center" prop="scaleTitle" />
+        <!-- <el-table-column label="测评量表标题" align="center" prop="scaleTitle" /> -->
         <el-table-column label="问题序号" align="center" prop="questionOrder" />
         <el-table-column label="问题内容" align="center" prop="questionContent" />
-        <el-table-column label="因子名称" align="center" prop="factorName" />
+        <!-- <el-table-column label="因子名称" align="center" prop="factorName" /> -->
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
@@ -303,6 +303,7 @@ const submitForm = () => {
       }
       proxy?.$modal.msgSuccess("修改成功");
       reset();
+      form.value.scaleAnswerList = []
       dialog.visible = false;
       await getList();
     }