5123

2023-07-21 16:08:08 +08:00
parent 67cb0df5b9
commit b3d67fb0e8
7 changed files with 27 additions and 21 deletions
--- 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],
--- a/cdTMP/src/layout/project-layout.vue
+++ b/cdTMP/src/layout/project-layout.vue
@@ -6,15 +6,16 @@
        <a-layout class="layout">
            <a-layout class="layout layout-demo">
                <a-layout-sider class="layout-sider">
-                    <div class="p-2">
-                        <a-input-group class="mb-2 w-full flex items-center" size="mini">
+                    <div class="p-2 overflow-auto myhcalc">
+                        <a-input-group class="mb-2 w-full flex items-center h-1/12" size="mini">
                            <a-input style="height: 32px" v-model="searchKey" allow-clear></a-input>
                            <a-button @click="handleSearchTreeDataClick">搜索</a-button>
                        </a-input-group>
-                        <a-alert title="提示" style="margin-bottom: 10px" class="mt-0 py-1"
+                        <a-alert title="提示" style="margin-bottom: 10px" class="mt-0 py-1 h-1/12"
                            >空搜索需要点击搜索按钮</a-alert
                        >
                        <a-tree
+                            class="h-10/12"
                            :data="treeData"
                            size="small"
                            block-node
@@ -74,7 +75,7 @@
                        </a-tree>
                    </div>
                </a-layout-sider>
-                <a-layout class="layout-content">
+                <a-layout class="layout-content myhcalc">
                    <a-layout-content class="work-area project-layout">
                        <PageLayout />
                    </a-layout-content>
@@ -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);
+}
 </style>
--- a/cdTMP/src/views/login.vue
+++ b/cdTMP/src/views/login.vue
@@ -74,11 +74,10 @@
 </template>

 <script setup>
-import { reactive, onMounted, ref } from "vue"
+import { reactive, ref } from "vue"
 import verifyCode from "@cps/ma-verifyCode/index.vue"
 import { useUserStore } from "@/store"
 import { useRouter, useRoute } from "vue-router"
-import { Message } from "@arco-design/web-vue"
 const router = useRouter()
 const route = useRoute()
 const userStore = useUserStore()
--- a/cdTMP/src/views/project/case/index.vue
+++ b/cdTMP/src/views/project/case/index.vue
@@ -260,7 +260,7 @@ const crudColumns = ref([
        search: true,
        formType: "select",
        commonRules: [{ required: true, message: "提单人必填" }],
-        dict: { url: "system/user/index", translation: true, props: { label: "name", value: "name" } }
+        dict: { url: "system/user/list", translation: true, props: { label: "name", value: "name" } }
    },
    {
        title: "提单日期",
@@ -286,7 +286,7 @@ const crudColumns = ref([
        dataIndex: "verifyPerson",
        formType: "select",
        commonRules: [{ required: true, message: "提单人必填" }],
-        dict: { url: "system/user/index", translation: true, props: { label: "name", value: "name" } }
+        dict: { url: "system/user/list", translation: true, props: { label: "name", value: "name" } }
    },
    {
        title: "验证日期",
@@ -300,7 +300,7 @@ const crudColumns = ref([
        dataIndex: "revokePerson",
        formType: "select",
        commonRules: [{ required: true, message: "提单人必填" }],
-        dict: { url: "system/user/index", translation: true, props: { label: "name", value: "name" } }
+        dict: { url: "system/user/list", translation: true, props: { label: "name", value: "name" } }
    },
    {
        title: "撤销日期",
--- a/cdTMP/src/views/project/testDemand/index.vue
+++ b/cdTMP/src/views/project/testDemand/index.vue
@@ -97,7 +97,7 @@ const crudColumns = ref([
        search: true,
        formType: "select",
        commonRules: [{ required: true, message: "设计人员必填" }],
-        dict: { url: "system/user/index", translation: true, props: { label: "name", value: "name" } }
+        dict: { url: "system/user/list", translation: true, props: { label: "name", value: "name" } }
    },
    {
        title: "执行人员",
@@ -107,7 +107,7 @@ const crudColumns = ref([
        search: true,
        formType: "select",
        commonRules: [{ required: true, message: "执行人员必填" }],
-        dict: { url: "system/user/index", translation: true, props: { label: "name", value: "name" } }
+        dict: { url: "system/user/list", translation: true, props: { label: "name", value: "name" } }
    },
    {
        title: "审核人员",
@@ -117,7 +117,7 @@ const crudColumns = ref([
        search: true,
        formType: "select",
        commonRules: [{ required: true, message: "审核人员必填" }],
-        dict: { url: "system/user/index", translation: true, props: { label: "name", value: "name" } }
+        dict: { url: "system/user/list", translation: true, props: { label: "name", value: "name" } }
    },
    {
        title: "用例综述",
--- a/cdTMP/src/views/testmanage/projmanage/index.vue
+++ b/cdTMP/src/views/testmanage/projmanage/index.vue
@@ -193,7 +193,7 @@ const crudColumns = ref([
        search: true,
        commonRules: [{ required: true, message: "责任人必选" }],
        formType: "select",
-        dict: { url: "system/user/list", props: { label: "name", value: "name" }, translation: true }
+        dict: { url: "system/user/index", props: { label: "name", value: "name" }, translation: true }
    },
    {
        title: "成员",
@@ -202,7 +202,7 @@ const crudColumns = ref([
        search: true,
        formType: "select",
        multiple: true,
-        dict: { url: "system/user/list", props: { label: "name", value: "name" }, translation: true },
+        dict: { url: "system/user/index", props: { label: "name", value: "name" }, translation: true },
        commonRules: [{ required: true, message: "成员至少选择一个" }]
    },
    {