Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client
# Conflicts: # frontend/src/views/plan/autoTest/components/tree.vue
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user