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 @@
-
+
+
+
+
+ {{ scope.row.scaleSubTitle }}
+
+
+
+
@@ -164,8 +173,8 @@
- 停用
- 正常
+ 正常
+ 停用
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 @@
删除
-
+
@@ -96,14 +96,17 @@
-
+
-
+
+ 选择题目
+
@@ -177,6 +180,13 @@
+
+
+
+
+
+
@@ -214,6 +224,8 @@ const dialog = reactive({
title: ''
});
+const questionVisible = ref(false);
+
const initFormData: SysScaleFactorForm = {
factorId: undefined,
factorName: undefined,
@@ -264,6 +276,10 @@ const data = reactive>({
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([]);
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([])
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()
});
-
-