ClientApps/pqs-9100_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	frontend/src/views/plan/autoTest/components/tree.vue
This commit is contained in:
GYYM
2024-11-14 18:47:15 +08:00
parent a3051c0ea4 7033c3cdc6
commit 7efaa253a2
44 changed files with 193 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/src/views/plan/autoTest/components/tree.vue
View File

@@ -24,10 +24,9 @@
class="custom-tree-node"
style="display: flex; align-items: center"
>
<CircleCheck v-if="data.isChildNode && data.scriptIdx < currentIndex" style="width:18px;height: 18px;margin-right:8px;color:#67C23A;"/>
<svg-icon name="wind" spin></svg-icon>
<Loading v-if="data.isChildNode && data.scriptIdx === currentIndex" style="width:18px;height: 18px;margin-right:8px;color:#E6A23C;"/>
<svg-icon v-if="data.isChildNode && data.scriptIdx === currentIndex" name="loading" spin ></svg-icon>
<span>{{ node.label }}</span>
</span>
</template>
@@ -73,7 +72,7 @@ const timer = setInterval(() => {
currentIndex.value++;
if (currentIndex.value > 14)
currentIndex.value = 0;
console.log(currentIndex.value);
// console.log(currentIndex.value);
}, 2000);
@@ -88,7 +87,7 @@ watch(
}
);
const changeSelect=()=>{
console.log(treeRef.value.getCheckedKeys());
//console.log(treeRef.value.getCheckedKeys());
}
const handleNodeClick = (data) => {
console.log(data);

1
frontend/src/views/plan/autoTest/index.vue
View File

@@ -13,6 +13,7 @@
:label="item.name"
></el-checkbox
>
<el-button type="primary" @click="handlePreTest">预检测</el-button>
<el-button type="primary" @click="handleAutoTest">正式检测</el-button>
<el-button type="primary" @click="handleBackDeviceList"

2
frontend/src/views/plan/planList/components/devPopup.vue
View File

@@ -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) => {

2
frontend/src/views/plan/planList/components/planPopup.vue
View File

@@ -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); // 提交后关闭对话框
}

2
frontend/src/views/plan/planList/components/sourcePopup.vue
View File

@@ -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) => {

4
frontend/src/views/plan/planList/index.vue
View File

@@ -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()
})

2
frontend/src/views/plan/preTest/components/scrollTable.vue
View File

@@ -95,7 +95,7 @@ onBeforeUnmount(() => {
handleEnter();
});
const dataSource = computed(() => {
console.log("dataSource", dataSource);
//console.log("dataSource", dataSource);
return props.dataSource;
});
watch(

2
frontend/src/views/plan/preTest/components/timeLine.vue
View File

@@ -53,7 +53,7 @@ const activities = [
const data = ref([]);
const open = (list: any) => {
data.value = list;
console.log(data.value, "99999999");
// console.log(data.value, "99999999");
};
onMounted(() => {

4
frontend/src/views/plan/singlePlanList/index.vue
View File

@@ -408,8 +408,8 @@ const sortTable = ({
newIndex?: number;
oldIndex?: number;
}) => {
console.log(newIndex, oldIndex);
console.log(proTable.value?.tableData);
// console.log(newIndex, oldIndex);
//console.log(proTable.value?.tableData);
ElMessage.success("修改列表排序成功");
};