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

微调

Browse Source
This commit is contained in:
caozehui
2024-12-27 13:36:20 +08:00
parent e70d1cb3f2
commit c6836cad06
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/api/check/interface/index.ts
View File

@@ -54,7 +54,7 @@ export namespace CheckData {
LOADING = 0, LOADING = 0,
SUCCESS = 1, SUCCESS = 1,
FAIL = 2, FAIL = 2,
UNCONNECTED=3, UNCONNECTED = 3,
ERRORDATA = 4 ERRORDATA = 4
} }

20
frontend/src/views/home/components/test.vue
View File

@@ -110,7 +110,7 @@
<!-- <template #header>--> <!-- <template #header>-->
<!-- <div style="background: #003078 !important; color: #fff !important; font-size: 18px;">检测项进度</div>--> <!-- <div style="background: #003078 !important; color: #fff !important; font-size: 18px;">检测项进度</div>-->
<!-- </template>--> <!-- </template>-->
<div ref="scrollContainer"> <div ref="scrollContainerRef">
<p v-for="(item, index) in testLogList" <p v-for="(item, index) in testLogList"
:key="index" :key="index"
:style="{color:item.type==='error'?'#F56C6C': item.type==='warning'?'#e6a23c':'var(--el-text-color-regular)'}"> :style="{color:item.type==='error'?'#F56C6C': item.type==='warning'?'#e6a23c':'var(--el-text-color-regular)'}">
@@ -195,7 +195,7 @@ const testStatus = toRef(props, 'testStatus')
const webMsgSend = toRef(props, 'webMsgSend') const webMsgSend = toRef(props, 'webMsgSend')
const resultDialogVisible = ref(false) const resultDialogVisible = ref(false)
const scrollContainer = ref<HTMLElement | null>(null); const scrollContainerRef = ref();
const dataCheckSingleChannelSingleTestPopupRef = ref<InstanceType<typeof dataCheckSingleChannelSingleTestPopup>>() const dataCheckSingleChannelSingleTestPopupRef = ref<InstanceType<typeof dataCheckSingleChannelSingleTestPopup>>()
@@ -228,7 +228,7 @@ const checkResultView = computed(() => {
tempChnBtnResult.push({color: CheckData.ButtonColorEnum.INFO, icon: 'Minus'}) tempChnBtnResult.push({color: CheckData.ButtonColorEnum.INFO, icon: 'Minus'})
break; break;
case CheckData.ChnCheckResultEnum.LOADING: case CheckData.ChnCheckResultEnum.LOADING:
tempChnBtnResult.push({color: CheckData.ButtonColorEnum.INFO, icon: 'Loading'}) tempChnBtnResult.push({color: CheckData.ButtonColorEnum.LOADING, icon: 'Loading'})
break; break;
case CheckData.ChnCheckResultEnum.SUCCESS: case CheckData.ChnCheckResultEnum.SUCCESS:
tempChnBtnResult.push({color: CheckData.ButtonColorEnum.SUCCESS, icon: 'CircleCheckFilled'}) tempChnBtnResult.push({color: CheckData.ButtonColorEnum.SUCCESS, icon: 'CircleCheckFilled'})
@@ -256,7 +256,7 @@ const checkResultView = computed(() => {
tempChnBtnResult.push({color: CheckData.ButtonColorEnum.INFO, icon: 'Minus'}) tempChnBtnResult.push({color: CheckData.ButtonColorEnum.INFO, icon: 'Minus'})
break; break;
case CheckData.ChnCheckResultEnum.LOADING: case CheckData.ChnCheckResultEnum.LOADING:
tempChnBtnResult.push({color: CheckData.ButtonColorEnum.INFO, icon: 'Loading'}) tempChnBtnResult.push({color: CheckData.ButtonColorEnum.LOADING, icon: 'Loading'})
break; break;
case CheckData.ChnCheckResultEnum.SUCCESS: case CheckData.ChnCheckResultEnum.SUCCESS:
tempChnBtnResult.push({color: CheckData.ButtonColorEnum.SUCCESS, icon: 'CircleCheckFilled'}) tempChnBtnResult.push({color: CheckData.ButtonColorEnum.SUCCESS, icon: 'CircleCheckFilled'})
@@ -470,7 +470,6 @@ watch(webMsgSend, function (newValue, oldValue) {
// 更新进度条 // 更新进度条
const updatePercentage = () => { const updatePercentage = () => {
console.log('updatePercentage',activeIndex, checkTotal)
if (activeIndex < checkTotal) { if (activeIndex < checkTotal) {
percentage.value = Math.trunc(activeIndex / checkTotal * 100); percentage.value = Math.trunc(activeIndex / checkTotal * 100);
} else { } else {
@@ -498,7 +497,8 @@ onBeforeMount(() => {
initCheckResult() initCheckResult()
// todo 可移除start // todo 可移除start
randomUnConnectedRaw = getRandomInt(scriptData.length) + 1 let a = getRandomInt(scriptData.length) + 4
randomUnConnectedRaw = a < scriptData.length ? a : scriptData.length
randomUnConnectedDeviceId = deviceList[getRandomInt(deviceList.length)].deviceId randomUnConnectedDeviceId = deviceList[getRandomInt(deviceList.length)].deviceId
randomErrorDataRaw = getRandomInt(scriptData.length) + 1 randomErrorDataRaw = getRandomInt(scriptData.length) + 1
while (randomErrorDataRaw === randomUnConnectedRaw) { while (randomErrorDataRaw === randomUnConnectedRaw) {
@@ -507,6 +507,7 @@ onBeforeMount(() => {
// todo 可移除end // todo 可移除end
}) })
const showTestLog = () => { const showTestLog = () => {
drawer.value = true drawer.value = true
} }
@@ -600,8 +601,9 @@ const updateCheckResult = (data: CheckData.ScriptChnItem) => {
} }
const scrollToBottom = () => { const scrollToBottom = () => {
if (scrollContainer.value) { if (scrollContainerRef.value) {
scrollContainer.value.scrollTop = scrollContainer.value.scrollHeight; scrollContainerRef.value.scrollTop = scrollContainerRef.value.scrollHeight;
console.log(scrollContainerRef.value.scrollTop)
} }
}; };
@@ -773,7 +775,7 @@ const getCheckResult = (scriptId: string) => {
tempChnResult.push(CheckData.ChnCheckResultEnum.SUCCESS) tempChnResult.push(CheckData.ChnCheckResultEnum.SUCCESS)
} }
let randomNum = getRandomInt(item.chnNum * 2) let randomNum = getRandomInt(item.chnNum * 2)
if (randomNum < item.chnNum) { if (randomNum < item.chnNum && activeIndex >= 4 && activeIndex <= 8) {
tempChnResult[randomNum] = CheckData.ChnCheckResultEnum.FAIL tempChnResult[randomNum] = CheckData.ChnCheckResultEnum.FAIL
errorCheckItem.push({scriptId, type: 'error'}) errorCheckItem.push({scriptId, type: 'error'})
} }