Merge branch 'develop' of http://39.98.45.134:8090/tool/web-tool into develop

packages/graphmod-atl/src/siftingSort/Sort.js

 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Tabs, TagSelect, StdFormRow, CardPane} from 'amos-framework';
+import { Tabs, TagSelect, StdFormRow, CardPane, BorderRadius} from 'amos-framework';
 import { Row, Col } from 'amos-framework';
 import { getSortSences } from './api';
 
 
 const { TabList, Tab, TabPanel } = Tabs;
-const sences = ['全部', '新能源', '水利环境', '医疗健康', '智慧城市', '智慧园区', '企业运营', '物流仓库', '生产制造', '其他']
+const categoryScene = ['全部', '新能源', '水利环境', '医疗健康', '智慧城市', '智慧园区', '企业运营', '物流仓库', '生产制造', '其他']
 const miniSences = ['综合排序', '热门推荐', '最新发布']
 
 
@@ -20,20 +20,20 @@ function ListCards({cardItems}) {
 
     const cols = rowItems.map((cardItems, index) => (
       <Col span={6} key={index}>
-        <div style={{margin: 30}}>
-          <CardPane style={{ width: 300 }} bodyStyle={{ padding: 0 }}>
-            <div>
-              <img alt="example" width="100%" src="https://tinypng.com/images/apng/panda-waving.png" />
+        <div style={{margin: 30,display:'flex',justifyContent:'center'}}>
+          <CardPane style={{ width:300 ,height:240,border:0}} bodyStyle={{ padding: 0}}>
+            <div style={{height:'75%'}}>
+              <img alt="example" width="100%" height='160px' style={{objectFit:'cover',borderRadius:10}} src={+cardItems.sketch} />
             </div>
-            <div style={{ padding: '10px 16px' }}>
-              <h2 style={{ margin: 0 }}>{cardItems.name}</h2>
-              <p style={{ textAlign: 'left', marginTop: '5px' }}>{cardItems.url}</p>
-              <p style={{ textAlign: 'left', marginTop: '5px' }}>热度指数:{cardItems.times}</p>
-              <p style={{ textAlign: 'left', marginTop: '5px' }}>{cardItems.agency}</p>
+            <div style={{ padding: '10px 0px 10px 50px' }}>
+              <h2 style={{ margin: 0 }}>{cardItems.templateName}</h2>
+              <div style={{display : 'flex'}}>  
+                <p style={{ textAlign: 'left', marginTop: '5px' }}>热度指数:{cardItems.viewTimes}</p>
+              <p style={{ textAlign: 'left', marginTop: '5px' }}>{cardItems.agencyName}</p>
+              </div>
             </div>
           </CardPane>
         </div>
-
       </Col>
     ));
 
@@ -71,7 +71,7 @@ class Shifting extends Component {
     this.state = {
       mode: 'divider',
       cardItems: [],
-      selectSence: sences[0],
+      selectSence: categoryScene[0],
       selectMiniSence: miniSences[0]
       // mode2: 'line',
       // mode3: 'bullet'
@@ -131,10 +131,10 @@ render() {
           <Tab>&nbsp;&nbsp;三维模型&nbsp;&nbsp;</Tab>
         </TabList>
         <TabPanel>
-          <StdFormRow  label="场景" block style={{ paddingBottom: 11 }}>
-            <TagSelect defaultValue = {sences[0]} data={sences} onChange={this.handleSenecesSubmit} expandable single />
+          <StdFormRow  label="场景" block id = 'scene' style={{padding:'11px 0px 11px 20px',}}>
+            <TagSelect defaultValue = {categoryScene[0]} data={categoryScene} onChange={this.handleSenecesSubmit} expandable single />
           </StdFormRow>
-          <StdFormRow  block style={{ paddingBottom: 11 }}>
+          <StdFormRow  block style={{ padding:'0px 0px 11px 20px'}}>
             <TagSelect defaultValue = {miniSences[0]} data={miniSences} onChange={this.handleMiniSenecesSubmit} expandable single />
           </StdFormRow>
           <ListCards cardItems={this.state.cardItems}/>

packages/graphmod-atl/src/siftingSort/api.js

@@ -14,12 +14,12 @@ const {
 
 export const UrlConsts =
 {
-    getSortSencesUrl: () => completePrefix()(gateWay.tool, 'v1/iot/View/select/all'),
+    getSortSencesUrl: () => completePrefix()(gateWay.atl, 'scene/select/all'),
 };
 
-export const getSortSences = (sences, miniSences) => {
+export const getSortSences = (categoryScene, miniSences) => {
   const formData = new window.FormData();
-  formData.append('sences', sences)
+  formData.append('categoryScene', categoryScene)
   formData.append('miniSences', miniSences)
     return commonPost(UrlConsts.getSortSencesUrl(), formData );
   };

packages/graphmod-atl/src/siftingSort/index.scss

@@ -32,3 +32,4 @@
     vertical-align: top;
   }
 }
+

packages/graphmod-scripts/src/_proxy.js

 const proxy = {
-  // '/baseURI': {
-  //   target: 'http://172.16.10.72:10005/',
-  //   pathRewrite: { '^/baseURI': '' }
-  // },
-  '/baseURI/jcs': {
-    // target: 'http://172.16.10.72:10005/',
-    target: 'http://172.16.0.120:20000/',
-    changeOrigin: true,
+  '/baseURI': {
+    target: 'http://172.16.3.18:10005/',
     pathRewrite: { '^/baseURI': '' }
   },
-  '/bizURI/openapi': {
-    target: 'http://172.16.3.3:11001/',
+  '/bizURI/atl': {
+    target: 'http://172.16.0.14:30002/',
+    // changeOrigin: true,
     pathRewrite: { '^/bizURI': '' }
   },
   '/bizURI': {
-    // target: 'http://172.16.3.20:11100/', // 苏
-    // target: 'http://172.16.3.89:11100/', // 田
-    target: 'http://172.16.10.72:10005/',
-    // target: 'http://172.16.3.20:8807/', // 田
-    // target: 'http://172.16.3.89:11000/', // 田
-    // target: 'http://113.134.211.174:10005/', // 李
-    // target: 'http://172.16.3.41:11100/', // 唐
-    // target: 'http://172.16.3.4:11100/',  // 陈
+    target: 'http://172.16.3.18:10005/',
     pathRewrite: { '^/bizURI': '' }
   },
-
-  // '/baseURI':{
-  //   target:'http://172.24.139.74:30201',
-  //   changeOrigin:true,
-  //   pathRewrite:{'^/baseURI':''}
-  // },
-  //   '/bizURI/jcs':{
-  //   target:'http://172.24.139.74:30201',
-  //   pathRewrite:{'^/bizURI':''}
-  // },
-  // '/bizURI':{
-  //   target:'http://172.24.139.74:30201',
-  //   changeOrigin:true,
-  //   pathRewrite:{'^/bizURI':''}
-  // },
-
-  '/bizURI/video': {
-    target: 'http://172.16.3.39:7900/',
-    pathRewrite: { '^/bizURI': '' }
-  },
-  '/fileURI': {
-    target: 'http://172.16.10.72/',
-    pathRewrite: { '^/fileURI': '' }
-  },
-  '/openUrl': {
-    target: 'http://11.11.16.12:83/'
-  },
-  '/jcs/': {
-    target: 'http://172.16.10.72:10005/'
-  },
-  '/ccs/': {
-    target: 'http://172.16.3.20:8807/'
-  },
-  '/fulong/': {
-    target: 'http://172.16.3.120:8001/'
-  },
-  '/tzs/': {
-    target: 'http://172.16.10.72:10005/'
-    // target: 'http://172.16.3.89:11000/'
-  },
-  '/privilege': {
-    target: 'http://172.16.10.72:10005/'
-  },
-  '/iot': {
-    target: 'http://172.16.10.72:10005/'
-  },
   '/group1': {
     target: 'http://39.98.246.31:8888/'
   },
@@ -80,9 +22,6 @@ const proxy = {
   '/upload': {
     // target: 'http://172.16.10.202:9000/'
     target: 'http://172.16.10.72/'
-  },
-  '/audio': {
-    target: 'http://11.11.16.18/records/'
   }
 };
 

packages/graphmod-utils/src/gateWay.js

@@ -23,5 +23,5 @@ export default {
   risk: 'risk', // 风险模型
   report: 'report', // 数据填报
 
-  tool: 'tool'
+  atl: 'atl'
 };