样式微调

This commit is contained in:
GYYM
2024-11-22 10:46:10 +08:00
parent 44f8d43775
commit 6137ac18b7
8 changed files with 47 additions and 24 deletions

View File

@@ -14,6 +14,7 @@
</div>
<div class="right-content">
<el-tabs type="border-card">
<el-empty description="暂无数据,等待检测开始" v-if="activeIndex === 0"/>
<el-tab-pane label="被检设备1" v-if="activeIndex > 0">
<channelsTestTable></channelsTestTable>
</el-tab-pane>
@@ -87,12 +88,12 @@ if(ts.value==='start')
ts.value = 'process'
let timer = setInterval(() => {
if(activeIndex.value < activeTotalNum.value - 2)
if(activeIndex.value < activeTotalNum.value)
activeIndex.value++
else if(activeIndex.value === activeTotalNum.value -2)
else if(activeIndex.value === activeTotalNum.value)
{
activeIndex.value++
activeIndex.value++
clearInterval(timer)
ts.value = 'success'
}
else
{
@@ -176,6 +177,6 @@ emit('update:testStatus',ts.value)
margin-bottom: 10px;
}
.right-content{
min-height: 400px;
max-height: 400px;
}
</style>

View File

@@ -1,5 +1,5 @@
<template>
<el-dialog title="数据查询" :model-value='visible' @close="handleCancel" v-bind="dialogBig">
<el-dialog title="数据查询" :model-value='visible' @close="handleCancel" width="1050px">
<div class="data-check-dialog">
<div class="data-check-title">
<el-form :model='formContent'>
@@ -49,13 +49,13 @@
class="ml-2"
inline-prompt
style="--el-switch-on-color: #003078; --el-switch-off-color: #5a79a9"
active-text="仅显示不合格测试项"
inactive-text="显示全部测试项"
active-text="不合格测试项"
inactive-text="全部测试项"
/>
</div>
<div>
<el-tree
:default-expanded-keys="['0','1']"
:default-expanded-keys="['0','0-1','0-2','0-3','1']"
node-key="id"
:data="data"
:props="defaultProps"

View File

@@ -1,15 +1,15 @@
<template>
<el-dialog title="报告生成" :model-value='visible' @close="handleCancel" v-bind="dialogBig">
<el-dialog title="报告生成" :model-value='visible' @close="handleCancel" width="832px">
<div class="report-dialog">
<div class="report-title">
<div>
<el-row :gutter="16" >
<el-col :span="8">
<el-row :gutter="24" >
<el-col :span="12">
<el-form-item label="检测脚本:" >
<el-input v-model='testScriptName' :disabled="true"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="误差体系" >
<el-input v-model='errorSysName' :disabled="true"/>
</el-form-item>
@@ -17,13 +17,13 @@
</el-row>
</div>
<div>
<el-row :gutter="16" >
<el-col :span="8">
<el-row :gutter="24" >
<el-col :span="12">
<el-form-item label="数据处理原则" >
<el-input v-model='dataRule' :disabled="true"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="报告模板" >
<el-input v-model='reportTemplate' :disabled="true"/>
</el-form-item>
@@ -132,8 +132,11 @@ const props = defineProps<{
}
.report-title{
margin-left: 15px;
/* display: flex; */
/* flex-direction: row;
margin-top: 10px; */
}

View File

@@ -90,10 +90,10 @@
link
:icon="View"
@click="openDrawer('查看', scope.row)"
v-if="form.activeTabs === 3 && form.activeChildTabs === 0"
v-if="form.activeTabs === 3 && form.activeChildTabs === 1"
>查看</el-button
>
<div class='cn-render-buttons' v-if="form.activeTabs === 3 && form.activeChildTabs === 1">
<div class='cn-render-buttons' v-if="form.activeTabs === 3 && form.activeChildTabs === 0">
<el-dropdown trigger='click'>
<el-button link type='primary' :icon="View" class='table-operate'>
<div class='table-operate-text'>查看...</div>

View File

@@ -1190,8 +1190,7 @@ watch(ts, function (newValue, oldValue) {
--el-table-tr-bg-color: var(--el-color-success-light-9);
}
:deep(.dialog){
height: 900px !important;
.dialog{
display: flex;
flex-direction: column;
}
@@ -1203,6 +1202,10 @@ watch(ts, function (newValue, oldValue) {
margin-right:10px;
margin-bottom:10px;
}
.dialog-content{
max-height: 545px;
overflow-y: auto;
}
.dialog-log{
max-height: 50px;

View File

@@ -193,7 +193,7 @@ const detectionOptions = ref([
//
// })
// }
clearData()
emit('update:visible', false); // 关闭对话框
};
@@ -255,6 +255,16 @@ const detectionOptions = ref([
<style scoped lang="scss">
:deep(.dialog-big .el-dialog__body){
max-height: 840px !important;
}
// :deep(.dialog-big){
// max-height: 840px !important;
// }
// :deep(.el-dialog__body){
// max-height: 840px !important;
// }
.steps-container :deep(.test-head-steps){
height: 80px;
margin-bottom: 10px;

View File

@@ -315,11 +315,13 @@ const handleCheckFunction = (val: any) => {
tabLabel1.value = "设备复检";
break;
case 3://报告生成
tabLabel1.value = "未检设备";
tabShow.value = true;
tabLabel1.value = "报告生成";
//tabShow.value = true;
break;
case 4://设备归档
tabLabel1.value = "设备归档";
case 5://数据查询
tabLabel1.value = "数据查询";
break;
}

View File

@@ -66,6 +66,10 @@
/>
</el-select>
</el-form-item>
<el-form-item label='检测功能' :label-width='100' prop='device_Id'>
<el-checkbox v-model="checked1" label="守时检测" size="large" />
</el-form-item>
</el-form>
</div>
<template #footer>
@@ -104,7 +108,7 @@
};
}>();
const checked1 = ref(false)
const fatherPlanList = [
{ label: '/', value: 'type0' },
{ label: '检测计划1', value: 'type1' },