liting2017 6 年之前
父節點
當前提交
24d421b5ec

+ 4 - 0
js/admin/index/content.jsx

@@ -6,6 +6,8 @@ import AchievementExamine from '@/administration/achievement/achievementExamine'
 import AchievementLibrary from '@/administration/achievement/techAchievement';
 import BusinessCategory from '@/administration/business/businessCategory';
 import BusinessProject from '@/administration/business/businessProject';
+import News from '@/administration/News/newsList';
+import Policy from '@/administration/policy/policyList';
 
 import {hashHistory,Route,Router,IndexRedirect} from 'react-router';
 import {Layout} from 'antd';
@@ -26,6 +28,8 @@ export default class ContentRouter extends React.Component {
             <Route path="/achievementExamine" component={AchievementExamine} />
             <Route path="/businessCategory" component={BusinessCategory} />
             <Route path="/businessProject" component={BusinessProject} />
+            <Route path="/news" component={News} />
+            <Route path="/policy" component={Policy} />
         </Router>
       </Content>
     )

+ 1 - 5
js/admin/index/leftMenu.jsx

@@ -2,13 +2,9 @@ import React from 'react';
 import { Menu, Icon, Layout } from 'antd';
 import '@/account/leftTab.less';
 const SubMenu = Menu.SubMenu;
-const MenuItemGroup = Menu.ItemGroup;
 import { Link } from 'react-router';
-import ajax from 'jquery/src/ajax/xhr.js';
-import $ from 'jquery/src/ajax';
 import { adminMenu } from '../menu';
 import logo from 'img/acc-logo.png';
-const { Sider } = Layout;
 
 const LeftTab = React.createClass({
 	getInitialState() {
@@ -16,7 +12,7 @@ const LeftTab = React.createClass({
 			openKeys: [ 'sub1' ],
 			current: 'index',
 			switch: false,
-			rootSubmenuKeys :['sub1', 'sub2','sub3','sub4']
+			rootSubmenuKeys :['sub1', 'sub2','sub3','sub4','sub5']
 		};
 	},
 	menuClick(e) {

+ 9 - 0
js/admin/menu.jsx

@@ -34,6 +34,15 @@ module.exports = {
           { name: '业务分类管理', url: 'businessCategory' },
           { name: '业务项目管理', url: 'businessProject' },
         ]
+      },
+      {
+        name: '政策与新闻',
+        url: 'sub5',
+        icon: 'exception',
+        children: [
+          { name: '政策管理', url: 'policy' },
+          { name: '新闻管理', url: 'news' },
+        ]
       }
     ]
 }

+ 1 - 0
js/component/account/achievement/techAchievement.jsx

@@ -286,6 +286,7 @@ const DemandList = React.createClass({
         };
         const hasSelected = this.state.selectedRowKeys.length > 0;
         const { RangePicker } = DatePicker;
+        this.state.dataSource = [{key:1,id:1,auditStatus:0},{key:2,id:1,auditStatus:1},{key:3,id:1,auditStatus:2},{key:4,id:1,auditStatus:3}]
         return (
             <div className="user-content" >
                 <div className="content-title">

+ 16 - 0
js/component/dataDic.js

@@ -2225,6 +2225,22 @@ module.exports = {
 	        key: "APP成果搜索页"
 	    }
     ],
+     //新闻发布位置
+     newsPosition:[
+        {
+	        value: "web_index",
+	        key: "网站新闻首页"
+	    },{
+	        value: "web_achievement_main",
+	        key: "网站科技服务主页"
+	    }, {
+	        value: "web_achievement_list",
+	        key: "app政策主页"
+	    },{
+	        value: "app_index",
+	        key: "APP科技服务首页"
+	    }
+    ],
     //成果类型
     achievementType:[
         {

+ 15 - 1
js/component/tools.js

@@ -78,7 +78,8 @@ import {
     releasePosition,
     achievementPosition,
     achievementType,
-    transaction
+    transaction,
+    newsPosition
 } from './dataDic.js';
 
 import { provinceList} from './NewDicProvinceList.js';
@@ -1416,6 +1417,19 @@ module.exports = {
          return theType.join(' - ');
         }
      },
+     getNewPosition:function(e=[]){
+        if (e) {
+            let theType = [];
+            e.map((item)=>{
+                newsPosition.map(function (atem) {
+                    if (atem.value == item) {
+                        theType.push(atem.key);
+                    };
+                });
+            })
+         return theType.join(' - ');
+        }
+     },
      //成果类型;
      getAchievementType:function(e){
         if (e||e==0) {