处理文件冲突

src/view/bizview/situation/riskAssessment/SituationMap.js

@@ -4,9 +4,6 @@ import AmosWebSocket from 'amos-websocket';
 import { Connect, Tooltip } from 'amos-framework';
 import SvgToolkit from 'amos-viz/lib/svg/SvgToolkit';
 import * as endConf from 'amos-processor/lib/config/endconf';
-// import sitMap from './datas/sit-map';
-// import info from './datas/info';
-// import text from './datas/text';
 import ynSitMap from './datas/yn/sit-map';
 import ynInfo from './datas/yn/info';
 import ynText from './datas/yn/text';
@@ -23,6 +20,8 @@ const genVal = (val) =>  Math.round((Math.random() * 10 + val));
 const colorEnum = { '0': 'initial', '1': 'one',  '2': 'two', '3': 'three', '4': 'fourfive', '5': 'fourfive' };
 const AmosConfig = endConf.AmosConfig;
 const projectName = AmosConfig.riskDynamicChart.projectName;
+
+import shmText from `./datas/${projectName}/text`;
 const riskSourceIdMap = AmosConfig.riskDynamicChart.riskSourceIdMap;
 const imgWidth = projectName==='shm'?988:1009;
 const imgHeight = projectName==='shm'?519:568;