joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
fan 2021-03-29 11:10:57 +08:00
commit 5090b14819
9 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/iscs/iscsSystem/stationConfig/environment/index.vue
View File

@ -158,6 +158,8 @@ export default {
const data = JSON.parse(resp.data.graphData);
this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate);
document.querySelector('.Substation').scrollTop = 0;
} else {
this.loading = false;
}
});
}

4
src/views/iscs/iscsSystem/stationConfig/fas/index.vue
View File

@ -65,7 +65,7 @@ export default {
if (this.mode == 'gas') {
this.title = this.stationName + ' 气体灭火系统';
this.scaleRate = window.innerWidth / 1920;
this.height = 970;
this.height = 930;
} else if (this.mode == 'sensing') {
this.title = '';
this.scaleRate = window.innerWidth / 1920;
@ -98,6 +98,8 @@ export default {
const data = JSON.parse(resp.data.graphData);
this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate);
document.querySelector('.fasIndex').scrollTop = 0;
} else {
this.loading = false;
}
});
}

2
src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue
View File

@ -114,6 +114,8 @@ export default {
const data = JSON.parse(resp.data.graphData);
this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate);
document.querySelector('.Substation').scrollTop = 0;
} else {
this.loading = false;
}
});
}

2
src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue
View File

@ -48,6 +48,8 @@ export default {
if (resp.data) {
const data = JSON.parse(resp.data.graphData);
this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate);
} else {
this.loading = false;
}
});
}

2
src/views/iscs/iscsSystem/stationConfig/signalSystem/index.vue
View File

@ -75,6 +75,8 @@ export default {
const data = JSON.parse(resp.data.graphData);
this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate);
document.querySelector('.fasIndex').scrollTop = 0;
} else {
this.loading = false;
}
});
}

2
src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue
View File

@ -71,6 +71,8 @@ export default {
const data = JSON.parse(resp.data.graphData);
this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate);
document.querySelector('.fasIndex').scrollTop = 0;
} else {
this.loading = false;
}
});
}

18
src/views/planMonitor/components/routingoperate/routeMap.vue
View File

@ -157,19 +157,19 @@ export default {
</script>
<style lang="scss" scope>
.content-route{
display: flex;
flex-direction: column;
/deep/ {
.el-dialog__body{
.content-route /deep/ .el-dialog__body {
width: 100%;
height:100%;
flex:1;
padding: 0;
overflow: hidden;
}
}
padding: 0 !important;
overflow: hidden !important;
}
.content-route{
display: flex;
flex-direction: column;
}
.content-box{
display:flex;
height:100%;

11
src/views/planMonitor/detail.vue
View File

@ -15,17 +15,17 @@
border
>
<el-table-column prop="name" :label="this.$t('planMonitor.runGraphName')" />
<el-table-column v-if="!(/^\/design\/userlist/.test(this.$route.fullPath))" :label="this.$t('global.status')">
<!-- <el-table-column v-if="!(/^\/design\/userlist/.test(this.$route.fullPath))" :label="this.$t('global.status')">
<template slot-scope="scope">
<el-tag>{{ handlerStatus(scope.row) }}</el-tag>
</template>
</el-table-column>
<el-table-column
</el-table-column> -->
<!-- <el-table-column
v-if="!(/^\/design\/userlist/.test(this.$route.fullPath))"
prop="explanation"
show-overflow-tooltip
:label="this.$t('planMonitor.explanation')"
/>
/> -->
<el-table-column :label="this.$t('planMonitor.creationDate')">
<template slot-scope="scope">
<el-tag type="success">{{ handleTime(scope.row.createTime) }}</el-tag>
@ -33,7 +33,8 @@
</el-table-column>
<el-table-column :label="this.$t('global.operate')" width="400">
<template slot-scope="scope">
<el-button v-if="scope.row.status !=='1'" size="mini" class="button_box" type="success" :loading="scope.row.runplanLoading" @click="handleConfirm(scope.row)">{{ $t('planMonitor.load') }}</el-button>
<!-- {{ $t('planMonitor.load') }} -->
<el-button v-if="scope.row.status !=='1'" size="mini" class="button_box" type="success" :loading="scope.row.runplanLoading" @click="handleConfirm(scope.row)">编制</el-button>
<el-button v-if="isCreate && scope.row.status !=='1'" size="mini" class="button_box" type="primary" @click="handleEdit(scope.row)">{{ $t('planMonitor.modifyName') }}</el-button>
<el-button v-if="isCreate && scope.row.status !=='1'" size="mini" class="button_box" type="danger" @click="handleDelete(scope.row)">{{ $t('global.delete') }}</el-button>
<el-button v-if="isCreate && scope.row.status ==='0' && hasRelease" size="mini" class="button_box" type="primary" @click="handlePublish(scope.row)">{{ hasRelease?$t('global.release'):$t('planMonitor.applyRelease') }}</el-button>

9
src/views/planMonitor/editTool/menus/createEmptyPlan.vue
View File

@ -40,7 +40,8 @@
</el-form>
</el-row>
</el-tab-pane>
<el-tab-pane label="导入运行图" name="three">
<!-- v-if="hasRelease" -->
<!-- <el-tab-pane label="导入运行图" name="three">
<el-row>
<el-button type="text" class="uploadDemo">
<input
@ -53,7 +54,7 @@
<i class="el-icon-plus" />
</el-button>
</el-row>
</el-tab-pane>
</el-tab-pane> -->
</el-tabs>
</div>
<span slot="footer" class="dialog-footer">
@ -117,6 +118,10 @@ export default {
{ required: true, message: this.$t('rules.enterTheNameOfTheRunGraph'), trigger: 'blur' }
]
};
},
hasRelease() {
return this.$store.state.user.roles.includes('04') ||
this.$store.state.user.roles.includes('05');
}
},
mounted() {