Web/admin-sjzx
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

终端检测&干扰源版本提交

Browse Source
This commit is contained in:
zhujiyan
2024-05-29 14:04:42 +08:00
parent 3d0bd8f644
commit 62e68e4434
5 changed files with 47 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue
View File

@@ -92,7 +92,6 @@ const createNewDiagram = async (xml) => {
// TODO 芋艿：如果多个 endActivity 的话，目前的逻辑可能有一定的问题。https://www.jdon.com/workflow/multi-events.html
const highlightDiagram = async () => {
const activityList = activityLists.value
console.log(activityLists.value,"高亮数据444455666");
if (activityList.length === 0) {
return
}
@@ -105,10 +104,8 @@ const highlightDiagram = async () => {
//进行中高亮之后的任务 key 集合，用于过滤掉 taskList 进行中后面的任务，避免进行中后面的数据 Hover 还有数据
let removeTaskDefinitionKeyList = []
// debugger
console.log(bpmnModeler.getDefinitions().rootElements,"打印bpmnModeler.getDefinitions().rootElements[0]");
//芋道这里取值是rootElements[0].flowElements
bpmnModeler.getDefinitions().rootElements[1].flowElements?.forEach((n: any) => {
console.log(n,"打印nnnnnnnnnnnnnnnnn");
let activity: any = activityList.find((m: any) => m.key === n.id) // 找到对应的活动
if (!activity) {
return
@@ -370,7 +367,6 @@ const elementHover = (element) => {
if (activity.endTime > 0) {
html += `<p>结束时间：${formatDate(activity.endTime)}</p>`
}
console.log(html)
} else if (element.value.type === 'bpmn:EndEvent' && processInstance.value) {
let optionData = getIntDictOptions(DICT_TYPE.BPM_TASK_STATUS)
let dataResult = ''
@@ -388,7 +384,6 @@ const elementHover = (element) => {
html += `<p>结束时间：${formatDate(processInstance.value.endTime)}</p>`
}
}
// console.log(html, 'html111111111111111')
elementOverlayIds.value[element.value.id] = toRaw(overlays.value)?.add(element.value, {
position: { left: 0, bottom: 0 },
html: `<div class="element-overlays">${html}</div>`

2
src/router/static.ts
View File

@@ -116,7 +116,7 @@ export const adminBaseRoute = {
name: 'BpmProcessInstanceDetail',
meta: {
title: pageTitle('router.instanceDetail')
}
},
},
{
path: 'ProgramReviewInter',

40
src/views/pqs/supervise/interfere/components/undocumented/detail.vue
View File

@@ -39,9 +39,6 @@
<el-descriptions-item label="工程名">
{{ detailData.projectName }}
</el-descriptions-item>
<el-descriptions-item label="用户协议容量" v-if="detailData.userType == 0 || detailData.userType == 1">
{{ proviteData.agreementCapacity }}
</el-descriptions-item>
<el-descriptions-item label="电压等级">
{{
voltageLevelList.find(item => {
@@ -108,12 +105,11 @@
{{ proviteData.antiInterferenceTest == 0 ? '否' : '是' }}
</span>
</el-descriptions-item>
<el-descriptions-item label="PCC点" v-if="detailData.userType != 0 && detailData.userType != 1">
{{ proviteData?.pccPoint }}
<el-descriptions-item label="用户协议容量（MVA）" v-if="detailData.userType == 0 || detailData.userType == 1">
{{ proviteData.agreementCapacity }}
</el-descriptions-item>
<el-descriptions-item
label="PCC供电设备容量"
label="PCC供电设备容量（MVA）"
v-if="
detailData.userType == '2' ||
detailData.userType == '3' ||
@@ -124,7 +120,7 @@
{{ proviteData.pccEquipmentCapacity }}
</el-descriptions-item>
<el-descriptions-item
label="基准短路容量"
label="基准短路容量（MVA）"
v-if="
detailData.userType == '2' ||
detailData.userType == '3' ||
@@ -134,19 +130,8 @@
>
{{ proviteData.baseShortCircuitCapacity }}
</el-descriptions-item>
{{ proviteData }}
<el-descriptions-item label="评估类型" v-if="detailData.userType != 0 && detailData.userType != 1">
{{
evaluationTypeList.find(item => {
return item.id == proviteData?.evaluationType
})?.name
}}
</el-descriptions-item>
<el-descriptions-item label="预测评估评审单位" v-if="detailData.userType != 0 && detailData.userType != 1">
{{ proviteData?.evaluationChekDept }}
</el-descriptions-item>
<el-descriptions-item
label="系统最小短路容量"
label="系统最小短路容量（MVA）"
v-if="
detailData.userType == '2' ||
detailData.userType == '3' ||
@@ -157,7 +142,7 @@
{{ proviteData?.minShortCircuitCapacity }}
</el-descriptions-item>
<el-descriptions-item
label="用户用电协议容量"
label="用户用电协议容量（MVA）"
v-if="
detailData.userType == '2' ||
detailData.userType == '3' ||
@@ -167,6 +152,19 @@
>
{{ proviteData?.userAgreementCapacity }}
</el-descriptions-item>
<el-descriptions-item label="PCC点" v-if="detailData.userType != 0 && detailData.userType != 1">
{{ proviteData?.pccPoint }}
</el-descriptions-item>
<el-descriptions-item label="评估类型" v-if="detailData.userType != 0 && detailData.userType != 1">
{{
evaluationTypeList.find(item => {
return item.id == proviteData?.evaluationType
})?.name
}}
</el-descriptions-item>
<el-descriptions-item label="预测评估评审单位" v-if="detailData.userType != 0 && detailData.userType != 1">
{{ proviteData?.evaluationChekDept }}
</el-descriptions-item>
<el-descriptions-item label="行业" v-if="detailData.userType == 6">
{{
industryList.find(item => {

28
src/views/pqs/supervise/plan/components/effectProblem/addForm.vue
View File

@@ -108,12 +108,6 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item for="-" label="问题简要描述：" prop="simpleProblemDesc">
<el-input v-model="form.simpleProblemDesc" autocomplete="off" placeholder="请输入问题简要描述" />
</el-form-item>
<el-form-item for="-" label="问题描述：" prop="problemDesc">
<el-input v-model="form.problemDesc" autocomplete="off" placeholder="请输入问题描述" />
</el-form-item>
<el-form-item for="-" label="问题发现时间：" prop="discoveryTime">
<el-date-picker
style="width: 100%"
@@ -124,17 +118,23 @@
placeholder="问题发现时间"
/>
</el-form-item>
<el-form-item for="-" label="定级依据：" prop="problemLevelReason">
<el-input v-model="form.problemLevelReason" autocomplete="off" placeholder="请输入定级依据" />
<el-form-item for="-" label="定级依据：" prop="problemLevelReason" style="width:100%;">
<el-input type="textarea" v-model="form.problemLevelReason" autocomplete="off" placeholder="请输入定级依据" />
</el-form-item>
<el-form-item for="-" label="整改方案：" prop="rectificationProgramme">
<el-input v-model="form.rectificationProgramme" autocomplete="off" placeholder="请输入整改方案" />
<el-form-item for="-" label="问题简要描述：" prop="simpleProblemDesc" style="width:100%;">
<el-input type="textarea" v-model="form.simpleProblemDesc" autocomplete="off" placeholder="请输入问题简要描述" />
</el-form-item>
<el-form-item for="-" label="整改措施：" prop="rectificationMeasure">
<el-input v-model="form.rectificationMeasure" autocomplete="off" placeholder="请输入整改措施" />
<el-form-item for="-" label="问题描述：" prop="problemDesc" style="width:100%;">
<el-input type="textarea" v-model="form.problemDesc" autocomplete="off" placeholder="请输入问题描述" />
</el-form-item>
<el-form-item for="-" label="备注：">
<el-input v-model="form.remark" autocomplete="off" placeholder="请输入备注" />
<el-form-item for="-" label="整改方案：" prop="rectificationProgramme" style="width:100%;">
<el-input type="textarea" v-model="form.rectificationProgramme" autocomplete="off" placeholder="请输入整改方案" />
</el-form-item>
<el-form-item for="-" label="整改措施：" prop="rectificationMeasure" style="width:100%;">
<el-input type="textarea" v-model="form.rectificationMeasure" autocomplete="off" placeholder="请输入整改措施" />
</el-form-item>
<el-form-item for="-" label="备注：" style="width:100%;">
<el-input type="textarea" v-model="form.remark" autocomplete="off" placeholder="请输入备注" />
</el-form-item>
</el-form>
<template #footer v-if="openType != 'detail'">

26
src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
View File

@@ -196,10 +196,10 @@
</el-select>
</el-form-item>
<el-form-item for="-" label="终端IP：" prop="terminalIp">
<el-input v-model="form.terminalIp" autocomplete="off" placeholder="请输入终端IP" />
<el-input oninput="value=value.replace(/[^0-9.]/g,'')" v-model="form.terminalIp" autocomplete="off" placeholder="请输入终端IP" />
</el-form-item>
<el-form-item for="-" label="端口：" prop="terminalPort">
<el-input v-model="form.terminalPort" autocomplete="off" placeholder="请输入端口" />
<el-input oninput="value=value.replace(/[^0-9.]/g,'')" v-model="form.terminalPort" autocomplete="off" placeholder="请输入端口" />
</el-form-item>
<el-form-item for="-" label="投运时间：" prop="commissioningTime">
<el-date-picker
@@ -368,12 +368,12 @@
/>
</el-form-item>
<el-form-item for="-" label="经度：" prop="longitude">
<!-- <el-form-item for="-" label="经度：" prop="longitude">
<el-input v-model="form.longitude" autocomplete="off" placeholder="请输入经度" />
</el-form-item>
<el-form-item for="-" label="纬度：" prop="latitude">
<el-input v-model="form.latitude" autocomplete="off" placeholder="请输入纬度" />
</el-form-item>
</el-form-item> -->
<el-form-item for="-" label="SIM卡号：" prop="simCardNumber">
<el-input v-model="form.simCardNumber" autocomplete="off" placeholder="请输入SIM卡号" />
@@ -652,7 +652,7 @@ const summonFlagList = [
},
{
id: '1',
name: '变为触发'
name: '变位触发'
}
]
//定义电镀功能下拉框数据
@@ -734,8 +734,8 @@ const resetForm =async () => {
electroplatingFunction: electroplatingFunctionList[0].id, //电镀功能
frontEndMachine: frontEndMachineList.value[0]?.id, //所属前置机
identificationCode: '', // 识别码
latitude: '0', //纬度
longitude: '0', //经度
// latitude: '0', //纬度
// longitude: '0', //经度
manufacturer: manufacturerList[0].id, //厂家
manufacturerDeviceNumber: '', // 厂家设备编号
monitoringDeviceInstallationPosition: monitoringDeviceInstallationPositionList[0].id, //监测装置安装位置
@@ -794,8 +794,8 @@ const devReportForm = ref({
electroplatingFunction: electroplatingFunctionList[0].id, //电镀功能
frontEndMachine: frontEndMachineList.value[0]?.id, //所属前置机
identificationCode: '', // 识别码
latitude: '0', //纬度
longitude: '0', //经度
// latitude: '0', //纬度
// longitude: '0', //经度
manufacturer: manufacturerList[0].id, //厂家
manufacturerDeviceNumber: '', // 厂家设备编号
monitoringDeviceInstallationPosition: monitoringDeviceInstallationPositionList[0].id, //监测装置安装位置
@@ -957,14 +957,14 @@ const rules = ref({
],
terminalPort: [
{
required: false,
required: true,
message: '请输入端口',
trigger: 'blur'
}
],
frontEndMachine: [
{
required: false,
required: true,
message: '请选择所属前置机',
trigger: 'change'
}
@@ -985,14 +985,14 @@ const rules = ref({
],
identificationCode: [
{
required: true,
required: false,
message: '请输入识别码',
trigger: 'blur'
}
],
terminalSecretKey: [
{
required: true,
required: false,
message: '请输入终端秘钥',
trigger: 'blur'
}