修改了运行不了的bug

packages/graphmod-assets/src/index.js

@@ -131,12 +131,6 @@ const common = {
   alertmergeIcon: require('./../assets/common/alertmergeIcon.png')
 };
 
-const alarm = {
-  alarmRed: require('../assets/alarm/light-red.gif'),
-  alarmGreen: require('../assets/alarm/light-green.gif')
-};
-
 export default {
-  common,
-  alarm
+  common
 };

packages/graphmod-atl/src/api.js

@@ -21,7 +21,8 @@ const {
 
 export const UrlConsts = {
   deleteAgency: (url) => completePrefix(baseURI, 'atl/agency/relation/{agencyCode}/{sequenceNbrs}'),
-  exportAgency: (url) => completePrefix(baseURI, 'atl/agency/export/{agencyCode}/{sequenceNbrs}'),
+  // exportAgency: (url) => completePrefix(baseURI, 'atl/agency/export/{agencyCode}/{sequenceNbrs}'),
+  exportAgency: (url) => completePrefix(baseURI, 'atl/agency/export/{agencyCode}/{ipSeq}/{sequenceNbrs}'),
   generateSqlUrl: url => completePrefix(baseURI, 'atl/v1/dataApi/generateSQL') // 通用导出SQL脚本 get
 };
 
@@ -42,6 +43,6 @@ export const templateDownload = (params) => {
 /**
  * 导出机构
  */
-export const exportByAgencyCode = (agencyCode, sequenceNbrs) => {
-  return fileDownload({ url: formatUrl(UrlConsts.exportAgency(), { agencyCode, sequenceNbrs }) });
+export const exportByAgencyCode = (agencyCode, ipSeq, sequenceNbrs) => {
+  return fileDownload({ url: formatUrl(UrlConsts.exportAgency(), { agencyCode, ipSeq, sequenceNbrs }) });
 };

packages/graphmod-atl/src/download/DownloadView.js

@@ -55,6 +55,7 @@ class DownloadView extends Component {
         break;
       case 'exportAgency':
         agencyCode = LocationParam.getLocationParamByName('agencyCode');
+        ipSeq = LocationParam.getLocationParamByName('ipSeq');
         break;
       case 'export':
         ipSeq = LocationParam.getLocationParamByName('ipSeq');
@@ -73,7 +74,8 @@ class DownloadView extends Component {
               break;
             case 'exportAgency': {
                sequenceNbrs = dataConfig[dataConfig.dimension];
-              exportByAgencyCode(agencyCode,sequenceNbrs);
+              // exportByAgencyCode(agencyCode, sequenceNbrs);
+              exportByAgencyCode(agencyCode, ipSeq, sequenceNbrs);
             }
               break;
             case 'export':
@@ -86,32 +88,10 @@ class DownloadView extends Component {
     } else {
       briskWarningTip('至少选择一行数据');
     }
-
-    // this.setState({ selectId: dataConfig[dataConfig.dimension], logsVisible: true }, () => {
-    //   switch (dataConfig.type) {
-    //     case 'deleteAgency':
-    //       {
-    //         sequenceNbrs = dataConfig[dataConfig.dimension];
-    //         deleteByAgencyCode(agencyCode, sequenceNbrs);
-    //       }
-    //       break;
-    //     case 'exportAgency':
-    //       {
-    //         sequenceNbrs = dataConfig[dataConfig.dimension];
-    //         exportByAgencyCode(agencyCode,sequenceNbrs);
-    //       }
-    //       break;
-    //     case 'export':
-    //       templateDownload({ resourceCode: dataConfig.resourceCode, dimension: dataConfig.dimension, [dataConfig.dimension]: dataConfig[dataConfig.dimension], ipSeq });
-    //       break;
-    //   }
-
-    // });
-
   };
 
   render() {
-    const { dataConfig = {} } = this.props;
+    const { dataConfig = {}, record } = this.props;
     const { logsVisible, selectId } = this.state;
 
     switch (dataConfig.type) {

packages/graphmod-atl/src/index.js

@@ -3,11 +3,11 @@ import { chainModResult } from 'amos-viz/lib/widgets/modLoader';
 import './index.scss';
 import './cssvar.scss';
 import Download from './download';
-import Shifting from './siftingSort';
+import Scene from './scene';
 
 const IMods = [
   ...Download,
-  ...Shifting
+  ...Scene
 ];
 
 export default chainModResult(IMods).mods;

packages/graphmod-atl/src/scene/Scene.js

@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Tabs, TagSelect, StdFormRow, CardPane, Row, Col } from 'amos-framework';
 import { getSortSences } from './api';
+import { commonGet } from '@gm/graphmod-utils/src/request';
 
 import './index.scss';
 
@@ -14,7 +15,14 @@ function ListCards({ cardItems }) {
   // console.log("传入ListCards中的carditems:")
   // console.log(cardItems)
   function handleClick() {
-    window.open(this);
+    // window.open(this);
+
+    // 向后端先发送
+    const backendUrl = "http://172.16.0.120:30002/atl/forward?url=" + encodeURIComponent(this);
+    commonGet(backendUrl).then(data => {
+      console.log('Data:', data);
+      window.open(this + "&token=" + data);
+    });
   }
 
   for (let i = 0; i < cardItems.length; i += 4) {

packages/graphmod-atl/src/scene/index.js

-import Shifting from './Sort';
+import Scene from './Scene';
 
 export default [
   {
     key: 'atl-shifting', // 筛选缩略图显示页面
-    component: Shifting
+    component: Scene
   }
 ];

packages/graphmod-utils/src/api.js

@@ -12,6 +12,7 @@ export const UrlConsts = {
   dictListUrl: url => completePrefix(baseURI, 'systemctl/v1/dictionary/{dictCode}/values'), // 根据字典标识获取字典列表 get
   platFormUploadfileUrl: url => completePrefix(baseURI, 'systemctl/v1/filestorage'), // 平台文件服务器上传接口
   lookFileUrl: url => completePrefix('/fileURI/', url), // 查看图片 fileURI需要走转向代理
+  getRegionUrl: url => completePrefix(baseURI, 'systemctl/v1/region/tree'), // 获取行政区划
   remoteUrl: completePrefix(baseURI, 'morphic/biz/url'), // 请求第三方系统 api， post，需要传入第三方api 地址
   generateSqlUrl: url => completePrefix(baseURI, 'studio/v1/dataApi/generateSQL') // 通用导出SQL脚本 get
 };
@@ -40,6 +41,13 @@ export const fileUploadAction = file => {
 };
 
 /**
+ * 获取行政区划
+ */
+export const getRegion = () => {
+  return commonGet(formatUrl(UrlConsts.getRegionUrl()));
+};
+
+/**
  * 图片文件路径补全
  * @param {string} fileUrl
  */