0531

2024-05-31 18:29:29 +08:00
parent 5a67d60937
commit 607dcde7b0
11 changed files with 853 additions and 459 deletions
--- a/cdTMP/index.html
+++ b/cdTMP/index.html
@@ -37,6 +37,11 @@
            margin-top: -5%;
        }

+        .app-loading__logo img {
+            width: 170px;
+            height: 200px;
+        }
+
        .app-loading-text {
            position: relative;
            margin-top: 1rem;
--- a/cdTMP/package-lock.json
+++ b/cdTMP/package-lock.json
--- a/cdTMP/package.json
+++ b/cdTMP/package.json
@@ -12,7 +12,7 @@
    },
    "dependencies": {
        "@arco-design/color": "^0.4.0",
-        "@arco-design/web-vue": "^2.46.2",
+        "@arco-design/web-vue": "^2.55.2",
        "@tinymce/tinymce-vue": "^5.1.1",
        "@vueuse/core": "^10.1.2",
        "axios": "^1.4.0",
@@ -31,7 +31,7 @@
        "qs": "^6.11.2",
        "sortablejs": "^1.15.0",
        "tinymce": "^6.8.3",
-        "vue": "^3.3.0",
+        "vue": "^3.4.27",
        "vue-clipboard3": "^2.0.0",
        "vue-color-kit": "^1.0.5",
        "vue-echarts": "^6.5.5",
@@ -41,11 +41,11 @@
    "devDependencies": {
        "@types/lodash": "^4.14.195",
        "@types/mockjs": "^1.0.7",
-        "@types/node": "^20.2.5",
+        "@types/node": "^20.12.13",
        "@types/nprogress": "^0.2.0",
        "@types/qs": "^6.9.7",
-        "@vitejs/plugin-vue": "^4.1.0",
-        "@vitejs/plugin-vue-jsx": "^3.0.1",
+        "@vitejs/plugin-vue": "^5.0.4",
+        "@vitejs/plugin-vue-jsx": "^4.0.0",
        "@vue/babel-plugin-jsx": "^1.1.1",
        "autoprefixer": "^10.4.14",
        "browserslist": "^4.23.0",
@@ -57,6 +57,6 @@
        "postcss": "^8.4.24",
        "prettier": "^2.8.8",
        "tailwindcss": "^3.3.2",
-        "vite": "^4.3.9"
+        "vite": "^5.2.12"
    }
 }
--- a/cdTMP/src/api/project/dut.js
+++ b/cdTMP/src/api/project/dut.js
@@ -66,5 +66,16 @@ export default {
            method: "post",
            data: params
        })
+    },
+    /**
+     * 请求打开dut.vue页面，查看当前dut的类型“XQ/XY/SO等”
+     * @returns
+     */
+    getDutType(params = {}) {
+        return request({
+            url: "/project/dut/dut_type",
+            method: "get",
+            params
+        })
    }
 }
--- a/cdTMP/src/layout/project-layout.vue
+++ b/cdTMP/src/layout/project-layout.vue
@@ -20,7 +20,7 @@
                            </a-button>
                        </a-popconfirm>
                        <a-tree
-                            class="h-10/12 select-none"
+                            class="h-10/12 select-none my-arco-wrap-class"
                            :data="treeData"
                            size="mini"
                            checkable
@@ -1057,4 +1057,9 @@ const problemRoundRef = ref(null)
 .myhcalc {
    height: calc(100% - 60px);
 }
+.my-arco-wrap-class :deep(.arco-tree-node-title-text) {
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
 </style>
--- a/cdTMP/src/main.js
+++ b/cdTMP/src/main.js
@@ -17,6 +17,7 @@ import "@/style/global.less"
 // 读取package.json打印个软件名称和版本
 import tool from "@/utils/tool"
 import packageJson from "../package.json"
+// 启动app之前
 const app = createApp(App)
 app.use(ArcoVue, {})
 app.use(ArcoVueIcon)
@@ -24,7 +25,6 @@ app.use(router)
 app.use(pinia)
 app.use(globalComponents)
 // app.use(directive)
-// 虚拟列表

 // 注册ma-icon图标
 const modules = import.meta.glob("./assets/ma-icons/*.vue", { eager: true })
--- a/cdTMP/src/style/global.less
+++ b/cdTMP/src/style/global.less
@@ -1,5 +1,8 @@
@import "dark.less";
@import "animation.less";
+// 导入自己的样式覆盖
+@import "warp.less";
+

 html,
 body {
--- a/cdTMP/src/style/warp.less
+++ b/cdTMP/src/style/warp.less
@@ -0,0 +1,7 @@
+.tox-textarea-wrap {
+    height: 100% !important;
+
+    &>textarea.tox-textarea {
+        height: 100%;
+    }
+}
--- a/cdTMP/src/views/project/dut/index.vue
+++ b/cdTMP/src/views/project/dut/index.vue
@@ -7,11 +7,11 @@
                    {{ showType(record) }}
                </template>
                <template #tableAfterButtons>
-                    <a-button status="success" type="outline" @click="handleAddFileInputDemand">
+                    <a-button status="success" type="outline" @click="handleAddFileInputDemand" v-if="isXQ === 'XQ'">
                        <template #icon>
                            <icon-plus />
                        </template>
-                        上传需求快捷录入
+                        上传需求规格说明快捷录入
                    </a-button>
                </template>
            </ma-crud>
@@ -24,6 +24,7 @@
 import { ref, computed } from "vue"
 import { useRoute, useRouter } from "vue-router"
 import designDemandApi from "@/api/project/designDemand"
+import dutApi from "@/api/project/dut"
 import commonApi from "@/api/common"
 import { useTreeDataStore } from "@/store"
 import FileInputModal from "./components/FileInputModal/index.vue"
@@ -42,6 +43,14 @@ const demandTypeDict = ref([])
    })
 })()

+// 5月31日更新，获取当前dut的类型，以判断是否显示“需求录入”的按钮
+const isXQ = ref("")
+async function isXQdemand() {
+    const res = await dutApi.getDutType({ key: route.query.key, project_id: projectId.value })
+    isXQ.value = res.data.dut_type
+}
+isXQdemand()
+
 const showType = (record) => {
    let len = demandTypeDict.value.data.length
    for (let i = 0; i < len; i++) {
@@ -165,7 +174,7 @@ const crudColumns = ref([
 // ~~~大功能打开ma-form-modal~~~
 const fileInputRef = ref(null)
 const handleAddFileInputDemand = () => {
-    fileInputRef.value.open();
+    fileInputRef.value.open()
 }
 </script>

--- a/cdTMP/src/views/project/testDemand/index.vue
+++ b/cdTMP/src/views/project/testDemand/index.vue
@@ -57,7 +57,6 @@ const crudOptions = ref({
        let design_key = key_split[2]
        let test_key = key_split[3]
        let td = treeDataStore.treeData
-        console.log(route.query.key)
        crudRef.value.crudFormRef.actionTitle = `${route.query.ident} >
        ${td[round_key].title} > ${td[round_key].children[dut_key].title} >
        ${td[round_key].children[dut_key].children[design_key].title} >
@@ -117,6 +116,21 @@ const crudOptions = ref({
                        ]
                    }
                ]
+            },
+            {
+                formType: "grid",
+                cols: [{ span: 24, formList: [{ dataIndex: "summarize" }] }]
+            },
+            {
+                formType: "grid",
+                cols: [{ span: 24, formList: [{ dataIndex: "initialization" }] }]
+            },
+            {
+                formType: "grid",
+                cols: [
+                    { span: 12, formList: [{ dataIndex: "premise" }] },
+                    { span: 12, formList: [{ dataIndex: "exe_time" }] }
+                ]
            }
        ]
    }
@@ -197,6 +211,12 @@ const crudColumns = ref([
        hide: true,
        addDefaultValue: "软件正常启动，各界面显示工作正常"
    },
+    {
+        title: "执行时间",
+        dataIndex: "exe_time",
+        hide: true,
+        formType: "date",
+    },
    {
        title: "测试步骤",
        dataIndex: "testStep",
--- a/cdTMP/vite.config.js
+++ b/cdTMP/vite.config.js
@@ -6,7 +6,6 @@ export default ({ mode }) => {
    const env = loadEnv(mode, process.cwd())
    console.log("当前环境为：", mode)
    const proxyPrefix = env.VITE_APP_PROXY_PREFIX
-
    return defineConfig({
        base: env.VITE_APP_BASE,
        plugins: [vue(), vueJsx()],
@@ -18,7 +17,10 @@ export default ({ mode }) => {
                vue: "vue/dist/vue.esm-bundler.js"
            }
        },
-
+        define: {
+            __VUE_PROD_DEVTOOLS__: false,
+            __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: false
+        },
        build: {
            chunkSizeWarningLimit: 3000
            // assetsPublicPath: "./"