From bc38c4a546bc78fe363c45f720a8380c53fd975d Mon Sep 17 00:00:00 2001
From: jiangzhe <244140623@qq.com>
Date: Tue, 16 Apr 2024 16:36:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss             |  8 ++++++
 src/views/scale/SysScale/index.vue       | 15 +++++++++---
 src/views/scale/SysScaleFactor/index.vue | 31 +++++++++++++++++++-----
 src/views/scale/SysScaleList/index.vue   |  9 -------
 4 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 48865fb..2cf3cd8 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -206,3 +206,11 @@ aside {
     margin-bottom: 10px;
   }
 }
+
+.text-ellipsis {
+  text-overflow: ellipsis;
+  overflow: hidden;
+  word-break: break-all;
+  white-space: nowrap
+}
+
diff --git a/src/views/scale/SysScale/index.vue b/src/views/scale/SysScale/index.vue
index c2e850c..88f516e 100644
--- a/src/views/scale/SysScale/index.vue
+++ b/src/views/scale/SysScale/index.vue
@@ -65,7 +65,16 @@
         <el-table-column label="名称" align="center" prop="scaleName" />
         <el-table-column label="编码" align="center" prop="scaleCode" />
         <el-table-column label="标题" align="center" prop="scaleTitle" />
-        <el-table-column label="副标题" align="center" prop="scaleSubTitle" />
+        <el-table-column label="副标题" align="center" prop="scaleSubTitle">
+          <template #default="scope">
+            <el-popover placement="top-start" title="测评详情" :width="400" trigger="hover"
+              :content="scope.row.scaleSubTitle">
+              <template #reference>
+                <span class="text-ellipsis">{{ scope.row.scaleSubTitle }}</span>
+              </template>
+            </el-popover>
+          </template>
+        </el-table-column>
         <el-table-column label="状态" align="center" prop="status">
           <template #default="scope">
             <el-tag :type="scope.row.status === 1 ? 'success' : 'danger'" disable-transitions>
@@ -164,8 +173,8 @@
           <el-col :span="12">
             <el-form-item label="状态" prop="status">
               <el-radio-group v-model="form.status">
-                <el-radio value="0">停用</el-radio>
-                <el-radio value="1">正常</el-radio>
+                <el-radio :value="1">正常</el-radio>
+                <el-radio :value="0">停用</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
diff --git a/src/views/scale/SysScaleFactor/index.vue b/src/views/scale/SysScaleFactor/index.vue
index 6afb5e8..8673454 100644
--- a/src/views/scale/SysScaleFactor/index.vue
+++ b/src/views/scale/SysScaleFactor/index.vue
@@ -31,10 +31,10 @@
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
               v-hasPermi="['scale:factor:remove']">删除</el-button>
           </el-col>
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport"
               v-hasPermi="['scale:factor:export']">导出</el-button>
-          </el-col>
+          </el-col> -->
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -96,14 +96,17 @@
           </el-row>
 
           <el-row>
-            <el-col :span="24">
+            <el-col :span="22">
               <el-form-item label="选择题目" prop="questionIds">
                 <el-checkbox-group v-model="form.questionIds">
-                  <el-checkbox v-for="item in scaleQuestionList" :key="item.questionId" :label="item.questionOrder"
+                  <el-checkbox v-for="item in questionChooseList" :key="item.questionId" :label="item.questionOrder"
                     :value="item.questionId" />
                 </el-checkbox-group>
               </el-form-item>
             </el-col>
+            <el-col :span="2">
+              <el-button type="primary" @click="handleSelectQuestion">选择题目</el-button>
+            </el-col>
           </el-row>
 
         </el-card>
@@ -177,6 +180,13 @@
         </div>
       </template>
     </el-dialog>
+
+    <el-dialog title="选择题目" v-model="questionVisible" width="600px" append-to-body>
+      <el-checkbox-group v-model="form.questionIds">
+        <el-checkbox v-for="item in scaleQuestionList" :key="item.questionId" :label="item.questionOrder"
+          :value="item.questionId" />
+      </el-checkbox-group>
+    </el-dialog>
   </div>
 </template>
 
@@ -214,6 +224,8 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
+const questionVisible = ref(false);
+
 const initFormData: SysScaleFactorForm = {
   factorId: undefined,
   factorName: undefined,
@@ -264,6 +276,10 @@ const data = reactive<PageData<SysScaleFactorForm, SysScaleFactorQuery>>({
 
 const { queryParams, form, rules } = toRefs(data);
 
+function handleSelectQuestion() {
+  questionVisible.value = true
+}
+
 /** 查询测评因子列表 */
 const getList = async () => {
   loading.value = true;
@@ -387,13 +403,16 @@ const ruleTypeList = [
   }
 ]
 
-
 const scaleQuestionList = ref<SysScaleQuestionVO[]>([]);
 async function getScaleQuestionList() {
-  const res = await listSysScaleQuestion({scaleId})
+  const res = await listSysScaleQuestion({ scaleId })
   scaleQuestionList.value = res.rows
 }
 
+const questionChooseList = computed(() => {
+  return scaleQuestionList.value.filter(item => form.value.questionIds.includes(item.questionId))
+})
+
 const yzdList = ref<DictDataVO[]>([])
 async function getYzdList() {
   const res = await getDicts('yzd')
diff --git a/src/views/scale/SysScaleList/index.vue b/src/views/scale/SysScaleList/index.vue
index 857368c..47578f2 100644
--- a/src/views/scale/SysScaleList/index.vue
+++ b/src/views/scale/SysScaleList/index.vue
@@ -283,12 +283,3 @@ onMounted(() => {
   getScaleTypeList()
 });
 </script>
-
-<style lang="scss" scoped>
-.text-ellipsis {
-  text-overflow: ellipsis;
-  overflow: hidden;
-  word-break: break-all;
-  white-space: nowrap
-}
-</style>