feat(plan): 闪变提示信息做大做显眼,居中显示;
This commit is contained in:
@@ -378,6 +378,39 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<ImportExcel ref="deviceImportExcel" @result="importResult" />
|
<ImportExcel ref="deviceImportExcel" @result="importResult" />
|
||||||
|
<transition name="fade">
|
||||||
|
<div
|
||||||
|
v-if="shanBianDialogVisible"
|
||||||
|
style="
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
position: absolute;
|
||||||
|
z-index: 999999999;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
background-color: rgba(0, 0, 0, 0.5);
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
style="
|
||||||
|
padding: 10px;
|
||||||
|
border: 1px solid var(--el-color-warning);
|
||||||
|
border-radius: 5px;
|
||||||
|
user-select: none;
|
||||||
|
background-color: var(--el-color-danger-light-9);
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<el-text style="font-weight: bold" type="warning" size="large">
|
||||||
|
<el-icon><WarningFilled /></el-icon>
|
||||||
|
闪变耗时较长,不推荐批量被检设备在检测过程中采集该指标
|
||||||
|
<el-icon @click="() => (shanBianDialogVisible = false)"><Close /></el-icon>
|
||||||
|
</el-text>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</transition>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -414,6 +447,7 @@ import { downloadTemplate, importPqDev } from '@/api/device/device'
|
|||||||
import { getTestConfig } from '@/api/system/base'
|
import { getTestConfig } from '@/api/system/base'
|
||||||
import { getRegRes } from '@/api/system/versionRegister'
|
import { getRegRes } from '@/api/system/versionRegister'
|
||||||
import DevSelect from '@/views/plan/planList/components/devSelect.vue'
|
import DevSelect from '@/views/plan/planList/components/devSelect.vue'
|
||||||
|
import { WarningFilled } from '@element-plus/icons-vue'
|
||||||
|
|
||||||
const modeStore = useModeStore()
|
const modeStore = useModeStore()
|
||||||
const AppSceneStore = useAppSceneStore()
|
const AppSceneStore = useAppSceneStore()
|
||||||
@@ -444,6 +478,7 @@ const planType = ref<number>(0)
|
|||||||
const subPlanBindStandardDev = ref<any>([]) //哪些标准设备已经被子计划绑定
|
const subPlanBindStandardDev = ref<any>([]) //哪些标准设备已经被子计划绑定
|
||||||
const activeNames = ref(['1'])
|
const activeNames = ref(['1'])
|
||||||
const allDisabled = ref(false)
|
const allDisabled = ref(false)
|
||||||
|
const shanBianDialogVisible = ref(false)
|
||||||
const leaderData = ref<any[]>([])
|
const leaderData = ref<any[]>([])
|
||||||
const memberData = ref<any[]>([])
|
const memberData = ref<any[]>([])
|
||||||
const generateData = () => {
|
const generateData = () => {
|
||||||
@@ -761,7 +796,7 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
|
|||||||
user_Result: any
|
user_Result: any
|
||||||
|
|
||||||
if (mode.value === '比对式') {
|
if (mode.value === '比对式') {
|
||||||
[
|
;[
|
||||||
PqErrSys_Result,
|
PqErrSys_Result,
|
||||||
pqDevList_Result,
|
pqDevList_Result,
|
||||||
pqReportName_Result,
|
pqReportName_Result,
|
||||||
@@ -805,9 +840,8 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
|
|||||||
const dataRuleDict = dictStore.getDictData('Data_Rule')
|
const dataRuleDict = dictStore.getDictData('Data_Rule')
|
||||||
const rule = dataRuleDict.find(item => item.code === 'Cp95_Value')
|
const rule = dataRuleDict.find(item => item.code === 'Cp95_Value')
|
||||||
formContent.dataRule = rule ? rule.id : ''
|
formContent.dataRule = rule ? rule.id : ''
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
[pqSource_Result, PqScript_Result, PqErrSys_Result, pqDevList_Result, pqReportName_Result] =
|
;[pqSource_Result, PqScript_Result, PqErrSys_Result, pqDevList_Result, pqReportName_Result] =
|
||||||
await Promise.all([
|
await Promise.all([
|
||||||
getTestSourceList(data),
|
getTestSourceList(data),
|
||||||
getPqScriptList(data),
|
getPqScriptList(data),
|
||||||
@@ -873,7 +907,7 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
|
|||||||
isSelectDisabled.value = true
|
isSelectDisabled.value = true
|
||||||
formContent.memberIds = data.members
|
formContent.memberIds = data.members
|
||||||
}
|
}
|
||||||
[
|
;[
|
||||||
PqErrSys_Result,
|
PqErrSys_Result,
|
||||||
boundPqDevList_Result,
|
boundPqDevList_Result,
|
||||||
unboundPqDevList_Result,
|
unboundPqDevList_Result,
|
||||||
@@ -920,7 +954,7 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
[
|
;[
|
||||||
pqSource_Result,
|
pqSource_Result,
|
||||||
PqScript_Result,
|
PqScript_Result,
|
||||||
PqErrSys_Result,
|
PqErrSys_Result,
|
||||||
@@ -1048,7 +1082,10 @@ const handleTestItemChange = () => {
|
|||||||
.filter(option => formContent.testItems.includes(option.value))
|
.filter(option => formContent.testItems.includes(option.value))
|
||||||
.find(option => option.label === '闪变')
|
.find(option => option.label === '闪变')
|
||||||
if (hasShanBian) {
|
if (hasShanBian) {
|
||||||
ElMessage.warning('闪变耗时较长,不推荐批量被检设备在检测过程中采集该指标')
|
shanBianDialogVisible.value = true
|
||||||
|
setTimeout(() => {
|
||||||
|
shanBianDialogVisible.value = false
|
||||||
|
}, 5000)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1208,7 +1245,7 @@ const handleDataSourceChange = () => {
|
|||||||
formContent.datasourceIds = []
|
formContent.datasourceIds = []
|
||||||
}
|
}
|
||||||
|
|
||||||
if(hasLuBo && hasMinuteStats){
|
if (hasLuBo && hasMinuteStats) {
|
||||||
ElMessage.warning('录波数据与分钟统计数据不能同时选择')
|
ElMessage.warning('录波数据与分钟统计数据不能同时选择')
|
||||||
formContent.datasourceIds = []
|
formContent.datasourceIds = []
|
||||||
}
|
}
|
||||||
@@ -1272,4 +1309,12 @@ const props = defineProps<{
|
|||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
.fade-enter-active,
|
||||||
|
.fade-leave-active {
|
||||||
|
transition: opacity 0.5s;
|
||||||
|
}
|
||||||
|
.fade-enter-from,
|
||||||
|
.fade-leave-to {
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
Reference in New Issue
Block a user