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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
caozehui
2024-12-05 13:43:19 +08:00
parent 1b171d4b8d c5acb84d97
commit 57f9238033
7 changed files with 208 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/api/system/dictionary/dictData.ts
View File

@@ -216,7 +216,7 @@ const dictData: Dict[] = [
children: [
{
id: "0",
label: 'FLUKE6100A电能功率标准源',
label: 'FLUKE.6100A电能功率标准源',
code: 0,
},
{
@@ -236,7 +236,7 @@ const dictData: Dict[] = [
},
{
id: "4",
label: 'PQV-520电能质量检测装置',
label: 'PQV-520便携式电能质量监测装置',
code: 4,
},
],

18
frontend/src/styles/element.scss
View File

@@ -490,3 +490,21 @@
// color: var(--ba-bg-color-overlay) !important;
}
}
.el-message-box{
padding: 0px !important;
.el-message-box__header{
background-color: var(--el-color-primary);
.el-message-box__title{
color: #fff;
padding: 10px 10px 0;
}
}
.el-message-box__content{
padding: 10px ;
border-bottom: 1px solid #cccccc;
}
.el-message-box__btns {
padding: 10px;}
}

8
frontend/src/views/home/components/channelsTest.vue
View File

@@ -346,7 +346,7 @@ emit('update:testStatus',ts.value)
margin-bottom: 10px;
}
.right-content{
max-height: 400px;
/* max-height: 400px; */
}
.custom-tabs-label .el-icon {
@@ -356,4 +356,10 @@ emit('update:testStatus',ts.value)
vertical-align: middle;
margin-left: 4px;
}
.dialog-content{
height: 472px;
}
.el-tabs--border-card {
height: 435px;
}
</style>

61
frontend/src/views/home/components/preTest.vue
View File

@@ -3,14 +3,8 @@
<el-tabs type="border-card">
<el-tab-pane label="预检测项目">
<div class="form-grid">
<el-checkbox
v-for="(item, index) in detectionOptions"
v-model="item.selected"
:key="index"
:label="item.name"
></el-checkbox
>
<el-checkbox v-for="(item, index) in detectionOptions" v-model="item.selected" :key="index"
:label="item.name"></el-checkbox>
<!-- disabled="true" -->
</div>
</el-tab-pane>
@@ -18,7 +12,8 @@
<div class="test-dialog">
<div class="dialog-left">
<el-steps direction="vertical" :active="activeIndex" :process-status="currentStepStatus" finish-status="success">
<el-steps direction="vertical" :active="activeIndex" :process-status="currentStepStatus"
finish-status="success">
<el-step title="源通讯校验" />
<el-step title="设备通讯校验" />
<el-step title="协议校验" />
@@ -30,28 +25,32 @@
<el-collapse v-model="collapseActiveName" accordion>
<el-collapse-item title="源通讯校验" name="1">
<div class="div-log">
<p v-for="(item, index) in step1InitLog" :key="index" :style="{color:item.type==='error'?'#F56C6C':'var(--el-text-color-regular)'}">
<p v-for="(item, index) in step1InitLog" :key="index"
:style="{ color: item.type === 'error' ? '#F56C6C' : 'var(--el-text-color-regular)' }">
{{ item.log }} <br />
</p>
</div>
</el-collapse-item>
<el-collapse-item title="设备通讯校验" name="2">
<div class="div-log">
<p v-for="(item, index) in step2InitLog" :key="index" :style="{color:item.type==='error'?'#F56C6C':'var(--el-text-color-regular)'}">
<p v-for="(item, index) in step2InitLog" :key="index"
:style="{ color: item.type === 'error' ? '#F56C6C' : 'var(--el-text-color-regular)' }">
{{ item.log }} <br />
</p>
</div>
</el-collapse-item>
<el-collapse-item title="协议校验" name="3">
<div class="div-log">
<p v-for="(item, index) in step3InitLog" :key="index" :style="{color:item.type==='error'?'#F56C6C':'var(--el-text-color-regular)'}">
<p v-for="(item, index) in step3InitLog" :key="index"
:style="{ color: item.type === 'error' ? '#F56C6C' : 'var(--el-text-color-regular)' }">
{{ item.log }} <br />
</p>
</div>
</el-collapse-item>
<el-collapse-item title="相序校验" name="4">
<div class="div-log">
<p v-for="(item, index) in step4InitLog" :key="index" :style="{color:item.type==='error'?'#F56C6C':'var(--el-text-color-regular)'}">
<p v-for="(item, index) in step4InitLog" :key="index"
:style="{ color: item.type === 'error' ? '#F56C6C' : 'var(--el-text-color-regular)' }">
{{ item.log }} <br />
</p>
</div>
@@ -214,23 +213,19 @@ const ts = ref('');
watch(activeIndex, function (newValue, oldValue) {
if(activeIndex.value === 1)
{
if (activeIndex.value === 1) {
step1InitLog.value.length = 0;
step1InitLog.value = step1Log.value;
}
if(activeIndex.value === 2)
{
if (activeIndex.value === 2) {
step2InitLog.value.length = 0;
step2InitLog.value = step2Log.value;
}
if(activeIndex.value === 3)
{
if (activeIndex.value === 3) {
step3InitLog.value.length = 0;
step3InitLog.value = step3Log.value;
}
if(activeIndex.value > 3)
{
if (activeIndex.value > 3) {
step4InitLog.value.length = 0;
step4InitLog.value = step4Log.value;
}
@@ -243,20 +238,17 @@ watch(activeIndex, function (newValue, oldValue) {
//监听goods_sn的变化
watch(testStatus, function (newValue, oldValue) {
ts.value = props.testStatus;
if(ts.value==='start')
{
if (ts.value === 'start') {
ts.value = 'process'
let timer = setInterval(() => {
if (activeIndex.value < activeTotalNum.value - 2)
activeIndex.value++
else if(activeIndex.value === activeTotalNum.value -2)
{
else if (activeIndex.value === activeTotalNum.value - 2) {
activeIndex.value++
activeIndex.value++
}
else
{
else {
clearInterval(timer)
ts.value = 'success'
}
@@ -274,17 +266,18 @@ watch(ts, function (newValue, oldValue) {
</script>
<style scoped lang="scss">
.test-dialog {
height: 350px;
display: flex;
flex-direction: row; /* 横向排列 */
flex-direction: row;
/* 横向排列 */
margin-top: 20px;
/* .dialog-left{
margin-right: 20px;
} */
}
.dialog-left {
width: 15%;
margin-left: 20px;
@@ -309,12 +302,20 @@ watch(ts, function (newValue, oldValue) {
width: 80%;
height: 100%;
}
.dialog-right :deep(.el-collapse-item__header) {
font-size: 16px;
}
.div-log {
height: 100px;
height: 145px;
overflow-y: auto;
padding-left: 10px;
p {
margin: 5px 0;
font-size: 14px;
}
}
</style>

21
frontend/src/views/home/components/table.vue
View File

@@ -631,6 +631,7 @@ let testType = "test";//检测还是复检
const handleSelectionChange = (selection: any[]) => {
devNum = selection.length;
devChannelsNum = 0;
for (let i = 0; i < selection.length; i++) {
devChannelsNum += selection[i].dev_Chns;
}
@@ -923,19 +924,15 @@ const handleTest = (val:string) => {
},
)
.then(() => {
ElMessage.success(val);
ElMessage.success('不合格项复检');
dialogTitle.value = val;
dialogFormVisible.value = true; // 打开对话框
})
.catch((action: Action) => {
ElMessage.success('全部复检');
dialogTitle.value = val;
dialogFormVisible.value = true; // 打开对话框
})
// .catch((action: Action) => {
// ElMessage({
// type: 'info',
// message:
// action === 'cancel'
// ? '以当前数据为主完成数据覆盖'
// : '取消本次导入操作',
// })
// })
}
else
{
@@ -966,7 +963,7 @@ const handleTest = (val:string) => {
return
}
if(val==='归档')
if(val==='批量归档')
{
const loading = ElLoading.service({
lock: true,
@@ -975,7 +972,7 @@ const handleTest = (val:string) => {
})
setTimeout(() => {
loading.close()
ElMessage.success("批量归档成功");
ElMessage.success("归档成功");
}, 2000)
}
};

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

@@ -3,11 +3,11 @@
<div class = "test-dialog">
<div class="dialog-left">
<el-steps direction="vertical" :active="activeIndex" :process-status="currentStepStatus" finish-status="success">
<el-step title="开始检测" description="2018-04-12 20:46"/>
<el-step title="GPS完成上送" description="2018-04-12 20:46"/>
<el-step title="设备开始上送时刻" description="2018-04-12 20:46"/>
<el-step title="设备最晚上送时刻" description="2018-04-12 20:46"/>
<el-step title="检测完成" description="2018-04-12 20:46"/>
<el-step title="开始检测" :description="startTime"/>
<el-step title="GPS完成上送" :description="gpsTime"/>
<el-step title="设备开始上送时刻" :description="devStartTime"/>
<el-step title="设备最晚上送时刻" :description="devEndTime"/>
<el-step title="检测完成" :description="finishTime"/>
</el-steps>
<!-- <el-timeline style="max-width: 600px">
<el-timeline-item
@@ -54,6 +54,11 @@ import { SuccessFilled } from '@element-plus/icons-vue'
const activeIndex = ref(0)
const activeTotalNum = ref(5)
const startTime = ref('')
const gpsTime = ref('')
const devStartTime = ref('')
const devEndTime = ref('')
const finishTime = ref('')
interface Activity {
content: string;
@@ -224,8 +229,9 @@ watch(ts, function (newValue, oldValue) {
display: flex;
flex-direction: row; /* 横向排列 */
margin-top: 20px;
min-height: 300px;
/* margin-top: 20px; */
/* min-height: 300px; */
height: 472px;
/* .dialog-left{
margin-right: 20px;
} */

14
frontend/src/views/home/tabs/dashboard.vue
View File

@@ -353,9 +353,9 @@ const resizeObserver = new ResizeObserver(entries => {
chartsWidth.value = entry.contentRect.width;
console.log('Charts Info Width:', chartsWidth.value);
pieRef1.value.reSize(chartsWidth.value * 0.95,145,true);
pieRef2.value.reSize(chartsWidth.value * 0.95,145,true);
pieRef3.value.reSize(chartsWidth.value * 0.95,145,true);
pieRef1.value.reSize(chartsWidth.value * 0.95,180,true);
pieRef2.value.reSize(chartsWidth.value * 0.95,180,true);
pieRef3.value.reSize(chartsWidth.value * 0.95,180,true);
}
});
@@ -631,4 +631,12 @@ onUnmounted(() => {
}
}
}
:deep(.el-collapse-item__conten){
// background-color:#f6f6f6;
padding-bottom: 0px !important;
}
:deep(.el-collapse-item__content ){
// background-color:#f6f6f6;
padding-bottom: 0px !important;
}
</style>