msb-public
/
dc3-web
mirror of https://gitee.com/pnoker/dc3-web.git
1
0
Code Issues Projects Releases Wiki Activity

优化

Browse Source
develop
hongyuan.zhang 3 years ago
parent 9e70f97cba
commit 1c24246631
8 changed files with 107 additions and 76 deletions
Show Stats Download Patch File Download Diff File

10
src/api/data.js
Unescape View File

@ -2,16 +2,8 @@ import request from '@/config/axios'
export const pointValueApi = {
list: (pointValue) => request({
url: 'data_api/data/pointValue/list',
url: 'data_api/data/point_value/list',
method: 'post',
data: pointValue
})
};
export const deviceEventApi = {
list: (event) => request({
url: 'data_api/data/deviceEvent/list',
method: 'post',
data: event
})
};

72
src/api/manager.js
Unescape View File

@ -9,31 +9,26 @@ export const driverApi = {
url: 'manager_api/manager/driver/list',
method: 'post',
data: driver
}),
status: (driver) => request({
url: 'manager_api/manager/driver/status',
method: 'post',
data: driver
})
};
export const driverAttributeApi = {
add: (driverAttribute) => request({
url: 'manager_api/manager/driverAttribute/add',
url: 'manager_api/manager/driver_attribute/add',
method: 'post',
data: driverAttribute
}),
delete: (id) => request({
url: 'manager_api/manager/driverAttribute/delete/' + id,
url: 'manager_api/manager/driver_attribute/delete/' + id,
method: 'post'
}),
update: (driverAttribute) => request({
url: 'manager_api/manager/driverAttribute/update',
url: 'manager_api/manager/driver_attribute/update',
method: 'post',
data: driverAttribute
}),
list: (driverAttribute) => request({
url: 'manager_api/manager/driverAttribute/list',
url: 'manager_api/manager/driver_attribute/list',
method: 'post',
data: driverAttribute
})
@ -41,21 +36,21 @@ export const driverAttributeApi = {
export const driverInfoApi = {
add: (driverInfo) => request({
url: 'manager_api/manager/driverInfo/add',
url: 'manager_api/manager/driver_info/add',
method: 'post',
data: driverInfo
}),
delete: (id) => request({
url: 'manager_api/manager/driverInfo/delete/' + id,
url: 'manager_api/manager/driver_info/delete/' + id,
method: 'post'
}),
update: (driverInfo) => request({
url: 'manager_api/manager/driverInfo/update',
url: 'manager_api/manager/driver_info/update',
method: 'post',
data: driverInfo
}),
list: (driverInfo) => request({
url: 'manager_api/manager/driverInfo/list',
url: 'manager_api/manager/driver_info/list',
method: 'post',
data: driverInfo
})
@ -63,21 +58,21 @@ export const driverInfoApi = {
export const pointAttributeApi = {
add: (pointAttribute) => request({
url: 'manager_api/manager/pointAttribute/add',
url: 'manager_api/manager/point_attribute/add',
method: 'post',
data: pointAttribute
}),
delete: (id) => request({
url: 'manager_api/manager/pointAttribute/delete/' + id,
url: 'manager_api/manager/point_attribute/delete/' + id,
method: 'post'
}),
update: (pointAttribute) => request({
url: 'manager_api/manager/pointAttribute/update',
url: 'manager_api/manager/point_attribute/update',
method: 'post',
data: pointAttribute
}),
list: (pointAttribute) => request({
url: 'manager_api/manager/pointAttribute/list',
url: 'manager_api/manager/point_attribute/list',
method: 'post',
data: pointAttribute
})
@ -85,21 +80,21 @@ export const pointAttributeApi = {
export const pointInfoApi = {
add: (pointInfo) => request({
url: 'manager_api/manager/pointInfo/add',
url: 'manager_api/manager/point_info/add',
method: 'post',
data: pointInfo
}),
delete: (id) => request({
url: 'manager_api/manager/pointInfo/delete/' + id,
url: 'manager_api/manager/point_info/delete/' + id,
method: 'post'
}),
update: (pointInfo) => request({
url: 'manager_api/manager/pointInfo/update',
url: 'manager_api/manager/point_info/update',
method: 'post',
data: pointInfo
}),
list: (pointInfo) => request({
url: 'manager_api/manager/pointInfo/list',
url: 'manager_api/manager/point_info/list',
method: 'post',
data: pointInfo
})
@ -168,11 +163,6 @@ export const deviceApi = {
url: 'manager_api/manager/device/list',
method: 'post',
data: device
}),
status: (device) => request({
url: 'manager_api/manager/device/status',
method: 'post',
data: device
})
};
@ -208,11 +198,11 @@ export const dictionaryApi = {
method: 'get'
}),
driverAttributeDictionary: () => request({
url: 'manager_api/manager/dictionary/driverAttribute',
url: 'manager_api/manager/dictionary/driver_attribute',
method: 'get'
}),
pointAttributeDictionary: () => request({
url: 'manager_api/manager/dictionary/pointAttribute',
url: 'manager_api/manager/dictionary/point_attribute',
method: 'get'
}),
groupDictionary: () => request({
@ -228,3 +218,29 @@ export const dictionaryApi = {
method: 'get'
})
};
export const eventApi = {
driverEvent: (event) => request({
url: 'manager_api/manager/event/driver',
method: 'post',
data: event
}),
deviceEvent: (event) => request({
url: 'manager_api/manager/event/device',
method: 'post',
data: event
})
};
export const statusApi = {
driverStatus: (driver) => request({
url: 'manager_api/manager/status/driver',
method: 'post',
data: driver
}),
deviceStatus: (device) => request({
url: 'manager_api/manager/status/device',
method: 'post',
data: device
})
};

12
src/router/views/index.js
Unescape View File

@ -26,7 +26,7 @@ export default [
},
{
name: 'driverAttribute',
path: '/driverAttribute',
path: '/driver_attribute',
meta: {
isAuth: true,
title: '驱动属性'
@ -35,7 +35,7 @@ export default [
},
{
name: 'pointAttribute',
path: '/pointAttribute',
path: '/point_attribute',
meta: {
isAuth: true,
title: '位号属性'
@ -53,7 +53,7 @@ export default [
},
{
name: 'driverInfo',
path: '/driverInfo',
path: '/driver_info',
meta: {
isAuth: true,
title: '驱动配置'
@ -89,7 +89,7 @@ export default [
},
{
name: 'pointInfo',
path: '/pointInfo',
path: '/point_info',
meta: {
isAuth: true,
title: '位号配置'
@ -98,7 +98,7 @@ export default [
},
{
name: 'pointValue',
path: '/pointValue',
path: '/point_value',
meta: {
isAuth: true,
title: '数据'
@ -107,7 +107,7 @@ export default [
},
{
name: 'deviceEvent',
path: '/deviceEvent',
path: '/device_event',
meta: {
isAuth: true,
title: '事件'

17
src/views/device/Device.vue
Unescape View File

@ -26,7 +26,7 @@
<el-tag v-if="scope.row.status==='ONLINE'" type="success" effect="plain">在线</el-tag>
<el-tag v-else-if="scope.row.status==='MAINTAIN'" type="warning" effect="plain">维护</el-tag>
<el-tag v-else-if="scope.row.status==='FAULT'" type="danger" effect="plain">故障</el-tag>
<el-tag v-else-if="scope.row.status==='OFFLINE'" type="danger" effect="plain">离线</el-tag>
<el-tag v-else-if="scope.row.status==='OFFLINE'" type="info" effect="plain">离线</el-tag>
<el-tag v-else type="info" effect="plain">未知</el-tag>
</template>
</avue-crud>
@ -63,7 +63,7 @@
</template>
<script>
import {deviceApi, dictionaryApi} from '@/api/manager'
import {deviceApi, dictionaryApi, statusApi} from '@/api/manager'
import {failMessage, successMessage} from "@/util/util";
export default {
@ -240,20 +240,19 @@
}, this.query)).then(list => {
const data = list.data;
this.page.total = data.total;
deviceApi.status(Object.assign({
this.listData = data.records;
statusApi.deviceStatus(Object.assign({
page: {
current: page.currentPage,
size: page.pageSize
}
}, this.query)).then(statuses => {
this.listData = data.records.map(d => {
d.status = statuses.data[d.id] || "OFFLINE";
return d;
this.listData.forEach(data => {
data.status = statuses.data[data.id] || "OFFLINE";
});
}).catch(() => {
this.listData = data.records.map(d => {
d.status = "UNKNOW";
return d;
this.listData.forEach(data => {
data.status = "UNKNOW";
});
});
}).catch(() => {

53
src/views/driver/Driver.vue
Unescape View File

@ -17,8 +17,11 @@
@current-change="currentChange"
>
<template slot="status" slot-scope="scope">
<el-tag v-if="scope.row.status" type="success" effect="plain">在线</el-tag>
<el-tag v-else type="info" effect="plain">离线</el-tag>
<el-tag v-if="scope.row.status==='ONLINE'" type="success" effect="plain">在线</el-tag>
<el-tag v-else-if="scope.row.status==='MAINTAIN'" type="warning" effect="plain">维护</el-tag>
<el-tag v-else-if="scope.row.status==='FAULT'" type="danger" effect="plain">故障</el-tag>
<el-tag v-else-if="scope.row.status==='OFFLINE'" type="info" effect="plain">离线</el-tag>
<el-tag v-else type="info" effect="plain">未知</el-tag>
</template>
</avue-crud>
</base-card>
@ -26,7 +29,7 @@
</template>
<script>
import {driverApi} from '@/api/manager'
import {driverApi, statusApi} from '@/api/manager'
import {successMessage} from "@/util/util";
export default {
@ -59,13 +62,6 @@
span: 8,
search: true,
searchSpan: 6
}, {
label: '状态',
prop: 'status',
width: 100,
span: 8,
disabled: true,
slot: true
}, {
label: '主机',
prop: 'host',
@ -80,6 +76,31 @@
span: 12,
search: true,
searchSpan: 6
}, {
label: '状态',
prop: 'status',
width: 100,
span: 8,
disabled: true,
display: false,
slot: true,
type: 'select',
value: 'OFFLINE',
dicData: [
{
label: '在线',
value: 'ONLINE'
}, {
label: '离线',
value: 'OFFLINE'
}, {
label: '维护',
value: 'MAINTAIN'
}, {
label: '故障',
value: 'FAULT'
}
]
}, {
label: '备注',
prop: 'description',
@ -135,15 +156,19 @@
}, this.query)).then(list => {
const data = list.data;
this.page.total = data.total;
driverApi.status(Object.assign({
this.listData = data.records;
statusApi.driverStatus(Object.assign({
page: {
current: page.currentPage,
size: page.pageSize
}
}, this.query)).then(statuses => {
this.listData = data.records.map(d => {
d.status = statuses.data[d.serviceName] === true;
return d;
this.listData.forEach(data => {
data.status = statuses.data[data.id] || "OFFLINE";
});
}).catch(() => {
this.listData.forEach(data => {
data.status = "UNKNOW";
});
});
}).catch(() => {

5
src/views/event/DeviceEvent.vue
Unescape View File

@ -31,8 +31,7 @@
</template>
<script>
import {dictionaryApi} from '@/api/manager'
import {deviceEventApi} from '@/api/data'
import {eventApi, dictionaryApi} from '@/api/manager'
export default {
data() {
@ -171,7 +170,7 @@
{
list(page) {
this.loading = true;
deviceEventApi.list(Object.assign({
eventApi.deviceEvent(Object.assign({
page: {
current: page.currentPage,
size: page.pageSize,

12
src/views/layout/Layout.vue
Unescape View File

@ -11,16 +11,16 @@
:router=true>
<el-menu-item index="/home"><span class="el-icon-menu"/>首页</el-menu-item>
<el-menu-item index="/driver">驱动</el-menu-item>
<el-menu-item index="/driverAttribute">驱动属性</el-menu-item>
<el-menu-item index="/pointAttribute">位号属性</el-menu-item>
<el-menu-item index="/driver_attribute">驱动属性</el-menu-item>
<el-menu-item index="/point_attribute">位号属性</el-menu-item>
<el-menu-item index="/profile">模板</el-menu-item>
<el-menu-item index="/driverInfo">驱动配置</el-menu-item>
<el-menu-item index="/driver_info">驱动配置</el-menu-item>
<el-menu-item index="/point">位号</el-menu-item>
<el-menu-item index="/group">分组</el-menu-item>
<el-menu-item index="/device">设备</el-menu-item>
<el-menu-item index="/pointInfo">位号配置</el-menu-item>
<el-menu-item index="/pointValue">数据</el-menu-item>
<el-menu-item index="/deviceEvent">事件</el-menu-item>
<el-menu-item index="/point_info">位号配置</el-menu-item>
<el-menu-item index="/point_value">数据</el-menu-item>
<el-menu-item index="/device_event">事件</el-menu-item>
<!--<el-menu-item index="/now">实时</el-menu-item>
<el-menu-item index="/history">历史</el-menu-item>
<el-menu-item index="/video">视频</el-menu-item>

2
src/views/profile/Profile.vue
Unescape View File

@ -76,7 +76,7 @@
value: false
},
{
label: '公有(web暂不支持,该模式请使用批量导入)',
label: '公有',
value: true,
disabled: true

Write Preview
Loading…
Cancel
Save