Web/hb_pqs_web
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.1.22:3000/root/HB_PMS3.0_WEB

Browse Source
This commit is contained in:
GGJ
2025-04-18 15:15:09 +08:00
parent 0a521bdcb7 263cd764f3
commit b317bf9c7d
8 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/views/Account-management/components/Monitoringpoint.vue
View File

@@ -615,21 +615,24 @@ export default {
//台区台账表头
tableHeaderMonitoring: [
// { prop: 'id', label: '监测点编号', width: 120 },
{ prop: 'monitorObjectName', label: '监测对象名称', width: 250 },
{ prop: 'name', label: '测点名称', width: 220 },
{ prop: 'monitorId', label: '测点编号', width: 220 },
{ prop: 'orgName', label: '组织机构名称', width: 170 },
{ prop: 'operationName', label: '运维单位名称', width: 170 },
{ prop: 'midStation', label: '变电站编号', width: 150 },
{ prop: 'powerrName', label: '变电站名称', width: 120 },
//{ prop: "generatrixName", label: "母线名称", width: 120 },
{ prop: 'busId', label: '母线编号', width: 180 },
{ prop: 'lineName', label: '母线名称', width: 180 },
// { prop: "lineId", label: "监测线路ID", width: 180 },
{ prop: "lineNum", label: "装置接线序号", width: 180 },
{ prop: 'voltageLevel', label: '电压等级', width: 100 },
{ prop: 'monitorState', label: '监测点状态', width: 120 },
{ prop: 'monitorObjectName', label: '监测对象名称', width: 250 },
{ prop: 'monitorType', label: '监测点类型', width: 120 },
{ prop: 'minShortCircuitCapacity', label: '最小短路容量', width: 120 },
{ prop: 'powerSupplyEqCapacity', label: '供电设备容量', width: 120 },
{ prop: 'userAgreementCapacity', label: '用户协议容量', width: 120 },
{ prop: 'putDate', label: '投运日期', width: 120 },
{
prop: 'voltageDeviationUpperLimit',
label: '电压偏差限值（上）',
@@ -1384,7 +1387,7 @@ export default {
form.pageSize = this.total
getAllMonitorPageList(form).then(res => {
this.$refs.Monitoringpoint.exportData({
filename: '监测点台账', // 文件名字
filename: '监测点台账'+new Date().getTime(), // 文件名字
sheetName: 'Sheet1',
type: 'xlsx', //导出文件类型 xlsx 和 csv
useStyle: true,

18
src/views/Process-supervision/Supervisionmanage2/Workplan.vue
View File

@@ -2024,12 +2024,22 @@ export default {
this.$refs.ruleform.validate(value => {
// console.log(value);
if (value == true) {
if(this.ruleform.ifReleaseWarning == 1){
//需要提示预告警单不能为空
if(this.ruleform.workAlarmId == null || this.ruleform.workAlarmId == ''){
this.$message.warning("关联告预警单不可为空！");
return
}
}
this.$confirm('是否确认新增?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
addProblem(this.ruleform).then(res => {
if (res.code == 'A0000') {
this.$message({
@@ -2194,6 +2204,14 @@ export default {
this.$refs.ruleform.validate(value => {
// console.log(value);
if (value == true) {
if(this.ruleform.ifReleaseWarning == 1){
//需要提示预告警单不能为空
if(this.ruleform.workAlarmId == null || this.ruleform.workAlarmId == ''){
this.$message.warning("关联告预警单不可为空！");
return
}
}
this.$confirm('是否确认修改?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',

4
src/views/Process-supervision/components/harmonicmanagement/Planmanagement.vue
View File

@@ -29,7 +29,7 @@
<el-col :span="24">
<div class="button" style="float: left">
<el-button type="primary" icon="el-icon-circle-plus" @click="planAdditionFn">新增计划</el-button>
<el-button type="primary" icon="el-icon-s-claim" @click="planReviewFn">提交审核</el-button>
<!-- <el-button type="primary" icon="el-icon-s-claim" @click="planReviewFn">提交审核</el-button>-->
</div>
<div class="button">
@@ -667,7 +667,7 @@ export default {
//获取审核人列表
getAuditUser() {
let param = {roleType: 3}
let param = {roleType: 1}
getAuditUser(param).then(res => {
if (res && res.code === 'A0000') {
this.auditUserList = res.data

2
src/views/Process-supervision/components/interferencemanagement/Undocumentednonlinear.vue
View File

@@ -1195,7 +1195,7 @@ export default {
//获取审核人列表
getAuditUser() {
let param = {roleType: 3}
let param = {roleType: 1}
getAuditUser(param).then(res => {
if (res && res.code === 'A0000') {
this.auditUserList = res.data

4
src/views/Process-supervision/harmonicmanagement.vue
View File

@@ -6,9 +6,9 @@
<el-tab-pane label="普测计划管理" name="1" :style="'height:' + vh + 'px;'">
<Planmanagement v-if="activeName == '1'"></Planmanagement>
</el-tab-pane>
<el-tab-pane label="普测计划审批" name="2" :style="'height:' + vh + 'px;'">
<!-- <el-tab-pane label="普测计划审批" name="2" :style="'height:' + vh + 'px;'">
<Planapproval v-if="activeName == '2'" ref="planapprovalRef" :son="planId"></Planapproval>
</el-tab-pane>
</el-tab-pane>-->
<!-- <el-tab-pane label="普测结果管理" name="3" :style="'height:' + vh + 'px;'">
<Resultsmanagement v-if="activeName == '3'"></Resultsmanagement>
</el-tab-pane>

4
src/views/SpecialAnalysisModuleDesign/ElectricRailwayLine.vue
View File

@@ -35,13 +35,13 @@
<influence v-if="activeName == '4'"></influence>
</el-tab-pane>
<!-- <el-tab-pane
<el-tab-pane
label="详细数据表"
name="5"
:style="'height:' + vh + ';'"
>
<dataSheet v-if="activeName == '5'"></dataSheet>
</el-tab-pane> -->
</el-tab-pane>
</el-tabs>
</el-col>
</el-row>

2
src/views/flow_task/components/normalPlanInit.vue
View File

@@ -264,7 +264,7 @@ export default {
//获取审核人列表
getAuditUser() {
let param = {roleType: 3}
let param = {roleType: 1}
getAuditUser(param).then(res => {
if (res && res.code === 'A0000') {
this.auditUserList = res.data

6
src/views/harmonic-boot/data-feed/index.vue
View File

@@ -69,7 +69,7 @@
</el-form-item>
<el-form-item style="float: right;margin-right: 50px">
<el-button :disabled="store.params.dataType === '01'" type="primary" @click="reCalUpload(activeName)">
<el-button :disabled="store.params.dataType === '01'" type="primary" @click="reCalUpload('1')">
{{ storeList[activeName].label + '重新计算' }}
</el-button>
</el-form-item>
@@ -605,7 +605,7 @@ export default {
let dateMonth = this.store.params.searchBeginTime.substring(0, 7)
//月
request
.get('/prepare-boot/dimGlobal/reCalMonthUploadAlgorithm?statisticDate=' + dateMonth + '&type=' + type)
.get('/prepare-boot/dimGlobal/reCalMonthUploadAlgorithm?statisticDate=' + dateMonth + '&type=1')
.then(res => {
if (res && res.code === 'A0000') {
this.$message({
@@ -617,7 +617,7 @@ export default {
})
} else {
request
.get('/prepare-boot/dimGlobal/reCalUploadAlgorithm?statisticDate=' + this.store.params.searchBeginTime + '&type=' + type)
.get('/prepare-boot/dimGlobal/reCalUploadAlgorithm?statisticDate=' + this.store.params.searchBeginTime + '&type=1')
.then(res => {
if (res && res.code === 'A0000') {
this.$message({