Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

# Conflicts:
#	frontend/src/views/plan/autoTest/components/tree.vue

frontend/src/views/plan/planList/components/devPopup.vue

@@ -100,7 +100,7 @@
       label: '归档状态',
       minWidth: 110,
     },
-    { prop: 'operation', label: '操作', fixed: 'right', minWidth: 150 },
+    { prop: 'operation', label: '操作', fixed: 'right', minWidth: 100 },
   ])
 
   const open = (textTitle: string) => {

frontend/src/views/plan/planList/components/planPopup.vue

@@ -142,7 +142,7 @@ const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
     {
         // 将表单数据转为json,发送到后端
         let confirmFormData = JSON.parse(JSON.stringify(props.formData));
-        console.log(confirmFormData)
+        //console.log(confirmFormData)
         emit('submit', props.formData); // 提交表单数据
         emit('update:visible', false); // 提交后关闭对话框             
     } 

frontend/src/views/plan/planList/components/sourcePopup.vue

@@ -77,7 +77,7 @@
       search: { el: 'select' },
       minWidth: 150,
     },
-    { prop: 'operation', label: '操作', fixed: 'right', width: 150 },
+    { prop: 'operation', label: '操作', fixed: 'right', width: 100 },
   ])
 
   const open = (textTitle: string) => {

frontend/src/views/plan/planList/index.vue

@@ -317,7 +317,7 @@ function handleFiles(event: Event) {
   const files = target.files
   if (files && files.length > 0) {
     // 处理文件
-    console.log(files)
+   // console.log(files)
     ElMessageBox.confirm(
         '导入的数据与当前数据有冲突，请选择以哪个数据为主进行覆盖',
         '数据冲突',
@@ -366,7 +366,7 @@ const combineClick = () => {
       },
   )
       .then(({ value }) => {
-        console.log(`合并后的计划名为:`, value)
+       // console.log(`合并后的计划名为:`, value)
         proTable.value?.clearSelection()
         proTable.value?.getTableList()
       })