diff --git a/public/config/config.json b/public/config/config.json index 8e6cc74..313f7fe 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,6 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:22006" + "baseUrl": "http://111.198.10.15:11643", + "securityJsCode": "56bf9671d4b3517d294caec4751889a1", + "JsKey": "40849e82b4e33f5255b17372520c954d" } diff --git a/public/config/config.json b/public/config/config.json index 8e6cc74..313f7fe 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,6 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:22006" + "baseUrl": "http://111.198.10.15:11643", + "securityJsCode": "56bf9671d4b3517d294caec4751889a1", + "JsKey": "40849e82b4e33f5255b17372520c954d" } diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 1f8697d..98261dc 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -16,11 +16,11 @@ // 添加用户 export function addUser(data: object) { - return request.post('system/mgr/add', data) + return request.post('sys/mgr/add', data) } // 修改用户 export function updateUser(data: object) { - return request.post('system/mgr/update', data) + return request.post('sys/mgr/update', data) } // 删除用户 export function delUser(data: { id: string }) { diff --git a/public/config/config.json b/public/config/config.json index 8e6cc74..313f7fe 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,6 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:22006" + "baseUrl": "http://111.198.10.15:11643", + "securityJsCode": "56bf9671d4b3517d294caec4751889a1", + "JsKey": "40849e82b4e33f5255b17372520c954d" } diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 1f8697d..98261dc 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -16,11 +16,11 @@ // 添加用户 export function addUser(data: object) { - return request.post('system/mgr/add', data) + return request.post('sys/mgr/add', data) } // 修改用户 export function updateUser(data: object) { - return request.post('system/mgr/update', data) + return request.post('sys/mgr/update', data) } // 删除用户 export function delUser(data: { id: string }) { diff --git a/src/assets/icons/board.svg b/src/assets/icons/board.svg new file mode 100644 index 0000000..b0a8f1e --- /dev/null +++ b/src/assets/icons/board.svg @@ -0,0 +1 @@ + diff --git a/public/config/config.json b/public/config/config.json index 8e6cc74..313f7fe 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,6 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:22006" + "baseUrl": "http://111.198.10.15:11643", + "securityJsCode": "56bf9671d4b3517d294caec4751889a1", + "JsKey": "40849e82b4e33f5255b17372520c954d" } diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 1f8697d..98261dc 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -16,11 +16,11 @@ // 添加用户 export function addUser(data: object) { - return request.post('system/mgr/add', data) + return request.post('sys/mgr/add', data) } // 修改用户 export function updateUser(data: object) { - return request.post('system/mgr/update', data) + return request.post('sys/mgr/update', data) } // 删除用户 export function delUser(data: { id: string }) { diff --git a/src/assets/icons/board.svg b/src/assets/icons/board.svg new file mode 100644 index 0000000..b0a8f1e --- /dev/null +++ b/src/assets/icons/board.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-alarm.svg b/src/assets/icons/icon-alarm.svg new file mode 100644 index 0000000..d15bda6 --- /dev/null +++ b/src/assets/icons/icon-alarm.svg @@ -0,0 +1 @@ + diff --git a/public/config/config.json b/public/config/config.json index 8e6cc74..313f7fe 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,6 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:22006" + "baseUrl": "http://111.198.10.15:11643", + "securityJsCode": "56bf9671d4b3517d294caec4751889a1", + "JsKey": "40849e82b4e33f5255b17372520c954d" } diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 1f8697d..98261dc 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -16,11 +16,11 @@ // 添加用户 export function addUser(data: object) { - return request.post('system/mgr/add', data) + return request.post('sys/mgr/add', data) } // 修改用户 export function updateUser(data: object) { - return request.post('system/mgr/update', data) + return request.post('sys/mgr/update', data) } // 删除用户 export function delUser(data: { id: string }) { diff --git a/src/assets/icons/board.svg b/src/assets/icons/board.svg new file mode 100644 index 0000000..b0a8f1e --- /dev/null +++ b/src/assets/icons/board.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-alarm.svg b/src/assets/icons/icon-alarm.svg new file mode 100644 index 0000000..d15bda6 --- /dev/null +++ b/src/assets/icons/icon-alarm.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-ledger.svg b/src/assets/icons/icon-ledger.svg new file mode 100644 index 0000000..21d793d --- /dev/null +++ b/src/assets/icons/icon-ledger.svg @@ -0,0 +1 @@ + diff --git a/public/config/config.json b/public/config/config.json index 8e6cc74..313f7fe 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,6 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:22006" + "baseUrl": "http://111.198.10.15:11643", + "securityJsCode": "56bf9671d4b3517d294caec4751889a1", + "JsKey": "40849e82b4e33f5255b17372520c954d" } diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 1f8697d..98261dc 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -16,11 +16,11 @@ // 添加用户 export function addUser(data: object) { - return request.post('system/mgr/add', data) + return request.post('sys/mgr/add', data) } // 修改用户 export function updateUser(data: object) { - return request.post('system/mgr/update', data) + return request.post('sys/mgr/update', data) } // 删除用户 export function delUser(data: { id: string }) { diff --git a/src/assets/icons/board.svg b/src/assets/icons/board.svg new file mode 100644 index 0000000..b0a8f1e --- /dev/null +++ b/src/assets/icons/board.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-alarm.svg b/src/assets/icons/icon-alarm.svg new file mode 100644 index 0000000..d15bda6 --- /dev/null +++ b/src/assets/icons/icon-alarm.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-ledger.svg b/src/assets/icons/icon-ledger.svg new file mode 100644 index 0000000..21d793d --- /dev/null +++ b/src/assets/icons/icon-ledger.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-pipeline.svg b/src/assets/icons/icon-pipeline.svg new file mode 100644 index 0000000..417ede9 --- /dev/null +++ b/src/assets/icons/icon-pipeline.svg @@ -0,0 +1 @@ + diff --git a/public/config/config.json b/public/config/config.json index 8e6cc74..313f7fe 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,6 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:22006" + "baseUrl": "http://111.198.10.15:11643", + "securityJsCode": "56bf9671d4b3517d294caec4751889a1", + "JsKey": "40849e82b4e33f5255b17372520c954d" } diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 1f8697d..98261dc 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -16,11 +16,11 @@ // 添加用户 export function addUser(data: object) { - return request.post('system/mgr/add', data) + return request.post('sys/mgr/add', data) } // 修改用户 export function updateUser(data: object) { - return request.post('system/mgr/update', data) + return request.post('sys/mgr/update', data) } // 删除用户 export function delUser(data: { id: string }) { diff --git a/src/assets/icons/board.svg b/src/assets/icons/board.svg new file mode 100644 index 0000000..b0a8f1e --- /dev/null +++ b/src/assets/icons/board.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-alarm.svg b/src/assets/icons/icon-alarm.svg new file mode 100644 index 0000000..d15bda6 --- /dev/null +++ b/src/assets/icons/icon-alarm.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-ledger.svg b/src/assets/icons/icon-ledger.svg new file mode 100644 index 0000000..21d793d --- /dev/null +++ b/src/assets/icons/icon-ledger.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-pipeline.svg b/src/assets/icons/icon-pipeline.svg new file mode 100644 index 0000000..417ede9 --- /dev/null +++ b/src/assets/icons/icon-pipeline.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-rule.svg b/src/assets/icons/icon-rule.svg new file mode 100644 index 0000000..6739521 --- /dev/null +++ b/src/assets/icons/icon-rule.svg @@ -0,0 +1 @@ + diff --git a/public/config/config.json b/public/config/config.json index 8e6cc74..313f7fe 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,6 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:22006" + "baseUrl": "http://111.198.10.15:11643", + "securityJsCode": "56bf9671d4b3517d294caec4751889a1", + "JsKey": "40849e82b4e33f5255b17372520c954d" } diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 1f8697d..98261dc 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -16,11 +16,11 @@ // 添加用户 export function addUser(data: object) { - return request.post('system/mgr/add', data) + return request.post('sys/mgr/add', data) } // 修改用户 export function updateUser(data: object) { - return request.post('system/mgr/update', data) + return request.post('sys/mgr/update', data) } // 删除用户 export function delUser(data: { id: string }) { diff --git a/src/assets/icons/board.svg b/src/assets/icons/board.svg new file mode 100644 index 0000000..b0a8f1e --- /dev/null +++ b/src/assets/icons/board.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-alarm.svg b/src/assets/icons/icon-alarm.svg new file mode 100644 index 0000000..d15bda6 --- /dev/null +++ b/src/assets/icons/icon-alarm.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-ledger.svg b/src/assets/icons/icon-ledger.svg new file mode 100644 index 0000000..21d793d --- /dev/null +++ b/src/assets/icons/icon-ledger.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-pipeline.svg b/src/assets/icons/icon-pipeline.svg new file mode 100644 index 0000000..417ede9 --- /dev/null +++ b/src/assets/icons/icon-pipeline.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-rule.svg b/src/assets/icons/icon-rule.svg new file mode 100644 index 0000000..6739521 --- /dev/null +++ b/src/assets/icons/icon-rule.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-station.svg b/src/assets/icons/icon-station.svg new file mode 100644 index 0000000..2d89e89 --- /dev/null +++ b/src/assets/icons/icon-station.svg @@ -0,0 +1 @@ + diff --git a/public/config/config.json b/public/config/config.json index 8e6cc74..313f7fe 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,6 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:22006" + "baseUrl": "http://111.198.10.15:11643", + "securityJsCode": "56bf9671d4b3517d294caec4751889a1", + "JsKey": "40849e82b4e33f5255b17372520c954d" } diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 1f8697d..98261dc 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -16,11 +16,11 @@ // 添加用户 export function addUser(data: object) { - return request.post('system/mgr/add', data) + return request.post('sys/mgr/add', data) } // 修改用户 export function updateUser(data: object) { - return request.post('system/mgr/update', data) + return request.post('sys/mgr/update', data) } // 删除用户 export function delUser(data: { id: string }) { diff --git a/src/assets/icons/board.svg b/src/assets/icons/board.svg new file mode 100644 index 0000000..b0a8f1e --- /dev/null +++ b/src/assets/icons/board.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-alarm.svg b/src/assets/icons/icon-alarm.svg new file mode 100644 index 0000000..d15bda6 --- /dev/null +++ b/src/assets/icons/icon-alarm.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-ledger.svg b/src/assets/icons/icon-ledger.svg new file mode 100644 index 0000000..21d793d --- /dev/null +++ b/src/assets/icons/icon-ledger.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-pipeline.svg b/src/assets/icons/icon-pipeline.svg new file mode 100644 index 0000000..417ede9 --- /dev/null +++ b/src/assets/icons/icon-pipeline.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-rule.svg b/src/assets/icons/icon-rule.svg new file mode 100644 index 0000000..6739521 --- /dev/null +++ b/src/assets/icons/icon-rule.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-station.svg b/src/assets/icons/icon-station.svg new file mode 100644 index 0000000..2d89e89 --- /dev/null +++ b/src/assets/icons/icon-station.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-well.svg b/src/assets/icons/icon-well.svg new file mode 100644 index 0000000..f1d1797 --- /dev/null +++ b/src/assets/icons/icon-well.svg @@ -0,0 +1 @@ + diff --git a/public/config/config.json b/public/config/config.json index 8e6cc74..313f7fe 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,6 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:22006" + "baseUrl": "http://111.198.10.15:11643", + "securityJsCode": "56bf9671d4b3517d294caec4751889a1", + "JsKey": "40849e82b4e33f5255b17372520c954d" } diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 1f8697d..98261dc 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -16,11 +16,11 @@ // 添加用户 export function addUser(data: object) { - return request.post('system/mgr/add', data) + return request.post('sys/mgr/add', data) } // 修改用户 export function updateUser(data: object) { - return request.post('system/mgr/update', data) + return request.post('sys/mgr/update', data) } // 删除用户 export function delUser(data: { id: string }) { diff --git a/src/assets/icons/board.svg b/src/assets/icons/board.svg new file mode 100644 index 0000000..b0a8f1e --- /dev/null +++ b/src/assets/icons/board.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-alarm.svg b/src/assets/icons/icon-alarm.svg new file mode 100644 index 0000000..d15bda6 --- /dev/null +++ b/src/assets/icons/icon-alarm.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-ledger.svg b/src/assets/icons/icon-ledger.svg new file mode 100644 index 0000000..21d793d --- /dev/null +++ b/src/assets/icons/icon-ledger.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-pipeline.svg b/src/assets/icons/icon-pipeline.svg new file mode 100644 index 0000000..417ede9 --- /dev/null +++ b/src/assets/icons/icon-pipeline.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-rule.svg b/src/assets/icons/icon-rule.svg new file mode 100644 index 0000000..6739521 --- /dev/null +++ b/src/assets/icons/icon-rule.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-station.svg b/src/assets/icons/icon-station.svg new file mode 100644 index 0000000..2d89e89 --- /dev/null +++ b/src/assets/icons/icon-station.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-well.svg b/src/assets/icons/icon-well.svg new file mode 100644 index 0000000..f1d1797 --- /dev/null +++ b/src/assets/icons/icon-well.svg @@ -0,0 +1 @@ + diff --git a/src/components/map/index.vue b/src/components/map/index.vue index f9c3b5d..55e37da 100644 --- a/src/components/map/index.vue +++ b/src/components/map/index.vue @@ -26,7 +26,7 @@ const loading = ref(true) // 设置安全密钥 window._AMapSecurityConfig = { - securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换 + securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换 } // 地图实例 const map = shallowRef() @@ -40,7 +40,7 @@ // -------------------------------------初始化地图-------------------------------------------------- const initMap = () => { AMapLoader.load({ - key: '40849e82b4e33f5255b17372520c954d', // 后期需替换 + key: localStorage.getItem('JsKey')!, // 后期需替换 version: '2.0', // 指定要加载的 JSAPI 的版本,缺省时默认为 1.4.15 plugins: ['AMap.Scale', 'AMap.MouseTool'], // 需要使用的的插件列表,如比例尺'AMap.Scale'等 }) diff --git a/public/config/config.json b/public/config/config.json index 8e6cc74..313f7fe 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,6 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:22006" + "baseUrl": "http://111.198.10.15:11643", + "securityJsCode": "56bf9671d4b3517d294caec4751889a1", + "JsKey": "40849e82b4e33f5255b17372520c954d" } diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 1f8697d..98261dc 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -16,11 +16,11 @@ // 添加用户 export function addUser(data: object) { - return request.post('system/mgr/add', data) + return request.post('sys/mgr/add', data) } // 修改用户 export function updateUser(data: object) { - return request.post('system/mgr/update', data) + return request.post('sys/mgr/update', data) } // 删除用户 export function delUser(data: { id: string }) { diff --git a/src/assets/icons/board.svg b/src/assets/icons/board.svg new file mode 100644 index 0000000..b0a8f1e --- /dev/null +++ b/src/assets/icons/board.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-alarm.svg b/src/assets/icons/icon-alarm.svg new file mode 100644 index 0000000..d15bda6 --- /dev/null +++ b/src/assets/icons/icon-alarm.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-ledger.svg b/src/assets/icons/icon-ledger.svg new file mode 100644 index 0000000..21d793d --- /dev/null +++ b/src/assets/icons/icon-ledger.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-pipeline.svg b/src/assets/icons/icon-pipeline.svg new file mode 100644 index 0000000..417ede9 --- /dev/null +++ b/src/assets/icons/icon-pipeline.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-rule.svg b/src/assets/icons/icon-rule.svg new file mode 100644 index 0000000..6739521 --- /dev/null +++ b/src/assets/icons/icon-rule.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-station.svg b/src/assets/icons/icon-station.svg new file mode 100644 index 0000000..2d89e89 --- /dev/null +++ b/src/assets/icons/icon-station.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-well.svg b/src/assets/icons/icon-well.svg new file mode 100644 index 0000000..f1d1797 --- /dev/null +++ b/src/assets/icons/icon-well.svg @@ -0,0 +1 @@ + diff --git a/src/components/map/index.vue b/src/components/map/index.vue index f9c3b5d..55e37da 100644 --- a/src/components/map/index.vue +++ b/src/components/map/index.vue @@ -26,7 +26,7 @@ const loading = ref(true) // 设置安全密钥 window._AMapSecurityConfig = { - securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换 + securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换 } // 地图实例 const map = shallowRef() @@ -40,7 +40,7 @@ // -------------------------------------初始化地图-------------------------------------------------- const initMap = () => { AMapLoader.load({ - key: '40849e82b4e33f5255b17372520c954d', // 后期需替换 + key: localStorage.getItem('JsKey')!, // 后期需替换 version: '2.0', // 指定要加载的 JSAPI 的版本,缺省时默认为 1.4.15 plugins: ['AMap.Scale', 'AMap.MouseTool'], // 需要使用的的插件列表,如比例尺'AMap.Scale'等 }) diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue index 529c2ca..c9ad1a2 100644 --- a/src/layouts/components/Tools/alarmList.vue +++ b/src/layouts/components/Tools/alarmList.vue @@ -19,7 +19,7 @@ device: '燃气智能监测终端', code: 'N57G215', alarmValue: '浓度12%vol', - readStatus: '1', + readStatus: '2', time: '2024-03-21 13:03:01', grade: '2', }, @@ -51,25 +51,33 @@
-
- 1 +
+
+ 1 +
+
+ {{ message.title }} +
+
+ {{ message.time }} +
-
- {{ message.title }} -
-
- {{ message.time }} +
+ + {{ message.readStatus + === '1' ? '已读' : '未读' }} + + + 查看 +
- {{ message.time }} +
+ {{ message.code }} | {{ message.device }} | {{ message.alarmValue }} +
-
- - - -
@@ -88,6 +96,7 @@ .message-container { width: 100%; padding: 0 5px; + overflow-x: hidden; .message-title { width: 100%; @@ -112,6 +121,23 @@ display: flex; font-size: 12px; + // width: 70%; + // display: flex; + .container { + align-items: center; + width: 72%; + display: flex; + overflow: hidden; + + /* 确保超出的内容会被裁剪 */ + white-space: nowrap; + + /* 确保文本在一行内显示 */ + text-overflow: ellipsis; + + /* 超出的文本部分显示为省略号 */ + } + .mar { margin: 0 5px; } diff --git a/public/config/config.json b/public/config/config.json index 8e6cc74..313f7fe 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,6 @@ { "title":"燃气物联感知平台", - "baseUrl": "http://111.198.10.15:22006" + "baseUrl": "http://111.198.10.15:11643", + "securityJsCode": "56bf9671d4b3517d294caec4751889a1", + "JsKey": "40849e82b4e33f5255b17372520c954d" } diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 1f8697d..98261dc 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -16,11 +16,11 @@ // 添加用户 export function addUser(data: object) { - return request.post('system/mgr/add', data) + return request.post('sys/mgr/add', data) } // 修改用户 export function updateUser(data: object) { - return request.post('system/mgr/update', data) + return request.post('sys/mgr/update', data) } // 删除用户 export function delUser(data: { id: string }) { diff --git a/src/assets/icons/board.svg b/src/assets/icons/board.svg new file mode 100644 index 0000000..b0a8f1e --- /dev/null +++ b/src/assets/icons/board.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-alarm.svg b/src/assets/icons/icon-alarm.svg new file mode 100644 index 0000000..d15bda6 --- /dev/null +++ b/src/assets/icons/icon-alarm.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-ledger.svg b/src/assets/icons/icon-ledger.svg new file mode 100644 index 0000000..21d793d --- /dev/null +++ b/src/assets/icons/icon-ledger.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-pipeline.svg b/src/assets/icons/icon-pipeline.svg new file mode 100644 index 0000000..417ede9 --- /dev/null +++ b/src/assets/icons/icon-pipeline.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-rule.svg b/src/assets/icons/icon-rule.svg new file mode 100644 index 0000000..6739521 --- /dev/null +++ b/src/assets/icons/icon-rule.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-station.svg b/src/assets/icons/icon-station.svg new file mode 100644 index 0000000..2d89e89 --- /dev/null +++ b/src/assets/icons/icon-station.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-well.svg b/src/assets/icons/icon-well.svg new file mode 100644 index 0000000..f1d1797 --- /dev/null +++ b/src/assets/icons/icon-well.svg @@ -0,0 +1 @@ + diff --git a/src/components/map/index.vue b/src/components/map/index.vue index f9c3b5d..55e37da 100644 --- a/src/components/map/index.vue +++ b/src/components/map/index.vue @@ -26,7 +26,7 @@ const loading = ref(true) // 设置安全密钥 window._AMapSecurityConfig = { - securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换 + securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换 } // 地图实例 const map = shallowRef() @@ -40,7 +40,7 @@ // -------------------------------------初始化地图-------------------------------------------------- const initMap = () => { AMapLoader.load({ - key: '40849e82b4e33f5255b17372520c954d', // 后期需替换 + key: localStorage.getItem('JsKey')!, // 后期需替换 version: '2.0', // 指定要加载的 JSAPI 的版本,缺省时默认为 1.4.15 plugins: ['AMap.Scale', 'AMap.MouseTool'], // 需要使用的的插件列表,如比例尺'AMap.Scale'等 }) diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue index 529c2ca..c9ad1a2 100644 --- a/src/layouts/components/Tools/alarmList.vue +++ b/src/layouts/components/Tools/alarmList.vue @@ -19,7 +19,7 @@ device: '燃气智能监测终端', code: 'N57G215', alarmValue: '浓度12%vol', - readStatus: '1', + readStatus: '2', time: '2024-03-21 13:03:01', grade: '2', }, @@ -51,25 +51,33 @@
-
- 1 +
+
+ 1 +
+
+ {{ message.title }} +
+
+ {{ message.time }} +
-
- {{ message.title }} -
-
- {{ message.time }} +
+ + {{ message.readStatus + === '1' ? '已读' : '未读' }} + + + 查看 +
- {{ message.time }} +
+ {{ message.code }} | {{ message.device }} | {{ message.alarmValue }} +
-
- - - -
@@ -88,6 +96,7 @@ .message-container { width: 100%; padding: 0 5px; + overflow-x: hidden; .message-title { width: 100%; @@ -112,6 +121,23 @@ display: flex; font-size: 12px; + // width: 70%; + // display: flex; + .container { + align-items: center; + width: 72%; + display: flex; + overflow: hidden; + + /* 确保超出的内容会被裁剪 */ + white-space: nowrap; + + /* 确保文本在一行内显示 */ + text-overflow: ellipsis; + + /* 超出的文本部分显示为省略号 */ + } + .mar { margin: 0 5px; } diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue index 8c42ce1..9f2d41f 100644 --- a/src/layouts/components/Tools/index.vue +++ b/src/layouts/components/Tools/index.vue @@ -101,7 +101,7 @@ - + @@ -88,6 +96,7 @@ .message-container { width: 100%; padding: 0 5px; + overflow-x: hidden; .message-title { width: 100%; @@ -112,6 +121,23 @@ display: flex; font-size: 12px; + // width: 70%; + // display: flex; + .container { + align-items: center; + width: 72%; + display: flex; + overflow: hidden; + + /* 确保超出的内容会被裁剪 */ + white-space: nowrap; + + /* 确保文本在一行内显示 */ + text-overflow: ellipsis; + + /* 超出的文本部分显示为省略号 */ + } + .mar { margin: 0 5px; } diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue index 8c42ce1..9f2d41f 100644 --- a/src/layouts/components/Tools/index.vue +++ b/src/layouts/components/Tools/index.vue @@ -101,7 +101,7 @@ - + @@ -88,6 +96,7 @@ .message-container { width: 100%; padding: 0 5px; + overflow-x: hidden; .message-title { width: 100%; @@ -112,6 +121,23 @@ display: flex; font-size: 12px; + // width: 70%; + // display: flex; + .container { + align-items: center; + width: 72%; + display: flex; + overflow: hidden; + + /* 确保超出的内容会被裁剪 */ + white-space: nowrap; + + /* 确保文本在一行内显示 */ + text-overflow: ellipsis; + + /* 超出的文本部分显示为省略号 */ + } + .mar { margin: 0 5px; } diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue index 8c42ce1..9f2d41f 100644 --- a/src/layouts/components/Tools/index.vue +++ b/src/layouts/components/Tools/index.vue @@ -101,7 +101,7 @@ - + @@ -88,6 +96,7 @@ .message-container { width: 100%; padding: 0 5px; + overflow-x: hidden; .message-title { width: 100%; @@ -112,6 +121,23 @@ display: flex; font-size: 12px; + // width: 70%; + // display: flex; + .container { + align-items: center; + width: 72%; + display: flex; + overflow: hidden; + + /* 确保超出的内容会被裁剪 */ + white-space: nowrap; + + /* 确保文本在一行内显示 */ + text-overflow: ellipsis; + + /* 超出的文本部分显示为省略号 */ + } + .mar { margin: 0 5px; } diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue index 8c42ce1..9f2d41f 100644 --- a/src/layouts/components/Tools/index.vue +++ b/src/layouts/components/Tools/index.vue @@ -101,7 +101,7 @@ - +