jsyhsec/energy_storage
7
0
Fork 0
mirror of https://gitee.com/js-yhsec/energy_storage.git synced 2026-05-27 18:59:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

合并代码

Browse Source
This commit is contained in:
ym1026
2025-09-11 19:08:47 +08:00
parent 506c2e98f2 1965d28ede
commit 1a22f45b26
270 changed files with 13926 additions and 2814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
web/src/views/system/alarmLog.vue
View File

@@ -1,9 +1,6 @@
<template>
<div class="alarmLog">
<searchBox
:btn-option-list="btnOptionList"
@operateForm="operateForm"
></searchBox>
<!-- <searchBox :btn-option-list="btnOptionList" @operateForm="operateForm"></searchBox> -->
<div class="content-table">
<ComTable
@@ -11,16 +8,17 @@
:table-data="tableData"
@handlePagesizeChange="handlePagesizeChange"
ref="comTable"
:table-option="tableOption"
:page-option="pageOption"
>
<template #type="record">
<span>{{ ['其它','系统日志','操作日志','设备日志'][record.type] }}</span>
<span>{{ ['其它', '系统日志', '操作日志', '设备日志'][record.type] }}</span>
</template>
<template #status="record">
<span><a-tag :color="record.status ? 'red' : 'green'">{{
record.status ? '异常' : '正常'
}}</a-tag></span>
<span
><a-tag :color="record.status==0 ? 'red' : 'green'">{{
record.status==0 ? '异常' : '正常'
}}</a-tag></span
>
</template>
<template #action="record">
@@ -28,7 +26,7 @@
</template>
</ComTable>
</div>
<a-modal v-model:open="formModal" width="750px" style="top: 20px" :footer="null">
<a-modal v-model:open="formModal" width="750px" style="top: 20px" :footer="null">
<!-- action:edit add -->
<EditCom
:record="formState"
@@ -46,11 +44,11 @@ import { getReq, postReq } from '@/request/api.js'
import EditCom from '@/components/EditCom.vue'
import { ExclamationCircleOutlined } from '@ant-design/icons-vue'
import { createVNode } from 'vue'
import { Modal } from 'ant-design-vue'
export default {
name: '',
components: {
EditCom,
EditCom
},
props: {},
data() {
@@ -63,7 +61,8 @@ export default {
page: 1
},
btnOptionList: [],
paramsDate: {}
paramsDate: {},
tableData: []
}
},
computed: {},
@@ -79,7 +78,7 @@ export default {
},
mounted() {
this.operateList = this.$getBtns(['查看', '删除'])
this.operateList = this.$getBtns(['查看'])
// this.btnOptionList = this.$getBtns(['新增'])
this.getList()
},
@@ -118,22 +117,21 @@ export default {
},
async operateForm(type, record = {}) {
this.formStatus = type
if(type=='edit'||type=='read'){
if (type == 'edit' || type == 'read') {
await this.getRuleFormInfo(record)
this.formModal = true
this.formState = record
}else if(type=='del'){
this.handleDelete([record.device_id],this.getList)
}else if(type=='back'){
} else if (type == 'del') {
this.handleDelete([record.device_id], this.getList)
} else if (type == 'back') {
this.formModal = false
this.getList()
}
},
// 删除操作
async handleDelete(id,callback) {
async handleDelete(id, callback) {
const that = this
Modal.confirm({
title: '你确认删除数据吗?',
@@ -141,10 +139,10 @@ export default {
async onOk() {
try {
const res = await getReq('/deleteUser',{user_id:id})
const res = await getReq('/deleteUser', { user_id: id })
if (res.errcode === 0) {
this.$message.success(res.errmsg)
this.pageOption.page=1
this.pageOption.page = 1
callback()
} else {
throw res
@@ -160,8 +158,6 @@ export default {
})
},
async getRuleFormInfo(record) {
const row = record || {}
for (let e of alarmlogOptions) {
@@ -182,8 +178,6 @@ export default {
// const attrs=JSON.parse(row.attrs||"{}")
// e.ruleForm[i.key] = attrs[i.key]
// }
}
}
},
@@ -199,10 +193,10 @@ export default {
<style lang="scss" scoped>
.alarmLog {
height: 100%;
padding: 20px;
.content-table {
height: calc(100% - 70px);
padding: 10px;
height: 100%;
}
}
</style>

16
web/src/views/system/device.vue
View File

@@ -18,8 +18,8 @@
<span>{{ getType(record.type) }}</span>
</template>
<template #isEnable="record">
<span><a-tag :color="record.is_open ? 'green' : 'red'">{{
record.is_open ? '启用' : '禁用'
<span><a-tag :color="record.is_open==1 ? 'green' : 'red'">{{
record.is_open==1 ? '启用' : '禁用'
}}</a-tag></span>
</template>
@@ -48,7 +48,7 @@ import OperateCom from '@/components/OperateCom'
import EditCom from '@/components/EditCom.vue'
import { ExclamationCircleOutlined } from '@ant-design/icons-vue'
import { createVNode } from 'vue'
import { Modal } from 'ant-design-vue'
import searchBox from '@/components/SearchBox.vue'
import {deviceTypeList} from '@/utils/config'
export default {
@@ -170,7 +170,7 @@ export default {
// 删除操作
async handleDelete(id,callback) {
const that = this
Modal.confirm({
this.$Modal.confirm({
title: '你确认删除数据吗?',
icon: createVNode(ExclamationCircleOutlined),
@@ -203,7 +203,7 @@ export default {
if (i.key === 'id') {
e.ruleForm.id = row.id
} else if (i.key === 'is_open') {
e.ruleForm.is_open = Boolean(row.is_open)
e.ruleForm.is_open = Boolean(Number(row.is_open))
} else {
e.ruleForm[i.key] = row[i.key] || ''
}
@@ -232,10 +232,12 @@ export default {
<style lang="scss" scoped>
.device {
height: 100%;
padding: 0 10px;
.content-table {
height: calc(100% - 70px);
padding: 10px;
width: 100%;
height: calc(100% - 90px);
padding: 0 10px;
}
}
</style>

92
web/src/views/system/log.vue
View File

@@ -1,9 +1,6 @@
<template>
<div class="alarmlog">
<searchBox
:btn-option-list="btnOptionList"
@operateForm="operateForm"
></searchBox>
<div class="syslog">
<!-- <searchBox :btn-option-list="btnOptionList" @operateForm="operateForm"></searchBox> -->
<div class="content-table">
<ComTable
@@ -11,12 +8,14 @@
:table-data="tableData"
@handlePagesizeChange="handlePagesizeChange"
ref="comTable"
:table-option="tableOption"
:page-option="pageOption"
>
<template #gender="record">
<!-- 0:女; 1:男 -->
<span>{{ ['女', '男'][record.gender] }}</span>
<template #status="record">
<span>
<a-tag :color="record.status==0 ? 'red' : 'green'">{{
record.status==0 ? '异常' : '正常'
}}</a-tag>
</span>
</template>
<template #action="record">
@@ -37,7 +36,7 @@
</template>
<script>
import { columnList, userOptions } from '../../../public/config/columnList'
import { columnList, syslogOptions } from '../../../public/config/columnList'
import { getReq, postReq } from '@/request/api.js'
import EditCom from '@/components/EditCom.vue'
@@ -60,13 +59,14 @@ export default {
page: 1
},
btnOptionList: [],
paramsDate: {}
paramsDate: {},
tableData: []
}
},
computed: {},
created() {
let info = []
let col = columnList.find((i) => i.page == 'alarmlog').columns
let col = columnList.find((i) => i.page == 'syslog').columns
if (col.length) {
col.forEach((item) => {
info.push(this.$setWidth(item))
@@ -76,8 +76,8 @@ export default {
},
mounted() {
this.operateList = this.$getBtns(['查看', '修改', '删除'])
this.btnOptionList = this.$getBtns(['新增'])
this.operateList = this.$getBtns(['查看'])
// this.btnOptionList = this.$getBtns(['新增'])
this.getList()
},
@@ -94,7 +94,7 @@ export default {
}
try {
const res = await getReq('/queryUserList', params)
const res = await getReq('/querySystemLogList', params)
if (res.errcode === 0) {
this.$refs.comTable.loading = false
@@ -113,41 +113,25 @@ export default {
//统一处理报错提示
}
},
operateForm(type, record = {}) {
console.log(record, record.id, 'rrrrrrrrrr')
async operateForm(type, record = {}) {
this.formStatus = type
switch (type) {
case 'add':
this.formModal = true
this.formState = {}
this.getRuleFormInfo()
break
case 'edit':
case 'read':
if (type == 'edit' || type == 'read') {
await this.getRuleFormInfo(record)
this.formModal = true
this.formState = record
this.getRuleFormInfo(record)
break
case 'del':
this.handleDelete([record.user_id], this.getList)
break
case 'back':
} else if (type == 'del') {
this.handleDelete([record.device_id], this.getList)
} else if (type == 'back') {
this.formModal = false
this.getList()
break
default:
break
}
},
// 删除操作
async handleDelete(id, callback) {
const that = this
Modal.confirm({
this.$Modal.confirm({
title: '你确认删除数据吗?',
icon: createVNode(ExclamationCircleOutlined),
@@ -172,27 +156,13 @@ export default {
})
},
async getRuleFormInfo(record) {
function getInfo(data, url) {
return new Promise((reslove, reject) => {
getReq(data, url).then((res) => {
reslove(res.data)
})
})
}
const row = record || {}
let row = {}
if (record && record.user_id) {
// row = await getInfo({ id: record.id },'/queryUserList')
this.record = record
row = record
// this.type='edit'
for (let e of syslogOptions) {
for (let i of e.list) {
e.ruleForm[i.key] = row[i.key] || ''
}
}
userOptions.forEach((e, index) => {
e.list.forEach((i) => {
e.ruleForm[i.key] = row ? row[i.key] : ''
e.ruleForm.id = row.id
})
})
},
handlePagesizeChange(pageOption) {
this.pageOption.pageSize = pageOption.pageSize
@@ -204,12 +174,12 @@ export default {
</script>
<style lang="scss" scoped>
.user {
.syslog {
height: 100%;
padding: 20px;
.content-table {
height: calc(100% - 70px);
padding: 10px;
height: 100%;
}
}
</style>

12
web/src/views/system/permission.vue
View File

@@ -43,12 +43,12 @@
</template>
<script>
import { columnList, permissionOptions } from '../../../public/config/columnList'
import { columnList } from '../../../public/config/columnList'
import { getReq, postReq } from '@/request/api.js'
import { ExclamationCircleOutlined } from '@ant-design/icons-vue'
import { createVNode } from 'vue'
import { Modal } from 'ant-design-vue'
export default {
name: '',
components: {
@@ -198,13 +198,7 @@ export default {
row = record
// this.type='edit'
}
permissionOptions.forEach((e, index) => {
e.list.forEach((i) => {
e.ruleForm[i.key] = row ? row[i.key] : ''
e.ruleForm.id = row.id
})
})
},
handlePagesizeChange(pageOption) {
this.pageOption.pageSize = pageOption.pageSize

23
web/src/views/system/policy.vue
View File

@@ -14,7 +14,7 @@
<div>{{ getPolicyType(record.type) }}</div>
</template>
<template #isOpen="record">
<a-tag :color="record.is_open == 1 ? '#2db7f5' : '#f50'">{{
<a-tag :color="record.is_open == 1 ? 'green' : 'red'">{{
record.is_open == 1 ? '启用' : '禁用'
}}</a-tag>
</template>
@@ -27,8 +27,8 @@
<div>
<a-modal
v-model:open="formModal"
width="70%"
style="top: 20px"
width="900px"
style="top: 20px;"
:footer="null"
:get-container="() => $refs.policy"
>
@@ -47,6 +47,7 @@ export default {
name: '',
components: { policyForm },
props: {},
data() {
return {
formModal: false,
@@ -57,21 +58,18 @@ export default {
title: '策略ID',
dataIndex: 'policy_id',
key: 'policyId',
width: 120,
ellipsis: true
},
{
title: '策略名称',
dataIndex: 'name',
key: 'name',
width: 120,
ellipsis: true
},
{
title: '策略类型',
dataIndex: 'type', //策略类型：1：削峰套利；2：需求响应；3：自发自用
key: 'type',
width: 120,
ellipsis: true,
scopedSlots: { customRender: 'type' }
},
@@ -79,7 +77,6 @@ export default {
title: '策略描述',
dataIndex: 'describe',
key: 'describe',
width: 120,
ellipsis: true
},
{
@@ -93,7 +90,6 @@ export default {
title: '是否启用',
dataIndex: 'is_open',
key: 'isOpen',
width: 120,
ellipsis: true,
scopedSlots: { customRender: 'isOpen' }
},
@@ -102,8 +98,8 @@ export default {
title: '操作',
dataIndex: 'action',
key: 'action',
width: 150,
ellipsis: true,
fixed:'right',
scopedSlots: { customRender: 'action' }
}
],
@@ -128,16 +124,18 @@ export default {
},
methods: {
async getTableList() {
this.$refs.comTable.loading = true
try {
this.$refs.comTable.loading = false
const res = await getReq('/queryPolicyList', {
page: this.pageOption.page,
page_size: this.pageOption.pageSize
})
console.log(res)
this.tableData = res.data
this.pageOption.count = res.count
} catch (error) {
console.log(error)
this.$refs.comTable.loading = false
}
},
getPolicyType(type) {
@@ -232,12 +230,13 @@ export default {
<style lang="scss" scoped>
.policy {
width: 100%;
// width: 100%;
height: 100%;
padding: 0 15px;
padding: 0 10px;
.content-table {
width: 100%;
height: calc(100% - 90px);
padding: 0 10px;
}
}
</style>

2
web/src/views/system/role.vue
View File

@@ -51,7 +51,7 @@ import OperateCom from '@/components/OperateCom'
import EditCom from '@/components/EditCom.vue'
import { ConsoleSqlOutlined, ExclamationCircleOutlined } from '@ant-design/icons-vue'
import { createVNode } from 'vue'
import { Modal } from 'ant-design-vue'
import searchBox from '@/components/SearchBox.vue'
export default {
name: '',

2
web/src/views/system/service.vue
View File

@@ -44,7 +44,7 @@ import { getReq, postReq } from '@/request/api.js'
import EditCom from '@/components/EditCom.vue'
import { ExclamationCircleOutlined } from '@ant-design/icons-vue'
import { createVNode } from 'vue'
import { Modal } from 'ant-design-vue'
import searchBox from '@/components/SearchBox.vue'
export default {
name: '',

2
web/src/views/system/station.vue
View File

@@ -51,7 +51,7 @@ import OperateCom from '@/components/OperateCom'
import EditCom from '@/components/EditCom.vue'
import { ExclamationCircleOutlined } from '@ant-design/icons-vue'
import { createVNode } from 'vue'
import { Modal } from 'ant-design-vue'
import searchBox from '@/components/SearchBox.vue'
export default {
name: '',

10
web/src/views/system/user.vue
View File

@@ -41,20 +41,14 @@
<script>
import { columnList, userOptions } from '../../../public/config/columnList'
import { getReq, postReq } from '@/request/api.js'
import ComTable from '@/components/ComTable'
import OperateCom from '@/components/OperateCom'
import EditCom from '@/components/EditCom.vue'
import { ExclamationCircleOutlined } from '@ant-design/icons-vue'
import { createVNode } from 'vue'
import { Modal } from 'ant-design-vue'
import searchBox from '@/components/SearchBox.vue'
import { createVNode } from 'vue'
export default {
name: '',
components: {
searchBox,
EditCom,
ComTable,
OperateCom
},
props: {},
data() {
@@ -157,7 +151,7 @@ export default {
// 删除操作
async handleDelete(id,callback) {
const that = this
Modal.confirm({
this.$Modal.confirm({
title: '你确认删除数据吗?',
icon: createVNode(ExclamationCircleOutlined),