-
-
{{ info.label }}：
-
查看
-
{{ info.value }}
+
+ {{ info.k }}：
+
+ {{ info.v }}
+
-
-
+
+
+
+
电流电压
+
+
+
+
+
+
功率
+
+
+
+
diff --git a/web/src/main.js b/web/src/main.js
index b5a94a2..350ff23 100644
--- a/web/src/main.js
+++ b/web/src/main.js
@@ -10,20 +10,25 @@ import '@/style/index.scss'
import * as echarts from 'echarts'
import { setWidth } from '@/utils/column'
import { getBtns } from '@/utils/btnList'
-import { message } from 'ant-design-vue'
+import { message, Modal } from 'ant-design-vue'
import VueTianditu from 'vue-tianditu'
import SearchBox from '@/components/SearchBox.vue'
import ComTable from '@/components/ComTable.vue'
+import OperateCom from '@/components/OperateCom'
+import TreeTable from '@/components/TreeTable.vue'
const app = createApp(App)
app.component('SearchBox', SearchBox)
app.component('ComTable', ComTable)
+app.component('OperateCom', OperateCom)
+app.component('TreeTable', TreeTable)
app.config.globalProperties.$echarts = echarts // 挂载到全局属性
app.config.globalProperties.$setWidth = setWidth // 挂载到全局属性
app.config.globalProperties.$getBtns = getBtns
app.config.globalProperties.$message = message
+app.config.globalProperties.$Modal = Modal
app.use(store).use(router).use(Antd).use(VueTianditu).mount('#app')
diff --git a/web/src/router/index.js b/web/src/router/index.js
index b6da209..a95fd91 100644
--- a/web/src/router/index.js
+++ b/web/src/router/index.js
@@ -60,7 +60,9 @@ export const routes = [
{
name: 'permission',
path: 'permission',
- title: '权限管理'
+ title: '权限管理',
+ component: () =>
+ import(/* webpackChunkName: "system" */ '@/views/system/permission.vue')
},
{
name: 'station',
@@ -71,7 +73,8 @@ export const routes = [
{
name: 'service',
path: 'service',
- title: '服务管理'
+ title: '服务管理',
+ component: () => import(/* webpackChunkName: "system" */ '@/views/system/service.vue')
},
{
path: 'policy',
@@ -82,17 +85,20 @@ export const routes = [
{
name: 'device',
path: 'device',
- title: '设备管理'
+ title: '设备管理',
+ component: () => import(/* webpackChunkName: "system" */ '@/views/system/device.vue')
},
{
- name: 'log',
+ name: 'alarmLog',
path: 'log',
- title: '告警日志'
+ title: '告警日志',
+ component: () => import(/* webpackChunkName: "system" */ '@/views/system/alarmLog.vue')
},
{
- name: 'syslog',
+ name: 'sylog',
path: 'syslog',
- title: '系统日志'
+ title: '系统日志',
+ component: () => import(/* webpackChunkName: "system" */ '@/views/system/log.vue')
}
]
}
diff --git a/web/src/utils/btnList.js b/web/src/utils/btnList.js
index b79a84d..502354c 100644
--- a/web/src/utils/btnList.js
+++ b/web/src/utils/btnList.js
@@ -1,21 +1,17 @@
+import route from 'vue-router'
const btnList = [
{ label: '', type: '', disFlag: '' },
- { label: '新增', type: 'add', disFlag: 'isEdit', icon: 'icon-add' },
- { label: '查看', type: 'read', disFlag: 'isQuery' },
- { label: '修改', type: 'edit', disFlag: 'isEdit' },
- { label: '删除', type: 'del', disFlag: 'isEdit', icon: 'icon-del' }
- // { label: '批量删除', type: 'del', disFlag: 'isEdit', icon: 'icon-del' }
+ { label: '新增', type: 'add', disFlag: 'is_add', icon: 'icon-add' },
+ { label: '查看', type: 'read', disFlag: 'is_view' },
+ { label: '修改', type: 'edit', disFlag: 'is_edit' },
+ { label: '删除', type: 'del', disFlag: 'is_del', icon: 'icon-del' }
]
-// arr:按钮数组
-// permissions:{
-// isControl: true;
-// isEdit: true;
-// isQuery: true;
-// }
function getBtns(arr) {
- const permissions =
- JSON.parse(localStorage.getItem('user')).userExtend.role.permissionList[0] || {}
+ console.log(this.$route, 'route')
+ // JSON.parse(localStorage.getItem('permission')).find((item)=>item.route==)
+ // const permissions =
+ // JSON.parse(localStorage.getItem('permission')) || {}
const btns = []
btnList.forEach((item) => {
if (arr.includes(item.label)) {
diff --git a/web/src/utils/column.js b/web/src/utils/column.js
index de36cb7..c53d08c 100644
--- a/web/src/utils/column.js
+++ b/web/src/utils/column.js
@@ -6,7 +6,7 @@ const colWidth = [
},
{
label: '名称',
- width: 200,
+ width: 150,
align: 'left',
sorter: (a, b) => {
return a.name.localeCompare(b.name)
@@ -70,7 +70,7 @@ const colWidth = [
label: '操作',
align: 'center',
width: 200,
- fixed: 'right',
+ // fixed: 'right',
resizable: false
}
]
diff --git a/web/src/utils/config.js b/web/src/utils/config.js
index d2e76fa..891a17e 100644
--- a/web/src/utils/config.js
+++ b/web/src/utils/config.js
@@ -13,3 +13,146 @@ export const policyTypes = [
// label: '峰谷套利2'
// }
]
+
+export const deviceTypeList = [
+ {
+ value: 1,
+ label: '变压器',
+ iconfont: 'icon-transformer'
+ },
+ {
+ value: 2,
+ label: '配电柜',
+ iconfont: 'icon-dianpingcai'
+ },
+ {
+ value: 3,
+ label: '电表',
+ iconfont: 'icon-dianbiao'
+ },
+ {
+ value: 4,
+ label: '门禁',
+ iconfont: 'icon-menjin'
+ },
+ {
+ value: 5,
+ label: '空调',
+ iconfont: 'icon-kongdiaogongcheng'
+ },
+ {
+ value: 6,
+ label: '照明',
+ iconfont: 'icon-zhaomingdeng'
+ },
+ {
+ value: 7,
+ label: '消防',
+ iconfont: 'icon-xiaofang'
+ },
+ {
+ value: 8,
+ label: '光照监测设备',
+ iconfont: 'icon-guangzhaojianceshebei'
+ },
+ {
+ value: 9,
+ label: '风速监测设备',
+ iconfont: 'icon-fengsujiance'
+ },
+ {
+ value: 10,
+ label: '温湿度监测设备',
+ iconfont: 'icon-wenshidujiance'
+ },
+ {
+ value: 11,
+ label: '烟感监测设备',
+ iconfont: 'icon-yanganjiance'
+ },
+ {
+ value: 12,
+ label: '水浸传感器',
+ iconfont: 'icon-shuijinchuanganqiicon'
+ },
+ {
+ value: 13,
+ label: '视频监控',
+ iconfont: 'icon-shipinjiankong'
+ },
+ {
+ value: 100,
+ label: '储能预制舱',
+ iconfont: 'icon-jizhuangxiang'
+ },
+ {
+ value: 101,
+ label: 'EMS',
+ iconfont: 'icon-quexianguanli'
+ },
+ {
+ value: 102,
+ label: 'PCS',
+ iconfont: 'icon-nengyuanguanli'
+ },
+ {
+ value: 103,
+ label: 'PCU',
+ iconfont: 'icon-bianyaqi'
+ },
+ {
+ value: 104,
+ label: 'BMS',
+ iconfont: 'icon-BMSchunengdianchi'
+ },
+ {
+ value: 105,
+ label: 'BCU',
+ iconfont: 'icon-L-chunengdianchicu'
+ },
+ {
+ value: 106,
+ label: '充电桩',
+ iconfont: 'icon-charging-pile-line'
+ },
+ {
+ value: 107,
+ label: '充电枪',
+ iconfont: 'icon-chongdianqiang'
+ },
+ {
+ value: 108,
+ label: '集中器',
+ iconfont: 'icon-jizhongqi'
+ },
+ {
+ value: 109,
+ label: '光伏板',
+ iconfont: 'icon-guangfuban'
+ },
+ {
+ value: 110,
+ label: '风力发电机光感',
+ iconfont: 'icon-zhuangjirongliang'
+ }
+]
+// 日志类型：0:其它; 1:系统日志; 2:操作日志; 3:设备日志
+
+export const logTypes = [
+ {
+ value: '0',
+ label: '其它'
+ },
+ {
+ value: '1',
+ label: '系统日志'
+ },
+ {
+ value: '2',
+ label: '操作日志'
+ },
+ {
+ value: '3',
+ label: '设备日志'
+ }
+]
diff --git a/web/src/utils/gcj02ToWgs84.js b/web/src/utils/gcj02ToWgs84.js
index f97fb5b..9edc3b5 100644
--- a/web/src/utils/gcj02ToWgs84.js
+++ b/web/src/utils/gcj02ToWgs84.js
@@ -1,80 +1,80 @@
-// /**
-// * 判断是否在中国境外
-// */
-// function outOfChina(lng, lat) {
-// return !(lng >= 72.004 && lng <= 137.8347 && lat >= 0.8293 && lat <= 55.8271)
-// }
+/**
+ * 判断是否在中国境外
+ */
+function outOfChina(lng, lat) {
+ return !(lng >= 72.004 && lng <= 137.8347 && lat >= 0.8293 && lat <= 55.8271)
+}
-// /**
-// * 辅助函数：纬度转换
-// */
-// function _transformLat(x, y) {
-// let ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x))
-// ret += ((20.0 * Math.sin(6.0 * x * Math.PI) + 20.0 * Math.sin(2.0 * x * Math.PI)) * 2.0) / 3.0
-// ret += ((20.0 * Math.sin(y * Math.PI) + 40.0 * Math.sin((y / 3.0) * Math.PI)) * 2.0) / 3.0
-// ret +=
-// ((160.0 * Math.sin((y / 12.0) * Math.PI) + 320 * Math.sin((y * Math.PI) / 30.0)) * 2.0) / 3.0
-// return ret
-// }
+/**
+ * 辅助函数：纬度转换
+ */
+function _transformLat(x, y) {
+ let ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x))
+ ret += ((20.0 * Math.sin(6.0 * x * Math.PI) + 20.0 * Math.sin(2.0 * x * Math.PI)) * 2.0) / 3.0
+ ret += ((20.0 * Math.sin(y * Math.PI) + 40.0 * Math.sin((y / 3.0) * Math.PI)) * 2.0) / 3.0
+ ret +=
+ ((160.0 * Math.sin((y / 12.0) * Math.PI) + 320 * Math.sin((y * Math.PI) / 30.0)) * 2.0) / 3.0
+ return ret
+}
-// /**
-// * 辅助函数：经度转换
-// */
-// function _transformLng(x, y) {
-// let ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x))
-// ret += ((20.0 * Math.sin(6.0 * x * Math.PI) + 20.0 * Math.sin(2.0 * x * Math.PI)) * 2.0) / 3.0
-// ret += ((20.0 * Math.sin(x * Math.PI) + 40.0 * Math.sin((x / 3.0) * Math.PI)) * 2.0) / 3.0
-// ret +=
-// ((150.0 * Math.sin((x / 12.0) * Math.PI) + 300.0 * Math.sin((x / 30.0) * Math.PI)) * 2.0) / 3.0
-// return ret
-// }
+/**
+ * 辅助函数：经度转换
+ */
+function _transformLng(x, y) {
+ let ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x))
+ ret += ((20.0 * Math.sin(6.0 * x * Math.PI) + 20.0 * Math.sin(2.0 * x * Math.PI)) * 2.0) / 3.0
+ ret += ((20.0 * Math.sin(x * Math.PI) + 40.0 * Math.sin((x / 3.0) * Math.PI)) * 2.0) / 3.0
+ ret +=
+ ((150.0 * Math.sin((x / 12.0) * Math.PI) + 300.0 * Math.sin((x / 30.0) * Math.PI)) * 2.0) / 3.0
+ return ret
+}
-// /**
-// * GCJ-02 (高德/腾讯坐标系) 转 WGS-84 (GPS原始坐标系)
-// * @param {number} lng GCJ-02经度
-// * @param {number} lat GCJ-02纬度
-// * @returns {number[]} [WGS-84经度, WGS-84纬度]
-// */
-// export function gcj02ToWgs84(lng, lat) {
-// // 判断是否在中国境内（简化版，实际需更完整判断）
-// if (outOfChina(lng, lat)) {
-// return [lng, lat] // 境外坐标不转换
-// }
+/**
+ * GCJ-02 (高德/腾讯坐标系) 转 WGS-84 (GPS原始坐标系)
+ * @param {number} lng GCJ-02经度
+ * @param {number} lat GCJ-02纬度
+ * @returns {number[]} [WGS-84经度, WGS-84纬度]
+ */
+export function gcj02ToWgs84(lng, lat) {
+ // 判断是否在中国境内（简化版，实际需更完整判断）
+ if (outOfChina(lng, lat)) {
+ return [lng, lat] // 境外坐标不转换
+ }
-// let dlat = _transformLat(lng - 105.0, lat - 35.0)
-// let dlng = _transformLng(lng - 105.0, lat - 35.0)
+ let dlat = _transformLat(lng - 105.0, lat - 35.0)
+ let dlng = _transformLng(lng - 105.0, lat - 35.0)
-// const radlat = (lat / 180.0) * Math.PI
-// let magic = Math.sin(radlat)
-// magic = 1 - 0.00669342162296594323 * magic * magic
-// const sqrtmagic = Math.sqrt(magic)
+ const radlat = (lat / 180.0) * Math.PI
+ let magic = Math.sin(radlat)
+ magic = 1 - 0.00669342162296594323 * magic * magic
+ const sqrtmagic = Math.sqrt(magic)
-// dlat =
-// (dlat * 180.0) / (((6378245.0 * (1 - 0.00669342162296594323)) / (magic * sqrtmagic)) * Math.PI)
-// dlng = (dlng * 180.0) / ((6378245.0 / sqrtmagic) * Math.cos(radlat) * Math.PI)
+ dlat =
+ (dlat * 180.0) / (((6378245.0 * (1 - 0.00669342162296594323)) / (magic * sqrtmagic)) * Math.PI)
+ dlng = (dlng * 180.0) / ((6378245.0 / sqrtmagic) * Math.cos(radlat) * Math.PI)
-// // 初始转换结果（粗略值）
-// let wgsLat = lat - dlat
-// let wgsLng = lng - dlng
+ // 初始转换结果（粗略值）
+ let wgsLat = lat - dlat
+ let wgsLng = lng - dlng
-// return [wgsLng, wgsLat]
-// }
+ return [wgsLng, wgsLat]
+}
-// /**
-// * WGS-84 转 GCJ-02（用于迭代优化）
-// */
-// function wgs84ToGcj02(lng, lat) {
-// if (outOfChina(lng, lat)) {
-// return [lng, lat]
-// }
-// let dlat = _transformLat(lng - 105.0, lat - 35.0)
-// let dlng = _transformLng(lng - 105.0, lat - 35.0)
-// const radlat = (lat / 180.0) * Math.PI
-// let magic = Math.sin(radlat)
-// magic = 1 - 0.00669342162296594323 * magic * magic
-// const sqrtmagic = Math.sqrt(magic)
-// dlat =
-// (dlat * 180.0) / (((6378245.0 * (1 - 0.00669342162296594323)) / (magic * sqrtmagic)) * Math.PI)
-// dlng = (dlng * 180.0) / ((6378245.0 / sqrtmagic) * Math.cos(radlat) * Math.PI)
-// return [lng + dlng, lat + dlat]
-// }
+/**
+ * WGS-84 转 GCJ-02（用于迭代优化）
+ */
+function wgs84ToGcj02(lng, lat) {
+ if (outOfChina(lng, lat)) {
+ return [lng, lat]
+ }
+ let dlat = _transformLat(lng - 105.0, lat - 35.0)
+ let dlng = _transformLng(lng - 105.0, lat - 35.0)
+ const radlat = (lat / 180.0) * Math.PI
+ let magic = Math.sin(radlat)
+ magic = 1 - 0.00669342162296594323 * magic * magic
+ const sqrtmagic = Math.sqrt(magic)
+ dlat =
+ (dlat * 180.0) / (((6378245.0 * (1 - 0.00669342162296594323)) / (magic * sqrtmagic)) * Math.PI)
+ dlng = (dlng * 180.0) / ((6378245.0 / sqrtmagic) * Math.cos(radlat) * Math.PI)
+ return [lng + dlng, lat + dlat]
+}
diff --git a/web/src/utils/loadTMap.js b/web/src/utils/loadTMap.js
new file mode 100644
index 0000000..7737021
--- /dev/null
+++ b/web/src/utils/loadTMap.js
@@ -0,0 +1,11 @@
+// utils/loadTMap.js
+export async function loadTMap(tk) {
+ if (window.T) return // 如果已加载，直接返回
+ return new Promise((resolve, reject) => {
+ const script = document.createElement('script')
+ script.src = `https://api.tianditu.gov.cn/api?v=4.0&tk=${tk}`
+ script.onload = () => resolve(window.T)
+ script.onerror = (err) => reject(err)
+ document.head.appendChild(script)
+ })
+}
diff --git a/web/src/views/LoginView.vue b/web/src/views/LoginView.vue
index ad171d3..508d64b 100644
--- a/web/src/views/LoginView.vue
+++ b/web/src/views/LoginView.vue
@@ -75,13 +75,17 @@ export default {
const values = await this.$refs.ruleForm.validateFields()
const res = await getReq('/login',this.form )
this.loading = false
+
console.log(res);
- // if (res.code === 200) {
- this.$message.success('登录成功')
- localStorage.setItem('token', res.token)
- this.$router.push('/')
- // } else {
+ if (res.errcode === 0) {
+ this.$message.success('登录成功')
+ localStorage.setItem('token', res.token)
+ localStorage.setItem('permission',JSON.stringify( res.permission) )
+ this.$router.push('/')
+
+ }
+ // else {
// this.$message.error(res.message || '登录失败')
// }
} catch (error) {
diff --git a/web/src/views/MainView.vue b/web/src/views/MainView.vue
index 0e0e3d1..44a066c 100644
--- a/web/src/views/MainView.vue
+++ b/web/src/views/MainView.vue
@@ -15,9 +15,8 @@