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 {
activeRule: genActiveRule('/civbase/civweb4'),
props: {},
},
{
name: 'civweb5',
entry: `//${window.location.hostname}:3002/civbase/civweb5`,
container: '#micro-container',
activeRule: genActiveRule('/civbase/civweb5'),
},
// {
// name: 'civweb5',
// entry: `//${window.location.hostname}:3002/civbase/civweb5`,
// container: '#micro-container',
// activeRule: genActiveRule('/civbase/civweb5'),
// },
],
prod: [
{
......
import { service, jsonp } from '@wisdom-utils/utils';
import constants from '../constants';
export const API = {
AUTHORIZATION_TOKEN: '/Publish/Identity/AuthorizationToken',
GET_GATEWAY_CONFIG: '/Publish/OMS/GateWayConfig',
GET_CONFIG: '/CityInterface/rest/services.svc/GetConfig',
GENERATE_TOKEN: '/cityinterface/rest/services.svc/generatetoken',
......@@ -29,6 +30,11 @@ export const API = {
};
const services = service({
authorizationToken: {
url: API.AUTHORIZATION_TOKEN,
method: constants.REQUEST_METHOD_GET,
type: constants.REQUEST_HTTP,
},
getWateWayConfig: {
url: API.GET_GATEWAY_CONFIG,
method: constants.REQUEST_METHOD_GET,
......
......@@ -402,7 +402,7 @@ class Notifier {
break;
case MESSAGE_TYPE.SCADA_TYPE:
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;
case MESSAGE_TYPE.SYS_TYPE:
case "系统通知":
......
......@@ -694,7 +694,6 @@ const BasicLayout = props => {
openKeys={[...openKeys]}
menuProps={{
onClick: ({ item, key, keyPath, domEvent }) => {
debugger
domEvent.persist();
const keyField = key.indexOf('/') > -1 ? 'path' : 'key';
const config = findPathByLeafId(key, [currentRoutes], '', keyField);
......
......@@ -82,7 +82,7 @@ export const initMicroApps = loader => {
},
singular: true,
scopedCSS: true,
prefetch: 'all',
// prefetch: 'all',
// eslint-disable-next-line no-underscore-dangle
getPublicPath: window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__,
excludeAssetFilter: url =>
......
......@@ -641,6 +641,13 @@ class Login {
this.events.removeAllListeners('loginError');
const self = this;
// eslint-disable-next-line no-undef
// services.authorizationToken({
// loginName: usr,
// password: pwd ? sha1(pwd).toUpperCase() : '',
// type: "database"
// }).then(res => {
// console.log(res)
// })
services.generateToken(
{
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