diff --git a/cdTMP/index.html b/cdTMP/index.html
index 44ced12..9777d53 100644
--- a/cdTMP/index.html
+++ b/cdTMP/index.html
@@ -4,6 +4,9 @@
+
+
+
成都测试管理平台
diff --git a/cdTMP/src/components/ma-editor/index.vue b/cdTMP/src/components/ma-editor/index.vue
index 7e1c941..5095ef7 100644
--- a/cdTMP/src/components/ma-editor/index.vue
+++ b/cdTMP/src/components/ma-editor/index.vue
@@ -34,7 +34,6 @@ import "tinymce/plugins/quickbars" //快速工具栏
import "tinymce/plugins/save" //保存
import "tinymce/plugins/searchreplace" //查找替换
import "tinymce/plugins/table" //表格
-import "tinymce/plugins/template" //内容模板
import "tinymce/plugins/visualblocks" //显示元素范围
import "tinymce/plugins/visualchars" //显示不可见字符
import "tinymce/plugins/wordcount" //字数统计
@@ -48,7 +47,7 @@ const props = defineProps({
plugins: {
type: [String, Array],
default:
- "preview searchreplace autolink directionality visualblocks visualchars template code codesample table charmap nonbreaking insertdatetime advlist lists wordcount autosave"
+ "preview searchreplace autolink directionality visualblocks visualchars code codesample table charmap nonbreaking insertdatetime advlist lists wordcount autosave"
},
toolbar: {
type: [String, Array],
diff --git a/cdTMP/src/layout/project-layout.vue b/cdTMP/src/layout/project-layout.vue
index 2e8a52b..88a0844 100644
--- a/cdTMP/src/layout/project-layout.vue
+++ b/cdTMP/src/layout/project-layout.vue
@@ -6,15 +6,16 @@
-
-
+
-
+
@@ -179,35 +180,36 @@ const loadMore = (nodeData) => {
if (nodeData.level == "0") {
return new Promise(async (resolve) => {
const res = await projectApi.getDutInfo(projectInfo.value.id, nodeData.key, nodeData.level)
- nodeData.children = res
+ // ~~~~~~~~~~~~~注意这里res和res.data，反正nodeData要返回数组~~~~~~~~~~~~~~~~~
+ nodeData.children = res.data
resolve()
})
}
if (nodeData.level == "1") {
return new Promise(async (resolve) => {
const res = await projectApi.getDemandInfo(projectInfo.value.id, nodeData.key, nodeData.level)
- nodeData.children = res
+ nodeData.children = res.data
resolve()
})
}
if (nodeData.level == "2") {
return new Promise(async (resolve) => {
const res = await projectApi.getTestInfo(projectInfo.value.id, nodeData.key, nodeData.level)
- nodeData.children = res
+ nodeData.children = res.data
resolve()
})
}
if (nodeData.level == "3") {
return new Promise(async (resolve) => {
const res = await projectApi.getCaseInfo(projectInfo.value.id, nodeData.key, nodeData.level)
- nodeData.children = res
+ nodeData.children = res.data
resolve()
})
}
if (nodeData.level == "4") {
return new Promise(async (resolve) => {
const res = await projectApi.getProblemInfo(projectInfo.value.id, nodeData.key, nodeData.level)
- nodeData.children = res
+ nodeData.children = res.data
resolve()
})
}
@@ -470,4 +472,7 @@ const roundOption = ref({
transition: padding 0.2s cubic-bezier(0.34, 0.69, 0.1, 1);
position: absolute;
}
+.myhcalc {
+ height: calc(100% - 60px);
+}
diff --git a/cdTMP/src/views/login.vue b/cdTMP/src/views/login.vue
index 27aa3a8..dc378ab 100644
--- a/cdTMP/src/views/login.vue
+++ b/cdTMP/src/views/login.vue
@@ -74,11 +74,10 @@