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:
GYYM
2024-12-05 17:30:25 +08:00
parent 11c32ed360
commit 6010cbf20a
7 changed files with 50 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,19 +4,19 @@
<div class="change-errsys-title"> <div class="change-errsys-title">
<el-form :model='formContent' label-width="auto" class="form-three"> <el-form :model='formContent' label-width="auto" class="form-three">
<el-form-item label="设备名称:"> <el-form-item label="设备名称">
<el-input v-model='deviceName' :disabled="true" /> <el-input v-model='deviceName' :disabled="true" />
</el-form-item> </el-form-item>
<el-form-item label="检测脚本:"> <el-form-item label="检测脚本">
<el-input v-model='testScriptName' :disabled="true" /> <el-input v-model='testScriptName' :disabled="true" />
</el-form-item> </el-form-item>
<el-form-item label="数据处理原则:"> <el-form-item label="数据原则">
<el-input v-model='dataRule' :disabled="true" /> <el-input v-model='dataRule' :disabled="true" />
</el-form-item> </el-form-item>
<el-form-item label="误差体系:"> <el-form-item label="误差体系">
<el-select v-model="error_Sys_Id" autocomplete="off"> <el-select v-model="error_Sys_Id" autocomplete="off">
<el-option v-for="plan in testErrSystDataList" :key="plan.id" :label="plan.label" :value="plan.id" <el-option v-for="plan in testErrSystDataList" :key="plan.id" :label="plan.label" :value="plan.id"
:disabled="plan.label === errorSysName"> :disabled="plan.label === errorSysName">

10
frontend/src/views/home/components/dataCheckPopup.vue
View File

@@ -3,16 +3,16 @@
<div class="data-check-dialog"> <div class="data-check-dialog">
<div class="data-check-title"> <div class="data-check-title">
<el-form :model='formContent' label-width="auto" class="form-three "> <el-form :model='formContent' label-width="auto" class="form-three ">
<el-form-item label="检测脚本:" > <el-form-item label="检测脚本" >
<el-input v-model='testScriptName' :disabled="true"/> <el-input v-model='testScriptName' :disabled="true"/>
</el-form-item> </el-form-item>
<el-form-item label="误差体系:" > <el-form-item label="误差体系" >
<el-input v-model='errorSysName' :disabled="true"/> <el-input v-model='errorSysName' :disabled="true"/>
</el-form-item> </el-form-item>
<el-form-item label="数据处理原则:" > <el-form-item label="数据原则" >
<el-input v-model='dataRule' :disabled="true"/> <el-input v-model='dataRule' :disabled="true"/>
</el-form-item> </el-form-item>
<el-form-item label="设备名称:" > <el-form-item label="设备名称" >
<el-input v-model='deviceName' :disabled="true"/> <el-input v-model='deviceName' :disabled="true"/>
</el-form-item> </el-form-item>
@@ -28,7 +28,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<el-form-item label='通道号:'> <el-form-item label='通道号'>
<el-select v-model="monitorIdx"> <el-select v-model="monitorIdx">
<el-option <el-option
v-for="item in monitorIdxList" v-for="item in monitorIdxList"

52
frontend/src/views/home/components/reportPopup.vue
View File

@@ -1,43 +1,37 @@
<template> <template>
<el-dialog title="报告生成" :model-value='visible' @close="handleCancel" width="832px"> <el-dialog title="报告生成" :model-value='visible' @close="handleCancel" width="832px" draggable>
<div class="report-dialog"> <div class="report-dialog">
<div class="report-title"> <div class="report-title form-two">
<div>
<el-row :gutter="24" > <el-form-item label="检测脚本" label-width="100px">
<el-col :span="12">
<el-form-item label="检测脚本:" >
<el-input v-model='testScriptName' :disabled="true"/> <el-input v-model='testScriptName' :disabled="true"/>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12"> <el-form-item label="误差体系" label-width="100px">
<el-form-item label="误差体系" >
<el-input v-model='errorSysName' :disabled="true"/> <el-input v-model='errorSysName' :disabled="true"/>
</el-form-item> </el-form-item>
</el-col>
</el-row> <el-form-item label="数据原则" label-width="100px">
</div>
<div>
<el-row :gutter="24" >
<el-col :span="12">
<el-form-item label="数据处理原则" >
<el-input v-model='dataRule' :disabled="true"/> <el-input v-model='dataRule' :disabled="true"/>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12"> <el-form-item label="报告模板" label-width="100px">
<el-form-item label="报告模板" >
<el-input v-model='reportTemplate' :disabled="true"/> <el-input v-model='reportTemplate' :disabled="true"/>
</el-form-item> </el-form-item>
</el-col>
</el-row>
</div>
</div> </div>
<div class="report-content"> <div class="report-content">
<div> <div>
<el-tabs type="border-card"> <el-tabs type="border-card">
<el-tab-pane label="报告生成状态表："> <el-tab-pane label="报告生成进度">
<div class="form-grid"> <div class="form-grid">
<div class="tabs-title"><el-button type="primary" loading >已生成2台/共4台</el-button> </div> <div class="tabs-title ">
<el-table :data="reportData" stripe="" :header-cell-style="{ textAlign: 'center' } " :cell-style="{ textAlign: 'center' }" style="width: 100%" border class="custom-table"> <span style=" font-size: 18px;font-weight: 600;">
已生成 <span style="color: #67C23A">2</span> 台/共 <span style="color: green">3</span> 台
</span>
<!-- <el-button type="primary" loading >已生成2台/共3台</el-button> -->
</div>
<div class="table-main">
<el-table :data="reportData" :header-cell-style="{ textAlign: 'center' } " :cell-style="{ textAlign: 'center' }" style="width: 100%" border class="custom-table">
<el-table-column prop="id" width="70" label="序号" /> <el-table-column prop="id" width="70" label="序号" />
<el-table-column prop="deviceName" width="150" label="设备名称" /> <el-table-column prop="deviceName" width="150" label="设备名称" />
<el-table-column label="生成进度" width="450"> <el-table-column label="生成进度" width="450">
@@ -52,6 +46,8 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
</div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
@@ -81,9 +77,9 @@ import { CirclePlus, Delete, Download,View } from '@element-plus/icons-vue'
const currentScriptDsc = ref('电压准确度检测：频率：42.5Hz Ua=46.192V 0° Ub=46.192V -120° Uc=46.192V 120° Ia=1A 0° Ib=1A -120° Ic=1A 120°'); const currentScriptDsc = ref('电压准确度检测：频率：42.5Hz Ua=46.192V 0° Ub=46.192V -120° Uc=46.192V 120° Ia=1A 0° Ib=1A -120° Ic=1A 120°');
const reportData = ref([ const reportData = ref([
{ id: '1', deviceName: '被检设备1', processValue: '100' , action:'查看' }, { id: '1', deviceName: '240001', processValue: '100' , action:'查看' },
{ id: '2', deviceName: '被检设备2', processValue: '100' , action:'查看' }, { id: '2', deviceName: '240002', processValue: '100' , action:'查看' },
{ id: '3', deviceName: '被检设备3', processValue: '10', action:'查看' }, { id: '3', deviceName: '240003', processValue: '10', action:'查看' },
]) ])
const customColors = [ const customColors = [
{ color: "red", percentage: 0 }, { color: "red", percentage: 0 },

4
frontend/src/views/home/components/resultPopup.vue
View File

@@ -3,13 +3,13 @@
<div class="result-dialog"> <div class="result-dialog">
<div class="result-title"> <div class="result-title">
<el-row> <el-row>
<el-form-item label="检测脚本:" > <el-form-item label="检测脚本" >
<el-input v-model='testScriptName' :disabled="true"/> <el-input v-model='testScriptName' :disabled="true"/>
</el-form-item> </el-form-item>
<el-form-item label="误差体系" > <el-form-item label="误差体系" >
<el-input v-model='errorSysName' :disabled="true"/> <el-input v-model='errorSysName' :disabled="true"/>
</el-form-item> </el-form-item>
<el-form-item label="数据处理原则" > <el-form-item label="数据原则" >
<el-input v-model='dataRule' :disabled="true"/> <el-input v-model='dataRule' :disabled="true"/>
</el-form-item> </el-form-item>
</el-row> </el-row>

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

@@ -24,7 +24,7 @@
<el-form-item label="检测状态" v-if="form.activeTabs != 3 && form.activeTabs != 5"> <el-form-item label="检测状态" v-if="form.activeTabs != 3 && form.activeTabs != 5">
<el-select v-model="form.checkStatus" clearable> <el-select v-model="form.checkStatus" clearable>
<el-option <el-option
v-for="(item, index) in checkResultList" v-for="(item, index) in checkStatusList"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
:disabled="item.disabled" :disabled="item.disabled"
@@ -734,7 +734,6 @@ const changeActiveTabs = (val: number,val2: number,tabledata:any[]) => {
form.value.activeChildTabs= val2; form.value.activeChildTabs= val2;
deviceData.value = tabledata; deviceData.value = tabledata;
tableHeaderInit(val) tableHeaderInit(val)
console.log(form,val,val2,666)
}; };
//根据当前功能，初始化表头下拉框中的默认值和禁用值 //根据当前功能，初始化表头下拉框中的默认值和禁用值

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

@@ -251,15 +251,15 @@ const chartsData1: any = ref([]),
const getPieData = () => { const getPieData = () => {
chartsData1.value = [ chartsData1.value = [
{ value: Math.floor(Math.random() * 100) + 1, name: "未检测", itemStyle: { color: '#fac858' } }, { value: 12, name: "未检测", itemStyle: { color: '#fac858' } },
{ value: Math.floor(Math.random() * 100) + 1, name: "检测中", itemStyle: { color: '#ee6666' } }, { value: 0, name: "检测中", itemStyle: { color: '#ee6666' } },
{ value: Math.floor(Math.random() * 100) + 1, name: "检测完成", itemStyle: { color: '#91cc75' } }, { value: 6, name: "检测完成", itemStyle: { color: '#91cc75' } },
{ value: Math.floor(Math.random() * 100) + 1, name: "归档", itemStyle: { color: '#5470c6' } }, { value: 2, name: "归档", itemStyle: { color: '#5470c6' } },
]; ];
chartsData2.value = [ chartsData2.value = [
{ value: Math.floor(Math.random() * 100) + 1, name: "未检测" , itemStyle: { color: '#fac858' } }, { value: 12, name: "未检测" , itemStyle: { color: '#fac858' } },
{ value: Math.floor(Math.random() * 100) + 1, name: "不合格" , itemStyle: { color: '#ee6666' } }, { value: 3, name: "不合格" , itemStyle: { color: '#ee6666' } },
{ value: Math.floor(Math.random() * 100) + 1, name: "合格", itemStyle: { color: '#91cc75' } }, { value: 5, name: "合格", itemStyle: { color: '#91cc75' } },
// { value: Math.floor(Math.random() * 100) + 1, name: "有不合格项" , itemStyle: { color: '#ee6666' } }, // { value: Math.floor(Math.random() * 100) + 1, name: "有不合格项" , itemStyle: { color: '#ee6666' } },
// { value: Math.floor(Math.random() * 100) + 1, name: "全部合格", itemStyle: { color: '#91cc75' } }, // { value: Math.floor(Math.random() * 100) + 1, name: "全部合格", itemStyle: { color: '#91cc75' } },
]; ];
@@ -268,9 +268,9 @@ const getPieData = () => {
// { value: Math.floor(Math.random() * 100) + 1, name: "已生成报告" }, // { value: Math.floor(Math.random() * 100) + 1, name: "已生成报告" },
// { value: Math.floor(Math.random() * 100) + 1, name: "未生成报告" }, // { value: Math.floor(Math.random() * 100) + 1, name: "未生成报告" },
{ value: Math.floor(Math.random() * 100) + 1, name: "未检测" , itemStyle: { color: '#fac858' } }, { value: 12, name: "未检测" , itemStyle: { color: '#fac858' } },
{ value: Math.floor(Math.random() * 100) + 1, name: "未生成" , itemStyle: { color: '#ee6666' } }, { value: 4, name: "未生成" , itemStyle: { color: '#ee6666' } },
{ value: Math.floor(Math.random() * 100) + 1, name: "已生成", itemStyle: { color: '#91cc75' } }, { value: 4, name: "已生成", itemStyle: { color: '#91cc75' } },
// { value: Math.floor(Math.random() * 100) + 1, name: "未检测" , itemStyle: { color: '#fac858' } }, // { value: Math.floor(Math.random() * 100) + 1, name: "未检测" , itemStyle: { color: '#fac858' } },

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

@@ -248,27 +248,6 @@ const columns = reactive<ColumnProps<Plan.PlanAndSourceBO>[]>([
search: { el: 'select', props: { filterable: true } }, search: { el: 'select', props: { filterable: true } },
fieldNames: { label: 'label', value: 'id' }, fieldNames: { label: 'label', value: 'id' },
}, },
// {
// prop: 'father_Plan_Id',
// label: '父节点',
// width: 200,
// enum: testFatherPlanList,
// fieldNames: { label: 'label', value: 'id' },
// },
// {
// prop: 'create_Time',
// label: '记录时间',
// minWidth: 180,
// search: {
// span: 2,
// render: () => {
// return (
// <div class='flx-flex-start'>
// </div>
// )
// },
// },
// },
{ prop: 'operation', label: '操作', fixed: 'right', width: 250 }, { prop: 'operation', label: '操作', fixed: 'right', width: 250 },
]) ])