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

Merge branch 'master' of http://192.168.1.22:3000/ClientApps/pqs-9100_client

Browse Source 
# Conflicts:
#	frontend/src/views/machine/device/components/monitorTab.vue
This commit is contained in:
sjl
2025-11-04 09:18:40 +08:00
parent a4b016ef0d d329b68592
commit e7c93d03aa
3 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/api/device/interface/monitor.ts
View File

@@ -27,6 +27,7 @@ export namespace Monitor {
statInterval: number; //统计间隔
harmSysId: string; //默认与谐波系统监测点ID相同
checkFlag: number;//是否参与检测0否1是
resultType:string|null; //检测结果类型
}
/**

30
frontend/src/views/machine/device/components/monitorPopup.vue
View File

@@ -11,15 +11,15 @@
<div>
<el-form :model="formContent" ref="dialogFormRef" :rules="rules" label-width="140" class="form-two">
<el-form-item label="名称" prop="name">
<el-input clearable v-model="formContent.name" placeholder="请输入监测点名称" />
<el-input clearable v-model="formContent.name" placeholder="请输入监测点名称" :disabled="props.DevFormContent.importFlag == 1 || formContent.resultType!=null"/>
</el-form-item>
<el-form-item label="线路号" prop="num">
<el-select v-model="formContent.num" placeholder="请选择线路号" @change="handleMonNumChange">
<el-select v-model="formContent.num" placeholder="请选择线路号" @change="handleMonNumChange" :disabled="props.DevFormContent.importFlag == 1 || formContent.resultType!=null">
<el-option v-for="item in lineNum" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="所属母线" prop="busbar">
<el-input v-model="formContent.busbar" clearable placeholder="请输入所属母线" />
<el-input v-model="formContent.busbar" clearable placeholder="请输入所属母线" :disabled="props.DevFormContent.importFlag == 1 || formContent.resultType!=null"/>
</el-form-item>
<!-- <el-form-item label="所属母线" prop="busbar">
<el-select
@@ -38,7 +38,7 @@
</el-select>
</el-form-item> -->
<el-form-item label="接线方式" prop="connection">
<el-select v-model="formContent.connection" clearable placeholder="请选择接线方式">
<el-select v-model="formContent.connection" clearable placeholder="请选择接线方式" :disabled="props.DevFormContent.importFlag == 1 || formContent.resultType!=null">
<el-option
v-for="item in dictStore.getDictData('Dev_Connect')"
:key="item.id"
@@ -56,11 +56,11 @@
</template>
<div class="ratio-input-group">
<el-form-item prop="ptPrimary" class="ratio-form-item">
<el-input v-model="ptPrimary" placeholder="一次侧" @input="handlePtInput" />
<el-input v-model="ptPrimary" placeholder="一次侧" @input="handlePtInput" :disabled="props.DevFormContent.importFlag == 1 || formContent.resultType!=null"/>
</el-form-item>
<div class="colon">:</div>
<el-form-item prop="ptSecondary" style="margin-left: 10px" class="ratio-form-item">
<el-input v-model="ptSecondary" placeholder="二次侧" @input="handlePtInput" />
<el-input v-model="ptSecondary" placeholder="二次侧" @input="handlePtInput" :disabled="props.DevFormContent.importFlag == 1 || formContent.resultType!=null"/>
</el-form-item>
</div>
</el-form-item>
@@ -75,17 +75,17 @@
</template>
<div class="ratio-input-group">
<el-form-item prop="ctPrimary" class="ratio-form-item">
<el-input v-model="ctPrimary" placeholder="一次侧" @input="handleCtInput" />
<el-input v-model="ctPrimary" placeholder="一次侧" @input="handleCtInput" :disabled="props.DevFormContent.importFlag == 1 || formContent.resultType!=null"/>
</el-form-item>
<div class="colon">:</div>
<el-form-item prop="ctSecondary" style="margin-left: 10px" class="ratio-form-item">
<el-input v-model="ctSecondary" placeholder="二次侧" @input="handleCtInput" />
<el-input v-model="ctSecondary" placeholder="二次侧" @input="handleCtInput" :disabled="props.DevFormContent.importFlag == 1 || formContent.resultType!=null"/>
</el-form-item>
</div>
</el-form-item>
<el-form-item label="统计间隔" prop="statInterval">
<el-select v-model="formContent.statInterval" clearable placeholder="请选择统计间隔">
<el-select v-model="formContent.statInterval" clearable placeholder="请选择统计间隔" :disabled="props.DevFormContent.importFlag == 1 || formContent.resultType!=null">
<el-option
v-for="item in dictStore.getDictData('Dev_Chns')"
:key="item.id"
@@ -95,10 +95,10 @@
</el-select>
</el-form-item>
<el-form-item label="谐波系统检测点id" prop="harmSysId" placeholder="请输入谐波系统检测点id">
<el-input v-model="formContent.harmSysId" />
<el-input v-model="formContent.harmSysId" :disabled="props.DevFormContent.importFlag == 1 || formContent.resultType!=null"/>
</el-form-item>
<el-form-item label="是否参与检测" prop="checkFlag" placeholder="请输入CT编号">
<el-select v-model="formContent.checkFlag" clearable placeholder="请选择是否加密">
<el-select v-model="formContent.checkFlag" :disabled="formContent.resultType!=null">
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option>
</el-select>
@@ -140,6 +140,11 @@ const ptSecondary = ref<string>('')
const ctPrimary = ref<string>('')
const ctSecondary = ref<string>('')
// 定义 props
const props = defineProps<{
DevFormContent: Device.ResPqDev
}>()
// 定义弹出组件元信息
const dialogFormRef = ref()
function useMetaInfo() {
@@ -177,7 +182,8 @@ const resetFormContent = () => {
connection: '',
statInterval: 1,
harmSysId: '',
checkFlag: 1
checkFlag: 1,
resultType: null
}
}

6
frontend/src/views/machine/device/components/monitorTab.vue
View File

@@ -15,7 +15,6 @@
type="primary"
:icon="CirclePlus"
@click="openDialog('add')"
:disabled="props.DevFormContent.importFlag == 1"
>
新增
</el-button>
@@ -38,7 +37,6 @@
link
:icon="EditPen"
:model-value="false"
:disabled="props.DevFormContent.importFlag == 1"
@click="openDialog('edit', scope.row)"
>
编辑
@@ -49,13 +47,14 @@
link
:icon="Delete"
@click="handleDelete(scope.row.id)"
:disabled="scope.row.resultType!=null"
>
删除
</el-button>
</template>
</ProTable>
</div>
<MonitorPopup @getParameter="getParameter" ref="monitorPopup" />
<MonitorPopup @getParameter="getParameter" ref="monitorPopup" :DevFormContent="props.DevFormContent"/>
</template>
<script setup lang="ts">
@@ -216,7 +215,6 @@ watch(
() => props.DevFormContent.monitorList,
newVal => {
tableData.value = newVal || []
},
{ immediate: true }
)