多影响量

frontend/src/views/machine/testScript/components/testProjectPopup.vue

@@ -3,19 +3,19 @@
         <el-carousel height="600px" :autoplay="false" ref="carouselRef" indicator-position="none">
             <el-carousel-item :name="0" style="height: 100%; overflow-y: auto">
                 <div class="dialog-content">
-                    <el-tabs type="border-card" class="right-tabs">
+                    <el-tabs type="border-card" class="test-tabs">
                         <el-tab-pane label="检测">
                             <!-- 全局设置菜单内容 -->
-                            <div style="height: 295px">
-                                <el-radio-group v-model="form.subType">
-                                    <el-radio
-                                        v-for="item in tabChildren"
-                                        :key="item"
-                                        :label="item.label"
-                                        :value="item.code"
-                                        border
-                                        style="margin: 0 0 10px 10px"
-                                    />
+                            <div class="test-pane-scroll">
+                                <el-radio-group v-model="form.subType" class="test-radio-group">
+                                    <el-radio
+                                        v-for="item in tabChildren"
+                                        :key="item"
+                                        :label="item.label"
+                                        :value="item.code"
+                                        border
+                                        class="test-radio-item"
+                                    />
                                     <!-- <el-radio v-for="item in tabChildren" :value="item.value" border>{{ item.label }}</el-radio> -->
                                 </el-radio-group>
                             </div>
@@ -121,7 +121,7 @@
                             </el-table>
                         </el-tab-pane>
                     </el-tabs>
-                    <el-tabs type="border-card" class="right-tabs" style="height: 100%">
+                    <el-tabs type="border-card" class="settings-tabs" style="height: 100%">
                         <el-tab-pane label="全局设置菜单">
                             <!-- 全局设置菜单内容 -->
                             <div style="height: 295px; width: 170px">
@@ -734,4 +734,48 @@ defineExpose({ open })
     background-color: var(--el-color-primary);
     color: var(--el-color-white);
 }
+
+.test-tabs {
+    flex: 0 0 250px;
+    width: 250px;
+    min-width: 250px;
+}
+
+.settings-tabs {
+    flex: 0 0 auto;
+}
+
+.test-pane-scroll {
+    height: 295px;
+    display: flex;
+    justify-content: flex-start;
+    align-items: flex-start;
+    overflow-x: auto;
+    overflow-y: auto;
+}
+
+.test-radio-group {
+    display: flex;
+    align-items: flex-start;
+    min-width: 100%;
+    flex-direction: column;
+}
+
+.left-tabs {
+    flex: 1 1 auto;
+    min-width: 0;
+}
+
+:deep(.test-radio-group .el-radio) {
+    width: max-content;
+    max-width: none;
+}
+
+:deep(.test-radio-group .test-radio-item) {
+    margin: 0 0 10px 0;
+}
+
+:deep(.test-radio-group .el-radio__label) {
+    white-space: nowrap;
+}
 </style>

frontend/src/views/machine/testScript/components/testScriptPopup.vue

@@ -287,7 +287,8 @@ const setTree = async (data, data1) => {
 const convertToOptions = (dictTree: Dict.ResDictTree[]): CascaderOption[] => {
     return dictTree.map(item => ({
         value: item.id,
-        code: item.code.split('-')[1] || item.code.split('-')[0],
+        // code: item.code.split('-')[1] || item.code.split('-')[0],
+      code:item.code.substring(item.code.indexOf('-')+1,item.code.length),
         label: item.name,
         children: item.children ? convertToOptions(item.children) : undefined
     }))