Commit 21fad263 authored by 邓晓峰's avatar 邓晓峰

fix: message format bug

parent aa76b29c
This diff was suppressed by a .gitattributes entry.
...@@ -10,12 +10,12 @@ export default { ...@@ -10,12 +10,12 @@ export default {
activeRule: genActiveRule('/civbase/civweb4'), activeRule: genActiveRule('/civbase/civweb4'),
props: {}, props: {},
}, },
{ // {
name: 'civweb5', // name: 'civweb5',
entry: `//${window.location.hostname}:3002/civbase/civweb5`, // entry: `//${window.location.hostname}:3002/civbase/civweb5`,
container: '#micro-container', // container: '#micro-container',
activeRule: genActiveRule('/civbase/civweb5'), // activeRule: genActiveRule('/civbase/civweb5'),
}, // },
], ],
prod: [ prod: [
{ {
......
import { service, jsonp } from '@wisdom-utils/utils'; import { service, jsonp } from '@wisdom-utils/utils';
import constants from '../constants'; import constants from '../constants';
export const API = { export const API = {
AUTHORIZATION_TOKEN: '/Publish/Identity/AuthorizationToken',
GET_GATEWAY_CONFIG: '/Publish/OMS/GateWayConfig', GET_GATEWAY_CONFIG: '/Publish/OMS/GateWayConfig',
GET_CONFIG: '/CityInterface/rest/services.svc/GetConfig', GET_CONFIG: '/CityInterface/rest/services.svc/GetConfig',
GENERATE_TOKEN: '/cityinterface/rest/services.svc/generatetoken', GENERATE_TOKEN: '/cityinterface/rest/services.svc/generatetoken',
...@@ -29,6 +30,11 @@ export const API = { ...@@ -29,6 +30,11 @@ export const API = {
}; };
const services = service({ const services = service({
authorizationToken: {
url: API.AUTHORIZATION_TOKEN,
method: constants.REQUEST_METHOD_GET,
type: constants.REQUEST_HTTP,
},
getWateWayConfig: { getWateWayConfig: {
url: API.GET_GATEWAY_CONFIG, url: API.GET_GATEWAY_CONFIG,
method: constants.REQUEST_METHOD_GET, method: constants.REQUEST_METHOD_GET,
......
...@@ -402,7 +402,7 @@ class Notifier { ...@@ -402,7 +402,7 @@ class Notifier {
break; break;
case MESSAGE_TYPE.SCADA_TYPE: case MESSAGE_TYPE.SCADA_TYPE:
case "通用报警": case "通用报警":
messageInfo = `${info.title}${info.alarmDevice}\\n${info.alarmContent}\\n${info.alarmValue} / ${info.alarmThreshold}\\n${info.deviceCode}`; messageInfo = `${info.title} \\n ${info.content.replace(", ", "\\n")}\\n${info.deviceCode}`;
break; break;
case MESSAGE_TYPE.SYS_TYPE: case MESSAGE_TYPE.SYS_TYPE:
case "系统通知": case "系统通知":
......
...@@ -694,7 +694,6 @@ const BasicLayout = props => { ...@@ -694,7 +694,6 @@ const BasicLayout = props => {
openKeys={[...openKeys]} openKeys={[...openKeys]}
menuProps={{ menuProps={{
onClick: ({ item, key, keyPath, domEvent }) => { onClick: ({ item, key, keyPath, domEvent }) => {
debugger
domEvent.persist(); domEvent.persist();
const keyField = key.indexOf('/') > -1 ? 'path' : 'key'; const keyField = key.indexOf('/') > -1 ? 'path' : 'key';
const config = findPathByLeafId(key, [currentRoutes], '', keyField); const config = findPathByLeafId(key, [currentRoutes], '', keyField);
......
...@@ -82,7 +82,7 @@ export const initMicroApps = loader => { ...@@ -82,7 +82,7 @@ export const initMicroApps = loader => {
}, },
singular: true, singular: true,
scopedCSS: true, scopedCSS: true,
prefetch: 'all', // prefetch: 'all',
// eslint-disable-next-line no-underscore-dangle // eslint-disable-next-line no-underscore-dangle
getPublicPath: window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__, getPublicPath: window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__,
excludeAssetFilter: url => excludeAssetFilter: url =>
......
...@@ -641,6 +641,13 @@ class Login { ...@@ -641,6 +641,13 @@ class Login {
this.events.removeAllListeners('loginError'); this.events.removeAllListeners('loginError');
const self = this; const self = this;
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
// services.authorizationToken({
// loginName: usr,
// password: pwd ? sha1(pwd).toUpperCase() : '',
// type: "database"
// }).then(res => {
// console.log(res)
// })
services.generateToken( services.generateToken(
{ {
f: 'json', f: 'json',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment