([]) // 树形结构
@@ -408,12 +416,12 @@ const formData = ref({
// 定义 pptxPoints 类型
interface PptxPoints {
- firstName: string;
- slideIndex: string;
- function: string;
- examName: string;
- examCode: string;
- method?: string;
+ firstName: string
+ slideIndex: string
+ function: string
+ examName: string
+ examCode: string
+ method?: string
}
let pptxPointsInfosList: PptxPoints[] = []
const removePoint = (row) => {
@@ -477,18 +485,29 @@ const handleCheckChange = (data: any, _checked: boolean, _indeterminate: boolean
}
}
const file = ref()
+
// 获取slide文件，并使用文件流进行解析
const getSlideDataInfo = async () => {
const fileInput = document.getElementById('slideFile') as HTMLInputElement
if (fileInput != null) {
- if (fileInput.files && fileInput.files[0]) {
- file.value = fileInput.files[0]
- } else {
- return
+ const loading = ElLoading.service({
+ target: '.tree-wrap', // 只遮罩左侧树区域
+ text: '正在读取考点…',
+ background: 'rgba(255,255,255,0.6)'
+ })
+ try {
+ if (fileInput.files && fileInput.files[0]) {
+ file.value = fileInput.files[0]
+ } else {
+ loading.close()
+ return
+ }
+ const res = await PptxApi.getSlideDataInfo({ file: file.value })
+ pptxPointsList.value = []
+ pptxPointsList.value.push(...handleTree(res.data))
+ } finally {
+ loading.close()
}
- const res = await PptxApi.getSlideDataInfo({ file: file.value })
- pptxPointsList.value = []
- pptxPointsList.value.push(...handleTree(res.data))
}
}
@@ -505,10 +524,10 @@ const textIndex = ref()
const handleNodelClick = async (row: any) => {
console.log(row)
if (!row.click) {
- return
+ return
}
// 获取名称
- chineseName.value = '【' + row.belongTo +'】【' + row.name + '】'
+ chineseName.value = '【' + row.belongTo + '】【' + row.name + '】'
textIndex.value = row.index
const res = await PptxApi.getSlideByNameList(row.type)
pptxPointsInfoList.value = []
@@ -535,14 +554,14 @@ const submitPptxPoints = async () => {
for (let i = 0; i < res.data.length; i++) {
var indexFlag = false
for (let x = 0; x < list.value.length; x++) {
- list.value[x].scoreRate='1'
+ list.value[x].scoreRate = '1'
if (res.data[i].content == list.value[x].content) {
// 如果存在相同的数据话 不进入
indexFlag = true
}
}
if (!indexFlag) {
- (res.data[i] as any).sort = list.value.length + 1
+ ;(res.data[i] as any).sort = list.value.length + 1
list.value.push(res.data[i])
}
}
@@ -576,7 +595,8 @@ const submitPptxPoints = async () => {
// pptxPointsList.value = []
}
const formRules = reactive({
- status: [{ required: true, message: '启用状态必填', trigger: 'blur' }]
+ status: [{ required: true, message: '启用状态必填', trigger: 'blur' }],
+ pointNames: [{ required: true, message: '知识点必填', trigger: 'blur' }]
})
const formRef = ref() // 表单 Ref
// 左侧试题描述
@@ -638,7 +658,7 @@ const deleteUrl = (index: number) => {
const handleUploadSuccess = ({ url, fileType }) => {
const index = documentList.value.findIndex((item) => item.fileType === fileType)
if (index !== -1) {
- documentList.value[index].url = url1
+ documentList.value[index].url = url
}
}
/** 打开弹窗 */
@@ -654,8 +674,8 @@ const open = async (queryParams: any, type: string, id?: number) => {
const res = await QuestionApi.getQuestion(id)
formData.value = res
console.log(formData.value)
- list.value = formData.value.answerList as any[]
- documentList.value = res.fileUploads as any[]
+ list.value = formData.value.answerList as any[]
+ documentList.value = res.fileUploads as any[]
} finally {
formLoading.value = false
}
@@ -976,7 +996,7 @@ const openPoints = async () => {
padding: 0 20px 20px 20px;
}
.dialog-scroll-content {
- height: 400px;
+ height: 350px;
overflow-y: auto;
}
diff --git a/src/views/paper/question/WpsWordForm.vue b/src/views/paper/question/WpsWordForm.vue
index 3f946cc..806192d 100644
--- a/src/views/paper/question/WpsWordForm.vue
+++ b/src/views/paper/question/WpsWordForm.vue
@@ -139,9 +139,10 @@
v-loading="loading"
:data="list"
@selection-change="handleSelectionChange"
+ style="width: 100%"
>
-
+
@@ -294,18 +295,17 @@
/>
-
+
考点详情
-
-
-
+
+
-
+
-
+
([]) // 树形结构
const wordPointsInfoList = ref([]) // 树形结构
-const list = ref([]) // 列表的数
+// 明确 list 类型，避免 never[] 类型报错
+interface AnswerItem {
+ image: string;
+ content: string;
+ contentIn: string;
+ scoreRate: string;
+ [key: string]: any;
+}
+const list = ref([])
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const loading = ref(false) // 列表的加载中
@@ -417,7 +425,16 @@ const formData = ref({
]
})
-let wordPointsInfosList: (typeof wordPoints)[] = []
+// 定义 wordPointsInfosList 类型，避免 wordPoints 未定义报错
+interface WordPointsInfo {
+ firstName: string;
+ index: string;
+ function: string;
+ examName: string;
+ examCode: string;
+ method?: string;
+}
+let wordPointsInfosList: WordPointsInfo[] = []
const removePoint = (row) => {
// list.value.splice(index, 1)
for (let i = 0; i < list.value.length; i++) {
@@ -426,7 +443,7 @@ const removePoint = (row) => {
}
}
}
-function fileTypeFormatter(row, column, cellValue) {
+function fileTypeFormatter(_row: any, _column: any, cellValue: string) {
if (cellValue === '0') return '素材文件(上传ZIP)'
if (cellValue === '1') return '考试文件'
if (cellValue === '2') return '结果文件'
@@ -455,33 +472,31 @@ const documentList = ref([
const dialogFormVisibleWordInfo = ref(false)
const dialogFormVisibleWordInfos = ref(false)
const titles = ref('')
-const filePath = ref('')
+// 已声明未用，注释掉避免报错
+// const filePath = ref('')
-const handleCheckChange = (data: Tree, checked: boolean, indeterminate: boolean) => {
- console.log(data)
- const wordPoints = {
- firstName: '',
- index: '',
- function: '',
- examName: '',
- examCode: ''
+// Tree 类型补充 any，避免类型报错
+const handleCheckChange = (data: any, _checked: boolean, _indeterminate: boolean) => {
+ const wordPoints: WordPointsInfo = {
+ firstName: chineseName.value,
+ index: textIndex.value,
+ function: data.functions ?? '',
+ examName: data.chineseName ?? '',
+ examCode: '111',
+ method: data.parameter ?? ''
}
- if (data.functions != null && data.functions != '') {
- wordPoints.firstName = chineseName.value
- wordPoints.index = textIndex.value
- wordPoints.function = data.functions
- wordPoints.examName = data.chineseName
- wordPoints.examCode = '111'
- wordPoints.method = data.parameter
+ if (wordPoints.function) {
wordPointsInfosList.push(cloneDeep(wordPoints))
}
}
-const file = ref()
+const file = ref()
// 获取docx文件，并使用文件流进行解析
const getDocxDataInfo = async () => {
const fileInput = document.getElementById('docxFile') as HTMLInputElement
if (fileInput != null) {
- file.value = fileInput.files[0]
+ if (fileInput.files && fileInput.files.length > 0) {
+ file.value = fileInput.files[0]
+ }
const res = await WordApi.getWordDataInfo({ file: file.value })
wordPointsList.value = []
wordPointsList.value.push(...handleTree(res.data))
@@ -493,9 +508,9 @@ const addWordForm = async () => {
dialogFormVisibleWordInfo.value = true
}
-const queryParams = reactive({
- nodeFunction: undefined
-})
+// const queryParams = reactive({
+// nodeFunction: undefined
+// })
const chineseName = ref('')
const textIndex = ref()
@@ -521,11 +536,11 @@ const handleNodelClick = async (row: any) => {
wordPointsInfoList.value.push(...handleTree(res))
dialogFormVisibleWordInfos.value = true
}
-const handleDelete = (row) => {
- console.log(row)
+const handleDelete = (row: any) => {
for (let i = 0; i < list.value.length; i++) {
- if (row.content == list.value[i].content) {
+ if ((row.content ?? row.contentIn) == (list.value[i].content ?? list.value[i].contentIn)) {
list.value.splice(i, 1)
+ break
}
}
}
@@ -550,14 +565,14 @@ const submitWordPoints = async () => {
res.data[i].scoreRate='1'
var indexFlag = false
for (let x = 0; x < list.value.length; x++) {
- if (res.data[i].content == list.value[x].content) {
+ if ((res.data[i].content ?? res.data[i].contentIn) == (list.value[x].content ?? list.value[x].contentIn)) {
// 如果存在相同的数据话 不进入
indexFlag = true
}
}
if (!indexFlag) {
res.data[i].sort = list.value.length + 1
- list.value.push(res.data[i])
+ list.value.push(res.data[i] as any)
}
}
// wordPoints.value = {
@@ -590,14 +605,15 @@ const submitWordPoints = async () => {
// wordPointsList.value = []
}
const formRules = reactive({
- status: [{ required: true, message: '启用状态必填', trigger: 'blur' }]
+ status: [{ required: true, message: '启用状态必填', trigger: 'blur' }],
+ pointNames: [{ required: true, message: '知识点必填', trigger: 'blur' }]
})
const formRef = ref() // 表单 Ref
// 左侧试题描述
const leftActiveName = ref('desc')
// 右侧tab
const rightActiveName = ref('annex')
-const rightHandleClick = (tab, e) => {
+const rightHandleClick = (tab: any) => {
rightActiveName.value = tab.paneName.value
}
const selections = ref([])
@@ -647,17 +663,16 @@ const deleteUrl = (index: number) => {
formData.value.fileUploads[index].fileName = ''
}
// 媒体文件
-const mediumList = ref([] as any)
-const multipleMediumSelection = ref([] as any)
-const handleMediumSelectionChange = (val: any) => {
- multipleMediumSelection.value = val
-}
-const fileList = []
-
-const multipleDocumentSelection = ref([] as any)
-const handleDocumentSelectionChange = (val: any) => {
- multipleDocumentSelection.value = val
-}
+// const mediumList = ref([] as any)
+// const multipleMediumSelection = ref([] as any)
+// const handleMediumSelectionChange = (val: any) => {
+// multipleMediumSelection.value = val
+// }
+// const fileList = []
+// const multipleDocumentSelection = ref([] as any)
+// const handleDocumentSelectionChange = (val: any) => {
+// multipleDocumentSelection.value = val
+// }
const handleUploadSuccess = ({ url, fileType }) => {
const index = documentList.value.findIndex((item) => item.fileType === fileType)
if (index !== -1) {
@@ -695,15 +710,15 @@ const open = async (queryParams: any, type: string, id?: number) => {
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
// 转换函数：将大写字母 A-Z 映射为 0-25
-const mappedNumber = computed(() => {
- const char = radio.value.toUpperCase()
- const code = char.charCodeAt(0)
- if (code >= 65 && code <= 90) {
- return code - 65
- } else {
- return '请输入 A-Z 的字母'
- }
-})
+// const mappedNumber = computed(() => {
+// const char = radio.value.toUpperCase()
+// const code = char.charCodeAt(0)
+// if (code >= 65 && code <= 90) {
+// return code - 65
+// } else {
+// return '请输入 A-Z 的字母'
+// }
+// })
/** 提交表单 */
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
const submitForm = async () => {
@@ -819,7 +834,7 @@ const handleTreeWithLevel = (list, level = 1) => {
// 只允许点击第三级节点
const treeRef = ref() // 引用 el-tree
-const handleNodeClick = (data, node) => {
+const handleNodeClick = (data: any) => {
if (data.level === 3) {
formData.value.pointNames = data.id
formData.value.pointNamesVo = data.name
diff --git a/src/views/paper/question/WpsXlsxForm.vue b/src/views/paper/question/WpsXlsxForm.vue
index b90199c..5296856 100644
--- a/src/views/paper/question/WpsXlsxForm.vue
+++ b/src/views/paper/question/WpsXlsxForm.vue
@@ -139,9 +139,10 @@
v-loading="loading"
:data="list"
@selection-change="handleSelectionChange"
+ style="width: 100%"
>
-
+
@@ -294,18 +295,17 @@
/>
-
+
考点详情
-
-
-
+
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
:
-
+
- 确定
+ 确定
+
+
+
+
+
+
+
+
+
+ 删除选中
+
-
-
-
-
-
-
-
- 删除选中
-
-
-
确 定
取 消
@@ -407,26 +395,24 @@ const isCellType = ref(false) // 是否单元格
const cellInputValue = ref('') // 上方输入框值
const cellValues = ref<{ value: string }[]>([]) // 存储所有添加的数据
const selectedRows = ref<{ value: string }[]>([]) // 多选的行
-const rangeStart = ref(""); // range 开始
-const rangeEnd = ref(""); // range 结束
+const rangeStart = ref('') // range 开始
+const rangeEnd = ref('') // range 结束
// 添加到列表（带重复判断）
const addCellValue = () => {
- if (selectedType.value === "range") {
- if (!rangeStart.value || !rangeEnd.value) return;
+ if (selectedType.value === 'range') {
+ if (!rangeStart.value || !rangeEnd.value) return
cellValues.value.push({
- value: rangeStart.value + ":" + rangeEnd.value
- });
- rangeStart.value = "";
- rangeEnd.value = "";
+ value: rangeStart.value + ':' + rangeEnd.value
+ })
+ rangeStart.value = ''
+ rangeEnd.value = ''
} else {
- if (!cellInputValue.value) return;
- cellValues.value.push({ value: cellInputValue.value });
- cellInputValue.value = "";
+ if (!cellInputValue.value) return
+ cellValues.value.push({ value: cellInputValue.value })
+ cellInputValue.value = ''
}
-};
-
-
+}
// 表格多选事件
const handleSelectionChanges = (rows: any[]) => {
@@ -435,15 +421,19 @@ const handleSelectionChanges = (rows: any[]) => {
// 删除选中项
const deleteSelected = () => {
- cellValues.value = cellValues.value.filter(
- item => !selectedRows.value.includes(item)
- )
+ cellValues.value = cellValues.value.filter((item) => !selectedRows.value.includes(item))
selectedRows.value = []
}
-
-
-const list = ref([]) // 列表的数
+// 明确 list 类型，避免 never[] 类型报错
+interface AnswerItem {
+ image: string;
+ content: string;
+ contentIn: string;
+ scoreRate: string;
+ [key: string]: any;
+}
+const list = ref([])
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const loading = ref(false) // 列表的加载中
@@ -496,15 +486,25 @@ const formData = ref({
]
})
-let xlsxPointsInfosList: (typeof xlsxPoints)[] = []
-const removePoint = (row) => {
+// 定义 xlsxPointsInfosList 类型，避免 xlsxPoints 未定义报错
+interface XlsxPointsInfo {
+ firstName: string;
+ index: string;
+ function: string;
+ examName: string;
+ examCode: string;
+ method?: string;
+}
+let xlsxPointsInfosList: XlsxPointsInfo[] = []
+const removePoint = (row: any) => {
for (let i = 0; i < list.value.length; i++) {
- if (row.content == list.value[i].content) {
+ if ((row.content ?? row.contentIn) == (list.value[i].content ?? list.value[i].contentIn)) {
list.value.splice(i, 1)
+ break
}
}
}
-function fileTypeFormatter(row, column, cellValue) {
+function fileTypeFormatter(_row: any, _column: any, cellValue: string) {
if (cellValue === '0') return '素材文件(上传ZIP)'
if (cellValue === '1') return '考试文件'
if (cellValue === '2') return '结果文件'
@@ -533,37 +533,36 @@ const documentList = ref([
const dialogFormVisibleXlsxInfo = ref(false)
const dialogFormVisibleXlsxInfos = ref(false)
const titles = ref('')
-const filePath = ref('')
+// 已声明未用，注释掉避免报错
+// const filePath = ref('')
-const handleCheckChange = (data: Tree, checked: boolean, indeterminate: boolean) => {
- console.log(data+"handleCheckChange")
- const xlsxPoints = {
- firstName: '',
- index: '',
- function: '',
- examName: '',
- examCode: ''
+// Tree 类型补充 any，避免类型报错
+const handleCheckChange = (data: any, _checked: boolean, _indeterminate: boolean) => {
+ // 兼容属性名
+ const xlsxPoints: XlsxPointsInfo = {
+ firstName: chineseName.value,
+ index: textIndex.value,
+ function: data.functions ?? '',
+ examName: data.chineseName ?? '',
+ examCode: '111',
+ method: data.parameter ?? ''
}
- if (data.functions != null && data.functions != '') {
- xlsxPoints.firstName = chineseName.value
- xlsxPoints.index = textIndex.value
- xlsxPoints.function = data.functions
- xlsxPoints.examName = data.chineseName
- xlsxPoints.examCode = '111'
- xlsxPoints.method = data.parameter
+ if (xlsxPoints.function) {
xlsxPointsInfosList.push(cloneDeep(xlsxPoints))
}
}
-const file = ref()
+const file = ref()
// 获取xlsx文件，并使用文件流进行解析
const getXlsxDataInfo = async () => {
const fileInput = document.getElementById('xlsxFile') as HTMLInputElement
if (fileInput != null) {
- file.value = fileInput.files[0]
+ if (fileInput.files && fileInput.files.length > 0) {
+ file.value = fileInput.files[0]
+ }
const res = await XlsxApi.getXlsxDataInfo({ file: file.value })
xlsxPointsList.value = []
xlsxPointsList.value.push(...handleTree(res.data))
- }
+ }
}
// 打开考点窗口
@@ -578,15 +577,16 @@ const selectedType = ref('cell') // 初始值随便设
const handleNodelClick = async (row: any) => {
// 获取名称
chineseName.value = '【' + row.name + '】'
- // 判断是否是单元格
- isCellType.value = row.type === 'cell'||row.type === 'range'||row.type === 'row'||row.type === 'col'
+ // 判断是否是单元格
+ isCellType.value =
+ row.type === 'cell' || row.type === 'range' || row.type === 'row' || row.type === 'col'
if (isCellType.value) {
selectedType.value = row.type // 点击节点时更新
- cellInputValue.value ="";
+ cellInputValue.value = ''
cellValues.value = [] // 新的 cell 节点清空数据
}
-console.log(row.index+"row.indexrow.index")
+ console.log(row.index + 'row.indexrow.index')
textIndex.value = row.index
const res = await XlsxApi.getXlsxByNameList(row.type)
xlsxPointsInfoList.value = []
@@ -595,69 +595,66 @@ console.log(row.index+"row.indexrow.index")
}
const getPlaceholder = (type) => {
- console.log(type+"typetypetype")
+ console.log(type + 'typetypetype')
switch (type) {
case 'cell':
- return '请输入单元格（如 A1）';
+ return '请输入单元格（如 A1）'
case 'range':
- return '请输入范围（如 A1:B5）';
+ return '请输入范围（如 A1:B5）'
case 'row':
- return '请输入行号（如 3）';
+ return '请输入行号（如 3）'
case 'col':
- return '请输入列号（如 B）';
+ return '请输入列号（如 B）'
default:
- return '请输入值';
+ return '请输入值'
}
}
-
-
-
-
-const handleDelete = (row) => {
- console.log(row)
+const handleDelete = (row: any) => {
for (let i = 0; i < list.value.length; i++) {
- if (row.content == list.value[i].content) {
+ if ((row.content ?? row.contentIn) == (list.value[i].content ?? list.value[i].contentIn)) {
list.value.splice(i, 1)
+ break
}
}
}
const submitXlsxPoints = async () => {
- console.log('单元格输入内容:', cellValues.value)
+ console.log('单元格输入内容:', cellValues.value)
console.log(xlsxPointsInfosList)
const res = await XlsxApi.getXlsxMaster({
data: JSON.stringify(xlsxPointsInfosList),
file: file.value,
- cell: cellValues.value.map(item => item.value) // 提取值数组
+ cell: cellValues.value.map((item) => item.value) // 提取值数组
})
xlsxPointsInfosList = []
console.log(res)
for (let i = 0; i < res.data.length; i++) {
- res.data[i].scoreRate='1'
+ res.data[i].scoreRate = '1'
var indexFlag = false
for (let x = 0; x < list.value.length; x++) {
- if (res.data[i].content == list.value[x].content) {
+ if ((res.data[i].content ?? res.data[i].contentIn) == (list.value[x].content ?? list.value[x].contentIn)) {
// 如果存在相同的数据话 不进入
indexFlag = true
}
}
if (!indexFlag) {
res.data[i].sort = list.value.length + 1
- list.value.push(res.data[i])
+ list.value.push(res.data[i] as any)
}
}
dialogFormVisibleXlsxInfos.value = false
}
const formRules = reactive({
- status: [{ required: true, message: '启用状态必填', trigger: 'blur' }]
+ status: [{ required: true, message: '启用状态必填', trigger: 'blur' }],
+ pointNames: [{ required: true, message: '知识点必填', trigger: 'blur' }]
})
const formRef = ref() // 表单 Ref
// 左侧试题描述
const leftActiveName = ref('desc')
// 右侧tab
const rightActiveName = ref('annex')
-const rightHandleClick = (tab, e) => {
+const rightHandleClick = (tab: any) => {
rightActiveName.value = tab.paneName.value
}
const selections = ref([])
@@ -726,7 +723,7 @@ const open = async (queryParams: any, type: string, id?: number) => {
const res = await QuestionApi.getQuestion(id)
formData.value = res
console.log(formData.value)
- list.value = formData.value.answerList
+ list.value = formData.value.answerList as any[]
documentList.value = res.fileUploads
} finally {
formLoading.value = false
@@ -858,7 +855,7 @@ const handleTreeWithLevel = (list, level = 1) => {
// 只允许点击第三级节点
const treeRef = ref() // 引用 el-tree
-const handleNodeClick = (data, node) => {
+const handleNodeClick = (data: any) => {
if (data.level === 3) {
formData.value.pointNames = data.id
formData.value.pointNamesVo = data.name